* [PATCH] perf stat: Use aggregated counts directly
@ 2021-04-23 2:38 Namhyung Kim
2021-04-25 15:50 ` Jiri Olsa
0 siblings, 1 reply; 5+ messages in thread
From: Namhyung Kim @ 2021-04-23 2:38 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo, Jiri Olsa
Cc: Ingo Molnar, Peter Zijlstra, Mark Rutland, Alexander Shishkin,
LKML, Andi Kleen, Ian Rogers, Jin Yao
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>
---
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] perf stat: Use aggregated counts directly
2021-04-23 2:38 [PATCH] perf stat: Use aggregated counts directly Namhyung Kim
@ 2021-04-25 15:50 ` Jiri Olsa
2021-04-25 18:00 ` Namhyung Kim
0 siblings, 1 reply; 5+ messages in thread
From: Jiri Olsa @ 2021-04-25 15:50 UTC (permalink / raw)
To: Namhyung Kim
Cc: Arnaldo Carvalho de Melo, Ingo Molnar, Peter Zijlstra,
Mark Rutland, Alexander Shishkin, LKML, Andi Kleen, Ian Rogers,
Jin Yao
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?
Acked-by: Jiri Olsa <jolsa@redhat.com>
thanks,
jirka
>
> Signed-off-by: Namhyung Kim <namhyung@kernel.org>
> ---
> 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
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] perf stat: Use aggregated counts directly
2021-04-25 15:50 ` Jiri Olsa
@ 2021-04-25 18:00 ` Namhyung Kim
2021-05-03 21:27 ` Namhyung Kim
0 siblings, 1 reply; 5+ messages in thread
From: Namhyung Kim @ 2021-04-25 18:00 UTC (permalink / raw)
To: Jiri Olsa
Cc: Arnaldo Carvalho de Melo, Ingo Molnar, Peter Zijlstra,
Mark Rutland, Alexander Shishkin, LKML, Andi Kleen, Ian Rogers,
Jin Yao
On Mon, Apr 26, 2021 at 12:50 AM Jiri Olsa <jolsa@redhat.com> 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@redhat.com>
Thanks,
Namhyung
>
> >
> > Signed-off-by: Namhyung Kim <namhyung@kernel.org>
> > ---
> > 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
> >
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] perf stat: Use aggregated counts directly
2021-04-25 18:00 ` Namhyung Kim
@ 2021-05-03 21:27 ` Namhyung Kim
2021-05-04 12:37 ` Arnaldo Carvalho de Melo
0 siblings, 1 reply; 5+ messages in thread
From: Namhyung Kim @ 2021-05-03 21:27 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo
Cc: Ingo Molnar, Peter Zijlstra, Mark Rutland, Alexander Shishkin,
LKML, Andi Kleen, Ian Rogers, Jin Yao, Jiri Olsa
Hi Arnaldo,
I'm not sure it's in your tree, can you please take a look and merge it?
Thanks,
Namhyung
On Sun, Apr 25, 2021 at 11:00 AM Namhyung Kim <namhyung@kernel.org> wrote:
>
> On Mon, Apr 26, 2021 at 12:50 AM Jiri Olsa <jolsa@redhat.com> 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@redhat.com>
>
> Thanks,
> Namhyung
>
> >
> > >
> > > Signed-off-by: Namhyung Kim <namhyung@kernel.org>
> > > ---
> > > 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
> > >
> >
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] perf stat: Use aggregated counts directly
2021-05-03 21:27 ` Namhyung Kim
@ 2021-05-04 12:37 ` Arnaldo Carvalho de Melo
0 siblings, 0 replies; 5+ messages in thread
From: Arnaldo Carvalho de Melo @ 2021-05-04 12:37 UTC (permalink / raw)
To: Namhyung Kim
Cc: Ingo Molnar, Peter Zijlstra, Mark Rutland, Alexander Shishkin,
LKML, Andi Kleen, Ian Rogers, Jin Yao, Jiri Olsa
Em Mon, May 03, 2021 at 02:27:36PM -0700, Namhyung Kim escreveu:
> Hi Arnaldo,
>
> I'm not sure it's in your tree, can you please take a look and merge it?
Thanks, applied.
- Arnaldo
> Thanks,
> Namhyung
>
> On Sun, Apr 25, 2021 at 11:00 AM Namhyung Kim <namhyung@kernel.org> wrote:
> >
> > On Mon, Apr 26, 2021 at 12:50 AM Jiri Olsa <jolsa@redhat.com> 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@redhat.com>
> >
> > Thanks,
> > Namhyung
> >
> > >
> > > >
> > > > Signed-off-by: Namhyung Kim <namhyung@kernel.org>
> > > > ---
> > > > 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
> > > >
> > >
--
- Arnaldo
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-05-04 12:37 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-23 2:38 [PATCH] perf stat: Use aggregated counts directly Namhyung Kim
2021-04-25 15:50 ` Jiri Olsa
2021-04-25 18:00 ` Namhyung Kim
2021-05-03 21:27 ` Namhyung Kim
2021-05-04 12:37 ` Arnaldo Carvalho de Melo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).