在 2023/8/15 上午9:11, Ian Rogers 写道:

On Mon, Aug 7, 2023 at 12:51 AM Jing Zhang [off-list ref] wrote:

quoted

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@linux.alibaba.com>

Did you test with NO_JEVENTS=1?

You are absolutely right. I completely overlooked the case where NO_JEVENTS=1.

quoted

---
 .../pmu-events/arch/test/test_soc/sys/uncore.json  |  8 ++++
 tools/perf/tests/pmu-events.c                      | 55 ++++++++++++++++++++++
 2 files changed, 63 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..19ec595 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).",
+           "Type": "0x05",
+           "EventIdCode": "0x01",
+           "EventName": "sys_cmn_pmu.hnf_cache_miss",
+           "Unit": "sys_cmn_pmu",
+           "Compat": "434*;436*;43c*;43a01"

I suspect this needs adding here:
https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/tree/tools/perf/pmu-events/empty-pmu-events.c?h=perf-tools-next#n247

After adding the relevant code in empty-pmu-events.c, it can successfully test with NO_JEVENTS=1.

Thanks,
Jing

Thanks,
Ian

quoted

    }
 ]

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

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel