From patchwork Wed Dec 21 22:34:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 13079203 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 5C421C4332F for ; Wed, 21 Dec 2022 22:36:02 +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=QUCk7kXmjXu6uDxItJJwkQvLvCdU2kBBC6GG8km+REA=; b=IQp RV87e9UJ6bRcVG0jUMir/lIkEgSDKZHLdGJGLlEleoK41JRaw2mUyDQR/4X0ewC5G9trB+lK+r5nD 7Ifq0z9SvpXhxZHzTckGj66FKwYcbwIdZSQftxEZBquIEXk+Yj6Vu1p1gg+xRXMHtU3fUqKFMF2ME e/GwvUA3gFIiiiZWJilwa3rgvYAytVc3kYkceZ+e204RMI1ybZ4u9nnDvjx36+k2bTeb4QuTu30nK SDXu+4ej1+rcKeuBWfAbPIX6MmFDejAOm+n5LgMyc3oQZsUmfX91jj7Uc+Dmhrz6mIRYyEM64q0g5 02cYSS53HOejOYjZPHMrL/nv7QKy4JA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1p87fY-0038yZ-SJ; Wed, 21 Dec 2022 22:34:37 +0000 Received: from mail-yb1-xb49.google.com ([2607:f8b0:4864:20::b49]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1p87fV-0038uw-5c for linux-arm-kernel@lists.infradead.org; Wed, 21 Dec 2022 22:34:34 +0000 Received: by mail-yb1-xb49.google.com with SMTP id a5-20020a25af05000000b006e450a5e507so19307098ybh.22 for ; Wed, 21 Dec 2022 14:34:30 -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=JIowfcxIlSOnpo+34eejAu9BpaMvt8oO2tnwfcBHK9E=; b=LLSlMCImdpJICzXSFwKufVi6MbgWOiagYpMxF5WRXTuuxx0lk/yLS4q8YnUM83y4Aw r5NDXNnYpJ6j74WZp71NW8W3DEp4FV5SmjL7sMiALgBNJ25bacbGZHOsGaPaEMBYfj2m B5XU3CzCzwCBO3I75UME9AfZGC4bIMUOX8pHTScoEZx6gUH5Ha5GpGcIfQLrEfBn+Unb Az1ZpJn1XfV9d/RQa7HHG4SdDe/rvlRENmu7kVCPt3ZqXz08nCk7ITwa9hJ3Unfc7x3G LiCZusvXJE9IpIhAohHFo/UFWiahP8fOhMpCXHwHYLkI4ZPtvbsbSMN+PUdGGYePk0/1 X6Ug== 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=JIowfcxIlSOnpo+34eejAu9BpaMvt8oO2tnwfcBHK9E=; b=5JpjxKDETn1oybOfzUg9fLZpXo71pFb0uMwkt60ZFneYY/evN5BEWXbnjxniBHnY/k 5wSlRqL7sHyoD+rS7Z/WYMiww19i80xElBw/nSs3oxnHA81pRTGLJ3F+MZYqAaApb9TW O3g55zCcyUR2ta0CYgaGg1b8kQUY2C1cHMxztnGnp4lCDHOOCbpaptyDyBfpsIyGbOVa /ZZpxBaqkZv8EqQQgnN3S00+OqyivBhixSLuwSrLz341Qd8oyKedoVyIHUaKM4TEO32o XXNQtCQtiSF/IRYgA5P6MF+ApxC4BLR/C/cadvHmHFUkHTnEsrCvhnMY940XKAIEfMDd 67YA== X-Gm-Message-State: AFqh2kqlBKt9RMFJLAV20+EJsOS0eKLFhhCLV4HY2HO0BOL9aJGB4FHX YYmHH2tluwc5d7xpA0hTsqpxs7Eks3Qk X-Google-Smtp-Source: AMrXdXt/1i6tEE0aK9MxTxBRxe31r3mW9upfGIUXK/yHidpIcZPyWJDOwuzvHtzQrbtXnFSQB6TM/EocWP7x X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:62bd:f120:1fd8:1d21]) (user=irogers job=sendgmr) by 2002:a05:6902:505:b0:70f:8944:6a8b with SMTP id x5-20020a056902050500b0070f89446a8bmr305071ybs.260.1671662070033; Wed, 21 Dec 2022 14:34:30 -0800 (PST) Date: Wed, 21 Dec 2022 14:34:11 -0800 Message-Id: <20221221223420.2157113-1-irogers@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog Subject: [PATCH v2 0/9] 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-20221221_143433_254677_D5F78C1D X-CRM114-Status: GOOD ( 14.64 ) 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. 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 (9): 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: Separate metric out of pmu_event 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 tools/perf/arch/arm64/util/pmu.c | 23 +- 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 | 3 +- tools/perf/pmu-events/empty-pmu-events.c | 111 ++++++- tools/perf/pmu-events/jevents.py | 353 ++++++++++++++++++----- tools/perf/pmu-events/metric.py | 79 ++++- tools/perf/pmu-events/metric_test.py | 10 + 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 | 68 ++--- tools/perf/util/cgroup.c | 1 - tools/perf/util/evsel.c | 2 - tools/perf/util/evsel.h | 2 - tools/perf/util/metricgroup.c | 203 +++++++------ 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 - 26 files changed, 666 insertions(+), 463 deletions(-)