From mboxrd@z Thu Jan 1 00:00:00 1970 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9AE9BEE4996 for ; Mon, 21 Aug 2023 08:36:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234024AbjHUIgc (ORCPT ); Mon, 21 Aug 2023 04:36:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41352 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229516AbjHUIgb (ORCPT ); Mon, 21 Aug 2023 04:36:31 -0400 Received: from out30-101.freemail.mail.aliyun.com (out30-101.freemail.mail.aliyun.com [115.124.30.101]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 561C1A6; Mon, 21 Aug 2023 01:36:29 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R781e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046059;MF=renyu.zj@linux.alibaba.com;NM=1;PH=DS;RN=21;SR=0;TI=SMTPD_---0VqEq89R_1692606980; Received: from srmbuffer011165236051.sqa.net(mailfrom:renyu.zj@linux.alibaba.com fp:SMTPD_---0VqEq89R_1692606980) by smtp.aliyun-inc.com; Mon, 21 Aug 2023 16:36:26 +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 v7 0/8] perf vendor events: Add JSON metrics for Arm CMN Date: Mon, 21 Aug 2023 16:36:09 +0800 Message-Id: <1692606977-92009-1-git-send-email-renyu.zj@linux.alibaba.com> X-Mailer: git-send-email 1.8.3.1 Precedence: bulk List-ID: X-Mailing-List: linux-perf-users@vger.kernel.org Changes since v6: - Supplement the omitted EventCode; - Keep the original way of ConfigCode; - Supplement the test in empty-pmu-events.c, so that the pmu event test can succeed when build with NO_JEVENT=1. - Link: https://lore.kernel.org/all/1691394685-61240-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 | 4 + .../pmu-events/arch/x86/icelakex/pipeline.json | 4 + .../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 | 8 + .../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 | 64 ++++- tools/perf/util/metricgroup.c | 2 +- tools/perf/util/pmu.c | 33 ++- tools/perf/util/pmu.h | 1 + 77 files changed, 679 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 -- 1.8.3.1