perf test: Use generic event for expand_libpfm_events()

[ Upstream commit 9b0a7836359443227c9af101f7aea8412e739458 ]

I found that the UNHALTED_CORE_CYCLES event is only available in the
Intel machines and it makes other vendors/archs fail on the test.  As
libpfm4 can parse the generic events like cycles, let's use them.

Fixes: 40b74c30ff ("perf test: Add expand cgroup event test")
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Acked-by: Ian Rogers <irogers@google.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lore.kernel.org/lkml/20201027072855.655449-1-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Namhyung Kim 2020-10-27 16:28:54 +09:00 committed by Greg Kroah-Hartman
parent c5c1af1107
commit 3647b89442

View File

@ -145,7 +145,7 @@ static int expand_libpfm_events(void)
int ret; int ret;
struct evlist *evlist; struct evlist *evlist;
struct rblist metric_events; struct rblist metric_events;
const char event_str[] = "UNHALTED_CORE_CYCLES"; const char event_str[] = "CYCLES";
struct option opt = { struct option opt = {
.value = &evlist, .value = &evlist,
}; };