Commit 5f09ca5a authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf stat: Do not pass avg to generic_metric 



There's no need to pass the given evsel's count to metric data, because
it will be pushed again within the following metric_events loop.

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lore.kernel.org/lkml/20200524224219.234847-3-jolsa@kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent d685e6c1

tools/perf/util/stat-shadow.c

+2 −8
Original line number Diff line number Diff line
@@ -737,7 +737,6 @@ static void generic_metric(struct perf_stat_config *config, 
			   const char *metric_name,

			   const char *metric_unit,

			   int runtime,

			   double avg,

			   int cpu,

			   struct perf_stat_output_ctx *out,

			   struct runtime_stat *st)
@@ -750,11 +749,6 @@ static void generic_metric(struct perf_stat_config *config, 
	char *n, *pn;



	expr__ctx_init(&pctx);

	/* Must be first id entry */

	n = strdup(name);

	if (!n)

		return;

	expr__add_id(&pctx, n, avg);

	for (i = 0; metric_events[i]; i++) {

		struct saved_value *v;

		struct stats *stats;
@@ -1042,7 +1036,7 @@ void perf_stat__print_shadow_stats(struct perf_stat_config *config, 
			print_metric(config, ctxp, NULL, NULL, name, 0);

	} else if (evsel->metric_expr) {

		generic_metric(config, evsel->metric_expr, evsel->metric_events, evsel->name,

				evsel->metric_name, NULL, 1, avg, cpu, out, st);

				evsel->metric_name, NULL, 1, cpu, out, st);

	} else if (runtime_stat_n(st, STAT_NSECS, 0, cpu) != 0) {

		char unit = 'M';

		char unit_buf[10];
@@ -1071,7 +1065,7 @@ void perf_stat__print_shadow_stats(struct perf_stat_config *config, 
				out->new_line(config, ctxp);

			generic_metric(config, mexp->metric_expr, mexp->metric_events,

					evsel->name, mexp->metric_name,

					mexp->metric_unit, mexp->runtime, avg, cpu, out, st);

					mexp->metric_unit, mexp->runtime, cpu, out, st);

		}

	}

	if (num == 0)