perf tests: Don't tail call optimize in unwind test

[linux-2.6-microblaze.git] / tools / perf / tests / evsel-roundtrip-name.c

diff --git a/tools/perf/tests/evsel-roundtrip-name.c b/tools/perf/tests/evsel-roundtrip-name.c
index 956205b..f7f3e5b 100644 (file)
--- a/tools/perf/tests/evsel-roundtrip-name.c
+++ b/tools/perf/tests/evsel-roundtrip-name.c
@@ -20,12 +20,11 @@ static int perf_evsel__roundtrip_cache_name_test(void)
        for (type = 0; type < PERF_COUNT_HW_CACHE_MAX; type++) {
                for (op = 0; op < PERF_COUNT_HW_CACHE_OP_MAX; op++) {
                        /* skip invalid cache type */
-                       if (!perf_evsel__is_cache_op_valid(type, op))
+                       if (!evsel__is_cache_op_valid(type, op))
                                continue;
 
                        for (i = 0; i < PERF_COUNT_HW_CACHE_RESULT_MAX; i++) {
-                               __perf_evsel__hw_cache_type_op_res_name(type, op, i,
-                                                                       name, sizeof(name));
+                               __evsel__hw_cache_type_op_res_name(type, op, i, name, sizeof(name));
                                err = parse_events(evlist, name, NULL);
                                if (err)
                                        ret = err;
@@ -39,23 +38,22 @@ static int perf_evsel__roundtrip_cache_name_test(void)
        for (type = 0; type < PERF_COUNT_HW_CACHE_MAX; type++) {
                for (op = 0; op < PERF_COUNT_HW_CACHE_OP_MAX; op++) {
                        /* skip invalid cache type */
-                       if (!perf_evsel__is_cache_op_valid(type, op))
+                       if (!evsel__is_cache_op_valid(type, op))
                                continue;
 
                        for (i = 0; i < PERF_COUNT_HW_CACHE_RESULT_MAX; i++) {
-                               __perf_evsel__hw_cache_type_op_res_name(type, op, i,
-                                                                       name, sizeof(name));
+                               __evsel__hw_cache_type_op_res_name(type, op, i, name, sizeof(name));
                                if (evsel->idx != idx)
                                        continue;
 
                                ++idx;
 
-                               if (strcmp(perf_evsel__name(evsel), name)) {
-                                       pr_debug("%s != %s\n", perf_evsel__name(evsel), name);
+                               if (strcmp(evsel__name(evsel), name)) {
+                                       pr_debug("%s != %s\n", evsel__name(evsel), name);
                                        ret = -1;
                                }
 
-                               evsel = perf_evsel__next(evsel);
+                               evsel = evsel__next(evsel);
                        }
                }
        }
@@ -84,9 +82,9 @@ static int __perf_evsel__name_array_test(const char *names[], int nr_names)
 
        err = 0;
        evlist__for_each_entry(evlist, evsel) {
-               if (strcmp(perf_evsel__name(evsel), names[evsel->idx])) {
+               if (strcmp(evsel__name(evsel), names[evsel->idx])) {
                        --err;
-                       pr_debug("%s != %s\n", perf_evsel__name(evsel), names[evsel->idx]);
+                       pr_debug("%s != %s\n", evsel__name(evsel), names[evsel->idx]);
                }
        }
 
@@ -102,12 +100,11 @@ int test__perf_evsel__roundtrip_name_test(struct test *test __maybe_unused, int
 {
        int err = 0, ret = 0;
 
-       err = perf_evsel__name_array_test(perf_evsel__hw_names);
+       err = perf_evsel__name_array_test(evsel__hw_names);
        if (err)
                ret = err;
 
-       err = __perf_evsel__name_array_test(perf_evsel__sw_names,
-                                           PERF_COUNT_SW_DUMMY + 1);
+       err = __perf_evsel__name_array_test(evsel__sw_names, PERF_COUNT_SW_DUMMY + 1);
        if (err)
                ret = err;