Commit 808ce56e authored by James Clark's avatar James Clark Committed by Namhyung Kim
Browse files

perf test: Fix event parsing test on Arm 



The test looks for a PMU from sysfs with type = PERF_TYPE_RAW when
opening a raw event. Arm doesn't have a real raw PMU, only core PMUs
with unique types other than raw.

Instead of looking for a matching PMU, just test that the event type
was parsed as raw and skip the PMU search on Arm. The raw event type
test should also apply to all platforms so add it outside of the ifdef.

Fixes: aefde50a ("perf test: Fix parse-events tests for >1 core PMU")
Acked-by: default avatarIan Rogers <irogers@google.com>
Signed-off-by: default avatarJames Clark <james.clark@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Link: https://lore.kernel.org/r/20230705082653.23566-2-james.clark@arm.com


Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
parent b2ad9549

tools/perf/tests/parse-events.c

+13 −1
Original line number Diff line number Diff line
@@ -108,10 +108,21 @@ static int test__checkevent_raw(struct evlist *evlist) 
	TEST_ASSERT_VAL("wrong number of entries", 0 != evlist->core.nr_entries);



	perf_evlist__for_each_evsel(&evlist->core, evsel) {

		struct perf_pmu *pmu = NULL;

		struct perf_pmu *pmu __maybe_unused = NULL;

		bool type_matched = false;



		TEST_ASSERT_VAL("wrong config", test_perf_config(evsel, 0x1a));

		TEST_ASSERT_VAL("event not parsed as raw type",

				evsel->attr.type == PERF_TYPE_RAW);

#if defined(__aarch64__)

		/*

		 * Arm doesn't have a real raw type PMU in sysfs, so raw events

		 * would never match any PMU. However, RAW events on Arm will

		 * always successfully open on the first available core PMU

		 * so no need to test for a matching type here.

		 */

		type_matched = raw_type_match = true;

#else

		while ((pmu = perf_pmus__scan(pmu)) != NULL) {

			if (pmu->type == evsel->attr.type) {

				TEST_ASSERT_VAL("PMU type expected once", !type_matched);
@@ -120,6 +131,7 @@ static int test__checkevent_raw(struct evlist *evlist) 
					raw_type_match = true;

			}

		}

#endif

		TEST_ASSERT_VAL("No PMU found for type", type_matched);

	}

	TEST_ASSERT_VAL("Raw PMU not matched", raw_type_match);