mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-12-27 13:30:45 -05:00
perf test: Switch cycles event to cpu-cycles
Without a PMU perf matches an event against any PMU with the event. Unfortunately some PMU drivers advertise a "cycles" event which is typically just a core event. As tests assume a core event, switch to use "cpu-cycles" that avoids the overloaded "cycles" event on troublesome PMUs and is so far not overloaded. Note, on x86 this changes a legacy event into a sysfs one. Signed-off-by: Ian Rogers <irogers@google.com> Tested-by: James Clark <james.clark@linaro.org> Signed-off-by: Namhyung Kim <namhyung@kernel.org>
This commit is contained in:
@@ -704,7 +704,7 @@ static int do_test_code_reading(bool try_kcore)
|
||||
struct map *map;
|
||||
bool have_vmlinux, have_kcore;
|
||||
struct dso *dso;
|
||||
const char *events[] = { "cycles", "cycles:u", "cpu-clock", "cpu-clock:u", NULL };
|
||||
const char *events[] = { "cpu-cycles", "cpu-cycles:u", "cpu-clock", "cpu-clock:u", NULL };
|
||||
int evidx = 0;
|
||||
struct perf_env host_env;
|
||||
|
||||
|
||||
@@ -90,7 +90,7 @@ static int test__keep_tracking(struct test_suite *test __maybe_unused, int subte
|
||||
perf_evlist__set_maps(&evlist->core, cpus, threads);
|
||||
|
||||
CHECK__(parse_event(evlist, "dummy:u"));
|
||||
CHECK__(parse_event(evlist, "cycles:u"));
|
||||
CHECK__(parse_event(evlist, "cpu-cycles:u"));
|
||||
|
||||
evlist__config(evlist, &opts, NULL);
|
||||
|
||||
|
||||
@@ -101,11 +101,11 @@ static int test__perf_time_to_tsc(struct test_suite *test __maybe_unused, int su
|
||||
|
||||
perf_evlist__set_maps(&evlist->core, cpus, threads);
|
||||
|
||||
CHECK__(parse_event(evlist, "cycles:u"));
|
||||
CHECK__(parse_event(evlist, "cpu-cycles:u"));
|
||||
|
||||
evlist__config(evlist, &opts, NULL);
|
||||
|
||||
/* For hybrid "cycles:u", it creates two events */
|
||||
/* For hybrid "cpu-cycles:u", it creates two events */
|
||||
evlist__for_each_entry(evlist, evsel) {
|
||||
evsel->core.attr.comm = 1;
|
||||
evsel->core.attr.disabled = 1;
|
||||
|
||||
@@ -332,7 +332,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";
|
||||
const char *cycles = "cpu-cycles:u";
|
||||
struct switch_tracking switch_tracking = { .tids = NULL, };
|
||||
struct record_opts opts = {
|
||||
.mmap_pages = UINT_MAX,
|
||||
|
||||
Reference in New Issue
Block a user