perf test: Make matching_pmu effective

The perf_pmu_test_event.matching_pmu didn't work. No matter what its
value is, it does not affect the test results. So let matching_pmu be
used for matching perf_pmu_test_pmu.pmu.name.

Signed-off-by: Jing Zhang <renyu.zj@linux.alibaba.com>
Reviewed-by: John Garry <john.g.garry@oracle.com>
Reviewed-by: Ian Rogers <irogers@google.com>
Tested-by: Ian Rogers <irogers@google.com>
Cc: James Clark <james.clark@arm.com>
Cc: Will Deacon <will@kernel.org>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Mike Leach <mike.leach@linaro.org>
Cc: Shuai Xue <xueshuai@linux.alibaba.com>
Cc: Zhuo Song <zhuo.song@linux.alibaba.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-doc@vger.kernel.org
Link: https://lore.kernel.org/r/1695794391-34817-5-git-send-email-renyu.zj@linux.alibaba.com
Signed-off-by: Namhyung Kim <namhyung@kernel.org>

diff --git a/tools/perf/tests/pmu-events.c b/tools/perf/tests/pmu-events.c
index f5321fbdee79d1e591bfd643e73b9b09360123e2..0cf572f7c1e705074f7e3ac193721f6e45e24ed6 100644 (file)
--- a/tools/perf/tests/pmu-events.c
+++ b/tools/perf/tests/pmu-events.c
@@ -245,7 +245,7 @@ static const struct perf_pmu_test_event sys_ddr_pmu_write_cycles = {
        },
        .alias_str = "event=0x2b",
        .alias_long_desc = "ddr write-cycles event",
-       .matching_pmu = "uncore_sys_ddr_pmu",
+       .matching_pmu = "uncore_sys_ddr_pmu0",
 };
 
 static const struct perf_pmu_test_event sys_ccn_pmu_read_cycles = {
@@ -259,7 +259,7 @@ static const struct perf_pmu_test_event sys_ccn_pmu_read_cycles = {
        },
        .alias_str = "config=0x2c",
        .alias_long_desc = "ccn read-cycles event",
-       .matching_pmu = "uncore_sys_ccn_pmu",
+       .matching_pmu = "uncore_sys_ccn_pmu4",
 };
 
 static const struct perf_pmu_test_event *sys_events[] = {
@@ -615,6 +615,12 @@ static int __test_uncore_pmu_event_aliases(struct perf_pmu_test_pmu *test_pmu)
                        .count = &matched_count,
                };
 
+               if (strcmp(pmu_name, test_event.matching_pmu)) {
+                       pr_debug("testing aliases uncore PMU %s: mismatched matching_pmu, %s vs %s\n",
+                                       pmu_name, test_event.matching_pmu, pmu_name);
+                       return -1;
+               }
+
                err = perf_pmu__find_event(pmu, event->name, &args,
                                           test_core_pmu_event_aliases_cb);
                if (err) {