perf test parse-events: Without a PMU use cpu-cycles rather than cycles

Without a PMU perf matches an event against any PMU with the
event. Unfortunately some PMU drivers advertise a "cycles" event which
is typically just a core event. Switch to using "cpu-cycles" which is
an indentical legacy event but avoids the multiple PMU confusion
introduced by the PMU drivers. Note, on x86 cpu-cycles is also a sysfs
event but cycles isn't.

Signed-off-by: Ian Rogers <irogers@google.com>
Tested-by: James Clark <james.clark@linaro.org>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>

diff --git a/tools/perf/tests/parse-events.c b/tools/perf/tests/parse-events.c
index f6cd994f75cf3044d1e4104d8c92944df131baa0..23f3e265e2a14468f8a8c29060116fca17075234 100644 (file)
--- a/tools/perf/tests/parse-events.c
+++ b/tools/perf/tests/parse-events.c
@@ -585,9 +585,10 @@ static int test__checkevent_pmu(struct evlist *evlist)
 {
 
        struct evsel *evsel = evlist__first(evlist);
+       struct perf_pmu *core_pmu = perf_pmus__find_core_pmu();
 
        TEST_ASSERT_VAL("wrong number of entries", 1 == evlist->core.nr_entries);
-       TEST_ASSERT_VAL("wrong type", PERF_TYPE_RAW == evsel->core.attr.type);
+       TEST_ASSERT_VAL("wrong type", core_pmu->type == evsel->core.attr.type);
        TEST_ASSERT_VAL("wrong config",    test_config(evsel, 10));
        TEST_ASSERT_VAL("wrong config1",    1 == evsel->core.attr.config1);
        TEST_ASSERT_VAL("wrong config2",    3 == evsel->core.attr.config2);
@@ -646,17 +647,18 @@ static int test__checkevent_list(struct evlist *evlist)
 static int test__checkevent_pmu_name(struct evlist *evlist)
 {
        struct evsel *evsel = evlist__first(evlist);
+       struct perf_pmu *core_pmu = perf_pmus__find_core_pmu();
 
        /* cpu/config=1,name=krava/u */
        TEST_ASSERT_VAL("wrong number of entries", 2 == evlist->core.nr_entries);
-       TEST_ASSERT_VAL("wrong type", PERF_TYPE_RAW == evsel->core.attr.type);
+       TEST_ASSERT_VAL("wrong type", core_pmu->type == evsel->core.attr.type);
        TEST_ASSERT_VAL("wrong config", 1 == evsel->core.attr.config);
        TEST_ASSERT_VAL("wrong name", evsel__name_is(evsel, "krava"));
 
        /* cpu/config=2/u" */
        evsel = evsel__next(evsel);
        TEST_ASSERT_VAL("wrong number of entries", 2 == evlist->core.nr_entries);
-       TEST_ASSERT_VAL("wrong type", PERF_TYPE_RAW == evsel->core.attr.type);
+       TEST_ASSERT_VAL("wrong type", core_pmu->type == evsel->core.attr.type);
        TEST_ASSERT_VAL("wrong config", 2 == evsel->core.attr.config);
        TEST_ASSERT_VAL("wrong name", evsel__name_is(evsel, "cpu/config=2/u"));
 
@@ -666,10 +668,11 @@ static int test__checkevent_pmu_name(struct evlist *evlist)
 static int test__checkevent_pmu_partial_time_callgraph(struct evlist *evlist)
 {
        struct evsel *evsel = evlist__first(evlist);
+       struct perf_pmu *core_pmu = perf_pmus__find_core_pmu();
 
        /* cpu/config=1,call-graph=fp,time,period=100000/ */
        TEST_ASSERT_VAL("wrong number of entries", 2 == evlist->core.nr_entries);
-       TEST_ASSERT_VAL("wrong type", PERF_TYPE_RAW == evsel->core.attr.type);
+       TEST_ASSERT_VAL("wrong type", core_pmu->type == evsel->core.attr.type);
        TEST_ASSERT_VAL("wrong config", 1 == evsel->core.attr.config);
        /*
         * The period, time and callgraph value gets configured within evlist__config,
@@ -681,7 +684,7 @@ static int test__checkevent_pmu_partial_time_callgraph(struct evlist *evlist)
 
        /* cpu/config=2,call-graph=no,time=0,period=2000/ */
        evsel = evsel__next(evsel);
-       TEST_ASSERT_VAL("wrong type", PERF_TYPE_RAW == evsel->core.attr.type);
+       TEST_ASSERT_VAL("wrong type", core_pmu->type == evsel->core.attr.type);
        TEST_ASSERT_VAL("wrong config", 2 == evsel->core.attr.config);
        /*
         * The period, time and callgraph value gets configured within evlist__config,
@@ -697,12 +700,14 @@ static int test__checkevent_pmu_partial_time_callgraph(struct evlist *evlist)
 static int test__checkevent_pmu_events(struct evlist *evlist)
 {
        struct evsel *evsel;
+       struct perf_pmu *core_pmu = perf_pmus__find_core_pmu();
 
        TEST_ASSERT_VAL("wrong number of entries", 1 <= evlist->core.nr_entries);
 
        evlist__for_each_entry(evlist, evsel) {
-               TEST_ASSERT_VAL("wrong type", PERF_TYPE_RAW == evsel->core.attr.type ||
-                                             strcmp(evsel->pmu->name, "cpu"));
+               TEST_ASSERT_VAL("wrong type", core_pmu->type == evsel->core.attr.type ||
+                               !strncmp(evsel__name(evsel), evsel->pmu->name,
+                                        strlen(evsel->pmu->name)));
                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);
@@ -1650,7 +1655,7 @@ static int test__checkevent_complex_name(struct evlist *evlist)
 
        TEST_ASSERT_VAL("wrong complex name parsing",
                        evsel__name_is(evsel,
-                                      "COMPLEX_CYCLES_NAME:orig=cycles,desc=chip-clock-ticks"));
+                                      "COMPLEX_CYCLES_NAME:orig=cpu-cycles,desc=chip-clock-ticks"));
        return TEST_OK;
 }
 
@@ -1787,7 +1792,7 @@ static const struct evlist_test test__events[] = {
                /* 4 */
        },
        {
-               .name  = "cycles/period=100000,config2/",
+               .name  = "cpu-cycles/period=100000,config2/",
                .check = test__checkevent_symbolic_name_config,
                /* 5 */
        },
@@ -1902,27 +1907,27 @@ static const struct evlist_test test__events[] = {
                /* 7 */
        },
        {
-               .name  = "{instructions:k,cycles:upp}",
+               .name  = "{instructions:k,cpu-cycles:upp}",
                .check = test__group1,
                /* 8 */
        },
        {
-               .name  = "{faults:k,branches}:u,cycles:k",
+               .name  = "{faults:k,branches}:u,cpu-cycles:k",
                .check = test__group2,
                /* 9 */
        },
        {
-               .name  = "group1{syscalls:sys_enter_openat:H,cycles:kppp},group2{cycles,1:3}:G,instructions:u",
+               .name  = "group1{syscalls:sys_enter_openat:H,cpu-cycles:kppp},group2{cpu-cycles,1:3}:G,instructions:u",
                .check = test__group3,
                /* 0 */
        },
        {
-               .name  = "{cycles:u,instructions:kp}:p",
+               .name  = "{cpu-cycles:u,instructions:kp}:p",
                .check = test__group4,
                /* 1 */
        },
        {
-               .name  = "{cycles,instructions}:G,{cycles:G,instructions:G},cycles",
+               .name  = "{cpu-cycles,instructions}:G,{cpu-cycles:G,instructions:G},cpu-cycles",
                .check = test__group5,
                /* 2 */
        },
@@ -1932,27 +1937,27 @@ static const struct evlist_test test__events[] = {
                /* 3 */
        },
        {
-               .name  = "{cycles,cache-misses:G}:H",
+               .name  = "{cpu-cycles,cache-misses:G}:H",
                .check = test__group_gh1,
                /* 4 */
        },
        {
-               .name  = "{cycles,cache-misses:H}:G",
+               .name  = "{cpu-cycles,cache-misses:H}:G",
                .check = test__group_gh2,
                /* 5 */
        },
        {
-               .name  = "{cycles:G,cache-misses:H}:u",
+               .name  = "{cpu-cycles:G,cache-misses:H}:u",
                .check = test__group_gh3,
                /* 6 */
        },
        {
-               .name  = "{cycles:G,cache-misses:H}:uG",
+               .name  = "{cpu-cycles:G,cache-misses:H}:uG",
                .check = test__group_gh4,
                /* 7 */
        },
        {
-               .name  = "{cycles,cache-misses,branch-misses}:S",
+               .name  = "{cpu-cycles,cache-misses,branch-misses}:S",
                .check = test__leader_sample1,
                /* 8 */
        },
@@ -1967,7 +1972,7 @@ static const struct evlist_test test__events[] = {
                /* 0 */
        },
        {
-               .name  = "{cycles,cache-misses,branch-misses}:D",
+               .name  = "{cpu-cycles,cache-misses,branch-misses}:D",
                .check = test__pinned_group,
                /* 1 */
        },
@@ -2005,7 +2010,7 @@ static const struct evlist_test test__events[] = {
                /* 6 */
        },
        {
-               .name  = "task-clock:P,cycles",
+               .name  = "task-clock:P,cpu-cycles",
                .check = test__checkevent_precise_max_modifier,
                /* 7 */
        },
@@ -2036,17 +2041,17 @@ static const struct evlist_test test__events[] = {
                /* 2 */
        },
        {
-               .name  = "cycles/name='COMPLEX_CYCLES_NAME:orig=cycles,desc=chip-clock-ticks'/Duk",
+               .name  = "cpu-cycles/name='COMPLEX_CYCLES_NAME:orig=cpu-cycles,desc=chip-clock-ticks'/Duk",
                .check = test__checkevent_complex_name,
                /* 3 */
        },
        {
-               .name  = "cycles//u",
+               .name  = "cpu-cycles//u",
                .check = test__sym_event_slash,
                /* 4 */
        },
        {
-               .name  = "cycles:k",
+               .name  = "cpu-cycles:k",
                .check = test__sym_event_dc,
                /* 5 */
        },
@@ -2056,17 +2061,17 @@ static const struct evlist_test test__events[] = {
                /* 6 */
        },
        {
-               .name  = "{cycles,cache-misses,branch-misses}:e",
+               .name  = "{cpu-cycles,cache-misses,branch-misses}:e",
                .check = test__exclusive_group,
                /* 7 */
        },
        {
-               .name  = "cycles/name=name/",
+               .name  = "cpu-cycles/name=name/",
                .check = test__term_equal_term,
                /* 8 */
        },
        {
-               .name  = "cycles/name=l1d/",
+               .name  = "cpu-cycles/name=l1d/",
                .check = test__term_equal_legacy,
                /* 9 */
        },
@@ -2174,7 +2179,7 @@ static const struct evlist_test test__events_pmu[] = {
                /* 2 */
        },
        {
-               .name  = "cpu/name='COMPLEX_CYCLES_NAME:orig=cycles,desc=chip-clock-ticks',period=0x1,event=0x2/ukp",
+               .name  = "cpu/name='COMPLEX_CYCLES_NAME:orig=cpu-cycles,desc=chip-clock-ticks',period=0x1,event=0x2/ukp",
                .valid = test__pmu_cpu_event_valid,
                .check = test__checkevent_complex_name,
                /* 3 */