Commit 7365f105 authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo
Browse files

perf stat-display: Avoid use of core for CPU 



Correct use of cpumap index in print_no_aggr_metric().

Signed-off-by: default avatarIan Rogers <irogers@google.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: John Garry <john.garry@huawei.com>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: Mike Leach <mike.leach@linaro.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Clarke <pc@us.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Riccardo Mancini <rickyman7@gmail.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: Suzuki Poulouse <suzuki.poulose@arm.com>
Cc: Vineet Singh <vineet.singh@intel.com>
Cc: coresight@lists.linaro.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: zhengjun.xing@intel.com
Link: https://lore.kernel.org/r/20220105061351.120843-26-irogers@google.com


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

tools/perf/util/stat-display.c

+22 −23
Original line number Diff line number Diff line
@@ -120,11 +120,10 @@ static void aggr_printout(struct perf_stat_config *config, 
				id.die,

				config->csv_output ? 0 : -3,

				id.core, config->csv_sep);

		} else if (id.core > -1) {

		} else if (id.cpu > -1) {

			fprintf(config->output, "CPU%*d%s",

				config->csv_output ? 0 : -7,

				evsel__cpus(evsel)->map[id.core],

				config->csv_sep);

				id.cpu, config->csv_sep);

		}

		break;

	case AGGR_THREAD:
@@ -334,7 +333,7 @@ static int first_shadow_cpu(struct perf_stat_config *config, 
	int cpu, idx;



	if (config->aggr_mode == AGGR_NONE)

		return id->core;

		return id->cpu;



	if (!config->aggr_get_id)

		return 0;
@@ -697,10 +696,9 @@ static void print_counter_aggrdata(struct perf_stat_config *config, 
		fprintf(output, "%s", prefix);



	uval = val * counter->scale;

	if (cpu != -1) {

		id = aggr_cpu_id__empty();

		id.core = cpu;

	}

	if (cpu != -1)

		id = aggr_cpu_id__cpu(cpu, /*data=*/NULL);



	printout(config, id, nr, counter, uval,

		 prefix, run, ena, 1.0, &rt_stat);

	if (!metric_only)
@@ -911,8 +909,7 @@ static void print_counter(struct perf_stat_config *config, 
			fprintf(output, "%s", prefix);



		uval = val * counter->scale;

		id = aggr_cpu_id__empty();

		id.core = cpu;

		id = aggr_cpu_id__cpu(cpu, /*data=*/NULL);

		printout(config, id, 0, counter, uval, prefix,

			 run, ena, 1.0, &rt_stat);
@@ -924,29 +921,31 @@ static void print_no_aggr_metric(struct perf_stat_config *config, 
				 struct evlist *evlist,

				 char *prefix)

{

	int cpu;

	int nrcpus = 0;

	struct evsel *counter;

	u64 ena, run, val;

	double uval;

	struct aggr_cpu_id id;

	int all_idx, cpu;



	nrcpus = evlist->core.cpus->nr;

	for (cpu = 0; cpu < nrcpus; cpu++) {

	perf_cpu_map__for_each_cpu(cpu, all_idx, evlist->core.cpus) {

		struct evsel *counter;

		bool first = true;



		if (prefix)

			fputs(prefix, config->output);

		evlist__for_each_entry(evlist, counter) {

			id = aggr_cpu_id__empty();

			id.core = cpu;

			u64 ena, run, val;

			double uval;

			struct aggr_cpu_id id;

			int counter_idx = perf_cpu_map__idx(evsel__cpus(counter), cpu);



			if (counter_idx < 0)

				continue;



			id = aggr_cpu_id__cpu(cpu, /*data=*/NULL);

			if (first) {

				aggr_printout(config, counter, id, 0);

				first = false;

			}

			val = perf_counts(counter->counts, cpu, 0)->val;

			ena = perf_counts(counter->counts, cpu, 0)->ena;

			run = perf_counts(counter->counts, cpu, 0)->run;

			val = perf_counts(counter->counts, counter_idx, 0)->val;

			ena = perf_counts(counter->counts, counter_idx, 0)->ena;

			run = perf_counts(counter->counts, counter_idx, 0)->run;



			uval = val * counter->scale;

			printout(config, id, 0, counter, uval, prefix,