lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Fri, 22 Jul 2022 15:32:15 -0700 From: Ian Rogers <irogers@...gle.com> To: perry.taylor@...el.com, caleb.biggers@...el.com, kshipra.bopardikar@...el.com, Kan Liang <kan.liang@...ux.intel.com>, Zhengjun Xing <zhengjun.xing@...ux.intel.com>, Peter Zijlstra <peterz@...radead.org>, Ingo Molnar <mingo@...hat.com>, Arnaldo Carvalho de Melo <acme@...nel.org>, Mark Rutland <mark.rutland@....com>, Alexander Shishkin <alexander.shishkin@...ux.intel.com>, Jiri Olsa <jolsa@...hat.com>, Namhyung Kim <namhyung@...nel.org>, Maxime Coquelin <mcoquelin.stm32@...il.com>, Alexandre Torgue <alexandre.torgue@...s.st.com>, Andi Kleen <ak@...ux.intel.com>, James Clark <james.clark@....com>, John Garry <john.garry@...wei.com>, linux-kernel@...r.kernel.org, linux-perf-users@...r.kernel.org, Sedat Dilek <sedat.dilek@...il.com> Cc: Stephane Eranian <eranian@...gle.com>, Ian Rogers <irogers@...gle.com> Subject: [PATCH v1 06/31] perf vendor events: Update bonnell mapfile.csv 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. Signed-off-by: Ian Rogers <irogers@...gle.com> --- 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 1fe376b3624d..d3c0cc6eff8c 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
Powered by blists - more mailing lists