Commit 33bbc571 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf list: Display metric expressions for --details option 



Display metric expression itself when --details is specified.

Current list with no details:

  # perf list metrics
  ...
  TopDownL1:
    IPC
         [Instructions Per Cycle (per logical thread)]
    SLOTS
         [Total issue-pipeline slots]
  ...

Detailed output with metric formula:

  # perf list --details metrics
  ...
  TopDownL1:
    IPC
         [Instructions Per Cycle (per logical thread)]
         [inst_retired.any / cpu_clk_unhalted.thread]
    SLOTS
         [Total issue-pipeline slots]
         [4*(( cpu_clk_unhalted.thread_any / 2 ) if #smt_on else cycles)]
  ...

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20190213123246.4015-6-jolsa@kernel.org


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

tools/perf/builtin-list.c

+4 −4
Original line number Diff line number Diff line
@@ -82,9 +82,9 @@ int cmd_list(int argc, const char **argv) 
		else if (strcmp(argv[i], "sdt") == 0)

			print_sdt_events(NULL, NULL, raw_dump);

		else if (strcmp(argv[i], "metric") == 0)

			metricgroup__print(true, false, NULL, raw_dump);

			metricgroup__print(true, false, NULL, raw_dump, details_flag);

		else if (strcmp(argv[i], "metricgroup") == 0)

			metricgroup__print(false, true, NULL, raw_dump);

			metricgroup__print(false, true, NULL, raw_dump, details_flag);

		else if ((sep = strchr(argv[i], ':')) != NULL) {

			int sep_idx;
@@ -102,7 +102,7 @@ int cmd_list(int argc, const char **argv) 
			s[sep_idx] = '\0';

			print_tracepoint_events(s, s + sep_idx + 1, raw_dump);

			print_sdt_events(s, s + sep_idx + 1, raw_dump);

			metricgroup__print(true, true, s, raw_dump);

			metricgroup__print(true, true, s, raw_dump, details_flag);

			free(s);

		} else {

			if (asprintf(&s, "*%s*", argv[i]) < 0) {
@@ -119,7 +119,7 @@ int cmd_list(int argc, const char **argv) 
						details_flag);

			print_tracepoint_events(NULL, s, raw_dump);

			print_sdt_events(NULL, s, raw_dump);

			metricgroup__print(true, true, NULL, raw_dump);

			metricgroup__print(true, true, NULL, raw_dump, details_flag);

			free(s);

		}

	}

tools/perf/util/metricgroup.c

+7 −1
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ static void metricgroup__print_strlist(struct strlist *metrics, bool raw) 
}



void metricgroup__print(bool metrics, bool metricgroups, char *filter,

			bool raw)

			bool raw, bool details)

{

	struct pmu_events_map *map = perf_pmu__find_map(NULL);

	struct pmu_event *pe;
@@ -329,6 +329,12 @@ void metricgroup__print(bool metrics, bool metricgroups, char *filter, 
					if (asprintf(&s, "%s\n%*s%s]",

						     pe->metric_name, 8, "[", pe->desc) < 0)

						return;



					if (details) {

						if (asprintf(&s, "%s\n%*s%s]",

							     s, 8, "[", pe->metric_expr) < 0)

							return;

					}

				}



				if (!s)

tools/perf/util/metricgroup.h

+2 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ int metricgroup__parse_groups(const struct option *opt, 
			const char *str,

			struct rblist *metric_events);



void metricgroup__print(bool metrics, bool groups, char *filter, bool raw);

void metricgroup__print(bool metrics, bool groups, char *filter,

			bool raw, bool details);

bool metricgroup__has_metric(const char *metric);

#endif

tools/perf/util/parse-events.c

+1 −1
Original line number Diff line number Diff line
@@ -2540,7 +2540,7 @@ void print_events(const char *event_glob, bool name_only, bool quiet_flag, 


	print_sdt_events(NULL, NULL, name_only);



	metricgroup__print(true, true, NULL, name_only);

	metricgroup__print(true, true, NULL, name_only, details_flag);

}



int parse_events__is_hardcoded_term(struct parse_events_term *term)

CRA Git | Maintained and supported by SUSTech CRA and CCSE