146 lines
5.0 KiB
Diff
146 lines
5.0 KiB
Diff
From 16055ffe7f4937ac992b9e84f120ad3128b23352 Mon Sep 17 00:00:00 2001
|
|
From: Jiri Olsa <jolsa@kernel.org>
|
|
Date: Wed, 13 Feb 2019 13:32:41 +0100
|
|
Subject: [PATCH 007/201] perf list: Display metric expressions for --details
|
|
option
|
|
|
|
mainline inclusion
|
|
from mainline-v5.1-rc1
|
|
commit 33bbc571ed79cace481fae4031b80a51d93ae997
|
|
category: feature
|
|
bugzilla: https://gitee.com/openeuler/kernel/issues/I8C0CX
|
|
|
|
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=33bbc571ed79cace481fae4031b80a51d93ae997
|
|
|
|
------------------------------------------------------------
|
|
|
|
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: Jiri 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: Arnaldo Carvalho de Melo <acme@redhat.com>
|
|
Signed-off-by: hongrongxuan <hongrongxuan@huawei.com>
|
|
---
|
|
tools/perf/builtin-list.c | 8 ++++----
|
|
tools/perf/util/metricgroup.c | 8 +++++++-
|
|
tools/perf/util/metricgroup.h | 3 ++-
|
|
tools/perf/util/parse-events.c | 2 +-
|
|
4 files changed, 14 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/tools/perf/builtin-list.c b/tools/perf/builtin-list.c
|
|
index ead221e49f00..c9f98d00c0e9 100644
|
|
--- a/tools/perf/builtin-list.c
|
|
+++ b/tools/perf/builtin-list.c
|
|
@@ -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);
|
|
}
|
|
}
|
|
diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c
|
|
index 6dcc6e1182a5..27552a0b990a 100644
|
|
--- a/tools/perf/util/metricgroup.c
|
|
+++ b/tools/perf/util/metricgroup.c
|
|
@@ -296,7 +296,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;
|
|
@@ -355,6 +355,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)
|
|
diff --git a/tools/perf/util/metricgroup.h b/tools/perf/util/metricgroup.h
|
|
index 8a155dba0581..5c52097a5c63 100644
|
|
--- a/tools/perf/util/metricgroup.h
|
|
+++ b/tools/perf/util/metricgroup.h
|
|
@@ -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
|
|
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
|
|
index 0eff0c3ba9ee..f5a7d42b0928 100644
|
|
--- a/tools/perf/util/parse-events.c
|
|
+++ b/tools/perf/util/parse-events.c
|
|
@@ -2545,7 +2545,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)
|
|
--
|
|
2.27.0
|
|
|