perf tools metric: Don't include duration_time in group

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>

diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c
index 7d36435..d816457 100644 (file)
--- a/tools/perf/util/metricgroup.c
+++ b/tools/perf/util/metricgroup.c
@@ -409,6 +409,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);
 
@@ -419,11 +420,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) {