iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

perf tests: Add hybrid cases for 'Roundtrip evsel->name' test

Browse Source 
Since for one hw event, two hybrid events are created.

For example,

evsel->idx      evsel__name(evsel)
0               cycles
1               cycles
2               instructions
3               instructions
...

So for comparing the evsel name on hybrid, the evsel->idx
needs to be divided by 2.

  # ./perf test 14
  14: Roundtrip evsel->name                                           : Ok

Signed-off-by: Jin Yao <yao.jin@linux.intel.com>
Reviewed-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Kan Liang <kan.liang@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/r/20210427070139.25256-20-yao.jin@linux.intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Jin Yao 2021-04-27 15:01:32 +08:00 committed by Arnaldo Carvalho de Melo
parent 2541cb63ac
commit afff9f312e
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tools/perf/tests/evsel-roundtrip-name.c
View File

@ -4,6 +4,7 @@
#include "parse-events.h" #include "parse-events.h"
#include "tests.h" #include "tests.h"
#include "debug.h" #include "debug.h"
#include "pmu.h"
#include <errno.h> #include <errno.h>
#include <linux/kernel.h> #include <linux/kernel.h>
@ -62,7 +63,8 @@ static int perf_evsel__roundtrip_cache_name_test(void)
return ret; return ret;
} }
static int __perf_evsel__name_array_test(const char *names[], int nr_names) static int __perf_evsel__name_array_test(const char *names[], int nr_names,
int distance)
{ {
int i, err; int i, err;
struct evsel *evsel; struct evsel *evsel;
@ -82,9 +84,9 @@ static int __perf_evsel__name_array_test(const char *names[], int nr_names)
err = 0; err = 0;
evlist__for_each_entry(evlist, evsel) { evlist__for_each_entry(evlist, evsel) {
if (strcmp(evsel__name(evsel), names[evsel->idx])) { if (strcmp(evsel__name(evsel), names[evsel->idx / distance])) {
--err; --err;
pr_debug("%s != %s\n", evsel__name(evsel), names[evsel->idx]); pr_debug("%s != %s\n", evsel__name(evsel), names[evsel->idx / distance]);
} }
} }
@ -93,18 +95,21 @@ out_delete_evlist:
return err; return err;
} }
#define perf_evsel__name_array_test(names) \ #define perf_evsel__name_array_test(names, distance) \
__perf_evsel__name_array_test(names, ARRAY_SIZE(names)) __perf_evsel__name_array_test(names, ARRAY_SIZE(names), distance)
int test__perf_evsel__roundtrip_name_test(struct test *test __maybe_unused, int subtest __maybe_unused) int test__perf_evsel__roundtrip_name_test(struct test *test __maybe_unused, int subtest __maybe_unused)
{ {
int err = 0, ret = 0; int err = 0, ret = 0;
err = perf_evsel__name_array_test(evsel__hw_names); if (perf_pmu__has_hybrid())
return perf_evsel__name_array_test(evsel__hw_names, 2);
err = perf_evsel__name_array_test(evsel__hw_names, 1);
if (err) if (err)
ret = err; ret = err;
err = __perf_evsel__name_array_test(evsel__sw_names, PERF_COUNT_SW_DUMMY + 1); err = __perf_evsel__name_array_test(evsel__sw_names, PERF_COUNT_SW_DUMMY + 1, 1);
if (err) if (err)
ret = err; ret = err;