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 8FC4CC04A68 for ; Wed, 27 Jul 2022 22:09:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235032AbiG0WJ0 (ORCPT ); Wed, 27 Jul 2022 18:09:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50934 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234199AbiG0WJB (ORCPT ); Wed, 27 Jul 2022 18:09:01 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 95FB957270 for ; Wed, 27 Jul 2022 15:08:57 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id k16-20020a252410000000b006718984ef63so253287ybk.3 for ; Wed, 27 Jul 2022 15:08:57 -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; bh=8F+fz6+0/gUalMupUoM3UlVut6MQCtx2E2VfaCYyCYs=; b=SVrzjdA/29nNMvxtMEUOAmZjsomAqykdTmkEngLitpMomnZZwE06XS4fPMaoa1387w 9MYE+Eu5EE80/Ys86P/8OIvtCSXzZKJt2PmnabnqXvdkKB2nVSpGibW9O4i2bv9XZKlK Sd3/A7fn5Yi45H8hr9ZWe9nVMceuwvDVWBrk2BZPyP1fSktKr2dSLiY2i8s77QqB2SKh X5iItT/To9rea2fQ21xTcpDJCg9aoST9nMpTL+fMVCdy8EEcZTTlAa/gwteLEHscYjRm TssFkFv+wF9vvz3irksGb5nDZ9Uh83fjRFCPKpkuzoLeHkBRErJsi7U+C+JgOGed5m2K 58Ew== 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; bh=8F+fz6+0/gUalMupUoM3UlVut6MQCtx2E2VfaCYyCYs=; b=x5PETqZzgPiOUJtBYE+keF4hd+YTN3OrS2tZzP+n1P2bYBgrZe3s2473Eu7whYPj7A YFlRlnOhUmLoj9PHescJHRxWZj07BsEU8R7n1Jd/7o2DEFAgUzLBkrmWHrALiZZrpBT6 2si8TfKOF8qIr1OkImiPKo3fbP94+hIJ7/4Y21S4CI836+gCWj/M3pqq9lgboRrZd8zn 0w/rfb2721ANM0qlKJ/FBih9n3ccMPHTIQSuVOQb+tZOfGhZqZDXeGinQmmfm3K/RJWk JhAHSoEb5ceVe67JXd7HFcSaz7uN5lTLRvDaqxqfotIB2TVnskEOlvTMTNlzxYorAJUL yHhA== X-Gm-Message-State: AJIora8FBUo95su7i8ZJK0HohFm0my7TpIIienoHwOqeH55Dw0jqfOvS ZXkU8VrQ4ncHx6DBQQD4jbOHPH1C3Pxh X-Google-Smtp-Source: AGRyM1vcNms7CX+IV4N8vvNYD0KM3NFfqflu7Gp/S+6+PQ53h+1Kq1xz56/htqhh8ihmrG7gqa22U7iGFz6u X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:882a:af57:8cb6:6f9e]) (user=irogers job=sendgmr) by 2002:a81:5748:0:b0:31f:6587:b25 with SMTP id l69-20020a815748000000b0031f65870b25mr3836694ywb.517.1658959736916; Wed, 27 Jul 2022 15:08:56 -0700 (PDT) Date: Wed, 27 Jul 2022 15:08:07 -0700 In-Reply-To: <20220727220832.2865794-1-irogers@google.com> Message-Id: <20220727220832.2865794-6-irogers@google.com> Mime-Version: 1.0 References: <20220727220832.2865794-1-irogers@google.com> X-Mailer: git-send-email 2.37.1.359.gd136c6c3e2-goog Subject: [PATCH v3 05/30] perf vendor events: Update bonnell 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" Precedence: bulk List-ID: X-Mailing-List: linux-perf-users@vger.kernel.org Align end of file whitespace with what is generated by: https://github.com/intel/event-converter-for-linux-perf/blob/master/download_and_gen.py Fold the mapfile.csv entries together with a more complex regular expression. This will reduce the pmu-events.c table size. The files following this change are still at v4. Signed-off-by: Ian Rogers --- tools/perf/pmu-events/arch/x86/bonnell/cache.json | 2 +- tools/perf/pmu-events/arch/x86/bonnell/floating-point.json | 2 +- tools/perf/pmu-events/arch/x86/bonnell/frontend.json | 2 +- tools/perf/pmu-events/arch/x86/bonnell/memory.json | 2 +- tools/perf/pmu-events/arch/x86/bonnell/other.json | 2 +- tools/perf/pmu-events/arch/x86/bonnell/pipeline.json | 2 +- tools/perf/pmu-events/arch/x86/bonnell/virtual-memory.json | 2 +- tools/perf/pmu-events/arch/x86/mapfile.csv | 6 +----- 8 files changed, 8 insertions(+), 12 deletions(-) diff --git a/tools/perf/pmu-events/arch/x86/bonnell/cache.json b/tools/perf/pmu-events/arch/x86/bonnell/cache.json index 71653bfe7093..86582bb8aa39 100644 --- a/tools/perf/pmu-events/arch/x86/bonnell/cache.json +++ b/tools/perf/pmu-events/arch/x86/bonnell/cache.json @@ -743,4 +743,4 @@ "SampleAfterValue": "10000", "UMask": "0x2" } -] \ No newline at end of file +] diff --git a/tools/perf/pmu-events/arch/x86/bonnell/floating-point.json b/tools/perf/pmu-events/arch/x86/bonnell/floating-point.json index f8055ff47f19..1fa347d07c98 100644 --- a/tools/perf/pmu-events/arch/x86/bonnell/floating-point.json +++ b/tools/perf/pmu-events/arch/x86/bonnell/floating-point.json @@ -258,4 +258,4 @@ "SampleAfterValue": "2000000", "UMask": "0x2" } -] \ No newline at end of file +] diff --git a/tools/perf/pmu-events/arch/x86/bonnell/frontend.json b/tools/perf/pmu-events/arch/x86/bonnell/frontend.json index e852eb2cc878..21fe5fe229aa 100644 --- a/tools/perf/pmu-events/arch/x86/bonnell/frontend.json +++ b/tools/perf/pmu-events/arch/x86/bonnell/frontend.json @@ -88,4 +88,4 @@ "SampleAfterValue": "2000000", "UMask": "0x1" } -] \ No newline at end of file +] diff --git a/tools/perf/pmu-events/arch/x86/bonnell/memory.json b/tools/perf/pmu-events/arch/x86/bonnell/memory.json index 2aa4c41f528e..f8b45b6fb4d3 100644 --- a/tools/perf/pmu-events/arch/x86/bonnell/memory.json +++ b/tools/perf/pmu-events/arch/x86/bonnell/memory.json @@ -151,4 +151,4 @@ "SampleAfterValue": "200000", "UMask": "0x86" } -] \ No newline at end of file +] diff --git a/tools/perf/pmu-events/arch/x86/bonnell/other.json b/tools/perf/pmu-events/arch/x86/bonnell/other.json index 114c062e7e96..e0bdcfbfa9dc 100644 --- a/tools/perf/pmu-events/arch/x86/bonnell/other.json +++ b/tools/perf/pmu-events/arch/x86/bonnell/other.json @@ -447,4 +447,4 @@ "SampleAfterValue": "200000", "UMask": "0xc0" } -] \ No newline at end of file +] diff --git a/tools/perf/pmu-events/arch/x86/bonnell/pipeline.json b/tools/perf/pmu-events/arch/x86/bonnell/pipeline.json index 896b738e59b6..f5123c99a7ba 100644 --- a/tools/perf/pmu-events/arch/x86/bonnell/pipeline.json +++ b/tools/perf/pmu-events/arch/x86/bonnell/pipeline.json @@ -353,4 +353,4 @@ "SampleAfterValue": "2000000", "UMask": "0x10" } -] \ No newline at end of file +] diff --git a/tools/perf/pmu-events/arch/x86/bonnell/virtual-memory.json b/tools/perf/pmu-events/arch/x86/bonnell/virtual-memory.json index c2363b8e61b4..e8512c585572 100644 --- a/tools/perf/pmu-events/arch/x86/bonnell/virtual-memory.json +++ b/tools/perf/pmu-events/arch/x86/bonnell/virtual-memory.json @@ -121,4 +121,4 @@ "SampleAfterValue": "200000", "UMask": "0x3" } -] \ No newline at end of file +] diff --git a/tools/perf/pmu-events/arch/x86/mapfile.csv b/tools/perf/pmu-events/arch/x86/mapfile.csv index 2842f23db82a..dbd6bcbbca8b 100644 --- a/tools/perf/pmu-events/arch/x86/mapfile.csv +++ b/tools/perf/pmu-events/arch/x86/mapfile.csv @@ -1,13 +1,9 @@ Family-model,Version,Filename,EventType GenuineIntel-6-9[7A],v1.13,alderlake,core +GenuineIntel-6-(1C|26|27|35|36),v4,bonnell,core GenuineIntel-6-(3D|47),v26,broadwell,core GenuineIntel-6-56,v23,broadwellde,core GenuineIntel-6-4F,v19,broadwellx,core -GenuineIntel-6-1C,v4,bonnell,core -GenuineIntel-6-26,v4,bonnell,core -GenuineIntel-6-27,v4,bonnell,core -GenuineIntel-6-36,v4,bonnell,core -GenuineIntel-6-35,v4,bonnell,core GenuineIntel-6-5C,v8,goldmont,core GenuineIntel-6-7A,v1,goldmontplus,core GenuineIntel-6-3C,v24,haswell,core -- 2.37.1.359.gd136c6c3e2-goog