Skip to content

Commit

Permalink
perf pmu: Support per pmu json aliases
Browse files Browse the repository at this point in the history
Add support for registering json aliases per PMU. Any alias with an unit
matching the prefix is registered to the PMU.  Uncore has multiple
instances of most units, so all these aliases get registered for each
individual PMU (this is important later to run the event on every
instance of the PMU).

To avoid printing the events multiple times in perf list filter out
duplicated events during printing.

v2: Rely on uncore_ prefix already in unit
v3: Document why calls were reordered

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Link: http://lkml.kernel.org/r/20170128020345.19007-4-andi@firstfloor.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
  • Loading branch information
Andi Kleen authored and Arnaldo Carvalho de Melo committed Feb 8, 2017
1 parent fedb2b5 commit 15b22ed
Showing 1 changed file with 9 additions and 4 deletions.
13 changes: 9 additions & 4 deletions tools/perf/util/pmu.c
Original file line number Diff line number Diff line change
Expand Up @@ -590,14 +590,16 @@ static struct perf_pmu *pmu_lookup(const char *name)
if (pmu_format(name, &format))
return NULL;

if (pmu_aliases(name, &aliases))
/*
* Check the type first to avoid unnecessary work.
*/
if (pmu_type(name, &type))
return NULL;

pmu_add_cpu_aliases(&aliases, name);

if (pmu_type(name, &type))
if (pmu_aliases(name, &aliases))
return NULL;

pmu_add_cpu_aliases(&aliases, name);
pmu = zalloc(sizeof(*pmu));
if (!pmu)
return NULL;
Expand Down Expand Up @@ -1195,6 +1197,9 @@ void print_pmu_events(const char *event_glob, bool name_only, bool quiet_flag,
len = j;
qsort(aliases, len, sizeof(struct sevent), cmp_sevent);
for (j = 0; j < len; j++) {
/* Skip duplicates */
if (j > 0 && !strcmp(aliases[j].name, aliases[j - 1].name))
continue;
if (name_only) {
printf("%s ", aliases[j].name);
continue;
Expand Down

0 comments on commit 15b22ed

Please sign in to comment.