77 lines
2.5 KiB
Diff
77 lines
2.5 KiB
Diff
From 4f8b8c59605dc32e5224879c3e24ac750a05b482 Mon Sep 17 00:00:00 2001
|
|
From: Andi Kleen <ak@linux.intel.com>
|
|
Date: Fri, 28 Jun 2019 15:07:37 -0700
|
|
Subject: [PATCH 018/201] perf tools metric: Don't include duration_time in
|
|
group
|
|
|
|
mainline inclusion
|
|
from mainline-v5.3-rc1
|
|
commit 488c3bf7ece89e47887607863207021283e37828
|
|
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=488c3bf7ece89e47887607863207021283e37828
|
|
|
|
------------------------------------------------------------------------
|
|
|
|
The Memory_BW metric generates groups including duration_time, which
|
|
maps to a software event.
|
|
|
|
For some reason this makes the group always not count.
|
|
|
|
Always put duration_time outside a group when generating metrics. It's
|
|
always the same time, so no need to group it.
|
|
|
|
Signed-off-by: Andi Kleen <ak@linux.intel.com>
|
|
Cc: Jiri Olsa <jolsa@kernel.org>
|
|
Link: http://lkml.kernel.org/r/20190628220737.13259-3-andi@firstfloor.org
|
|
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
|
|
Signed-off-by: hongrongxuan <hongrongxuan@huawei.com>
|
|
---
|
|
tools/perf/util/metricgroup.c | 19 +++++++++++++++++--
|
|
1 file changed, 17 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c
|
|
index 90c22757ca9d..dae3779d4fef 100644
|
|
--- a/tools/perf/util/metricgroup.c
|
|
+++ b/tools/perf/util/metricgroup.c
|
|
@@ -422,6 +422,7 @@ static int metricgroup__add_metric(const char *metric, struct strbuf *events,
|
|
const char **ids;
|
|
int idnum;
|
|
struct egroup *eg;
|
|
+ bool no_group = false;
|
|
|
|
pr_debug("metric expr %s for %s\n", pe->metric_expr, pe->metric_name);
|
|
|
|
@@ -432,11 +433,25 @@ static int metricgroup__add_metric(const char *metric, struct strbuf *events,
|
|
strbuf_addf(events, ",");
|
|
for (j = 0; j < idnum; j++) {
|
|
pr_debug("found event %s\n", ids[j]);
|
|
+ /*
|
|
+ * Duration time maps to a software event and can make
|
|
+ * groups not count. Always use it outside a
|
|
+ * group.
|
|
+ */
|
|
+ if (!strcmp(ids[j], "duration_time")) {
|
|
+ if (j > 0)
|
|
+ strbuf_addf(events, "}:W,");
|
|
+ strbuf_addf(events, "duration_time");
|
|
+ no_group = true;
|
|
+ continue;
|
|
+ }
|
|
strbuf_addf(events, "%s%s",
|
|
- j == 0 ? "{" : ",",
|
|
+ j == 0 || no_group ? "{" : ",",
|
|
ids[j]);
|
|
+ no_group = false;
|
|
}
|
|
- strbuf_addf(events, "}:W");
|
|
+ if (!no_group)
|
|
+ strbuf_addf(events, "}:W");
|
|
|
|
eg = malloc(sizeof(struct egroup));
|
|
if (!eg) {
|
|
--
|
|
2.27.0
|
|
|