From: John Garry <john.garry@huawei.com>
To: <peterz@infradead.org>, <mingo@redhat.com>, <acme@kernel.org>,
<mark.rutland@arm.com>, <alexander.shishkin@linux.intel.com>,
<jolsa@redhat.com>, <namhyung@kernel.org>
Cc: <yao.jin@linux.intel.com>, <linux-kernel@vger.kernel.org>,
<linux-perf-users@vger.kernel.org>, <irogers@google.com>,
<linuxarm@huawei.com>, John Garry <john.garry@huawei.com>
Subject: [PATCH 08/11] perf test: Add more pmu-events uncore aliases
Date: Thu, 29 Jul 2021 21:56:23 +0800 [thread overview]
Message-ID: <1627566986-30605-9-git-send-email-john.garry@huawei.com> (raw)
In-Reply-To: <1627566986-30605-1-git-send-email-john.garry@huawei.com>
Add more events to cover the scenarios fixed and also inadvertently broken
by commit c47a5599eda3 ("perf tools: Fix pattern matching for same
substring in different PMU type").
Signed-off-by: John Garry <john.garry@huawei.com>
---
.../arch/test/test_soc/cpu/uncore.json | 23 +++++-
tools/perf/tests/pmu-events.c | 72 +++++++++++++++++++
2 files changed, 94 insertions(+), 1 deletion(-)
diff --git a/tools/perf/pmu-events/arch/test/test_soc/cpu/uncore.json b/tools/perf/pmu-events/arch/test/test_soc/cpu/uncore.json
index d0a890cc814d..788766f45dbc 100644
--- a/tools/perf/pmu-events/arch/test/test_soc/cpu/uncore.json
+++ b/tools/perf/pmu-events/arch/test/test_soc/cpu/uncore.json
@@ -17,5 +17,26 @@
"CounterMask": "0",
"Invert": "0",
"EdgeDetect": "0"
- }
+ },
+ {
+ "EventCode": "0x7",
+ "EventName": "uncore_hisi_l3c.rd_hit_cpipe",
+ "BriefDescription": "Total read hits",
+ "PublicDescription": "Total read hits",
+ "Unit": "hisi_sccl,l3c"
+ },
+ {
+ "EventCode": "0x12",
+ "EventName": "uncore_imc_free_running.cache_miss",
+ "BriefDescription": "Total cache misses",
+ "PublicDescription": "Total cache misses",
+ "Unit": "imc_free_running"
+ },
+ {
+ "EventCode": "0x34",
+ "EventName": "uncore_imc.cache_hits",
+ "BriefDescription": "Total cache hits",
+ "PublicDescription": "Total cache hits",
+ "Unit": "imc"
+ },
]
diff --git a/tools/perf/tests/pmu-events.c b/tools/perf/tests/pmu-events.c
index 74c7dfe0a97f..0fcdeeda00ec 100644
--- a/tools/perf/tests/pmu-events.c
+++ b/tools/perf/tests/pmu-events.c
@@ -143,9 +143,54 @@ static const struct perf_pmu_test_event unc_cbo_xsnp_response_miss_eviction = {
.matching_pmu = "uncore_cbox_0",
};
+static const struct perf_pmu_test_event uncore_hisi_l3c_rd_hit_cpipe = {
+ .event = {
+ .name = "uncore_hisi_l3c.rd_hit_cpipe",
+ .event = "event=0x2",
+ .desc = "Total read hits. Unit: hisi_sccl,l3c ",
+ .topic = "uncore",
+ .long_desc = "Total read hits",
+ .pmu = "hisi_sccl,l3c",
+ },
+ .alias_str = "event=0x7",
+ .alias_long_desc = "Total read hits",
+ .matching_pmu = "hisi_sccl3_l3c7",
+};
+
+static const struct perf_pmu_test_event uncore_imc_free_running_cache_miss = {
+ .event = {
+ .name = "uncore_imc_free_running.cache_miss",
+ .event = "event=0x12",
+ .desc = "Total cache misses. Unit: uncore_imc_free_running ",
+ .topic = "uncore",
+ .long_desc = "Total cache misses",
+ .pmu = "uncore_imc_free_running",
+ },
+ .alias_str = "event=0x12",
+ .alias_long_desc = "Total cache misses",
+ .matching_pmu = "uncore_imc_free_running_0",
+};
+
+static const struct perf_pmu_test_event uncore_imc_cache_hits = {
+ .event = {
+ .name = "uncore_imc.cache_hits",
+ .event = "event=0x34",
+ .desc = "Total cache hits. Unit: uncore_imc ",
+ .topic = "uncore",
+ .long_desc = "Total cache hits",
+ .pmu = "uncore_imc",
+ },
+ .alias_str = "event=0x34",
+ .alias_long_desc = "Total cache hits",
+ .matching_pmu = "uncore_imc_0",
+};
+
static const struct perf_pmu_test_event *uncore_events[] = {
&uncore_hisi_ddrc_flux_wcmd,
&unc_cbo_xsnp_response_miss_eviction,
+ &uncore_hisi_l3c_rd_hit_cpipe,
+ &uncore_imc_free_running_cache_miss,
+ &uncore_imc_cache_hits,
NULL
};
@@ -504,6 +549,33 @@ static struct perf_pmu_test_pmu test_pmus[] = {
&unc_cbo_xsnp_response_miss_eviction,
},
},
+ {
+ .pmu = {
+ .name = (char *)"hisi_sccl3_l3c7",
+ .is_uncore = 1,
+ },
+ .aliases = {
+ &uncore_hisi_l3c_rd_hit_cpipe,
+ },
+ },
+ {
+ .pmu = {
+ .name = (char *)"uncore_imc_free_running_0",
+ .is_uncore = 1,
+ },
+ .aliases = {
+ &uncore_imc_free_running_cache_miss,
+ },
+ },
+ {
+ .pmu = {
+ .name = (char *)"uncore_imc_0",
+ .is_uncore = 1,
+ },
+ .aliases = {
+ &uncore_imc_cache_hits,
+ },
+ },
};
/* Test that aliases generated are as expected */
--
2.26.2
next prev parent reply other threads:[~2021-07-29 14:11 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-29 13:56 [PATCH 00/11] perf test: Improve pmu-events support John Garry
2021-07-29 13:56 ` [PATCH 01/11] perf test: Factor out pmu-events event comparison John Garry
2021-07-29 13:56 ` [PATCH 02/11] perf jevents: Relocate test events to cpu folder John Garry
2021-08-02 14:54 ` Arnaldo Carvalho de Melo
2021-08-02 15:02 ` John Garry
2021-08-03 8:19 ` John Garry
2021-08-09 15:46 ` John Garry
2021-08-10 14:01 ` Arnaldo Carvalho de Melo
2021-08-10 14:23 ` John Garry
2021-08-10 14:34 ` Arnaldo Carvalho de Melo
2021-08-10 17:58 ` Arnaldo Carvalho de Melo
2021-08-11 7:59 ` John Garry
2021-08-11 18:38 ` Arnaldo Carvalho de Melo
2021-07-29 13:56 ` [PATCH 03/11] perf test: Declare pmu-events test events separately John Garry
2021-07-29 13:56 ` [PATCH 04/11] perf test: Factor out pmu-events alias comparison John Garry
2021-07-29 13:56 ` [PATCH 05/11] perf test: Test pmu-events core aliases separately John Garry
2021-07-29 13:56 ` [PATCH 06/11] perf pmu: Check .is_uncore field in pmu_add_cpu_aliases_map() John Garry
2021-07-29 13:56 ` [PATCH 07/11] perf test: Re-add pmu-event uncore PMU alias test John Garry
2021-07-29 13:56 ` John Garry [this message]
2021-07-29 13:56 ` [PATCH 09/11] perf pmu: Make pmu_add_sys_aliases() public John Garry
2021-07-29 13:56 ` [PATCH 10/11] perf jevents: Print SoC name per system event table John Garry
2021-07-29 13:56 ` [PATCH 11/11] perf test: Add pmu-events sys event support John Garry
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1627566986-30605-9-git-send-email-john.garry@huawei.com \
--to=john.garry@huawei.com \
--cc=acme@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=irogers@google.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=linuxarm@huawei.com \
--cc=mark.rutland@arm.com \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=yao.jin@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).