From patchwork Thu Sep 7 11:58:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jing Zhang X-Patchwork-Id: 13376389 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 A0C37EB8FB1 for ; Thu, 7 Sep 2023 11:59:19 +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:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date:Subject:Cc:To :From: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=PD2Zstj7kRqTsk5Zi/65VNYSsphOcK0vqa8CVfbwra0=; b=OWfXBKGRgVK5rV RFXI4OkVhMRB93r2LIEmlsInX9x0pK9wHq+s8JanL9lSTBi1GwAKzZgw5T156+3FL0PS7WeZQCi1w 3SO2bmrXDdZDOyfgf+pMtayMPIMmQ0Vo3ZW5XCQm0nV2EY0HZsRvRtkgO4A2wOOiQbSNfBUOh/G0j ZyJS/xoh9++avF2R3N/YlXHeRXdBWzTB5GJ7Er/j9n6ZsuHDymZrlFAsED9cD9qOQXucgU+oZLVOF R0N2GWshJnmFhYWyJpnm07QBzmA2CLJnayzkVq8zarDQXAGcSJt1ZiJAKt8zOs6g5f9lKd2Zp7hSK kSX63cf/pYRaFZe6s9BQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qeDew-00C384-0I; Thu, 07 Sep 2023 11:58:54 +0000 Received: from out30-132.freemail.mail.aliyun.com ([115.124.30.132]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qeDeq-00C34a-2J for linux-arm-kernel@lists.infradead.org; Thu, 07 Sep 2023 11:58:50 +0000 X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R641e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046056;MF=renyu.zj@linux.alibaba.com;NM=1;PH=DS;RN=21;SR=0;TI=SMTPD_---0VrYpeXv_1694087915; Received: from srmbuffer011165236051.sqa.net(mailfrom:renyu.zj@linux.alibaba.com fp:SMTPD_---0VrYpeXv_1694087915) by smtp.aliyun-inc.com; Thu, 07 Sep 2023 19:58:43 +0800 From: Jing Zhang To: John Garry , Ian Rogers Cc: Will Deacon , James Clark , Arnaldo Carvalho de Melo , Mark Rutland , Mike Leach , Leo Yan , Namhyung Kim , Peter Zijlstra , Ingo Molnar , Alexander Shishkin , Jiri Olsa , Adrian Hunter , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org, linux-doc@vger.kernel.org, Zhuo Song , Jing Zhang , Shuai Xue Subject: [PATCH v8 0/8] Add metrics for Arm CMN Date: Thu, 7 Sep 2023 19:58:25 +0800 Message-Id: <1694087913-46144-1-git-send-email-renyu.zj@linux.alibaba.com> X-Mailer: git-send-email 1.8.3.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230907_045848_916067_1519FCDE X-CRM114-Status: GOOD ( 11.49 ) 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: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Changes since v7: - Optimized pmu_uncore_identifier_match(). - Added all missing "event=0" in JSON file. - Rebase this series onto the latest perf-tools-next. - Link: https://lore.kernel.org/all/1692606977-92009-1-git-send-email-renyu.zj@linux.alibaba.com/ Jing Zhang (8): perf pmu: "Compat" supports matching multiple identifiers perf metric: "Compat" supports matching multiple identifiers perf vendor events: Supplement the omitted EventCode perf jevents: Support more event fields perf test: Make matching_pmu effective perf test: Add pmu-event test for "Compat" and new event_field. perf jevents: Add support for Arm CMN PMU aliasing perf vendor events: Add JSON metrics for Arm CMN .../pmu-events/arch/arm64/arm/cmn/sys/cmn.json | 266 +++++++++++++++++++++ .../pmu-events/arch/arm64/arm/cmn/sys/metric.json | 74 ++++++ .../pmu-events/arch/test/test_soc/sys/uncore.json | 8 + .../pmu-events/arch/x86/alderlake/pipeline.json | 9 + .../pmu-events/arch/x86/alderlaken/pipeline.json | 3 + .../pmu-events/arch/x86/broadwell/pipeline.json | 4 + .../pmu-events/arch/x86/broadwellde/pipeline.json | 4 + .../arch/x86/broadwellde/uncore-cache.json | 2 + .../arch/x86/broadwellde/uncore-interconnect.json | 1 + .../arch/x86/broadwellde/uncore-memory.json | 1 + .../arch/x86/broadwellde/uncore-power.json | 1 + .../pmu-events/arch/x86/broadwellx/pipeline.json | 4 + .../arch/x86/broadwellx/uncore-cache.json | 2 + .../arch/x86/broadwellx/uncore-interconnect.json | 13 + .../arch/x86/broadwellx/uncore-memory.json | 2 + .../arch/x86/broadwellx/uncore-power.json | 1 + .../pmu-events/arch/x86/cascadelakex/pipeline.json | 4 + .../arch/x86/cascadelakex/uncore-cache.json | 2 + .../arch/x86/cascadelakex/uncore-interconnect.json | 1 + .../arch/x86/cascadelakex/uncore-io.json | 1 + .../arch/x86/cascadelakex/uncore-memory.json | 1 + .../arch/x86/cascadelakex/uncore-power.json | 1 + .../pmu-events/arch/x86/elkhartlake/pipeline.json | 2 + .../pmu-events/arch/x86/goldmont/pipeline.json | 3 + .../pmu-events/arch/x86/goldmontplus/pipeline.json | 3 + .../pmu-events/arch/x86/grandridge/pipeline.json | 3 + .../arch/x86/graniterapids/pipeline.json | 4 + .../perf/pmu-events/arch/x86/haswell/pipeline.json | 4 + .../pmu-events/arch/x86/haswellx/pipeline.json | 4 + .../pmu-events/arch/x86/haswellx/uncore-cache.json | 2 + .../arch/x86/haswellx/uncore-interconnect.json | 14 ++ .../arch/x86/haswellx/uncore-memory.json | 2 + .../pmu-events/arch/x86/haswellx/uncore-power.json | 1 + .../perf/pmu-events/arch/x86/icelake/pipeline.json | 5 + .../pmu-events/arch/x86/icelakex/pipeline.json | 5 + .../pmu-events/arch/x86/icelakex/uncore-cache.json | 1 + .../arch/x86/icelakex/uncore-interconnect.json | 1 + .../arch/x86/icelakex/uncore-memory.json | 1 + .../pmu-events/arch/x86/icelakex/uncore-power.json | 1 + .../pmu-events/arch/x86/ivybridge/pipeline.json | 3 + .../perf/pmu-events/arch/x86/ivytown/pipeline.json | 4 + .../pmu-events/arch/x86/ivytown/uncore-cache.json | 2 + .../arch/x86/ivytown/uncore-interconnect.json | 11 + .../pmu-events/arch/x86/ivytown/uncore-memory.json | 1 + .../pmu-events/arch/x86/ivytown/uncore-power.json | 1 + .../pmu-events/arch/x86/jaketown/pipeline.json | 4 + .../pmu-events/arch/x86/jaketown/uncore-cache.json | 2 + .../arch/x86/jaketown/uncore-interconnect.json | 12 + .../arch/x86/jaketown/uncore-memory.json | 1 + .../pmu-events/arch/x86/jaketown/uncore-power.json | 2 + .../arch/x86/knightslanding/pipeline.json | 3 + .../arch/x86/knightslanding/uncore-cache.json | 1 + .../arch/x86/knightslanding/uncore-memory.json | 4 + .../pmu-events/arch/x86/meteorlake/pipeline.json | 9 + .../pmu-events/arch/x86/rocketlake/pipeline.json | 3 + .../pmu-events/arch/x86/sandybridge/pipeline.json | 4 + .../arch/x86/sapphirerapids/pipeline.json | 5 + .../pmu-events/arch/x86/sierraforest/pipeline.json | 4 + .../pmu-events/arch/x86/silvermont/pipeline.json | 3 + .../perf/pmu-events/arch/x86/skylake/pipeline.json | 4 + .../pmu-events/arch/x86/skylakex/pipeline.json | 4 + .../pmu-events/arch/x86/skylakex/uncore-cache.json | 2 + .../arch/x86/skylakex/uncore-interconnect.json | 1 + .../pmu-events/arch/x86/skylakex/uncore-io.json | 1 + .../arch/x86/skylakex/uncore-memory.json | 1 + .../pmu-events/arch/x86/skylakex/uncore-power.json | 1 + .../pmu-events/arch/x86/snowridgex/pipeline.json | 2 + .../arch/x86/snowridgex/uncore-cache.json | 1 + .../arch/x86/snowridgex/uncore-interconnect.json | 1 + .../arch/x86/snowridgex/uncore-memory.json | 1 + .../arch/x86/snowridgex/uncore-power.json | 1 + .../pmu-events/arch/x86/tigerlake/pipeline.json | 5 + tools/perf/pmu-events/empty-pmu-events.c | 8 + tools/perf/pmu-events/jevents.py | 21 +- tools/perf/tests/pmu-events.c | 65 ++++- tools/perf/util/metricgroup.c | 2 +- tools/perf/util/pmu.c | 28 ++- tools/perf/util/pmu.h | 1 + 78 files changed, 681 insertions(+), 9 deletions(-) create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cmn/sys/cmn.json create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cmn/sys/metric.json