Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 206cab65 authored by Andi Kleen's avatar Andi Kleen Committed by Arnaldo Carvalho de Melo
Browse files

perf stat: Add --metric-only support for -A 



Add metric only support for -A too. This requires a new print function
that prints the metrics in the right order.

v2: Fix manpage
v3: Simplify nrcpus computation

Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
Link: http://lkml.kernel.org/r/1457049458-28956-7-git-send-email-andi@firstfloor.org


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

tools/perf/Documentation/perf-stat.txt

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ The overhead percentage could be high in some cases, for instance with small, su 


--metric-only::

Only print computed metrics. Print them in a single line.

Don't show any raw values. Not supported with -A or --per-thread.

Don't show any raw values. Not supported with --per-thread.



--per-socket::

Aggregate counts per processor socket for system-wide mode measurements.  This

tools/perf/builtin-stat.c

+37 −8
Original line number Diff line number Diff line
@@ -1250,10 +1250,40 @@ static void print_counter(struct perf_evsel *counter, char *prefix) 
	}

}



static void print_no_aggr_metric(char *prefix)

{

	int cpu;

	int nrcpus = 0;

	struct perf_evsel *counter;

	u64 ena, run, val;

	double uval;



	nrcpus = evsel_list->cpus->nr;

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

		bool first = true;



		if (prefix)

			fputs(prefix, stat_config.output);

		evlist__for_each(evsel_list, counter) {

			if (first) {

				aggr_printout(counter, cpu, 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;



			uval = val * counter->scale;

			printout(cpu, 0, counter, uval, prefix, run, ena, 1.0);

		}

		fputc('\n', stat_config.output);

	}

}



static int aggr_header_lens[] = {

	[AGGR_CORE] = 18,

	[AGGR_SOCKET] = 12,

	[AGGR_NONE] = 15,

	[AGGR_NONE] = 6,

	[AGGR_THREAD] = 24,

	[AGGR_GLOBAL] = 0,

};
@@ -1408,8 +1438,12 @@ static void print_counters(struct timespec *ts, int argc, const char **argv) 
			fputc('\n', stat_config.output);

		break;

	case AGGR_NONE:

		if (metric_only)

			print_no_aggr_metric(prefix);

		else {

			evlist__for_each(evsel_list, counter)

				print_counter(counter, prefix);

		}

		break;

	case AGGR_UNSET:

	default:
@@ -2178,11 +2212,6 @@ int cmd_stat(int argc, const char **argv, const char *prefix __maybe_unused) 
		goto out;

	}



	if (metric_only && stat_config.aggr_mode == AGGR_NONE) {

		fprintf(stderr, "--metric-only is not supported with -A\n");

		goto out;

	}



	if (metric_only && run_count > 1) {

		fprintf(stderr, "--metric-only is not supported with -r\n");

		goto out;