Re: [PATCH] perf stat: Use aggregated counts directly

[Namhyung Kim]

On Mon, Apr 26, 2021 at 12:50 AM Jiri Olsa <jolsa@xxxxxxxxxx> wrote:
>
> On Thu, Apr 22, 2021 at 07:38:33PM -0700, Namhyung Kim wrote:
> > 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.
>
> it looks ok, but it should fix the noise output then, right?

Yeah, but only if -r and -I options are used at the same time.

>
> Acked-by: Jiri Olsa <jolsa@xxxxxxxxxx>

Thanks,
Namhyung

>
> >
> > Signed-off-by: Namhyung Kim <namhyung@xxxxxxxxxx>
> > ---
> >  tools/perf/util/stat-display.c |  8 ++++----
> >  tools/perf/util/stat.c         | 12 ------------
> >  2 files changed, 4 insertions(+), 16 deletions(-)
> >
> > diff --git a/tools/perf/util/stat-display.c b/tools/perf/util/stat-display.c
> > index d3137bc17065..a38fa6527586 100644
> > --- a/tools/perf/util/stat-display.c
> > +++ b/tools/perf/util/stat-display.c
> > @@ -807,11 +807,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 2db46b9bebd0..d3ec2624e036 100644
> > --- 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);
> >
> > --
> > 2.31.1.498.g6c1eba8ee3d-goog
> >
>