From nobody Thu Dec 18 08:37:57 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 94D4DC77B60 for ; Wed, 26 Apr 2023 07:07:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239942AbjDZHH4 (ORCPT ); Wed, 26 Apr 2023 03:07:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45888 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239914AbjDZHHP (ORCPT ); Wed, 26 Apr 2023 03:07:15 -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 60A843A9F for ; Wed, 26 Apr 2023 00:05:54 -0700 (PDT) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-54f8a3f6b03so105014377b3.2 for ; Wed, 26 Apr 2023 00:05:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1682492737; x=1685084737; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=hQLtw5RMB3Daw/2/bml2TpAPLMkiCqaBNsV2CgoJXks=; b=B5KI0A9KFlYxcY+7k1D7CUDFZvprNXA/okbjoAqOhSuauCGJZ5b07igWWW7E4jq/tm mZVH2hMLBFESMUOz5Xd+aKqrOfdewmKFgg7MAQVhe+gle01u1BFOMGwYv0jEQA83aPEZ ftkWXWafkTEhLxvP7dyb+UF0TT3g9MXnMyOGVACYEr10+zbpuCmJEXJjOstzbPcTZSZK JzXrmjxKE8sO0n1ZmTCpCa9s3CF+KEV+hpQPZrDV+T/EJni3d4WgJB+S1E6xJYt8OMxj t9KvpchghLLXp056Ssqn5bPldItVr8r3cgKtTfkKSV1PyH8lBaZKUrSiXdKjKb/5/E02 UaaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682492737; x=1685084737; 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=hQLtw5RMB3Daw/2/bml2TpAPLMkiCqaBNsV2CgoJXks=; b=FrEj4lpgcb/l0IgOeNOtjpy8PXjOQWn79kHsFdUEIoJuWMMu6GAvaGZM1ET/2yMdVO Gfo0jwjpDi8NnzfwwterKlHJ5JcsiDn4AT7MJwKjGJYM4IznNsBXho/o9mHsRvwpXFhv 8C915XbSIDSEhT0uIAqGsMADYmfOFOuhMnFIm9zq2n+qWXv9uOTsal12mV+aHlYhUyX6 nv6xzS7y2AFPe+ApNo6EYHjypojPWmv+0aqivdnpZTzQ5vDgmLQl0+BabRTZGpIPrzCv 4P/+PCwIOqagcW2o3HCn9pmdIg0bgwmW8ao3iMKYsLYC11W/thURv09bjwZUysU9zpg8 FXkw== X-Gm-Message-State: AAQBX9f2g1zgcCnP2hWFn3tnqd+sOa132vumNNE7wmAuCMxX4S2FfzQr i6HGvza0Ujp6+mrEANNsTg/q2IekhJxO X-Google-Smtp-Source: AKy350apWTU9HkhOaCBsCC7bZbmli/pO0tdxpBoo4po1yUZ6tk74U1W6It++yGs+Htsw8VyVXAfYW1zipfqO X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:144f:e890:2b29:48d9]) (user=irogers job=sendgmr) by 2002:a81:a843:0:b0:54f:68a1:b406 with SMTP id f64-20020a81a843000000b0054f68a1b406mr9571080ywh.2.1682492736855; Wed, 26 Apr 2023 00:05:36 -0700 (PDT) Date: Wed, 26 Apr 2023 00:00:43 -0700 In-Reply-To: <20230426070050.1315519-1-irogers@google.com> Message-Id: <20230426070050.1315519-34-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 33/40] perf parse-events: Don't auto merge hybrid wildcard events 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" Bring back the behavior of not auto-merging hybrid events by delegating to a test in pmu. Signed-off-by: Ian Rogers --- tools/perf/util/parse-events.c | 5 ++++- tools/perf/util/parse-events.y | 4 +++- tools/perf/util/pmu.c | 5 +++++ tools/perf/util/pmu.h | 1 + 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index 98e424257278..b62dcc51b22f 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -1718,16 +1718,19 @@ int parse_events_multi_pmu_add(struct parse_events_= state *parse_state, =20 while ((pmu =3D perf_pmu__scan(pmu)) !=3D NULL) { struct perf_pmu_alias *alias; + bool auto_merge_stats; =20 if (parse_events__filter_pmu(parse_state, pmu)) continue; =20 + auto_merge_stats =3D perf_pmu__auto_merge_stats(pmu); + list_for_each_entry(alias, &pmu->aliases, list) { if (!strcasecmp(alias->name, str)) { parse_events_copy_term_list(head, &orig_head); if (!parse_events_add_pmu(parse_state, list, pmu->name, orig_head, - /*auto_merge_stats=3D*/true)) { + auto_merge_stats)) { pr_debug("%s -> %s/%s/\n", str, pmu->name, alias->str); ok++; diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y index f4ee03b5976b..4e1f5de35be8 100644 --- a/tools/perf/util/parse-events.y +++ b/tools/perf/util/parse-events.y @@ -327,10 +327,12 @@ PE_NAME opt_pmu_config name +=3D 7; if (!perf_pmu__match(pattern, name, $1) || !perf_pmu__match(pattern, pmu->alias_name, $1)) { + bool auto_merge_stats =3D perf_pmu__auto_merge_stats(pmu); + if (parse_events_copy_term_list(orig_terms, &terms)) CLEANUP_YYABORT; if (!parse_events_add_pmu(parse_state, list, pmu->name, terms, - /*auto_merge_stats=3D*/true)) { + auto_merge_stats)) { ok++; parse_state->wild_card_pmus =3D true; } diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index cd4247a379d4..f4f0afbc391c 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -1660,6 +1660,11 @@ bool perf_pmu__supports_wildcard_numeric(const struc= t perf_pmu *pmu) return is_pmu_core(pmu->name) || perf_pmu__is_hybrid(pmu->name); } =20 +bool perf_pmu__auto_merge_stats(const struct perf_pmu *pmu) +{ + return !perf_pmu__is_hybrid(pmu->name); +} + static bool pmu_alias_is_duplicate(struct sevent *alias_a, struct sevent *alias_b) { diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h index 5a19536a5449..0e0cb6283594 100644 --- a/tools/perf/util/pmu.h +++ b/tools/perf/util/pmu.h @@ -222,6 +222,7 @@ struct perf_pmu *perf_pmu__scan(struct perf_pmu *pmu); bool is_pmu_core(const char *name); bool perf_pmu__supports_legacy_cache(const struct perf_pmu *pmu); bool perf_pmu__supports_wildcard_numeric(const struct perf_pmu *pmu); +bool perf_pmu__auto_merge_stats(const struct perf_pmu *pmu); void print_pmu_events(const struct print_callbacks *print_cb, void *print_= state); bool pmu_have_event(const char *pname, const char *name); =20 --=20 2.40.1.495.gc816e09b53d-goog