From nobody Sun Sep 14 11:12:44 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 98E62C25B4E for ; Tue, 24 Jan 2023 06:34:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232865AbjAXGeD (ORCPT ); Tue, 24 Jan 2023 01:34:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49250 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232570AbjAXGd6 (ORCPT ); Tue, 24 Jan 2023 01:33:58 -0500 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 4D9153D936 for ; Mon, 23 Jan 2023 22:33:48 -0800 (PST) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-4faa8f4bfb9so141537327b3.17 for ; Mon, 23 Jan 2023 22:33:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=+mNj+eN7H0uNDnKMkq51DjW40YsleRJ8vwRWU7dz4QY=; b=CL03b5QHkoB3uLRyi5YhAqUJ1Ya1DIeLNnleziaSRXUmOxri9MYmcW8rqtDHeifqt8 wkm+D7H/3BcrVyOCxIqMpIYoKUkQApYxD3zj2FcOXfxymyBcDvJAotVw+is4rnNtkhu1 r/Lk+ZLMEYSOW5A40rT7RmknPERSWBi6Idrlc98DcAJaYzj+39VZElfYx2MB6cCqK216 pQ8S8mpbmNvMxyn6muqlMdTNtmewgeP+VZqaKKWw1o0F9LHZCoRJPM9cqcZBUPiy3PGG urk2PD+y6m7Pwao/R4cX9W8hwbviRMZY/kB8YqV2xR6DfNugK0Nn6fXjNHMwekZr0pWr NKJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=+mNj+eN7H0uNDnKMkq51DjW40YsleRJ8vwRWU7dz4QY=; b=dNk33kZL6AlH+KFiW2z38yp9htdJxqOaaYDAWbRrfvEUgWFEu10T8/UR3LFlnIyph1 5qmstgbge5+LgeypjgHvkwJpyV7bVSba+4+9BN/nnaAigdMw1z8u+W3YsHxmcofwCrgZ LWvvm5s39BrMfzafoAP/Tf0fGWGBcwtc/3SMTP1tIXC36YeoUYCUWltmXbd9vYnmVIHt xVQHPS4jG89lGN1AzPKSciz9JFINhZZydrndklrWWudheI0iORq3yh//1O0hOJN6kqJZ LhzNwRKdsYtFfdeTVvp6yYpjpDHueUB/mcvLq9KLgYbCgLGaHUte+7RYCGXYn9OaFUgI LUSA== X-Gm-Message-State: AFqh2krX2NejrfuM+AUc62MNISry9eHoLdlfB7YglpJoLJHDZmnNDYP+ Y3HVBmenPj8UEMn14HtNmnc8f44ayiAF X-Google-Smtp-Source: AMrXdXtyW+GyNqvfDgGw0ffVskP1+lNmWojOKMYHVDZ46E7P7gOWQ2JznYssW+xCwItFReoBSN++fA3TdZh8 X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:460d:1b4a:acb8:ae9a]) (user=irogers job=sendgmr) by 2002:a81:9196:0:b0:3d7:b184:9885 with SMTP id i144-20020a819196000000b003d7b1849885mr3797485ywg.125.1674542027502; Mon, 23 Jan 2023 22:33:47 -0800 (PST) Date: Mon, 23 Jan 2023 22:33:11 -0800 In-Reply-To: <20230124063320.668917-1-irogers@google.com> Message-Id: <20230124063320.668917-3-irogers@google.com> Mime-Version: 1.0 References: <20230124063320.668917-1-irogers@google.com> X-Mailer: git-send-email 2.39.0.246.g2a6d74b583-goog Subject: [PATCH v3 02/11] perf jevents metric: Add ability to rewrite metrics in terms of others From: Ian Rogers To: John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Adrian Hunter , Kan Liang , Kim Phillips , Florian Fischer , Ravi Bangoria , Xing Zhengjun , Rob Herring , Kang Minchul , linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, Sandipan Das , Jing Zhang , linuxppc-dev@lists.ozlabs.org, Kajol Jain Cc: Stephane Eranian , Perry Taylor , Caleb Biggers , 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" Add RewriteMetricsInTermsOfOthers that iterates over pairs of names and expressions trying to replace an expression, within the current expression, with its name. Signed-off-by: Ian Rogers --- tools/perf/pmu-events/metric.py | 73 +++++++++++++++++++++++++++- tools/perf/pmu-events/metric_test.py | 10 ++++ 2 files changed, 81 insertions(+), 2 deletions(-) diff --git a/tools/perf/pmu-events/metric.py b/tools/perf/pmu-events/metric= .py index 2f2fd220e843..ed13efac7389 100644 --- a/tools/perf/pmu-events/metric.py +++ b/tools/perf/pmu-events/metric.py @@ -4,7 +4,7 @@ import ast import decimal import json import re -from typing import Dict, List, Optional, Set, Union +from typing import Dict, List, Optional, Set, Tuple, Union =20 =20 class Expression: @@ -26,6 +26,9 @@ class Expression: """Returns true when two expressions are the same.""" raise NotImplementedError() =20 + def Substitute(self, name: str, expression: 'Expression') -> 'Expression= ': + raise NotImplementedError() + def __str__(self) -> str: return self.ToPerfJson() =20 @@ -186,6 +189,15 @@ class Operator(Expression): other.lhs) and self.rhs.Equals(other.rhs) return False =20 + def Substitute(self, name: str, expression: Expression) -> Expression: + if self.Equals(expression): + return Event(name) + lhs =3D self.lhs.Substitute(name, expression) + rhs =3D None + if self.rhs: + rhs =3D self.rhs.Substitute(name, expression) + return Operator(self.operator, lhs, rhs) + =20 class Select(Expression): """Represents a select ternary in the parse tree.""" @@ -225,6 +237,14 @@ class Select(Expression): other.false_val) and self.true_val.Equals(other.true_val) return False =20 + def Substitute(self, name: str, expression: Expression) -> Expression: + if self.Equals(expression): + return Event(name) + true_val =3D self.true_val.Substitute(name, expression) + cond =3D self.cond.Substitute(name, expression) + false_val =3D self.false_val.Substitute(name, expression) + return Select(true_val, cond, false_val) + =20 class Function(Expression): """A function in an expression like min, max, d_ratio.""" @@ -267,6 +287,15 @@ class Function(Expression): return result return False =20 + def Substitute(self, name: str, expression: Expression) -> Expression: + if self.Equals(expression): + return Event(name) + lhs =3D self.lhs.Substitute(name, expression) + rhs =3D None + if self.rhs: + rhs =3D self.rhs.Substitute(name, expression) + return Function(self.fn, lhs, rhs) + =20 def _FixEscapes(s: str) -> str: s =3D re.sub(r'([^\\]),', r'\1\\,', s) @@ -293,6 +322,9 @@ class Event(Expression): def Equals(self, other: Expression) -> bool: return isinstance(other, Event) and self.name =3D=3D other.name =20 + def Substitute(self, name: str, expression: Expression) -> Expression: + return self + =20 class Constant(Expression): """A constant within the expression tree.""" @@ -317,6 +349,9 @@ class Constant(Expression): def Equals(self, other: Expression) -> bool: return isinstance(other, Constant) and self.value =3D=3D other.value =20 + def Substitute(self, name: str, expression: Expression) -> Expression: + return self + =20 class Literal(Expression): """A runtime literal within the expression tree.""" @@ -336,6 +371,9 @@ class Literal(Expression): def Equals(self, other: Expression) -> bool: return isinstance(other, Literal) and self.value =3D=3D other.value =20 + def Substitute(self, name: str, expression: Expression) -> Expression: + return self + =20 def min(lhs: Union[int, float, Expression], rhs: Union[int, float, Expression]) -> Fun= ction: @@ -461,6 +499,7 @@ class MetricGroup: =20 =20 class _RewriteIfExpToSelect(ast.NodeTransformer): + """Transformer to convert if-else nodes to Select expressions.""" =20 def visit_IfExp(self, node): # pylint: disable=3Dinvalid-name @@ -498,7 +537,37 @@ def ParsePerfJson(orig: str) -> Expression: for kw in keywords: py =3D re.sub(rf'Event\(r"{kw}"\)', kw, py) =20 - parsed =3D ast.parse(py, mode=3D'eval') + try: + parsed =3D ast.parse(py, mode=3D'eval') + except SyntaxError as e: + raise SyntaxError(f'Parsing expression:\n{orig}') from e _RewriteIfExpToSelect().visit(parsed) parsed =3D ast.fix_missing_locations(parsed) return _Constify(eval(compile(parsed, orig, 'eval'))) + + +def RewriteMetricsInTermsOfOthers(metrics: list[Tuple[str, Expression]] + )-> Dict[str, Expression]: + """Shorten metrics by rewriting in terms of others. + + Args: + metrics (list): pairs of metric names and their expressions. + Returns: + Dict: mapping from a metric name to a shortened expression. + """ + updates: Dict[str, Expression] =3D dict() + for outer_name, outer_expression in metrics: + updated =3D outer_expression + while True: + for inner_name, inner_expression in metrics: + if inner_name.lower() =3D=3D outer_name.lower(): + continue + if inner_name in updates: + inner_expression =3D updates[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]): + break + updates[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 15315d0f716c..ced5998bd827 100644 --- a/tools/perf/pmu-events/metric_test.py +++ b/tools/perf/pmu-events/metric_test.py @@ -2,7 +2,9 @@ import unittest from metric import Constant from metric import Event +from metric import Expression from metric import ParsePerfJson +from metric import RewriteMetricsInTermsOfOthers =20 =20 class TestMetricExpressions(unittest.TestCase): @@ -153,5 +155,13 @@ class TestMetricExpressions(unittest.TestCase): after =3D '0 * SLOTS' self.assertEqual(ParsePerfJson(before).Simplify().ToPerfJson(), after) =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')} + self.assertEqual(RewriteMetricsInTermsOfOthers(before), after) + Expression.__eq__ =3D None + if __name__ =3D=3D '__main__': unittest.main() --=20 2.39.0.246.g2a6d74b583-goog