From patchwork Thu Jan 26 23:36:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 13117904 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 67409C61DA7 for ; Thu, 26 Jan 2023 23:38:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:Mime-Version: Message-Id:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=Z1dP5RkKTeRKhMco4lPG395V1hazNBWOVquPTnyEQJs=; b=SVu k7lQpNib0o2am8ucpSNcpOVmu21Y4Ry6nxT41Bpkcb/TpxtO6q3VMKuV29ZoMdHJ01LKrpL0w2kbo FDmDtv+kHV/naEzGN0zVcB3kn26mC1VnPBwaV39aI7bGQZIi4VdyRWc8mtxz1YtVc3gVl/DwoK6dS sI1WzvT8TXtdcOCxf0Zwmd3Gtz/fM202sY9tLiM1EpAtd38aWLFPQYBt/l5AnUrh5kZKg47Iwpr6j hRljDUmrUsOpqgjwQJs0NszcmxvdnryqLTtUbfBCeKuyINSzF/24131aX5mmEMhFB4HXL3O6hwPPe joBrjCkiWJbOB6VgsErZKaDm5Gyj9JA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pLBnl-00CksG-Ps; Thu, 26 Jan 2023 23:37:05 +0000 Received: from mail-yw1-x1149.google.com ([2607:f8b0:4864:20::1149]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pLBnj-00CkrP-3i for linux-arm-kernel@lists.infradead.org; Thu, 26 Jan 2023 23:37:04 +0000 Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-4b34cf67fb6so37316647b3.6 for ; Thu, 26 Jan 2023 15:36:58 -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:mime-version :message-id:date:from:to:cc:subject:date:message-id:reply-to; bh=r6injwhONnAcvsjLw2H0Tcbd9Xyh1Q4Op8zz5A06SIQ=; b=f09RSyrVetVchZ4QvPtUU6E08ocu9SFUegDFEAstX9+V1i49NyWNseSfswL06DiqYZ 4z+XHvvdlFgZXKP6diE/RuhG7ju0eHcohPjoxQ7HA3BtMEq02rQ9A8VFVGsccwln9lQ0 XdjRQjWoG2naSS+788wJdCLRQpGjE5TZ7VhOnbuordNc1HYmGhqQEQfzShMVYGIPu3un Yt/oWBoUb9YN4HrxyRTYPzDVrFNM5cmYj7WlmxWadjIXtryWScL5TD04yYSIRnvpay6u tP/PRb5Bbz/ENJmw8FO3fAq8mb6bNZ48DlM23zzJRhDgts5WflJnsoeCYREA7K9ySLdD 3FbQ== 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:mime-version :message-id:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=r6injwhONnAcvsjLw2H0Tcbd9Xyh1Q4Op8zz5A06SIQ=; b=kpR/UwZrZR3jjYu1K3QuYiecUAgWGQcaC7ZJAyWnTuAA0ZF+1Nq6G0cQYrsd4vRD3S IToEyTs6JcMJpMC9Ry5z3OqAkh7lQ/aN9rdpWdp1vdrRSFIHtGinPL68cbubLAr57Y3F jB+Swpt71uX9x/rsjWxXPNVjRFaWPrg9bl+SihR2J0ZqIOTfMHjuXkg+ojNeZAQAUVOS ibEM1M8EblzUZfLABbEmGOCY/vRmPbkSY+7yqUlsXMSelmnCNAaeRFUFSA8E30xr3nFj y6Jo9Xxd4A3iV7QJpRV497WcbcLTSHlfVvXoEs4ZOob5ZBzOQ9KLVki91lXLV2bKXuqL KgVQ== X-Gm-Message-State: AO0yUKVycSDj2pysENfn/X4EB0t5UIJVq/pkdwEE8+P3tzHGbjl4gYGx +RkFyxaqyHnt6U3Ib7AG3rlF88QOAbIR X-Google-Smtp-Source: AK7set/7oU0hODtcLNoxFKHHWkJc1FB7dyIz8Mcqfd+Seeri4BbkpvznWB5X1iDILXh3Df6AIdMiKDR+/V+K X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:b9b8:6de0:39b3:4cf7]) (user=irogers job=sendgmr) by 2002:a81:5204:0:b0:507:86ae:c733 with SMTP id g4-20020a815204000000b0050786aec733mr972921ywb.358.1674776218043; Thu, 26 Jan 2023 15:36:58 -0800 (PST) Date: Thu, 26 Jan 2023 15:36:30 -0800 Message-Id: <20230126233645.200509-1-irogers@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog Subject: [PATCH v5 00/15] jevents/pmu-events improvements 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230126_153703_164765_3DE9D770 X-CRM114-Status: GOOD ( 17.33 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add an optimization to jevents using the metric code, rewrite metrics in terms of each other in order to minimize size and improve readability. 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. A limitation of the substitutions are that they depend on strict equality and the shape of the tree. This means that for "a + b + c" then a substitution of "a + b" will succeed while "b + c" will fail (the LHS for "+ c" is "a + b" not just "b"). Separate out the events and metrics in the pmu-events tables saving 14.8% in the table size while making it that metrics no longer need to iterate over all events and vice versa. These changes remove evsel's direct metric support as the pmu_event no longer has a metric to populate it. This is a minor issue as the code wasn't working properly, metrics for this are rare and can still be properly ran using '-M'. Add an ability to just build certain models into the jevents generated pmu-metrics.c code. This functionality is appropriate for operating systems like ChromeOS, that aim to minimize binary size and know all the target CPU models. v5. s/list/List/ in a type annotation to fix Python 3.6 as reported by John Garry . Fix a bug in metric_test.py where a bad character was imported. To avoid similar regressions, run metric_test.py before generating pmu-events.c. v4. Better support the implementor/model style --model argument for jevents.py. Add #slots test fix. On some patches add reviewed-by John Garry and Kajol Jain. v3. Rebase an incorporate review comments from John Garry , in particular breaking apart patch 4 into 3 patches. The no jevents breakage and then later fix is avoided in this series too. v2. Rebase. Modify the code that skips rewriting a metric with the same name with itself, to make the name check case insensitive. Ian Rogers (15): perf jevents metric: Correct Function equality perf jevents metric: Add ability to rewrite metrics in terms of others perf jevents: Rewrite metrics in the same file with each other perf pmu-events: Add separate metric from pmu_event perf pmu-events: Separate the metrics from events for no jevents perf pmu-events: Remove now unused event and metric variables perf stat: Remove evsel metric_name/expr perf jevents: Combine table prefix and suffix writing perf pmu-events: Introduce pmu_metrics_table perf jevents: Generate metrics and events as separate tables perf jevents: Add model list option perf pmu-events: Fix testing with JEVENTS_ARCH=all perf jevents: Correct bad character encoding tools build: Add test echo-cmd perf jevents: Run metric_test.py at compile-time tools/build/Makefile.build | 1 + tools/perf/arch/arm64/util/pmu.c | 11 +- tools/perf/arch/powerpc/util/header.c | 4 +- tools/perf/builtin-list.c | 20 +- tools/perf/builtin-stat.c | 1 - tools/perf/pmu-events/Build | 16 +- tools/perf/pmu-events/empty-pmu-events.c | 108 ++++++- tools/perf/pmu-events/jevents.py | 357 +++++++++++++++++++---- tools/perf/pmu-events/metric.py | 79 ++++- tools/perf/pmu-events/metric_test.py | 15 +- tools/perf/pmu-events/pmu-events.h | 26 +- tools/perf/tests/expand-cgroup.c | 4 +- tools/perf/tests/parse-metric.c | 4 +- tools/perf/tests/pmu-events.c | 69 ++--- tools/perf/util/cgroup.c | 1 - tools/perf/util/evsel.c | 2 - tools/perf/util/evsel.h | 2 - tools/perf/util/expr.h | 1 + tools/perf/util/expr.l | 8 +- tools/perf/util/metricgroup.c | 207 +++++++------ tools/perf/util/metricgroup.h | 4 +- tools/perf/util/parse-events.c | 2 - tools/perf/util/pmu.c | 44 +-- tools/perf/util/pmu.h | 10 +- tools/perf/util/print-events.c | 32 +- tools/perf/util/print-events.h | 3 +- tools/perf/util/python.c | 7 - tools/perf/util/stat-shadow.c | 112 ------- tools/perf/util/stat.h | 1 - 29 files changed, 681 insertions(+), 470 deletions(-) mode change 100644 => 100755 tools/perf/pmu-events/metric_test.py Reviewed-By: Kajol Jain