perf tests parse-events: Use "branches" rather than "cache-references"

Switch from "cache-references" to "branches" in test as Intel has a
sysfs event for "cache-references" and changing the priority for sysfs
over legacy causes the test to fail.

Signed-off-by: Ian Rogers <irogers@google.com>
Reviewed-by: Kan Liang <kan.liang@linux.intel.com>
Tested-by: Atish Patra <atishp@rivosinc.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Beeman Strong <beeman@rivosinc.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/r/20240416061533.921723-6-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/tests/parse-events.c b/tools/perf/tests/parse-events.c
index 0b70451451b3793892c2ff6a680276c6358a3270..993e482f094c2d20a471757b40ac0d0108f68365 100644 (file)
--- a/tools/perf/tests/parse-events.c
+++ b/tools/perf/tests/parse-events.c
@@ -942,8 +942,8 @@ static int test__group2(struct evlist *evlist)
                        continue;
                }
                if (evsel->core.attr.type == PERF_TYPE_HARDWARE &&
-                   test_config(evsel, PERF_COUNT_HW_CACHE_REFERENCES)) {
-                       /* cache-references + :u modifier */
+                   test_config(evsel, PERF_COUNT_HW_BRANCH_INSTRUCTIONS)) {
+                       /* branches + :u modifier */
                        TEST_ASSERT_VAL("wrong exclude_user", !evsel->core.attr.exclude_user);
                        TEST_ASSERT_VAL("wrong exclude_kernel", evsel->core.attr.exclude_kernel);
                        TEST_ASSERT_VAL("wrong exclude_hv", evsel->core.attr.exclude_hv);
@@ -2032,7 +2032,7 @@ static const struct evlist_test test__events[] = {
                /* 8 */
        },
        {
-               .name  = "{faults:k,cache-references}:u,cycles:k",
+               .name  = "{faults:k,branches}:u,cycles:k",
                .check = test__group2,
                /* 9 */
        },