perf stat: Output JSON MetricExpr metric (37932c18) · Commits · 戴 / test

Add generic infrastructure to perf stat to output ratios for "MetricExpr" entries in the event lists. Many events are more useful as ratios than in raw form, typically some count in relation to total ticks. Transfer the MetricExpr information from the alias to the evsel. We mark the events that need to be collected for MetricExpr, and also link the events using them with a pointer. The code is careful to always prefer the right event in the same group to minimize multiplexing errors. At the moment only a single relation is supported. Then add a rblist to the stat shadow code that remembers stats based on the cpu and context. Then finally update and retrieve and print these values similarly to the existing hardcoded perf metrics. We use the simple expression parser added earlier to evaluate the expression. Normally we just output the result without further commentary, but for --metric-only this would lead to empty columns. So for this case use the original event as description. There is no attempt to automatically add the MetricExpr event, if it is missing, however we suggest it to the user, because the user tool doesn't have enough information to reliably construct a group that is guaranteed to schedule. So we leave that to the user. % perf stat -a -I 1000 -e '{unc_p_clockticks,unc_p_freq_max_os_cycles}' 1.000147889 800,085,181 unc_p_clockticks 1.000147889 93,126,241 unc_p_freq_max_os_cycles # 11.6 2.000448381 800,218,217 unc_p_clockticks 2.000448381 142,516,095 unc_p_freq_max_os_cycles # 17.8 3.000639852 800,243,057 unc_p_clockticks 3.000639852 162,292,689 unc_p_freq_max_os_cycles # 20.3 % perf stat -a -I 1000 -e '{unc_p_clockticks,unc_p_freq_max_os_cycles}' --metric-only # time freq_max_os_cycles % 1.000127077 0.9 2.000301436 0.7 3.000456379 0.0 v2: Change from DivideBy to MetricExpr v3: Use expr__ prefix. Support more than one other event. v4: Update description v5: Only print warning message once for multiple PMUs. Signed-off-by:

Andi Kleen <ak@linux.intel.com> Acked-by:

Jiri Olsa <jolsa@kernel.org> Link: http://lkml.kernel.org/r/20170320201711.14142-11-andi@firstfloor.org Signed-off-by:

Arnaldo Carvalho de Melo <acme@redhat.com>

tools/perf/builtin-stat.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -1145,6 +1145,7 @@ static void printout(int id, int nr, struct perf_evsel *counter, double uval,
		out.print_metric = pm;
		out.new_line = nl;
		out.ctx = &os;
		out.force_header = false;

		if (csv_output && !metric_only) {
		print_noise(counter, noise);
		@@ -1480,6 +1481,7 @@ static void print_metric_headers(const char *prefix, bool no_indent)
		out.ctx = &os;
		out.print_metric = print_metric_header;
		out.new_line = new_line_metric;
		out.force_header = true;
		os.evsel = counter;
		perf_stat__print_shadow_stats(counter, 0,
		0,
		@@ -2498,6 +2500,7 @@ int cmd_stat(int argc, const char *argv, const char prefix __maybe_unused)
		argc = parse_options_subcommand(argc, argv, stat_options, stat_subcommands,
		(const char **) stat_usage,
		PARSE_OPT_STOP_AT_NON_OPTION);
		perf_stat__collect_metric_expr(evsel_list);
		perf_stat__init_shadow_stats();

		if (csv_sep) {

tools/perf/util/evsel.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -236,6 +236,9 @@ void perf_evsel__init(struct perf_evsel *evsel,
		evsel->sample_size = __perf_evsel__sample_size(attr->sample_type);
		perf_evsel__calc_id_pos(evsel);
		evsel->cmdline_group_boundary = false;
		evsel->metric_expr = NULL;
		evsel->metric_events = NULL;
		evsel->collect_stat = false;
		}

		struct perf_evsel perf_evsel__new_idx(struct perf_event_attr attr, int idx)

tools/perf/util/evsel.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -132,6 +132,9 @@ struct perf_evsel {
		struct list_head config_terms;
		int bpf_fd;
		bool merged_stat;
		const char * metric_expr;
		struct perf_evsel **metric_events;
		bool collect_stat;
		};

		union u64_swap {

tools/perf/util/parse-events.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -1255,6 +1255,7 @@ int parse_events_add_pmu(struct parse_events_evlist *data,
		evsel->scale = info.scale;
		evsel->per_pkg = info.per_pkg;
		evsel->snapshot = info.snapshot;
		evsel->metric_expr = info.metric_expr;
		}

		return evsel ? 0 : -ENOMEM;

tools/perf/util/pmu.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -994,6 +994,7 @@ int perf_pmu__check_alias(struct perf_pmu pmu, struct list_head head_terms,
		info->unit = NULL;
		info->scale = 0.0;
		info->snapshot = false;
		info->metric_expr = NULL;

		list_for_each_entry_safe(term, h, head_terms, list) {
		alias = pmu_find_alias(pmu, term);
		@@ -1009,6 +1010,7 @@ int perf_pmu__check_alias(struct perf_pmu pmu, struct list_head head_terms,

		if (alias->per_pkg)
		info->per_pkg = true;
		info->metric_expr = alias->metric_expr;

		list_del(&term->list);
		free(term);

Admin message