From patchwork Tue Dec 13 05:00:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 32629 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp2636857wrr; Mon, 12 Dec 2022 21:05:54 -0800 (PST) X-Google-Smtp-Source: AA0mqf49SCeLdQGZ0wz8NxsNtOMZOI8BLNfCVYICUdNQiabtgzPWMru2XgrEy2CHOBuqhEKqPKRi X-Received: by 2002:a17:906:c52:b0:78d:f457:108f with SMTP id t18-20020a1709060c5200b0078df457108fmr15020932ejf.76.1670907954433; Mon, 12 Dec 2022 21:05:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670907954; cv=none; d=google.com; s=arc-20160816; b=A2ebpr7JY6rh5ce4n8T86toyOTOg2xV2GDRQ5ijNF3U03nDvd2H7MjAxEnh/lVXWeA f9uKBk2Xs2MWJpHTr404ZoOZWHXPDk8j/2mq4xck0CrZfZeNNh2X5ZbyCRdB7cN9vPkW +JKVtR6Hd4qgwdi+JeOJR+NBEhRF+4VYj1xqI7veZTN+0qb9DVDFL/RdN+iWCoEBnqQ6 P5PX6GmycC9cAmMf7xiFZa6vrlKhcjNrpPjNkmvfB5VdcQgspUA70gI+mUDYApTvZLl5 GR24rMoPyDMYVJegjQX3r8pjUWj8wFNhW/PPcVfpxqOyf9LdewtkvRO4BznkBzdTQA7f TBmA== 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=/yu0KB4t7W5Xd9zmAyi2lGA9bjdxvCQ3UbAdr4QNgMY=; b=Q+dZbNBkUXgCUPxf1GnZEZH41qnmsfS96DUJNbHYeEFnSNwfnXHU3Pi1hvatsecTe5 SHtLdGDf21xcSmSstpPSWOVMwCaIqnj++7huIu5k+i7UFadnVVEsfhRwt7+paKFQOw1h 91DUscfkc4XJyIulhEL3S0S5DJ+CHb4Gdc98gYJV1qx1eLUQ/QyeGIn+3mjLCgcaYMjx dwp3SpUdZOf1rdNRdJwbko7yHHijqNly2Oqwvf7FSp5yvayty1M9nWT1YTUUgRn/D3V8 TR80Qp4Rlit8rGmoTiwGzbAIGih799hTtCHlxmk9pQ2FSku9EG+qJDTOPHYtZzVYzvl5 dYQg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b="omQOjH/u"; 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 ho37-20020a1709070ea500b007be4d8bf6d5si8172537ejc.714.2022.12.12.21.05.30; Mon, 12 Dec 2022 21:05:54 -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="omQOjH/u"; 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 S234269AbiLMFEy (ORCPT + 99 others); Tue, 13 Dec 2022 00:04:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45280 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234445AbiLMFEG (ORCPT ); Tue, 13 Dec 2022 00:04:06 -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 7C9482036A for ; Mon, 12 Dec 2022 21:01:47 -0800 (PST) Received: by mail-yb1-xb49.google.com with SMTP id 203-20020a2502d4000000b006f94ab02400so15335000ybc.2 for ; Mon, 12 Dec 2022 21:01:47 -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=/yu0KB4t7W5Xd9zmAyi2lGA9bjdxvCQ3UbAdr4QNgMY=; b=omQOjH/uMzQeAufRIrLE+kRo3ideghY40BKbwOZwFmudyu4uFE7auJtDweQ0mgBWBC Xe/ehOcpjuhrS8AnJNOFTXsn88ZjN2rxZ1t+wf1Sje7s60Z8rKlaPlGa65gqJyKyObec uaXybn0CaXL3zIdsOqEmqzRxfpSoNL4IRVhrkBEje3myCz/7e2IlWdz3F7kxnqg3iX0K a06iF6z0wPrCA15a9+OOX7ZloPFLa4zvD0XIQbLiMoC4dAqlJl5wj3k1NIpmp9X2CPqd BwqYepF5WXs+Q8tjTZWuR3DB4w9r3XPBqibOZPe8Mfj2HRajmijaCcPhBOEmYfP/J8K9 vqhQ== 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=/yu0KB4t7W5Xd9zmAyi2lGA9bjdxvCQ3UbAdr4QNgMY=; b=e507RMKkyNgswN6imu5Q6mWRT+k5xJAuOhZqGiImBCFpXfpcxaDWOSiiZ9y4IPfvm3 A/Mt6aGh3S9ru3xZ1B9kRenhoxUq5AuX5+scFbWn0S8sdhKCt3y4bsJF971tqmVnn0qq 6i6zI4YLMhg8lEJbFGHwuc9mAUMuIh1ch1ty3TL/fOlspEHSba/2D6Ah6rYRP1xWqGuR 9CP5yaT/HEvukkkMcCzpHnCAOG+VdO2h3arWf+nz8mumEDPOlKRCeuFRXRaik46P1CKK JMuDIAhtZWx8rLWscfe70P6raRjWuNN4rmE9GBY8rYxO2r1/xTuDbMrqMFPQk2ud3YJC HvkA== X-Gm-Message-State: ANoB5plfN3GCk89RS4fnHKHO+/PRvCnn1sM78KamBjORuBDq5ihICfYt ohom0FFktWOERpwuWdkfT5Bi8rVEFpT5 X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:6b9f:864c:28da:e99b]) (user=irogers job=sendgmr) by 2002:a81:b807:0:b0:3b3:3f1d:8623 with SMTP id v7-20020a81b807000000b003b33f1d8623mr1908277ywe.96.1670907707153; Mon, 12 Dec 2022 21:01:47 -0800 (PST) Date: Mon, 12 Dec 2022 21:00:37 -0800 In-Reply-To: <20221213050043.1199380-1-irogers@google.com> Message-Id: <20221213050043.1199380-4-irogers@google.com> Mime-Version: 1.0 References: <20221213050043.1199380-1-irogers@google.com> X-Mailer: git-send-email 2.39.0.rc1.256.g54fd8350bd-goog Subject: [PATCH v1 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?1752073979171967197?= X-GMAIL-MSGID: =?utf-8?q?1752073979171967197?= 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."""