From nobody Wed Sep 10 05:46:11 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 CC125C64EC4 for ; Wed, 8 Mar 2023 08:19:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229762AbjCHITg (ORCPT ); Wed, 8 Mar 2023 03:19:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36970 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230109AbjCHITI (ORCPT ); Wed, 8 Mar 2023 03:19:08 -0500 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1E045AF741 for ; Wed, 8 Mar 2023 00:18:57 -0800 (PST) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-5376fa4106eso162384627b3.7 for ; Wed, 08 Mar 2023 00:18:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1678263537; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=2Zi5p4CfxjslDfFVesFPJB5iL1V/LCfUtX6duyKxd8c=; b=YdAdLYcK8sWIVTwyTrqtRaR0SjJ9t8Q0EKD3edlPqX+FxA9MzgM6TZl6ceBNdgiQLr kSvt73qy5ImkjXyUHvd7rYBpwT6IqP3nFqaSAM6c8f4bu/fNU2RNrclF/0UbR5HLPwJk uGx9i5KdvGIMqsC4LcJAAJEhAtNP7ABrM6pa2zxLFp4s9LumMndYD4K9hM6sCEpNl7XL 2ikQCmQBV2One9usFWx0yEgMZ3eqd0zzXM1WghkmON1pEExWdeqxPtFNHqGE66lpnSka vpdMbU5TPlLaIcQAfi/8+bBsHsLwuCQGMIq+Z2KHyRr6Cjmbt7QlKp2ukoB98EDvuFFs BogA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678263537; 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=2Zi5p4CfxjslDfFVesFPJB5iL1V/LCfUtX6duyKxd8c=; b=m+5fkJE1DgjexqhMASNh+qsz4RN0jJYWIRtFByujnlktJJPbhk7Ieb7Q+xIZKnkXxb mC+wE9crcwXATdnxeu/jZuU8xDgurRAbHSA0H8vIL3+mzhDPqmhFXt/USBZUuw/NZoU1 51lQBFN+kFiKVLEaIlMRdGW+HMJg/954+s11SX6krhqN0jM0u2JURBggjDP2qP+ugcEw bMV26WLjvwNbAslB/coPvI04ARV4rMmhKThKODy6nbCdC7UxhUgOrGSasZ9vNdoAaOfs AX2FVCJhTSsCKFWr8pApqKpDIO6Xk0BIdZAMTmMO/fw6fnjQdSMO1Tl58QyR4k1lw8n/ 4C0g== X-Gm-Message-State: AO0yUKVVoInWmei5GVQ8BmYprilBtksp4MBw2txhuJbzYdqJrpYJxPI9 GXaWLFE5rZ/KwvDIZR+SJIiWjwShEOYL X-Google-Smtp-Source: AK7set/qNl7v0DhqfD6Z5logJRcak5Yq2B6AAWQJB8MADi/RRnIgEzcYG7sfKvgy++dVM8wRwcRtoUNtjD4s X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:9a99:fbc4:7488:8b5f]) (user=irogers job=sendgmr) by 2002:a5b:688:0:b0:aa9:bd2e:3744 with SMTP id j8-20020a5b0688000000b00aa9bd2e3744mr8322221ybq.9.1678263536785; Wed, 08 Mar 2023 00:18:56 -0800 (PST) Date: Wed, 8 Mar 2023 00:17:29 -0800 In-Reply-To: <20230308081731.1887278-1-irogers@google.com> Message-Id: <20230308081731.1887278-10-irogers@google.com> Mime-Version: 1.0 References: <20230308081731.1887278-1-irogers@google.com> X-Mailer: git-send-email 2.40.0.rc0.216.gc4246ad0f0-goog Subject: [PATCH v3 09/11] perf evsel: Remove use_uncore_alias From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Mark Rutland , Adrian Hunter , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Kan Liang , Zhengjun Xing , Ravi Bangoria , "Steinar H. Gunderson" , Qi Liu , Kim Phillips , Florian Fischer , James Clark , Suzuki Poulouse , Sean Christopherson , Leo Yan , John Garry , Kajol Jain , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Stephane Eranian , 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" This flag used to be used when regrouping uncore events in particular due to wildcard matches. This is now handled by sorting evlist and so the flag is redundant. Signed-off-by: Ian Rogers --- tools/perf/util/evsel.c | 1 - tools/perf/util/evsel.h | 1 - tools/perf/util/parse-events.c | 12 +++--------- tools/perf/util/parse-events.h | 3 +-- tools/perf/util/parse-events.y | 11 +++++++---- 5 files changed, 11 insertions(+), 17 deletions(-) diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index 51d9650267d0..b9b05091bc8f 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -458,7 +458,6 @@ struct evsel *evsel__clone(struct evsel *orig) evsel->per_pkg =3D orig->per_pkg; evsel->percore =3D orig->percore; evsel->precise_max =3D orig->precise_max; - evsel->use_uncore_alias =3D orig->use_uncore_alias; evsel->is_libpfm_event =3D orig->is_libpfm_event; =20 evsel->exclude_GH =3D orig->exclude_GH; diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h index d26745ca6147..c272c06565c0 100644 --- a/tools/perf/util/evsel.h +++ b/tools/perf/util/evsel.h @@ -89,7 +89,6 @@ struct evsel { bool per_pkg; bool percore; bool precise_max; - bool use_uncore_alias; bool is_libpfm_event; bool auto_merge_stats; bool collect_stat; diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index 394ab23089d0..93a90651266f 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -1445,15 +1445,13 @@ static int parse_events__inside_hybrid_pmu(struct p= arse_events_state *parse_stat int parse_events_add_pmu(struct parse_events_state *parse_state, struct list_head *list, char *name, struct list_head *head_config, - bool auto_merge_stats, - bool use_alias) + bool auto_merge_stats) { struct perf_event_attr attr; struct perf_pmu_info info; struct perf_pmu *pmu; struct evsel *evsel; struct parse_events_error *err =3D parse_state->error; - bool use_uncore_alias; LIST_HEAD(config_terms); =20 pmu =3D parse_state->fake_pmu ?: perf_pmu__find(name); @@ -1488,8 +1486,6 @@ int parse_events_add_pmu(struct parse_events_state *p= arse_state, memset(&attr, 0, sizeof(attr)); } =20 - use_uncore_alias =3D (pmu->is_uncore && use_alias); - if (!head_config) { attr.type =3D pmu->type; evsel =3D __add_event(list, &parse_state->idx, &attr, @@ -1499,7 +1495,6 @@ int parse_events_add_pmu(struct parse_events_state *p= arse_state, /*cpu_list=3D*/NULL); if (evsel) { evsel->pmu_name =3D name ? strdup(name) : NULL; - evsel->use_uncore_alias =3D use_uncore_alias; return 0; } else { return -ENOMEM; @@ -1560,7 +1555,6 @@ int parse_events_add_pmu(struct parse_events_state *p= arse_state, evsel->use_config_name =3D true; =20 evsel->pmu_name =3D name ? strdup(name) : NULL; - evsel->use_uncore_alias =3D use_uncore_alias; evsel->percore =3D config_term_percore(&evsel->config_terms); =20 if (parse_state->fake_pmu) @@ -1622,7 +1616,7 @@ int parse_events_multi_pmu_add(struct parse_events_st= ate *parse_state, parse_events_copy_term_list(head, &orig_head); if (!parse_events_add_pmu(parse_state, list, pmu->name, orig_head, - true, true)) { + /*auto_merge_stats=3D*/true)) { pr_debug("%s -> %s/%s/\n", str, pmu->name, alias->str); ok++; @@ -1634,7 +1628,7 @@ int parse_events_multi_pmu_add(struct parse_events_st= ate *parse_state, =20 if (parse_state->fake_pmu) { if (!parse_events_add_pmu(parse_state, list, str, head, - true, true)) { + /*auto_merge_stats=3D*/true)) { pr_debug("%s -> %s/%s/\n", str, "fake_pmu", str); ok++; } diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h index 22fc11b0bd59..fdac44dc696b 100644 --- a/tools/perf/util/parse-events.h +++ b/tools/perf/util/parse-events.h @@ -183,8 +183,7 @@ int parse_events_add_breakpoint(struct list_head *list,= int *idx, int parse_events_add_pmu(struct parse_events_state *parse_state, struct list_head *list, char *name, struct list_head *head_config, - bool auto_merge_stats, - bool use_alias); + bool auto_merge_stats); =20 struct evsel *parse_events__add_event(int idx, struct perf_event_attr *att= r, const char *name, const char *metric_id, diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y index 90d12f2bc8be..f1b153c72d67 100644 --- a/tools/perf/util/parse-events.y +++ b/tools/perf/util/parse-events.y @@ -313,7 +313,7 @@ event_pmu_name opt_pmu_config list =3D alloc_list(); if (!list) CLEANUP_YYABORT; - if (parse_events_add_pmu(_parse_state, list, $1, $2, false, false)) { + if (parse_events_add_pmu(_parse_state, list, $1, $2, /*auto_merge_stats= =3D*/false)) { struct perf_pmu *pmu =3D NULL; int ok =3D 0; =20 @@ -330,8 +330,10 @@ event_pmu_name opt_pmu_config !perf_pmu__match(pattern, pmu->alias_name, $1)) { if (parse_events_copy_term_list(orig_terms, &terms)) CLEANUP_YYABORT; - if (!parse_events_add_pmu(_parse_state, list, pmu->name, terms, true, = false)) + if (!parse_events_add_pmu(_parse_state, list, pmu->name, terms, + /*auto_merge_stats=3D*/true)) { ok++; + } parse_events_terms__delete(terms); } } @@ -407,7 +409,8 @@ PE_PMU_EVENT_FAKE sep_dc if (!list) YYABORT; =20 - err =3D parse_events_add_pmu(_parse_state, list, $1, NULL, false, false); + err =3D parse_events_add_pmu(_parse_state, list, $1, /*head_config=3D*/NU= LL, + /*auto_merge_stats=3D*/false); free($1); if (err < 0) { free(list); @@ -425,7 +428,7 @@ PE_PMU_EVENT_FAKE opt_pmu_config if (!list) YYABORT; =20 - err =3D parse_events_add_pmu(_parse_state, list, $1, $2, false, false); + err =3D parse_events_add_pmu(_parse_state, list, $1, $2, /*auto_merge_sta= ts=3D*/false); free($1); parse_events_terms__delete($2); if (err < 0) { --=20 2.40.0.rc0.216.gc4246ad0f0-goog