On Mon, Aug 21, 2023 at 1:36 AM Jing Zhang <renyu.zj@xxxxxxxxxxxxxxxxx> wrote: > > Add new event test for uncore system event which is used to verify the > functionality of "Compat" matching multiple identifiers and the new event > fields "EventIdCode" and "Type". > > Signed-off-by: Jing Zhang <renyu.zj@xxxxxxxxxxxxxxxxx> Thanks for the tests! I've no issue with them beside the already mentioned ';'. This will need updating for: https://lore.kernel.org/lkml/20230824183212.374787-1-irogers@xxxxxxxxxx/ https://lore.kernel.org/lkml/20230825024002.801955-1-irogers@xxxxxxxxxx/ Thanks, Ian > --- > .../pmu-events/arch/test/test_soc/sys/uncore.json | 8 ++++ > tools/perf/pmu-events/empty-pmu-events.c | 8 ++++ > tools/perf/tests/pmu-events.c | 55 ++++++++++++++++++++++ > 3 files changed, 71 insertions(+) > > diff --git a/tools/perf/pmu-events/arch/test/test_soc/sys/uncore.json b/tools/perf/pmu-events/arch/test/test_soc/sys/uncore.json > index c7e7528..06b886d 100644 > --- a/tools/perf/pmu-events/arch/test/test_soc/sys/uncore.json > +++ b/tools/perf/pmu-events/arch/test/test_soc/sys/uncore.json > @@ -12,5 +12,13 @@ > "EventName": "sys_ccn_pmu.read_cycles", > "Unit": "sys_ccn_pmu", > "Compat": "0x01" > + }, > + { > + "BriefDescription": "Counts total cache misses in first lookup result (high priority).", > + "NodeType": "0x05", > + "EventIdCode": "0x01", > + "EventName": "sys_cmn_pmu.hnf_cache_miss", > + "Unit": "sys_cmn_pmu", > + "Compat": "434*;436*;43c*;43a01" > } > ] > diff --git a/tools/perf/pmu-events/empty-pmu-events.c b/tools/perf/pmu-events/empty-pmu-events.c > index e74defb..25be18a 100644 > --- a/tools/perf/pmu-events/empty-pmu-events.c > +++ b/tools/perf/pmu-events/empty-pmu-events.c > @@ -245,6 +245,14 @@ struct pmu_events_map { > .pmu = "uncore_sys_ccn_pmu", > }, > { > + .name = "sys_cmn_pmu.hnf_cache_miss", > + .event = "type=0x05,eventid=0x01", > + .desc = "Counts total cache misses in first lookup result (high priority). Unit: uncore_sys_cmn_pmu ", > + .compat = "434*;436*;43c*;43a01", > + .topic = "uncore", > + .pmu = "uncore_sys_cmn_pmu", > + }, > + { > .name = 0, > .event = 0, > .desc = 0, > diff --git a/tools/perf/tests/pmu-events.c b/tools/perf/tests/pmu-events.c > index 3204252..79fb3e2 100644 > --- a/tools/perf/tests/pmu-events.c > +++ b/tools/perf/tests/pmu-events.c > @@ -255,9 +255,24 @@ struct perf_pmu_test_pmu { > .matching_pmu = "uncore_sys_ccn_pmu4", > }; > > +static const struct perf_pmu_test_event sys_cmn_pmu_hnf_cache_miss = { > + .event = { > + .name = "sys_cmn_pmu.hnf_cache_miss", > + .event = "type=0x05,eventid=0x01", > + .desc = "Counts total cache misses in first lookup result (high priority). Unit: uncore_sys_cmn_pmu ", > + .topic = "uncore", > + .pmu = "uncore_sys_cmn_pmu", > + .compat = "434*;436*;43c*;43a01", > + }, > + .alias_str = "type=0x5,eventid=0x1", > + .alias_long_desc = "Counts total cache misses in first lookup result (high priority). Unit: uncore_sys_cmn_pmu ", > + .matching_pmu = "uncore_sys_cmn_pmu0", > +}; > + > static const struct perf_pmu_test_event *sys_events[] = { > &sys_ddr_pmu_write_cycles, > &sys_ccn_pmu_read_cycles, > + &sys_cmn_pmu_hnf_cache_miss, > NULL > }; > > @@ -704,6 +719,46 @@ static int __test_uncore_pmu_event_aliases(struct perf_pmu_test_pmu *test_pmu) > &sys_ccn_pmu_read_cycles, > }, > }, > + { > + .pmu = { > + .name = (char *)"uncore_sys_cmn_pmu0", > + .is_uncore = 1, > + .id = (char *)"43401", > + }, > + .aliases = { > + &sys_cmn_pmu_hnf_cache_miss, > + }, > + }, > + { > + .pmu = { > + .name = (char *)"uncore_sys_cmn_pmu0", > + .is_uncore = 1, > + .id = (char *)"43602", > + }, > + .aliases = { > + &sys_cmn_pmu_hnf_cache_miss, > + }, > + }, > + { > + .pmu = { > + .name = (char *)"uncore_sys_cmn_pmu0", > + .is_uncore = 1, > + .id = (char *)"43c03", > + }, > + .aliases = { > + &sys_cmn_pmu_hnf_cache_miss, > + }, > + }, > + { > + .pmu = { > + .name = (char *)"uncore_sys_cmn_pmu0", > + .is_uncore = 1, > + .id = (char *)"43a01", > + }, > + .aliases = { > + &sys_cmn_pmu_hnf_cache_miss, > + }, > + } > }; > > /* Test that aliases generated are as expected */ > -- > 1.8.3.1 >
