perf stat: Command line PMU metric filtering

Wire up the --cputype value to limit which metrics are parsed.

Signed-off-by: Ian Rogers <irogers@google.com>
Tested-by: Kan Liang <kan.liang@linux.intel.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Ahmad Yasin <ahmad.yasin@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
Cc: Caleb Biggers <caleb.biggers@intel.com>
Cc: Edward Baker <edward.baker@intel.com>
Cc: Florian Fischer <florian.fischer@muhq.space>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: John Garry <john.g.garry@oracle.com>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Kang Minchul <tegongkang@gmail.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Perry Taylor <perry.taylor@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ravi Bangoria <ravi.bangoria@amd.com>
Cc: Rob Herring <robh@kernel.org>
Cc: Samantha Alt <samantha.alt@intel.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: Sumanth Korikkar <sumanthk@linux.ibm.com>
Cc: Suzuki Poulouse <suzuki.poulose@arm.com>
Cc: Thomas Richter <tmricht@linux.ibm.com>
Cc: Tiezhu Yang <yangtiezhu@loongson.cn>
Cc: Weilin Wang <weilin.wang@intel.com>
Cc: Xing Zhengjun <zhengjun.xing@linux.intel.com>
Cc: Yang Jihong <yangjihong1@huawei.com>
Link: https://lore.kernel.org/r/20230502223851.2234828-40-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index 8161f92..e18b323 100644 (file)
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -1783,6 +1783,7 @@ static int add_default_attributes(void)
 };
 
        struct perf_event_attr default_null_attrs[] = {};
+       const char *pmu = parse_events_option_args.pmu_filter ?: "all";
 
        /* Set attrs if no event is selected and !null_run: */
        if (stat_config.null_run)
@@ -1794,11 +1795,11 @@ static int add_default_attributes(void)
                 * will use this approach. To determine transaction support
                 * on an architecture test for such a metric name.
                 */
-               if (!metricgroup__has_metric("all", "transaction")) {
+               if (!metricgroup__has_metric(pmu, "transaction")) {
                        pr_err("Missing transaction metrics");
                        return -1;
                }
-               return metricgroup__parse_groups(evsel_list, "transaction",
+               return metricgroup__parse_groups(evsel_list, pmu, "transaction",
                                                stat_config.metric_no_group,
                                                stat_config.metric_no_merge,
                                                stat_config.metric_no_threshold,
@@ -1823,7 +1824,7 @@ static int add_default_attributes(void)
                        smi_reset = true;
                }
 
-               if (!metricgroup__has_metric("all", "smi")) {
+               if (!metricgroup__has_metric(pmu, "smi")) {
                        pr_err("Missing smi metrics");
                        return -1;
                }
@@ -1831,7 +1832,7 @@ static int add_default_attributes(void)
                if (!force_metric_only)
                        stat_config.metric_only = true;
 
-               return metricgroup__parse_groups(evsel_list, "smi",
+               return metricgroup__parse_groups(evsel_list, pmu, "smi",
                                                stat_config.metric_no_group,
                                                stat_config.metric_no_merge,
                                                stat_config.metric_no_threshold,
@@ -1864,7 +1865,8 @@ static int add_default_attributes(void)
                                "Please print the result regularly, e.g. -I1000\n");
                }
                str[8] = stat_config.topdown_level + '0';
-               if (metricgroup__parse_groups(evsel_list, str,
+               if (metricgroup__parse_groups(evsel_list,
+                                               pmu, str,
                                                /*metric_no_group=*/false,
                                                /*metric_no_merge=*/false,
                                                /*metric_no_threshold=*/true,
@@ -1903,14 +1905,14 @@ static int add_default_attributes(void)
                 * caused by exposing latent bugs. This is fixed properly in:
                 * https://lore.kernel.org/lkml/bff481ba-e60a-763f-0aa0-3ee53302c480@linux.intel.com/
                 */
-               if (metricgroup__has_metric("all", "TopdownL1") && !perf_pmu__has_hybrid()) {
+               if (metricgroup__has_metric(pmu, "TopdownL1") && !perf_pmu__has_hybrid()) {
                        struct evlist *metric_evlist = evlist__new();
                        struct evsel *metric_evsel;
 
                        if (!metric_evlist)
                                return -1;
 
-                       if (metricgroup__parse_groups(metric_evlist, "TopdownL1",
+                       if (metricgroup__parse_groups(metric_evlist, pmu, "TopdownL1",
                                                        /*metric_no_group=*/false,
                                                        /*metric_no_merge=*/false,
                                                        /*metric_no_threshold=*/true,
@@ -2434,7 +2436,9 @@ int cmd_stat(int argc, const char **argv)
         * knowing the target is system-wide.
         */
        if (metrics) {
-               metricgroup__parse_groups(evsel_list, metrics,
+               const char *pmu = parse_events_option_args.pmu_filter ?: "all";
+
+               metricgroup__parse_groups(evsel_list, pmu, metrics,
                                        stat_config.metric_no_group,
                                        stat_config.metric_no_merge,
                                        stat_config.metric_no_threshold,

diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c
index cc5166d..103a672 100644 (file)
--- a/tools/perf/util/metricgroup.c
+++ b/tools/perf/util/metricgroup.c
@@ -1648,6 +1648,7 @@ out:
 }
 
 int metricgroup__parse_groups(struct evlist *perf_evlist,
+                             const char *pmu,
                              const char *str,
                              bool metric_no_group,
                              bool metric_no_merge,
@@ -1661,7 +1662,7 @@ int metricgroup__parse_groups(struct evlist *perf_evlist,
        if (!table)
                return -EINVAL;
 
-       return parse_groups(perf_evlist, "all", str, metric_no_group, metric_no_merge,
+       return parse_groups(perf_evlist, pmu, str, metric_no_group, metric_no_merge,
                            metric_no_threshold, user_requested_cpu_list, system_wide,
                            /*fake_pmu=*/NULL, metric_events, table);
 }

diff --git a/tools/perf/util/metricgroup.h b/tools/perf/util/metricgroup.h
index 08e9b9e..bf18274 100644 (file)
--- a/tools/perf/util/metricgroup.h
+++ b/tools/perf/util/metricgroup.h
@@ -67,6 +67,7 @@ struct metric_event *metricgroup__lookup(struct rblist *metric_events,
                                         struct evsel *evsel,
                                         bool create);
 int metricgroup__parse_groups(struct evlist *perf_evlist,
+                             const char *pmu,
                              const char *str,
                              bool metric_no_group,
                              bool metric_no_merge,