From nobody Sun Sep 14 03:29:42 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 B9B4FC05027 for ; Thu, 26 Jan 2023 23:37:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233358AbjAZXhP (ORCPT ); Thu, 26 Jan 2023 18:37:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46998 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233340AbjAZXhL (ORCPT ); Thu, 26 Jan 2023 18:37:11 -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 7095253B1D for ; Thu, 26 Jan 2023 15:37:06 -0800 (PST) Received: by mail-yb1-xb49.google.com with SMTP id b201-20020a2534d2000000b0080b87d910a2so3602435yba.21 for ; Thu, 26 Jan 2023 15:37:06 -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=ExyRpkcDLmvPbAA8QgL36/HbLE4lSe5Woy02Q1CnQZ0=; b=b7HSkW9BPwilG22qgpz9e/XOczfoW9yCKXfLOvRsQ9wBfqrGhxw2TaKrwXSt1PVsdd M84LPosr6r3kuqQWcN/LiSEFmX+TevYFm1LpD7/Li9Wl50Vsaf3LCddQumROgGmGUQQo epcbUYKS1qYwHxdY3eYWhKb5WXtHQlyT4DGWMlEDAMRxU6fx9f/ndV3g1nvwZ0EbCP4u 7PWHk+CStL2Y52640ZelIpaMIrqnKYJMMCSRgY4Yf4cjgJ/FlSpmQMgJ2ek0reIkgHqU qVc2P92NXw7JlhdQKxeHJhHhZGm/8MMORkIPhEqswrvqLVXc9MnbKxUzglvGNAe127by LbSA== 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=ExyRpkcDLmvPbAA8QgL36/HbLE4lSe5Woy02Q1CnQZ0=; b=doQcFD9mojNjKTen28N97TLD1+ulB1Mgt0zrc8XOWerNck32C/8wpjFvv8j1WVP93f oC6a5m5jEuzkP3Imi9Q//3+Ieslscd9iHeD8RlnrfszHCDaeom+iz9pDXxEIKlU7kizO 4b61lRKjyy23aU1a9PcBlxIMbmU7W18JtJLIMcfClBT997PR0DVH/4mJEwKa2JnTYmum rEaz32I2XdbVdVb4GsD8RQub3MtuZwwWnK5DrcAUKxInI4g966CvY61+gPgyc0S6aGGr NkDI74ydOJErAJU1ut9dS5QyTMtIDv8GrYOLbYVIjNmMuqf3g9Y2Rt5uOJc3DqrV6lRH BN0Q== X-Gm-Message-State: AFqh2krZ7xJFOjJZbTCJGlCKlDAFqsQQ4R+35sEOC2M6XvcaLqwoCPjk KlSNRm5dOf8a21Y1USFFfQrShhkLeR5y X-Google-Smtp-Source: AMrXdXuVZJSXhsLBJF4s+rqkvT9ejKCkIXS7lhPHPbiIAmWd7TUMwVa2Yo0mIGWQgyijPi/6uHMwa59GCZY/ X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:b9b8:6de0:39b3:4cf7]) (user=irogers job=sendgmr) by 2002:a81:ed4:0:b0:4dd:c62f:d65a with SMTP id 203-20020a810ed4000000b004ddc62fd65amr3419482ywo.427.1674776225629; Thu, 26 Jan 2023 15:37:05 -0800 (PST) Date: Thu, 26 Jan 2023 15:36:31 -0800 In-Reply-To: <20230126233645.200509-1-irogers@google.com> Message-Id: <20230126233645.200509-2-irogers@google.com> Mime-Version: 1.0 References: <20230126233645.200509-1-irogers@google.com> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog Subject: [PATCH v5 01/15] 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. Reviewed-by: Kajol Jain Reviewed-By: Kajol Jain --- 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.1.456.gfc5497dd1b-goog From nobody Sun Sep 14 03:29:42 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 0951FC54EAA for ; Thu, 26 Jan 2023 23:37:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233419AbjAZXhS (ORCPT ); Thu, 26 Jan 2023 18:37:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46922 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233367AbjAZXhP (ORCPT ); Thu, 26 Jan 2023 18:37:15 -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 0D5574608A for ; Thu, 26 Jan 2023 15:37:14 -0800 (PST) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-5063c0b909eso37138697b3.7 for ; Thu, 26 Jan 2023 15:37:14 -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=zVzLGDFk0ATwExjUMDftjSNFZ72W3NZoCawlQdDdpKY=; b=g6B2e931x3l/7IDGJTFRhdD+fs2W/iVGC/9/OGD/9xMyNzGYszCJRBhKhZt8qdb0WS Mj4civh5fQtEFSx7ZF/uP0ogEmf9FMzTNTsU8yOqUqcVDSt5VwMNO54ItUxJPiA8uJTg AL1z5/zKgUzr27kAbh21VOmJTCvtddk6RlAZjaVOzky+kZxObvNrMiuJFnCpUkFR4yvq dKqqGywWp2j8skVstAWywqYG+9Pko+yV+k+DLlDTB+OMOjp8bxuAroLXZbINOHKvRfbz dAbYmSe2q28FTiGup4oyTPsrSx8RsMEOI/JK4pIcY9DLJ4ch4Zxbzv+g9fBeBmdT/Yar Kv1g== 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=zVzLGDFk0ATwExjUMDftjSNFZ72W3NZoCawlQdDdpKY=; b=XmUuFgTZ7cIYTuX0fv1Z5CrQ3qev4Ycbu5mpfbW9b81qwcnnY2UvLvTNd7x5bPmKqv 2mTd9ISAua2A+GLp8f3La9ZJqz6KL1hPGC4YjhaDty7HNpKT64M1vKRjcAaAYUTK6Isc QrPIau2MM2joHJiYS6qCM7AEbRZ+/5K+AV7gdxBjGFErIb0EyDcWU4UGKqL0ooXZwRG5 1FdCwMivB1Wa4pVyWyvoxatMwgX25toJi016d4+EDrApOQgwxGiffCuiChvKrjsZtoZW rw3NnyCbrqBOlkmw5PvVmlN+BSciRL4qgwrwK3SRujjmahhqbVG14/3jHagFnGq2IoLi 8qCg== X-Gm-Message-State: AO0yUKWt1rQCxfZhCAp22DvThOMz1S/6SBZhNQFKqPJOxv1Vut/xE9ir GwhETWESMSqo3haxrLig1IfiV3hBn9At X-Google-Smtp-Source: AK7set+Iv2jmW6JOcsgy1uCNPGEoi/rn7S52ZxdpjWt6UB9uRDAOijygh48h7MPGC6ch2gn93vDjHr3/VJ1L X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:b9b8:6de0:39b3:4cf7]) (user=irogers job=sendgmr) by 2002:a25:6e84:0:b0:80b:4da5:cf19 with SMTP id j126-20020a256e84000000b0080b4da5cf19mr1962472ybc.455.1674776233289; Thu, 26 Jan 2023 15:37:13 -0800 (PST) Date: Thu, 26 Jan 2023 15:36:32 -0800 In-Reply-To: <20230126233645.200509-1-irogers@google.com> Message-Id: <20230126233645.200509-3-irogers@google.com> Mime-Version: 1.0 References: <20230126233645.200509-1-irogers@google.com> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog Subject: [PATCH v5 02/15] 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. Reviewed-By: Kajol Jain --- 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..77ea6ff98538 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.1.456.gfc5497dd1b-goog From nobody Sun Sep 14 03:29:42 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 DF1E1C05027 for ; Thu, 26 Jan 2023 23:37:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233427AbjAZXhe (ORCPT ); Thu, 26 Jan 2023 18:37:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47212 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233357AbjAZXha (ORCPT ); Thu, 26 Jan 2023 18:37:30 -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 C728C6B98D for ; Thu, 26 Jan 2023 15:37:21 -0800 (PST) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-5028c723d28so37269327b3.15 for ; Thu, 26 Jan 2023 15:37:21 -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=sZMgv7d+qS2IPgaZDQ3hwKBijNPiryE68frwCkys2NE=; b=p07QyxNyuqbp4f6wdTyQ7nt4VdaMwxGyoUK/0k2+63P0aiCeLgEz6DjMog0g+BetuJ q4pQTACbjzryhviMQ7vTHUrQI24o/45haTUFAOLWErFNTxgCq5X5+HRsBn9eyAWoH4N4 kF3zZU3ZD5vxAiRvXWqhkXutjZAdJZbRD7+JVrpfqF/FValQvpWBkxlakz+yZRJ8lepk SGDXDTqhl0YpGkN+hMyL0Rem7V4cd7OfHr057iRaKSizy6p8XVO9HOOaU4/hv8m32p0Y aeTuUyycKmjfDfm76GbEp6ylGlX0/qmzKS6fY4eGiYHwbWPrrVLMtnbfxgsipHXOy3mk RLeQ== 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=sZMgv7d+qS2IPgaZDQ3hwKBijNPiryE68frwCkys2NE=; b=qyiREh6LzmXzZM0wB1bx7gpCkBY1hV8WQCjSBQRseWRpYoIO9xZREQm1gIjlOIS6Ov gCNgtc0WbR/h2gphOnnTCs9mOLrDSLNSTpgP/rBnp7Mh8PaBPr5W2+w3yFqIgljg8vuy U8KRCRUyKymyg3dn2IN/pz7v+2EbuEfmV2EQVtWqNy+oVPWm9rCuHPaNIWVEPWEalfmV zi0sQlPaWuF5sLHuMbQK6924GBVbr/AIIQMhoyE5bxPPjbPgI9qJ6ciI+YDkahtxKWwc Rn3IAXzAS+2PDD8LZpUqjFYe45m8bow4xbAxXdgQ8a6HUQ+HUyrG0CWxHVWV2F5V2M3P g57g== X-Gm-Message-State: AO0yUKWBLUdhizrJPrkajJXqxl9Myhvk9Xo40/ulHvJE3RXtkdtxZakT 3+rC78oHSwz3hz61CGqN+kQ4w9qYWCxW X-Google-Smtp-Source: AK7set8J8fjITXrFkqjV8qoRxG/OptJXGdliAd6Ni2HXOVXiJKUwFJUhB7iGDfPx931wpEDI7WZbS7czEKbF X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:b9b8:6de0:39b3:4cf7]) (user=irogers job=sendgmr) by 2002:a25:491:0:b0:80b:d57a:612f with SMTP id 139-20020a250491000000b0080bd57a612fmr361423ybe.448.1674776240866; Thu, 26 Jan 2023 15:37:20 -0800 (PST) Date: Thu, 26 Jan 2023 15:36:33 -0800 In-Reply-To: <20230126233645.200509-1-irogers@google.com> Message-Id: <20230126233645.200509-4-irogers@google.com> Mime-Version: 1.0 References: <20230126233645.200509-1-irogers@google.com> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog Subject: [PATCH v5 03/15] 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. Reviewed-By: Kajol Jain --- 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 0416b7442171..15a1671740cc 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.1.456.gfc5497dd1b-goog From nobody Sun Sep 14 03:29:42 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 E8374C54EAA for ; Thu, 26 Jan 2023 23:38:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233431AbjAZXiB (ORCPT ); Thu, 26 Jan 2023 18:38:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48378 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233440AbjAZXh6 (ORCPT ); Thu, 26 Jan 2023 18:37:58 -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 81D2169B07 for ; Thu, 26 Jan 2023 15:37:28 -0800 (PST) Received: by mail-yb1-xb49.google.com with SMTP id a62-20020a25ca41000000b0080b838a5199so3578340ybg.6 for ; Thu, 26 Jan 2023 15:37:28 -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=cR8g2rjfxuT2CGwb5MVZPHAjpY3ojCm5F266K7G8T4Y=; b=VrIiz6M2bS0P821l70QzmKF/K5ssQZQZHDv8WTmHzUc7ldtl54etZm99pItD+lxh82 0+rNw3oTYAUA1bXmrlgPIxSfY1kg/PNvTom0LQDn8yVXVXTz4ZagGS8GLMdpiyBL/jch 04jLWIgWpJ7XDC7KKhmSNK4CGwfVCtIZ4sVEDBEukUgs1c9zeC2q0Qm8GGHAzawo0XPg +7GMh20zwFE7ZO+CnlKrXmFmhb6WgAJOm1GaPeKtu+Ku0K9HVo1npWijAddca0mntn8L lkPnKlKsB+6eHfO3fVUdcCIQIqE/46EtsvPUh4O06W76mvltEFdo03gYtdEKt3vT/3A3 uBCg== 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=cR8g2rjfxuT2CGwb5MVZPHAjpY3ojCm5F266K7G8T4Y=; b=zbNVtYqilRCYOHISs9l7VRra5/rqa1+fkFRZ9RgmqmKFhQJh0UBNNr64XA0hI2Y64e zzbUZzeKIjy1KkXHwB3o9YJIWSOxX6FazAaokN97Nit8m4n8WzmuVdJZItub4X3gu771 I26pEp2zP7mr5DY0Df/hzL8KSdLAqeakRVd3zGrXta3lyuzY1mMcGPl1rfEoV0U7oKGs Rmqad5zJK0LoY+zdU7Rr/hcsNAh0BLKUevszhkZX4XIP/Q17BLxoITv8/c3MfjgmYaXx BmSYAqdADR8yGgQUiaf5a/KceXKZ8O0QiIBQFRqsb0fHlBl0f3g+Yfk0LrMs0WlTD6vA 2nIw== X-Gm-Message-State: AO0yUKVrZdHKi3JzOPIl5rnT2TSde2b5cjvMaDi0tmA2A3vT3JGvo6a6 ifaQ4f7ju8bOaD2+B2TzX/B7AiVf1nNt X-Google-Smtp-Source: AK7set8QVcQNzPHHxLzc3vSenH5aLkYTqp0N0T/0I0cA7DeSjPP/PCAtGdBs+o2XeKEhvbFxG8YNPk9NGnui X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:b9b8:6de0:39b3:4cf7]) (user=irogers job=sendgmr) by 2002:a0d:d4c5:0:b0:506:6859:bc1e with SMTP id w188-20020a0dd4c5000000b005066859bc1emr1132175ywd.183.1674776247451; Thu, 26 Jan 2023 15:37:27 -0800 (PST) Date: Thu, 26 Jan 2023 15:36:34 -0800 In-Reply-To: <20230126233645.200509-1-irogers@google.com> Message-Id: <20230126233645.200509-5-irogers@google.com> Mime-Version: 1.0 References: <20230126233645.200509-1-irogers@google.com> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog Subject: [PATCH v5 04/15] perf pmu-events: Add separate metric from 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" Create a new pmu_metric for the metric related variables from pmu_event but that is initially just a clone of pmu_event. Add iterators for pmu_metric and use in places that metrics are desired rather than events. Make the event iterator skip metric only events, and the metric iterator skip event only events. Reviewed-by: John Garry Reviewed-By: Kajol Jain --- tools/perf/arch/powerpc/util/header.c | 4 +- tools/perf/pmu-events/empty-pmu-events.c | 49 ++++++- tools/perf/pmu-events/jevents.py | 62 ++++++++- tools/perf/pmu-events/pmu-events.h | 26 ++++ tools/perf/tests/pmu-events.c | 35 +++-- tools/perf/util/metricgroup.c | 161 +++++++++++------------ tools/perf/util/metricgroup.h | 2 +- 7 files changed, 228 insertions(+), 111 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/pmu-events/empty-pmu-events.c b/tools/perf/pmu-even= ts/empty-pmu-events.c index 480e8f0d30c8..4e39d1a8d6d6 100644 --- a/tools/perf/pmu-events/empty-pmu-events.c +++ b/tools/perf/pmu-events/empty-pmu-events.c @@ -181,6 +181,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. @@ -254,11 +259,29 @@ static const struct pmu_sys_events pmu_sys_event_tabl= es[] =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++) { - int ret =3D fn(pe, table, data); + for (const struct pmu_event *pe =3D &table->entries[0]; pe->name || pe->m= etric_expr; pe++) { + int ret; =20 + if (!pe->name) + continue; + ret =3D fn(pe, table, data); + if (ret) + return ret; + } + return 0; +} + +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->name || pm->= metric_expr; pm++) { + int ret; + + if (!pm->metric_expr) + continue; + ret =3D fn(pm, etable, data); if (ret) return ret; } @@ -305,11 +328,22 @@ const struct pmu_events_table *find_core_events_table= (const char *arch, const ch } =20 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); + + 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_event(&tables->table, fn, data); + int ret =3D pmu_events_table_for_each_metric(&tables->table, fn, data); =20 if (ret) return ret; @@ -340,3 +374,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 15a1671740cc..858787a12302 100755 --- a/tools/perf/pmu-events/jevents.py +++ b/tools/perf/pmu-events/jevents.py @@ -564,7 +564,19 @@ static const struct pmu_sys_events pmu_sys_event_table= s[] =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""" +\tpe->{attr} =3D (*p =3D=3D '\\0' ? NULL : p); +""") + if attr =3D=3D _json_event_attributes[-1]: + continue + _args.output_file.write('\twhile (*p++);') + _args.output_file.write("""} +static void decompress_metric(int offset, struct pmu_metric *pe) { \tconst char *p =3D &big_c_string[offset]; """) @@ -585,7 +597,9 @@ int pmu_events_table_for_each_event(const struct pmu_ev= ents_table *table, struct pmu_event pe; int ret; =20 - decompress(table->entries[i].offset, &pe); + decompress_event(table->entries[i].offset, &pe); + if (!pe.name) + continue; ret =3D fn(&pe, table, data); if (ret) return ret; @@ -593,6 +607,24 @@ int pmu_events_table_for_each_event(const struct pmu_e= vents_table *table, return 0; } =20 +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_expr) + continue; + ret =3D fn(&pm, table, 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; @@ -644,6 +676,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]; @@ -667,6 +712,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..45c0f508af23 100644 --- a/tools/perf/pmu-events/pmu-events.h +++ b/tools/perf/pmu-events/pmu-events.h @@ -30,20 +30,46 @@ struct pmu_event { const char *metric_constraint; }; =20 +struct pmu_metric { + const char *name; + const char *compat; + const char *event; + const char *desc; + const char *topic; + const char *long_desc; + const char *pmu; + const char *unit; + const char *perpkg; + const char *aggr_mode; + const char *metric_expr; + const char *metric_name; + const char *metric_group; + const char *deprecated; + const char *metric_constraint; +}; + struct pmu_events_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, + 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..e5fb3d5a06c3 100644 --- a/tools/perf/tests/pmu-events.c +++ b/tools/perf/tests/pmu-events.c @@ -840,7 +840,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 +854,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 +877,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 +912,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 +921,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 +941,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 +1021,11 @@ static int metric_parse_fake(const char *metric_nam= e, 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 +1044,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, --=20 2.39.1.456.gfc5497dd1b-goog From nobody Sun Sep 14 03:29:42 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 203A1C05027 for ; Thu, 26 Jan 2023 23:38:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233463AbjAZXiO (ORCPT ); Thu, 26 Jan 2023 18:38:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48520 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233454AbjAZXiE (ORCPT ); Thu, 26 Jan 2023 18:38:04 -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 443E26DFE2 for ; Thu, 26 Jan 2023 15:37:36 -0800 (PST) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-4c8e781bc0aso37719667b3.22 for ; Thu, 26 Jan 2023 15:37:36 -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=VKGQ3UMcGBfYsEagUEP2tt2hFRwSrRyVp71e2QE2hiM=; b=aV7vKVkhORJ2QG8ykWx6y2ItWk9jTsmmbc4n9E21UNeXKoEDgAIOeZzZ/LdZO1RQN3 FrU2ZAREeD3okbeK80SPEWl6FOC0UFYNlgqNBP9OxKiOdY9vHI+0knTbXwfgHVDzB7tC WU/38NdEoKBs6fetvNwIcoIOhBK64V1h5Ge2iTLfLiuE0kXkH3/X4jLoJNYcwrTHM10C x50TP+xn+lh7A/DbX6ln4q/qIbsoTFxrv7TWodicY2vbc+ZYcM+d7okP/m7gCt1G+dlH nQKhYLdlydtCydVyf2r8lHmmaOEWu/nfHje+JHRu3RcAXwI5WF5g9qbO4/FhOEa5UOTa W2rw== 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=VKGQ3UMcGBfYsEagUEP2tt2hFRwSrRyVp71e2QE2hiM=; b=CvJ+34tiEVoUb5kFINQBA0BPsKcBaKd1fmMwxtMniwTgungzVSu8+x77mpIbRo/Fp7 7UkFNRjrE/J7GW7p2zsXkxZTEW+3IWoXDQOG4+79z0uczcGTrwM011KEAkq6S3BPnzXT Lky7pQVq36LGvpp1VG2dlhgs5iofZC2G+iPrTwISsj7tlcQvyvUtqf5JwkFxE4GecsCP GJH7r6IxHMdTu7qpLCLazT4ob8/KioNSsYFArEfICEmnEJeOstBkOaqlh3sSlT6p9JdJ qCozL+iLc4nEVW8TThKKFESO0A8ipkSgbmtzFG5rPwwzIx0LVA7N8EXTb4ZL+irRVH7F VDhg== X-Gm-Message-State: AO0yUKXXa4pbNUKaDimDpmF2bm3by7Za7hvxpxWUfl0cJIhe2Fdy0dpw lh0j7PqJRmFqXuvqaOgtCZwPlZzmplWo X-Google-Smtp-Source: AK7set8gWwYykkaFWU14EGjYcNcEBDVQZrbnovUFySkGKnETHkfL8FsYFRudVpYUi1imLlkceh4e3ToiALuL X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:b9b8:6de0:39b3:4cf7]) (user=irogers job=sendgmr) by 2002:a05:690c:607:b0:506:c9b7:ae6f with SMTP id bq7-20020a05690c060700b00506c9b7ae6fmr928091ywb.310.1674776255242; Thu, 26 Jan 2023 15:37:35 -0800 (PST) Date: Thu, 26 Jan 2023 15:36:35 -0800 In-Reply-To: <20230126233645.200509-1-irogers@google.com> Message-Id: <20230126233645.200509-6-irogers@google.com> Mime-Version: 1.0 References: <20230126233645.200509-1-irogers@google.com> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog Subject: [PATCH v5 05/15] perf pmu-events: Separate the metrics from events for no jevents 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" Separate the event and metric table when building without jevents. Add find_core_metrics_table and perf_pmu__find_metrics_table while renaming existing utilities to be event specific, so that users can find the right table for their need. Reviewed-by: John Garry Reviewed-By: Kajol Jain --- tools/perf/pmu-events/empty-pmu-events.c | 88 ++++++++++++++++++------ tools/perf/pmu-events/jevents.py | 7 +- tools/perf/pmu-events/pmu-events.h | 4 +- tools/perf/tests/expand-cgroup.c | 2 +- tools/perf/tests/parse-metric.c | 2 +- tools/perf/util/pmu.c | 4 +- 6 files changed, 79 insertions(+), 28 deletions(-) diff --git a/tools/perf/pmu-events/empty-pmu-events.c b/tools/perf/pmu-even= ts/empty-pmu-events.c index 4e39d1a8d6d6..10bd4943ebf8 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 @@ -197,7 +204,8 @@ struct pmu_metrics_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 /* @@ -208,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 @@ -259,12 +269,9 @@ static const struct pmu_sys_events pmu_sys_event_table= s[] =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->m= etric_expr; pe++) { - int ret; + for (const struct pmu_event *pe =3D &table->entries[0]; pe->name; pe++) { + int ret =3D fn(pe, table, data); =20 - if (!pe->name) - continue; - ret =3D fn(pe, table, data); if (ret) return ret; } @@ -276,19 +283,44 @@ int pmu_events_table_for_each_metric(const struct pmu= _events_table *etable, pmu_ { struct pmu_metrics_table *table =3D (struct pmu_metrics_table *)etable; =20 - for (const struct pmu_metric *pm =3D &table->entries[0]; pm->name || pm->= metric_expr; pm++) { - int ret; + for (const struct pmu_metric *pm =3D &table->entries[0]; pm->metric_expr;= pm++) { + int ret =3D fn(pm, etable, data); =20 - if (!pm->metric_expr) - continue; - ret =3D fn(pm, etable, data); if (ret) return ret; } 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); + 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->event_table; + break; + } + } + free(cpuid); + return table; +} + +const struct pmu_events_table *perf_pmu__find_metrics_table(struct perf_pm= u *pmu) { const struct pmu_events_table *table =3D NULL; char *cpuid =3D perf_pmu__getcpuid(pmu); @@ -308,7 +340,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 (const struct pmu_events_table *)&map->metric_table; break; } } @@ -322,7 +354,18 @@ 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(tables->cpuid, cpui= d)) - return &tables->table; + return &tables->event_table; + } + return NULL; +} + +const struct pmu_events_table *find_core_metrics_table(const char *arch, c= onst 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 (const struct pmu_events_table *)&tables->metric_table; } return NULL; } @@ -330,7 +373,7 @@ const struct pmu_events_table *find_core_events_table(c= onst char *arch, const ch 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); =20 if (ret) return ret; @@ -343,7 +386,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->table, fn, data); + int ret =3D pmu_events_table_for_each_metric( + (const struct pmu_events_table *)&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 858787a12302..8df14ab14fcf 100755 --- a/tools/perf/pmu-events/jevents.py +++ b/tools/perf/pmu-events/jevents.py @@ -625,7 +625,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); @@ -663,6 +663,11 @@ const struct pmu_events_table *find_core_events_table(= const char *arch, const ch return NULL; } =20 +const struct pmu_events_table *find_core_metrics_table(const char *arch, c= onst char *cpuid) +{ + return (struct pmu_events_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]; diff --git a/tools/perf/pmu-events/pmu-events.h b/tools/perf/pmu-events/pmu= -events.h index 45c0f508af23..e2cd3e61acef 100644 --- a/tools/perf/pmu-events/pmu-events.h +++ b/tools/perf/pmu-events/pmu-events.h @@ -63,8 +63,10 @@ int pmu_events_table_for_each_event(const struct pmu_eve= nts_table *table, pmu_ev 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 *perf_pmu__find_events_table(struct perf_pmu= *pmu); +const struct pmu_events_table *perf_pmu__find_metrics_table(struct perf_pm= u *pmu); const struct pmu_events_table *find_core_events_table(const char *arch, co= nst char *cpuid); +const struct pmu_events_table *find_core_metrics_table(const char *arch, c= onst 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 diff --git a/tools/perf/tests/expand-cgroup.c b/tools/perf/tests/expand-cgr= oup.c index 51fb5f34c1dd..4f3195b84463 100644 --- a/tools/perf/tests/expand-cgroup.c +++ b/tools/perf/tests/expand-cgroup.c @@ -186,7 +186,7 @@ static int expand_metric_events(void) 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..6c527cd805fe 100644 --- a/tools/perf/tests/parse-metric.c +++ b/tools/perf/tests/parse-metric.c @@ -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/util/pmu.c b/tools/perf/util/pmu.c index 8abf5b8439a7..3a67b17b4a16 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -663,7 +663,7 @@ 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); } =20 /* @@ -794,7 +794,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 --=20 2.39.1.456.gfc5497dd1b-goog From nobody Sun Sep 14 03:29:42 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 56E8EC05027 for ; Thu, 26 Jan 2023 23:38:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233468AbjAZXiS (ORCPT ); Thu, 26 Jan 2023 18:38:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48518 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233436AbjAZXiM (ORCPT ); Thu, 26 Jan 2023 18:38:12 -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 AC20549011 for ; Thu, 26 Jan 2023 15:37:44 -0800 (PST) Received: by mail-yb1-xb49.google.com with SMTP id a62-20020a25ca41000000b0080b838a5199so3578918ybg.6 for ; Thu, 26 Jan 2023 15:37:44 -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=SS90grWgohlzb32OUVYWhu+Lm8wOsXwcckr8iyu5ib4=; b=jVn+xYURfrGty296mf/7/X4eT5g/5K0s4Skr+7+jvrbQTXSCvBW6lK7hi4SKw6ZMmO LOMNd56aJjjf4xLmbKgdDMpo9x+4KrKqieelSQDA6gMWzJCeeCFBwGB5X/YMIkRtlo5P 1KlfnvOWBSBdS21QES3AEIFk8csrxL9DbqbVhKdC0za9CHoAk7aCzgIYPS924IrmF789 Bi5ucCS7MTGK4PbHPzbbMx1FLozRpMXkSER7wcL9wpTALRoYzFwqbHrN0Yr6637ONCs8 9zPmCbUne7TGhIi1IwTXTK2jqVO2AcJdhoWq8XG3o66r/EaXinQ5ZQGTcNfGgwaiY4c2 E19Q== 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=SS90grWgohlzb32OUVYWhu+Lm8wOsXwcckr8iyu5ib4=; b=pHtsK+1zHnYzSFvFG0TwKterMYSYCe+J0tG6G93ekpFY11aG5UwvAoyP1fgJLUhrBE 4CZAkA3MbFXsxOByycIJWsqnRsg4D/hgI8lfX1pC/IMoWe5jjcyeBgCPBfPteXHIZT/v 18VOjhQaQo+pLWBUpFPJly4Y9HQbwY+Ge5xaK95XNfc+ToOUvZWZa5ZBgE6WlzgXW4p8 i0QseBknmgmbht+fqm0Vo6uN+pBmYTU8Q2XrkuvWR0R9QmrOP1uNbP1PXQ/k1dP9Xx7X m3nmgJFmgfR7zsjgPVs1UTldjStlmSRUQyb5Xa28um6Ws9GtEtdY0xj83qkDHiLXZenY zOEw== X-Gm-Message-State: AO0yUKWx9+RGWdOtnEq8ywn/N1AJvVI+vNcnKwS6J2tLE5GanpKHBiHu NhISX5FM4Zp6gg3j9z+gUhIzmunJzgBL X-Google-Smtp-Source: AK7set/FzwChscHCORzrVvwZxguBH0dXtRx3KpvVbE2VEccCu699HQGlCl8mK8JRXgOdh8jqKI/pPQ7fASKB X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:b9b8:6de0:39b3:4cf7]) (user=irogers job=sendgmr) by 2002:a25:ce90:0:b0:80b:6168:a831 with SMTP id x138-20020a25ce90000000b0080b6168a831mr1670013ybe.408.1674776263409; Thu, 26 Jan 2023 15:37:43 -0800 (PST) Date: Thu, 26 Jan 2023 15:36:36 -0800 In-Reply-To: <20230126233645.200509-1-irogers@google.com> Message-Id: <20230126233645.200509-7-irogers@google.com> Mime-Version: 1.0 References: <20230126233645.200509-1-irogers@google.com> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog Subject: [PATCH v5 06/15] perf pmu-events: Remove now unused event and metric variables 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" Previous changes separated the uses of pmu_event and pmu_metric, however, both structures contained all the variables of event and metric. This change removes the event variables from metric and the metric variables from event. 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. [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 Reviewed-by: John Garry Reviewed-By: Kajol Jain --- tools/perf/builtin-list.c | 20 ++--------------- tools/perf/pmu-events/jevents.py | 20 +++++++++++++---- tools/perf/pmu-events/pmu-events.h | 22 +++++-------------- tools/perf/tests/pmu-events.c | 27 ----------------------- 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 +-- 9 files changed, 36 insertions(+), 134 deletions(-) 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/jevents.py b/tools/perf/pmu-events/jeven= ts.py index 8df14ab14fcf..4cdbf34b7298 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 @@ -569,21 +574,28 @@ static void decompress_event(int offset, struct pmu_e= vent *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]: continue _args.output_file.write('\twhile (*p++);') _args.output_file.write("""} -static void decompress_metric(int offset, struct pmu_metric *pe) + +static void decompress_metric(int offset, struct pmu_metric *pm) { \tconst char *p =3D &big_c_string[offset]; """) for attr in _json_event_attributes: - _args.output_file.write(f""" -\tpe->{attr} =3D (*p =3D=3D '\\0' ? NULL : p); + 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++);') diff --git a/tools/perf/pmu-events/pmu-events.h b/tools/perf/pmu-events/pmu= -events.h index e2cd3e61acef..dca32979d6a4 100644 --- a/tools/perf/pmu-events/pmu-events.h +++ b/tools/perf/pmu-events/pmu-events.h @@ -23,29 +23,19 @@ struct pmu_event { const char *unit; const char *perpkg; const char *aggr_mode; - const char *metric_expr; - const char *metric_name; - const char *metric_group; const char *deprecated; - const char *metric_constraint; }; =20 struct pmu_metric { - const char *name; - const char *compat; - const char *event; - const char *desc; - const char *topic; - const char *long_desc; - const char *pmu; - const char *unit; - const char *perpkg; - const char *aggr_mode; - const char *metric_expr; 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; diff --git a/tools/perf/tests/pmu-events.c b/tools/perf/tests/pmu-events.c index e5fb3d5a06c3..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 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 3a67b17b4a16..f8c214d8815f 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -280,10 +280,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; @@ -299,8 +295,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); @@ -337,16 +331,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; } @@ -401,8 +392,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; @@ -756,9 +745,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 @@ -813,12 +799,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 @@ -1400,8 +1380,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); @@ -1417,8 +1395,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); @@ -1634,8 +1610,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 @@ -1673,8 +1648,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, @@ -1687,9 +1660,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 2bdc560f19c7..64c596a358cc 100644 --- a/tools/perf/util/pmu.h +++ b/tools/perf/util/pmu.h @@ -132,8 +132,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; @@ -187,13 +185,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.1.456.gfc5497dd1b-goog From nobody Sun Sep 14 03:29:42 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 6FE5AC54EAA for ; Thu, 26 Jan 2023 23:38:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233475AbjAZXib (ORCPT ); Thu, 26 Jan 2023 18:38:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48404 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233479AbjAZXiV (ORCPT ); Thu, 26 Jan 2023 18:38:21 -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 694F42F7B9 for ; Thu, 26 Jan 2023 15:37:52 -0800 (PST) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-507aac99fdfso37401927b3.11 for ; Thu, 26 Jan 2023 15:37:52 -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=uI6fIFedsJpOLIOhQhVhxz0/qvMMlyLGFRBReTiGS9A=; b=neW8DlQWi2lJmMRPeteCYNGulGhd5+sl3R9twMzOL/sQzVTOiXbkNrb7B+Qzf3Vvw2 J5vWZ2r4e8Jxvn5QxrI5vWU+f3/3QgLoM93eTKJD0gAjso0UgHM+b/odVK9IXxVcq8yq SUZhri48HxAwysAtfSopd2wCYGpwKfpnH/eW2AjX4/HMQA4i0vasmZ+fT01RldkHYiJi PbOf+DP1oK/4wlGLfg9bNb4gEpeDNAxH3+myDdxXubSrGvInXMYmajLuAVvaMlLOXEvK MbHyPrke9xDAXJlyvwrFuANXQail/XmFA1BnPOcgxi00XT7AQEvu0BYkucOoBUop0Z/I 5s7g== 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=uI6fIFedsJpOLIOhQhVhxz0/qvMMlyLGFRBReTiGS9A=; b=5TqWgKTjqufjZ4mAVEQ+Atxhw1CWqtQTUrqASoxKdT16glS0RRGh54Kkp0dGU7EWdX B8TPOUsrwz0OTtda16/brbZ9bzL5LrUJzP/MHx7DszVjlEEmF/6hqkQ/2y3XYWDkLKHP wo/EyeeQnKFzqU8BvSzi8WjYd/nwcyWcE8Lzy4p11ZrG2f5HCeoo6OByK70bsvppJN8t JklKucMUROJDtIqp2xDOH5iZhK6vFEQlYZvRUt032eS+ZUR37DlXXVpKozMAf/YmXCtg UoNSCNSdOvg2QPP/YbtNqVFGaTcMdsmeakLfNYIc5zjJdVAwUlojPycPXLk+sYgzq//a sgCQ== X-Gm-Message-State: AFqh2kreaUA8NkBi4WrzThAHeJPUDQP7VaKuOYZze/oNVR5FnFkE3zt0 +GtsALPxWtvW+bnPELovKlT10zLocxzl X-Google-Smtp-Source: AMrXdXt8cJmrdwmhepz48xZc9rh0NdIvBjWhKKsC8kPd5k7GrcZkKEQetjN142/SCNeDupzozABKHTmqtkug X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:b9b8:6de0:39b3:4cf7]) (user=irogers job=sendgmr) by 2002:a25:7e81:0:b0:7e5:ecf1:ebde with SMTP id z123-20020a257e81000000b007e5ecf1ebdemr3102826ybc.375.1674776270909; Thu, 26 Jan 2023 15:37:50 -0800 (PST) Date: Thu, 26 Jan 2023 15:36:37 -0800 In-Reply-To: <20230126233645.200509-1-irogers@google.com> Message-Id: <20230126233645.200509-8-irogers@google.com> Mime-Version: 1.0 References: <20230126233645.200509-1-irogers@google.com> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog Subject: [PATCH v5 07/15] 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. Reviewed-by: John Garry Reviewed-By: Kajol Jain --- 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 cd978c240e0d..bfb13306d82c 100644 --- a/tools/perf/util/cgroup.c +++ b/tools/perf/util/cgroup.c @@ -481,7 +481,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 8550638587e5..a90e998826e0 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 9e5d881b0987..42e8b813d010 100644 --- a/tools/perf/util/python.c +++ b/tools/perf/util/python.c @@ -76,13 +76,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) -{ -} - /* * These ones are 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.1.456.gfc5497dd1b-goog From nobody Sun Sep 14 03:29:42 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 F14F5C61D97 for ; Thu, 26 Jan 2023 23:38:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233083AbjAZXie (ORCPT ); Thu, 26 Jan 2023 18:38:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48772 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232936AbjAZXi1 (ORCPT ); Thu, 26 Jan 2023 18:38:27 -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 6CC3642BDB for ; Thu, 26 Jan 2023 15:38:01 -0800 (PST) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-5062f3a2977so37768267b3.21 for ; Thu, 26 Jan 2023 15:38: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=FoTYT9Og9W7mOnq4wl24j8oeZ9sXDx0pwBnIKjojMSA=; b=ULUppHbH0Lds8PRb4HCInj6sdVtWfg1huViMQi1YE0ul63ee8883+M0MnHN4Us2V7i TmjI70t+lcCBgmZxtoL/jVWPJ6sNnKqitAyb4vnBVnY/dMkVpEDZBvCVPjCW3YmSEr4F AKZBMBxOLYx67TrJvqXkt8MfTBW1ftqkkF1sbbshp97ZvIv+FuvNWM5Pl0BCYc+fMQjF jG3XD5ioKeQ1A5FPzRWN6yoxg3PDQSVRSrZ9uTL5IG0keeoCO+uX8swHm+XxplFeE095 9igTX6u9qNkN705TCI2pwnGERWhDZUmphBbqVscDIST1+JZmSqkpiApPjtWUTiwkTlXA dj3Q== 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=FoTYT9Og9W7mOnq4wl24j8oeZ9sXDx0pwBnIKjojMSA=; b=BMoLbmo/zzqmkmWvfDhLvvmKqhLivpksYhHiPO4UH/VubrDUlq3apK0aBK25fUC808 F9ESaLxaJHH0LoYy4hmANQjqwSvUBHFkXNO2NwnC11YPM41eiQ+NFkEcoNLCCtp5DlZT 64eL792l6UtVyECvVWNcn45wmyAR1BDCJQeuP8EXtbG8Bt1lfPCE3a7vDM0vF53SIU+H AYXHC25mVw8CLI7PF3KOwYuP7SXfHEY0OeFB/3z5jVHEievi46aT9grSXZhBHN6Qpgug J8Q+F99fo3WBADfGSxcVDqGwhfXbQ1jzK1wzXYtV3SLE2CJxN+Bhgu/6fAsBPxebtAyR r6qQ== X-Gm-Message-State: AO0yUKUwfNNj3aObuumBGNq5wWaazq4Gcs7gT5kNrNdWUp5gM6bSGfas qgJUxYkEt6v0f5l1TiGxgLBrV3uicRXB X-Google-Smtp-Source: AK7set83ZU/+aIZhovn+Ujc40CNNaJnunjOMXWOZV5je7wWwRjnplJ+bu5E9859RuJWtZNCyTfNVH7wZOkFk X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:b9b8:6de0:39b3:4cf7]) (user=irogers job=sendgmr) by 2002:a25:2f88:0:b0:80b:c194:655c with SMTP id v130-20020a252f88000000b0080bc194655cmr677594ybv.236.1674776278610; Thu, 26 Jan 2023 15:37:58 -0800 (PST) Date: Thu, 26 Jan 2023 15:36:38 -0800 In-Reply-To: <20230126233645.200509-1-irogers@google.com> Message-Id: <20230126233645.200509-9-irogers@google.com> Mime-Version: 1.0 References: <20230126233645.200509-1-irogers@google.com> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog Subject: [PATCH v5 08/15] 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. Reviewed-By: Kajol Jain --- 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 4cdbf34b7298..5f8d490c7269 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. @@ -378,24 +378,13 @@ def preprocess_arch_std_files(archpath: str) -> None: _arch_std_events[event.metric_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]: @@ -407,17 +396,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'): @@ -455,12 +446,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 @@ -809,7 +801,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.1.456.gfc5497dd1b-goog From nobody Sun Sep 14 03:29:42 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 19FE9C61DA7 for ; Thu, 26 Jan 2023 23:38:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233483AbjAZXis (ORCPT ); Thu, 26 Jan 2023 18:38:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49290 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233470AbjAZXiq (ORCPT ); Thu, 26 Jan 2023 18:38:46 -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 AB1246DFD4 for ; Thu, 26 Jan 2023 15:38:07 -0800 (PST) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-4fee82718afso37390437b3.5 for ; Thu, 26 Jan 2023 15:38:07 -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=EwmlnWAznmIuSklcPXcPcZQenZPbuVtqsMsWpkC7XfE=; b=WsmfLZ16mU7tmkDOEdOasbyJpZYKYWwZvo0hz744whCpnejZ8uY4DvPUVrPACYQ7JK e5klKA70QwUEM8GJpJebkCWo28s/8hc9v3xPcb8yABPtgYUsk8QJ7lxWU1wMoD5HnLhB WUXIWdZIi1DtFHWNAzDTgDDXucixEWFbGUYb5NR7Dxh218qZ+LrYcY16vxQ6DRheqdjG al6MEmN+HdMB0qtzMbN1qInTY5ax4YEN/QNS90h106C2grPPak0ITyBnQxzToyhpapGd HTIf/oXZLmL9LOeJAE2e7GTfkhuQBHCful+NpS7sQ3T31kFFeLFi/c0LFlsv+7eXGpKb PcVQ== 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=EwmlnWAznmIuSklcPXcPcZQenZPbuVtqsMsWpkC7XfE=; b=cw+3mceMjV8BnJn1k+kG1Y69GCc5iGrkOhYbyH7daV99zWumpOFXAjqfYOz7yuUx5P bAJ3UPPXAZRkIADwB07L5LQVjmLEzNLs09pyTvgqE5ThzPGVxtWdFWdD09/0MRxAcgrx Qj8qKqksfes1lr9e02yNzXHadq6XtQS8aoADmoRuwKMO+3PqOCmHERNZhGYQWVzD+kxs 6RCCf7mDnaNxWJFBii1fYmPWymOkiT0ovaZyhj5fzGCmTaQN5Eo78Cd2ACjnzSySYyqa +8+Tb6PLp1sqRIR9Et7m4eAC2ZowxwsDqRmixiNmbVVPdQRAcjCEQQIKv24rXpx5rIRU /L/Q== X-Gm-Message-State: AFqh2kreHsk3nHGS6ICmFkaF2XnAN7rvLtJmXPmn+u3NYAoj/S9YFRzZ R4/nJ4uJ2StzLJYUfEkNmd6b5Op8IE7m X-Google-Smtp-Source: AMrXdXv7tpkLcYzwlE6PaLht9x4pKv6DPLDmn8PpWuAxHjdYOaNA9iEIhy+3OjKUlea7DkReR0vEtWrjCrW0 X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:b9b8:6de0:39b3:4cf7]) (user=irogers job=sendgmr) by 2002:a81:e94c:0:b0:4b1:9930:6c06 with SMTP id e12-20020a81e94c000000b004b199306c06mr4713403ywm.327.1674776286845; Thu, 26 Jan 2023 15:38:06 -0800 (PST) Date: Thu, 26 Jan 2023 15:36:39 -0800 In-Reply-To: <20230126233645.200509-1-irogers@google.com> Message-Id: <20230126233645.200509-10-irogers@google.com> Mime-Version: 1.0 References: <20230126233645.200509-1-irogers@google.com> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog Subject: [PATCH v5 09/15] 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. For the no jevents case the tables are already separate, later changes will separate the tables for the jevents case. Reviewed-By: Kajol Jain --- tools/perf/arch/arm64/util/pmu.c | 11 ++++- tools/perf/pmu-events/empty-pmu-events.c | 21 ++++----- tools/perf/pmu-events/jevents.py | 21 ++++++--- tools/perf/pmu-events/pmu-events.h | 10 +++-- tools/perf/tests/expand-cgroup.c | 2 +- tools/perf/tests/parse-metric.c | 2 +- tools/perf/tests/pmu-events.c | 5 ++- tools/perf/util/metricgroup.c | 54 ++++++++++++------------ tools/perf/util/metricgroup.h | 2 +- tools/perf/util/pmu.c | 5 +++ tools/perf/util/pmu.h | 1 + 11 files changed, 78 insertions(+), 56 deletions(-) diff --git a/tools/perf/arch/arm64/util/pmu.c b/tools/perf/arch/arm64/util/= pmu.c index 801bf52e2ea6..2779840d8896 100644 --- a/tools/perf/arch/arm64/util/pmu.c +++ b/tools/perf/arch/arm64/util/pmu.c @@ -22,7 +22,14 @@ static struct perf_pmu *pmu__find_core_pmu(void) return NULL; =20 return pmu; - } +} + +const struct pmu_metrics_table *pmu_metrics_table__find(void) +{ + struct perf_pmu *pmu =3D pmu__find_core_pmu(); + + if (pmu) + return perf_pmu__find_metrics_table(pmu); =20 return NULL; } @@ -32,7 +39,7 @@ const struct pmu_events_table *pmu_events_table__find(voi= d) struct perf_pmu *pmu =3D pmu__find_core_pmu(); =20 if (pmu) - return perf_pmu__find_table(pmu); + return perf_pmu__find_events_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 10bd4943ebf8..a938b74cf487 100644 --- a/tools/perf/pmu-events/empty-pmu-events.c +++ b/tools/perf/pmu-events/empty-pmu-events.c @@ -278,13 +278,11 @@ 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_expr;= pm++) { - int ret =3D fn(pm, etable, data); + int ret =3D fn(pm, table, data); =20 if (ret) return ret; @@ -320,9 +318,9 @@ const struct pmu_events_table *perf_pmu__find_events_ta= ble(struct perf_pmu *pmu) return table; } =20 -const struct pmu_events_table *perf_pmu__find_metrics_table(struct perf_pm= u *pmu) +const struct pmu_metrics_table *perf_pmu__find_metrics_table(struct perf_p= mu *pmu) { - const struct pmu_events_table *table =3D NULL; + const struct pmu_metrics_table *table =3D NULL; char *cpuid =3D perf_pmu__getcpuid(pmu); int i; =20 @@ -340,7 +338,7 @@ const struct pmu_events_table *perf_pmu__find_metrics_t= able(struct perf_pmu *pmu break; =20 if (!strcmp_cpuid_str(map->cpuid, cpuid)) { - table =3D (const struct pmu_events_table *)&map->metric_table; + table =3D &map->metric_table; break; } } @@ -359,13 +357,13 @@ const struct pmu_events_table *find_core_events_table= (const char *arch, const ch return NULL; } =20 -const struct pmu_events_table *find_core_metrics_table(const char *arch, c= onst char *cpuid) +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 (const struct pmu_events_table *)&tables->metric_table; + return &tables->metric_table; } return NULL; } @@ -386,8 +384,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 5f8d490c7269..d83cc94af51f 100755 --- a/tools/perf/pmu-events/jevents.py +++ b/tools/perf/pmu-events/jevents.py @@ -611,10 +611,12 @@ 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) { + const struct pmu_events_table *table =3D (const struct pmu_events_= table *)mtable; + for (size_t i =3D 0; i < table->length; i++) { struct pmu_metric pm; int ret; @@ -622,7 +624,7 @@ int pmu_events_table_for_each_metric(const struct pmu_e= vents_table *table, decompress_metric(table->entries[i].offset, &pm); if (!pm.metric_expr) continue; - ret =3D fn(&pm, table, data); + ret =3D fn(&pm, mtable, data); if (ret) return ret; } @@ -656,6 +658,11 @@ const struct pmu_events_table *perf_pmu__find_events_t= able(struct 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]; @@ -667,9 +674,9 @@ const struct pmu_events_table *find_core_events_table(c= onst char *arch, const ch return NULL; } =20 -const struct pmu_events_table *find_core_metrics_table(const char *arch, c= onst char *cpuid) +const struct pmu_metrics_table *find_core_metrics_table(const char *arch, = const char *cpuid) { - return (struct pmu_events_table *)find_core_events_table(arch, cpu= id); + return (struct pmu_metrics_table *)find_core_events_table(arch, cpu= id); } =20 int pmu_for_each_core_event(pmu_event_iter_fn fn, void *data) @@ -690,7 +697,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; @@ -727,7 +735,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 dca32979d6a4..b7d4a66b8ad2 100644 --- a/tools/perf/pmu-events/pmu-events.h +++ b/tools/perf/pmu-events/pmu-events.h @@ -39,28 +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_events_table(struct perf_pmu= *pmu); -const struct pmu_events_table *perf_pmu__find_metrics_table(struct perf_pm= u *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_events_table *find_core_metrics_table(const char *arch, c= onst 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 4f3195b84463..672a27f37060 100644 --- a/tools/perf/tests/expand-cgroup.c +++ b/tools/perf/tests/expand-cgroup.c @@ -180,7 +180,7 @@ 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); diff --git a/tools/perf/tests/parse-metric.c b/tools/perf/tests/parse-metri= c.c index 6c527cd805fe..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; 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..f3559be95541 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,8 +477,8 @@ 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, - void *vdata) + const struct pmu_metrics_table *table __maybe_unused, + void *vdata) { struct rblist *groups =3D vdata; =20 @@ -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,8 +1045,8 @@ 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, - void *data) + const struct pmu_metrics_table *table __maybe_unused, + void *data) { struct metricgroup_add_iter_data *d =3D data; int ret; @@ -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 f8c214d8815f..c256b29defad 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -655,6 +655,11 @@ __weak const struct pmu_events_table *pmu_events_table= __find(void) return perf_pmu__find_events_table(NULL); } =20 +__weak const struct pmu_metrics_table *pmu_metrics_table__find(void) +{ + return perf_pmu__find_metrics_table(NULL); +} + /* * Suffix must be in form tok_{digits}, or tok{digits}, or same as pmu_name * to be valid. diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h index 64c596a358cc..6b770f17eb86 100644 --- a/tools/perf/util/pmu.h +++ b/tools/perf/util/pmu.h @@ -231,6 +231,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.1.456.gfc5497dd1b-goog From nobody Sun Sep 14 03:29:42 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 24F26C05027 for ; Thu, 26 Jan 2023 23:38:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233484AbjAZXiy (ORCPT ); Thu, 26 Jan 2023 18:38:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49352 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233478AbjAZXiu (ORCPT ); Thu, 26 Jan 2023 18:38:50 -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 810DF6A738 for ; Thu, 26 Jan 2023 15:38:15 -0800 (PST) Received: by mail-yb1-xb49.google.com with SMTP id x188-20020a2531c5000000b00716de19d76bso3566522ybx.19 for ; Thu, 26 Jan 2023 15:38:15 -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=rgaL7fTLciRMj0236xUDyoUjWYE0YTTX8Uwd7deoYFM=; b=UVxY0+8bHvxk1X6SHpPSWfIvGslOtlfOLKXmOTnkORMBu28G6kEYL9CzDjLGKeCO8f dNcau7D6gNGqlGyLAjIpLVBtouLhyudm4OH3M3FMibjXXWUymr0q22iMQextFSqVUDCC c5sB2R4RyQ2b4y2s2GfdbuRH+j/afqZ0Tz1ag2KaNcmVdfXsDha2Cvd9bM8/TBDU8kWI ur/oOCfA0SB7rDo5mC5I25U1G0StkkKnabrTYpDQU3JERiFaP4WkyI/NGFDC/AiRqTO/ cqIalsR6UGApQyuwvUzLaDKXGXf0WSna6yWOIZEH0gPk6Uw+tpI1SFHZU7XJhR2VNoaw l01g== 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=rgaL7fTLciRMj0236xUDyoUjWYE0YTTX8Uwd7deoYFM=; b=oo0LiLnCO+mtFNUaEFpdybAqPaarKqUVr4vFfb43JrE98ucZidf7SJQ5kAgiDZCuaC wHOw9zYZb0QzNcp2o8j/IhpsPXrRSlf1OigAM4sVnlE9GeGUiT0x+gEvRrmOLSxkZ7FG 3iR0tLk9RrnuK9fY30gNkBriKyEaJdqQm2n8bkazE6q5eBNm33SHAAVvokgq/ppNRjdT JblzpmtjWHxO55Ejf4LfNgnv9/4/mBqaa5zXXwHF0H0L7wEnJjUm+6N0dO6zCtvUy0JA 5jE3rb4gtRdcV8a8dhYxy82oLxKRDm6uODQAd8VR3GwaZu0jrHfkBlqEd4YJFCF2xi+h +JHg== X-Gm-Message-State: AO0yUKXI3DbS8U+ncoNZZPfGpAYUME5LR5tpFpP2NnYWhQLv0f7tDyd4 +/ceEp77tR4Lo/dFjo5GfygcpIRF2qZD X-Google-Smtp-Source: AK7set9WYPebKTDJi3N21r2zohiiq+IqM7CiMzlWGE/ve+FhjdvtcCA8n9sTLwkvl44e8Wokgmv2NvyfdMYs X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:b9b8:6de0:39b3:4cf7]) (user=irogers job=sendgmr) by 2002:a81:5ca:0:b0:506:4e9b:2104 with SMTP id 193-20020a8105ca000000b005064e9b2104mr1535676ywf.492.1674776293282; Thu, 26 Jan 2023 15:38:13 -0800 (PST) Date: Thu, 26 Jan 2023 15:36:40 -0800 In-Reply-To: <20230126233645.200509-1-irogers@google.com> Message-Id: <20230126233645.200509-11-irogers@google.com> Mime-Version: 1.0 References: <20230126233645.200509-1-irogers@google.com> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog Subject: [PATCH v5 10/15] 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. Note, for the test PMU architecture pme_test_soc_cpu is renamed pmu_events__test_soc_cpu for consistency with the event vs metric naming convention. Reviewed-By: Kajol Jain --- 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 d83cc94af51f..627ee817f57f 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.""" @@ -381,7 +396,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: @@ -401,15 +419,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' @@ -432,12 +489,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(): @@ -447,12 +505,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 @@ -477,6 +538,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. @@ -488,7 +555,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 /* @@ -502,9 +570,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} }, """) @@ -515,14 +587,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}} }}, """) @@ -531,7 +618,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 }, } }; """) @@ -542,14 +630,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}}, @@ -557,7 +667,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 @@ -566,10 +677,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]: @@ -581,14 +689,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("""} @@ -611,12 +716,10 @@ 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) { - const struct pmu_events_table *table =3D (const struct pmu_events_= table *)mtable; - for (size_t i =3D 0; i < table->length; i++) { struct pmu_metric pm; int ret; @@ -624,7 +727,7 @@ int pmu_metrics_table_for_each_metric(const struct pmu_= metrics_table *mtable, decompress_metric(table->entries[i].offset, &pm); if (!pm.metric_expr) continue; - ret =3D fn(&pm, mtable, data); + ret =3D fn(&pm, table, data); if (ret) return ret; } @@ -650,7 +753,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; } } @@ -660,7 +763,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) @@ -669,14 +794,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) @@ -684,7 +815,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; @@ -697,8 +828,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; @@ -712,7 +842,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; } @@ -722,7 +852,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; @@ -735,8 +865,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; @@ -811,6 +940,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.1.456.gfc5497dd1b-goog From nobody Sun Sep 14 03:29:42 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 4F6A5C61D97 for ; Thu, 26 Jan 2023 23:39:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233495AbjAZXjD (ORCPT ); Thu, 26 Jan 2023 18:39:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49428 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233489AbjAZXi4 (ORCPT ); Thu, 26 Jan 2023 18:38:56 -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 149C39EDD for ; Thu, 26 Jan 2023 15:38:21 -0800 (PST) Received: by mail-yb1-xb4a.google.com with SMTP id o1-20020a252801000000b0080b8600bdc9so3596071ybo.3 for ; Thu, 26 Jan 2023 15:38:21 -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=IwLDElolHzeZLKuISE9CI+5UsjDPN8soJqHYYoHyVfU=; b=mUVaju3nOKChRdBXbRrG511ZdgeydKkpFLygk8N9IPus6RUGwOirgTw3T6gdfTfzr2 ri2wpt+PrZ42Xn071wp+LQhqH+elR/Nhbz7KYAQnHJlHyNNLoKZpCvvBG10Yl6WQp5aB c0RgZOrBDK8Uw0YakyZNIx9PANqn5sClNxkHQRGcotQ/ARkKa5jR0XxJTlVECLtXQWrB egfCOCLsUNdY589QTAYSBtfFFgAXhNKt8rbTYZVi6OPusPOvrIqGxaiKZ1+wMgAPfyFY 7kjQdlvg8gkyYZkY2CDPI3EukUo8dYC249pP6eTQxENksi+EprnuE1duKfwv/RJUDlwJ NIkg== 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=IwLDElolHzeZLKuISE9CI+5UsjDPN8soJqHYYoHyVfU=; b=yC6TQ+INEneGIqIjVQ8mrjzRnJ/RVDpRxFboy3+2xgLnRaYwZKzAo4T6CeTHIALQzU Q26o9Py4h7Odg/M0EWYwnqUagmYrlm15jYSD+r0RqMkAvLiY/Rvyc/IywXpN9lOMsjpy Lm57uY2oVK3RRjfwkJQnTXxCv/DkF9bODnnQkWImMPH3Mglbb2kpKaUJi8zCiaQDGqyF hkDp4TTGpz9Gz1hn35NCliywWan5FBvqO/x+9ySaR9DLWAMYKqI3wT+p6O/p9tFbxSWW Gdy2c3JplIjih7HWcwGwS9khofYS/wnqenFflRSqvDswgD8Qm+65onlRVdMIUOSlj06r RF4A== X-Gm-Message-State: AFqh2krVKSjCY3OVTLNWUJfBvLq0qVkEdm3HQqPZdzNioZO8fHULPysr 9bVGaO4SEJFd20qVs/BxtGnOjwDJwUAK X-Google-Smtp-Source: AMrXdXurlT/MBprPyUf0wEkWYa4By5hnxMjN10TK8OtYnoQ9X72UaUExeqjlvkTePRgt8wZMr3APhFQ44gi9 X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:b9b8:6de0:39b3:4cf7]) (user=irogers job=sendgmr) by 2002:a0d:f047:0:b0:4e0:c054:9c60 with SMTP id z68-20020a0df047000000b004e0c0549c60mr4471856ywe.490.1674776300084; Thu, 26 Jan 2023 15:38:20 -0800 (PST) Date: Thu, 26 Jan 2023 15:36:41 -0800 In-Reply-To: <20230126233645.200509-1-irogers@google.com> Message-Id: <20230126233645.200509-12-irogers@google.com> Mime-Version: 1.0 References: <20230126233645.200509-1-irogers@google.com> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog Subject: [PATCH v5 11/15] 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. Reviewed-By: Kajol Jain --- tools/perf/pmu-events/Build | 3 ++- tools/perf/pmu-events/jevents.py | 14 ++++++++++++++ 2 files changed, 16 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 627ee817f57f..2bcd07ce609f 100755 --- a/tools/perf/pmu-events/jevents.py +++ b/tools/perf/pmu-events/jevents.py @@ -599,6 +599,8 @@ const struct pmu_events_map pmu_events_map[] =3D { else: metric_tblname =3D 'NULL' metric_size =3D '0' + if event_size =3D=3D '0' and metric_size =3D=3D '0': + continue cpuid =3D row[0].replace('\\', '\\\\') _args.output_file.write(f"""{{ \t.arch =3D "{arch}", @@ -888,12 +890,24 @@ 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 _args.model !=3D 'all' and item.is_dir(): + # Check if the model matches one in _args.model. + if len(parents) =3D=3D _args.model.split(',')[0].count('/'): + # We're testing the correct directory. + item_path =3D '/'.join(parents) + ('/' if len(parents) > 0 else = '') + item.name + if 'test' not in item_path and item_path not in _args.model.spli= t(','): + 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'''Select a model such as skylake to +reduce the code size. Normally set to "all". For architectures like +ARM64 with an implementor/model, the model must include the implementor +such as "arm/cortex-a34".''', + default=3D'all') ap.add_argument( 'starting_dir', type=3Ddir_path, --=20 2.39.1.456.gfc5497dd1b-goog From nobody Sun Sep 14 03:29:42 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 450B3C54EAA for ; Thu, 26 Jan 2023 23:39:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233489AbjAZXjK (ORCPT ); Thu, 26 Jan 2023 18:39:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49672 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229500AbjAZXjF (ORCPT ); Thu, 26 Jan 2023 18:39:05 -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 BC2691ABE7 for ; Thu, 26 Jan 2023 15:38:27 -0800 (PST) Received: by mail-yb1-xb4a.google.com with SMTP id r8-20020a252b08000000b007b989d5e105so3590182ybr.11 for ; Thu, 26 Jan 2023 15:38:27 -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=wSC7IGbFplNjrd7OktgTvuZJ+ddPP0r726YUt977o3g=; b=gZCa5OqiYz7NyA6wxR3fCZCky6kk8dd2ivPt2CaREtn9Z9XF7e58Rav+cA+K9bCEQN 6o/MuJmb4H9idBb7vfMk6bOdgVuHCE0F1qZipjYthhqjcv0pQUDz7YLAwSnEwbtHbdUa Wgxo77095ctlPwQfJX+yHJM0Uan+lqnh/xUw7edMCiC9weIc2kyt+nqBL14pgSN2L2vb SR6CTArsAMMpLftaHCc2QfE0zG4i+0XSSZyQT1M9E5/QyPP+wKGZh3F8G7xJ3tmQPakA Bn6o3nUY8Q2zmRZGMjElSQ0vZRi9PIeDYDzIB/xxyyVnQhkZaUw/lcuFrgqIk2uBkGz2 r/Zw== 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=wSC7IGbFplNjrd7OktgTvuZJ+ddPP0r726YUt977o3g=; b=zYFllw16T+Js0lBKgOegu2ppbxs7gVF2uF1MzUp9/yTi6eXI7lo4UeJEi/FJcmTBC4 JEx+sAqggNA4DQixrqOwUrJuf1eg7HeJ5SHqd2NMr0NHwvfg2Q04sQ25BHj3MKak7XpC PBIHfO0blRu9J1rRkDgp/kNgGIFAkt9Tpk4zTdW4lur7ch3aL9c16nKHXct99NCAQOF5 YS7czf+ndiMgo28Fo7D95/Jrt9LXEfpncynPCDw0YMPU8ueQRU+PnWZhcZUCZj1mq5yk CA738rsL1c/CRUceB2o70GHuiil5+rgWO8QFslzGL+7KtW6SN4rNWra7EjwxuCy62tHW u1TA== X-Gm-Message-State: AO0yUKUNWXDmc3YkfedgHtA0rj2paoCBZKx+wChOFRYBDQ5Kkl3MYmez sKAE9x0KNyXvvZck27/Wukh0MVOclzUB X-Google-Smtp-Source: AK7set+OUpwXf8Bx1zrRtgOMDopCjgg4Qbg1GA9ZQB3lT9ReFsdmmO2a+c65JJvtRAYo78u7CvJ3tHwlJO8s X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:b9b8:6de0:39b3:4cf7]) (user=irogers job=sendgmr) by 2002:a81:b246:0:b0:506:55d9:3a78 with SMTP id q67-20020a81b246000000b0050655d93a78mr1019749ywh.339.1674776306506; Thu, 26 Jan 2023 15:38:26 -0800 (PST) Date: Thu, 26 Jan 2023 15:36:42 -0800 In-Reply-To: <20230126233645.200509-1-irogers@google.com> Message-Id: <20230126233645.200509-13-irogers@google.com> Mime-Version: 1.0 References: <20230126233645.200509-1-irogers@google.com> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog Subject: [PATCH v5 12/15] perf pmu-events: Fix testing with JEVENTS_ARCH=all 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" The #slots literal will return NAN when not on ARM64 which causes a perf test failure when not on an ARM64 for a JEVENTS_ARCH=3Dall build: .. 10.4: Parsing of PMU event table metrics with fake PMUs : FAIL= ED! .. Add an is_test boolean so that the failure can be avoided when running as a test. Fixes: acef233b7ca7 ("perf pmu: Add #slots literal support for arm64") Reviewed-By: Kajol Jain Reviewed-by: John Garry --- tools/perf/tests/pmu-events.c | 1 + tools/perf/util/expr.h | 1 + tools/perf/util/expr.l | 8 +++++--- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/tools/perf/tests/pmu-events.c b/tools/perf/tests/pmu-events.c index 962c3c0d53ba..accf44b3d968 100644 --- a/tools/perf/tests/pmu-events.c +++ b/tools/perf/tests/pmu-events.c @@ -950,6 +950,7 @@ static int metric_parse_fake(const char *metric_name, c= onst char *str) pr_debug("expr__ctx_new failed"); return TEST_FAIL; } + ctx->sctx.is_test =3D true; if (expr__find_ids(str, NULL, ctx) < 0) { pr_err("expr__find_ids failed\n"); return -1; diff --git a/tools/perf/util/expr.h b/tools/perf/util/expr.h index 029271540fb0..eaa44b24c555 100644 --- a/tools/perf/util/expr.h +++ b/tools/perf/util/expr.h @@ -9,6 +9,7 @@ struct expr_scanner_ctx { char *user_requested_cpu_list; int runtime; bool system_wide; + bool is_test; }; =20 struct expr_parse_ctx { diff --git a/tools/perf/util/expr.l b/tools/perf/util/expr.l index 0168a9637330..72ff4f3d6d4b 100644 --- a/tools/perf/util/expr.l +++ b/tools/perf/util/expr.l @@ -84,9 +84,11 @@ static int literal(yyscan_t scanner, const struct expr_s= canner_ctx *sctx) YYSTYPE *yylval =3D expr_get_lval(scanner); =20 yylval->num =3D expr__get_literal(expr_get_text(scanner), sctx); - if (isnan(yylval->num)) - return EXPR_ERROR; - + if (isnan(yylval->num)) { + if (!sctx->is_test) + return EXPR_ERROR; + yylval->num =3D 1; + } return LITERAL; } %} --=20 2.39.1.456.gfc5497dd1b-goog From nobody Sun Sep 14 03:29:42 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 E2FB2C61DA7 for ; Thu, 26 Jan 2023 23:39:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233492AbjAZXjY (ORCPT ); Thu, 26 Jan 2023 18:39:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49940 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233511AbjAZXjV (ORCPT ); Thu, 26 Jan 2023 18:39: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 0B09011661 for ; Thu, 26 Jan 2023 15:38:48 -0800 (PST) Received: by mail-yb1-xb4a.google.com with SMTP id d21-20020a25add5000000b007ff8112e8b8so3610718ybe.17 for ; Thu, 26 Jan 2023 15:38:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=xTYdmI9og0perxBFMnwOyD8JALYBo9fFqhvIGnAB7iw=; b=pN++yaxhHw5hsqtHgPMZeHJr1T+f83UqE4aoFtt5+LAeg4UHQo6kEIwVfN/W5KzpWd NAKHo1zdw7heZJbx1WfqGp1S+SxrOx8iQQEmdAlVDg2VTtwzUZXBX9I4nN6s/ySTc+jr 3ZaRTEU2LdtjdBqC28mfYKA3RWWRWiipp0ubURRbSnB2td+dOXW6A6Z1YmXTTTs7lrMt kSSpO1HdzzSc0Io1imdV8ICez2HaQFT3vzJjPfo5xcK7Rc2m+quLXQ9DiPdQKhFDh9i9 7D6enP4ZWLDUdi03ANNOdVpbRaEKQA7hGat0dQrO/F54JVVNV8CR5DwopbFxCgwL+Ylt 8iEg== 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=xTYdmI9og0perxBFMnwOyD8JALYBo9fFqhvIGnAB7iw=; b=LF9iNDE3uju5cV6L8jhAxrzhU4QnfF6kYHff5HkorPunrOdajjHPHXkxAM3NJggqgP SX8yQFbJErVmVBetdq22OOueO3w3DcZLeyoURX18BmiGa3zfTUw+0XfXKrCMJz7T0bTR S2o8pIetfQpRhHTxI2QbXF2RCE5cVgrZfm31Ywq/l83h3XPFcrHq6pjooqOpSKlsVH2f O3BywE2T3aCcKfUx4i5IVzHcDEAgUB3dSqcmq2cEMNk86KlGHjSiJh1XYvVxyTTY59tW A1YoN9S/GKNZjo0wQkuAOqrMOn3PUMRiEv0xJVK8DTB9YANMXC8ShNbWacKl+UaC8xGA IGGA== X-Gm-Message-State: AO0yUKWE4W0QAfhgWxrKi7OchygGi61YE3/iWK6Dflv8bmSCdlebqx4E l/+j60G81dkawKpUTdzmXh3OYrNRptRd X-Google-Smtp-Source: AK7set8ogChtzu8dxXsUiUpTxkmy4XJKX0fEnPVUFfp8yLVVlaZbFvMbbtXJs9Lil32EN+jbOQsVkSj+abRi X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:b9b8:6de0:39b3:4cf7]) (user=irogers job=sendgmr) by 2002:a25:ce90:0:b0:80b:6168:a831 with SMTP id x138-20020a25ce90000000b0080b6168a831mr1670207ybe.408.1674776313147; Thu, 26 Jan 2023 15:38:33 -0800 (PST) Date: Thu, 26 Jan 2023 15:36:43 -0800 In-Reply-To: <20230126233645.200509-1-irogers@google.com> Message-Id: <20230126233645.200509-14-irogers@google.com> Mime-Version: 1.0 References: <20230126233645.200509-1-irogers@google.com> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog Subject: [PATCH v5 13/15] perf jevents: Correct bad character encoding 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" A character encoding issue added a "3D" character that breaks the metrics test. Fixes: 40769665b63d ("perf jevents: Parse metrics during conversion") Reviewed-By: Kajol Jain --- tools/perf/pmu-events/metric_test.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/perf/pmu-events/metric_test.py b/tools/perf/pmu-events/m= etric_test.py index ced5998bd827..e4c792428277 100644 --- a/tools/perf/pmu-events/metric_test.py +++ b/tools/perf/pmu-events/metric_test.py @@ -89,8 +89,8 @@ class TestMetricExpressions(unittest.TestCase): after =3D r'min((a + b if c > 1 else c + d), e + f)' self.assertEqual(ParsePerfJson(before).ToPerfJson(), after) =20 - before =3D3D r'a if b else c if d else e' - after =3D3D r'(a if b else (c if d else e))' + before =3D r'a if b else c if d else e' + after =3D r'(a if b else (c if d else e))' self.assertEqual(ParsePerfJson(before).ToPerfJson(), after) =20 def test_ToPython(self): --=20 2.39.1.456.gfc5497dd1b-goog From nobody Sun Sep 14 03:29:42 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 7341DC61D97 for ; Thu, 26 Jan 2023 23:39:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233522AbjAZXja (ORCPT ); Thu, 26 Jan 2023 18:39:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50080 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233511AbjAZXj1 (ORCPT ); Thu, 26 Jan 2023 18:39:27 -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 551183A91 for ; Thu, 26 Jan 2023 15:38:56 -0800 (PST) Received: by mail-yb1-xb4a.google.com with SMTP id i17-20020a25bc11000000b007b59a5b74aaso3560726ybh.7 for ; Thu, 26 Jan 2023 15:38:56 -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=snCBxLwh7jm6krd4EQPzPcciOFAFt0fWD1CpQDw1t+8=; b=e6ohvklUxI4ipjwUCogc5GWZzMwgpvonuMqEFAldtcrN5gwr7vxUrcVT0vO30kWL/u UTKdHnDRG6MmsGo21+eZky1ijnGvGJykYoL/kbFW9ydXTr28qfBvoBzw4x0iBjSVI/qy VTCRwVi0mxUxy0SzS4w3U/CgWKzSOIkd80PZW3EXNp2goqcaJGRQYStILOiyjyH57toU Ov2TmXZBqoiT6exgPN6QdRQYDvkEyTP7AI0uIu/zVKmHN2V4qhHd+ihEH4gbDypEXF5s B7IQpf7Q7r5YYT3Gs4h8bzZo9lqB4lzNuM0ur+i/xVRYO3M91t6R/XihIzHynFsRrdw4 oOWw== 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=snCBxLwh7jm6krd4EQPzPcciOFAFt0fWD1CpQDw1t+8=; b=pGeV4Gd6ozE5ai7JR6SRsjhmt5Em7ae1Djtq0HBGi5+u1lKqMrOUtxGJZeA6wlJtWZ k+twcFs6vGOyJOnZyZ7Pm4rrwGGp7QQoARSn4bewKStls1hiSm7CkObEKHwpWTuIUxru HZX+zdYTucmnr/F7O2GWu9X5FYTWjEsgTu5hMy9LSX3uqDcBldjwXml9u/5pD1v/7oTe gzYMRzrgtw7U2qLAhte8VLFVSpUkQeQ+s6yBYSLFImAh1ze6Tc0wU3wrBH3+uMvZ6m+T 3wg1vh3JlO56A6yXf+v0Om3JFrx+Z5uAyIlYoC/uA8YNtEuBMiikLzNMuQ3vW+9nV5oG AYYA== X-Gm-Message-State: AO0yUKUZyUgD9I+7Ib4RRwIqkIdZwasFwtltzh0tKus4zoMx2rYPAYno /vOWegvLJzs9dWbz3fcKOXhg68tzivqN X-Google-Smtp-Source: AK7set/8zwjdXupmXxmE3nxBHcDXM+9r4moQ67xxfCC3ARU9uYuzrlHsQS14Uo2BYtJ6Y5jtB3/pbR3UBgqM X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:b9b8:6de0:39b3:4cf7]) (user=irogers job=sendgmr) by 2002:a0d:fb43:0:b0:506:5a29:80ce with SMTP id l64-20020a0dfb43000000b005065a2980cemr1081160ywf.254.1674776321949; Thu, 26 Jan 2023 15:38:41 -0800 (PST) Date: Thu, 26 Jan 2023 15:36:44 -0800 In-Reply-To: <20230126233645.200509-1-irogers@google.com> Message-Id: <20230126233645.200509-15-irogers@google.com> Mime-Version: 1.0 References: <20230126233645.200509-1-irogers@google.com> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog Subject: [PATCH v5 14/15] tools build: Add test echo-cmd 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 quiet_cmd_test so that: $(Q)$(call echo-cmd,test) will print: TEST This is useful for executing compile-time tests similar to what happens for fortify tests in the kernel's lib directory. Reviewed-By: Kajol Jain --- tools/build/Makefile.build | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/build/Makefile.build b/tools/build/Makefile.build index 715092fc6a23..89430338a3d9 100644 --- a/tools/build/Makefile.build +++ b/tools/build/Makefile.build @@ -53,6 +53,7 @@ build-file :=3D $(dir)/Build =20 quiet_cmd_flex =3D FLEX $@ quiet_cmd_bison =3D BISON $@ +quiet_cmd_test =3D TEST $@ =20 # Create directory unless it exists quiet_cmd_mkdir =3D MKDIR $(dir $@) --=20 2.39.1.456.gfc5497dd1b-goog From nobody Sun Sep 14 03:29:42 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 7E255C05027 for ; Thu, 26 Jan 2023 23:39:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233524AbjAZXjm (ORCPT ); Thu, 26 Jan 2023 18:39:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50404 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233523AbjAZXjk (ORCPT ); Thu, 26 Jan 2023 18:39:40 -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 B39686E434 for ; Thu, 26 Jan 2023 15:39:05 -0800 (PST) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-509ab88f98fso28377377b3.10 for ; Thu, 26 Jan 2023 15:39:05 -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=8yQHRXERZFizphhJ63mW6mIE9BNCBXqYeW1Mn7KMwfU=; b=Y/sQCucBClKQsTlXfwP8ONsiTL9RBPVsVmQF37414RJnG7UMV4/CLL3uZgMmJMXlNI bmcqCC6rD4WN3YgsoeoeLzw8JmATIoAQDNMUufDoROLYDCNnC2CJ6kutrZrVTpofZUPb Rtvndbylyci2/1G8lrvGJRIbW/Oh8eZ3fFBgdOrVGger8kG8DIrc0JHOj9P1vAjFUywa seo641oGr/QFHGj4MNa0LJYVvArR5kd8jFfji8UmGXmYyDiBIXi7XL8HXfoJyISEJOr4 7vkN1CEc6H95EKbtasAdsf/amK+ceYtHrq6/lI0J4iqtFjcBun8/pqQviQk6V/ay37zd YebQ== 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=8yQHRXERZFizphhJ63mW6mIE9BNCBXqYeW1Mn7KMwfU=; b=3Jk8Q2f0NR0GKIxbdJjRG5o+m8MTzzbTtzhIwGT4s4aXPguwCOueLvs1CchEVGrvYQ DJnhxku8pmKeRziWw2p+oHqg0vmYE6sbWrkGKW+ajhuKj/EtsXJdPRru5p71EJhcxiS+ 43868BN3V+fQOoDVr0ThVQbWpnjh+4Nb8pOwfe+I+6vNi9vqiHFme5T2Yy/wMcff8CHJ ziPf8gQQhX8EacV6V8kyu9JqLOoAxwL+2CWHxSpyiUN/0VPPxotY85f/qEe6sb98SssQ NHd+I5wWGovb7FmGapxOmQSjQHmqX4dM+TEE1ImHVDwLsrQCS8kvFJn9HvR/1dPwxcsR ZqYg== X-Gm-Message-State: AFqh2koFug+A85X5+HLk/br8R5zQ3IwWNPj6/ceJn+gW5QDJw2XiJoSt q2ODAd5IMjwU86A4xsERMUsEDYWtmcRO X-Google-Smtp-Source: AMrXdXvjSOd1GSGigNKbLZhLK5pRh1N/XxjXT7JcXzHRlezRc4DR2tD5b4t3IXtvKemh8xSO34tQlBHylaTn X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:b9b8:6de0:39b3:4cf7]) (user=irogers job=sendgmr) by 2002:a25:24c4:0:b0:803:197f:3f41 with SMTP id k187-20020a2524c4000000b00803197f3f41mr2749703ybk.489.1674776330013; Thu, 26 Jan 2023 15:38:50 -0800 (PST) Date: Thu, 26 Jan 2023 15:36:45 -0800 In-Reply-To: <20230126233645.200509-1-irogers@google.com> Message-Id: <20230126233645.200509-16-irogers@google.com> Mime-Version: 1.0 References: <20230126233645.200509-1-irogers@google.com> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog Subject: [PATCH v5 15/15] perf jevents: Run metric_test.py at compile-time 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 target that generates a log file for running metric_test.py and make this a dependency on generating pmu-events.c. The log output is displayed if the test fails like (the test was modified to make it fail): ``` TEST /tmp/perf/pmu-events/metric_test.log F...... =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D FAIL: test_Brackets (__main__.TestMetricExpressions) Reviewed-By: Kajol Jain ---------------------------------------------------------------------- Traceback (most recent call last): File "tools/perf/pmu-events/metric_test.py", line 33, in test_Brackets self.assertEqual((a * b + c).ToPerfJson(), 'a * b + d') AssertionError: 'a * b + c' !=3D 'a * b + d' - a * b + c ? ^ + a * b + d ? ^ ---------------------------------------------------------------------- Ran 7 tests in 0.004s FAILED (failures=3D1) make[3]: *** [pmu-events/Build:32: /tmp/perf/pmu-events/metric_test.log] Er= ror 1 ``` However, normal execution will just show the TEST line. This is roughly modeled on fortify testing in the kernel lib directory. Modify metric_test.py so that it is executable. This is necessary when PYTHON isn't specified in the build, the normal case. Use variables to make the paths to files clearer and more consistent. --- tools/perf/pmu-events/Build | 13 +++++++++++-- tools/perf/pmu-events/metric_test.py | 1 + 2 files changed, 12 insertions(+), 2 deletions(-) mode change 100644 =3D> 100755 tools/perf/pmu-events/metric_test.py diff --git a/tools/perf/pmu-events/Build b/tools/perf/pmu-events/Build index a14de24ecb69..150765f2baee 100644 --- a/tools/perf/pmu-events/Build +++ b/tools/perf/pmu-events/Build @@ -6,6 +6,11 @@ JDIR_TEST =3D pmu-events/arch/test JSON_TEST =3D $(shell [ -d $(JDIR_TEST) ] && \ find $(JDIR_TEST) -name '*.json') JEVENTS_PY =3D pmu-events/jevents.py +METRIC_PY =3D pmu-events/metric.py +METRIC_TEST_PY =3D pmu-events/metric_test.py +EMPTY_PMU_EVENTS_C =3D pmu-events/empty-pmu-events.c +PMU_EVENTS_C =3D $(OUTPUT)pmu-events/pmu-events.c +METRIC_TEST_LOG =3D $(OUTPUT)pmu-events/metric_test.log =20 ifeq ($(JEVENTS_ARCH),) JEVENTS_ARCH=3D$(SRCARCH) @@ -18,11 +23,15 @@ JEVENTS_MODEL ?=3D all # =20 ifeq ($(NO_JEVENTS),1) -$(OUTPUT)pmu-events/pmu-events.c: pmu-events/empty-pmu-events.c +$(PMU_EVENTS_C): $(EMPTY_PMU_EVENTS_C) $(call rule_mkdir) $(Q)$(call echo-cmd,gen)cp $< $@ else -$(OUTPUT)pmu-events/pmu-events.c: $(JSON) $(JSON_TEST) $(JEVENTS_PY) pmu-e= vents/metric.py +$(METRIC_TEST_LOG): $(METRIC_TEST_PY) $(METRIC_PY) + $(call rule_mkdir) + $(Q)$(call echo-cmd,test)$(PYTHON) $< 2> $@ || (cat $@ && false) + +$(PMU_EVENTS_C): $(JSON) $(JSON_TEST) $(JEVENTS_PY) $(METRIC_PY) $(METRIC_= TEST_LOG) $(call rule_mkdir) $(Q)$(call echo-cmd,gen)$(PYTHON) $(JEVENTS_PY) $(JEVENTS_ARCH) $(JEVENTS= _MODEL) pmu-events/arch $@ endif diff --git a/tools/perf/pmu-events/metric_test.py b/tools/perf/pmu-events/m= etric_test.py old mode 100644 new mode 100755 index e4c792428277..40a3c7d8b2bc --- a/tools/perf/pmu-events/metric_test.py +++ b/tools/perf/pmu-events/metric_test.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python3 # SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause) import unittest from metric import Constant --=20 2.39.1.456.gfc5497dd1b-goog