Skip to content

Commit

Permalink
Merge pull request #150 from edwarddavidbaker/mapfile-metrics
Browse files Browse the repository at this point in the history 
mapfile: Reference platform metrics
  • Loading branch information
@edwarddavidbaker
edwarddavidbaker authored Aug 13, 2024
2 parents 47778ca + 9ad02b5 commit fcb1625
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 0 deletions.
26 changes: 26 additions & 0 deletions mapfile.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,20 +49,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-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-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-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-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-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,,,
Expand All @@ -71,18 +78,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-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-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-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,,,
Expand All @@ -93,22 +106,27 @@ GenuineIntel-6-55-[01234],V1.35,/SKX/events/skylakex_core.json,core,,,
GenuineIntel-6-55-[01234],V1.35,/SKX/events/skylakex_fp_arith_inst.json,fp_arith_inst,,,
GenuineIntel-6-55-[01234],V1.35,/SKX/events/skylakex_uncore.json,uncore,,,
GenuineIntel-6-55-[01234],V1.35,/SKX/events/skylakex_uncore_experimental.json,uncore experimental,,,
GenuineIntel-6-55-[01234],V0,/SKX/metrics/skylakex_metrics.json,metrics,,,
GenuineIntel-6-55-[56789ABCDEF],V1.22,/CLX/events/cascadelakex_core.json,core,,,
GenuineIntel-6-55-[56789ABCDEF],V1.22,/CLX/events/cascadelakex_fp_arith_inst.json,fp_arith_inst,,,
GenuineIntel-6-55-[56789ABCDEF],V1.22,/CLX/events/cascadelakex_uncore.json,uncore,,,
GenuineIntel-6-55-[56789ABCDEF],V1.22,/CLX/events/cascadelakex_uncore_experimental.json,uncore experimental,,,
GenuineIntel-6-55-[56789ABCDEF],V0,/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.22,/ICL/events/icelake_core.json,core,,,
GenuineIntel-6-7D,V1.22,/ICL/events/icelake_uncore.json,uncore,,,
GenuineIntel-6-7D,V1.22,/ICL/events/icelake_uncore_experimental.json,uncore experimental,,,
GenuineIntel-6-7D,V0,/ICL/metrics/icelake_metrics.json,metrics,,,
GenuineIntel-6-7E,V1.22,/ICL/events/icelake_core.json,core,,,
GenuineIntel-6-7E,V1.22,/ICL/events/icelake_uncore.json,uncore,,,
GenuineIntel-6-7E,V1.22,/ICL/events/icelake_uncore_experimental.json,uncore experimental,,,
GenuineIntel-6-7E,V0,/ICL/metrics/icelake_metrics.json,metrics,,,
GenuineIntel-6-A7,V1.03,/RKL/events/rocketlake_core.json,core,,,
GenuineIntel-6-A7,V1.03,/RKL/events/rocketlake_uncore.json,uncore,,,
GenuineIntel-6-A7,V1.03,/RKL/events/rocketlake_uncore_experimental.json,uncore experimental,,,
GenuineIntel-6-A7,V0,/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,,,
Expand All @@ -121,15 +139,19 @@ GenuineIntel-6-8D,V1.16,/TGL/events/tigerlake_uncore_experimental.json,uncore ex
GenuineIntel-6-8F,V1.24,/SPR/events/sapphirerapids_core.json,core,,,
GenuineIntel-6-8F,V1.24,/SPR/events/sapphirerapids_uncore.json,uncore,,,
GenuineIntel-6-8F,V1.24,/SPR/events/sapphirerapids_uncore_experimental.json,uncore experimental,,,
GenuineIntel-6-8F,V0,/SPR/metrics/sapphirerapids_metrics.json,metrics,,,
GenuineIntel-6-CF,V1.10,/EMR/events/emeraldrapids_core.json,core,,,
GenuineIntel-6-CF,V1.10,/EMR/events/emeraldrapids_uncore.json,uncore,,,
GenuineIntel-6-CF,V1.10,/EMR/events/emeraldrapids_uncore_experimental.json,uncore experimental,,,
GenuineIntel-6-CF,V0,/EMR/metrics/emeraldrapids_metrics.json,metrics,,,
GenuineIntel-6-6A,V1.26,/ICX/events/icelakex_core.json,core,,,
GenuineIntel-6-6A,V1.26,/ICX/events/icelakex_uncore.json,uncore,,,
GenuineIntel-6-6A,V1.26,/ICX/events/icelakex_uncore_experimental.json,uncore experimental,,,
GenuineIntel-6-6A,V0,/ICX/metrics/icelakex_metrics.json,metrics,,,
GenuineIntel-6-6C,V1.26,/ICX/events/icelakex_core.json,core,,,
GenuineIntel-6-6C,V1.26,/ICX/events/icelakex_uncore.json,uncore,,,
GenuineIntel-6-6C,V1.26,/ICX/events/icelakex_uncore_experimental.json,uncore experimental,,,
GenuineIntel-6-6C,V0,/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.27,/ADL/events/alderlake_gracemont_core.json,hybridcore,0x20,0x000001,Atom
Expand Down Expand Up @@ -166,15 +188,19 @@ GenuineIntel-6-AC,V1.10,/MTL/events/meteorlake_uncore_experimental.json,uncore e
GenuineIntel-6-AD,V1.02,/GNR/events/graniterapids_core.json,core,,,
GenuineIntel-6-AD,V1.02,/GNR/events/graniterapids_uncore.json,uncore,,,
GenuineIntel-6-AD,V1.02,/GNR/events/graniterapids_uncore_experimental.json,uncore experimental,,,
GenuineIntel-6-AD,V0,/GNR/metrics/graniterapids_metrics.json,metrics,,,
GenuineIntel-6-AE,V1.02,/GNR/events/graniterapids_core.json,core,,,
GenuineIntel-6-AE,V1.02,/GNR/events/graniterapids_uncore.json,uncore,,,
GenuineIntel-6-AE,V1.02,/GNR/events/graniterapids_uncore_experimental.json,uncore experimental,,,
GenuineIntel-6-AE,V0,/GNR/metrics/graniterapids_metrics.json,metrics,,,
GenuineIntel-6-AF,V1.04,/SRF/events/sierraforest_core.json,core,,,
GenuineIntel-6-AF,V1.04,/SRF/events/sierraforest_uncore.json,uncore,,,
GenuineIntel-6-AF,V1.04,/SRF/events/sierraforest_uncore_experimental.json,uncore experimental,,,
GenuineIntel-6-AF,V0,/SRF/metrics/sierraforest_metrics.json,metrics,,,
GenuineIntel-6-B6,V1.03,/GRR/events/grandridge_core.json,core,,,
GenuineIntel-6-B6,V1.03,/GRR/events/grandridge_uncore.json,uncore,,,
GenuineIntel-6-B6,V1.03,/GRR/events/grandridge_uncore_experimental.json,uncore experimental,,,
GenuineIntel-6-B6,V0,/GRR/metrics/grandridge_metrics.json,metrics,,,
GenuineIntel-6-BD,V1.06,/LNL/events/lunarlake_skymont_core.json,hybridcore,0x20,0x000003,Atom
GenuineIntel-6-BD,V1.06,/LNL/events/lunarlake_lioncove_core.json,hybridcore,0x40,0x000003,Core
GenuineIntel-6-BD,V1.06,/LNL/events/lunarlake_uncore.json,uncore,,,
Expand Down
5 changes: 5 additions & 0 deletions scripts/create_perf_json.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1865,6 +1865,11 @@ def __init__(self, base_path: Path):
first_row = False
continue

# Skip mapfile metrics entries metrics/*_metrics.json. This utility uses
# metrics/perf/*metrics_perf.json files.
if event_type == 'metrics':
continue

# From path compute the shortname (like SKL) and the
# longname (like Skylake).
shortname = re.sub(r'/([^/]*)/.*', r'\1', path)
Expand Down

0 comments on commit fcb1625

Please sign in to comment.