Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-23 12:42:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

perf metric: Fix metric_leader

Browse Source 
Multiple events may have a metric_leader to aggregate into.

This happens for uncore events where, for example, uncore_imc is
expanded into uncore_imc_0, uncore_imc_1, etc.

Such events all have the same metric_id and should aggregate into the
first event.

The change introducing metric_ids had a bug where the metric_id was
compared to itself, creating an always true condition.

Correct this by comparing the event in the metric_evlist and the
metric_leader.

Fixes: ec5c5b3d2c ("perf metric: Encode and use metric-id as qualifier")
Signed-off-by: Ian Rogers <irogers@google.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: John Garry <john.garry@huawei.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lore.kernel.org/lkml/20220115062852.1959424-1-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Ian Rogers 2022-01-14 22:28:52 -08:00 committed by Arnaldo Carvalho de Melo
parent a6e6274362
commit d3e2bb4359
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/perf/util/metricgroup.c
View File

@ -314,7 +314,7 @@ static int setup_metric_events(struct hashmap *ids,
*/ */
metric_id = evsel__metric_id(ev); metric_id = evsel__metric_id(ev);
evlist__for_each_entry_continue(metric_evlist, ev) { evlist__for_each_entry_continue(metric_evlist, ev) {
if (!strcmp(evsel__metric_id(metric_events[i]), metric_id)) if (!strcmp(evsel__metric_id(ev), metric_id))
ev->metric_leader = metric_events[i]; ev->metric_leader = metric_events[i];
} }
} }