Commit 297767ac authored May 20, 2020 by Jin Yao Committed by Arnaldo Carvalho de Melo May 28, 2020

perf stat: Copy counts from prev_raw_counts to evsel->counts



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 use 'evsel->prev_raw_counts' which is updated in each
interval and it's saved with the latest counts. Before reporting the
summary, we copy the counts from evsel->prev_raw_counts to
evsel->counts, and next we just follow non-interval processing.

 v5:
 ---
 Don't save the previous aggr value to the member of [cpu0,thread0]
 in perf_counts. Originally that was a trick because the
 perf_stat_process_counter would create aggr values from per cpu
 values. But we don't need to do that all the time. We will
 handle it in next patch.

Signed-off-by: Jin Yao <yao.jin@linux.intel.com>
Reviewed-by: Jiri Olsa <jolsa@redhat.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jin Yao <yao.jin@intel.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lore.kernel.org/lkml/20200520042737.24160-4-yao.jin@linux.intel.com


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent cf4d9bd6

tools/perf/util/stat.c

+24 −0

Original line number	Diff line number	Diff line
		@@ -225,6 +225,30 @@ void perf_evlist__reset_prev_raw_counts(struct evlist *evlist)
		evsel__reset_prev_raw_counts(evsel);
		}

		static void perf_evsel__copy_prev_raw_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->prev_raw_counts, cpu,
		thread);
		}
		}

		evsel->counts->aggr = evsel->prev_raw_counts->aggr;
		}

		void perf_evlist__copy_prev_raw_counts(struct evlist *evlist)
		{
		struct evsel *evsel;

		evlist__for_each_entry(evlist, evsel)
		perf_evsel__copy_prev_raw_counts(evsel);
		}

		static void zero_per_pkg(struct evsel *counter)
		{
		if (counter->per_pkg_mask)

tools/perf/util/stat.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -198,6 +198,7 @@ int perf_evlist__alloc_stats(struct evlist *evlist, bool alloc_raw);
		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_prev_raw_counts(struct evlist *evlist);

		int perf_stat_process_counter(struct perf_stat_config *config,
		struct evsel *counter);

Admin message