[PATCH v2 0/2] perf stat: Support overall statistics for interval mode

[PATCH v2 0/2] perf stat: Support overall statistics for interval mode

[Jin Yao]

Currently perf-stat supports to print counts at regular interval (-I),
but it's not very easy for user to get the overall statistics.

With this patchset, it supports to report the summary at the end of
interval output.

For example,

 root@kbl-ppc:~# perf stat -e cycles -I1000 --interval-count 2
 #           time             counts unit events
      1.000412064          2,281,114      cycles
      2.001383658          2,547,880      cycles

  Performance counter stats for 'system wide':

          4,828,994      cycles

        2.002860349 seconds time elapsed

 root@kbl-ppc:~# perf stat -e cycles,instructions -I1000 --interval-count 2
 #           time             counts unit events
      1.000389902          1,536,093      cycles
      1.000389902            420,226      instructions              #    0.27  insn per cycle
      2.001433453          2,213,952      cycles
      2.001433453            735,465      instructions              #    0.33  insn per cycle

  Performance counter stats for 'system wide':

          3,750,045      cycles
          1,155,691      instructions              #    0.31  insn per cycle

        2.003023361 seconds time elapsed

 root@kbl-ppc:~# perf stat -M CPI,IPC -I1000 --interval-count 2
 #           time             counts unit events
      1.000435121            905,303      inst_retired.any          #      2.9 CPI
      1.000435121          2,663,333      cycles
      1.000435121            914,702      inst_retired.any          #      0.3 IPC
      1.000435121          2,676,559      cpu_clk_unhalted.thread
      2.001615941          1,951,092      inst_retired.any          #      1.8 CPI
      2.001615941          3,551,357      cycles
      2.001615941          1,950,837      inst_retired.any          #      0.5 IPC
      2.001615941          3,551,044      cpu_clk_unhalted.thread

  Performance counter stats for 'system wide':

          2,856,395      inst_retired.any          #      2.2 CPI
          6,214,690      cycles
          2,865,539      inst_retired.any          #      0.5 IPC
          6,227,603      cpu_clk_unhalted.thread

        2.003403078 seconds time elapsed

 v2:
 ---
 Rebase to perf/core branch

Jin Yao (2):
  perf evsel: Create counts for collecting summary data
  perf stat: Report summary for interval mode

 tools/perf/builtin-stat.c | 14 ++++++-
 tools/perf/util/evsel.c   | 10 ++++-
 tools/perf/util/evsel.h   |  1 +
 tools/perf/util/stat.c    | 77 +++++++++++++++++++++++++++++++++++++++
 tools/perf/util/stat.h    |  5 +++
 5 files changed, 103 insertions(+), 4 deletions(-)

-- 
2.17.1

[PATCH v2 1/2] perf evsel: Create counts for collecting summary data

[Jin Yao]

It would be useful to support the overall statistics for perf-stat
interval mode. For example, report the summary at the end of
"perf-stat -I" output.

But since perf-stat can support many aggregation modes, such as
--per-thread, --per-socket, -M and etc, we need a solution which
doesn't bring much complexity.

The idea is to create new 'evsel->summary_counts' which sums up the
counts delta per interval. Before reporting the summary, we copy the
data from evsel->summary_counts to evsel->counts, and next we just
follow current code.

 v2:
 ---
 Rebase to perf/core branch

Signed-off-by: Jin Yao <yao.jin@linux.intel.com>
---
 tools/perf/util/evsel.c | 10 ++++++++--
 tools/perf/util/evsel.h |  1 +
 tools/perf/util/stat.c  | 20 ++++++++++++++++++++
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index a75bcb95bf23..abc503dd6eda 100644
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -1280,22 +1280,28 @@ void evsel__delete(struct evsel *evsel)
 void evsel__compute_deltas(struct evsel *evsel, int cpu, int thread,
 			   struct perf_counts_values *count)
 {
-	struct perf_counts_values tmp;
+	struct perf_counts_values tmp, *summary;
 
-	if (!evsel->prev_raw_counts)
+	if (!evsel->prev_raw_counts || !evsel->summary_counts)
 		return;
 
 	if (cpu == -1) {
 		tmp = evsel->prev_raw_counts->aggr;
 		evsel->prev_raw_counts->aggr = *count;
+		summary = &evsel->summary_counts->aggr;
 	} else {
 		tmp = *perf_counts(evsel->prev_raw_counts, cpu, thread);
 		*perf_counts(evsel->prev_raw_counts, cpu, thread) = *count;
+		summary = perf_counts(evsel->summary_counts, cpu, thread);
 	}
 
 	count->val = count->val - tmp.val;
 	count->ena = count->ena - tmp.ena;
 	count->run = count->run - tmp.run;
+
+	summary->val += count->val;
+	summary->ena += count->ena;
+	summary->run += count->run;
 }
 
 void perf_counts_values__scale(struct perf_counts_values *count,
diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h
index 783246bf8d0d..430639c99d04 100644
--- a/tools/perf/util/evsel.h
+++ b/tools/perf/util/evsel.h
@@ -46,6 +46,7 @@ struct evsel {
 	char			*filter;
 	struct perf_counts	*counts;
 	struct perf_counts	*prev_raw_counts;
+	struct perf_counts	*summary_counts;
 	int			idx;
 	unsigned long		max_events;
 	unsigned long		nr_events_printed;
diff --git a/tools/perf/util/stat.c b/tools/perf/util/stat.c
index 774468341851..c3fd008b4e84 100644
--- a/tools/perf/util/stat.c
+++ b/tools/perf/util/stat.c
@@ -171,6 +171,24 @@ static void perf_evsel__reset_prev_raw_counts(struct evsel *evsel)
        }
 }
 
+static int perf_evsel__alloc_summary_counts(struct evsel *evsel,
+					    int ncpus, int nthreads)
+{
+	struct perf_counts *counts;
+
+	counts = perf_counts__new(ncpus, nthreads);
+	if (counts)
+		evsel->summary_counts = counts;
+
+	return counts ? 0 : -ENOMEM;
+}
+
+static void perf_evsel__free_summary_counts(struct evsel *evsel)
+{
+	perf_counts__delete(evsel->summary_counts);
+	evsel->summary_counts = NULL;
+}
+
 static int perf_evsel__alloc_stats(struct evsel *evsel, bool alloc_raw)
 {
 	int ncpus = evsel__nr_cpus(evsel);
@@ -178,6 +196,7 @@ static int perf_evsel__alloc_stats(struct evsel *evsel, bool alloc_raw)
 
 	if (perf_evsel__alloc_stat_priv(evsel) < 0 ||
 	    perf_evsel__alloc_counts(evsel, ncpus, nthreads) < 0 ||
+	    perf_evsel__alloc_summary_counts(evsel, ncpus, nthreads) < 0 ||
 	    (alloc_raw && perf_evsel__alloc_prev_raw_counts(evsel, ncpus, nthreads) < 0))
 		return -ENOMEM;
 
@@ -208,6 +227,7 @@ void perf_evlist__free_stats(struct evlist *evlist)
 		perf_evsel__free_stat_priv(evsel);
 		perf_evsel__free_counts(evsel);
 		perf_evsel__free_prev_raw_counts(evsel);
+		perf_evsel__free_summary_counts(evsel);
 	}
 }
 
-- 
2.17.1

Re: [PATCH v2 1/2] perf evsel: Create counts for collecting summary data

[Jiri Olsa]

On Sat, May 02, 2020 at 10:07:04AM +0800, Jin Yao wrote:
> It would be useful to support the overall statistics for perf-stat
> interval mode. For example, report the summary at the end of
> "perf-stat -I" output.
> 
> But since perf-stat can support many aggregation modes, such as
> --per-thread, --per-socket, -M and etc, we need a solution which
> doesn't bring much complexity.
> 
> The idea is to create new 'evsel->summary_counts' which sums up the
> counts delta per interval. Before reporting the summary, we copy the
> data from evsel->summary_counts to evsel->counts, and next we just
> follow current code.
> 
>  v2:
>  ---
>  Rebase to perf/core branch
> 
> Signed-off-by: Jin Yao <yao.jin@linux.intel.com>
> ---
>  tools/perf/util/evsel.c | 10 ++++++++--
>  tools/perf/util/evsel.h |  1 +
>  tools/perf/util/stat.c  | 20 ++++++++++++++++++++
>  3 files changed, 29 insertions(+), 2 deletions(-)
> 
> diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
> index a75bcb95bf23..abc503dd6eda 100644
> --- a/tools/perf/util/evsel.c
> +++ b/tools/perf/util/evsel.c
> @@ -1280,22 +1280,28 @@ void evsel__delete(struct evsel *evsel)
>  void evsel__compute_deltas(struct evsel *evsel, int cpu, int thread,
>  			   struct perf_counts_values *count)
>  {
> -	struct perf_counts_values tmp;
> +	struct perf_counts_values tmp, *summary;
>  
> -	if (!evsel->prev_raw_counts)
> +	if (!evsel->prev_raw_counts || !evsel->summary_counts)
>  		return;
>  
>  	if (cpu == -1) {
>  		tmp = evsel->prev_raw_counts->aggr;
>  		evsel->prev_raw_counts->aggr = *count;
> +		summary = &evsel->summary_counts->aggr;
>  	} else {
>  		tmp = *perf_counts(evsel->prev_raw_counts, cpu, thread);
>  		*perf_counts(evsel->prev_raw_counts, cpu, thread) = *count;
> +		summary = perf_counts(evsel->summary_counts, cpu, thread);

shouldn't this be enough?

		perf_counts(evsel->summary_counts, cpu, thread) = *count

without the code below.. and similar for aggr case

however I still wonder if we should count this in
perf_stat_process_counter and only for interval mode

>  	}
>  
>  	count->val = count->val - tmp.val;
>  	count->ena = count->ena - tmp.ena;
>  	count->run = count->run - tmp.run;
> +
> +	summary->val += count->val;
> +	summary->ena += count->ena;
> +	summary->run += count->run;
>  }
>  
>  void perf_counts_values__scale(struct perf_counts_values *count,
> diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h
> index 783246bf8d0d..430639c99d04 100644
> --- a/tools/perf/util/evsel.h
> +++ b/tools/perf/util/evsel.h
> @@ -46,6 +46,7 @@ struct evsel {
>  	char			*filter;
>  	struct perf_counts	*counts;
>  	struct perf_counts	*prev_raw_counts;
> +	struct perf_counts	*summary_counts;

'sum_counts' might be better

jirka

>  	int			idx;
>  	unsigned long		max_events;
>  	unsigned long		nr_events_printed;
> diff --git a/tools/perf/util/stat.c b/tools/perf/util/stat.c
> index 774468341851..c3fd008b4e84 100644
> --- a/tools/perf/util/stat.c

SNIP

Re: [PATCH v2 1/2] perf evsel: Create counts for collecting summary data

[Jin, Yao]

Hi Jiri,

On 5/5/2020 7:50 AM, Jiri Olsa wrote:
> On Sat, May 02, 2020 at 10:07:04AM +0800, Jin Yao wrote:
>> It would be useful to support the overall statistics for perf-stat
>> interval mode. For example, report the summary at the end of
>> "perf-stat -I" output.
>>
>> But since perf-stat can support many aggregation modes, such as
>> --per-thread, --per-socket, -M and etc, we need a solution which
>> doesn't bring much complexity.
>>
>> The idea is to create new 'evsel->summary_counts' which sums up the
>> counts delta per interval. Before reporting the summary, we copy the
>> data from evsel->summary_counts to evsel->counts, and next we just
>> follow current code.
>>
>>   v2:
>>   ---
>>   Rebase to perf/core branch
>>
>> Signed-off-by: Jin Yao <yao.jin@linux.intel.com>
>> ---
>>   tools/perf/util/evsel.c | 10 ++++++++--
>>   tools/perf/util/evsel.h |  1 +
>>   tools/perf/util/stat.c  | 20 ++++++++++++++++++++
>>   3 files changed, 29 insertions(+), 2 deletions(-)
>>
>> diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
>> index a75bcb95bf23..abc503dd6eda 100644
>> --- a/tools/perf/util/evsel.c
>> +++ b/tools/perf/util/evsel.c
>> @@ -1280,22 +1280,28 @@ void evsel__delete(struct evsel *evsel)
>>   void evsel__compute_deltas(struct evsel *evsel, int cpu, int thread,
>>   			   struct perf_counts_values *count)
>>   {
>> -	struct perf_counts_values tmp;
>> +	struct perf_counts_values tmp, *summary;
>>   
>> -	if (!evsel->prev_raw_counts)
>> +	if (!evsel->prev_raw_counts || !evsel->summary_counts)
>>   		return;
>>   
>>   	if (cpu == -1) {
>>   		tmp = evsel->prev_raw_counts->aggr;
>>   		evsel->prev_raw_counts->aggr = *count;
>> +		summary = &evsel->summary_counts->aggr;
>>   	} else {
>>   		tmp = *perf_counts(evsel->prev_raw_counts, cpu, thread);
>>   		*perf_counts(evsel->prev_raw_counts, cpu, thread) = *count;
>> +		summary = perf_counts(evsel->summary_counts, cpu, thread);
> 
> shouldn't this be enough?
> 
> 		perf_counts(evsel->summary_counts, cpu, thread) = *count
> 
> without the code below.. and similar for aggr case
> however I still wonder if we should count this in
> perf_stat_process_counter and only for interval mode
>

Actually I have an easier way, which just resets the prev_raw counters. For example,

@@ -724,6 +727,12 @@ static int __run_perf_stat(int argc, const char **argv, int 
run_idx)

         update_stats(&walltime_nsecs_stats, t1 - t0);

+       if (interval) {
+               stat_config.interval = 0;
+               stat_config.summary = true;
+               perf_evlist__reset_prev_raw_counts(evsel_list);
+       }
+
         /*
          * Closing a group leader splits the group, and as we only disable
          * group leaders, results in remaining events becoming enabled. To

But if we just directly copy from current counts, the summary result looks a bit 
confused.

For example,

root@kbl-ppc:/# perf stat -e cycles -I1000 --interval-count 2
#           time             counts unit events
      1.000402302          2,943,521      cycles
      2.001333982          2,146,165      cycles

  Performance counter stats for 'system wide':

          5,880,031      cycles

        2.002805025 seconds time elapsed

2,943,521 + 2,146,165 != 5,880,031

That's because the counter is still enabled after interval printing. So at the 
time of printing summary, the counts are sightly increased. User may be confused 
for the summary result (why it's not equal to the sum of interval values?).

>>   	}
>>   
>>   	count->val = count->val - tmp.val;
>>   	count->ena = count->ena - tmp.ena;
>>   	count->run = count->run - tmp.run;
>> +
>> +	summary->val += count->val;
>> +	summary->ena += count->ena;
>> +	summary->run += count->run;
>>   }
>>   
>>   void perf_counts_values__scale(struct perf_counts_values *count,
>> diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h
>> index 783246bf8d0d..430639c99d04 100644
>> --- a/tools/perf/util/evsel.h
>> +++ b/tools/perf/util/evsel.h
>> @@ -46,6 +46,7 @@ struct evsel {
>>   	char			*filter;
>>   	struct perf_counts	*counts;
>>   	struct perf_counts	*prev_raw_counts;
>> +	struct perf_counts	*summary_counts;
> 
> 'sum_counts' might be better
> 

That's OK. :)

Thanks
Jin Yao

> jirka
> 
>>   	int			idx;
>>   	unsigned long		max_events;
>>   	unsigned long		nr_events_printed;
>> diff --git a/tools/perf/util/stat.c b/tools/perf/util/stat.c
>> index 774468341851..c3fd008b4e84 100644
>> --- a/tools/perf/util/stat.c
> 
> SNIP
> 

[PATCH v2 2/2] perf stat: Report summary for interval mode

[Jin Yao]

Currently perf-stat supports to print counts at regular interval (-I),
but it's not very easy for user to get the overall statistics.

The patch uses 'evsel->summary_counts' to sum up the per interval counts
and copy the counts to 'evsel->counts' after printing the interval results.
Next, we just follow the non-interval processing.

Let's see some examples,

 root@kbl-ppc:~# perf stat -e cycles -I1000 --interval-count 2
 #           time             counts unit events
      1.000412064          2,281,114      cycles
      2.001383658          2,547,880      cycles

  Performance counter stats for 'system wide':

          4,828,994      cycles

        2.002860349 seconds time elapsed

 root@kbl-ppc:~# perf stat -e cycles,instructions -I1000 --interval-count 2
 #           time             counts unit events
      1.000389902          1,536,093      cycles
      1.000389902            420,226      instructions              #    0.27  insn per cycle
      2.001433453          2,213,952      cycles
      2.001433453            735,465      instructions              #    0.33  insn per cycle

  Performance counter stats for 'system wide':

          3,750,045      cycles
          1,155,691      instructions              #    0.31  insn per cycle

        2.003023361 seconds time elapsed

 root@kbl-ppc:~# perf stat -M CPI,IPC -I1000 --interval-count 2
 #           time             counts unit events
      1.000435121            905,303      inst_retired.any          #      2.9 CPI
      1.000435121          2,663,333      cycles
      1.000435121            914,702      inst_retired.any          #      0.3 IPC
      1.000435121          2,676,559      cpu_clk_unhalted.thread
      2.001615941          1,951,092      inst_retired.any          #      1.8 CPI
      2.001615941          3,551,357      cycles
      2.001615941          1,950,837      inst_retired.any          #      0.5 IPC
      2.001615941          3,551,044      cpu_clk_unhalted.thread

  Performance counter stats for 'system wide':

          2,856,395      inst_retired.any          #      2.2 CPI
          6,214,690      cycles
          2,865,539      inst_retired.any          #      0.5 IPC
          6,227,603      cpu_clk_unhalted.thread

        2.003403078 seconds time elapsed

 v2:
 ---
 Rebase to perf/core branch

Signed-off-by: Jin Yao <yao.jin@linux.intel.com>
---
 tools/perf/builtin-stat.c | 14 ++++++++--
 tools/perf/util/stat.c    | 57 +++++++++++++++++++++++++++++++++++++++
 tools/perf/util/stat.h    |  5 ++++
 3 files changed, 74 insertions(+), 2 deletions(-)

diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index 92a59f08db71..8f3441f794d5 100644
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -355,6 +355,7 @@ static void read_counters(struct timespec *rs)
 static void process_interval(void)
 {
 	struct timespec ts, rs;
+	struct stats walltime_nsecs_stats_bak;
 
 	clock_gettime(CLOCK_MONOTONIC, &ts);
 	diff_timespec(&rs, &ts, &ref_time);
@@ -367,9 +368,11 @@ static void process_interval(void)
 			pr_err("failed to write stat round event\n");
 	}
 
+	walltime_nsecs_stats_bak = walltime_nsecs_stats;
 	init_stats(&walltime_nsecs_stats);
 	update_stats(&walltime_nsecs_stats, stat_config.interval * 1000000);
 	print_counters(&rs, 0, NULL);
+	walltime_nsecs_stats = walltime_nsecs_stats_bak;
 }
 
 static void enable_counters(void)
@@ -732,7 +735,14 @@ static int __run_perf_stat(int argc, const char **argv, int run_idx)
 	 * avoid arbitrary skew, we must read all counters before closing any
 	 * group leaders.
 	 */
-	read_counters(&(struct timespec) { .tv_nsec = t1-t0 });
+	if (!interval)
+		read_counters(&(struct timespec) { .tv_nsec = t1-t0 });
+	else {
+		stat_config.interval = 0;
+		stat_config.summary = true;
+		perf_evlist__copy_summary_counts(evsel_list);
+		perf_evlist__process_summary_counts(&stat_config, evsel_list);
+	}
 
 	/*
 	 * We need to keep evsel_list alive, because it's processed
@@ -2149,7 +2159,7 @@ int cmd_stat(int argc, const char **argv)
 		}
 	}
 
-	if (!forever && status != -1 && !interval)
+	if (!forever && status != -1 && (!interval || stat_config.summary))
 		print_counters(NULL, argc, argv);
 
 	if (STAT_RECORD) {
diff --git a/tools/perf/util/stat.c b/tools/perf/util/stat.c
index c3fd008b4e84..fdd1930c219c 100644
--- a/tools/perf/util/stat.c
+++ b/tools/perf/util/stat.c
@@ -249,6 +249,63 @@ void perf_evlist__reset_prev_raw_counts(struct evlist *evlist)
 		perf_evsel__reset_prev_raw_counts(evsel);
 }
 
+static void perf_evsel__copy_summary_counts(struct evsel *evsel)
+{
+	int ncpus = evsel__nr_cpus(evsel);
+	int nthreads = perf_thread_map__nr(evsel->core.threads);
+
+	for (int thread = 0; thread < nthreads; thread++) {
+		for (int cpu = 0; cpu < ncpus; cpu++) {
+			*perf_counts(evsel->counts, cpu, thread) =
+				*perf_counts(evsel->summary_counts, cpu, thread);
+		}
+	}
+
+	evsel->prev_raw_counts->aggr = evsel->summary_counts->aggr;
+}
+
+void perf_evlist__copy_summary_counts(struct evlist *evlist)
+{
+	struct evsel *evsel;
+
+	evlist__for_each_entry(evlist, evsel)
+		perf_evsel__copy_summary_counts(evsel);
+}
+
+static void perf_stat_process_summary_counts(struct perf_stat_config *config,
+					     struct evsel *evsel)
+{
+	struct perf_counts_values *summary = &evsel->summary_counts->aggr;
+	struct perf_stat_evsel *ps = evsel->stats;
+	u64 *count = evsel->summary_counts->aggr.values;
+	int i;
+
+	if (!config->summary || config->aggr_mode != AGGR_GLOBAL)
+		return;
+
+	for (i = 0; i < 3; i++)
+		init_stats(&ps->res_stats[i]);
+
+	perf_counts_values__scale(summary, config->scale,
+				  &evsel->summary_counts->scaled);
+
+	for (i = 0; i < 3; i++)
+		update_stats(&ps->res_stats[i], count[i]);
+
+	perf_stat__update_shadow_stats(evsel, *count, 0, &rt_stat);
+}
+
+void perf_evlist__process_summary_counts(struct perf_stat_config *config,
+					 struct evlist *evlist)
+{
+	struct evsel *evsel;
+
+	perf_stat__reset_shadow_per_stat(&rt_stat);
+
+	evlist__for_each_entry(evlist, evsel)
+		perf_stat_process_summary_counts(config, evsel);
+}
+
 static void zero_per_pkg(struct evsel *counter)
 {
 	if (counter->per_pkg_mask)
diff --git a/tools/perf/util/stat.h b/tools/perf/util/stat.h
index b4fdfaa7f2c0..bad7d7678148 100644
--- a/tools/perf/util/stat.h
+++ b/tools/perf/util/stat.h
@@ -110,6 +110,7 @@ struct perf_stat_config {
 	bool			 all_kernel;
 	bool			 all_user;
 	bool			 percore_show_thread;
+	bool			 summary;
 	FILE			*output;
 	unsigned int		 interval;
 	unsigned int		 timeout;
@@ -199,6 +200,10 @@ void perf_evlist__free_stats(struct evlist *evlist);
 void perf_evlist__reset_stats(struct evlist *evlist);
 void perf_evlist__reset_prev_raw_counts(struct evlist *evlist);
 
+void perf_evlist__copy_summary_counts(struct evlist *evlist);
+void perf_evlist__process_summary_counts(struct perf_stat_config *config,
+					 struct evlist *evlist);
+
 int perf_stat_process_counter(struct perf_stat_config *config,
 			      struct evsel *counter);
 struct perf_tool;
-- 
2.17.1

Re: [PATCH v2 2/2] perf stat: Report summary for interval mode

[Jiri Olsa]

On Sat, May 02, 2020 at 10:07:05AM +0800, Jin Yao wrote:

SNIP

>  	init_stats(&walltime_nsecs_stats);
>  	update_stats(&walltime_nsecs_stats, stat_config.interval * 1000000);
>  	print_counters(&rs, 0, NULL);
> +	walltime_nsecs_stats = walltime_nsecs_stats_bak;
>  }
>  
>  static void enable_counters(void)
> @@ -732,7 +735,14 @@ static int __run_perf_stat(int argc, const char **argv, int run_idx)
>  	 * avoid arbitrary skew, we must read all counters before closing any
>  	 * group leaders.
>  	 */
> -	read_counters(&(struct timespec) { .tv_nsec = t1-t0 });
> +	if (!interval)
> +		read_counters(&(struct timespec) { .tv_nsec = t1-t0 });
> +	else {
> +		stat_config.interval = 0;
> +		stat_config.summary = true;
> +		perf_evlist__copy_summary_counts(evsel_list);
> +		perf_evlist__process_summary_counts(&stat_config, evsel_list);

I think keeping the summary and copying it to evsel->count is ok,
but when we pretend to have new counts in place, could we process
it with perf_stat_process_counter function? so we keep just
1 processing code?

perhaps have some setup functions for non-interval settings?

SNIP

> +
> +	evsel->prev_raw_counts->aggr = evsel->summary_counts->aggr;
> +}
> +
> +void perf_evlist__copy_summary_counts(struct evlist *evlist)
> +{
> +	struct evsel *evsel;
> +
> +	evlist__for_each_entry(evlist, evsel)
> +		perf_evsel__copy_summary_counts(evsel);
> +}
> +
> +static void perf_stat_process_summary_counts(struct perf_stat_config *config,
> +					     struct evsel *evsel)
> +{
> +	struct perf_counts_values *summary = &evsel->summary_counts->aggr;

as I said earlier, why not copy all summary_counts data into 'counts'
and use the current code the process and display the result?

thanks,
jirka

> +	struct perf_stat_evsel *ps = evsel->stats;
> +	u64 *count = evsel->summary_counts->aggr.values;
> +	int i;
> +
> +	if (!config->summary || config->aggr_mode != AGGR_GLOBAL)
> +		return;
> +
> +	for (i = 0; i < 3; i++)
> +		init_stats(&ps->res_stats[i]);
> +
> +	perf_counts_values__scale(summary, config->scale,
> +				  &evsel->summary_counts->scaled);
> +
> +	for (i = 0; i < 3; i++)

SNIP

Re: [PATCH v2 2/2] perf stat: Report summary for interval mode

[Jin, Yao]

Hi Jiri,

On 5/5/2020 7:41 AM, Jiri Olsa wrote:
> On Sat, May 02, 2020 at 10:07:05AM +0800, Jin Yao wrote:
> 
> SNIP
> 
>>   	init_stats(&walltime_nsecs_stats);
>>   	update_stats(&walltime_nsecs_stats, stat_config.interval * 1000000);
>>   	print_counters(&rs, 0, NULL);
>> +	walltime_nsecs_stats = walltime_nsecs_stats_bak;
>>   }
>>   
>>   static void enable_counters(void)
>> @@ -732,7 +735,14 @@ static int __run_perf_stat(int argc, const char **argv, int run_idx)
>>   	 * avoid arbitrary skew, we must read all counters before closing any
>>   	 * group leaders.
>>   	 */
>> -	read_counters(&(struct timespec) { .tv_nsec = t1-t0 });
>> +	if (!interval)
>> +		read_counters(&(struct timespec) { .tv_nsec = t1-t0 });
>> +	else {
>> +		stat_config.interval = 0;
>> +		stat_config.summary = true;
>> +		perf_evlist__copy_summary_counts(evsel_list);
>> +		perf_evlist__process_summary_counts(&stat_config, evsel_list);
> 
> I think keeping the summary and copying it to evsel->count is ok,
> but when we pretend to have new counts in place, could we process
> it with perf_stat_process_counter function? so we keep just
> 1 processing code?
> 
> perhaps have some setup functions for non-interval settings?
> 
> SNIP
> 
>> +
>> +	evsel->prev_raw_counts->aggr = evsel->summary_counts->aggr;
>> +}
>> +
>> +void perf_evlist__copy_summary_counts(struct evlist *evlist)
>> +{
>> +	struct evsel *evsel;
>> +
>> +	evlist__for_each_entry(evlist, evsel)
>> +		perf_evsel__copy_summary_counts(evsel);
>> +}
>> +
>> +static void perf_stat_process_summary_counts(struct perf_stat_config *config,
>> +					     struct evsel *evsel)
>> +{
>> +	struct perf_counts_values *summary = &evsel->summary_counts->aggr;
> 
> as I said earlier, why not copy all summary_counts data into 'counts'
> and use the current code the process and display the result?
> 
> thanks,
> jirka
> 

I'm now working on a much simpler patchset. I will post v3.

Thanks
Jin Yao

>> +	struct perf_stat_evsel *ps = evsel->stats;
>> +	u64 *count = evsel->summary_counts->aggr.values;
>> +	int i;
>> +
>> +	if (!config->summary || config->aggr_mode != AGGR_GLOBAL)
>> +		return;
>> +
>> +	for (i = 0; i < 3; i++)
>> +		init_stats(&ps->res_stats[i]);
>> +
>> +	perf_counts_values__scale(summary, config->scale,
>> +				  &evsel->summary_counts->scaled);
>> +
>> +	for (i = 0; i < 3; i++)
> 
> SNIP
>