Commit 1da1d607 authored by Adrian Hunter's avatar Adrian Hunter Committed by Arnaldo Carvalho de Melo
Browse files

perf tests: Fix Track with sched_switch test for hybrid case 



If cpu_core PMU event fails to parse, try also cpu_atom PMU event when
parsing cycles event.

Fixes: 43eb05d0 ("perf tests: Support 'Track with sched_switch' test for hybrid")
Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Jin Yao <yao.jin@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lore.kernel.org/r/20220809080702.6921-3-adrian.hunter@intel.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 2e828582

tools/perf/tests/switch-tracking.c

+13 −5
Original line number Diff line number Diff line
@@ -324,6 +324,7 @@ static int process_events(struct evlist *evlist, 
static int test__switch_tracking(struct test_suite *test __maybe_unused, int subtest __maybe_unused)

{

	const char *sched_switch = "sched:sched_switch";

	const char *cycles = "cycles:u";

	struct switch_tracking switch_tracking = { .tids = NULL, };

	struct record_opts opts = {

		.mmap_pages	     = UINT_MAX,
@@ -372,12 +373,19 @@ static int test__switch_tracking(struct test_suite *test __maybe_unused, int sub 
	cpu_clocks_evsel = evlist__last(evlist);



	/* Second event */

	if (perf_pmu__has_hybrid())

		err = parse_events(evlist, "cpu_core/cycles/u", NULL);

	else

		err = parse_events(evlist, "cycles:u", NULL);

	if (perf_pmu__has_hybrid()) {

		cycles = "cpu_core/cycles/u";

		err = parse_events(evlist, cycles, NULL);

		if (err) {

		pr_debug("Failed to parse event cycles:u\n");

			cycles = "cpu_atom/cycles/u";

			pr_debug("Trying %s\n", cycles);

			err = parse_events(evlist, cycles, NULL);

		}

	} else {

		err = parse_events(evlist, cycles, NULL);

	}

	if (err) {

		pr_debug("Failed to parse event %s\n", cycles);

		goto out_err;

	}