perf metrics: Sort the Default metricgroup

The new default mode will print the metrics as a metric group. The
metrics from the same metric group must be adjacent to each other in the
metric list. But the metric_list_cmp() sorts metrics by the number of
events.

Add a new sort for the Default metricgroup, which sorts by
default_metricgroup_name and metric_name.

Add is_default in the struct metric_event to indicate that it's from
the Default metricgroup.

Store the displayed metricgroup name of the Default metricgroup into
the metric expr for output.

Reviewed-by: Ian Rogers <irogers@google.com>
Signed-off-by: Kan Liang <kan.liang@linux.intel.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Ahmad Yasin <ahmad.yasin@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: https://lore.kernel.org/r/20230616031420.3751973-2-kan.liang@linux.intel.com
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 8b19644ade7dfbf6152e214aba55412adc89cf18..a6a5ed44a679a3e94ade2b3707b40301bd2d2827 100644 (file)
--- a/tools/perf/util/metricgroup.c
+++ b/tools/perf/util/metricgroup.c
@@ -79,6 +79,7 @@ static struct rb_node *metric_event_new(struct rblist *rblist __maybe_unused,
                return NULL;
        memcpy(me, entry, sizeof(struct metric_event));
        me->evsel = ((struct metric_event *)entry)->evsel;
+       me->is_default = false;
        INIT_LIST_HEAD(&me->head);
        return &me->nd;
 }
@@ -1160,6 +1161,25 @@ static int metric_list_cmp(void *priv __maybe_unused, const struct list_head *l,
        return right_count - left_count;
 }
 
+/**
+ * default_metricgroup_cmp - Implements complex key for the Default metricgroup
+ *                          that first sorts by default_metricgroup_name, then
+ *                          metric_name.
+ */
+static int default_metricgroup_cmp(void *priv __maybe_unused,
+                                  const struct list_head *l,
+                                  const struct list_head *r)
+{
+       const struct metric *left = container_of(l, struct metric, nd);
+       const struct metric *right = container_of(r, struct metric, nd);
+       int diff = strcmp(right->default_metricgroup_name, left->default_metricgroup_name);
+
+       if (diff)
+               return diff;
+
+       return strcmp(right->metric_name, left->metric_name);
+}
+
 struct metricgroup__add_metric_data {
        struct list_head *list;
        const char *pmu;
@@ -1515,6 +1535,7 @@ static int parse_groups(struct evlist *perf_evlist,
        LIST_HEAD(metric_list);
        struct metric *m;
        bool tool_events[PERF_TOOL_MAX] = {false};
+       bool is_default = !strcmp(str, "Default");
        int ret;
 
        if (metric_events_list->nr_entries == 0)
@@ -1549,6 +1570,9 @@ static int parse_groups(struct evlist *perf_evlist,
                        goto out;
        }
 
+       if (is_default)
+               list_sort(NULL, &metric_list, default_metricgroup_cmp);
+
        list_for_each_entry(m, &metric_list, nd) {
                struct metric_event *me;
                struct evsel **metric_events;
@@ -1637,6 +1661,8 @@ static int parse_groups(struct evlist *perf_evlist,
                expr->metric_unit = m->metric_unit;
                expr->metric_events = metric_events;
                expr->runtime = m->pctx->sctx.runtime;
+               expr->default_metricgroup_name = m->default_metricgroup_name;
+               me->is_default = is_default;
                list_add(&expr->nd, &me->head);
        }
 

diff --git a/tools/perf/util/metricgroup.h b/tools/perf/util/metricgroup.h
index bf18274c15dfaaa1ab029402dcd7fd0712e08ca0..d5325c6ec8e1140641f3229c5b9203b7f38b9103 100644 (file)
--- a/tools/perf/util/metricgroup.h
+++ b/tools/perf/util/metricgroup.h
@@ -22,6 +22,7 @@ struct cgroup;
 struct metric_event {
        struct rb_node nd;
        struct evsel *evsel;
+       bool is_default; /* the metric evsel from the Default metricgroup */
        struct list_head head; /* list of metric_expr */
 };
 
@@ -55,6 +56,8 @@ struct metric_expr {
         * more human intelligible) and then add "MiB" afterward when displayed.
         */
        const char *metric_unit;
+       /** Displayed metricgroup name of the Default metricgroup */
+       const char *default_metricgroup_name;
        /** Null terminated array of events used by the metric. */
        struct evsel **metric_events;
        /** Null terminated array of referenced metrics. */