perf stat: Correct first_shadow_cpu to return index

perf_stat__update_shadow_stats() and perf_stat__print_shadow_stats() use
a cpu map index rather than a CPU, but first_shadow_cpu is returning the
wrong value for this. Change first_shadow_cpu to
first_shadow_cpu_map_idx to make things agree.

Signed-off-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@redhat.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: John Garry <john.garry@huawei.com>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: Mike Leach <mike.leach@linaro.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Clarke <pc@us.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Riccardo Mancini <rickyman7@gmail.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: Suzuki Poulouse <suzuki.poulose@arm.com>
Cc: Vineet Singh <vineet.singh@intel.com>
Cc: coresight@lists.linaro.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: zhengjun.xing@intel.com
Link: https://lore.kernel.org/r/20220105061351.120843-48-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/util/stat-display.c b/tools/perf/util/stat-display.c
index 0f19236..ba95379 100644 (file)
--- a/tools/perf/util/stat-display.c
+++ b/tools/perf/util/stat-display.c
@@ -327,24 +327,23 @@ static void print_metric_header(struct perf_stat_config *config,
                fprintf(os->fh, "%*s ", config->metric_only_len, unit);
 }
 
-static int first_shadow_cpu(struct perf_stat_config *config,
-                           struct evsel *evsel, const struct aggr_cpu_id *id)
+static int first_shadow_cpu_map_idx(struct perf_stat_config *config,
+                               struct evsel *evsel, const struct aggr_cpu_id *id)
 {
-       struct perf_cpu_map *cpus;
+       struct perf_cpu_map *cpus = evsel__cpus(evsel);
        int cpu, idx;
 
        if (config->aggr_mode == AGGR_NONE)
-               return id->cpu;
+               return perf_cpu_map__idx(cpus, id->cpu);
 
        if (!config->aggr_get_id)
                return 0;
 
-       cpus = evsel__cpus(evsel);
        perf_cpu_map__for_each_cpu(cpu, idx, cpus) {
                struct aggr_cpu_id cpu_id = config->aggr_get_id(config, cpu);
 
                if (aggr_cpu_id__equal(&cpu_id, id))
-                       return cpu;
+                       return idx;
        }
        return 0;
 }
@@ -503,7 +502,7 @@ static void printout(struct perf_stat_config *config, struct aggr_cpu_id id, int
        }
 
        perf_stat__print_shadow_stats(config, counter, uval,
-                               first_shadow_cpu(config, counter, &id),
+                               first_shadow_cpu_map_idx(config, counter, &id),
                                &out, &config->metric_events, st);
        if (!config->csv_output && !config->metric_only) {
                print_noise(config, counter, noise);
@@ -532,7 +531,7 @@ static void aggr_update_shadow(struct perf_stat_config *config,
                                val += perf_counts(counter->counts, idx, 0)->val;
                        }
                        perf_stat__update_shadow_stats(counter, val,
-                                       first_shadow_cpu(config, counter, &id),
+                                       first_shadow_cpu_map_idx(config, counter, &id),
                                        &rt_stat);
                }
        }