public release

Makefile

@@ -45,7 +45,7 @@ build-public/postprocess:
 					--add-data "./events/metric_skx_clx.json:." \
 					--add-data "./events/metric_bdx.json:." \
 					--add-data "./events/metric_icx.json:." \
-					--add-data "./events/metric_spr.json:." \
+					--add-data "./events/metric_spr_emr.json:." \
 					--add-data "./events/metric_srf.json:." \
 					--add-data "./src/base.html:." \
 					--runtime-tmpdir . \

_version.txt

@@ -1 +1 @@
-1.3.7
+1.3.8

perf-collect.py

@@ -334,11 +334,8 @@ def validate_file(fname):
         eventfile = "clx_skx.txt"
     elif arch == "icelake":
         eventfile = "icx.txt"
-    elif arch == "sapphirerapids":
-        eventfile = "spr.txt"
-    elif arch == "emeraldrapids":
-        eventfile = "spr.txt"
-        have_uncore = False
+    elif arch == "sapphirerapids" or arch == "emeraldrapids":
+        eventfile = "spr_emr.txt"
     elif arch == "sierraforest":
         eventfile = "srf.txt"
 

perf-collect.spec

@@ -7,7 +7,7 @@ block_cipher = None
 a = Analysis(
     ['perf-collect.py'],
     pathex=[],
-    datas=[('./src/libtsc.so', '.'), ('./events/bdx.txt', '.'), ('./events/clx_skx.txt', '.'), ('./events/icx.txt', '.'), ('./events/spr.txt', '.'), ('./events/srf.txt', '.')],
+    datas=[('./src/libtsc.so', '.'), ('./events/bdx.txt', '.'), ('./events/clx_skx.txt', '.'), ('./events/icx.txt', '.'), ('./events/spr_emr.txt', '.'), ('./events/srf.txt', '.')],
     hiddenimports=[],
     hookspath=[],
     hooksconfig={},

perf-postprocess.py

@@ -407,7 +407,7 @@ def get_metric_file_name(microarchitecture):
     elif microarchitecture == "icelake":
         metric_file = "metric_icx.json"
     elif microarchitecture == "sapphirerapids" or microarchitecture == "emeraldrapids":
-        metric_file = "metric_spr.json"
+        metric_file = "metric_spr_emr.json"
     elif microarchitecture == "sierraforest":
         metric_file = "metric_srf.json"
     else: