From patchwork Wed Dec 21 22:34:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 35549 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:8188:b0:89:790f:f786 with SMTP id m8csp4950222dye; Wed, 21 Dec 2022 14:36:27 -0800 (PST) X-Google-Smtp-Source: AMrXdXtYZo3LGaR65RmvMVFGGjADJxwXne+jPZFWZzSnaanh8SA+bADKf720rgv1g0nT0LLckGMj X-Received: by 2002:a17:902:9008:b0:189:ed86:178b with SMTP id a8-20020a170902900800b00189ed86178bmr3471268plp.64.1671662187115; Wed, 21 Dec 2022 14:36:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671662187; cv=none; d=google.com; s=arc-20160816; b=JBtK0bm+tEshSKJvPRbjZfivqD4CjAUpxhQf5vMV3nRkB9M8P3E/HYzHkWE2tGZcf3 4ky1dpeEQtGMUZMeDE0y/5P7xtj+zPZbzSyhxTe0VJhuf8WDkIkmftcQYTqk3Wt+Wsrv zGzRA/8kmRxat4aJ4gK8Itv4bZzhBmJ0HbS2bQHusatsElNg9Z6tjhKaBA8SYQeDit4r 1/CF6Qlm+QwQUdIqOjVNiZ8FIxFcMOQjUh3M8zmopaArHpH0qs1N+nulaluNY34hnZO/ SlqdyEZz9a8XYEzVkpbiX6YUXZr4jQYA4aP8foL+yzrX8Wyhb60/tQzncodWK9oVW8d5 yT0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:cc:to:from:subject :references:mime-version:message-id:in-reply-to:date:dkim-signature; bh=p6Ltg4f6uWL2k+LZiF466krcgS3aBizbqVelMESPLmU=; b=ET/YyTWAJov59SJolP08kSY8mPnaLdpIYRmHn7jc7W95w3rYSzcIBBhhRcxw3AhKqZ Z4dJP9704LODjn7vbxhL6VTvIxgkFySZtuoRB66VAv7dJ1DVtHlMTyyRH3dnV0TVZFhp r1qdu4rRPwOk/ErFdAfa0GOrlUDS5pizyvVr0LbDH67PQiwLm6iL0SiI1N7MWOGuTUCd 1DSIr25cRDuGPxZcUXW0OKCIV2afONDLwhBzbXACjgPuvqjAm/0nqet/IEuflBMx6+f7 4UR0BWlkPMMJicOZFK8n/okQ/knK4Vdo5b+wCNgKO9EgVxL0Zb/jJaU0x/WmqDrLnCAj yFWg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=KLo5zAIN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u5-20020a170903124500b00186897fb90dsi19181356plh.233.2022.12.21.14.36.12; Wed, 21 Dec 2022 14:36:27 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=KLo5zAIN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235178AbiLUWfS (ORCPT + 99 others); Wed, 21 Dec 2022 17:35:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45848 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235115AbiLUWfE (ORCPT ); Wed, 21 Dec 2022 17:35:04 -0500 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 95CA4101FA for ; Wed, 21 Dec 2022 14:34:51 -0800 (PST) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-349423f04dbso3634597b3.13 for ; Wed, 21 Dec 2022 14:34:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=content-transfer-encoding:cc:to:from:subject:references :mime-version:message-id:in-reply-to:date:from:to:cc:subject:date :message-id:reply-to; bh=p6Ltg4f6uWL2k+LZiF466krcgS3aBizbqVelMESPLmU=; b=KLo5zAINtEhTy5AFiXvYhnTWFonz2gHXklS2cIgblZMzDqBGkvD/GjAhIbm8nbedAP G43TLqjfZ6HYOq6kQ3M6MlobEyHfYtBTwzBDWRY/dm++ym7mS1yUHPofAqRwrn2R9QTg ZUN2Z4vunBRPE/O73l2AeZy+wuvJR97b1giojICmxup/IQgwWU+JA9ojKBP2fkomqql7 ScZmQ7bSmFvruZvR4ImWtFGVRKLnQvkCks8Yq4MAzbAYZrWkjagLKSOjUwM0JrgKJDd6 x8JqtGCGq7mXrCezWgcnTJlXlDVc4lMkKIq32ZgeQ7x4oKx+RdEHJsX3QoiCzLZLgNCa iyYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:cc:to:from:subject:references :mime-version:message-id:in-reply-to:date:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=p6Ltg4f6uWL2k+LZiF466krcgS3aBizbqVelMESPLmU=; b=f3vUsmLfBjwUx6tODXtxFK8L29+1TFqs77mbDjO+dHwRSPbrchebjrvMOqJsLBKK4t LTZMTGMvgAuD5WqZUhkrmJ3t0jrHWsPdQb/2kgWPsBpZWuc1O6UicQjXaEcVl93GUnos 1MYuY4kEBosY3HJj28ZWpPg/w97hLO64c3GUsfELZ4OcO3H4rFI9565taXB0I8sKuxmV 7oKlZl034T1iJdXlsCGSJNnIgbLNScKzHphyG7GF0Lxu5xvlQt+laQoMu5o3k9nj5tBf HsHqk+MEO+0QUV0G9F81yjMwXY2S8kWp7gIbolttf19pol5IHVq9bUZB4ifqalAgvYb1 ppwQ== X-Gm-Message-State: AFqh2kq+j7fQhPzHHq10Q9ekPF9rkzQUcuIs+eoA3y6VQoyyecIxSrW+ CD+qAKrY3RatcRuLjXooidESnJpvnnI/ X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:62bd:f120:1fd8:1d21]) (user=irogers job=sendgmr) by 2002:a81:b642:0:b0:373:6e8a:e7db with SMTP id h2-20020a81b642000000b003736e8ae7dbmr317784ywk.144.1671662090799; Wed, 21 Dec 2022 14:34:50 -0800 (PST) Date: Wed, 21 Dec 2022 14:34:14 -0800 In-Reply-To: <20221221223420.2157113-1-irogers@google.com> Message-Id: <20221221223420.2157113-4-irogers@google.com> Mime-Version: 1.0 References: <20221221223420.2157113-1-irogers@google.com> X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog Subject: [PATCH v2 3/9] perf jevents: Rewrite metrics in the same file with each other From: Ian Rogers To: John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Adrian Hunter , Kan Liang , Kim Phillips , Florian Fischer , Ravi Bangoria , Xing Zhengjun , Rob Herring , Kang Minchul , linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, Sandipan Das , Jing Zhang , linuxppc-dev@lists.ozlabs.org, Kajol Jain Cc: Stephane Eranian , Perry Taylor , Caleb Biggers , Ian Rogers X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752864849873763971?= X-GMAIL-MSGID: =?utf-8?q?1752864849873763971?= Rewrite metrics within the same file in terms of each other. For example, on Power8 other_stall_cpi is rewritten from: "PM_CMPLU_STALL / PM_RUN_INST_CMPL - PM_CMPLU_STALL_BRU_CRU / PM_RUN_INST_CMPL - PM_CMPLU_STALL_FXU / PM_RUN_INST_CMPL - PM_CMPLU_STALL_VSU / PM_RUN_INST_CMPL - PM_CMPLU_STALL_LSU / PM_RUN_INST_CMPL - PM_CMPLU_STALL_NTCG_FLUSH / PM_RUN_INST_CMPL - PM_CMPLU_STALL_NO_NTF / PM_RUN_INST_CMPL" to: "stall_cpi - bru_cru_stall_cpi - fxu_stall_cpi - vsu_stall_cpi - lsu_stall_cpi - ntcg_flush_cpi - no_ntf_stall_cpi" Which more closely matches the definition on Power9. To avoid recomputation decorate the function with a cache. Signed-off-by: Ian Rogers --- tools/perf/pmu-events/jevents.py | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/tools/perf/pmu-events/jevents.py b/tools/perf/pmu-events/jevents.py index 4c398e0eeb2f..229402565425 100755 --- a/tools/perf/pmu-events/jevents.py +++ b/tools/perf/pmu-events/jevents.py @@ -3,6 +3,7 @@ """Convert directories of JSON events to C code.""" import argparse import csv +from functools import lru_cache import json import metric import os @@ -337,18 +338,28 @@ class JsonEvent: s = self.build_c_string() return f'{{ { _bcs.offsets[s] } }}, /* {s} */\n' - +@lru_cache(maxsize=None) def read_json_events(path: str, topic: str) -> Sequence[JsonEvent]: """Read json events from the specified file.""" - try: - result = json.load(open(path), object_hook=JsonEvent) + events = json.load(open(path), object_hook=JsonEvent) except BaseException as err: print(f"Exception processing {path}") raise - for event in result: + metrics: list[Tuple[str, metric.Expression]] = [] + for event in events: event.topic = topic - return result + if event.metric_name and '-' not in event.metric_name: + metrics.append((event.metric_name, event.metric_expr)) + updates = 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 = updates[event.metric_name] + + return events def preprocess_arch_std_files(archpath: str) -> None: """Read in all architecture standard events."""