147 lines
4.3 KiB
Diff
147 lines
4.3 KiB
Diff
From d9d8d8a8618f7da18025f35c10de8f8b16f4ac63 Mon Sep 17 00:00:00 2001
|
|
From: John Garry <john.garry@huawei.com>
|
|
Date: Fri, 4 Dec 2020 19:10:14 +0800
|
|
Subject: [PATCH 162/201] perf metricgroup: Support printing metric groups for
|
|
system PMUs
|
|
|
|
mainline inclusion
|
|
from mainline-v5.11-rc1
|
|
commit a36fadb17c27b4b5360db69acc80f5f4ad8dde7e
|
|
category: feature
|
|
bugzilla: https://gitee.com/openeuler/kernel/issues/I8C0CX
|
|
|
|
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=a36fadb17c27b4b5360db69acc80f5f4ad8dde7e
|
|
|
|
----------------------------------------------------------------------
|
|
|
|
Currently printing metricgroups for core- or uncore-based events matched
|
|
by CPUID is supported.
|
|
|
|
Extend this for system events.
|
|
|
|
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-9-git-send-email-john.garry@huawei.com
|
|
[ Reorder 'struct metricgroup_print_sys_idata' field to avoid alignment holes ]
|
|
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
|
|
Signed-off-by: hongrongxuan <hongrongxuan@huawei.com>
|
|
---
|
|
tools/perf/util/metricgroup.c | 64 ++++++++++++++++++++++++++++++++---
|
|
1 file changed, 60 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c
|
|
index 3ebd9190a87b..db5224115fe5 100644
|
|
--- a/tools/perf/util/metricgroup.c
|
|
+++ b/tools/perf/util/metricgroup.c
|
|
@@ -565,6 +565,49 @@ static int metricgroup__print_pmu_event(struct pmu_event *pe,
|
|
return 0;
|
|
}
|
|
|
|
+struct metricgroup_print_sys_idata {
|
|
+ struct strlist *metriclist;
|
|
+ char *filter;
|
|
+ struct rblist *groups;
|
|
+ bool metricgroups;
|
|
+ bool raw;
|
|
+ bool details;
|
|
+};
|
|
+
|
|
+typedef int (*metricgroup_sys_event_iter_fn)(struct pmu_event *pe, void *);
|
|
+
|
|
+struct metricgroup_iter_data {
|
|
+ metricgroup_sys_event_iter_fn fn;
|
|
+ void *data;
|
|
+};
|
|
+
|
|
+static int metricgroup__sys_event_iter(struct pmu_event *pe, void *data)
|
|
+{
|
|
+ struct metricgroup_iter_data *d = data;
|
|
+ struct perf_pmu *pmu = NULL;
|
|
+
|
|
+ if (!pe->metric_expr || !pe->compat)
|
|
+ return 0;
|
|
+
|
|
+ while ((pmu = perf_pmu__scan(pmu))) {
|
|
+
|
|
+ if (!pmu->id || strcmp(pmu->id, pe->compat))
|
|
+ continue;
|
|
+
|
|
+ return d->fn(pe, d->data);
|
|
+ }
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static int metricgroup__print_sys_event_iter(struct pmu_event *pe, void *data)
|
|
+{
|
|
+ struct metricgroup_print_sys_idata *d = data;
|
|
+
|
|
+ return metricgroup__print_pmu_event(pe, d->metricgroups, d->filter, d->raw,
|
|
+ d->details, d->groups, d->metriclist);
|
|
+}
|
|
+
|
|
void metricgroup__print(bool metrics, bool metricgroups, char *filter,
|
|
bool raw, bool details)
|
|
{
|
|
@@ -575,9 +618,6 @@ void metricgroup__print(bool metrics, bool metricgroups, char *filter,
|
|
struct rb_node *node, *next;
|
|
struct strlist *metriclist = NULL;
|
|
|
|
- if (!map)
|
|
- return;
|
|
-
|
|
if (!metricgroups) {
|
|
metriclist = strlist__new(NULL, NULL);
|
|
if (!metriclist)
|
|
@@ -588,7 +628,7 @@ void metricgroup__print(bool metrics, bool metricgroups, char *filter,
|
|
groups.node_new = mep_new;
|
|
groups.node_cmp = mep_cmp;
|
|
groups.node_delete = mep_delete;
|
|
- for (i = 0; ; i++) {
|
|
+ for (i = 0; map; i++) {
|
|
pe = &map->table[i];
|
|
|
|
if (!pe->name && !pe->metric_group && !pe->metric_name)
|
|
@@ -601,6 +641,22 @@ void metricgroup__print(bool metrics, bool metricgroups, char *filter,
|
|
return;
|
|
}
|
|
|
|
+ {
|
|
+ struct metricgroup_iter_data data = {
|
|
+ .fn = metricgroup__print_sys_event_iter,
|
|
+ .data = (void *) &(struct metricgroup_print_sys_idata){
|
|
+ .metriclist = metriclist,
|
|
+ .metricgroups = metricgroups,
|
|
+ .filter = filter,
|
|
+ .raw = raw,
|
|
+ .details = details,
|
|
+ .groups = &groups,
|
|
+ },
|
|
+ };
|
|
+
|
|
+ pmu_for_each_sys_event(metricgroup__sys_event_iter, &data);
|
|
+ }
|
|
+
|
|
if (!filter || !rblist__empty(&groups)) {
|
|
if (metricgroups && !raw)
|
|
printf("\nMetric Groups:\n\n");
|
|
--
|
|
2.27.0
|
|
|