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 96D4FC43334 for ; Mon, 25 Jul 2022 22:38:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237364AbiGYWi1 (ORCPT ); Mon, 25 Jul 2022 18:38:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44472 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237324AbiGYWhw (ORCPT ); Mon, 25 Jul 2022 18:37:52 -0400 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C2CDC26122 for ; Mon, 25 Jul 2022 15:37:11 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id b129-20020a25e487000000b0066e1c52ac55so9561706ybh.11 for ; Mon, 25 Jul 2022 15:37:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc:content-transfer-encoding; bh=r6Ju9B8odrMcuPiSneosFxBXicikUveUhhmad/h9PNg=; b=YQTCNXMGT9xBuN+ihcTyFhcws8KAYABXf5m1JxbDUn2hJV8Ibq1GcO5D46lOJe3oY0 yPsKyr9Ja0JOv5LbU3T18Q+OQyuV872OBBOd9X2TbhAwtRNcnYRzWfQvXf8qZMGL5uNz SZXhm9CqsIzvj87tGReE/Vc2t5LUbFejSpVkf74+Focu5UbETSgEvshPZ/aEkHOcJPiv 0CUgTMETUReLFM0nLOrkiNyxsKsdJCYFhOAyKhiFwPLZxZklCV2EQaRw66InXbdbwC12 lwYhWcF0AZjsALSoH8Hy0xl5JGcMmDRl6+yZBONr7hKGyJIwLAfm/FDUu8yYQIZJJHRT gLrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc:content-transfer-encoding; bh=r6Ju9B8odrMcuPiSneosFxBXicikUveUhhmad/h9PNg=; b=FrIRB+zCS4Go5j+tgSDxZSo562A5IIBp3Ei3vESeeCw+GOA7eY5vUOsAqgD7CMxoDx kqSNd42MCpfbLYbrdZs9ppeO0H8Q23nTu2gAie2MRUAdeeSmD+rG4oS0HXT58qsWg0Cm opFYqzM4rygzN7rU287n1oo2xbB/hIwr902vk9ePNS8LMEE+z9xrm0vOcOXERicKPLv7 v8VIuRLNcXZCqB9syuvA4kr0BnSdQpRIOrT8yBpOFCVK8HEP+hx1YZBW1/eJlXK4eqwW mxGQkLpqcfHEUH1DPKdRhdqAUJol662aAvxLHDIvRmo8DVUsbMhsGPSVKfecRep1hYtp d7Mw== X-Gm-Message-State: AJIora8mx6TKFKwr0+N9U4SFCv45uXYiee/pUgM8V/30e577bHlr2RqF rFjEARR0sw9V/qnvA9rHnYTm/cXtzrXG X-Google-Smtp-Source: AGRyM1t+gHwW156S0SQ6c8aBlI55JPxCgxHWrh5fWp66qdn+5YIyhdG1WPkvgXJlNJ0arfPVXFP1OEoo1EPz X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:7fbf:ee64:7f7:3631]) (user=irogers job=sendgmr) by 2002:a25:9d8c:0:b0:670:9325:34e4 with SMTP id v12-20020a259d8c000000b00670932534e4mr10455570ybp.104.1658788631379; Mon, 25 Jul 2022 15:37:11 -0700 (PDT) Date: Mon, 25 Jul 2022 15:36:11 -0700 In-Reply-To: <20220725223633.2301737-1-irogers@google.com> Message-Id: <20220725223633.2301737-11-irogers@google.com> Mime-Version: 1.0 References: <20220725223633.2301737-1-irogers@google.com> X-Mailer: git-send-email 2.37.1.359.gd136c6c3e2-goog Subject: [PATCH v2 10/32] perf vendor events: Update goldmontplus mapfile.csv From: Ian Rogers To: perry.taylor@intel.com, caleb.biggers@intel.com, kshipra.bopardikar@intel.com, Kan Liang , Zhengjun Xing , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Maxime Coquelin , Alexandre Torgue , Andi Kleen , James Clark , John Garry , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Sedat Dilek Cc: Stephane Eranian , Ian Rogers Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Align end of file whitespace with what is generated by: https://github.com/intel/event-converter-for-linux-perf/blob/master/downloa= d_and_gen.py Correct the version in mapfile.csv. Event json remains at v1.01, there are no goldmontplus metrics. Signed-off-by: Ian Rogers --- tools/perf/pmu-events/arch/x86/goldmontplus/cache.json | 2 +- tools/perf/pmu-events/arch/x86/goldmontplus/floating-point.json | 2 +- tools/perf/pmu-events/arch/x86/goldmontplus/frontend.json | 2 +- tools/perf/pmu-events/arch/x86/goldmontplus/memory.json | 2 +- tools/perf/pmu-events/arch/x86/goldmontplus/pipeline.json | 2 +- tools/perf/pmu-events/arch/x86/goldmontplus/virtual-memory.json | 2 +- tools/perf/pmu-events/arch/x86/mapfile.csv | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/perf/pmu-events/arch/x86/goldmontplus/cache.json b/tools= /perf/pmu-events/arch/x86/goldmontplus/cache.json index 59c039169eb8..16e8913c0434 100644 --- a/tools/perf/pmu-events/arch/x86/goldmontplus/cache.json +++ b/tools/perf/pmu-events/arch/x86/goldmontplus/cache.json @@ -1462,4 +1462,4 @@ "SampleAfterValue": "100007", "UMask": "0x1" } -] \ No newline at end of file +] diff --git a/tools/perf/pmu-events/arch/x86/goldmontplus/floating-point.jso= n b/tools/perf/pmu-events/arch/x86/goldmontplus/floating-point.json index c1f00c9470f4..9c3d22439530 100644 --- a/tools/perf/pmu-events/arch/x86/goldmontplus/floating-point.json +++ b/tools/perf/pmu-events/arch/x86/goldmontplus/floating-point.json @@ -35,4 +35,4 @@ "SampleAfterValue": "2000003", "UMask": "0x8" } -] \ No newline at end of file +] diff --git a/tools/perf/pmu-events/arch/x86/goldmontplus/frontend.json b/to= ols/perf/pmu-events/arch/x86/goldmontplus/frontend.json index 3fdc788a2b20..4c2abfbac8f8 100644 --- a/tools/perf/pmu-events/arch/x86/goldmontplus/frontend.json +++ b/tools/perf/pmu-events/arch/x86/goldmontplus/frontend.json @@ -95,4 +95,4 @@ "SampleAfterValue": "200003", "UMask": "0x1" } -] \ No newline at end of file +] diff --git a/tools/perf/pmu-events/arch/x86/goldmontplus/memory.json b/tool= s/perf/pmu-events/arch/x86/goldmontplus/memory.json index e26763d16d52..ae0cb3451866 100644 --- a/tools/perf/pmu-events/arch/x86/goldmontplus/memory.json +++ b/tools/perf/pmu-events/arch/x86/goldmontplus/memory.json @@ -35,4 +35,4 @@ "SampleAfterValue": "200003", "UMask": "0x4" } -] \ No newline at end of file +] diff --git a/tools/perf/pmu-events/arch/x86/goldmontplus/pipeline.json b/to= ols/perf/pmu-events/arch/x86/goldmontplus/pipeline.json index 4d7e3129e5ac..2b712b12cc1f 100644 --- a/tools/perf/pmu-events/arch/x86/goldmontplus/pipeline.json +++ b/tools/perf/pmu-events/arch/x86/goldmontplus/pipeline.json @@ -428,7 +428,7 @@ "EventName": "MACHINE_CLEARS.SMC", "PDIR_COUNTER": "na", "PEBScounters": "0,1,2,3", - "PublicDescription": "Counts the number of times that the processo= r detects that a program is writing to a code section and has to perform a = machine clear because of that modification. Self-modifying code (SMC) caus= es a severe penalty in all Intel architecture processors.", + "PublicDescription": "Counts the number of times that the processo= r detects that a program is writing to a code section and has to perform a = machine clear because of that modification. Self-modifying code (SMC) caus= es a severe penalty in all Intel(R) architecture processors.", "SampleAfterValue": "20003", "UMask": "0x1" }, diff --git a/tools/perf/pmu-events/arch/x86/goldmontplus/virtual-memory.jso= n b/tools/perf/pmu-events/arch/x86/goldmontplus/virtual-memory.json index 36eaec87eead..1f7db22c15e6 100644 --- a/tools/perf/pmu-events/arch/x86/goldmontplus/virtual-memory.json +++ b/tools/perf/pmu-events/arch/x86/goldmontplus/virtual-memory.json @@ -218,4 +218,4 @@ "SampleAfterValue": "20003", "UMask": "0x20" } -] \ No newline at end of file +] diff --git a/tools/perf/pmu-events/arch/x86/mapfile.csv b/tools/perf/pmu-ev= ents/arch/x86/mapfile.csv index ef0beab68a90..a2991906b51c 100644 --- a/tools/perf/pmu-events/arch/x86/mapfile.csv +++ b/tools/perf/pmu-events/arch/x86/mapfile.csv @@ -7,7 +7,7 @@ GenuineIntel-6-4F,v19,broadwellx,core GenuineIntel-6-55-[56789ABCDEF],v1.16,cascadelakex,core GenuineIntel-6-96,v1.03,elkhartlake,core GenuineIntel-6-5[CF],v13,goldmont,core -GenuineIntel-6-7A,v1,goldmontplus,core +GenuineIntel-6-7A,v1.01,goldmontplus,core GenuineIntel-6-3C,v24,haswell,core GenuineIntel-6-45,v24,haswell,core GenuineIntel-6-46,v24,haswell,core --=20 2.37.1.359.gd136c6c3e2-goog