diff --git a/mapfile.csv b/mapfile.csv index 9e9a097e..23ae41b6 100644 --- a/mapfile.csv +++ b/mapfile.csv @@ -52,27 +52,27 @@ GenuineIntel-6-46,V36,/HSW/events/haswell_uncore.json,uncore,,, GenuineIntel-6-3C,V36,/HSW/events/haswell_fp_arith_inst.json,fp_arith_inst,,, GenuineIntel-6-45,V36,/HSW/events/haswell_fp_arith_inst.json,fp_arith_inst,,, GenuineIntel-6-46,V36,/HSW/events/haswell_fp_arith_inst.json,fp_arith_inst,,, -GenuineIntel-6-3C,V0,/HSW/metrics/haswell_metrics.json,metrics,,, -GenuineIntel-6-45,V0,/HSW/metrics/haswell_metrics.json,metrics,,, -GenuineIntel-6-46,V0,/HSW/metrics/haswell_metrics.json,metrics,,, +GenuineIntel-6-3C,V1.0,/HSW/metrics/haswell_metrics.json,metrics,,, +GenuineIntel-6-45,V1.0,/HSW/metrics/haswell_metrics.json,metrics,,, +GenuineIntel-6-46,V1.0,/HSW/metrics/haswell_metrics.json,metrics,,, GenuineIntel-6-3F,V29,/HSX/events/haswellx_core.json,core,,, GenuineIntel-6-3F,V29,/HSX/events/haswellx_matrix.json,offcore,,, GenuineIntel-6-3F,V29,/HSX/events/haswellx_uncore.json,uncore,,, -GenuineIntel-6-3F,V0,/HSX/metrics/haswellx_metrics.json,metrics,,, +GenuineIntel-6-3F,V1.0,/HSX/metrics/haswellx_metrics.json,metrics,,, GenuineIntel-6-3D,V30,/BDW/events/broadwell_core.json,core,,, GenuineIntel-6-3D,V30,/BDW/events/broadwell_matrix.json,offcore,,, GenuineIntel-6-3D,V30,/BDW/events/broadwell_uncore.json,uncore,,, GenuineIntel-6-3D,V30,/BDW/events/broadwell_fp_arith_inst.json,fp_arith_inst,,, -GenuineIntel-6-3D,V0,/BDW/metrics/broadwell_metrics.json,metrics,,, +GenuineIntel-6-3D,V1.0,/BDW/metrics/broadwell_metrics.json,metrics,,, GenuineIntel-6-47,V30,/BDW/events/broadwell_core.json,core,,, GenuineIntel-6-47,V30,/BDW/events/broadwell_matrix.json,offcore,,, GenuineIntel-6-47,V30,/BDW/events/broadwell_uncore.json,uncore,,, GenuineIntel-6-47,V30,/BDW/events/broadwell_fp_arith_inst.json,fp_arith_inst,,, -GenuineIntel-6-47,V0,/BDW/metrics/broadwell_metrics.json,metrics,,, +GenuineIntel-6-47,V1.0,/BDW/metrics/broadwell_metrics.json,metrics,,, GenuineIntel-6-4F,V23,/BDX/events/broadwellx_core.json,core,,, GenuineIntel-6-4F,V23,/BDX/events/broadwellx_matrix.json,offcore,,, GenuineIntel-6-4F,V23,/BDX/events/broadwellx_uncore.json,uncore,,, -GenuineIntel-6-4F,V0,/BDX/metrics/broadwellx_metrics.json,metrics,,, +GenuineIntel-6-4F,V1.0,/BDX/metrics/broadwellx_metrics.json,metrics,,, GenuineIntel-6-56,V12,/BDW-DE/events/broadwellde_core.json,core,,, GenuineIntel-6-56,V12,/BDW-DE/events/broadwellde_uncore.json,uncore,,, GenuineIntel-6-4E,V59,/SKL/events/skylake_core.json,core,,, @@ -81,24 +81,24 @@ GenuineIntel-6-4E,V59,/SKL/events/skylake_uncore.json,uncore,,, GenuineIntel-6-5E,V59,/SKL/events/skylake_uncore.json,uncore,,, GenuineIntel-6-4E,V59,/SKL/events/skylake_fp_arith_inst.json,fp_arith_inst,,, GenuineIntel-6-5E,V59,/SKL/events/skylake_fp_arith_inst.json,fp_arith_inst,,, -GenuineIntel-6-4E,V0,/SKL/metrics/skylake_metrics.json,metrics,,, -GenuineIntel-6-5E,V0,/SKL/metrics/skylake_metrics.json,metrics,,, +GenuineIntel-6-4E,V1.0,/SKL/metrics/skylake_metrics.json,metrics,,, +GenuineIntel-6-5E,V1.0,/SKL/metrics/skylake_metrics.json,metrics,,, GenuineIntel-6-8E,V59,/SKL/events/skylake_core.json,core,,, GenuineIntel-6-9E,V59,/SKL/events/skylake_core.json,core,,, GenuineIntel-6-8E,V59,/SKL/events/skylake_uncore.json,uncore,,, GenuineIntel-6-9E,V59,/SKL/events/skylake_uncore.json,uncore,,, GenuineIntel-6-8E,V59,/SKL/events/skylake_fp_arith_inst.json,fp_arith_inst,,, GenuineIntel-6-9E,V59,/SKL/events/skylake_fp_arith_inst.json,fp_arith_inst,,, -GenuineIntel-6-8E,V0,/SKL/metrics/skylake_metrics.json,metrics,,, -GenuineIntel-6-9E,V0,/SKL/metrics/skylake_metrics.json,metrics,,, +GenuineIntel-6-8E,V1.0,/SKL/metrics/skylake_metrics.json,metrics,,, +GenuineIntel-6-9E,V1.0,/SKL/metrics/skylake_metrics.json,metrics,,, GenuineIntel-6-A5,V59,/SKL/events/skylake_core.json,core,,, GenuineIntel-6-A6,V59,/SKL/events/skylake_core.json,core,,, GenuineIntel-6-A5,V59,/SKL/events/skylake_uncore.json,uncore,,, GenuineIntel-6-A6,V59,/SKL/events/skylake_uncore.json,uncore,,, GenuineIntel-6-A5,V59,/SKL/events/skylake_fp_arith_inst.json,fp_arith_inst,,, GenuineIntel-6-A6,V59,/SKL/events/skylake_fp_arith_inst.json,fp_arith_inst,,, -GenuineIntel-6-A5,V0,/SKL/metrics/skylake_metrics.json,metrics,,, -GenuineIntel-6-A6,V0,/SKL/metrics/skylake_metrics.json,metrics,,, +GenuineIntel-6-A5,V1.0,/SKL/metrics/skylake_metrics.json,metrics,,, +GenuineIntel-6-A6,V1.0,/SKL/metrics/skylake_metrics.json,metrics,,, GenuineIntel-6-57,V16,/KNL/events/knightslanding_core.json,core,,, GenuineIntel-6-57,V16,/KNL/events/knightslanding_matrix.json,offcore,,, GenuineIntel-6-57,V16,/KNL/events/knightslanding_uncore.json,uncore,,, @@ -109,25 +109,25 @@ GenuineIntel-6-55-[01234],V1.36,/SKX/events/skylakex_core.json,core,,, GenuineIntel-6-55-[01234],V1.36,/SKX/events/skylakex_fp_arith_inst.json,fp_arith_inst,,, GenuineIntel-6-55-[01234],V1.36,/SKX/events/skylakex_uncore.json,uncore,,, GenuineIntel-6-55-[01234],V1.36,/SKX/events/skylakex_uncore_experimental.json,uncore experimental,,, -GenuineIntel-6-55-[01234],V0,/SKX/metrics/skylakex_metrics.json,metrics,,, +GenuineIntel-6-55-[01234],V1.0,/SKX/metrics/skylakex_metrics.json,metrics,,, GenuineIntel-6-55-[56789ABCDEF],V1.23,/CLX/events/cascadelakex_core.json,core,,, GenuineIntel-6-55-[56789ABCDEF],V1.23,/CLX/events/cascadelakex_fp_arith_inst.json,fp_arith_inst,,, GenuineIntel-6-55-[56789ABCDEF],V1.23,/CLX/events/cascadelakex_uncore.json,uncore,,, GenuineIntel-6-55-[56789ABCDEF],V1.23,/CLX/events/cascadelakex_uncore_experimental.json,uncore experimental,,, -GenuineIntel-6-55-[56789ABCDEF],V0,/CLX/metrics/cascadelakex_metrics.json,metrics,,, +GenuineIntel-6-55-[56789ABCDEF],V1.0,/CLX/metrics/cascadelakex_metrics.json,metrics,,, GenuineIntel-6-7A,V1.01,/GLP/events/goldmontplus_core.json,core,,, GenuineIntel-6-7A,V1.01,/GLP/events/goldmontplus_fp_arith_inst.json,fp_arith_inst,,, GenuineIntel-6-7A,V1.01,/GLP/events/goldmontplus_matrix.json,offcore,,, GenuineIntel-6-7D,V1.24,/ICL/events/icelake_core.json,core,,, GenuineIntel-6-7D,V1.24,/ICL/events/icelake_uncore.json,uncore,,, -GenuineIntel-6-7D,V0,/ICL/metrics/icelake_metrics.json,metrics,,, +GenuineIntel-6-7D,V1.0,/ICL/metrics/icelake_metrics.json,metrics,,, GenuineIntel-6-7E,V1.24,/ICL/events/icelake_core.json,core,,, GenuineIntel-6-7E,V1.24,/ICL/events/icelake_uncore.json,uncore,,, -GenuineIntel-6-7E,V0,/ICL/metrics/icelake_metrics.json,metrics,,, +GenuineIntel-6-7E,V1.0,/ICL/metrics/icelake_metrics.json,metrics,,, GenuineIntel-6-A7,V1.04,/RKL/events/rocketlake_core.json,core,,, GenuineIntel-6-A7,V1.04,/RKL/events/rocketlake_uncore.json,uncore,,, GenuineIntel-6-A7,V1.04,/RKL/events/rocketlake_uncore_experimental.json,uncore experimental,,, -GenuineIntel-6-A7,V0,/RKL/metrics/rocketlake_metrics.json,metrics,,, +GenuineIntel-6-A7,V1.0,/RKL/metrics/rocketlake_metrics.json,metrics,,, GenuineIntel-6-86,V1.23,/SNR/events/snowridgex_core.json,core,,, GenuineIntel-6-86,V1.23,/SNR/events/snowridgex_uncore.json,uncore,,, GenuineIntel-6-86,V1.23,/SNR/events/snowridgex_uncore_experimental.json,uncore experimental,,, @@ -140,19 +140,19 @@ GenuineIntel-6-8D,V1.17,/TGL/events/tigerlake_uncore_experimental.json,uncore ex GenuineIntel-6-8F,V1.25,/SPR/events/sapphirerapids_core.json,core,,, GenuineIntel-6-8F,V1.25,/SPR/events/sapphirerapids_uncore.json,uncore,,, GenuineIntel-6-8F,V1.25,/SPR/events/sapphirerapids_uncore_experimental.json,uncore experimental,,, -GenuineIntel-6-8F,V0,/SPR/metrics/sapphirerapids_metrics.json,metrics,,, +GenuineIntel-6-8F,V1.0,/SPR/metrics/sapphirerapids_metrics.json,metrics,,, GenuineIntel-6-CF,V1.11,/EMR/events/emeraldrapids_core.json,core,,, GenuineIntel-6-CF,V1.11,/EMR/events/emeraldrapids_uncore.json,uncore,,, GenuineIntel-6-CF,V1.11,/EMR/events/emeraldrapids_uncore_experimental.json,uncore experimental,,, -GenuineIntel-6-CF,V0,/EMR/metrics/emeraldrapids_metrics.json,metrics,,, +GenuineIntel-6-CF,V1.0,/EMR/metrics/emeraldrapids_metrics.json,metrics,,, GenuineIntel-6-6A,V1.27,/ICX/events/icelakex_core.json,core,,, GenuineIntel-6-6A,V1.27,/ICX/events/icelakex_uncore.json,uncore,,, GenuineIntel-6-6A,V1.27,/ICX/events/icelakex_uncore_experimental.json,uncore experimental,,, -GenuineIntel-6-6A,V0,/ICX/metrics/icelakex_metrics.json,metrics,,, +GenuineIntel-6-6A,V1.0,/ICX/metrics/icelakex_metrics.json,metrics,,, GenuineIntel-6-6C,V1.27,/ICX/events/icelakex_core.json,core,,, GenuineIntel-6-6C,V1.27,/ICX/events/icelakex_uncore.json,uncore,,, GenuineIntel-6-6C,V1.27,/ICX/events/icelakex_uncore_experimental.json,uncore experimental,,, -GenuineIntel-6-6C,V0,/ICX/metrics/icelakex_metrics.json,metrics,,, +GenuineIntel-6-6C,V1.0,/ICX/metrics/icelakex_metrics.json,metrics,,, GenuineIntel-6-96,V1.05,/EHL/events/elkhartlake_core.json,core,,, GenuineIntel-6-9C,V1.05,/EHL/events/elkhartlake_core.json,core,,, GenuineIntel-6-97,V1.28,/ADL/events/alderlake_gracemont_core.json,hybridcore,0x20,0x000001,Atom @@ -193,11 +193,11 @@ GenuineIntel-6-B5,V1.11,/MTL/events/meteorlake_uncore_experimental.json,uncore e GenuineIntel-6-AD,V1.04,/GNR/events/graniterapids_core.json,core,,, GenuineIntel-6-AD,V1.04,/GNR/events/graniterapids_uncore.json,uncore,,, GenuineIntel-6-AD,V1.04,/GNR/events/graniterapids_uncore_experimental.json,uncore experimental,,, -GenuineIntel-6-AD,V0,/GNR/metrics/graniterapids_metrics.json,metrics,,, +GenuineIntel-6-AD,V1.0,/GNR/metrics/graniterapids_metrics.json,metrics,,, GenuineIntel-6-AE,V1.04,/GNR/events/graniterapids_core.json,core,,, GenuineIntel-6-AE,V1.04,/GNR/events/graniterapids_uncore.json,uncore,,, GenuineIntel-6-AE,V1.04,/GNR/events/graniterapids_uncore_experimental.json,uncore experimental,,, -GenuineIntel-6-AE,V0,/GNR/metrics/graniterapids_metrics.json,metrics,,, +GenuineIntel-6-AE,V1.0,/GNR/metrics/graniterapids_metrics.json,metrics,,, GenuineIntel-6-AF,V1.07,/SRF/events/sierraforest_core.json,core,,, GenuineIntel-6-AF,V1.07,/SRF/events/sierraforest_uncore.json,uncore,,, GenuineIntel-6-AF,V1.07,/SRF/events/sierraforest_uncore_experimental.json,uncore experimental,,, diff --git a/scripts/ci/verify_mapfile/verify_mapfile.py b/scripts/ci/verify_mapfile/verify_mapfile.py index 7dac4002..2bf18352 100755 --- a/scripts/ci/verify_mapfile/verify_mapfile.py +++ b/scripts/ci/verify_mapfile/verify_mapfile.py @@ -83,7 +83,7 @@ def verify_mapfile_paths(perfmon_repo_path: Path): def verify_event_file_versions(perfmon_repo_path: Path): """Verify mapfile Version column matches event file Header.""" - version_re = re.compile(r'^[vV](\d{1,2}|\d\.\d\d)$') + version_re = re.compile(r'^[vV](\d{1,2}|\d\.\d{1,2})$') logger.info('Checking mapfile.csv version matches event file version.')