Received: by 2002:a05:7412:bc1a:b0:d7:7d3a:4fe2 with SMTP id ki26csp1279813rdb; Mon, 21 Aug 2023 03:02:52 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGGjNl7u+63QR6WqEQVA0jdaMOZMwqYz1b2tpyn8TOPBQ4kkRtdS5X6Y9Gu3tYa6VOTQBZi X-Received: by 2002:a17:907:7818:b0:99e:8e:d41a with SMTP id la24-20020a170907781800b0099e008ed41amr4894702ejc.52.1692612172596; Mon, 21 Aug 2023 03:02:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692612172; cv=none; d=google.com; s=arc-20160816; b=mmy+Wura6jB539jTTFCaJDJRkrmGeJFnrh/n0XJaDy9bc8ijkTFI4IQOK3ku+4NV0q SGF4DR0kLzcXt/k6TyhEDVmKSvhRKpz+hRbMM7wU+TgCu9vi+u/Ts8WZkelrUBAGSJ8a jeU3v3jZr/cQv8z+R8+GjQdmworj+OddNRDfZsSeFI/WHh0TBCfdsLTy0KiqkQud4ajj y7TSUT3dt8brYFz1+BeEo2X9+CxhBz+heUZ6KneODs+txNChGFY/c2TftKu/BhPtdanr A+m1RohMAJU7+QYJ6D1abMPl4ReWuKpv48jGU0MidqG7Y5dVJ7WjLrNwGXc/2rPMZNBn 4Sqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:message-id:date:subject:cc:to:from; bh=EOGWiLiKoBgZ7aZ/RKjHhe6iPJEU+QkHz7+f/I9wZL4=; fh=7pF9AUGuuVLtftwWy2EJKaooMcBit4LAHr6bHM40jlQ=; b=On448L5fZClYKC4bROnTQtJ1G0rFyC095K67V66OGFmRCJoX17wxnwjrRe+t9A5NTs c+BLJ1k/WuFzgAzDW0v9xf3BgFDZAC4ggLBqXXDajv/Ez+MIPVd4XSIkALD0GeTwaE0x PSaTL51mF3eDMLbN0ddqpiS8mtB0RePn9Qcu3R6zlDEXvVkZIIzaRC2XgBwsAUyRE69J ppzJSg/5ONYvBwoOFdo2TT/S7Hk8uzl8/Ds1cphfR2YrRAmcacrlLIqRUq2nNdWpHPGr WxBy4sWaX7JXslL6y3GXc88kdQ4eBIBjG9LHIXgS3BLjcILZ9diHkfjSpzeFCVKwvYZo TPXA== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x12-20020a1709065acc00b0099bcb1e4d5dsi5747514ejs.36.2023.08.21.03.02.27; Mon, 21 Aug 2023 03:02:52 -0700 (PDT) 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; 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=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234026AbjHUIgd (ORCPT + 99 others); Mon, 21 Aug 2023 04:36:33 -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 X-Spam-Status: No, score=-9.9 required=5.0 tests=BAYES_00, ENV_AND_HDR_SPF_MATCH,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY,USER_IN_DEF_SPF_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 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