From nobody Thu Dec 18 22:15:18 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 444E5C19F20 for ; Tue, 2 May 2023 22:46:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230367AbjEBWqe (ORCPT ); Tue, 2 May 2023 18:46:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35218 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230333AbjEBWqJ (ORCPT ); Tue, 2 May 2023 18:46:09 -0400 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 80F6530DD for ; Tue, 2 May 2023 15:45:41 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-b8f46dc51bdso8824755276.3 for ; Tue, 02 May 2023 15:45:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1683067446; x=1685659446; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=6DTTYiMDl8Yj+KSHhgdntFRxS2mVbWmHBiQYwku76Lg=; b=qIcCu4F4ipXFP1KhlrrY9hAFQfjYfnyjIWVRg/pF9X7JgwHFFfYH7JtWKWyF9h5stw DJHUzgE1eUF8HTsIfz2WQSiczrMJ/oOZB5y1bKeZBZqEXU8DZtULsiR09zCXDoc9Ky1t washr7kW4cKiaTY0DlaBKC3g9ex1OKc/uE+WOJXex2+3J9/271LWsJZMNGLYDFaLezBp OTfrA9TbdYrpGw+li83pG1E9dFbKYSDXXH3SgfBJS+rpBDK8yTx31dEy89Ibgq+0S8Sk xV4RcPkQ2/JGLUDGASSUjW9oYvno+6JqhLTZxpZxCinYdw67vtyCpi73aK00ku7MsGYp PhUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683067446; x=1685659446; 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=6DTTYiMDl8Yj+KSHhgdntFRxS2mVbWmHBiQYwku76Lg=; b=Rg/R5ukcTGJLFC5rHc6hgE+/SnI7m+/kRWXhtKeyN34ZLz5+Wpzor7jE1liIa77ogu rQmfAeb+yDxmh+rpwzz0SdCNw72ewTeegUtX6oRh6WycDYvvQ8QhhtUoCJgmb2QEacoi sy5n3z/OWqGWRPv86cnGiWpDr3OjiTMQ2t2+NZmjR1Uggu/EGblg/9hAX7IPgYlXCV+5 nYpYLNZRVFYC0GTGa0kwccM4YEz2DcwyIQpn8zyFj/qVWoDESz3nLE5csmuJ46plpbZC Q88+BfsmnFlkc0vcjcsJkBHbQFaTfh1nXU8Le/v3XE3Y8hEsV0qGIDiC79tiqTLApUDP tLww== X-Gm-Message-State: AC+VfDyEL/6p2LB+HrV+dxDrzznTw9oOPHvLae/YiweM0eqlHOQNAtQu ggAxhju4VdfSFYf902jCj2cXWD1Zsttw X-Google-Smtp-Source: ACHHUZ50FvgH7uzzNsRsTpHfx2O0DdSxoHTLqRCtSA04JIA1l31TAUW3CsOQl6k5Qu6HoOcow0aM5KXrPfmO X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:e70c:446b:d23b:982e]) (user=irogers job=sendgmr) by 2002:a25:5802:0:b0:b9d:b6cd:2dfd with SMTP id m2-20020a255802000000b00b9db6cd2dfdmr6428740ybb.8.1683067446252; Tue, 02 May 2023 15:44:06 -0700 (PDT) Date: Tue, 2 May 2023 15:38:48 -0700 In-Reply-To: <20230502223851.2234828-1-irogers@google.com> Message-Id: <20230502223851.2234828-42-irogers@google.com> Mime-Version: 1.0 References: <20230502223851.2234828-1-irogers@google.com> X-Mailer: git-send-email 2.40.1.495.gc816e09b53d-goog Subject: [PATCH v4 41/44] perf jevents: Don't rewrite metrics across PMUs 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" Don't rewrite metrics across PMUs as the result events likely won't be found. Identify metrics with a pair of PMU name and metric name. Signed-off-by: Ian Rogers --- tools/perf/pmu-events/jevents.py | 4 ++-- tools/perf/pmu-events/metric.py | 28 +++++++++++++++++----------- tools/perf/pmu-events/metric_test.py | 6 +++--- 3 files changed, 22 insertions(+), 16 deletions(-) diff --git a/tools/perf/pmu-events/jevents.py b/tools/perf/pmu-events/jeven= ts.py index b18dd2fcbf04..487ff01baf1b 100755 --- a/tools/perf/pmu-events/jevents.py +++ b/tools/perf/pmu-events/jevents.py @@ -391,11 +391,11 @@ def read_json_events(path: str, topic: str) -> Sequen= ce[JsonEvent]: except BaseException as err: print(f"Exception processing {path}") raise - metrics: list[Tuple[str, metric.Expression]] =3D [] + metrics: list[Tuple[str, str, metric.Expression]] =3D [] for event in events: event.topic =3D topic if event.metric_name and '-' not in event.metric_name: - metrics.append((event.metric_name, event.metric_expr)) + metrics.append((event.pmu, event.metric_name, event.metric_expr)) updates =3D metric.RewriteMetricsInTermsOfOthers(metrics) if updates: for event in events: diff --git a/tools/perf/pmu-events/metric.py b/tools/perf/pmu-events/metric= .py index 8ec0ba884673..af58b74d1644 100644 --- a/tools/perf/pmu-events/metric.py +++ b/tools/perf/pmu-events/metric.py @@ -552,28 +552,34 @@ def ParsePerfJson(orig: str) -> Expression: return _Constify(eval(compile(parsed, orig, 'eval'))) =20 =20 -def RewriteMetricsInTermsOfOthers(metrics: List[Tuple[str, Expression]] - )-> Dict[str, Expression]: +def RewriteMetricsInTermsOfOthers(metrics: List[Tuple[str, str, Expression= ]] + )-> Dict[Tuple[str, str], Expression]: """Shorten metrics by rewriting in terms of others. =20 Args: - metrics (list): pairs of metric names and their expressions. + metrics (list): pmus, metric names and their expressions. Returns: - Dict: mapping from a metric name to a shortened expression. + Dict: mapping from a pmu, metric name pair to a shortened expression. """ - updates: Dict[str, Expression] =3D dict() - for outer_name, outer_expression in metrics: + updates: Dict[Tuple[str, str], Expression] =3D dict() + for outer_pmu, outer_name, outer_expression in metrics: + if outer_pmu is None: + outer_pmu =3D 'cpu' updated =3D outer_expression while True: - for inner_name, inner_expression in metrics: + for inner_pmu, inner_name, inner_expression in metrics: + if inner_pmu is None: + inner_pmu =3D 'cpu' + if inner_pmu.lower() !=3D outer_pmu.lower(): + continue if inner_name.lower() =3D=3D outer_name.lower(): continue - if inner_name in updates: - inner_expression =3D updates[inner_name] + if (inner_pmu, inner_name) in updates: + inner_expression =3D updates[(inner_pmu, inner_name)] updated =3D updated.Substitute(inner_name, inner_expression) if updated.Equals(outer_expression): break - if outer_name in updates and updated.Equals(updates[outer_name]): + if (outer_pmu, outer_name) in updates and updated.Equals(updates[(ou= ter_pmu, outer_name)]): break - updates[outer_name] =3D updated + updates[(outer_pmu, outer_name)] =3D updated return updates diff --git a/tools/perf/pmu-events/metric_test.py b/tools/perf/pmu-events/m= etric_test.py index 40a3c7d8b2bc..ee22ff43ddd7 100755 --- a/tools/perf/pmu-events/metric_test.py +++ b/tools/perf/pmu-events/metric_test.py @@ -158,9 +158,9 @@ class TestMetricExpressions(unittest.TestCase): =20 def test_RewriteMetricsInTermsOfOthers(self): Expression.__eq__ =3D lambda e1, e2: e1.Equals(e2) - before =3D [('m1', ParsePerfJson('a + b + c + d')), - ('m2', ParsePerfJson('a + b + c'))] - after =3D {'m1': ParsePerfJson('m2 + d')} + before =3D [('cpu', 'm1', ParsePerfJson('a + b + c + d')), + ('cpu', 'm2', ParsePerfJson('a + b + c'))] + after =3D {('cpu', 'm1'): ParsePerfJson('m2 + d')} self.assertEqual(RewriteMetricsInTermsOfOthers(before), after) Expression.__eq__ =3D None =20 --=20 2.40.1.495.gc816e09b53d-goog