perf stat: Use aggregated counts directly

The ps->res_stats is for repeated runs, so the interval code should
not touch it.  Actually the aggregated counts are available in the
counter->counts->aggr, so we can (and should) use it directly IMHO.

No functional change intended.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Acked-by: Jiri Olsa <jolsa@redhat.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Jin Yao <yao.jin@linux.intel.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lore.kernel.org/lkml/20210423023833.1430520-1-namhyung@kernel.org
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 a76fff5..b759dfd 100644 (file)
--- a/tools/perf/util/stat-display.c
+++ b/tools/perf/util/stat-display.c
@@ -827,11 +827,11 @@ static void counter_aggr_cb(struct perf_stat_config *config __maybe_unused,
                            bool first __maybe_unused)
 {
        struct caggr_data *cd = data;
-       struct perf_stat_evsel *ps = counter->stats;
+       struct perf_counts_values *aggr = &counter->counts->aggr;
 
-       cd->avg += avg_stats(&ps->res_stats[0]);
-       cd->avg_enabled += avg_stats(&ps->res_stats[1]);
-       cd->avg_running += avg_stats(&ps->res_stats[2]);
+       cd->avg += aggr->val;
+       cd->avg_enabled += aggr->ena;
+       cd->avg_running += aggr->run;
 }
 
 /*

diff --git a/tools/perf/util/stat.c b/tools/perf/util/stat.c
index 2db46b9..d3ec262 100644 (file)
--- a/tools/perf/util/stat.c
+++ b/tools/perf/util/stat.c
@@ -437,18 +437,6 @@ int perf_stat_process_counter(struct perf_stat_config *config,
 
        aggr->val = aggr->ena = aggr->run = 0;
 
-       /*
-        * We calculate counter's data every interval,
-        * and the display code shows ps->res_stats
-        * avg value. We need to zero the stats for
-        * interval mode, otherwise overall avg running
-        * averages will be shown for each interval.
-        */
-       if (config->interval || config->summary) {
-               for (i = 0; i < 3; i++)
-                       init_stats(&ps->res_stats[i]);
-       }
-
        if (counter->per_pkg)
                evsel__zero_per_pkg(counter);