From nobody Thu Dec 18 08:37:46 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5D0FDC77B78 for ; Wed, 26 Apr 2023 07:06:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239563AbjDZHGs (ORCPT ); Wed, 26 Apr 2023 03:06:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40118 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239903AbjDZHGK (ORCPT ); Wed, 26 Apr 2023 03:06:10 -0400 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D306B3AAD for ; Wed, 26 Apr 2023 00:04:59 -0700 (PDT) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-54f6dd3b329so112047987b3.0 for ; Wed, 26 Apr 2023 00:04:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1682492680; x=1685084680; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=TAyALJLbbNr9SCrL2Eb+Aq75dpB9I3JfjYXmWchzgIY=; b=oOtOathYOIJyWxRF2gIMlIjlIwE54UasuOWHZShcnLf2b1fGoWhuwE/gsgKVU9tT/m xSm/du7WfhWaNsqvNCLUbWUgLpoNX3TDuLYy5iaK+aAtxvY9GC1ulL3opGbvMItmnONF 1VsT4UCU4t+OamZRPAXH3Fm87Ujs8CdL8yXI4Y/ZA1xx0L1/Tr5vgzJ/C4JzOIK1sZO2 MuJf5G9CQqcb2FMwVgZqyie9ei9iKVpyB73rFdowgf0stg0viVLJL+6Xf67pmDLAPPpF P9i3xKNnB6oQrz4Xbv3NqielT/Fle3/UXkOU2cjnSfkwMDz8JKPJNQAiLSlgOj2wRHj/ gLmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682492680; x=1685084680; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=TAyALJLbbNr9SCrL2Eb+Aq75dpB9I3JfjYXmWchzgIY=; b=TJyyeKJdH9/0abJ1mv1BG0WgJoheFMqzm2yLbIJBi/t2cZKHI8YObYLRh5MGeK+y8/ qLlavwQU5S4pXlrFeA8kAV9mykahdww9tfUHX4mi9OzSC3limH85kekKHgr0xGRWkmn1 lgnO77npPrNm8NY1UnS/mvy27T7DxsEsRkiRPaw/RudqeZtQAU1AMHVxxFaKotKqzIyg Z2arWMIUXRSeI236v0OeTXxThM1e1uPTkM4mzwY97sNeuKPTVsTaOd3No8HiKeLuUZ4J y3YrLuH39K00Y9QepY1bKUB87wHo3tVCEX0B3TQ/9uv0CLQqsPqwv98xpl3Dhw4AU9sA U5WQ== X-Gm-Message-State: AAQBX9dIUPPCFwFMA5L+Oaoa/L1MX6zf9ouMs8T7oYCnqlZnsK0T4S6p srgFLrpFd7gJU6H6LpHdkaXKKYa83gy5 X-Google-Smtp-Source: AKy350ZHTE5oUR9a4Uo2iZcViqjcyYoO7hRdzwCXJHiomFpA3+8DUIFRVN4GXU1twlxy44bbzTw5uK4ATK+u X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:144f:e890:2b29:48d9]) (user=irogers job=sendgmr) by 2002:a81:b248:0:b0:54c:bf7:1853 with SMTP id q69-20020a81b248000000b0054c0bf71853mr9738764ywh.6.1682492680178; Wed, 26 Apr 2023 00:04:40 -0700 (PDT) Date: Wed, 26 Apr 2023 00:00:36 -0700 In-Reply-To: <20230426070050.1315519-1-irogers@google.com> Message-Id: <20230426070050.1315519-27-irogers@google.com> Mime-Version: 1.0 References: <20230426070050.1315519-1-irogers@google.com> X-Mailer: git-send-email 2.40.1.495.gc816e09b53d-goog Subject: [PATCH v1 26/40] perf parse-events: Add pmu filter From: Ian Rogers To: Arnaldo Carvalho de Melo , Kan Liang , Ahmad Yasin , Peter Zijlstra , Ingo Molnar , Stephane Eranian , Andi Kleen , Perry Taylor , Samantha Alt , Caleb Biggers , Weilin Wang , Edward Baker , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Adrian Hunter , Florian Fischer , Rob Herring , Zhengjun Xing , John Garry , Kajol Jain , Sumanth Korikkar , Thomas Richter , Tiezhu Yang , Ravi Bangoria , Leo Yan , Yang Jihong , James Clark , Suzuki Poulouse , Kang Minchul , Athira Rajeev , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ian Rogers Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" To support the cputype argument added to "perf stat" for hybrid it is necessary to filter events during wildcard matching. Add a scanner argument for the filter and checking it when wildcard matching. Signed-off-by: Ian Rogers --- tools/perf/builtin-record.c | 13 +++++++-- tools/perf/builtin-stat.c | 10 +++++-- tools/perf/builtin-top.c | 5 +++- tools/perf/builtin-trace.c | 5 +++- tools/perf/tests/parse-events.c | 3 +- tools/perf/tests/pmu-events.c | 3 +- tools/perf/util/evlist.h | 1 - tools/perf/util/metricgroup.c | 4 +-- tools/perf/util/parse-events.c | 51 ++++++++++++++++++++++++--------- tools/perf/util/parse-events.h | 21 ++++++++++---- tools/perf/util/parse-events.y | 6 ++-- 11 files changed, 90 insertions(+), 32 deletions(-) diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index 7b7e74a56346..7e4490dfc0b5 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -3335,6 +3335,14 @@ const char record_callchain_help[] =3D CALLCHAIN_REC= ORD_HELP =20 static bool dry_run; =20 +static struct parse_events_option_args parse_events_option_args =3D { + .evlistp =3D &record.evlist, +}; + +static struct parse_events_option_args switch_output_parse_events_option_a= rgs =3D { + .evlistp =3D &record.sb_evlist, +}; + /* * XXX Will stay a global variable till we fix builtin-script.c to stop me= ssing * with it and switch to use the library functions in perf_evlist that came @@ -3343,7 +3351,7 @@ static bool dry_run; * using pipes, etc. */ static struct option __record_options[] =3D { - OPT_CALLBACK('e', "event", &record.evlist, "event", + OPT_CALLBACK('e', "event", &parse_events_option_args, "event", "event selector. use 'perf list' to list available events", parse_events_option), OPT_CALLBACK(0, "filter", &record.evlist, "filter", @@ -3496,7 +3504,8 @@ static struct option __record_options[] =3D { &record.switch_output.set, "signal or size[BKMG] or time[smhd]", "Switch output when receiving SIGUSR2 (signal) or cross a size or tim= e threshold", "signal"), - OPT_CALLBACK_SET(0, "switch-output-event", &record.sb_evlist, &record.swi= tch_output_event_set, "switch output event", + OPT_CALLBACK_SET(0, "switch-output-event", &switch_output_parse_events_op= tion_args, + &record.switch_output_event_set, "switch output event", "switch output event selector. use 'perf list' to list available event= s", parse_events_option_new_evlist), OPT_INTEGER(0, "switch-max-files", &record.switch_output.num_files, diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index eb34f5418ad3..46210fa3f14b 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c @@ -101,6 +101,10 @@ static void print_counters(struct timespec *ts, int argc, const char **arg= v); =20 static struct evlist *evsel_list; +static struct parse_events_option_args parse_events_option_args =3D { + .evlistp =3D &evsel_list, +}; + static bool all_counters_use_bpf =3D true; =20 static struct target target =3D { @@ -1096,8 +1100,8 @@ static int parse_hybrid_type(const struct option *opt, return -1; } =20 - evlist->hybrid_pmu_name =3D perf_pmu__hybrid_type_to_pmu(str); - if (!evlist->hybrid_pmu_name) { + parse_events_option_args.pmu_filter =3D perf_pmu__hybrid_type_to_pmu(str); + if (!parse_events_option_args.pmu_filter) { fprintf(stderr, "--cputype %s is not supported!\n", str); return -1; } @@ -1108,7 +1112,7 @@ static int parse_hybrid_type(const struct option *opt, static struct option stat_options[] =3D { OPT_BOOLEAN('T', "transaction", &transaction_run, "hardware transaction statistics"), - OPT_CALLBACK('e', "event", &evsel_list, "event", + OPT_CALLBACK('e', "event", &parse_events_option_args, "event", "event selector. use 'perf list' to list available events", parse_events_option), OPT_CALLBACK(0, "filter", &evsel_list, "filter", diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c index eb5740154bc0..48ee49e95c5e 100644 --- a/tools/perf/builtin-top.c +++ b/tools/perf/builtin-top.c @@ -1440,12 +1440,15 @@ int cmd_top(int argc, const char **argv) .max_stack =3D sysctl__max_stack(), .nr_threads_synthesize =3D UINT_MAX, }; + struct parse_events_option_args parse_events_option_args =3D { + .evlistp =3D &top.evlist, + }; bool branch_call_mode =3D false; struct record_opts *opts =3D &top.record_opts; struct target *target =3D &opts->target; const char *disassembler_style =3D NULL, *objdump_path =3D NULL, *addr2li= ne_path =3D NULL; const struct option options[] =3D { - OPT_CALLBACK('e', "event", &top.evlist, "event", + OPT_CALLBACK('e', "event", &parse_events_option_args, "event", "event selector. use 'perf list' to list available events", parse_events_option), OPT_U64('c', "count", &opts->user_interval, "event period to sample"), diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c index 8ee3a45c3c54..b49d3abb1203 100644 --- a/tools/perf/builtin-trace.c +++ b/tools/perf/builtin-trace.c @@ -4591,8 +4591,11 @@ static int trace__parse_events_option(const struct o= ption *opt, const char *str, err =3D 0; =20 if (lists[0]) { + struct parse_events_option_args parse_events_option_args =3D { + .evlistp =3D &trace->evlist, + }; struct option o =3D { - .value =3D &trace->evlist, + .value =3D &parse_events_option_args, }; err =3D parse_events_option(&o, lists[0], 0); } diff --git a/tools/perf/tests/parse-events.c b/tools/perf/tests/parse-event= s.c index 6aea51e33dc0..0b8ec9b1034f 100644 --- a/tools/perf/tests/parse-events.c +++ b/tools/perf/tests/parse-events.c @@ -1938,7 +1938,8 @@ static int test_event_fake_pmu(const char *str) return -ENOMEM; =20 parse_events_error__init(&err); - ret =3D __parse_events(evlist, str, &err, &perf_pmu__fake, /*warn_if_reor= dered=3D*/true); + ret =3D __parse_events(evlist, str, /*pmu_filter=3D*/NULL, &err, + &perf_pmu__fake, /*warn_if_reordered=3D*/true); if (ret) { pr_debug("failed to parse event '%s', err %d, str '%s'\n", str, ret, err.str); diff --git a/tools/perf/tests/pmu-events.c b/tools/perf/tests/pmu-events.c index a2cde61b1c77..734004f1a37d 100644 --- a/tools/perf/tests/pmu-events.c +++ b/tools/perf/tests/pmu-events.c @@ -776,7 +776,8 @@ static int check_parse_id(const char *id, struct parse_= events_error *error, for (cur =3D strchr(dup, '@') ; cur; cur =3D strchr(++cur, '@')) *cur =3D '/'; =20 - ret =3D __parse_events(evlist, dup, error, fake_pmu, /*warn_if_reordered= =3D*/true); + ret =3D __parse_events(evlist, dup, /*pmu_filter=3D*/NULL, error, fake_pm= u, + /*warn_if_reordered=3D*/true); free(dup); =20 evlist__delete(evlist); diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h index 46cf402add93..e7e5540cc970 100644 --- a/tools/perf/util/evlist.h +++ b/tools/perf/util/evlist.h @@ -67,7 +67,6 @@ struct evlist { struct evsel *selected; struct events_stats stats; struct perf_env *env; - const char *hybrid_pmu_name; void (*trace_event_sample_raw)(struct evlist *evlist, union perf_event *event, struct perf_sample *sample); diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c index 4b9a16291b96..46fc31cff124 100644 --- a/tools/perf/util/metricgroup.c +++ b/tools/perf/util/metricgroup.c @@ -1441,8 +1441,8 @@ static int parse_ids(bool metric_no_merge, struct per= f_pmu *fake_pmu, } pr_debug("Parsing metric events '%s'\n", events.buf); parse_events_error__init(&parse_error); - ret =3D __parse_events(parsed_evlist, events.buf, &parse_error, fake_pmu, - /*warn_if_reordered=3D*/false); + ret =3D __parse_events(parsed_evlist, events.buf, /*pmu_filter=3D*/NULL, + &parse_error, fake_pmu, /*warn_if_reordered=3D*/false); if (ret) { parse_events_error__print(&parse_error, events.buf); goto err_out; diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index fad0dd4b86b2..29fa84c4cdd4 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -464,8 +464,24 @@ int parse_events__decode_legacy_cache(const char *name= , int pmu_type, __u64 *con return 0; } =20 +/** + * parse_events__filter_pmu - returns false if a wildcard PMU should be + * considered, true if it should be filtered. + */ +bool parse_events__filter_pmu(const struct parse_events_state *parse_state, + const struct perf_pmu *pmu) +{ + if (parse_state->pmu_filter =3D=3D NULL) + return false; + + if (pmu->name =3D=3D NULL) + return true; + + return strcmp(parse_state->pmu_filter, pmu->name) !=3D 0; +} + int parse_events_add_cache(struct list_head *list, int *idx, const char *n= ame, - struct parse_events_error *err, + struct parse_events_state *parse_state, struct list_head *head_config) { struct perf_pmu *pmu =3D NULL; @@ -485,6 +501,9 @@ int parse_events_add_cache(struct list_head *list, int = *idx, const char *name, if (pmu->is_uncore || pmu->type =3D=3D PERF_TYPE_SOFTWARE) continue; =20 + if (parse_events__filter_pmu(parse_state, pmu)) + continue; + memset(&attr, 0, sizeof(attr)); attr.type =3D PERF_TYPE_HW_CACHE; =20 @@ -498,8 +517,7 @@ int parse_events_add_cache(struct list_head *list, int = *idx, const char *name, found_supported =3D true; =20 if (head_config) { - if (config_attr(&attr, head_config, err, - config_term_common)) + if (config_attr(&attr, head_config, parse_state->error, config_term_com= mon)) return -EINVAL; =20 if (get_config_terms(head_config, &config_terms)) @@ -1493,6 +1511,9 @@ int parse_events_add_numeric(struct parse_events_stat= e *parse_state, if (!perf_pmu__supports_wildcard_numeric(pmu)) continue; =20 + if (parse_events__filter_pmu(parse_state, pmu)) + continue; + found_supported =3D true; ret =3D __parse_events_add_numeric(parse_state, list, pmu->type, config,= head_config); if (ret) @@ -1686,6 +1707,9 @@ int parse_events_multi_pmu_add(struct parse_events_st= ate *parse_state, while ((pmu =3D perf_pmu__scan(pmu)) !=3D NULL) { struct perf_pmu_alias *alias; =20 + if (parse_events__filter_pmu(parse_state, pmu)) + continue; + list_for_each_entry(alias, &pmu->aliases, list) { if (!strcasecmp(alias->name, str)) { parse_events_copy_term_list(head, &orig_head); @@ -2118,7 +2142,7 @@ static bool parse_events__sort_events_and_fix_groups(= struct list_head *list) return idx_changed || num_leaders !=3D orig_num_leaders; } =20 -int __parse_events(struct evlist *evlist, const char *str, +int __parse_events(struct evlist *evlist, const char *str, const char *pmu= _filter, struct parse_events_error *err, struct perf_pmu *fake_pmu, bool warn_if_reordered) { @@ -2129,6 +2153,7 @@ int __parse_events(struct evlist *evlist, const char = *str, .evlist =3D evlist, .stoken =3D PE_START_EVENTS, .fake_pmu =3D fake_pmu, + .pmu_filter =3D pmu_filter, .match_legacy_cache_terms =3D true, }; int ret; @@ -2310,12 +2335,13 @@ void parse_events_error__print(struct parse_events_= error *err, int parse_events_option(const struct option *opt, const char *str, int unset __maybe_unused) { - struct evlist *evlist =3D *(struct evlist **)opt->value; + struct parse_events_option_args *args =3D opt->value; struct parse_events_error err; int ret; =20 parse_events_error__init(&err); - ret =3D parse_events(evlist, str, &err); + ret =3D __parse_events(*args->evlistp, str, args->pmu_filter, &err, + /*fake_pmu=3D*/NULL, /*warn_if_reordered=3D*/true); =20 if (ret) { parse_events_error__print(&err, str); @@ -2328,22 +2354,21 @@ int parse_events_option(const struct option *opt, c= onst char *str, =20 int parse_events_option_new_evlist(const struct option *opt, const char *s= tr, int unset) { - struct evlist **evlistp =3D opt->value; + struct parse_events_option_args *args =3D opt->value; int ret; =20 - if (*evlistp =3D=3D NULL) { - *evlistp =3D evlist__new(); + if (*args->evlistp =3D=3D NULL) { + *args->evlistp =3D evlist__new(); =20 - if (*evlistp =3D=3D NULL) { + if (*args->evlistp =3D=3D NULL) { fprintf(stderr, "Not enough memory to create evlist\n"); return -1; } } - ret =3D parse_events_option(opt, str, unset); if (ret) { - evlist__delete(*evlistp); - *evlistp =3D NULL; + evlist__delete(*args->evlistp); + *args->evlistp =3D NULL; } =20 return ret; diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h index 77b8f7efdb94..d4cbda6e946a 100644 --- a/tools/perf/util/parse-events.h +++ b/tools/perf/util/parse-events.h @@ -22,17 +22,24 @@ bool is_event_supported(u8 type, u64 config); =20 const char *event_type(int type); =20 +/* Arguments encoded in opt->value. */ +struct parse_events_option_args { + struct evlist **evlistp; + const char *pmu_filter; +}; int parse_events_option(const struct option *opt, const char *str, int uns= et); int parse_events_option_new_evlist(const struct option *opt, const char *s= tr, int unset); -__attribute__((nonnull(1, 2, 3))) -int __parse_events(struct evlist *evlist, const char *str, struct parse_ev= ents_error *error, - struct perf_pmu *fake_pmu, bool warn_if_reordered); +__attribute__((nonnull(1, 2, 4))) +int __parse_events(struct evlist *evlist, const char *str, const char *pmu= _filter, + struct parse_events_error *error, struct perf_pmu *fake_pmu, + bool warn_if_reordered); =20 __attribute__((nonnull(1, 2, 3))) static inline int parse_events(struct evlist *evlist, const char *str, struct parse_events_error *err) { - return __parse_events(evlist, str, err, /*fake_pmu=3D*/NULL, /*warn_if_re= ordered=3D*/true); + return __parse_events(evlist, str, /*pmu_filter=3D*/NULL, err, /*fake_pmu= =3D*/NULL, + /*warn_if_reordered=3D*/true); } =20 int parse_event(struct evlist *evlist, const char *str); @@ -122,11 +129,15 @@ struct parse_events_state { struct list_head *terms; int stoken; struct perf_pmu *fake_pmu; + /* If non-null, when wildcard matching only match the given PMU. */ + const char *pmu_filter; /* Should PE_LEGACY_NAME tokens be generated for config terms? */ bool match_legacy_cache_terms; bool wild_card_pmus; }; =20 +bool parse_events__filter_pmu(const struct parse_events_state *parse_state, + const struct perf_pmu *pmu); void parse_events__shrink_config_terms(void); int parse_events__is_hardcoded_term(struct parse_events_term *term); int parse_events_term__num(struct parse_events_term **term, @@ -171,7 +182,7 @@ int parse_events_add_tool(struct parse_events_state *pa= rse_state, struct list_head *list, int tool_event); int parse_events_add_cache(struct list_head *list, int *idx, const char *n= ame, - struct parse_events_error *error, + struct parse_events_state *parse_state, struct list_head *head_config); int parse_events__decode_legacy_cache(const char *name, int pmu_type, __u6= 4 *config); int parse_events_add_breakpoint(struct list_head *list, int *idx, diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y index e709508b1d6e..c95877cbd6cf 100644 --- a/tools/perf/util/parse-events.y +++ b/tools/perf/util/parse-events.y @@ -312,6 +312,9 @@ PE_NAME opt_pmu_config while ((pmu =3D perf_pmu__scan(pmu)) !=3D NULL) { char *name =3D pmu->name; =20 + if (parse_events__filter_pmu(parse_state, pmu)) + continue; + if (!strncmp(name, "uncore_", 7) && strncmp($1, "uncore_", 7)) name +=3D 7; @@ -473,13 +476,12 @@ event_legacy_cache: PE_LEGACY_CACHE opt_event_config { struct parse_events_state *parse_state =3D _parse_state; - struct parse_events_error *error =3D parse_state->error; struct list_head *list; int err; =20 list =3D alloc_list(); ABORT_ON(!list); - err =3D parse_events_add_cache(list, &parse_state->idx, $1, error, $2); + err =3D parse_events_add_cache(list, &parse_state->idx, $1, parse_state, = $2); =20 parse_events_terms__delete($2); free($1); --=20 2.40.1.495.gc816e09b53d-goog