From: John Garry <john.garry@huawei.com>
To: <peterz@infradead.org>, <mingo@redhat.com>, <acme@kernel.org>,
<mark.rutland@arm.com>, <alexander.shishkin@linux.intel.com>,
<jolsa@redhat.com>, <namhyung@kernel.org>, <will@kernel.org>
Cc: <ak@linux.intel.com>, <linuxarm@huawei.com>,
<linux-kernel@vger.kernel.org>, <qiangqing.zhang@nxp.com>,
<irogers@google.com>, <robin.murphy@arm.com>,
<zhangshaokun@hisilicon.com>,
<linux-arm-kernel@lists.infradead.org>,
John Garry <john.garry@huawei.com>
Subject: [RFC PATCH v2 08/13] perf pmu: Add pmu_add_sys_aliases()
Date: Fri, 17 Apr 2020 18:41:19 +0800 [thread overview]
Message-ID: <1587120084-18990-9-git-send-email-john.garry@huawei.com> (raw)
In-Reply-To: <1587120084-18990-1-git-send-email-john.garry@huawei.com>
Add pmu_add_sys_aliases() to add system PMU events aliases.
For adding system PMU events, we iterate through all the events per
SoC event table in pmu_sys_event_tables[].
Matches must satisfy both:
- PMU identifier matches event "compat" value
- like uncore event matching, the event "Unit" member must match; this
match under return value of pmu_uncore_alias_match() (maybe rename that
function?)
Signed-off-by: John Garry <john.garry@huawei.com>
---
tools/perf/util/pmu.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++
tools/perf/util/pmu.h | 5 ++++
2 files changed, 84 insertions(+)
diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
index 6a67c6a28d08..2f38465e8a73 100644
--- a/tools/perf/util/pmu.c
+++ b/tools/perf/util/pmu.c
@@ -827,6 +827,84 @@ 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(struct perf_pmu *pmu, pmu_sys_event_iter_fn fn,
+ void *data)
+{
+ struct pmu_event *pe;
+ int i = 0;
+
+ if (!pmu->id)
+ return;
+
+ 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) {
+ int ret;
+
+ pe = &event_table->table[j++];
+
+ if (!pe->name && !pe->metric_group && !pe->metric_name)
+ break;
+
+ ret = fn(pmu, pe, data);
+ if (ret)
+ break;
+ }
+ }
+}
+
+struct pmu_sys_event_iter_data {
+ struct list_head *head;
+};
+
+static int pmu_add_sys_aliases_iter_fn(struct perf_pmu *pmu,
+ struct pmu_event *pe, void *data)
+{
+ struct pmu_sys_event_iter_data *idata = data;
+
+ 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_for_each_sys_event(pmu, pmu_add_sys_aliases_iter_fn, &idata);
+}
+
struct perf_event_attr * __weak
perf_pmu__get_default_config(struct perf_pmu *pmu __maybe_unused)
{
@@ -882,6 +960,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 62ebca9481fe..e4bc9d192236 100644
--- a/tools/perf/util/pmu.h
+++ b/tools/perf/util/pmu.h
@@ -106,6 +106,11 @@ void pmu_add_cpu_aliases_map(struct list_head *head, struct perf_pmu *pmu,
struct pmu_events_map *perf_pmu__find_map(struct perf_pmu *pmu);
bool pmu_uncore_alias_match(const char *pmu_name, const char *name);
+typedef int (*pmu_sys_event_iter_fn)(struct perf_pmu *, struct pmu_event *pe,
+ void *data);
+
+void pmu_for_each_sys_event(struct perf_pmu *pmu, pmu_sys_event_iter_fn fn,
+ void *data);
int perf_pmu__convert_scale(const char *scale, char **end, double *sval);
#endif /* __PMU_H */
--
2.16.4
next prev parent reply other threads:[~2020-04-17 10:45 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-17 10:41 [RFC PATCH v2 00/13] perf pmu-events: Support event aliasing for system PMUs John Garry
2020-04-17 10:41 ` [RFC PATCH v2 01/13] perf parse-events: Fix comparison of evsel and leader pmu name John Garry
2020-04-27 8:16 ` Jiri Olsa
2020-04-27 9:03 ` John Garry
2020-04-17 10:41 ` [RFC PATCH v2 02/13] perf jevents: Add support for an extra directory level John Garry
2020-04-17 10:41 ` [RFC PATCH v2 03/13] perf jevents: Add support for system events tables John Garry
2020-04-17 10:41 ` [RFC PATCH v2 04/13] perf vendor events arm64: Relocate hip08 events John Garry
2020-04-17 10:41 ` [RFC PATCH v2 05/13] perf vendor events arm64: Add Architected events smmuv3-pmcg.json John Garry
2020-04-17 15:13 ` Ian Rogers
2020-04-17 16:14 ` John Garry
2020-04-17 10:41 ` [RFC PATCH v2 06/13] perf vendor events arm64: Add hip08 SMMUv3 PMCG events John Garry
2020-04-17 10:41 ` [RFC PATCH v2 07/13] perf pmu: Add pmu_id() John Garry
2020-04-22 11:41 ` Jiri Olsa
2020-04-22 11:54 ` John Garry
2020-04-17 10:41 ` John Garry [this message]
2020-04-17 10:41 ` [RFC PATCH v2 09/13] perf vendor events: Add JSON metrics for imx8mm DDR Perf John Garry
2020-04-20 4:17 ` Joakim Zhang
2020-04-20 10:50 ` John Garry
2020-04-20 11:25 ` Joakim Zhang
2020-04-20 14:20 ` John Garry
2020-04-21 2:40 ` Joakim Zhang
2020-04-21 12:28 ` John Garry
2020-04-27 8:09 ` John Garry
2020-04-17 10:41 ` [RFC PATCH v2 10/13] perf metricgroup: Split up metricgroup__add_metric() John Garry
2020-04-22 11:44 ` Jiri Olsa
2020-04-22 12:00 ` John Garry
2020-04-17 10:41 ` [RFC PATCH v2 11/13] perf metricgroup: Split up metricgroup__print() John Garry
2020-04-17 10:41 ` [RFC PATCH v2 12/13] perf metricgroup: Support printing metric groups for system PMUs John Garry
2020-04-17 10:41 ` [RFC PATCH v2 13/13] perf metricgroup: Support adding metrics " John Garry
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1587120084-18990-9-git-send-email-john.garry@huawei.com \
--to=john.garry@huawei.com \
--cc=acme@kernel.org \
--cc=ak@linux.intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=irogers@google.com \
--cc=jolsa@redhat.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxarm@huawei.com \
--cc=mark.rutland@arm.com \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=qiangqing.zhang@nxp.com \
--cc=robin.murphy@arm.com \
--cc=will@kernel.org \
--cc=zhangshaokun@hisilicon.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®