117 lines
4.0 KiB
Diff
117 lines
4.0 KiB
Diff
From 7d56affe37448a05c6dc70ea14dd25980bf90a97 Mon Sep 17 00:00:00 2001
|
|
From: Jiri Olsa <jolsa@kernel.org>
|
|
Date: Tue, 9 Jun 2020 12:57:47 -0300
|
|
Subject: [PATCH 098/201] perf tools: Add map to parse_groups() function
|
|
|
|
mainline inclusion
|
|
from mainline-v5.9-rc1
|
|
commit 1381396b0b778c918bf191b1960f92fbd563476d
|
|
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=1381396b0b778c918bf191b1960f92fbd563476d
|
|
|
|
----------------------------------------------------------------------
|
|
|
|
For testing purposes we need to pass our own map of events from
|
|
parse_groups() through metricgroup__add_metric.
|
|
|
|
Acked-by: Ian Rogers <irogers@google.com>
|
|
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
|
|
Cc: Andi Kleen <ak@linux.intel.com>
|
|
Cc: Ingo Molnar <mingo@kernel.org>
|
|
Cc: Michael Petlan <mpetlan@redhat.com>
|
|
Cc: Namhyung Kim <namhyung@kernel.org>
|
|
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
|
|
Cc: Stephane Eranian <eranian@google.com>
|
|
Link: http://lore.kernel.org/lkml/20200602214741.1218986-8-jolsa@kernel.org
|
|
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
|
|
Signed-off-by: hongrongxuan <hongrongxuan@huawei.com>
|
|
|
|
Conflicts:
|
|
tools/perf/util/metricgroup.c
|
|
---
|
|
tools/perf/util/metricgroup.c | 23 +++++++++++++----------
|
|
1 file changed, 13 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c
|
|
index 9fa47eb1b968..b3feb3b5cd99 100644
|
|
--- a/tools/perf/util/metricgroup.c
|
|
+++ b/tools/perf/util/metricgroup.c
|
|
@@ -604,17 +604,14 @@ static int __metricgroup__add_metric(struct list_head *group_list,
|
|
|
|
static int metricgroup__add_metric(const char *metric, bool metric_no_group,
|
|
struct strbuf *events,
|
|
- struct list_head *group_list)
|
|
+ struct list_head *group_list,
|
|
+ struct pmu_events_map *map)
|
|
{
|
|
- struct pmu_events_map *map = perf_pmu__find_map(NULL);
|
|
struct pmu_event *pe;
|
|
struct egroup *eg;
|
|
int i, ret;
|
|
bool has_match = false;
|
|
|
|
- if (!map)
|
|
- return 0;
|
|
-
|
|
for (i = 0; ; i++) {
|
|
pe = &map->table[i];
|
|
|
|
@@ -675,7 +672,8 @@ static int metricgroup__add_metric(const char *metric, bool metric_no_group,
|
|
|
|
static int metricgroup__add_metric_list(const char *list, bool metric_no_group,
|
|
struct strbuf *events,
|
|
- struct list_head *group_list)
|
|
+ struct list_head *group_list,
|
|
+ struct pmu_events_map *map)
|
|
{
|
|
char *llist, *nlist, *p;
|
|
int ret = -EINVAL;
|
|
@@ -690,7 +688,7 @@ static int metricgroup__add_metric_list(const char *list, bool metric_no_group,
|
|
|
|
while ((p = strsep(&llist, ",")) != NULL) {
|
|
ret = metricgroup__add_metric(p, metric_no_group, events,
|
|
- group_list);
|
|
+ group_list, map);
|
|
if (ret == -EINVAL) {
|
|
fprintf(stderr, "Cannot find metric or group `%s'\n",
|
|
p);
|
|
@@ -720,7 +718,8 @@ static int parse_groups(struct perf_evlist *perf_evlist, const char *str,
|
|
bool metric_no_group,
|
|
bool metric_no_merge,
|
|
struct perf_pmu *fake_pmu,
|
|
- struct rblist *metric_events)
|
|
+ struct rblist *metric_events,
|
|
+ struct pmu_events_map *map)
|
|
{
|
|
struct parse_events_error parse_error;
|
|
struct strbuf extra_events;
|
|
@@ -730,7 +729,7 @@ static int parse_groups(struct perf_evlist *perf_evlist, const char *str,
|
|
if (metric_events->nr_entries == 0)
|
|
metricgroup__rblist_init(metric_events);
|
|
ret = metricgroup__add_metric_list(str, metric_no_group,
|
|
- &extra_events, &group_list);
|
|
+ &extra_events, &group_list, map);
|
|
if (ret)
|
|
return ret;
|
|
pr_debug("adding %s\n", extra_events.buf);
|
|
@@ -755,9 +754,13 @@ int metricgroup__parse_groups(const struct option *opt,
|
|
struct rblist *metric_events)
|
|
{
|
|
struct perf_evlist *perf_evlist = *(struct perf_evlist **)opt->value;
|
|
+ struct pmu_events_map *map = perf_pmu__find_map(NULL);
|
|
+
|
|
+ if (!map)
|
|
+ return 0;
|
|
|
|
return parse_groups(perf_evlist, str, metric_no_group,
|
|
- metric_no_merge, NULL, metric_events);
|
|
+ metric_no_merge, NULL, metric_events, map);
|
|
}
|
|
|
|
bool metricgroup__has_metric(const char *metric)
|
|
--
|
|
2.27.0
|
|
|