From patchwork Thu Oct 20 13:45:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Clark X-Patchwork-Id: 6209 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4242:0:0:0:0:0 with SMTP id s2csp121941wrr; Thu, 20 Oct 2022 06:52:25 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6+Rh6wdpvf9UvzJ0AOJZ5wZ4afVYdmm0U8kLRNISN6z1psVz+4NDGCKFPyLXNzKCCTE1Ut X-Received: by 2002:a17:907:2721:b0:78d:4e30:df36 with SMTP id d1-20020a170907272100b0078d4e30df36mr11137458ejl.508.1666273945410; Thu, 20 Oct 2022 06:52:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666273945; cv=none; d=google.com; s=arc-20160816; b=GQL10fQOhPZf3EwbM7j4QNpNZhqwMfDrGNkPrCfGNjBNx/nV1bduqm0+HnX2pt2Kl6 DZCw1e55gukT1xAKXwy21Nq+1NC/Rs0Q3lXi1Q3Zspl7DNgYhDZduhqGtZKynj1HTw5P FAViqmqGoZbby93/sfk0+CdSW2czJqJZRO/8e+pL4arqunqxi7k0JvbN8LiXh9YTktZc bMp2T3EG9Q/Ei447FgBfWJ1jLPF2N4uEj8RO0sh0g69OUf0Md+qNxeV/w5tKB984PjKl tUUwVuIeGmd66apSROoFFP8EmFi2ZJDZZ2D9FjS0tFDCzGflKvGAWN+C0SiwIaFhnLof SGKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=/aqEmRlMria7CSgtvbpYDNqLn3Sc2QaX3ibl5X95Rk4=; b=KBL6wuL2P/gtULVe3H1mQKVbKpB+yk3lZztlQBRdnTLoo71zMhImwYmh5IHTHwoId2 lTs/HUcL6s7iISKpy4CzXY4fmc2aF+s3oXk0gr+lULukQCixaJw53li6us5L6AIyadla cqGODwNy+vEY3D9WGCWoXbEAQN4ctXoZ5Nzc658oCeRMRKLsD7VDaBM0P3riBnAguKh0 BdvEVZrBT3UpuCOswWrGYukjmguimWlXq1oK796dNa7kVKGp6Zsv9f9WgbZz/rBiAG/M 7SR1IvqmcZANgBGei0vwyTLJUN0nNge0yNKlXd/nZfebA682rNNCS+IBYkoCD38ECmVV 4aTg== 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=arm.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id mp30-20020a1709071b1e00b0078e27ef9510si15202407ejc.747.2022.10.20.06.51.59; Thu, 20 Oct 2022 06:52:25 -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=arm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230040AbiJTNsA (ORCPT + 99 others); Thu, 20 Oct 2022 09:48:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60822 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230038AbiJTNrz (ORCPT ); Thu, 20 Oct 2022 09:47:55 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 033431A9133; Thu, 20 Oct 2022 06:47:52 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 74163ED1; Thu, 20 Oct 2022 06:47:58 -0700 (PDT) Received: from e121896.arm.com (unknown [10.57.5.110]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 7D5093F67D; Thu, 20 Oct 2022 06:47:49 -0700 (PDT) From: James Clark To: linux-perf-users@vger.kernel.org, john.garry@huawei.com, acme@kernel.org Cc: linux-kernel@vger.kernel.org, nick.forrington@arm.com, al.grant@arm.com, James Clark , Will Deacon , Mike Leach , Leo Yan , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , linux-arm-kernel@lists.infradead.org Subject: [PATCH] perf vendor events: Add Arm Neoverse V2 PMU events Date: Thu, 20 Oct 2022 14:45:11 +0100 Message-Id: <20221020134512.1345013-1-james.clark@arm.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_LOW, SPF_HELO_NONE,SPF_NONE 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747214868314238515?= X-GMAIL-MSGID: =?utf-8?q?1747214868314238515?= Rename the neoverse-n2 folder to make it clear that it includes V2, and add V2 to mapfile.csv. V2 has the same events as N2, visible by running the following command in the ARM-software/data github repo [1]: diff pmu/neoverse-v2.json pmu/neoverse-n2.json | grep code Testing: $ perf test pmu 10: PMU events : 10.1: PMU event table sanity : Ok 10.2: PMU event map aliases : Ok 10.3: Parsing of PMU event table metrics : Ok 10.4: Parsing of PMU event table metrics with fake PMUs : Ok [1]: https://github.com/ARM-software/data Signed-off-by: James Clark Reviewed-by: Nick Forrington --- .../arch/arm64/arm/{neoverse-n2 => neoverse-n2-v2}/branch.json | 0 .../arch/arm64/arm/{neoverse-n2 => neoverse-n2-v2}/bus.json | 0 .../arch/arm64/arm/{neoverse-n2 => neoverse-n2-v2}/cache.json | 0 .../arm64/arm/{neoverse-n2 => neoverse-n2-v2}/exception.json | 0 .../arm64/arm/{neoverse-n2 => neoverse-n2-v2}/instruction.json | 0 .../arch/arm64/arm/{neoverse-n2 => neoverse-n2-v2}/memory.json | 0 .../arm64/arm/{neoverse-n2 => neoverse-n2-v2}/pipeline.json | 0 .../arch/arm64/arm/{neoverse-n2 => neoverse-n2-v2}/spe.json | 0 .../arch/arm64/arm/{neoverse-n2 => neoverse-n2-v2}/trace.json | 0 tools/perf/pmu-events/arch/arm64/mapfile.csv | 3 ++- 10 files changed, 2 insertions(+), 1 deletion(-) rename tools/perf/pmu-events/arch/arm64/arm/{neoverse-n2 => neoverse-n2-v2}/branch.json (100%) rename tools/perf/pmu-events/arch/arm64/arm/{neoverse-n2 => neoverse-n2-v2}/bus.json (100%) rename tools/perf/pmu-events/arch/arm64/arm/{neoverse-n2 => neoverse-n2-v2}/cache.json (100%) rename tools/perf/pmu-events/arch/arm64/arm/{neoverse-n2 => neoverse-n2-v2}/exception.json (100%) rename tools/perf/pmu-events/arch/arm64/arm/{neoverse-n2 => neoverse-n2-v2}/instruction.json (100%) rename tools/perf/pmu-events/arch/arm64/arm/{neoverse-n2 => neoverse-n2-v2}/memory.json (100%) rename tools/perf/pmu-events/arch/arm64/arm/{neoverse-n2 => neoverse-n2-v2}/pipeline.json (100%) rename tools/perf/pmu-events/arch/arm64/arm/{neoverse-n2 => neoverse-n2-v2}/spe.json (100%) rename tools/perf/pmu-events/arch/arm64/arm/{neoverse-n2 => neoverse-n2-v2}/trace.json (100%) diff --git a/tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/branch.json b/tools/perf/pmu-events/arch/arm64/arm/neoverse-n2-v2/branch.json similarity index 100% rename from tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/branch.json rename to tools/perf/pmu-events/arch/arm64/arm/neoverse-n2-v2/branch.json diff --git a/tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/bus.json b/tools/perf/pmu-events/arch/arm64/arm/neoverse-n2-v2/bus.json similarity index 100% rename from tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/bus.json rename to tools/perf/pmu-events/arch/arm64/arm/neoverse-n2-v2/bus.json diff --git a/tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/cache.json b/tools/perf/pmu-events/arch/arm64/arm/neoverse-n2-v2/cache.json similarity index 100% rename from tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/cache.json rename to tools/perf/pmu-events/arch/arm64/arm/neoverse-n2-v2/cache.json diff --git a/tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/exception.json b/tools/perf/pmu-events/arch/arm64/arm/neoverse-n2-v2/exception.json similarity index 100% rename from tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/exception.json rename to tools/perf/pmu-events/arch/arm64/arm/neoverse-n2-v2/exception.json diff --git a/tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/instruction.json b/tools/perf/pmu-events/arch/arm64/arm/neoverse-n2-v2/instruction.json similarity index 100% rename from tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/instruction.json rename to tools/perf/pmu-events/arch/arm64/arm/neoverse-n2-v2/instruction.json diff --git a/tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/memory.json b/tools/perf/pmu-events/arch/arm64/arm/neoverse-n2-v2/memory.json similarity index 100% rename from tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/memory.json rename to tools/perf/pmu-events/arch/arm64/arm/neoverse-n2-v2/memory.json diff --git a/tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/pipeline.json b/tools/perf/pmu-events/arch/arm64/arm/neoverse-n2-v2/pipeline.json similarity index 100% rename from tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/pipeline.json rename to tools/perf/pmu-events/arch/arm64/arm/neoverse-n2-v2/pipeline.json diff --git a/tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/spe.json b/tools/perf/pmu-events/arch/arm64/arm/neoverse-n2-v2/spe.json similarity index 100% rename from tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/spe.json rename to tools/perf/pmu-events/arch/arm64/arm/neoverse-n2-v2/spe.json diff --git a/tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/trace.json b/tools/perf/pmu-events/arch/arm64/arm/neoverse-n2-v2/trace.json similarity index 100% rename from tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/trace.json rename to tools/perf/pmu-events/arch/arm64/arm/neoverse-n2-v2/trace.json diff --git a/tools/perf/pmu-events/arch/arm64/mapfile.csv b/tools/perf/pmu-events/arch/arm64/mapfile.csv index ad502d00f460..f134e833c069 100644 --- a/tools/perf/pmu-events/arch/arm64/mapfile.csv +++ b/tools/perf/pmu-events/arch/arm64/mapfile.csv @@ -34,7 +34,8 @@ 0x00000000410fd460,v1,arm/cortex-a510,core 0x00000000410fd470,v1,arm/cortex-a710,core 0x00000000410fd480,v1,arm/cortex-x2,core -0x00000000410fd490,v1,arm/neoverse-n2,core +0x00000000410fd490,v1,arm/neoverse-n2-v2,core +0x00000000410fd4f0,v1,arm/neoverse-n2-v2,core 0x00000000420f5160,v1,cavium/thunderx2,core 0x00000000430f0af0,v1,cavium/thunderx2,core 0x00000000460f0010,v1,fujitsu/a64fx,core