From nobody Wed Sep 17 06:42:28 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 C8391C3DA79 for ; Wed, 21 Dec 2022 22:34:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235032AbiLUWep (ORCPT ); Wed, 21 Dec 2022 17:34:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45598 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234948AbiLUWei (ORCPT ); Wed, 21 Dec 2022 17:34:38 -0500 Received: from mail-pj1-x104a.google.com (mail-pj1-x104a.google.com [IPv6:2607:f8b0:4864:20::104a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6250D2BC0 for ; Wed, 21 Dec 2022 14:34:37 -0800 (PST) Received: by mail-pj1-x104a.google.com with SMTP id t15-20020a17090a4e4f00b00225a7107898so2586pjl.9 for ; Wed, 21 Dec 2022 14:34:37 -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=SSNQl52T6aONyRJU3JLzaiDjv/uDuW/eBBmo/7p1gyM=; b=hWrFQqbUjVIgEbk5/HxS/gkX6UYWMxIViM61QrBDErGTC0CBNoIoSRAGz4VBIy+Jr7 JswhbaKF216kLto8y6J0fNHcsV3xpaxqEJUkJbD+LHzyL6/kkMwmt8zPho3uLPm5a1tU 7T0VUBlzwmSB8KANwYWZ61vZ432nW1Ri7IIk/cr49jkIDjO4Oxy7NlMPIhaxhInVLxGy ltZAVnrt/pg51qXbCr0/25IVChcILeO1bWJ/6ep813uuo6FrGRblDVK16UPmaEFBryDQ ofPEuG9v8tmkKCKD09he2BxVBvloOkyTcDODFbe2QSWp7KFy4BP1B8TDzbO7Dja+3Obs xBqQ== 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=SSNQl52T6aONyRJU3JLzaiDjv/uDuW/eBBmo/7p1gyM=; b=EeIzNo+n6aT0FkViy5jb0WfpwQsr4DITm1mgIwLUdv9Xo3FOCNnmDynHgZnN4LQx/U lFMpBPhQxGq6W8iPFIURAcGNsurhJsFXMq9JXeIJBPgBSXYZ82PWoYmlHGd3CGtoYPuO oVSskOHyv4NJp7QCHcvcp8hlip70V/2RuW0n68E13w1vAxLUDIxSl8N6UPk+n9MTlhdw zcJ7NLlKuhctmIeS21D+EfOYQFOGbsQQbMvqUJEYLIFwDa4bw5ImHPYeHpaUY2Wfpmx1 JjckEg5e5sNjYHyrpjtFRUGrX4lox7kWSgVMISJktEu4VFvxsiMkKboQdAysSmbbFxPW N5dw== X-Gm-Message-State: AFqh2kpNg6ZLkjMECdioIAhDgtJinbaQ6JGKb5/ATbOXgX8G4fEetWsr bdjHAQCSUmgVP4+SEN48h6CSR4d3F9HU X-Google-Smtp-Source: AMrXdXv2jCTZRqgvHNw/zlM6+eqhzbGTGQXu+45bytWBX9fVfz/bcWmBaNU4rA3CFSzsBRM24pb0+K70sXOG X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:62bd:f120:1fd8:1d21]) (user=irogers job=sendgmr) by 2002:aa7:8ecc:0:b0:57c:ec11:dc0a with SMTP id b12-20020aa78ecc000000b0057cec11dc0amr247300pfr.40.1671662076792; Wed, 21 Dec 2022 14:34:36 -0800 (PST) Date: Wed, 21 Dec 2022 14:34:12 -0800 In-Reply-To: <20221221223420.2157113-1-irogers@google.com> Message-Id: <20221221223420.2157113-2-irogers@google.com> Mime-Version: 1.0 References: <20221221223420.2157113-1-irogers@google.com> X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog Subject: [PATCH v2 1/9] perf jevents metric: Correct Function equality 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" rhs may not be defined, say for source_count, so add a guard. Signed-off-by: Ian Rogers --- tools/perf/pmu-events/metric.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/perf/pmu-events/metric.py b/tools/perf/pmu-events/metric= .py index 4797ed4fd817..2f2fd220e843 100644 --- a/tools/perf/pmu-events/metric.py +++ b/tools/perf/pmu-events/metric.py @@ -261,8 +261,10 @@ class Function(Expression): =20 def Equals(self, other: Expression) -> bool: if isinstance(other, Function): - return self.fn =3D=3D other.fn and self.lhs.Equals( - other.lhs) and self.rhs.Equals(other.rhs) + result =3D self.fn =3D=3D other.fn and self.lhs.Equals(other.lhs) + if self.rhs: + result =3D result and self.rhs.Equals(other.rhs) + return result return False =20 =20 --=20 2.39.0.314.g84b9a713c41-goog From nobody Wed Sep 17 06:42:28 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 8C13FC4332F for ; Wed, 21 Dec 2022 22:34:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235098AbiLUWew (ORCPT ); Wed, 21 Dec 2022 17:34:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45662 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235042AbiLUWeq (ORCPT ); Wed, 21 Dec 2022 17:34:46 -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 122A564EB for ; Wed, 21 Dec 2022 14:34:45 -0800 (PST) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-3dfb9d11141so3921547b3.3 for ; Wed, 21 Dec 2022 14:34:45 -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=XSRdXmmYpH3FUi2ntSEaBZfMzdFPCToyU2P+KywsVtE=; b=NvffAvuaPXn6ccEpX8X07e5RRoMC12LkowBZEDZmy/VL6P7LQ5DbzNaf40i08etEDX ZrCCHFTZaM6dTI5lWq5CZwfAtt5n11ZgnoYtIjS0eps9AxnGF4SzE+3NhHhYCf97teX9 +h+YsC4zqbDV5Tiu6c+sFYAd0Ev+oGyiUjqGEOAvjj1NEaOigELNK7b/GcGevDv5w33X xkHa3VCMZNC3Z1g0KJ4z8rZNEoJhAawuX8F/MtsRICQjsUggG/bkv4zNHCj9TOQOZgIZ lx+HZ4IkQJ71oIH0yk+VPa7/ExO0mpUQFZd9/JgUWcBeKEHpAPsGnquGoF2Znl8+kPL3 kGyw== 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=XSRdXmmYpH3FUi2ntSEaBZfMzdFPCToyU2P+KywsVtE=; b=hYNfTuG5RRGk70NnWQLNpEZ271NapnMPezR7gDsW3GPJM2FVZTO+4T10tgMLZwOK8r vi6AAU3tvCFNjixMVWJiidUxACJfzAJ2Lgq0ChmRe35k9PgO/4LW02HBV+Q9LxO/sX34 u633hz4eDTUcpe7l0xUDSilswf0qC4E7cDWKS0lTnNeG8WCi6bzrqKyp4vJqXcdMgBc6 MLEKKSFr7WDMx5xE/IzASSo3daXLBwr6ePFYIY59K48uLa5/yW3OnuyNPO5l0A272ikF 9TmFAlzqfuDYol7wRUfrRoWbAqbULSESOpXb6Nihn3BhylEVvOR72ZmSaerNuttzW8gA +U8A== X-Gm-Message-State: AFqh2kqOFYvpx14rY4JCqQzPFeE82DUNrpKiup65ZmMCGrhM1q2Pcr5N XFmxPnaZEx+OjrMFmIaM8cutZ1WMaYFj X-Google-Smtp-Source: AMrXdXseIoVcrpixKyOR38LsCfRTlml7LxBXKDfiBv7hPRHdbJC1+xCKUhQtTkCoFSX5S/w0c23+hrejYK1Q X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:62bd:f120:1fd8:1d21]) (user=irogers job=sendgmr) by 2002:a0d:ca54:0:b0:370:4a99:df7d with SMTP id m81-20020a0dca54000000b003704a99df7dmr254226ywd.308.1671662084298; Wed, 21 Dec 2022 14:34:44 -0800 (PST) Date: Wed, 21 Dec 2022 14:34:13 -0800 In-Reply-To: <20221221223420.2157113-1-irogers@google.com> Message-Id: <20221221223420.2157113-3-irogers@google.com> Mime-Version: 1.0 References: <20221221223420.2157113-1-irogers@google.com> X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog Subject: [PATCH v2 2/9] 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.314.g84b9a713c41-goog From nobody Wed Sep 17 06:42:28 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 53D18C4332F for ; Wed, 21 Dec 2022 22:35:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235183AbiLUWfT (ORCPT ); Wed, 21 Dec 2022 17:35:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45848 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235115AbiLUWfE (ORCPT ); Wed, 21 Dec 2022 17:35:04 -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 95CA4101FA for ; Wed, 21 Dec 2022 14:34:51 -0800 (PST) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-349423f04dbso3634597b3.13 for ; Wed, 21 Dec 2022 14:34:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=content-transfer-encoding:cc:to:from:subject:references :mime-version:message-id:in-reply-to:date:from:to:cc:subject:date :message-id:reply-to; bh=p6Ltg4f6uWL2k+LZiF466krcgS3aBizbqVelMESPLmU=; b=KLo5zAINtEhTy5AFiXvYhnTWFonz2gHXklS2cIgblZMzDqBGkvD/GjAhIbm8nbedAP G43TLqjfZ6HYOq6kQ3M6MlobEyHfYtBTwzBDWRY/dm++ym7mS1yUHPofAqRwrn2R9QTg ZUN2Z4vunBRPE/O73l2AeZy+wuvJR97b1giojICmxup/IQgwWU+JA9ojKBP2fkomqql7 ScZmQ7bSmFvruZvR4ImWtFGVRKLnQvkCks8Yq4MAzbAYZrWkjagLKSOjUwM0JrgKJDd6 x8JqtGCGq7mXrCezWgcnTJlXlDVc4lMkKIq32ZgeQ7x4oKx+RdEHJsX3QoiCzLZLgNCa iyYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding: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=p6Ltg4f6uWL2k+LZiF466krcgS3aBizbqVelMESPLmU=; b=f3vUsmLfBjwUx6tODXtxFK8L29+1TFqs77mbDjO+dHwRSPbrchebjrvMOqJsLBKK4t LTZMTGMvgAuD5WqZUhkrmJ3t0jrHWsPdQb/2kgWPsBpZWuc1O6UicQjXaEcVl93GUnos 1MYuY4kEBosY3HJj28ZWpPg/w97hLO64c3GUsfELZ4OcO3H4rFI9565taXB0I8sKuxmV 7oKlZl034T1iJdXlsCGSJNnIgbLNScKzHphyG7GF0Lxu5xvlQt+laQoMu5o3k9nj5tBf HsHqk+MEO+0QUV0G9F81yjMwXY2S8kWp7gIbolttf19pol5IHVq9bUZB4ifqalAgvYb1 ppwQ== X-Gm-Message-State: AFqh2kq+j7fQhPzHHq10Q9ekPF9rkzQUcuIs+eoA3y6VQoyyecIxSrW+ CD+qAKrY3RatcRuLjXooidESnJpvnnI/ X-Google-Smtp-Source: AMrXdXsci0AMSF8Hr2DpdojcQrgVMbQ5l9lfm2lHEIIViWRShp+iXq7vcYMkxVW6Y3EwFrGoDRp5Su0CP7t4 X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:62bd:f120:1fd8:1d21]) (user=irogers job=sendgmr) by 2002:a81:b642:0:b0:373:6e8a:e7db with SMTP id h2-20020a81b642000000b003736e8ae7dbmr317784ywk.144.1671662090799; Wed, 21 Dec 2022 14:34:50 -0800 (PST) Date: Wed, 21 Dec 2022 14:34:14 -0800 In-Reply-To: <20221221223420.2157113-1-irogers@google.com> Message-Id: <20221221223420.2157113-4-irogers@google.com> Mime-Version: 1.0 References: <20221221223420.2157113-1-irogers@google.com> X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog Subject: [PATCH v2 3/9] perf jevents: Rewrite metrics in the same file with each other 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 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Rewrite metrics within the same file in terms of each other. For example, o= n Power8 other_stall_cpi is rewritten from: "PM_CMPLU_STALL / PM_RUN_INST_CMPL - PM_CMPLU_STALL_BRU_CRU / PM_RUN_INST_C= MPL - PM_CMPLU_STALL_FXU / PM_RUN_INST_CMPL - PM_CMPLU_STALL_VSU / PM_RUN_I= NST_CMPL - PM_CMPLU_STALL_LSU / PM_RUN_INST_CMPL - PM_CMPLU_STALL_NTCG_FLUS= H / PM_RUN_INST_CMPL - PM_CMPLU_STALL_NO_NTF / PM_RUN_INST_CMPL" to: "stall_cpi - bru_cru_stall_cpi - fxu_stall_cpi - vsu_stall_cpi - lsu_stall_= cpi - ntcg_flush_cpi - no_ntf_stall_cpi" Which more closely matches the definition on Power9. To avoid recomputation decorate the function with a cache. Signed-off-by: Ian Rogers --- tools/perf/pmu-events/jevents.py | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/tools/perf/pmu-events/jevents.py b/tools/perf/pmu-events/jeven= ts.py index 4c398e0eeb2f..229402565425 100755 --- a/tools/perf/pmu-events/jevents.py +++ b/tools/perf/pmu-events/jevents.py @@ -3,6 +3,7 @@ """Convert directories of JSON events to C code.""" import argparse import csv +from functools import lru_cache import json import metric import os @@ -337,18 +338,28 @@ class JsonEvent: s =3D self.build_c_string() return f'{{ { _bcs.offsets[s] } }}, /* {s} */\n' =20 - +@lru_cache(maxsize=3DNone) def read_json_events(path: str, topic: str) -> Sequence[JsonEvent]: """Read json events from the specified file.""" - try: - result =3D json.load(open(path), object_hook=3DJsonEvent) + events =3D json.load(open(path), object_hook=3DJsonEvent) except BaseException as err: print(f"Exception processing {path}") raise - for event in result: + metrics: list[Tuple[str, metric.Expression]] =3D [] + for event in events: event.topic =3D topic - return result + if event.metric_name and '-' not in event.metric_name: + metrics.append((event.metric_name, event.metric_expr)) + updates =3D metric.RewriteMetricsInTermsOfOthers(metrics) + if updates: + for event in events: + if event.metric_name in updates: + # print(f'Updated {event.metric_name} from\n"{event.metric_expr}"\= n' + # f'to\n"{updates[event.metric_name]}"') + event.metric_expr =3D updates[event.metric_name] + + return events =20 def preprocess_arch_std_files(archpath: str) -> None: """Read in all architecture standard events.""" --=20 2.39.0.314.g84b9a713c41-goog From nobody Wed Sep 17 06:42:28 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 B9A05C4332F for ; Wed, 21 Dec 2022 22:35:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235185AbiLUWfo (ORCPT ); Wed, 21 Dec 2022 17:35:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46736 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235184AbiLUWfV (ORCPT ); Wed, 21 Dec 2022 17:35:21 -0500 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BCBFE27908 for ; Wed, 21 Dec 2022 14:35:01 -0800 (PST) Received: by mail-yb1-xb4a.google.com with SMTP id 203-20020a2502d4000000b006f94ab02400so40288ybc.2 for ; Wed, 21 Dec 2022 14:35:01 -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=Ls0258QukRp98cBsGSybuOa7ZN2tgGfsj9SodVAm45U=; b=jpEfsjnW+b/8Imkd0pyofUEMO34H/M4npdJw7bbRJL0RTjYqAcns6OYUHp1mAAcy0l poHoIrluZPP0QVFgcSB1ov0U6XN13lbBE9F0sE+OguZh+ckUJbI79QeS9TvdEHdJMtth iOpNrJQ6aFPwZXyJVPX9MdMpmJmTalYLvVSzxcHDUEx2cKJTHlkK2EF8ViohqF7VIsjm 8TBg03qbhWC/MAwADa2JdruJ/rTL+JGTICmnKaYQSKtLMy39m9oNP9NKRNQgeULmDxZw AjKMT9STt48UXxo2itKKSyvQNPTxsIVBP7tC1F/2r4w2EWzF1ENLuUehH95QKiyzP3M+ vv0A== 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=Ls0258QukRp98cBsGSybuOa7ZN2tgGfsj9SodVAm45U=; b=yZgerbmyprXG7nHHsi2xeCDcvdpmDb9z42tNSyJHu7PiYy/ZPWHagJd8o4yXntClfR A/cHvEGMhBGi5kJWaYBBjU5OfOubLEMxc7K/arpZuLuGg9oIiZ0iItGXGka6V17ZnGu/ /M7JG23TiUWr9ldfccrzYcnzuPGYBADB0pI+ZvnmLEURT3L462M8wEhhaZGwZ92YWI59 fO7k/cn2eP+QGYlL/1FTCeTDI9+L6B1SDrFow/OdE64k7TgSZd2AqHVqLr7LZRZQJma9 g7hwecKlaL+VfSvzoY2tYAje/zQIJkeWzLlco/9U3bmcULI4RhKnhyeUSr367FFkHS5R L/eQ== X-Gm-Message-State: AFqh2kqRe0T9ck9pBzTgX/ctIlT8JbGjcSzHYHXqQYQveSxjCq9LFf0g EBaSLWrw5kMzAfoR+oUq87J7uBux0PET X-Google-Smtp-Source: AMrXdXvclqFY5Kg5W3b54xrPjG14ucWVI16lcQ5va8QUmBSHDZz47nk+iXfVeZdZ4UarlB5GH042GPx95DTS X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:62bd:f120:1fd8:1d21]) (user=irogers job=sendgmr) by 2002:a25:314:0:b0:71b:f630:ecc8 with SMTP id 20-20020a250314000000b0071bf630ecc8mr441450ybd.131.1671662100443; Wed, 21 Dec 2022 14:35:00 -0800 (PST) Date: Wed, 21 Dec 2022 14:34:15 -0800 In-Reply-To: <20221221223420.2157113-1-irogers@google.com> Message-Id: <20221221223420.2157113-5-irogers@google.com> Mime-Version: 1.0 References: <20221221223420.2157113-1-irogers@google.com> X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog Subject: [PATCH v2 4/9] perf pmu-events: Separate metric out of pmu_event 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" Previously both events and metrics were encoded in struct pmu_event. Create a new pmu_metric that has the metric related variables and remove these from pmu_event. Add iterators for pmu_metric and use in places that metrics are desired rather than events. Note, this change removes the setting of evsel's metric_name/expr as these fields are no longer part of struct pmu_event. The metric remains but is no longer implicitly requested when the event is. This impacts a few Intel uncore events, however, as the ScaleUnit is shared by the event and the metric this utility is questionable. Also the MetricNames look broken (contain spaces) in some cases and when trying to use the functionality with '-e' the metrics fail but regular metrics with '-M' work. For example, on SkylakeX '-M' works: ``` $ perf stat -M LLC_MISSES.PCIE_WRITE -a sleep 1 Performance counter stats for 'system wide': 0 UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART2 # 57896.0 = Bytes LLC_MISSES.PCIE_WRITE (49.84%) 7,174 UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART1 = (49.85%) 0 UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART3 = (50.16%) 63 UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART0 = (50.15%) 1.004576381 seconds time elapsed ``` whilst the event '-e' version is broken even with --group/-g (fwiw, we shou= ld also remove -g [1]): ``` $ perf stat -g -e LLC_MISSES.PCIE_WRITE -g -a sleep 1 Add UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART2 event to groups to get metric e= xpression for LLC_MISSES.PCIE_WRITE Add UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART1 event to groups to get metric e= xpression for LLC_MISSES.PCIE_WRITE Add UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART3 event to groups to get metric e= xpression for LLC_MISSES.PCIE_WRITE Add UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART0 event to groups to get metric e= xpression for LLC_MISSES.PCIE_WRITE Add UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART2 event to groups to get metric e= xpression for LLC_MISSES.PCIE_WRITE Add UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART1 event to groups to get metric e= xpression for LLC_MISSES.PCIE_WRITE Add UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART3 event to groups to get metric e= xpression for LLC_MISSES.PCIE_WRITE Add UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART0 event to groups to get metric e= xpression for LLC_MISSES.PCIE_WRITE Add UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART2 event to groups to get metric e= xpression for LLC_MISSES.PCIE_WRITE Add UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART1 event to groups to get metric e= xpression for LLC_MISSES.PCIE_WRITE Add UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART3 event to groups to get metric e= xpression for LLC_MISSES.PCIE_WRITE Add UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART0 event to groups to get metric e= xpression for LLC_MISSES.PCIE_WRITE Add UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART2 event to groups to get metric e= xpression for LLC_MISSES.PCIE_WRITE Add UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART1 event to groups to get metric e= xpression for LLC_MISSES.PCIE_WRITE Add UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART3 event to groups to get metric e= xpression for LLC_MISSES.PCIE_WRITE Add UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART0 event to groups to get metric e= xpression for LLC_MISSES.PCIE_WRITE Add UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART2 event to groups to get metric e= xpression for LLC_MISSES.PCIE_WRITE Add UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART1 event to groups to get metric e= xpression for LLC_MISSES.PCIE_WRITE Add UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART3 event to groups to get metric e= xpression for LLC_MISSES.PCIE_WRITE Add UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART0 event to groups to get metric e= xpression for LLC_MISSES.PCIE_WRITE Add UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART2 event to groups to get metric e= xpression for LLC_MISSES.PCIE_WRITE Add UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART1 event to groups to get metric e= xpression for LLC_MISSES.PCIE_WRITE Add UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART3 event to groups to get metric e= xpression for LLC_MISSES.PCIE_WRITE Add UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART0 event to groups to get metric e= xpression for LLC_MISSES.PCIE_WRITE Performance counter stats for 'system wide': 27,316 Bytes LLC_MISSES.PCIE_WRITE 1.004505469 seconds time elapsed ``` The code also carries warnings where the user is supposed to select events for metrics [2] but given the lack of use of such a feature, let's clean the code and just remove. With NO_JEVENTS=3D1 the empty-pmu-events.c is used and the separation to use metrics causes "Parse and process metrics" and "Event expansion for cgroups" to fail as they fail to find necessary metrics. This is fixed in a later change. [1] https://lore.kernel.org/lkml/20220707195610.303254-1-irogers@google.com/ [2] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree= /tools/perf/util/stat-shadow.c?id=3D01b8957b738f42f96a130079bc951b3cc78c5b8= a#n425 Signed-off-by: Ian Rogers --- tools/perf/arch/powerpc/util/header.c | 4 +- tools/perf/builtin-list.c | 20 +-- tools/perf/pmu-events/empty-pmu-events.c | 73 ++++++++-- tools/perf/pmu-events/jevents.py | 82 +++++++++++- tools/perf/pmu-events/pmu-events.h | 20 ++- tools/perf/tests/pmu-events.c | 62 +++------ tools/perf/util/metricgroup.c | 161 +++++++++++------------ tools/perf/util/metricgroup.h | 2 +- tools/perf/util/parse-events.c | 2 - tools/perf/util/pmu.c | 35 +---- tools/perf/util/pmu.h | 9 -- tools/perf/util/print-events.c | 32 ++--- tools/perf/util/print-events.h | 3 +- 13 files changed, 266 insertions(+), 239 deletions(-) diff --git a/tools/perf/arch/powerpc/util/header.c b/tools/perf/arch/powerp= c/util/header.c index e8fe36b10d20..78eef77d8a8d 100644 --- a/tools/perf/arch/powerpc/util/header.c +++ b/tools/perf/arch/powerpc/util/header.c @@ -40,11 +40,11 @@ get_cpuid_str(struct perf_pmu *pmu __maybe_unused) return bufp; } =20 -int arch_get_runtimeparam(const struct pmu_event *pe) +int arch_get_runtimeparam(const struct pmu_metric *pm) { int count; char path[PATH_MAX] =3D "/devices/hv_24x7/interface/"; =20 - atoi(pe->aggr_mode) =3D=3D PerChip ? strcat(path, "sockets") : strcat(pat= h, "coresperchip"); + atoi(pm->aggr_mode) =3D=3D PerChip ? strcat(path, "sockets") : strcat(pat= h, "coresperchip"); return sysfs__read_int(path, &count) < 0 ? 1 : count; } diff --git a/tools/perf/builtin-list.c b/tools/perf/builtin-list.c index 137d73edb541..791f513ae5b4 100644 --- a/tools/perf/builtin-list.c +++ b/tools/perf/builtin-list.c @@ -99,8 +99,7 @@ static void default_print_event(void *ps, const char *pmu= _name, const char *topi const char *scale_unit __maybe_unused, bool deprecated, const char *event_type_desc, const char *desc, const char *long_desc, - const char *encoding_desc, - const char *metric_name, const char *metric_expr) + const char *encoding_desc) { struct print_state *print_state =3D ps; int pos; @@ -159,10 +158,6 @@ static void default_print_event(void *ps, const char *= pmu_name, const char *topi if (print_state->detailed && encoding_desc) { printf("%*s", 8, ""); wordwrap(encoding_desc, 8, pager_get_columns(), 0); - if (metric_name) - printf(" MetricName: %s", metric_name); - if (metric_expr) - printf(" MetricExpr: %s", metric_expr); putchar('\n'); } } @@ -308,8 +303,7 @@ static void json_print_event(void *ps, const char *pmu_= name, const char *topic, const char *scale_unit, bool deprecated, const char *event_type_desc, const char *desc, const char *long_desc, - const char *encoding_desc, - const char *metric_name, const char *metric_expr) + const char *encoding_desc) { struct json_print_state *print_state =3D ps; bool need_sep =3D false; @@ -366,16 +360,6 @@ static void json_print_event(void *ps, const char *pmu= _name, const char *topic, encoding_desc); need_sep =3D true; } - if (metric_name) { - fix_escape_printf(&buf, "%s\t\"MetricName\": \"%S\"", need_sep ? ",\n" := "", - metric_name); - need_sep =3D true; - } - if (metric_expr) { - fix_escape_printf(&buf, "%s\t\"MetricExpr\": \"%S\"", need_sep ? ",\n" := "", - metric_expr); - need_sep =3D true; - } printf("%s}", need_sep ? "\n" : ""); strbuf_release(&buf); } diff --git a/tools/perf/pmu-events/empty-pmu-events.c b/tools/perf/pmu-even= ts/empty-pmu-events.c index 480e8f0d30c8..5572a4d1eddb 100644 --- a/tools/perf/pmu-events/empty-pmu-events.c +++ b/tools/perf/pmu-events/empty-pmu-events.c @@ -11,7 +11,7 @@ #include #include =20 -static const struct pmu_event pme_test_soc_cpu[] =3D { +static const struct pmu_event pmu_events__test_soc_cpu[] =3D { { .name =3D "l3_cache_rd", .event =3D "event=3D0x40", @@ -105,6 +105,14 @@ static const struct pmu_event pme_test_soc_cpu[] =3D { .desc =3D "L2 BTB Correction", .topic =3D "branch", }, + { + .name =3D 0, + .event =3D 0, + .desc =3D 0, + }, +}; + +static const struct pmu_metric pmu_metrics__test_soc_cpu[] =3D { { .metric_expr =3D "1 / IPC", .metric_name =3D "CPI", @@ -170,9 +178,8 @@ static const struct pmu_event pme_test_soc_cpu[] =3D { .metric_name =3D "L1D_Cache_Fill_BW", }, { - .name =3D 0, - .event =3D 0, - .desc =3D 0, + .metric_expr =3D 0, + .metric_name =3D 0, }, }; =20 @@ -181,6 +188,11 @@ struct pmu_events_table { const struct pmu_event *entries; }; =20 +/* Struct used to make the PMU metric table implementation opaque to calle= rs. */ +struct pmu_metrics_table { + const struct pmu_metric *entries; +}; + /* * Map a CPU to its table of PMU events. The CPU is identified by the * cpuid field, which is an arch-specific identifier for the CPU. @@ -192,7 +204,8 @@ struct pmu_events_table { struct pmu_events_map { const char *arch; const char *cpuid; - const struct pmu_events_table table; + const struct pmu_events_table event_table; + const struct pmu_metrics_table metric_table; }; =20 /* @@ -203,12 +216,14 @@ static const struct pmu_events_map pmu_events_map[] = =3D { { .arch =3D "testarch", .cpuid =3D "testcpu", - .table =3D { pme_test_soc_cpu }, + .event_table =3D { pmu_events__test_soc_cpu }, + .metric_table =3D { pmu_metrics__test_soc_cpu }, }, { .arch =3D 0, .cpuid =3D 0, - .table =3D { 0 }, + .event_table =3D { 0 }, + .metric_table =3D { 0 }, }, }; =20 @@ -254,9 +269,7 @@ static const struct pmu_sys_events pmu_sys_event_tables= [] =3D { int pmu_events_table_for_each_event(const struct pmu_events_table *table, = pmu_event_iter_fn fn, void *data) { - for (const struct pmu_event *pe =3D &table->entries[0]; - pe->name || pe->metric_group || pe->metric_name; - pe++) { + for (const struct pmu_event *pe =3D &table->entries[0]; pe->name; pe++) { int ret =3D fn(pe, table, data); =20 if (ret) @@ -265,6 +278,21 @@ int pmu_events_table_for_each_event(const struct pmu_e= vents_table *table, pmu_ev return 0; } =20 +int pmu_events_table_for_each_metric(const struct pmu_events_table *etable= , pmu_metric_iter_fn fn, + void *data) +{ + struct pmu_metrics_table *table =3D (struct pmu_metrics_table *)etable; + + for (const struct pmu_metric *pm =3D &table->entries[0]; pm->metric_group= || pm->metric_name; + pm++) { + int ret =3D fn(pm, etable, data); + + if (ret) + return ret; + } + return 0; +} + const struct pmu_events_table *perf_pmu__find_table(struct perf_pmu *pmu) { const struct pmu_events_table *table =3D NULL; @@ -285,7 +313,7 @@ const struct pmu_events_table *perf_pmu__find_table(str= uct perf_pmu *pmu) break; =20 if (!strcmp_cpuid_str(map->cpuid, cpuid)) { - table =3D &map->table; + table =3D &map->event_table; break; } } @@ -299,7 +327,7 @@ const struct pmu_events_table *find_core_events_table(c= onst char *arch, const ch tables->arch; tables++) { if (!strcmp(tables->arch, arch) && !strcmp_cpuid_str(tables->cpuid, cpui= d)) - return &tables->table; + return &tables->event_table; } return NULL; } @@ -309,7 +337,21 @@ int pmu_for_each_core_event(pmu_event_iter_fn fn, void= *data) for (const struct pmu_events_map *tables =3D &pmu_events_map[0]; tables->arch; tables++) { - int ret =3D pmu_events_table_for_each_event(&tables->table, fn, data); + int ret =3D pmu_events_table_for_each_event(&tables->event_table, fn, da= ta); + + if (ret) + return ret; + } + return 0; +} + +int pmu_for_each_core_metric(pmu_metric_iter_fn fn, void *data) +{ + for (const struct pmu_events_map *tables =3D &pmu_events_map[0]; + tables->arch; + tables++) { + int ret =3D pmu_events_table_for_each_metric( + (const struct pmu_events_table *)&tables->metric_table, fn, data); =20 if (ret) return ret; @@ -340,3 +382,8 @@ int pmu_for_each_sys_event(pmu_event_iter_fn fn, void *= data) } return 0; } + +int pmu_for_each_sys_metric(pmu_metric_iter_fn fn __maybe_unused, void *da= ta __maybe_unused) +{ + return 0; +} diff --git a/tools/perf/pmu-events/jevents.py b/tools/perf/pmu-events/jeven= ts.py index 229402565425..ee3d4cdf01be 100755 --- a/tools/perf/pmu-events/jevents.py +++ b/tools/perf/pmu-events/jevents.py @@ -37,6 +37,11 @@ _json_event_attributes =3D [ 'metric_constraint', 'metric_expr', 'long_desc' ] =20 +# Attributes that are in pmu_metric rather than pmu_event. +_json_metric_attributes =3D [ + 'metric_name', 'metric_group', 'metric_constraint', 'metric_expr', 'de= sc', + 'long_desc', 'unit', 'compat', 'aggr_mode' +] =20 def removesuffix(s: str, suffix: str) -> str: """Remove the suffix from a string @@ -562,12 +567,15 @@ static const struct pmu_sys_events pmu_sys_event_tabl= es[] =3D { \t}, }; =20 -static void decompress(int offset, struct pmu_event *pe) +static void decompress_event(int offset, struct pmu_event *pe) { \tconst char *p =3D &big_c_string[offset]; """) for attr in _json_event_attributes: - _args.output_file.write(f""" + if attr in _json_metric_attributes and 'metric_' in attr: + _args.output_file.write(f'\n\t/* Skip {attr} */\n') + else: + _args.output_file.write(f""" \tpe->{attr} =3D (*p =3D=3D '\\0' ? NULL : p); """) if attr =3D=3D _json_event_attributes[-1]: @@ -575,6 +583,22 @@ static void decompress(int offset, struct pmu_event *p= e) _args.output_file.write('\twhile (*p++);') _args.output_file.write("""} =20 +static void decompress_metric(int offset, struct pmu_metric *pm) +{ +\tconst char *p =3D &big_c_string[offset]; +""") + for attr in _json_event_attributes: + if attr in _json_metric_attributes: + _args.output_file.write(f""" +\tpm->{attr} =3D (*p =3D=3D '\\0' ? NULL : p); +""") + else: + _args.output_file.write(f'\n\t/* Skip {attr} */\n') + if attr =3D=3D _json_event_attributes[-1]: + continue + _args.output_file.write('\twhile (*p++);') + _args.output_file.write("""} + int pmu_events_table_for_each_event(const struct pmu_events_table *table, pmu_event_iter_fn fn, void *data) @@ -583,10 +607,30 @@ int pmu_events_table_for_each_event(const struct pmu_= events_table *table, struct pmu_event pe; int ret; =20 - decompress(table->entries[i].offset, &pe); - ret =3D fn(&pe, table, data); - if (ret) - return ret; + decompress_event(table->entries[i].offset, &pe); + if (pe.name) { + ret =3D fn(&pe, table, data); + if (ret) + return ret; + } + } + return 0; +} + +int pmu_events_table_for_each_metric(const struct pmu_events_table *table, + pmu_metric_iter_fn fn, + void *data) +{ + for (size_t i =3D 0; i < table->length; i++) { + struct pmu_metric pm; + int ret; + + decompress_metric(table->entries[i].offset, &pm); + if (pm.metric_name) { + ret =3D fn(&pm, table, data); + if (ret) + return ret; + } } return 0; } @@ -642,6 +686,19 @@ int pmu_for_each_core_event(pmu_event_iter_fn fn, void= *data) return 0; } =20 +int pmu_for_each_core_metric(pmu_metric_iter_fn fn, void *data) +{ + for (const struct pmu_events_map *tables =3D &pmu_events_map[0]; + tables->arch; + tables++) { + int ret =3D pmu_events_table_for_each_metric(&tables->tabl= e, fn, data); + + if (ret) + return ret; + } + return 0; +} + const struct pmu_events_table *find_sys_events_table(const char *name) { for (const struct pmu_sys_events *tables =3D &pmu_sys_event_tables= [0]; @@ -665,6 +722,19 @@ int pmu_for_each_sys_event(pmu_event_iter_fn fn, void = *data) } return 0; } + +int pmu_for_each_sys_metric(pmu_metric_iter_fn fn, void *data) +{ + for (const struct pmu_sys_events *tables =3D &pmu_sys_event_tables= [0]; + tables->name; + tables++) { + int ret =3D pmu_events_table_for_each_metric(&tables->tabl= e, fn, data); + + if (ret) + return ret; + } + return 0; +} """) =20 =20 diff --git a/tools/perf/pmu-events/pmu-events.h b/tools/perf/pmu-events/pmu= -events.h index fe343c4d8016..e137f3857c03 100644 --- a/tools/perf/pmu-events/pmu-events.h +++ b/tools/perf/pmu-events/pmu-events.h @@ -23,11 +23,19 @@ struct pmu_event { const char *unit; const char *perpkg; const char *aggr_mode; - const char *metric_expr; + const char *deprecated; +}; + +struct pmu_metric { const char *metric_name; const char *metric_group; - const char *deprecated; + const char *metric_expr; + const char *unit; + const char *compat; + const char *aggr_mode; const char *metric_constraint; + const char *desc; + const char *long_desc; }; =20 struct pmu_events_table; @@ -36,14 +44,22 @@ typedef int (*pmu_event_iter_fn)(const struct pmu_event= *pe, const struct pmu_events_table *table, void *data); =20 +typedef int (*pmu_metric_iter_fn)(const struct pmu_metric *pm, + const struct pmu_events_table *table, + void *data); + int pmu_events_table_for_each_event(const struct pmu_events_table *table, = pmu_event_iter_fn fn, void *data); +int pmu_events_table_for_each_metric(const struct pmu_events_table *table,= pmu_metric_iter_fn fn, + void *data); =20 const struct pmu_events_table *perf_pmu__find_table(struct perf_pmu *pmu); const struct pmu_events_table *find_core_events_table(const char *arch, co= nst char *cpuid); int pmu_for_each_core_event(pmu_event_iter_fn fn, void *data); +int pmu_for_each_core_metric(pmu_metric_iter_fn fn, void *data); =20 const struct pmu_events_table *find_sys_events_table(const char *name); int pmu_for_each_sys_event(pmu_event_iter_fn fn, void *data); +int pmu_for_each_sys_metric(pmu_metric_iter_fn fn, void *data); =20 #endif diff --git a/tools/perf/tests/pmu-events.c b/tools/perf/tests/pmu-events.c index a9f2330f6257..c2b3ada57cbc 100644 --- a/tools/perf/tests/pmu-events.c +++ b/tools/perf/tests/pmu-events.c @@ -337,36 +337,12 @@ static int compare_pmu_events(const struct pmu_event = *e1, const struct pmu_event return -1; } =20 - if (!is_same(e1->metric_expr, e2->metric_expr)) { - pr_debug2("testing event e1 %s: mismatched metric_expr, %s vs %s\n", - e1->name, e1->metric_expr, e2->metric_expr); - return -1; - } - - if (!is_same(e1->metric_name, e2->metric_name)) { - pr_debug2("testing event e1 %s: mismatched metric_name, %s vs %s\n", - e1->name, e1->metric_name, e2->metric_name); - return -1; - } - - if (!is_same(e1->metric_group, e2->metric_group)) { - pr_debug2("testing event e1 %s: mismatched metric_group, %s vs %s\n", - e1->name, e1->metric_group, e2->metric_group); - return -1; - } - if (!is_same(e1->deprecated, e2->deprecated)) { pr_debug2("testing event e1 %s: mismatched deprecated, %s vs %s\n", e1->name, e1->deprecated, e2->deprecated); return -1; } =20 - if (!is_same(e1->metric_constraint, e2->metric_constraint)) { - pr_debug2("testing event e1 %s: mismatched metric_constant, %s vs %s\n", - e1->name, e1->metric_constraint, e2->metric_constraint); - return -1; - } - return 0; } =20 @@ -432,9 +408,6 @@ static int test__pmu_event_table_core_callback(const st= ruct pmu_event *pe, struct perf_pmu_test_event const **test_event_table; bool found =3D false; =20 - if (!pe->name) - return 0; - if (pe->pmu) test_event_table =3D &uncore_events[0]; else @@ -840,7 +813,7 @@ struct metric { struct metric_ref metric_ref; }; =20 -static int test__parsing_callback(const struct pmu_event *pe, const struct= pmu_events_table *table, +static int test__parsing_callback(const struct pmu_metric *pm, const struc= t pmu_events_table *table, void *data) { int *failures =3D data; @@ -854,10 +827,10 @@ static int test__parsing_callback(const struct pmu_ev= ent *pe, const struct pmu_e }; int err =3D 0; =20 - if (!pe->metric_expr) + if (!pm->metric_expr) return 0; =20 - pr_debug("Found metric '%s'\n", pe->metric_name); + pr_debug("Found metric '%s'\n", pm->metric_name); (*failures)++; =20 /* @@ -877,14 +850,14 @@ static int test__parsing_callback(const struct pmu_ev= ent *pe, const struct pmu_e perf_evlist__set_maps(&evlist->core, cpus, NULL); runtime_stat__init(&st); =20 - err =3D metricgroup__parse_groups_test(evlist, table, pe->metric_name, + err =3D metricgroup__parse_groups_test(evlist, table, pm->metric_name, false, false, &metric_events); if (err) { - if (!strcmp(pe->metric_name, "M1") || !strcmp(pe->metric_name, "M2") || - !strcmp(pe->metric_name, "M3")) { + if (!strcmp(pm->metric_name, "M1") || !strcmp(pm->metric_name, "M2") || + !strcmp(pm->metric_name, "M3")) { (*failures)--; - pr_debug("Expected broken metric %s skipping\n", pe->metric_name); + pr_debug("Expected broken metric %s skipping\n", pm->metric_name); err =3D 0; } goto out_err; @@ -912,7 +885,7 @@ static int test__parsing_callback(const struct pmu_even= t *pe, const struct pmu_e struct metric_expr *mexp; =20 list_for_each_entry (mexp, &me->head, nd) { - if (strcmp(mexp->metric_name, pe->metric_name)) + if (strcmp(mexp->metric_name, pm->metric_name)) continue; pr_debug("Result %f\n", test_generic_metric(mexp, 0, &st)); err =3D 0; @@ -921,11 +894,11 @@ static int test__parsing_callback(const struct pmu_ev= ent *pe, const struct pmu_e } } } - pr_debug("Didn't find parsed metric %s", pe->metric_name); + pr_debug("Didn't find parsed metric %s", pm->metric_name); err =3D 1; out_err: if (err) - pr_debug("Broken metric %s\n", pe->metric_name); + pr_debug("Broken metric %s\n", pm->metric_name); =20 /* ... cleanup. */ metricgroup__rblist_exit(&metric_events); @@ -941,8 +914,8 @@ static int test__parsing(struct test_suite *test __mayb= e_unused, { int failures =3D 0; =20 - pmu_for_each_core_event(test__parsing_callback, &failures); - pmu_for_each_sys_event(test__parsing_callback, &failures); + pmu_for_each_core_metric(test__parsing_callback, &failures); + pmu_for_each_sys_metric(test__parsing_callback, &failures); =20 return failures =3D=3D 0 ? TEST_OK : TEST_FAIL; } @@ -1021,14 +994,11 @@ static int metric_parse_fake(const char *metric_name= , const char *str) return ret; } =20 -static int test__parsing_fake_callback(const struct pmu_event *pe, +static int test__parsing_fake_callback(const struct pmu_metric *pm, const struct pmu_events_table *table __maybe_unused, void *data __maybe_unused) { - if (!pe->metric_expr) - return 0; - - return metric_parse_fake(pe->metric_name, pe->metric_expr); + return metric_parse_fake(pm->metric_name, pm->metric_expr); } =20 /* @@ -1047,11 +1017,11 @@ static int test__parsing_fake(struct test_suite *te= st __maybe_unused, return err; } =20 - err =3D pmu_for_each_core_event(test__parsing_fake_callback, NULL); + err =3D pmu_for_each_core_metric(test__parsing_fake_callback, NULL); if (err) return err; =20 - return pmu_for_each_sys_event(test__parsing_fake_callback, NULL); + return pmu_for_each_sys_metric(test__parsing_fake_callback, NULL); } =20 static struct test_case pmu_events_tests[] =3D { diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c index b9c273ed080a..47fd02af66f1 100644 --- a/tools/perf/util/metricgroup.c +++ b/tools/perf/util/metricgroup.c @@ -167,14 +167,14 @@ static void metricgroup___watchdog_constraint_hint(co= nst char *name, bool foot) " echo 1 > /proc/sys/kernel/nmi_watchdog\n"); } =20 -static bool metricgroup__has_constraint(const struct pmu_event *pe) +static bool metricgroup__has_constraint(const struct pmu_metric *pm) { - if (!pe->metric_constraint) + if (!pm->metric_constraint) return false; =20 - if (!strcmp(pe->metric_constraint, "NO_NMI_WATCHDOG") && + if (!strcmp(pm->metric_constraint, "NO_NMI_WATCHDOG") && sysctl__nmi_watchdog_enabled()) { - metricgroup___watchdog_constraint_hint(pe->metric_name, false); + metricgroup___watchdog_constraint_hint(pm->metric_name, false); return true; } =20 @@ -193,7 +193,7 @@ static void metric__free(struct metric *m) free(m); } =20 -static struct metric *metric__new(const struct pmu_event *pe, +static struct metric *metric__new(const struct pmu_metric *pm, const char *modifier, bool metric_no_group, int runtime, @@ -210,15 +210,15 @@ static struct metric *metric__new(const struct pmu_ev= ent *pe, if (!m->pctx) goto out_err; =20 - m->metric_name =3D pe->metric_name; + m->metric_name =3D pm->metric_name; m->modifier =3D NULL; if (modifier) { m->modifier =3D strdup(modifier); if (!m->modifier) goto out_err; } - m->metric_expr =3D pe->metric_expr; - m->metric_unit =3D pe->unit; + m->metric_expr =3D pm->metric_expr; + m->metric_unit =3D pm->unit; m->pctx->sctx.user_requested_cpu_list =3D NULL; if (user_requested_cpu_list) { m->pctx->sctx.user_requested_cpu_list =3D strdup(user_requested_cpu_list= ); @@ -227,7 +227,7 @@ static struct metric *metric__new(const struct pmu_even= t *pe, } m->pctx->sctx.runtime =3D runtime; m->pctx->sctx.system_wide =3D system_wide; - m->has_constraint =3D metric_no_group || metricgroup__has_constraint(pe); + m->has_constraint =3D metric_no_group || metricgroup__has_constraint(pm); m->metric_refs =3D NULL; m->evlist =3D NULL; =20 @@ -348,10 +348,10 @@ static bool match_metric(const char *n, const char *l= ist) return false; } =20 -static bool match_pe_metric(const struct pmu_event *pe, const char *metric) +static bool match_pm_metric(const struct pmu_metric *pm, const char *metri= c) { - return match_metric(pe->metric_group, metric) || - match_metric(pe->metric_name, metric); + return match_metric(pm->metric_group, metric) || + match_metric(pm->metric_name, metric); } =20 /** struct mep - RB-tree node for building printing information. */ @@ -420,13 +420,13 @@ static struct mep *mep_lookup(struct rblist *groups, = const char *metric_group, return NULL; } =20 -static int metricgroup__add_to_mep_groups(const struct pmu_event *pe, +static int metricgroup__add_to_mep_groups(const struct pmu_metric *pm, struct rblist *groups) { const char *g; char *omg, *mg; =20 - mg =3D strdup(pe->metric_group ?: "No_group"); + mg =3D strdup(pm->metric_group ?: "No_group"); if (!mg) return -ENOMEM; omg =3D mg; @@ -435,15 +435,15 @@ static int metricgroup__add_to_mep_groups(const struc= t pmu_event *pe, =20 g =3D skip_spaces(g); if (strlen(g)) - me =3D mep_lookup(groups, g, pe->metric_name); + me =3D mep_lookup(groups, g, pm->metric_name); else - me =3D mep_lookup(groups, "No_group", pe->metric_name); + me =3D mep_lookup(groups, "No_group", pm->metric_name); =20 if (me) { - me->metric_desc =3D pe->desc; - me->metric_long_desc =3D pe->long_desc; - me->metric_expr =3D pe->metric_expr; - me->metric_unit =3D pe->unit; + me->metric_desc =3D pm->desc; + me->metric_long_desc =3D pm->long_desc; + me->metric_expr =3D pm->metric_expr; + me->metric_unit =3D pm->unit; } } free(omg); @@ -452,40 +452,37 @@ static int metricgroup__add_to_mep_groups(const struc= t pmu_event *pe, } =20 struct metricgroup_iter_data { - pmu_event_iter_fn fn; + pmu_metric_iter_fn fn; void *data; }; =20 -static int metricgroup__sys_event_iter(const struct pmu_event *pe, +static int metricgroup__sys_event_iter(const struct pmu_metric *pm, const struct pmu_events_table *table, void *data) { struct metricgroup_iter_data *d =3D data; struct perf_pmu *pmu =3D NULL; =20 - if (!pe->metric_expr || !pe->compat) + if (!pm->metric_expr || !pm->compat) return 0; =20 while ((pmu =3D perf_pmu__scan(pmu))) { =20 - if (!pmu->id || strcmp(pmu->id, pe->compat)) + if (!pmu->id || strcmp(pmu->id, pm->compat)) continue; =20 - return d->fn(pe, table, d->data); + return d->fn(pm, table, d->data); } return 0; } =20 -static int metricgroup__add_to_mep_groups_callback(const struct pmu_event = *pe, +static int metricgroup__add_to_mep_groups_callback(const struct pmu_metric= *pm, const struct pmu_events_table *table __maybe_unused, void *vdata) { struct rblist *groups =3D vdata; =20 - if (!pe->metric_name) - return 0; - - return metricgroup__add_to_mep_groups(pe, groups); + return metricgroup__add_to_mep_groups(pm, groups); } =20 void metricgroup__print(const struct print_callbacks *print_cb, void *prin= t_state) @@ -500,16 +497,16 @@ void metricgroup__print(const struct print_callbacks = *print_cb, void *print_stat groups.node_delete =3D mep_delete; table =3D pmu_events_table__find(); if (table) { - pmu_events_table_for_each_event(table, - metricgroup__add_to_mep_groups_callback, - &groups); + pmu_events_table_for_each_metric(table, + metricgroup__add_to_mep_groups_callback, + &groups); } { struct metricgroup_iter_data data =3D { .fn =3D metricgroup__add_to_mep_groups_callback, .data =3D &groups, }; - pmu_for_each_sys_event(metricgroup__sys_event_iter, &data); + pmu_for_each_sys_metric(metricgroup__sys_event_iter, &data); } =20 for (node =3D rb_first_cached(&groups.entries); node; node =3D next) { @@ -743,7 +740,7 @@ static int metricgroup__build_event_string(struct strbu= f *events, #undef RETURN_IF_NON_ZERO } =20 -int __weak arch_get_runtimeparam(const struct pmu_event *pe __maybe_unused) +int __weak arch_get_runtimeparam(const struct pmu_metric *pm __maybe_unuse= d) { return 1; } @@ -773,10 +770,10 @@ struct metricgroup_add_iter_data { =20 static bool metricgroup__find_metric(const char *metric, const struct pmu_events_table *table, - struct pmu_event *pe); + struct pmu_metric *pm); =20 static int add_metric(struct list_head *metric_list, - const struct pmu_event *pe, + const struct pmu_metric *pm, const char *modifier, bool metric_no_group, const char *user_requested_cpu_list, @@ -816,10 +813,10 @@ static int resolve_metric(struct list_head *metric_li= st, size_t bkt; struct to_resolve { /* The metric to resolve. */ - struct pmu_event pe; + struct pmu_metric pm; /* * The key in the IDs map, this may differ from in case, - * etc. from pe->metric_name. + * etc. from pm->metric_name. */ const char *key; } *pending =3D NULL; @@ -830,15 +827,15 @@ static int resolve_metric(struct list_head *metric_li= st, * the pending array. */ hashmap__for_each_entry(root_metric->pctx->ids, cur, bkt) { - struct pmu_event pe; + struct pmu_metric pm; =20 - if (metricgroup__find_metric(cur->pkey, table, &pe)) { + if (metricgroup__find_metric(cur->pkey, table, &pm)) { pending =3D realloc(pending, (pending_cnt + 1) * sizeof(struct to_resolve)); if (!pending) return -ENOMEM; =20 - memcpy(&pending[pending_cnt].pe, &pe, sizeof(pe)); + memcpy(&pending[pending_cnt].pm, &pm, sizeof(pm)); pending[pending_cnt].key =3D cur->pkey; pending_cnt++; } @@ -853,7 +850,7 @@ static int resolve_metric(struct list_head *metric_list, * context. */ for (i =3D 0; i < pending_cnt; i++) { - ret =3D add_metric(metric_list, &pending[i].pe, modifier, metric_no_grou= p, + ret =3D add_metric(metric_list, &pending[i].pm, modifier, metric_no_grou= p, user_requested_cpu_list, system_wide, root_metric, visited, table); if (ret) @@ -867,7 +864,7 @@ static int resolve_metric(struct list_head *metric_list, /** * __add_metric - Add a metric to metric_list. * @metric_list: The list the metric is added to. - * @pe: The pmu_event containing the metric to be added. + * @pm: The pmu_metric containing the metric to be added. * @modifier: if non-null event modifiers like "u". * @metric_no_group: Should events written to events be grouped "{}" or * global. Grouping is the default but due to multiplexi= ng the @@ -884,7 +881,7 @@ static int resolve_metric(struct list_head *metric_list, * architecture perf is running upon. */ static int __add_metric(struct list_head *metric_list, - const struct pmu_event *pe, + const struct pmu_metric *pm, const char *modifier, bool metric_no_group, int runtime, @@ -898,13 +895,13 @@ static int __add_metric(struct list_head *metric_list, int ret; bool is_root =3D !root_metric; struct visited_metric visited_node =3D { - .name =3D pe->metric_name, + .name =3D pm->metric_name, .parent =3D visited, }; =20 for (vm =3D visited; vm; vm =3D vm->parent) { - if (!strcmp(pe->metric_name, vm->name)) { - pr_err("failed: recursion detected for %s\n", pe->metric_name); + if (!strcmp(pm->metric_name, vm->name)) { + pr_err("failed: recursion detected for %s\n", pm->metric_name); return -1; } } @@ -914,7 +911,7 @@ static int __add_metric(struct list_head *metric_list, * This metric is the root of a tree and may reference other * metrics that are added recursively. */ - root_metric =3D metric__new(pe, modifier, metric_no_group, runtime, + root_metric =3D metric__new(pm, modifier, metric_no_group, runtime, user_requested_cpu_list, system_wide); if (!root_metric) return -ENOMEM; @@ -929,7 +926,7 @@ static int __add_metric(struct list_head *metric_list, */ if (root_metric->metric_refs) { for (; root_metric->metric_refs[cnt].metric_name; cnt++) { - if (!strcmp(pe->metric_name, + if (!strcmp(pm->metric_name, root_metric->metric_refs[cnt].metric_name)) return 0; } @@ -947,8 +944,8 @@ static int __add_metric(struct list_head *metric_list, * need to change them, so there's no need to create * our own copy. */ - root_metric->metric_refs[cnt].metric_name =3D pe->metric_name; - root_metric->metric_refs[cnt].metric_expr =3D pe->metric_expr; + root_metric->metric_refs[cnt].metric_name =3D pm->metric_name; + root_metric->metric_refs[cnt].metric_expr =3D pm->metric_expr; =20 /* Null terminate array. */ root_metric->metric_refs[cnt+1].metric_name =3D NULL; @@ -959,7 +956,7 @@ static int __add_metric(struct list_head *metric_list, * For both the parent and referenced metrics, we parse * all the metric's IDs and add it to the root context. */ - if (expr__find_ids(pe->metric_expr, NULL, root_metric->pctx) < 0) { + if (expr__find_ids(pm->metric_expr, NULL, root_metric->pctx) < 0) { /* Broken metric. */ ret =3D -EINVAL; } else { @@ -981,37 +978,37 @@ static int __add_metric(struct list_head *metric_list, =20 struct metricgroup__find_metric_data { const char *metric; - struct pmu_event *pe; + struct pmu_metric *pm; }; =20 -static int metricgroup__find_metric_callback(const struct pmu_event *pe, +static int metricgroup__find_metric_callback(const struct pmu_metric *pm, const struct pmu_events_table *table __maybe_unused, void *vdata) { struct metricgroup__find_metric_data *data =3D vdata; =20 - if (!match_metric(pe->metric_name, data->metric)) + if (!match_metric(pm->metric_name, data->metric)) return 0; =20 - memcpy(data->pe, pe, sizeof(*pe)); + memcpy(data->pm, pm, sizeof(*pm)); return 1; } =20 static bool metricgroup__find_metric(const char *metric, const struct pmu_events_table *table, - struct pmu_event *pe) + struct pmu_metric *pm) { struct metricgroup__find_metric_data data =3D { .metric =3D metric, - .pe =3D pe, + .pm =3D pm, }; =20 - return pmu_events_table_for_each_event(table, metricgroup__find_metric_ca= llback, &data) + return pmu_events_table_for_each_metric(table, metricgroup__find_metric_c= allback, &data) ? true : false; } =20 static int add_metric(struct list_head *metric_list, - const struct pmu_event *pe, + const struct pmu_metric *pm, const char *modifier, bool metric_no_group, const char *user_requested_cpu_list, @@ -1022,16 +1019,16 @@ static int add_metric(struct list_head *metric_list, { int ret =3D 0; =20 - pr_debug("metric expr %s for %s\n", pe->metric_expr, pe->metric_name); + pr_debug("metric expr %s for %s\n", pm->metric_expr, pm->metric_name); =20 - if (!strstr(pe->metric_expr, "?")) { - ret =3D __add_metric(metric_list, pe, modifier, metric_no_group, 0, + if (!strstr(pm->metric_expr, "?")) { + ret =3D __add_metric(metric_list, pm, modifier, metric_no_group, 0, user_requested_cpu_list, system_wide, root_metric, visited, table); } else { int j, count; =20 - count =3D arch_get_runtimeparam(pe); + count =3D arch_get_runtimeparam(pm); =20 /* This loop is added to create multiple * events depend on count value and add @@ -1039,7 +1036,7 @@ static int add_metric(struct list_head *metric_list, */ =20 for (j =3D 0; j < count && !ret; j++) - ret =3D __add_metric(metric_list, pe, modifier, metric_no_group, j, + ret =3D __add_metric(metric_list, pm, modifier, metric_no_group, j, user_requested_cpu_list, system_wide, root_metric, visited, table); } @@ -1047,17 +1044,17 @@ static int add_metric(struct list_head *metric_list, return ret; } =20 -static int metricgroup__add_metric_sys_event_iter(const struct pmu_event *= pe, +static int metricgroup__add_metric_sys_event_iter(const struct pmu_metric = *pm, const struct pmu_events_table *table __maybe_unused, void *data) { struct metricgroup_add_iter_data *d =3D data; int ret; =20 - if (!match_pe_metric(pe, d->metric_name)) + if (!match_pm_metric(pm, d->metric_name)) return 0; =20 - ret =3D add_metric(d->metric_list, pe, d->modifier, d->metric_no_group, + ret =3D add_metric(d->metric_list, pm, d->modifier, d->metric_no_group, d->user_requested_cpu_list, d->system_wide, d->root_metric, d->visited, d->table); if (ret) @@ -1107,19 +1104,19 @@ struct metricgroup__add_metric_data { bool has_match; }; =20 -static int metricgroup__add_metric_callback(const struct pmu_event *pe, +static int metricgroup__add_metric_callback(const struct pmu_metric *pm, const struct pmu_events_table *table, void *vdata) { struct metricgroup__add_metric_data *data =3D vdata; int ret =3D 0; =20 - if (pe->metric_expr && - (match_metric(pe->metric_group, data->metric_name) || - match_metric(pe->metric_name, data->metric_name))) { + if (pm->metric_expr && + (match_metric(pm->metric_group, data->metric_name) || + match_metric(pm->metric_name, data->metric_name))) { =20 data->has_match =3D true; - ret =3D add_metric(data->list, pe, data->modifier, data->metric_no_group, + ret =3D add_metric(data->list, pm, data->modifier, data->metric_no_group, data->user_requested_cpu_list, data->system_wide, /*root_metric=3D*/NULL, /*visited_metrics=3D*/NULL, table); } @@ -1166,8 +1163,8 @@ static int metricgroup__add_metric(const char *metric= _name, const char *modifier * Iterate over all metrics seeing if metric matches either the * name or group. When it does add the metric to the list. */ - ret =3D pmu_events_table_for_each_event(table, metricgroup__add_metric_c= allback, - &data); + ret =3D pmu_events_table_for_each_metric(table, metricgroup__add_metric_= callback, + &data); if (ret) goto out; =20 @@ -1189,7 +1186,7 @@ static int metricgroup__add_metric(const char *metric= _name, const char *modifier }, }; =20 - pmu_for_each_sys_event(metricgroup__sys_event_iter, &data); + pmu_for_each_sys_metric(metricgroup__sys_event_iter, &data); } /* End of pmu events. */ if (!has_match) @@ -1603,16 +1600,16 @@ int metricgroup__parse_groups_test(struct evlist *e= vlist, &perf_pmu__fake, metric_events, table); } =20 -static int metricgroup__has_metric_callback(const struct pmu_event *pe, +static int metricgroup__has_metric_callback(const struct pmu_metric *pm, const struct pmu_events_table *table __maybe_unused, void *vdata) { const char *metric =3D vdata; =20 - if (!pe->metric_expr) + if (!pm->metric_expr) return 0; =20 - if (match_metric(pe->metric_name, metric)) + if (match_metric(pm->metric_name, metric)) return 1; =20 return 0; @@ -1625,8 +1622,8 @@ bool metricgroup__has_metric(const char *metric) if (!table) return false; =20 - return pmu_events_table_for_each_event(table, metricgroup__has_metric_cal= lback, - (void *)metric) ? true : false; + return pmu_events_table_for_each_metric(table, metricgroup__has_metric_ca= llback, + (void *)metric) ? true : false; } =20 int metricgroup__copy_metric_events(struct evlist *evlist, struct cgroup *= cgrp, diff --git a/tools/perf/util/metricgroup.h b/tools/perf/util/metricgroup.h index 0013cf582173..b1f186d0f514 100644 --- a/tools/perf/util/metricgroup.h +++ b/tools/perf/util/metricgroup.h @@ -81,7 +81,7 @@ int metricgroup__parse_groups_test(struct evlist *evlist, =20 void metricgroup__print(const struct print_callbacks *print_cb, void *prin= t_state); bool metricgroup__has_metric(const char *metric); -int arch_get_runtimeparam(const struct pmu_event *pe __maybe_unused); +int arch_get_runtimeparam(const struct pmu_metric *pm); void metricgroup__rblist_exit(struct rblist *metric_events); =20 int metricgroup__copy_metric_events(struct evlist *evlist, struct cgroup *= cgrp, diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index 21cce83462b3..0336ff27c15f 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -1570,8 +1570,6 @@ int parse_events_add_pmu(struct parse_events_state *p= arse_state, evsel->scale =3D info.scale; evsel->per_pkg =3D info.per_pkg; evsel->snapshot =3D info.snapshot; - evsel->metric_expr =3D info.metric_expr; - evsel->metric_name =3D info.metric_name; return 0; } =20 diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index 2bdeb89352e7..d627f99b5a63 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -283,10 +283,6 @@ static void perf_pmu_update_alias(struct perf_pmu_alia= s *old, perf_pmu_assign_str(old->name, "long_desc", &old->long_desc, &newalias->long_desc); perf_pmu_assign_str(old->name, "topic", &old->topic, &newalias->topic); - perf_pmu_assign_str(old->name, "metric_expr", &old->metric_expr, - &newalias->metric_expr); - perf_pmu_assign_str(old->name, "metric_name", &old->metric_name, - &newalias->metric_name); perf_pmu_assign_str(old->name, "value", &old->str, &newalias->str); old->scale =3D newalias->scale; old->per_pkg =3D newalias->per_pkg; @@ -302,8 +298,6 @@ void perf_pmu_free_alias(struct perf_pmu_alias *newalia= s) zfree(&newalias->long_desc); zfree(&newalias->topic); zfree(&newalias->str); - zfree(&newalias->metric_expr); - zfree(&newalias->metric_name); zfree(&newalias->pmu_name); parse_events_terms__purge(&newalias->terms); free(newalias); @@ -340,16 +334,13 @@ static int __perf_pmu__new_alias(struct list_head *li= st, char *dir, char *name, int num; char newval[256]; char *long_desc =3D NULL, *topic =3D NULL, *unit =3D NULL, *perpkg =3D NU= LL, - *metric_expr =3D NULL, *metric_name =3D NULL, *deprecated =3D NULL, - *pmu_name =3D NULL; + *deprecated =3D NULL, *pmu_name =3D NULL; =20 if (pe) { long_desc =3D (char *)pe->long_desc; topic =3D (char *)pe->topic; unit =3D (char *)pe->unit; perpkg =3D (char *)pe->perpkg; - metric_expr =3D (char *)pe->metric_expr; - metric_name =3D (char *)pe->metric_name; deprecated =3D (char *)pe->deprecated; pmu_name =3D (char *)pe->pmu; } @@ -404,8 +395,6 @@ static int __perf_pmu__new_alias(struct list_head *list= , char *dir, char *name, perf_pmu__parse_snapshot(alias, dir, name); } =20 - alias->metric_expr =3D metric_expr ? strdup(metric_expr) : NULL; - alias->metric_name =3D metric_name ? strdup(metric_name): NULL; alias->desc =3D desc ? strdup(desc) : NULL; alias->long_desc =3D long_desc ? strdup(long_desc) : desc ? strdup(desc) : NULL; @@ -822,9 +811,6 @@ static int pmu_add_cpu_aliases_map_callback(const struc= t pmu_event *pe, struct pmu_add_cpu_aliases_map_data *data =3D vdata; const char *pname =3D pe->pmu ? pe->pmu : data->cpu_name; =20 - if (!pe->name) - return 0; - if (data->pmu->is_uncore && pmu_uncore_alias_match(pname, data->name)) goto new_alias; =20 @@ -879,12 +865,6 @@ static int pmu_add_sys_aliases_iter_fn(const struct pm= u_event *pe, struct pmu_sys_event_iter_data *idata =3D data; struct perf_pmu *pmu =3D idata->pmu; =20 - if (!pe->name) { - if (pe->metric_group || pe->metric_name) - return 0; - return -EINVAL; - } - if (!pe->compat || !pe->pmu) return 0; =20 @@ -1469,8 +1449,6 @@ int perf_pmu__check_alias(struct perf_pmu *pmu, struc= t list_head *head_terms, info->unit =3D NULL; info->scale =3D 0.0; info->snapshot =3D false; - info->metric_expr =3D NULL; - info->metric_name =3D NULL; =20 list_for_each_entry_safe(term, h, head_terms, list) { alias =3D pmu_find_alias(pmu, term); @@ -1486,8 +1464,6 @@ int perf_pmu__check_alias(struct perf_pmu *pmu, struc= t list_head *head_terms, =20 if (alias->per_pkg) info->per_pkg =3D true; - info->metric_expr =3D alias->metric_expr; - info->metric_name =3D alias->metric_name; =20 list_del_init(&term->list); parse_events_term__delete(term); @@ -1703,8 +1679,7 @@ void print_pmu_events(const struct print_callbacks *p= rint_cb, void *print_state) for (j =3D 0; j < len; j++) { const char *name, *alias =3D NULL, *scale_unit =3D NULL, *desc =3D NULL, *long_desc =3D NULL, - *encoding_desc =3D NULL, *topic =3D NULL, - *metric_name =3D NULL, *metric_expr =3D NULL; + *encoding_desc =3D NULL, *topic =3D NULL; bool deprecated =3D false; size_t buf_used; =20 @@ -1742,8 +1717,6 @@ void print_pmu_events(const struct print_callbacks *p= rint_cb, void *print_state) buf_used +=3D snprintf(buf + buf_used, sizeof(buf) - buf_used, "%s/%s/", aliases[j].pmu->name, aliases[j].event->str) + 1; - metric_name =3D aliases[j].event->metric_name; - metric_expr =3D aliases[j].event->metric_expr; deprecated =3D aliases[j].event->deprecated; } print_cb->print_event(print_state, @@ -1756,9 +1729,7 @@ void print_pmu_events(const struct print_callbacks *p= rint_cb, void *print_state) "Kernel PMU event", desc, long_desc, - encoding_desc, - metric_name, - metric_expr); + encoding_desc); } if (printed && pager_in_use()) printf("\n"); diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h index 69ca0004f94f..4d8d64209b4b 100644 --- a/tools/perf/util/pmu.h +++ b/tools/perf/util/pmu.h @@ -133,8 +133,6 @@ extern struct perf_pmu perf_pmu__fake; =20 struct perf_pmu_info { const char *unit; - const char *metric_expr; - const char *metric_name; double scale; bool per_pkg; bool snapshot; @@ -188,13 +186,6 @@ struct perf_pmu_alias { * default. */ bool deprecated; - /** - * @metric_expr: A metric expression associated with an event. Doing - * this makes little sense due to scale and unit applying to both. - */ - char *metric_expr; - /** @metric_name: A name for the metric. unit applying to both. */ - char *metric_name; /** @pmu_name: The name copied from struct perf_pmu. */ char *pmu_name; }; diff --git a/tools/perf/util/print-events.c b/tools/perf/util/print-events.c index 2646ae18d9f9..62e9ea7dcf40 100644 --- a/tools/perf/util/print-events.c +++ b/tools/perf/util/print-events.c @@ -101,9 +101,7 @@ void print_tracepoint_events(const struct print_callbac= ks *print_cb, void *print "Tracepoint event", /*desc=3D*/NULL, /*long_desc=3D*/NULL, - /*encoding_desc=3D*/NULL, - /*metric_name=3D*/NULL, - /*metric_expr=3D*/NULL); + /*encoding_desc=3D*/NULL); } free(dir_path); free(evt_namelist); @@ -195,9 +193,7 @@ void print_sdt_events(const struct print_callbacks *pri= nt_cb, void *print_state) "SDT event", /*desc=3D*/NULL, /*long_desc=3D*/NULL, - /*encoding_desc=3D*/NULL, - /*metric_name=3D*/NULL, - /*metric_expr=3D*/NULL); + /*encoding_desc=3D*/NULL); =20 free(evt_name); } @@ -255,9 +251,7 @@ int print_hwcache_events(const struct print_callbacks *= print_cb, void *print_sta event_type_descriptors[PERF_TYPE_HW_CACHE], /*desc=3D*/NULL, /*long_desc=3D*/NULL, - /*encoding_desc=3D*/NULL, - /*metric_name=3D*/NULL, - /*metric_expr=3D*/NULL); + /*encoding_desc=3D*/NULL); } strlist__delete(evt_name_list); return 0; @@ -277,9 +271,7 @@ void print_tool_events(const struct print_callbacks *pr= int_cb, void *print_state "Tool event", /*desc=3D*/NULL, /*long_desc=3D*/NULL, - /*encoding_desc=3D*/NULL, - /*metric_name=3D*/NULL, - /*metric_expr=3D*/NULL); + /*encoding_desc=3D*/NULL); } } =20 @@ -331,9 +323,7 @@ void print_symbol_events(const struct print_callbacks *= print_cb, void *print_sta event_type_descriptors[type], /*desc=3D*/NULL, /*long_desc=3D*/NULL, - /*encoding_desc=3D*/NULL, - /*metric_name=3D*/NULL, - /*metric_expr=3D*/NULL); + /*encoding_desc=3D*/NULL); } strlist__delete(evt_name_list); } @@ -364,9 +354,7 @@ void print_events(const struct print_callbacks *print_c= b, void *print_state) event_type_descriptors[PERF_TYPE_RAW], /*desc=3D*/NULL, /*long_desc=3D*/NULL, - /*encoding_desc=3D*/NULL, - /*metric_name=3D*/NULL, - /*metric_expr=3D*/NULL); + /*encoding_desc=3D*/NULL); =20 print_cb->print_event(print_state, /*topic=3D*/NULL, @@ -378,9 +366,7 @@ void print_events(const struct print_callbacks *print_c= b, void *print_state) event_type_descriptors[PERF_TYPE_RAW], "(see 'man perf-list' on how to encode it)", /*long_desc=3D*/NULL, - /*encoding_desc=3D*/NULL, - /*metric_name=3D*/NULL, - /*metric_expr=3D*/NULL); + /*encoding_desc=3D*/NULL); =20 print_cb->print_event(print_state, /*topic=3D*/NULL, @@ -392,9 +378,7 @@ void print_events(const struct print_callbacks *print_c= b, void *print_state) event_type_descriptors[PERF_TYPE_BREAKPOINT], /*desc=3D*/NULL, /*long_desc=3D*/NULL, - /*encoding_desc=3D*/NULL, - /*metric_name=3D*/NULL, - /*metric_expr=3D*/NULL); + /*encoding_desc=3D*/NULL); =20 print_tracepoint_events(print_cb, print_state); =20 diff --git a/tools/perf/util/print-events.h b/tools/perf/util/print-events.h index c237e53c4487..716dcf4b4859 100644 --- a/tools/perf/util/print-events.h +++ b/tools/perf/util/print-events.h @@ -16,8 +16,7 @@ struct print_callbacks { const char *scale_unit, bool deprecated, const char *event_type_desc, const char *desc, const char *long_desc, - const char *encoding_desc, - const char *metric_name, const char *metric_expr); + const char *encoding_desc); void (*print_metric)(void *print_state, const char *group, const char *name, --=20 2.39.0.314.g84b9a713c41-goog From nobody Wed Sep 17 06:42:28 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 9B37AC4167B for ; Wed, 21 Dec 2022 22:36:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235161AbiLUWgG (ORCPT ); Wed, 21 Dec 2022 17:36:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46620 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235031AbiLUWfc (ORCPT ); Wed, 21 Dec 2022 17:35:32 -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 1C55ABE26 for ; Wed, 21 Dec 2022 14:35:09 -0800 (PST) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-460ab8a327eso3224237b3.23 for ; Wed, 21 Dec 2022 14:35:09 -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=A5e+q2J2T13Zjvz/NSuIdISxQnXr8PJB3Wc0tTKT5vY=; b=aFZ+LpBPBWHwljcXxvgoSkrKpfn4vq/pAQhTdoqJDKJ3/jamd3650pn5kRPZwfutSb ypM+VTaEjb+lF3d6L6CzC6xarC2kUModgKntYDc1H/CnF5tU//k8jgSDginpbcEzhCTk raCv9myav/YWCpJOwFwwfrAseUyq9csf+wPfOgd+4Gm89Z7zLPY+6GEvzXwI2gvUHCBD IhoaCG1QlP/t/0Jspj5M/vWTONQbBobmtCGieH6iSkVVY4wWzqNPzuErZrx31m7UAxmI T7Ia7YYec8Wf/fMD1Ywjs3LYt8JekMUoHdLHt7FXEywrAsQ26CVb61W2bxfZjW11bb1i PEkg== 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=A5e+q2J2T13Zjvz/NSuIdISxQnXr8PJB3Wc0tTKT5vY=; b=Rx7/OU36owBWv/8yBAxPtjZx+9gS1PhvF9Mj8WzB87B/f153dWh5rFH2r3ppJFWD9F Ytchmv+kxlkk30CjbNPl4TND8zPki/b9O4aIGeoO59koc0aOYk4OXulciMD4pSicQWRe ycGe9nE4aTcFmukgKsIrOpk5aHO/V6/gTkml2qHTfUTf3ohyKAHumCy9Mh6xnjqoElbF S3Vb38vy4rhcQdDI1pQ9Xh4Eoc9YLNaAJgJghnfqRHmD5ilTl1Zlr1w9viDeb0vHlgBQ wwuZb/QPQ1jgSbTw65HxnGQdVXyXL0H29RHbQSPW2P8xi/73eIwSEgPAi5J0kp8yZ8QP aF8A== X-Gm-Message-State: AFqh2koH6xTHtcKheplrJ/DcX0voGj6uIcBe54CJIUlN3MTDIr3vhjzV p39FEmDLna1wzSH4E9BDGtRU/g7amqN0 X-Google-Smtp-Source: AMrXdXsGZ3Drpvj0peXwqzWVI5ormin6RpJoMKCej19VRZJ90L1xJTqpRv14sEFlGAt2+X6k2RQ4OrUu7PyV X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:62bd:f120:1fd8:1d21]) (user=irogers job=sendgmr) by 2002:a05:6902:3ce:b0:6f8:92de:92e3 with SMTP id g14-20020a05690203ce00b006f892de92e3mr350895ybs.105.1671662108352; Wed, 21 Dec 2022 14:35:08 -0800 (PST) Date: Wed, 21 Dec 2022 14:34:16 -0800 In-Reply-To: <20221221223420.2157113-1-irogers@google.com> Message-Id: <20221221223420.2157113-6-irogers@google.com> Mime-Version: 1.0 References: <20221221223420.2157113-1-irogers@google.com> X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog Subject: [PATCH v2 5/9] perf stat: Remove evsel metric_name/expr 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" Metrics are their own unit and these variables held broken metrics previously and now just hold the value NULL. Remove code that used these variables. Signed-off-by: Ian Rogers Reviewed-by: John Garry --- tools/perf/builtin-stat.c | 1 - tools/perf/util/cgroup.c | 1 - tools/perf/util/evsel.c | 2 - tools/perf/util/evsel.h | 2 - tools/perf/util/python.c | 7 --- tools/perf/util/stat-shadow.c | 112 ---------------------------------- tools/perf/util/stat.h | 1 - 7 files changed, 126 deletions(-) diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index 9f3e4b257516..5d18a5a6f662 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c @@ -2524,7 +2524,6 @@ int cmd_stat(int argc, const char **argv) &stat_config.metric_events); zfree(&metrics); } - perf_stat__collect_metric_expr(evsel_list); perf_stat__init_shadow_stats(); =20 if (add_default_attributes()) diff --git a/tools/perf/util/cgroup.c b/tools/perf/util/cgroup.c index e99b41f9be45..dc2db0ff7ab4 100644 --- a/tools/perf/util/cgroup.c +++ b/tools/perf/util/cgroup.c @@ -468,7 +468,6 @@ int evlist__expand_cgroup(struct evlist *evlist, const = char *str, nr_cgroups++; =20 if (metric_events) { - perf_stat__collect_metric_expr(tmp_list); if (metricgroup__copy_metric_events(tmp_list, cgrp, metric_events, &orig_metric_events) < 0) diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index 999dd1700502..4d198529911a 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -285,8 +285,6 @@ void evsel__init(struct evsel *evsel, evsel->sample_size =3D __evsel__sample_size(attr->sample_type); evsel__calc_id_pos(evsel); evsel->cmdline_group_boundary =3D false; - evsel->metric_expr =3D NULL; - evsel->metric_name =3D NULL; evsel->metric_events =3D NULL; evsel->per_pkg_mask =3D NULL; evsel->collect_stat =3D false; diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h index d572be41b960..24cb807ef6ce 100644 --- a/tools/perf/util/evsel.h +++ b/tools/perf/util/evsel.h @@ -105,8 +105,6 @@ struct evsel { * metric fields are similar, but needs more care as they can have * references to other metric (evsel). */ - const char * metric_expr; - const char * metric_name; struct evsel **metric_events; struct evsel *metric_leader; =20 diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c index 212031b97910..8c450b3d0080 100644 --- a/tools/perf/util/python.c +++ b/tools/perf/util/python.c @@ -75,13 +75,6 @@ const char *perf_env__arch(struct perf_env *env __maybe_= unused) return NULL; } =20 -/* - * Add this one here not to drag util/stat-shadow.c - */ -void perf_stat__collect_metric_expr(struct evlist *evsel_list) -{ -} - /* * This one is needed not to drag the PMU bandwagon, jevents generated * pmu_sys_event_tables, etc and evsel__find_pmu() is used so far just for diff --git a/tools/perf/util/stat-shadow.c b/tools/perf/util/stat-shadow.c index cadb2df23c87..35ea4813f468 100644 --- a/tools/perf/util/stat-shadow.c +++ b/tools/perf/util/stat-shadow.c @@ -346,114 +346,6 @@ static const char *get_ratio_color(enum grc_type type= , double ratio) return color; } =20 -static struct evsel *perf_stat__find_event(struct evlist *evsel_list, - const char *name) -{ - struct evsel *c2; - - evlist__for_each_entry (evsel_list, c2) { - if (!strcasecmp(c2->name, name) && !c2->collect_stat) - return c2; - } - return NULL; -} - -/* Mark MetricExpr target events and link events using them to them. */ -void perf_stat__collect_metric_expr(struct evlist *evsel_list) -{ - struct evsel *counter, *leader, **metric_events, *oc; - bool found; - struct expr_parse_ctx *ctx; - struct hashmap_entry *cur; - size_t bkt; - int i; - - ctx =3D expr__ctx_new(); - if (!ctx) { - pr_debug("expr__ctx_new failed"); - return; - } - evlist__for_each_entry(evsel_list, counter) { - bool invalid =3D false; - - leader =3D evsel__leader(counter); - if (!counter->metric_expr) - continue; - - expr__ctx_clear(ctx); - metric_events =3D counter->metric_events; - if (!metric_events) { - if (expr__find_ids(counter->metric_expr, - counter->name, - ctx) < 0) - continue; - - metric_events =3D calloc(sizeof(struct evsel *), - hashmap__size(ctx->ids) + 1); - if (!metric_events) { - expr__ctx_free(ctx); - return; - } - counter->metric_events =3D metric_events; - } - - i =3D 0; - hashmap__for_each_entry(ctx->ids, cur, bkt) { - const char *metric_name =3D cur->pkey; - - found =3D false; - if (leader) { - /* Search in group */ - for_each_group_member (oc, leader) { - if (!strcasecmp(oc->name, - metric_name) && - !oc->collect_stat) { - found =3D true; - break; - } - } - } - if (!found) { - /* Search ignoring groups */ - oc =3D perf_stat__find_event(evsel_list, - metric_name); - } - if (!oc) { - /* Deduping one is good enough to handle duplicated PMUs. */ - static char *printed; - - /* - * Adding events automatically would be difficult, because - * it would risk creating groups that are not schedulable. - * perf stat doesn't understand all the scheduling constraints - * of events. So we ask the user instead to add the missing - * events. - */ - if (!printed || - strcasecmp(printed, metric_name)) { - fprintf(stderr, - "Add %s event to groups to get metric expression for %s\n", - metric_name, - counter->name); - free(printed); - printed =3D strdup(metric_name); - } - invalid =3D true; - continue; - } - metric_events[i++] =3D oc; - oc->collect_stat =3D true; - } - metric_events[i] =3D NULL; - if (invalid) { - free(metric_events); - counter->metric_events =3D NULL; - counter->metric_expr =3D NULL; - } - } - expr__ctx_free(ctx); -} - static double runtime_stat_avg(struct runtime_stat *st, enum stat_type type, int map_idx, struct runtime_stat_data *rsd) @@ -1299,10 +1191,6 @@ void perf_stat__print_shadow_stats(struct perf_stat_= config *config, color =3D NULL; print_metric(config, ctxp, color, "%8.1f%%", "Core Bound", core_bound * 100.); - } else if (evsel->metric_expr) { - generic_metric(config, evsel->metric_expr, evsel->metric_events, NULL, - evsel->name, evsel->metric_name, NULL, 1, - map_idx, out, st); } else if (runtime_stat_n(st, STAT_NSECS, map_idx, &rsd) !=3D 0) { char unit =3D ' '; char unit_buf[10] =3D "/sec"; diff --git a/tools/perf/util/stat.h b/tools/perf/util/stat.h index 499c3bf81333..b1c29156c560 100644 --- a/tools/perf/util/stat.h +++ b/tools/perf/util/stat.h @@ -257,7 +257,6 @@ void perf_stat__print_shadow_stats(struct perf_stat_con= fig *config, struct perf_stat_output_ctx *out, struct rblist *metric_events, struct runtime_stat *st); -void perf_stat__collect_metric_expr(struct evlist *); =20 int evlist__alloc_stats(struct perf_stat_config *config, struct evlist *evlist, bool alloc_raw); --=20 2.39.0.314.g84b9a713c41-goog From nobody Wed Sep 17 06:42:28 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 10918C4332F for ; Wed, 21 Dec 2022 22:36:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235088AbiLUWgQ (ORCPT ); Wed, 21 Dec 2022 17:36:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46684 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235172AbiLUWfh (ORCPT ); Wed, 21 Dec 2022 17:35:37 -0500 Received: from mail-pf1-x44a.google.com (mail-pf1-x44a.google.com [IPv6:2607:f8b0:4864:20::44a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8AD6614D04 for ; Wed, 21 Dec 2022 14:35:17 -0800 (PST) Received: by mail-pf1-x44a.google.com with SMTP id z8-20020aa79588000000b00576e8050ec9so14918pfj.5 for ; Wed, 21 Dec 2022 14:35:17 -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=pC6isRrZQJBTPK0pkg9ElG5ABnt5NfeUEOm6zvm9c6s=; b=bxVJqQOTiX9f1tA62gviN0yBaRAZx1IjeakOqrQFWy2XrypXLEa6yhuzevo6tTduWZ nVo63HkbDpt6HVpwdMZEOYanE067vmvtTb92yMQ5dsCQ2/p8BEs9vU501nD4zwfhSUZ7 BqL74ZB3n8EIVrew/Y06Vl+ylDsgyaQrtLG0Jz3uPMRnKdbOC89aArgZL+96t0UZL+wH +cd6Mjd3fNDMP7YupeYkgP4xnramou5By08FKVzeZMsOdTYGWfUnRXPLybP8FMusBtqo vCaLhWwRUeTd3HCG1bNDlsE6h0xFWmvkF/xxKZ/u6q633Xxgh/nx8SSuk9qlZZRQRVh8 JhIA== 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=pC6isRrZQJBTPK0pkg9ElG5ABnt5NfeUEOm6zvm9c6s=; b=tVpz28tdYsWLegv4oTU8SosQGYJTddX9I/JaRc0tToAcIdb5rODPwSiN7BogP2gow3 u4Cj3JT5+8z0hFpBVQik+2RmV/2vHmHRMPw6HQXLyf1lrGo622D5OqjrgLt8Goz1pwgA HTAx8/jqJbrAtujjV338XNz+JMlBAQcg1IXFbdau5MCokrn7Gh27cZra1+ELnRPAw37N +2eccsA2cyQE9G/VeYOX5er7xQ0nBG0xaFAWdfle0fZRSHicrVnYMcxlL3nsRXHTySQR GQqsU5cmJZFI0PhHnihCwhat3KLZaMd6CX4Kw3jGF+K0mw02D7BYMpim/4ZgmTGtAs+6 BK2g== X-Gm-Message-State: AFqh2kpoPJkNAn5BXMNjL2h+SBk+I5ZBGQGc7/oYApwIclij4g/xbHNa CRtHPtoeUay/9j+/NOBnGR8r5wzsnIGE X-Google-Smtp-Source: AMrXdXvZgXgBm+ynSwUWG/YkqiQEqVQKEBGGCqm8lB+5EeVkLFjGgB4/0yy2i9dKPCb+QTfGBMBczDHbBr0U X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:62bd:f120:1fd8:1d21]) (user=irogers job=sendgmr) by 2002:a17:902:e045:b0:191:7ec:8236 with SMTP id x5-20020a170902e04500b0019107ec8236mr319004plx.38.1671662116379; Wed, 21 Dec 2022 14:35:16 -0800 (PST) Date: Wed, 21 Dec 2022 14:34:17 -0800 In-Reply-To: <20221221223420.2157113-1-irogers@google.com> Message-Id: <20221221223420.2157113-7-irogers@google.com> Mime-Version: 1.0 References: <20221221223420.2157113-1-irogers@google.com> X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog Subject: [PATCH v2 6/9] perf jevents: Combine table prefix and suffix writing 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" Combine into a single function to simplify, in a later change, writing metrics separately. Signed-off-by: Ian Rogers --- tools/perf/pmu-events/jevents.py | 36 +++++++++++++------------------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/tools/perf/pmu-events/jevents.py b/tools/perf/pmu-events/jeven= ts.py index ee3d4cdf01be..7b9714b25d0a 100755 --- a/tools/perf/pmu-events/jevents.py +++ b/tools/perf/pmu-events/jevents.py @@ -19,10 +19,10 @@ _sys_event_tables =3D [] # JsonEvent. Architecture standard events are in json files in the top # f'{_args.starting_dir}/{_args.arch}' directory. _arch_std_events =3D {} -# Track whether an events table is currently being defined and needs closi= ng. -_close_table =3D False # Events to write out when the table is closed _pending_events =3D [] +# Name of table to be written out +_pending_events_tblname =3D None # Global BigCString shared by all structures. _bcs =3D None # Order specific JsonEvent attributes will be visited. @@ -376,24 +376,13 @@ def preprocess_arch_std_files(archpath: str) -> None: _arch_std_events[event.name.lower()] =3D event =20 =20 -def print_events_table_prefix(tblname: str) -> None: - """Called when a new events table is started.""" - global _close_table - if _close_table: - raise IOError('Printing table prefix but last table has no suffix') - _args.output_file.write(f'static const struct compact_pmu_event {tblname= }[] =3D {{\n') - _close_table =3D True - - def add_events_table_entries(item: os.DirEntry, topic: str) -> None: """Add contents of file to _pending_events table.""" - if not _close_table: - raise IOError('Table entries missing prefix') for e in read_json_events(item.path, topic): _pending_events.append(e) =20 =20 -def print_events_table_suffix() -> None: +def print_pending_events() -> None: """Optionally close events table.""" =20 def event_cmp_key(j: JsonEvent) -> Tuple[bool, str, str, str, str]: @@ -405,17 +394,19 @@ def print_events_table_suffix() -> None: return (j.desc is not None, fix_none(j.topic), fix_none(j.name), fix_n= one(j.pmu), fix_none(j.metric_name)) =20 - global _close_table - if not _close_table: + global _pending_events + if not _pending_events: return =20 - global _pending_events + global _pending_events_tblname + _args.output_file.write( + f'static const struct compact_pmu_event {_pending_events_tblname}[] = =3D {{\n') + for event in sorted(_pending_events, key=3Devent_cmp_key): _args.output_file.write(event.to_c_string()) - _pending_events =3D [] + _pending_events =3D [] =20 _args.output_file.write('};\n\n') - _close_table =3D False =20 def get_topic(topic: str) -> str: if topic.endswith('metrics.json'): @@ -453,12 +444,13 @@ def process_one_file(parents: Sequence[str], item: os= .DirEntry) -> None: =20 # model directory, reset topic if item.is_dir() and is_leaf_dir(item.path): - print_events_table_suffix() + print_pending_events() =20 tblname =3D file_name_to_table_name(parents, item.name) if item.name =3D=3D 'sys': _sys_event_tables.append(tblname) - print_events_table_prefix(tblname) + global _pending_events_tblname + _pending_events_tblname =3D tblname return =20 # base dir or too deep @@ -802,7 +794,7 @@ struct compact_pmu_event { for arch in archs: arch_path =3D f'{_args.starting_dir}/{arch}' ftw(arch_path, [], process_one_file) - print_events_table_suffix() + print_pending_events() =20 print_mapping_table(archs) print_system_mapping_table() --=20 2.39.0.314.g84b9a713c41-goog From nobody Wed Sep 17 06:42:28 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 2664CC4332F for ; Wed, 21 Dec 2022 22:36:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235210AbiLUWgY (ORCPT ); Wed, 21 Dec 2022 17:36:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46142 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235143AbiLUWfm (ORCPT ); Wed, 21 Dec 2022 17:35:42 -0500 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 E7CB42791A for ; Wed, 21 Dec 2022 14:35:24 -0800 (PST) Received: by mail-yb1-xb49.google.com with SMTP id x188-20020a2531c5000000b00716de19d76bso19080190ybx.19 for ; Wed, 21 Dec 2022 14:35:24 -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=rRvS/qEVKLhlR8j01uyrpua52IG8ilBz9DVBSxxT9oI=; b=fieL8Kx0iyCLiE2RGXHVoU5rc/29o/vtcjAjGAQuxsLVNa4tBttWUrXDqsAurV5Q6o sjd8FQoGSuITZ3jtJineiMD3A5STI3qSWO3VNtM8OUpdcdd4ZsmpGSCapoeTleR0uqlT 9UwmtVJpjiG+tHwPfP72H3h0d7Fwtb331UBqxztxnenb9C5w5Te4RkjOwTV3U5HmcuMh IR41S9ctzkFuW7sjgDY6GYbSlvtQpySUqtQqSI9Vrr0vOxscBqHUyA8ilZchkqa+tUnu vD9RGAlhi7Zmby3OuY4r2zsVa5FswqnYHxiIkYLLocj/fMqBBnolCj8WIkRuknxyQ9IK nHnw== 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=rRvS/qEVKLhlR8j01uyrpua52IG8ilBz9DVBSxxT9oI=; b=ZXlcBzBqhorA8vBS4PLFwltl9XOs935H5SxbOxTQitJt40AVThcwlUthVLDmCRgeJB CC3lU3aK5ofH45KaSuOIN0ZbWblslXdTnt0Htfrt/apjp5uf3q+UxFnVP768i9jOnQkJ iYwV6utEfY/K07/aK24cbIXganw9wFKfbF+Qqn9aJlrwILywITY2txKHqibQMkYqBqH8 fofSDN0O7jgjX9f/K0f03JUQa5BIZ+DZbpihF8MWRYUyqAe1TO7qDU9OhVplq2kHSSEK iOuBNW4cVm3lpy3hGjXqPzf2fyHXPScUpUNh8OnD1L92hsC64Gwt0dqC/ZtHge3wiMht widg== X-Gm-Message-State: AFqh2kp4/gB4QdQCzzFLaZndT11AM84XgUxkxAbjUfMZsY05jJOvnw0g MNgmvX3RXvRr2KFjA/i4838/TQsXi3US X-Google-Smtp-Source: AMrXdXuqqCV9iRu4mi7Iat5os1z1E1nNjJ8R0kdkr8hFe+ERSONYSlDXgDY34TJ8VjfDvAzaQs+YWBN+ClXv X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:62bd:f120:1fd8:1d21]) (user=irogers job=sendgmr) by 2002:a05:6902:4e1:b0:6ee:d8b:747e with SMTP id w1-20020a05690204e100b006ee0d8b747emr307952ybs.523.1671662124196; Wed, 21 Dec 2022 14:35:24 -0800 (PST) Date: Wed, 21 Dec 2022 14:34:18 -0800 In-Reply-To: <20221221223420.2157113-1-irogers@google.com> Message-Id: <20221221223420.2157113-8-irogers@google.com> Mime-Version: 1.0 References: <20221221223420.2157113-1-irogers@google.com> X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog Subject: [PATCH v2 7/9] perf pmu-events: Introduce pmu_metrics_table 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 a metrics table that is just a cast from pmu_events_table. This changes the APIs so that event and metric usage of the underlying table is different. Later changes will separate the tables. This introduction fixes a NO_JEVENTS=3D1 regression on: 68: Parse and process metrics : Ok 70: Event expansion for cgroups : Ok caused by the necessary test metrics not being found. Signed-off-by: Ian Rogers --- tools/perf/arch/arm64/util/pmu.c | 23 ++++++++++- tools/perf/pmu-events/empty-pmu-events.c | 52 ++++++++++++++++++++---- tools/perf/pmu-events/jevents.py | 24 ++++++++--- tools/perf/pmu-events/pmu-events.h | 10 +++-- tools/perf/tests/expand-cgroup.c | 4 +- tools/perf/tests/parse-metric.c | 4 +- tools/perf/tests/pmu-events.c | 5 ++- tools/perf/util/metricgroup.c | 50 +++++++++++------------ tools/perf/util/metricgroup.h | 2 +- tools/perf/util/pmu.c | 9 +++- tools/perf/util/pmu.h | 1 + 11 files changed, 133 insertions(+), 51 deletions(-) diff --git a/tools/perf/arch/arm64/util/pmu.c b/tools/perf/arch/arm64/util/= pmu.c index 477e513972a4..f8ae479a06db 100644 --- a/tools/perf/arch/arm64/util/pmu.c +++ b/tools/perf/arch/arm64/util/pmu.c @@ -19,7 +19,28 @@ const struct pmu_events_table *pmu_events_table__find(vo= id) if (pmu->cpus->nr !=3D cpu__max_cpu().cpu) return NULL; =20 - return perf_pmu__find_table(pmu); + return perf_pmu__find_events_table(pmu); + } + + return NULL; +} + +const struct pmu_metrics_table *pmu_metrics_table__find(void) +{ + struct perf_pmu *pmu =3D NULL; + + while ((pmu =3D perf_pmu__scan(pmu))) { + if (!is_pmu_core(pmu->name)) + continue; + + /* + * The cpumap should cover all CPUs. Otherwise, some CPUs may + * not support some events or have different event IDs. + */ + if (pmu->cpus->nr !=3D cpu__max_cpu().cpu) + return NULL; + + return perf_pmu__find_metrics_table(pmu); } =20 return NULL; diff --git a/tools/perf/pmu-events/empty-pmu-events.c b/tools/perf/pmu-even= ts/empty-pmu-events.c index 5572a4d1eddb..d50f60a571dd 100644 --- a/tools/perf/pmu-events/empty-pmu-events.c +++ b/tools/perf/pmu-events/empty-pmu-events.c @@ -278,14 +278,12 @@ int pmu_events_table_for_each_event(const struct pmu_= events_table *table, pmu_ev return 0; } =20 -int pmu_events_table_for_each_metric(const struct pmu_events_table *etable= , pmu_metric_iter_fn fn, - void *data) +int pmu_metrics_table_for_each_metric(const struct pmu_metrics_table *tabl= e, pmu_metric_iter_fn fn, + void *data) { - struct pmu_metrics_table *table =3D (struct pmu_metrics_table *)etable; - for (const struct pmu_metric *pm =3D &table->entries[0]; pm->metric_group= || pm->metric_name; pm++) { - int ret =3D fn(pm, etable, data); + int ret =3D fn(pm, table, data); =20 if (ret) return ret; @@ -293,7 +291,7 @@ int pmu_events_table_for_each_metric(const struct pmu_e= vents_table *etable, pmu_ return 0; } =20 -const struct pmu_events_table *perf_pmu__find_table(struct perf_pmu *pmu) +const struct pmu_events_table *perf_pmu__find_events_table(struct perf_pmu= *pmu) { const struct pmu_events_table *table =3D NULL; char *cpuid =3D perf_pmu__getcpuid(pmu); @@ -321,6 +319,34 @@ const struct pmu_events_table *perf_pmu__find_table(st= ruct perf_pmu *pmu) return table; } =20 +const struct pmu_metrics_table *perf_pmu__find_metrics_table(struct perf_p= mu *pmu) +{ + const struct pmu_metrics_table *table =3D NULL; + char *cpuid =3D perf_pmu__getcpuid(pmu); + int i; + + /* on some platforms which uses cpus map, cpuid can be NULL for + * PMUs other than CORE PMUs. + */ + if (!cpuid) + return NULL; + + i =3D 0; + for (;;) { + const struct pmu_events_map *map =3D &pmu_events_map[i++]; + + if (!map->cpuid) + break; + + if (!strcmp_cpuid_str(map->cpuid, cpuid)) { + table =3D &map->metric_table; + break; + } + } + free(cpuid); + return table; +} + const struct pmu_events_table *find_core_events_table(const char *arch, co= nst char *cpuid) { for (const struct pmu_events_map *tables =3D &pmu_events_map[0]; @@ -332,6 +358,17 @@ const struct pmu_events_table *find_core_events_table(= const char *arch, const ch return NULL; } =20 +const struct pmu_metrics_table *find_core_metrics_table(const char *arch, = const char *cpuid) +{ + for (const struct pmu_events_map *tables =3D &pmu_events_map[0]; + tables->arch; + tables++) { + if (!strcmp(tables->arch, arch) && !strcmp_cpuid_str(tables->cpuid, cpui= d)) + return &tables->metric_table; + } + return NULL; +} + int pmu_for_each_core_event(pmu_event_iter_fn fn, void *data) { for (const struct pmu_events_map *tables =3D &pmu_events_map[0]; @@ -350,8 +387,7 @@ int pmu_for_each_core_metric(pmu_metric_iter_fn fn, voi= d *data) for (const struct pmu_events_map *tables =3D &pmu_events_map[0]; tables->arch; tables++) { - int ret =3D pmu_events_table_for_each_metric( - (const struct pmu_events_table *)&tables->metric_table, fn, data); + int ret =3D pmu_metrics_table_for_each_metric(&tables->metric_table, fn,= data); =20 if (ret) return ret; diff --git a/tools/perf/pmu-events/jevents.py b/tools/perf/pmu-events/jeven= ts.py index 7b9714b25d0a..be2cf8a8779c 100755 --- a/tools/perf/pmu-events/jevents.py +++ b/tools/perf/pmu-events/jevents.py @@ -609,17 +609,19 @@ int pmu_events_table_for_each_event(const struct pmu_= events_table *table, return 0; } =20 -int pmu_events_table_for_each_metric(const struct pmu_events_table *table, +int pmu_metrics_table_for_each_metric(const struct pmu_metrics_table *mtab= le, pmu_metric_iter_fn fn, void *data) { + struct pmu_events_table *table =3D (struct pmu_events_table *)mtab= le; + for (size_t i =3D 0; i < table->length; i++) { struct pmu_metric pm; int ret; =20 decompress_metric(table->entries[i].offset, &pm); if (pm.metric_name) { - ret =3D fn(&pm, table, data); + ret =3D fn(&pm, mtable, data); if (ret) return ret; } @@ -627,7 +629,7 @@ int pmu_events_table_for_each_metric(const struct pmu_e= vents_table *table, return 0; } =20 -const struct pmu_events_table *perf_pmu__find_table(struct perf_pmu *pmu) +const struct pmu_events_table *perf_pmu__find_events_table(struct perf_pmu= *pmu) { const struct pmu_events_table *table =3D NULL; char *cpuid =3D perf_pmu__getcpuid(pmu); @@ -654,6 +656,11 @@ const struct pmu_events_table *perf_pmu__find_table(st= ruct perf_pmu *pmu) return table; } =20 +const struct pmu_metrics_table *perf_pmu__find_metrics_table(struct perf_p= mu *pmu) +{ + return (struct pmu_metrics_table *)perf_pmu__find_events_table(pmu= ); +} + const struct pmu_events_table *find_core_events_table(const char *arch, co= nst char *cpuid) { for (const struct pmu_events_map *tables =3D &pmu_events_map[0]; @@ -665,6 +672,11 @@ const struct pmu_events_table *find_core_events_table(= const char *arch, const ch return NULL; } =20 +const struct pmu_metrics_table *find_core_metrics_table(const char *arch, = const char *cpuid) +{ + return (struct pmu_metrics_table *)find_core_events_table(arch, cpu= id); +} + int pmu_for_each_core_event(pmu_event_iter_fn fn, void *data) { for (const struct pmu_events_map *tables =3D &pmu_events_map[0]; @@ -683,7 +695,8 @@ int pmu_for_each_core_metric(pmu_metric_iter_fn fn, voi= d *data) for (const struct pmu_events_map *tables =3D &pmu_events_map[0]; tables->arch; tables++) { - int ret =3D pmu_events_table_for_each_metric(&tables->tabl= e, fn, data); + int ret =3D pmu_metrics_table_for_each_metric( + (struct pmu_metrics_table *)&tables->table= , fn, data); =20 if (ret) return ret; @@ -720,7 +733,8 @@ int pmu_for_each_sys_metric(pmu_metric_iter_fn fn, void= *data) for (const struct pmu_sys_events *tables =3D &pmu_sys_event_tables= [0]; tables->name; tables++) { - int ret =3D pmu_events_table_for_each_metric(&tables->tabl= e, fn, data); + int ret =3D pmu_metrics_table_for_each_metric( + (struct pmu_metrics_table *)&tables->table= , fn, data); =20 if (ret) return ret; diff --git a/tools/perf/pmu-events/pmu-events.h b/tools/perf/pmu-events/pmu= -events.h index e137f3857c03..b7d4a66b8ad2 100644 --- a/tools/perf/pmu-events/pmu-events.h +++ b/tools/perf/pmu-events/pmu-events.h @@ -39,26 +39,30 @@ struct pmu_metric { }; =20 struct pmu_events_table; +struct pmu_metrics_table; =20 typedef int (*pmu_event_iter_fn)(const struct pmu_event *pe, const struct pmu_events_table *table, void *data); =20 typedef int (*pmu_metric_iter_fn)(const struct pmu_metric *pm, - const struct pmu_events_table *table, + const struct pmu_metrics_table *table, void *data); =20 int pmu_events_table_for_each_event(const struct pmu_events_table *table, = pmu_event_iter_fn fn, void *data); -int pmu_events_table_for_each_metric(const struct pmu_events_table *table,= pmu_metric_iter_fn fn, +int pmu_metrics_table_for_each_metric(const struct pmu_metrics_table *tabl= e, pmu_metric_iter_fn fn, void *data); =20 -const struct pmu_events_table *perf_pmu__find_table(struct perf_pmu *pmu); +const struct pmu_events_table *perf_pmu__find_events_table(struct perf_pmu= *pmu); +const struct pmu_metrics_table *perf_pmu__find_metrics_table(struct perf_p= mu *pmu); const struct pmu_events_table *find_core_events_table(const char *arch, co= nst char *cpuid); +const struct pmu_metrics_table *find_core_metrics_table(const char *arch, = const char *cpuid); int pmu_for_each_core_event(pmu_event_iter_fn fn, void *data); int pmu_for_each_core_metric(pmu_metric_iter_fn fn, void *data); =20 const struct pmu_events_table *find_sys_events_table(const char *name); +const struct pmu_metrics_table *find_sys_metrics_table(const char *name); int pmu_for_each_sys_event(pmu_event_iter_fn fn, void *data); int pmu_for_each_sys_metric(pmu_metric_iter_fn fn, void *data); =20 diff --git a/tools/perf/tests/expand-cgroup.c b/tools/perf/tests/expand-cgr= oup.c index 51fb5f34c1dd..672a27f37060 100644 --- a/tools/perf/tests/expand-cgroup.c +++ b/tools/perf/tests/expand-cgroup.c @@ -180,13 +180,13 @@ static int expand_metric_events(void) struct evlist *evlist; struct rblist metric_events; const char metric_str[] =3D "CPI"; - const struct pmu_events_table *pme_test; + const struct pmu_metrics_table *pme_test; =20 evlist =3D evlist__new(); TEST_ASSERT_VAL("failed to get evlist", evlist); =20 rblist__init(&metric_events); - pme_test =3D find_core_events_table("testarch", "testcpu"); + pme_test =3D find_core_metrics_table("testarch", "testcpu"); ret =3D metricgroup__parse_groups_test(evlist, pme_test, metric_str, false, false, &metric_events); if (ret < 0) { diff --git a/tools/perf/tests/parse-metric.c b/tools/perf/tests/parse-metri= c.c index 21b7ac00d798..9fec6040950c 100644 --- a/tools/perf/tests/parse-metric.c +++ b/tools/perf/tests/parse-metric.c @@ -72,7 +72,7 @@ static int __compute_metric(const char *name, struct valu= e *vals, struct rblist metric_events =3D { .nr_entries =3D 0, }; - const struct pmu_events_table *pme_test; + const struct pmu_metrics_table *pme_test; struct perf_cpu_map *cpus; struct runtime_stat st; struct evlist *evlist; @@ -96,7 +96,7 @@ static int __compute_metric(const char *name, struct valu= e *vals, runtime_stat__init(&st); =20 /* Parse the metric into metric_events list. */ - pme_test =3D find_core_events_table("testarch", "testcpu"); + pme_test =3D find_core_metrics_table("testarch", "testcpu"); err =3D metricgroup__parse_groups_test(evlist, pme_test, name, false, false, &metric_events); diff --git a/tools/perf/tests/pmu-events.c b/tools/perf/tests/pmu-events.c index c2b3ada57cbc..9f2e385e0991 100644 --- a/tools/perf/tests/pmu-events.c +++ b/tools/perf/tests/pmu-events.c @@ -813,7 +813,8 @@ struct metric { struct metric_ref metric_ref; }; =20 -static int test__parsing_callback(const struct pmu_metric *pm, const struc= t pmu_events_table *table, +static int test__parsing_callback(const struct pmu_metric *pm, + const struct pmu_metrics_table *table, void *data) { int *failures =3D data; @@ -995,7 +996,7 @@ static int metric_parse_fake(const char *metric_name, c= onst char *str) } =20 static int test__parsing_fake_callback(const struct pmu_metric *pm, - const struct pmu_events_table *table __maybe_unused, + const struct pmu_metrics_table *table __maybe_unused, void *data __maybe_unused) { return metric_parse_fake(pm->metric_name, pm->metric_expr); diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c index 47fd02af66f1..46314ad571e4 100644 --- a/tools/perf/util/metricgroup.c +++ b/tools/perf/util/metricgroup.c @@ -457,7 +457,7 @@ struct metricgroup_iter_data { }; =20 static int metricgroup__sys_event_iter(const struct pmu_metric *pm, - const struct pmu_events_table *table, + const struct pmu_metrics_table *table, void *data) { struct metricgroup_iter_data *d =3D data; @@ -477,7 +477,7 @@ static int metricgroup__sys_event_iter(const struct pmu= _metric *pm, } =20 static int metricgroup__add_to_mep_groups_callback(const struct pmu_metric= *pm, - const struct pmu_events_table *table __maybe_unused, + const struct pmu_metrics_table *table __maybe_unused, void *vdata) { struct rblist *groups =3D vdata; @@ -488,16 +488,16 @@ static int metricgroup__add_to_mep_groups_callback(co= nst struct pmu_metric *pm, void metricgroup__print(const struct print_callbacks *print_cb, void *prin= t_state) { struct rblist groups; - const struct pmu_events_table *table; + const struct pmu_metrics_table *table; struct rb_node *node, *next; =20 rblist__init(&groups); groups.node_new =3D mep_new; groups.node_cmp =3D mep_cmp; groups.node_delete =3D mep_delete; - table =3D pmu_events_table__find(); + table =3D pmu_metrics_table__find(); if (table) { - pmu_events_table_for_each_metric(table, + pmu_metrics_table_for_each_metric(table, metricgroup__add_to_mep_groups_callback, &groups); } @@ -765,11 +765,11 @@ struct metricgroup_add_iter_data { bool system_wide; struct metric *root_metric; const struct visited_metric *visited; - const struct pmu_events_table *table; + const struct pmu_metrics_table *table; }; =20 static bool metricgroup__find_metric(const char *metric, - const struct pmu_events_table *table, + const struct pmu_metrics_table *table, struct pmu_metric *pm); =20 static int add_metric(struct list_head *metric_list, @@ -780,7 +780,7 @@ static int add_metric(struct list_head *metric_list, bool system_wide, struct metric *root_metric, const struct visited_metric *visited, - const struct pmu_events_table *table); + const struct pmu_metrics_table *table); =20 /** * resolve_metric - Locate metrics within the root metric and recursively = add @@ -807,7 +807,7 @@ static int resolve_metric(struct list_head *metric_list, bool system_wide, struct metric *root_metric, const struct visited_metric *visited, - const struct pmu_events_table *table) + const struct pmu_metrics_table *table) { struct hashmap_entry *cur; size_t bkt; @@ -889,7 +889,7 @@ static int __add_metric(struct list_head *metric_list, bool system_wide, struct metric *root_metric, const struct visited_metric *visited, - const struct pmu_events_table *table) + const struct pmu_metrics_table *table) { const struct visited_metric *vm; int ret; @@ -982,7 +982,7 @@ struct metricgroup__find_metric_data { }; =20 static int metricgroup__find_metric_callback(const struct pmu_metric *pm, - const struct pmu_events_table *table __maybe_unused, + const struct pmu_metrics_table *table __maybe_unused, void *vdata) { struct metricgroup__find_metric_data *data =3D vdata; @@ -995,7 +995,7 @@ static int metricgroup__find_metric_callback(const stru= ct pmu_metric *pm, } =20 static bool metricgroup__find_metric(const char *metric, - const struct pmu_events_table *table, + const struct pmu_metrics_table *table, struct pmu_metric *pm) { struct metricgroup__find_metric_data data =3D { @@ -1003,7 +1003,7 @@ static bool metricgroup__find_metric(const char *metr= ic, .pm =3D pm, }; =20 - return pmu_events_table_for_each_metric(table, metricgroup__find_metric_c= allback, &data) + return pmu_metrics_table_for_each_metric(table, metricgroup__find_metric_= callback, &data) ? true : false; } =20 @@ -1015,7 +1015,7 @@ static int add_metric(struct list_head *metric_list, bool system_wide, struct metric *root_metric, const struct visited_metric *visited, - const struct pmu_events_table *table) + const struct pmu_metrics_table *table) { int ret =3D 0; =20 @@ -1045,7 +1045,7 @@ static int add_metric(struct list_head *metric_list, } =20 static int metricgroup__add_metric_sys_event_iter(const struct pmu_metric = *pm, - const struct pmu_events_table *table __maybe_unused, + const struct pmu_metrics_table *table __maybe_unused, void *data) { struct metricgroup_add_iter_data *d =3D data; @@ -1105,7 +1105,7 @@ struct metricgroup__add_metric_data { }; =20 static int metricgroup__add_metric_callback(const struct pmu_metric *pm, - const struct pmu_events_table *table, + const struct pmu_metrics_table *table, void *vdata) { struct metricgroup__add_metric_data *data =3D vdata; @@ -1143,7 +1143,7 @@ static int metricgroup__add_metric(const char *metric= _name, const char *modifier const char *user_requested_cpu_list, bool system_wide, struct list_head *metric_list, - const struct pmu_events_table *table) + const struct pmu_metrics_table *table) { LIST_HEAD(list); int ret; @@ -1163,7 +1163,7 @@ static int metricgroup__add_metric(const char *metric= _name, const char *modifier * Iterate over all metrics seeing if metric matches either the * name or group. When it does add the metric to the list. */ - ret =3D pmu_events_table_for_each_metric(table, metricgroup__add_metric_= callback, + ret =3D pmu_metrics_table_for_each_metric(table, metricgroup__add_metric= _callback, &data); if (ret) goto out; @@ -1219,7 +1219,7 @@ static int metricgroup__add_metric(const char *metric= _name, const char *modifier static int metricgroup__add_metric_list(const char *list, bool metric_no_g= roup, const char *user_requested_cpu_list, bool system_wide, struct list_head *metric_list, - const struct pmu_events_table *table) + const struct pmu_metrics_table *table) { char *list_itr, *list_copy, *metric_name, *modifier; int ret, count =3D 0; @@ -1429,7 +1429,7 @@ static int parse_groups(struct evlist *perf_evlist, c= onst char *str, bool system_wide, struct perf_pmu *fake_pmu, struct rblist *metric_events_list, - const struct pmu_events_table *table) + const struct pmu_metrics_table *table) { struct evlist *combined_evlist =3D NULL; LIST_HEAD(metric_list); @@ -1577,7 +1577,7 @@ int metricgroup__parse_groups(struct evlist *perf_evl= ist, bool system_wide, struct rblist *metric_events) { - const struct pmu_events_table *table =3D pmu_events_table__find(); + const struct pmu_metrics_table *table =3D pmu_metrics_table__find(); =20 if (!table) return -EINVAL; @@ -1588,7 +1588,7 @@ int metricgroup__parse_groups(struct evlist *perf_evl= ist, } =20 int metricgroup__parse_groups_test(struct evlist *evlist, - const struct pmu_events_table *table, + const struct pmu_metrics_table *table, const char *str, bool metric_no_group, bool metric_no_merge, @@ -1601,7 +1601,7 @@ int metricgroup__parse_groups_test(struct evlist *evl= ist, } =20 static int metricgroup__has_metric_callback(const struct pmu_metric *pm, - const struct pmu_events_table *table __maybe_unused, + const struct pmu_metrics_table *table __maybe_unused, void *vdata) { const char *metric =3D vdata; @@ -1617,12 +1617,12 @@ static int metricgroup__has_metric_callback(const s= truct pmu_metric *pm, =20 bool metricgroup__has_metric(const char *metric) { - const struct pmu_events_table *table =3D pmu_events_table__find(); + const struct pmu_metrics_table *table =3D pmu_metrics_table__find(); =20 if (!table) return false; =20 - return pmu_events_table_for_each_metric(table, metricgroup__has_metric_ca= llback, + return pmu_metrics_table_for_each_metric(table, metricgroup__has_metric_c= allback, (void *)metric) ? true : false; } =20 diff --git a/tools/perf/util/metricgroup.h b/tools/perf/util/metricgroup.h index b1f186d0f514..84030321a057 100644 --- a/tools/perf/util/metricgroup.h +++ b/tools/perf/util/metricgroup.h @@ -73,7 +73,7 @@ int metricgroup__parse_groups(struct evlist *perf_evlist, bool system_wide, struct rblist *metric_events); int metricgroup__parse_groups_test(struct evlist *evlist, - const struct pmu_events_table *table, + const struct pmu_metrics_table *table, const char *str, bool metric_no_group, bool metric_no_merge, diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index d627f99b5a63..09014e85203b 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -718,7 +718,12 @@ char *perf_pmu__getcpuid(struct perf_pmu *pmu) =20 __weak const struct pmu_events_table *pmu_events_table__find(void) { - return perf_pmu__find_table(NULL); + return perf_pmu__find_events_table(NULL); +} + +__weak const struct pmu_metrics_table *pmu_metrics_table__find(void) +{ + return perf_pmu__find_metrics_table(NULL); } =20 /* @@ -846,7 +851,7 @@ static void pmu_add_cpu_aliases(struct list_head *head,= struct perf_pmu *pmu) { const struct pmu_events_table *table; =20 - table =3D perf_pmu__find_table(pmu); + table =3D perf_pmu__find_events_table(pmu); if (!table) return; =20 diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h index 4d8d64209b4b..c1fb70bf6f84 100644 --- a/tools/perf/util/pmu.h +++ b/tools/perf/util/pmu.h @@ -230,6 +230,7 @@ void pmu_add_cpu_aliases_table(struct list_head *head, = struct perf_pmu *pmu, =20 char *perf_pmu__getcpuid(struct perf_pmu *pmu); const struct pmu_events_table *pmu_events_table__find(void); +const struct pmu_metrics_table *pmu_metrics_table__find(void); bool pmu_uncore_alias_match(const char *pmu_name, const char *name); void perf_pmu_free_alias(struct perf_pmu_alias *alias); =20 --=20 2.39.0.314.g84b9a713c41-goog From nobody Wed Sep 17 06:42:28 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 4E32AC4167B for ; Wed, 21 Dec 2022 22:36:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235105AbiLUWgo (ORCPT ); Wed, 21 Dec 2022 17:36:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45846 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235155AbiLUWgC (ORCPT ); Wed, 21 Dec 2022 17:36:02 -0500 Received: from mail-ot1-x349.google.com (mail-ot1-x349.google.com [IPv6:2607:f8b0:4864:20::349]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4A47622BC9 for ; Wed, 21 Dec 2022 14:35:33 -0800 (PST) Received: by mail-ot1-x349.google.com with SMTP id bq2-20020a056830388200b00672e4a07168so72952otb.2 for ; Wed, 21 Dec 2022 14:35:33 -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=Zeq0c3sX/7SmRmvsyNKNV99iYluBRFNYHty1FMhbMmM=; b=k+Z5n/KAk0ZDyYqa1z1K4nOOj4eYlXbBm5lp6cQcj8/gbIZ0MkpXeUH09mWM98goJr L2Or6yvqegQKEnvA+x+c7RPOHfkLWbUxQHCYW+OzhpYnNTEkFCVm/w0n5hYgAEkP6UEP 6PNWM6xF0PPbdExrEoWcroe3Yvvlmo+aaVi4TJ4Gh9hVHCS+8ezPIGAXiIF+swurhjW0 523cjwGgvmHND2k49JcUIe7m84KtYWNBWTQ2UBQiAxcoIQgBIXNJYwXx6vBurP79OWP8 xW7rIbp8HEDJ8H4gpU6WMmNkOtKkO9ppYeV8zmOL8H84P0gKD83QYKJDVBVc7k8TxzIV 8I8w== 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=Zeq0c3sX/7SmRmvsyNKNV99iYluBRFNYHty1FMhbMmM=; b=TgkxBRLdKbC5ANMgv5bR9zLy1u32QO81JdiZPSlVnt5hGr1jWyDEfXN/uiztNRzZro rrJD3H5mKWBS339fLELc6zg5hV9s2H792LQA9Aq1R68T2d7Fy18koL8dqERQBVWVxNPW Z/ZY4QP9UsCsgkNC0SlTtNWKRnRVxB5blE0oitkIwnrD1mrkpj6Dzhq9kPKW79BFBC8Z O3gQtgCH+iVNfiBcMh7Axo2Z4L9rbmFVResTnV4wIr8Btskz1Rxkv4jVgI47xOjyTjti xB/QRP5lpFGF8ut5lrf2zUjDrDK7YtpLV+663/MaqMS1VUKiBCcILJ8+RVeyfGgUPsbX 4WPw== X-Gm-Message-State: AFqh2kqRnmbeQWsltQA+LKsZgBWZTskYcrGF7C8EERbeMLfTu8f/1Smp jS5a5sC0/lSOqGxWe80BigSLIYE3hSlI X-Google-Smtp-Source: AMrXdXu4+lYR7BbdxD3iZGlwGRIvTiK/bBSREglZen4lU6e0oQCbhPY9YQmlr6LNwWw+iRKzHoZS/9NCJw4y X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:62bd:f120:1fd8:1d21]) (user=irogers job=sendgmr) by 2002:a05:6870:d2a8:b0:144:189a:4dd with SMTP id d40-20020a056870d2a800b00144189a04ddmr194310oae.89.1671662132607; Wed, 21 Dec 2022 14:35:32 -0800 (PST) Date: Wed, 21 Dec 2022 14:34:19 -0800 In-Reply-To: <20221221223420.2157113-1-irogers@google.com> Message-Id: <20221221223420.2157113-9-irogers@google.com> Mime-Version: 1.0 References: <20221221223420.2157113-1-irogers@google.com> X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog Subject: [PATCH v2 8/9] perf jevents: Generate metrics and events as separate tables 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" Turn a perf json event into an event, metric or both. This reduces the number of events needed to scan to find an event or metric. As events no longer need the relatively seldom used metric fields, 4 bytes is saved per event. This reduces the big C string's size by 335kb (14.8%) on x86. Signed-off-by: Ian Rogers --- tools/perf/pmu-events/jevents.py | 244 +++++++++++++++++++++++-------- tools/perf/tests/pmu-events.c | 3 +- 2 files changed, 189 insertions(+), 58 deletions(-) diff --git a/tools/perf/pmu-events/jevents.py b/tools/perf/pmu-events/jeven= ts.py index be2cf8a8779c..c98443319145 100755 --- a/tools/perf/pmu-events/jevents.py +++ b/tools/perf/pmu-events/jevents.py @@ -13,28 +13,40 @@ import collections =20 # Global command line arguments. _args =3D None +# List of regular event tables. +_event_tables =3D [] # List of event tables generated from "/sys" directories. _sys_event_tables =3D [] +# List of regular metric tables. +_metric_tables =3D [] +# List of metric tables generated from "/sys" directories. +_sys_metric_tables =3D [] +# Mapping between sys event table names and sys metric table names. +_sys_event_table_to_metric_table_mapping =3D {} # Map from an event name to an architecture standard # JsonEvent. Architecture standard events are in json files in the top # f'{_args.starting_dir}/{_args.arch}' directory. _arch_std_events =3D {} # Events to write out when the table is closed _pending_events =3D [] -# Name of table to be written out +# Name of events table to be written out _pending_events_tblname =3D None +# Metrics to write out when the table is closed +_pending_metrics =3D [] +# Name of metrics table to be written out +_pending_metrics_tblname =3D None # Global BigCString shared by all structures. _bcs =3D None # Order specific JsonEvent attributes will be visited. _json_event_attributes =3D [ # cmp_sevent related attributes. - 'name', 'pmu', 'topic', 'desc', 'metric_name', 'metric_group', + 'name', 'pmu', 'topic', 'desc', # Seems useful, put it early. 'event', # Short things in alphabetical order. 'aggr_mode', 'compat', 'deprecated', 'perpkg', 'unit', # Longer things (the last won't be iterated over during decompress). - 'metric_constraint', 'metric_expr', 'long_desc' + 'long_desc' ] =20 # Attributes that are in pmu_metric rather than pmu_event. @@ -52,14 +64,16 @@ def removesuffix(s: str, suffix: str) -> str: return s[0:-len(suffix)] if s.endswith(suffix) else s =20 =20 -def file_name_to_table_name(parents: Sequence[str], dirname: str) -> str: +def file_name_to_table_name(prefix: str, parents: Sequence[str], + dirname: str) -> str: """Generate a C table name from directory names.""" - tblname =3D 'pme' + tblname =3D prefix for p in parents: tblname +=3D '_' + p tblname +=3D '_' + dirname return tblname.replace('-', '_') =20 + def c_len(s: str) -> int: """Return the length of s a C string =20 @@ -277,7 +291,7 @@ class JsonEvent: self.metric_constraint =3D jd.get('MetricConstraint') self.metric_expr =3D None if 'MetricExpr' in jd: - self.metric_expr =3D metric.ParsePerfJson(jd['MetricExpr']).Simplif= y() + self.metric_expr =3D metric.ParsePerfJson(jd['MetricExpr']).Simplify= () =20 arch_std =3D jd.get('ArchStdEvent') if precise and self.desc and '(Precise Event)' not in self.desc: @@ -326,23 +340,24 @@ class JsonEvent: s +=3D f'\t{attr} =3D {value},\n' return s + '}' =20 - def build_c_string(self) -> str: + def build_c_string(self, metric: bool) -> str: s =3D '' - for attr in _json_event_attributes: + for attr in _json_metric_attributes if metric else _json_event_attribu= tes: x =3D getattr(self, attr) - if x and attr =3D=3D 'metric_expr': + if metric and x and attr =3D=3D 'metric_expr': # Convert parsed metric expressions into a string. Slashes # must be doubled in the file. x =3D x.ToPerfJson().replace('\\', '\\\\') s +=3D f'{x}\\000' if x else '\\000' return s =20 - def to_c_string(self) -> str: + def to_c_string(self, metric: bool) -> str: """Representation of the event as a C struct initializer.""" =20 - s =3D self.build_c_string() + s =3D self.build_c_string(metric) return f'{{ { _bcs.offsets[s] } }}, /* {s} */\n' =20 + @lru_cache(maxsize=3DNone) def read_json_events(path: str, topic: str) -> Sequence[JsonEvent]: """Read json events from the specified file.""" @@ -379,7 +394,10 @@ def preprocess_arch_std_files(archpath: str) -> None: def add_events_table_entries(item: os.DirEntry, topic: str) -> None: """Add contents of file to _pending_events table.""" for e in read_json_events(item.path, topic): - _pending_events.append(e) + if e.name: + _pending_events.append(e) + if e.metric_name: + _pending_metrics.append(e) =20 =20 def print_pending_events() -> None: @@ -399,15 +417,54 @@ def print_pending_events() -> None: return =20 global _pending_events_tblname + if _pending_events_tblname.endswith('_sys'): + global _sys_event_tables + _sys_event_tables.append(_pending_events_tblname) + else: + global event_tables + _event_tables.append(_pending_events_tblname) + _args.output_file.write( f'static const struct compact_pmu_event {_pending_events_tblname}[] = =3D {{\n') =20 for event in sorted(_pending_events, key=3Devent_cmp_key): - _args.output_file.write(event.to_c_string()) + _args.output_file.write(event.to_c_string(metric=3DFalse)) _pending_events =3D [] =20 _args.output_file.write('};\n\n') =20 +def print_pending_metrics() -> None: + """Optionally close metrics table.""" + + def metric_cmp_key(j: JsonEvent) -> Tuple[bool, str, str]: + def fix_none(s: Optional[str]) -> str: + if s is None: + return '' + return s + + return (j.desc is not None, fix_none(j.pmu), fix_none(j.metric_name)) + + global _pending_metrics + if not _pending_metrics: + return + + global _pending_metrics_tblname + if _pending_metrics_tblname.endswith('_sys'): + global _sys_metric_tables + _sys_metric_tables.append(_pending_metrics_tblname) + else: + global metric_tables + _metric_tables.append(_pending_metrics_tblname) + + _args.output_file.write( + f'static const struct compact_pmu_event {_pending_metrics_tblname}[]= =3D {{\n') + + for metric in sorted(_pending_metrics, key=3Dmetric_cmp_key): + _args.output_file.write(metric.to_c_string(metric=3DTrue)) + _pending_metrics =3D [] + + _args.output_file.write('};\n\n') + def get_topic(topic: str) -> str: if topic.endswith('metrics.json'): return 'metrics' @@ -430,12 +487,13 @@ def preprocess_one_file(parents: Sequence[str], item:= os.DirEntry) -> None: =20 topic =3D get_topic(item.name) for event in read_json_events(item.path, topic): - _bcs.add(event.build_c_string()) + if event.name: + _bcs.add(event.build_c_string(metric=3DFalse)) + if event.metric_name: + _bcs.add(event.build_c_string(metric=3DTrue)) =20 def process_one_file(parents: Sequence[str], item: os.DirEntry) -> None: """Process a JSON file during the main walk.""" - global _sys_event_tables - def is_leaf_dir(path: str) -> bool: for item in os.scandir(path): if item.is_dir(): @@ -445,12 +503,15 @@ def process_one_file(parents: Sequence[str], item: os= .DirEntry) -> None: # model directory, reset topic if item.is_dir() and is_leaf_dir(item.path): print_pending_events() + print_pending_metrics() =20 - tblname =3D file_name_to_table_name(parents, item.name) - if item.name =3D=3D 'sys': - _sys_event_tables.append(tblname) global _pending_events_tblname - _pending_events_tblname =3D tblname + _pending_events_tblname =3D file_name_to_table_name('pmu_events_', par= ents, item.name) + global _pending_metrics_tblname + _pending_metrics_tblname =3D file_name_to_table_name('pmu_metrics_', p= arents, item.name) + + if item.name =3D=3D 'sys': + _sys_event_table_to_metric_table_mapping[_pending_events_tblname] = =3D _pending_metrics_tblname return =20 # base dir or too deep @@ -475,6 +536,12 @@ struct pmu_events_table { size_t length; }; =20 +/* Struct used to make the PMU metric table implementation opaque to calle= rs. */ +struct pmu_metrics_table { + const struct compact_pmu_event *entries; + size_t length; +}; + /* * Map a CPU to its table of PMU events. The CPU is identified by the * cpuid field, which is an arch-specific identifier for the CPU. @@ -486,7 +553,8 @@ struct pmu_events_table { struct pmu_events_map { const char *arch; const char *cpuid; - struct pmu_events_table table; + struct pmu_events_table event_table; + struct pmu_metrics_table metric_table; }; =20 /* @@ -500,9 +568,13 @@ const struct pmu_events_map pmu_events_map[] =3D { _args.output_file.write("""{ \t.arch =3D "testarch", \t.cpuid =3D "testcpu", -\t.table =3D { -\t.entries =3D pme_test_soc_cpu, -\t.length =3D ARRAY_SIZE(pme_test_soc_cpu), +\t.event_table =3D { +\t\t.entries =3D pmu_events__test_soc_cpu, +\t\t.length =3D ARRAY_SIZE(pmu_events__test_soc_cpu), +\t}, +\t.metric_table =3D { +\t\t.entries =3D pmu_metrics__test_soc_cpu, +\t\t.length =3D ARRAY_SIZE(pmu_metrics__test_soc_cpu), \t} }, """) @@ -513,14 +585,29 @@ const struct pmu_events_map pmu_events_map[] =3D { for row in table: # Skip the first row or any row beginning with #. if not first and len(row) > 0 and not row[0].startswith('#'): - tblname =3D file_name_to_table_name([], row[2].replace('/', '_= ')) + event_tblname =3D file_name_to_table_name('pmu_events_', [], r= ow[2].replace('/', '_')) + if event_tblname in _event_tables: + event_size =3D f'ARRAY_SIZE({event_tblname})' + else: + event_tblname =3D 'NULL' + event_size =3D '0' + metric_tblname =3D file_name_to_table_name('pmu_metrics_', [],= row[2].replace('/', '_')) + if metric_tblname in _metric_tables: + metric_size =3D f'ARRAY_SIZE({metric_tblname})' + else: + metric_tblname =3D 'NULL' + metric_size =3D '0' cpuid =3D row[0].replace('\\', '\\\\') _args.output_file.write(f"""{{ \t.arch =3D "{arch}", \t.cpuid =3D "{cpuid}", -\t.table =3D {{ -\t\t.entries =3D {tblname}, -\t\t.length =3D ARRAY_SIZE({tblname}) +\t.event_table =3D {{ +\t\t.entries =3D {event_tblname}, +\t\t.length =3D {event_size} +\t}}, +\t.metric_table =3D {{ +\t\t.entries =3D {metric_tblname}, +\t\t.length =3D {metric_size} \t}} }}, """) @@ -529,7 +616,8 @@ const struct pmu_events_map pmu_events_map[] =3D { _args.output_file.write("""{ \t.arch =3D 0, \t.cpuid =3D 0, -\t.table =3D { 0, 0 }, +\t.event_table =3D { 0, 0 }, +\t.metric_table =3D { 0, 0 }, } }; """) @@ -540,14 +628,36 @@ def print_system_mapping_table() -> None: _args.output_file.write(""" struct pmu_sys_events { \tconst char *name; -\tstruct pmu_events_table table; +\tstruct pmu_events_table event_table; +\tstruct pmu_metrics_table metric_table; }; =20 static const struct pmu_sys_events pmu_sys_event_tables[] =3D { """) + printed_metric_tables =3D [] for tblname in _sys_event_tables: _args.output_file.write(f"""\t{{ -\t\t.table =3D {{ +\t\t.event_table =3D {{ +\t\t\t.entries =3D {tblname}, +\t\t\t.length =3D ARRAY_SIZE({tblname}) +\t\t}},""") + metric_tblname =3D _sys_event_table_to_metric_table_mapping[tblname] + if metric_tblname in _sys_metric_tables: + _args.output_file.write(f""" +\t\t.metric_table =3D {{ +\t\t\t.entries =3D {metric_tblname}, +\t\t\t.length =3D ARRAY_SIZE({metric_tblname}) +\t\t}},""") + printed_metric_tables.append(metric_tblname) + _args.output_file.write(f""" +\t\t.name =3D \"{tblname}\", +\t}}, +""") + for tblname in _sys_metric_tables: + if tblname in printed_metric_tables: + continue + _args.output_file.write(f"""\t{{ +\t\t.metric_table =3D {{ \t\t\t.entries =3D {tblname}, \t\t\t.length =3D ARRAY_SIZE({tblname}) \t\t}}, @@ -555,7 +665,8 @@ static const struct pmu_sys_events pmu_sys_event_tables= [] =3D { \t}}, """) _args.output_file.write("""\t{ -\t\t.table =3D { 0, 0 } +\t\t.event_table =3D { 0, 0 }, +\t\t.metric_table =3D { 0, 0 }, \t}, }; =20 @@ -564,10 +675,7 @@ static void decompress_event(int offset, struct pmu_ev= ent *pe) \tconst char *p =3D &big_c_string[offset]; """) for attr in _json_event_attributes: - if attr in _json_metric_attributes and 'metric_' in attr: - _args.output_file.write(f'\n\t/* Skip {attr} */\n') - else: - _args.output_file.write(f""" + _args.output_file.write(f""" \tpe->{attr} =3D (*p =3D=3D '\\0' ? NULL : p); """) if attr =3D=3D _json_event_attributes[-1]: @@ -579,14 +687,11 @@ static void decompress_metric(int offset, struct pmu_= metric *pm) { \tconst char *p =3D &big_c_string[offset]; """) - for attr in _json_event_attributes: - if attr in _json_metric_attributes: - _args.output_file.write(f""" + for attr in _json_metric_attributes: + _args.output_file.write(f""" \tpm->{attr} =3D (*p =3D=3D '\\0' ? NULL : p); """) - else: - _args.output_file.write(f'\n\t/* Skip {attr} */\n') - if attr =3D=3D _json_event_attributes[-1]: + if attr =3D=3D _json_metric_attributes[-1]: continue _args.output_file.write('\twhile (*p++);') _args.output_file.write("""} @@ -609,19 +714,17 @@ int pmu_events_table_for_each_event(const struct pmu_= events_table *table, return 0; } =20 -int pmu_metrics_table_for_each_metric(const struct pmu_metrics_table *mtab= le, +int pmu_metrics_table_for_each_metric(const struct pmu_metrics_table *tabl= e, pmu_metric_iter_fn fn, void *data) { - struct pmu_events_table *table =3D (struct pmu_events_table *)mtab= le; - for (size_t i =3D 0; i < table->length; i++) { struct pmu_metric pm; int ret; =20 decompress_metric(table->entries[i].offset, &pm); if (pm.metric_name) { - ret =3D fn(&pm, mtable, data); + ret =3D fn(&pm, table, data); if (ret) return ret; } @@ -648,7 +751,7 @@ const struct pmu_events_table *perf_pmu__find_events_ta= ble(struct perf_pmu *pmu) break; =20 if (!strcmp_cpuid_str(map->cpuid, cpuid)) { - table =3D &map->table; + table =3D &map->event_table; break; } } @@ -658,7 +761,29 @@ const struct pmu_events_table *perf_pmu__find_events_t= able(struct perf_pmu *pmu) =20 const struct pmu_metrics_table *perf_pmu__find_metrics_table(struct perf_p= mu *pmu) { - return (struct pmu_metrics_table *)perf_pmu__find_events_table(pmu= ); + const struct pmu_metrics_table *table =3D NULL; + char *cpuid =3D perf_pmu__getcpuid(pmu); + int i; + + /* on some platforms which uses cpus map, cpuid can be NULL for + * PMUs other than CORE PMUs. + */ + if (!cpuid) + return NULL; + + i =3D 0; + for (;;) { + const struct pmu_events_map *map =3D &pmu_events_map[i++]; + if (!map->arch) + break; + + if (!strcmp_cpuid_str(map->cpuid, cpuid)) { + table =3D &map->metric_table; + break; + } + } + free(cpuid); + return table; } =20 const struct pmu_events_table *find_core_events_table(const char *arch, co= nst char *cpuid) @@ -667,14 +792,20 @@ const struct pmu_events_table *find_core_events_table= (const char *arch, const ch tables->arch; tables++) { if (!strcmp(tables->arch, arch) && !strcmp_cpuid_str(table= s->cpuid, cpuid)) - return &tables->table; + return &tables->event_table; } return NULL; } =20 const struct pmu_metrics_table *find_core_metrics_table(const char *arch, = const char *cpuid) { - return (struct pmu_metrics_table *)find_core_events_table(arch, cpu= id); + for (const struct pmu_events_map *tables =3D &pmu_events_map[0]; + tables->arch; + tables++) { + if (!strcmp(tables->arch, arch) && !strcmp_cpuid_str(table= s->cpuid, cpuid)) + return &tables->metric_table; + } + return NULL; } =20 int pmu_for_each_core_event(pmu_event_iter_fn fn, void *data) @@ -682,7 +813,7 @@ int pmu_for_each_core_event(pmu_event_iter_fn fn, void = *data) for (const struct pmu_events_map *tables =3D &pmu_events_map[0]; tables->arch; tables++) { - int ret =3D pmu_events_table_for_each_event(&tables->table= , fn, data); + int ret =3D pmu_events_table_for_each_event(&tables->event= _table, fn, data); =20 if (ret) return ret; @@ -695,8 +826,7 @@ int pmu_for_each_core_metric(pmu_metric_iter_fn fn, voi= d *data) for (const struct pmu_events_map *tables =3D &pmu_events_map[0]; tables->arch; tables++) { - int ret =3D pmu_metrics_table_for_each_metric( - (struct pmu_metrics_table *)&tables->table= , fn, data); + int ret =3D pmu_metrics_table_for_each_metric(&tables->met= ric_table, fn, data); =20 if (ret) return ret; @@ -710,7 +840,7 @@ const struct pmu_events_table *find_sys_events_table(co= nst char *name) tables->name; tables++) { if (!strcmp(tables->name, name)) - return &tables->table; + return &tables->event_table; } return NULL; } @@ -720,7 +850,7 @@ int pmu_for_each_sys_event(pmu_event_iter_fn fn, void *= data) for (const struct pmu_sys_events *tables =3D &pmu_sys_event_tables= [0]; tables->name; tables++) { - int ret =3D pmu_events_table_for_each_event(&tables->table= , fn, data); + int ret =3D pmu_events_table_for_each_event(&tables->event= _table, fn, data); =20 if (ret) return ret; @@ -733,8 +863,7 @@ int pmu_for_each_sys_metric(pmu_metric_iter_fn fn, void= *data) for (const struct pmu_sys_events *tables =3D &pmu_sys_event_tables= [0]; tables->name; tables++) { - int ret =3D pmu_metrics_table_for_each_metric( - (struct pmu_metrics_table *)&tables->table= , fn, data); + int ret =3D pmu_metrics_table_for_each_metric(&tables->met= ric_table, fn, data); =20 if (ret) return ret; @@ -809,6 +938,7 @@ struct compact_pmu_event { arch_path =3D f'{_args.starting_dir}/{arch}' ftw(arch_path, [], process_one_file) print_pending_events() + print_pending_metrics() =20 print_mapping_table(archs) print_system_mapping_table() diff --git a/tools/perf/tests/pmu-events.c b/tools/perf/tests/pmu-events.c index 9f2e385e0991..962c3c0d53ba 100644 --- a/tools/perf/tests/pmu-events.c +++ b/tools/perf/tests/pmu-events.c @@ -469,7 +469,8 @@ static int test__pmu_event_table_sys_callback(const str= uct pmu_event *pe, static int test__pmu_event_table(struct test_suite *test __maybe_unused, int subtest __maybe_unused) { - const struct pmu_events_table *sys_event_table =3D find_sys_events_table(= "pme_test_soc_sys"); + const struct pmu_events_table *sys_event_table =3D + find_sys_events_table("pmu_events__test_soc_sys"); const struct pmu_events_table *table =3D find_core_events_table("testarch= ", "testcpu"); int map_events =3D 0, expected_events, err; =20 --=20 2.39.0.314.g84b9a713c41-goog From nobody Wed Sep 17 06:42:28 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 9B6A5C4332F for ; Wed, 21 Dec 2022 22:36:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235151AbiLUWgu (ORCPT ); Wed, 21 Dec 2022 17:36:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45856 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235031AbiLUWgG (ORCPT ); Wed, 21 Dec 2022 17:36:06 -0500 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CB2D426FA for ; Wed, 21 Dec 2022 14:35:41 -0800 (PST) Received: by mail-yb1-xb4a.google.com with SMTP id 195-20020a2505cc000000b0071163981d18so7377ybf.13 for ; Wed, 21 Dec 2022 14:35:41 -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=p9uUKF5YT7W7omOcdy9d3QDDHSBY8arxpPiHsWUJZko=; b=QWG7vv893Fsft377ZiIohUY3mci0ZHvboSz90Qtk5dlscqS3WtTs9bp3VkqZ8fFUfb uC9G5MVVReAD5r/ifHRJ0SqT/QYETEqHYXJaIxUkVaFwdkc69sayzhiCJraFZPxuFcJY c1w4TdXEu2yhQvUg2SoLqtib0bpQonLrkWT6CAZH27GXwAjADBWQmQxNe7J+JXjSXXFl NHOLtAzOlq+3T3YdK7g0Iwsq4iuy+l6VIsoYY0PfeNbSBAxMYFgNKM7AbiZ/AAZiPTP/ /AdtRUYS1O89JYKyxQ4dIN0DHdnJMVqdne2EqrrR8xlBgs+Fz/a8EqhT2/cTM4ZspvM1 1BOw== 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=p9uUKF5YT7W7omOcdy9d3QDDHSBY8arxpPiHsWUJZko=; b=iBJ8XSILh9QMPmKrRdG5658pbYx5U8f6UkPTtKz94WGRpFOKr7tG9bcNdzJ9xmGtPw Wnu7Yz46zSGCox63XsnhFDbaC8+Muz/HGJgBEAH50viHVCtnJ+P4CV7MkSMPCDWcpIVG s+mffTLYOQcocZxbhxdN9dQ1zZYhxttBI6+nEz6bFm2B/CGjXw/L9Iznco57q+yLhLMn t5Us77X974ZD8ugkJxEj4J+gBsDfTHJD8MwgY88JcIWAUJW5mVvZT3BBd2LxPNjr7JFv 1LjAjVlkuucA5hVNAB7UwJUjJOyjAespCK93C3h68ODoQ9bhpLRjSScsUpuwSC3u34QN CRlQ== X-Gm-Message-State: AFqh2koKIDI7aQfNWmMGVgqAmQuoEgvk8BS54nxH8K2JenuOH3jrEv8B KpPlDs50cXxAGnimsZCJFcgy69ijKYMe X-Google-Smtp-Source: AMrXdXvNtX43k+EPvJLZ0aSkd2dIE7T4zDEJjE4B+TFFw+ofvO7b8R813qBnWYQ66EFhBrUxEvMDZT7JHCtT X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:62bd:f120:1fd8:1d21]) (user=irogers job=sendgmr) by 2002:a25:23d8:0:b0:6fb:67c7:33e1 with SMTP id j207-20020a2523d8000000b006fb67c733e1mr415565ybj.255.1671662140943; Wed, 21 Dec 2022 14:35:40 -0800 (PST) Date: Wed, 21 Dec 2022 14:34:20 -0800 In-Reply-To: <20221221223420.2157113-1-irogers@google.com> Message-Id: <20221221223420.2157113-10-irogers@google.com> Mime-Version: 1.0 References: <20221221223420.2157113-1-irogers@google.com> X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog Subject: [PATCH v2 9/9] perf jevents: Add model list option 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" This allows the set of generated jevents events and metrics be limited to a subset of the model names. Appropriate if trying to minimize the binary size where only a set of models are possible. Signed-off-by: Ian Rogers --- tools/perf/pmu-events/Build | 3 ++- tools/perf/pmu-events/jevents.py | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/perf/pmu-events/Build b/tools/perf/pmu-events/Build index 15b9e8fdbffa..a14de24ecb69 100644 --- a/tools/perf/pmu-events/Build +++ b/tools/perf/pmu-events/Build @@ -10,6 +10,7 @@ JEVENTS_PY =3D pmu-events/jevents.py ifeq ($(JEVENTS_ARCH),) JEVENTS_ARCH=3D$(SRCARCH) endif +JEVENTS_MODEL ?=3D all =20 # # Locate/process JSON files in pmu-events/arch/ @@ -23,5 +24,5 @@ $(OUTPUT)pmu-events/pmu-events.c: pmu-events/empty-pmu-ev= ents.c else $(OUTPUT)pmu-events/pmu-events.c: $(JSON) $(JSON_TEST) $(JEVENTS_PY) pmu-e= vents/metric.py $(call rule_mkdir) - $(Q)$(call echo-cmd,gen)$(PYTHON) $(JEVENTS_PY) $(JEVENTS_ARCH) pmu-event= s/arch $@ + $(Q)$(call echo-cmd,gen)$(PYTHON) $(JEVENTS_PY) $(JEVENTS_ARCH) $(JEVENTS= _MODEL) pmu-events/arch $@ endif diff --git a/tools/perf/pmu-events/jevents.py b/tools/perf/pmu-events/jeven= ts.py index c98443319145..e9eba51e8557 100755 --- a/tools/perf/pmu-events/jevents.py +++ b/tools/perf/pmu-events/jevents.py @@ -886,12 +886,16 @@ def main() -> None: action: Callable[[Sequence[str], os.DirEntry], None]) -> None: """Replicate the directory/file walking behavior of C's file tree walk= .""" for item in os.scandir(path): + if (len(parents) =3D=3D 0 and item.is_dir() and _args.model !=3D 'al= l' and + 'test' not in item.name and item.name not in _args.model.split('= ,')): + continue action(parents, item) if item.is_dir(): ftw(item.path, parents + [item.name], action) =20 ap =3D argparse.ArgumentParser() ap.add_argument('arch', help=3D'Architecture name like x86') + ap.add_argument('model', help=3D'Model such as skylake, normally "all"',= default=3D'all') ap.add_argument( 'starting_dir', type=3Ddir_path, --=20 2.39.0.314.g84b9a713c41-goog