perf pmu: Add pmu_add_sys_aliases()

Add pmu_add_sys_aliases() to add system PMU events aliases.

For adding system PMU events, iterate through all the events for all SoC
event tables in pmu_sys_event_tables[].

Matches must satisfy both:
- PMU identifier matches event "compat" value
- event "Unit" member must match, same as uncore event aliases matched by
  CPUID

Signed-off-by: John Garry <john.garry@huawei.com>
Acked-by: Kajol Jain <kjain@linux.ibm.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Joakim Zhang <qiangqing.zhang@nxp.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Kim Phillips <kim.phillips@amd.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Shaokun Zhang <zhangshaokun@hisilicon.com>
Cc: Will Deacon <will@kernel.org>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linuxarm@huawei.com
Link: http://lore.kernel.org/lkml/1607080216-36968-5-git-send-email-john.garry@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
index cbeda45ce578f6b7f0fcee4dd9808f1940b2a6ff..44ef28302fc77cbdb681684701e60bb42fc96874 100644 (file)
--- a/tools/perf/util/pmu.c
+++ b/tools/perf/util/pmu.c
@@ -812,6 +812,83 @@ static void pmu_add_cpu_aliases(struct list_head *head, struct perf_pmu *pmu)
        pmu_add_cpu_aliases_map(head, pmu, map);
 }
 
+void pmu_for_each_sys_event(pmu_sys_event_iter_fn fn, void *data)
+{
+       int i = 0;
+
+       while (1) {
+               struct pmu_sys_events *event_table;
+               int j = 0;
+
+               event_table = &pmu_sys_event_tables[i++];
+
+               if (!event_table->table)
+                       break;
+
+               while (1) {
+                       struct pmu_event *pe = &event_table->table[j++];
+                       int ret;
+
+                       if (!pe->name && !pe->metric_group && !pe->metric_name)
+                               break;
+
+                       ret = fn(pe, data);
+                       if (ret)
+                               break;
+               }
+       }
+}
+
+struct pmu_sys_event_iter_data {
+       struct list_head *head;
+       struct perf_pmu *pmu;
+};
+
+static int pmu_add_sys_aliases_iter_fn(struct pmu_event *pe, void *data)
+{
+       struct pmu_sys_event_iter_data *idata = data;
+       struct perf_pmu *pmu = idata->pmu;
+
+       if (!pe->name) {
+               if (pe->metric_group || pe->metric_name)
+                       return 0;
+               return -EINVAL;
+       }
+
+       if (!pe->compat || !pe->pmu)
+               return 0;
+
+       if (!strcmp(pmu->id, pe->compat) &&
+           pmu_uncore_alias_match(pe->pmu, pmu->name)) {
+               __perf_pmu__new_alias(idata->head, NULL,
+                                     (char *)pe->name,
+                                     (char *)pe->desc,
+                                     (char *)pe->event,
+                                     (char *)pe->long_desc,
+                                     (char *)pe->topic,
+                                     (char *)pe->unit,
+                                     (char *)pe->perpkg,
+                                     (char *)pe->metric_expr,
+                                     (char *)pe->metric_name,
+                                     (char *)pe->deprecated);
+       }
+
+       return 0;
+}
+
+static void pmu_add_sys_aliases(struct list_head *head, struct perf_pmu *pmu)
+{
+       struct pmu_sys_event_iter_data idata = {
+               .head = head,
+               .pmu = pmu,
+       };
+
+       if (!pmu->id)
+               return;
+
+       pmu_for_each_sys_event(pmu_add_sys_aliases_iter_fn, &idata);
+}
+
 struct perf_event_attr * __weak
 perf_pmu__get_default_config(struct perf_pmu *pmu __maybe_unused)
 {
@@ -867,6 +944,7 @@ static struct perf_pmu *pmu_lookup(const char *name)
                pmu->id = pmu_id(name);
        pmu->max_precise = pmu_max_precise(name);
        pmu_add_cpu_aliases(&aliases, pmu);
+       pmu_add_sys_aliases(&aliases, pmu);
 
        INIT_LIST_HEAD(&pmu->format);
        INIT_LIST_HEAD(&pmu->aliases);

diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h
index d4366e8e79df71a478f5229c8b61f98a12a014c0..8164388478c658692cac4710e2d613d665fc5088 100644 (file)
--- a/tools/perf/util/pmu.h
+++ b/tools/perf/util/pmu.h
@@ -117,6 +117,8 @@ struct pmu_events_map *perf_pmu__find_map(struct perf_pmu *pmu);
 bool pmu_uncore_alias_match(const char *pmu_name, const char *name);
 void perf_pmu_free_alias(struct perf_pmu_alias *alias);
 
+typedef int (*pmu_sys_event_iter_fn)(struct pmu_event *pe, void *data);
+void pmu_for_each_sys_event(pmu_sys_event_iter_fn fn, void *data);
 int perf_pmu__convert_scale(const char *scale, char **end, double *sval);
 
 int perf_pmu__caps_parse(struct perf_pmu *pmu);