perf pmu: Refactor perf_pmu__match()

Move all implementation to pmu code. Don't allocate a fnmatch wildcard
pattern, matching ignoring the suffix already handles this, and only
use fnmatch if the given PMU name has a '*' in it.

Signed-off-by: Ian Rogers <irogers@google.com>
Reviewed-by: Kan Liang <kan.liang@linux.intel.com>
Tested-by: Atish Patra <atishp@rivosinc.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Beeman Strong <beeman@rivosinc.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/r/20240416061533.921723-5-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index 3b1f767039fa66f255954284aeb8026684f3030c..39548ec645ecd5ac7883306129c91ee3e35027c1 100644 (file)
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -1611,7 +1611,6 @@ int parse_events_multi_pmu_add_or_add_pmu(struct parse_events_state *parse_state
                                        struct list_head **listp,
                                        void *loc_)
 {
-       char *pattern = NULL;
        YYLTYPE *loc = loc_;
        struct perf_pmu *pmu;
        int ok = 0;
@@ -1631,22 +1630,9 @@ int parse_events_multi_pmu_add_or_add_pmu(struct parse_events_state *parse_state
 
        pmu = NULL;
        /* Failed to add, try wildcard expansion of event_or_pmu as a PMU name. */
-       if (asprintf(&pattern, "%s*", event_or_pmu) < 0) {
-               zfree(listp);
-               return -ENOMEM;
-       }
-
        while ((pmu = perf_pmus__scan(pmu)) != NULL) {
-               const char *name = pmu->name;
-
-               if (parse_events__filter_pmu(parse_state, pmu))
-                       continue;
-
-               if (!strncmp(name, "uncore_", 7) &&
-                   strncmp(event_or_pmu, "uncore_", 7))
-                       name += 7;
-               if (!perf_pmu__match(pattern, name, event_or_pmu) ||
-                   !perf_pmu__match(pattern, pmu->alias_name, event_or_pmu)) {
+               if (!parse_events__filter_pmu(parse_state, pmu) &&
+                   perf_pmu__match(pmu, event_or_pmu)) {
                        bool auto_merge_stats = perf_pmu__auto_merge_stats(pmu);
 
                        if (!parse_events_add_pmu(parse_state, *listp, pmu,
@@ -1657,7 +1643,6 @@ int parse_events_multi_pmu_add_or_add_pmu(struct parse_events_state *parse_state
                        }
                }
        }
-       zfree(&pattern);
        if (ok)
                return 0;
 

diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
index ab30f22eaf10a19af442cccb1a052c06e419e2f9..74dd5bd49d9a861004069dce524ae75ef2135ec5 100644 (file)
--- a/tools/perf/util/pmu.c
+++ b/tools/perf/util/pmu.c
@@ -2064,18 +2064,29 @@ void perf_pmu__warn_invalid_config(struct perf_pmu *pmu, __u64 config,
                   name ?: "N/A", buf, config_name, config);
 }
 
-int perf_pmu__match(const char *pattern, const char *name, const char *tok)
+bool perf_pmu__match(const struct perf_pmu *pmu, const char *tok)
 {
-       if (!name)
-               return -1;
+       const char *name = pmu->name;
+       bool need_fnmatch = strchr(tok, '*') != NULL;
 
-       if (fnmatch(pattern, name, 0))
-               return -1;
+       if (!strncmp(tok, "uncore_", 7))
+               tok += 7;
+       if (!strncmp(name, "uncore_", 7))
+               name += 7;
 
-       if (tok && !perf_pmu__match_ignoring_suffix(name, tok))
-               return -1;
+       if (perf_pmu__match_ignoring_suffix(name, tok) ||
+           (need_fnmatch && !fnmatch(tok, name, 0)))
+               return true;
 
-       return 0;
+       name = pmu->alias_name;
+       if (!name)
+               return false;
+
+       if (!strncmp(name, "uncore_", 7))
+               name += 7;
+
+       return perf_pmu__match_ignoring_suffix(name, tok) ||
+               (need_fnmatch && !fnmatch(tok, name, 0));
 }
 
 double __weak perf_pmu__cpu_slots_per_cycle(void)

diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h
index 152700f784556207807906e2f9dfcb1cce4db0e0..93d03bd3ecbeb2ce502aa6cdb84acc99e4e826ae 100644 (file)
--- a/tools/perf/util/pmu.h
+++ b/tools/perf/util/pmu.h
@@ -263,7 +263,7 @@ void perf_pmu__warn_invalid_config(struct perf_pmu *pmu, __u64 config,
                                   const char *config_name);
 void perf_pmu__warn_invalid_formats(struct perf_pmu *pmu);
 
-int perf_pmu__match(const char *pattern, const char *name, const char *tok);
+bool perf_pmu__match(const struct perf_pmu *pmu, const char *tok);
 
 double perf_pmu__cpu_slots_per_cycle(void);
 int perf_pmu__event_source_devices_scnprintf(char *pathname, size_t size);