Merge pull request #133 from intel/cbiggers-work-branch

TMA 4.7 Update
intel · Feb 8, 2024 · 32a3af9 · 32a3af9
2 parents 09c155f + ef1df69
commit 32a3af9
Show file tree

Hide file tree

Showing 18 changed files with 50,344 additions and 2,352 deletions.
diff --git a/BDX/metrics/broadwellx_metrics.json b/BDX/metrics/broadwellx_metrics.json
diff --git a/BDX/metrics/perf/broadwellx_metrics_perf.json b/BDX/metrics/perf/broadwellx_metrics_perf.json
diff --git a/CLX/metrics/cascadelakex_metrics.json b/CLX/metrics/cascadelakex_metrics.json
diff --git a/CLX/metrics/perf/cascadelakex_metrics_perf.json b/CLX/metrics/perf/cascadelakex_metrics_perf.json
diff --git a/HSX/metrics/haswellx_metrics.json b/HSX/metrics/haswellx_metrics.json
diff --git a/HSX/metrics/perf/haswellx_metrics_perf.json b/HSX/metrics/perf/haswellx_metrics_perf.json
diff --git a/ICX/metrics/icelakex_metrics.json b/ICX/metrics/icelakex_metrics.json
diff --git a/ICX/metrics/perf/icelakex_metrics_perf.json b/ICX/metrics/perf/icelakex_metrics_perf.json
diff --git a/SKX/metrics/perf/skylakex_metrics_perf.json b/SKX/metrics/perf/skylakex_metrics_perf.json
diff --git a/SKX/metrics/skylakex_metrics.json b/SKX/metrics/skylakex_metrics.json
diff --git a/SPR/metrics/perf/sapphirerapids_metrics_perf.json b/SPR/metrics/perf/sapphirerapids_metrics_perf.json
diff --git a/SPR/metrics/perf/sapphirerapidshbm_flat_metrics_perf.json b/SPR/metrics/perf/sapphirerapidshbm_flat_metrics_perf.json
diff --git a/SPR/metrics/perf/sapphirerapidshbm_only_metrics_perf.json b/SPR/metrics/perf/sapphirerapidshbm_only_metrics_perf.json
diff --git a/SPR/metrics/sapphirerapids_metrics.json b/SPR/metrics/sapphirerapids_metrics.json
diff --git a/SPR/metrics/sapphirerapidshbm_flat_metrics.json b/SPR/metrics/sapphirerapidshbm_flat_metrics.json
diff --git a/SPR/metrics/sapphirerapidshbm_only_metrics.json b/SPR/metrics/sapphirerapidshbm_only_metrics.json
diff --git a/scripts/config/replacements_config.json b/scripts/config/replacements_config.json
@@ -13,6 +13,7 @@
         "PERF_METRICS.FETCH_LATENCY":"topdown\\-fetch\\-lat",
         "PERF_METRICS.MEMORY_BOUND":"topdown\\-mem\\-bound",
         "TOPDOWN.SLOTS:perf_metrics":"slots",
+        "TOPDOWN.SLOTS:percore":"TOPDOWN.SLOTS",
         "SOCKET_COUNT":"#num_packages",
         "HYPERTHREADING_ON":"#SMT_on",
         "CORES_PER_SOCKET":"#num_cores / #num_packages",
@@ -22,7 +23,14 @@
         "UNC_IIO_PAYLOAD_BYTES_IN.MEM_READ.PART2":"UNC_IIO_DATA_REQ_OF_CPU.MEM_READ.PART2",
         "UNC_IIO_PAYLOAD_BYTES_IN.MEM_READ.PART3":"UNC_IIO_DATA_REQ_OF_CPU.MEM_READ.PART3",
         "UNC_IIO_PAYLOAD_BYTES_IN.MEM_READ.PART4":"UNC_IIO_DATA_REQ_OF_CPU.MEM_READ.PART4",
-        "MSR_EVENT:msr=0x611:type=FREERUN:scope=PACKAGE":"power@energy\\-pkg@"
+        "MSR_EVENT:msr=0x611:type=FREERUN:scope=PACKAGE":"power@energy\\-pkg@",
+        "CPU_CLK_UNHALTED.THREAD_P:SUP":"CPU_CLK_UNHALTED.THREAD_P:k",
+        "CPU_CLK_UNHALTED.THREAD:SUP":"CPU_CLK_UNHALTED.THREAD:k",
+        "UNC_M_CLOCKTICKS:one_unit": "imc_0@event\\=0x0@",
+        "UNC_C_CLOCKTICKS:one_unit": "cbox_0@event\\=0x0@",
+        "UNC_CHA_CLOCKTICKS:one_unit": "cha_0@event\\=0x0@",
+        "FREERUN_PKG_ENERGY_STATUS":"power@energy\\-pkg@",
+        "FREERUN_DRAM_ENERGY_STATUS":"power@energy\\-ram@"
     },
     "metric_source_events":{
         "CHAS_PER_SOCKET":"UNC_CHA([^\\s]*)",
@@ -31,7 +39,8 @@
     "association_option_replacements": [
         {
             "events": ["ICACHE_", "INT_MISC", "UOPS_", "IDQ", "OFFCORE_", 
-                "L1D_", "DTLB_", "AMX_", "ITLB_", "EXE_", "INST_", "ASSISTS"],
+                "L1D_", "DTLB_", "AMX_", "ITLB_", "EXE_", "INST_", "ASSISTS",
+                "SW_", "RS", "DSB2MITE_"],
             "unit":"cpu",
             "translations":{
                 "c":"cmask",

diff --git a/scripts/perf_format_converter.py b/scripts/perf_format_converter.py
@@ -52,7 +52,7 @@
 OUTPUT_DIR_PATH = Path("./outputs/")
 
 # Fields to always display event if empty
-PERSISTENT_FIELDS = ["MetricGroup"]
+PERSISTENT_FIELDS = ["MetricGroup", "BriefDescription"]
 
 
 def main():