perf top: Uniform the event name for the hybrid machine

It's hard to distinguish the default cycles events among hybrid PMUs.
For example,

  $ perf top
  Available samples
  385 cycles:P
  903 cycles:P

The other tool, e.g., perf record, uniforms the event name and adds the
hybrid PMU name before opening the event. So the events can be easily
distinguished. Apply the same methodology for the perf top as well.

The evlist__uniquify_name() will be invoked by both record and top.
Move it to util/evlist.c

With the patch:

  $ perf top
  Available samples
  148 cpu_atom/cycles:P/
  1K cpu_core/cycles:P/

Reviewed-by: Ian Rogers <irogers@google.com>
Signed-off-by: Kan Liang <kan.liang@linux.intel.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Hector Martin <marcan@marcan.st>
Cc: Marc Zyngier <maz@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lore.kernel.org/r/20231214144612.1092028-2-kan.liang@linux.intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index 8a1002683fda27d3a59be9bdd9bb994d5256a02a..a89013c44fd5382dd3d00d3a47db93c2f7ed2b02 100644 (file)
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -2237,32 +2237,6 @@ static void hit_auxtrace_snapshot_trigger(struct record *rec)
        }
 }
 
-static void record__uniquify_name(struct record *rec)
-{
-       struct evsel *pos;
-       struct evlist *evlist = rec->evlist;
-       char *new_name;
-       int ret;
-
-       if (perf_pmus__num_core_pmus() == 1)
-               return;
-
-       evlist__for_each_entry(evlist, pos) {
-               if (!evsel__is_hybrid(pos))
-                       continue;
-
-               if (strchr(pos->name, '/'))
-                       continue;
-
-               ret = asprintf(&new_name, "%s/%s/",
-                              pos->pmu_name, pos->name);
-               if (ret) {
-                       free(pos->name);
-                       pos->name = new_name;
-               }
-       }
-}
-
 static int record__terminate_thread(struct record_thread *thread_data)
 {
        int err;
@@ -2496,7 +2470,7 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)
        if (data->is_pipe && rec->evlist->core.nr_entries == 1)
                rec->opts.sample_id = true;
 
-       record__uniquify_name(rec);
+       evlist__uniquify_name(rec->evlist);
 
        /* Debug message used by test scripts */
        pr_debug3("perf record opening and mmapping events\n");

diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index 13e609c0c6930f667b44a49f1733c71f03836054..baf1ab083436e3f980157cb5d3646d6ccc59a40c 100644 (file)
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -1298,6 +1298,7 @@ static int __cmd_top(struct perf_top *top)
                }
        }
 
+       evlist__uniquify_name(top->evlist);
        ret = perf_top__start_counters(top);
        if (ret)
                return ret;

diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index 0ed3ce2aa8ebf378e123337a04d332248373daec..6f0892803c2249af0e53b430662fe109104b7283 100644 (file)
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -2518,3 +2518,28 @@ void evlist__warn_user_requested_cpus(struct evlist *evlist, const char *cpu_lis
        }
        perf_cpu_map__put(user_requested_cpus);
 }
+
+void evlist__uniquify_name(struct evlist *evlist)
+{
+       struct evsel *pos;
+       char *new_name;
+       int ret;
+
+       if (perf_pmus__num_core_pmus() == 1)
+               return;
+
+       evlist__for_each_entry(evlist, pos) {
+               if (!evsel__is_hybrid(pos))
+                       continue;
+
+               if (strchr(pos->name, '/'))
+                       continue;
+
+               ret = asprintf(&new_name, "%s/%s/",
+                              pos->pmu_name, pos->name);
+               if (ret) {
+                       free(pos->name);
+                       pos->name = new_name;
+               }
+       }
+}

diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h
index 98e7ddb2bd3058106f77271f61f954242bc3984f..cb91dc9117a2726b34b9dce5265186c89eee96cd 100644 (file)
--- a/tools/perf/util/evlist.h
+++ b/tools/perf/util/evlist.h
@@ -442,5 +442,6 @@ struct evsel *evlist__find_evsel(struct evlist *evlist, int idx);
 int evlist__scnprintf_evsels(struct evlist *evlist, size_t size, char *bf);
 void evlist__check_mem_load_aux(struct evlist *evlist);
 void evlist__warn_user_requested_cpus(struct evlist *evlist, const char *cpu_list);
+void evlist__uniquify_name(struct evlist *evlist);
 
 #endif /* __PERF_EVLIST_H */