Merge pull request intel#242 from intel/platform_config_refactor

Converter script update
captain5050 · Nov 13, 2024 · 3602868 · 3602868
2 parents d45e91f + 8e434a0
commit 3602868
Show file tree

Hide file tree

Showing 3 changed files with 429 additions and 52 deletions.
diff --git a/scripts/config/platform_config.json b/scripts/config/platform_config.json
@@ -0,0 +1,236 @@
+[
+    {
+        "Name":"Haswell Client",
+        "ShortName":"HSW",
+        "FileName":"Haswell",
+        "Core":"Haswell",
+        "CoreType":"P-core",
+        "IsHybrid":false,
+        "DefaultLevel":0
+    },
+    {
+        "Name":"Haswell Server",
+        "ShortName":"HSX",
+        "FileName":"HaswellX",
+        "Core":"Haswell",
+        "CoreType":"P-core",
+        "IsHybrid":false,
+        "DefaultLevel":0
+    },
+    {
+        "Name":"Broadwell Client",
+        "ShortName":"BDW",
+        "FileName":"Broadwell",
+        "Core":"Broadwell",
+        "CoreType":"P-core",
+        "IsHybrid":false,
+        "DefaultLevel":0
+    },
+    {
+        "Name":"Broadwell Server",
+        "ShortName":"BDX",
+        "FileName":"BroadwellX",
+        "Core":"Broadwell",
+        "CoreType":"P-core",
+        "IsHybrid":false,
+        "DefaultLevel":0
+    },
+    {
+        "Name":"Skylake Client",
+        "ShortName":"SKL",
+        "FileName":"Skylake",
+        "Core":"Skylake",
+        "CoreType":"P-core",
+        "IsHybrid":false,
+        "DefaultLevel":0
+    },
+    {
+        "Name":"Skylake Server",
+        "ShortName":"SKX",
+        "FileName":"SkylakeX",
+        "Core":"Skylake",
+        "CoreType":"P-core",
+        "IsHybrid":false,
+        "DefaultLevel":0
+    },
+    {
+        "Name":"Cascade Lake Server",
+        "ShortName":"CLX",
+        "FileName":"CascadelakeX",
+        "Core":"Skylake",
+        "CoreType":"P-core",
+        "IsHybrid":false,
+        "DefaultLevel":0
+    },
+    {
+        "Name":"Icelake Client",
+        "ShortName":"ICL",
+        "FileName":"Icelake",
+        "Core":"SunnyCove",
+        "CoreType":"P-core",
+        "IsHybrid":false,
+        "DefaultLevel":1
+    },
+    {
+        "Name":"Icelake Server",
+        "ShortName":"ICX",
+        "FileName":"IcelakeX",
+        "Core":"SunnyCove",
+        "CoreType":"P-core",
+        "IsHybrid":false,
+        "DefaultLevel":1
+    },
+    {
+        "Name":"Rocket Lake Client",
+        "ShortName":"RKL",
+        "FileName":"Rocketlake",
+        "Core":"SunnyCove",
+        "CoreType":"P-core",
+        "IsHybrid":false,
+        "DefaultLevel":1
+    },
+    {
+        "Name":"Tiger Lake Client",
+        "ShortName":"TGL",
+        "FileName":"TigerLake",
+        "Core":"WillowCove",
+        "CoreType":"P-core",
+        "IsHybrid":false,
+        "DefaultLevel":1
+    },
+    {
+        "Name":"Sapphire Rapids Server",
+        "ShortName":"SPR",
+        "FileName":"Sapphirerapids",
+        "Core":"GoldenCove",
+        "CoreType":"P-core",
+        "IsHybrid":false,
+        "DefaultLevel":2
+    },
+    {
+        "Name":"Sapphire Rapids HBM",
+        "ShortName":"SPR-HBM",
+        "FileName":"SapphirerapidsHBM",
+        "Core":"GoldenCove",
+        "CoreType":"P-core",
+        "IsHybrid":false,
+        "DefaultLevel":2
+    },
+    {
+        "Name":"Sapphire Rapids HBM Only",
+        "ShortName":"SPR-HBMO",
+        "FileName":"Sapphirerapids-HBMOnly",
+        "Core":"GoldenCove",
+        "CoreType":"P-core",
+        "IsHybrid":false,
+        "DefaultLevel":2
+    },
+    {
+        "Name":"Granite Rapids Server",
+        "ShortName":"GNR",
+        "FileName":"GraniteRapids",
+        "Core":"RedwoodCove",
+        "CoreType":"P-core",
+        "IsHybrid":false,
+        "DefaultLevel":2
+    },
+    {
+        "Name":"Emerald Rapids Server",
+        "ShortName":"EMR",
+        "FileName":"EmeraldRapids",
+        "Core":"RaptorCove",
+        "CoreType":"P-core",
+        "IsHybrid":false,
+        "DefaultLevel":2
+    },
+    {
+        "Name":"Sierra Forest Server",
+        "ShortName":"SRF",
+        "FileName":"SierraForest",
+        "Core":"Crestmont",
+        "CoreType":"E-core",
+        "IsHybrid":false,
+        "DefaultLevel":0
+    },
+    {
+        "Name":"Grand Ridge Micro Server",
+        "ShortName":"GRR",
+        "FileName":"GrandRidge",
+        "Core":"Crestmont",
+        "CoreType":"E-core",
+        "IsHybrid":false,
+        "DefaultLevel":2
+    },
+    {
+        "Name":"Alder Lake",
+        "ShortName":"ADL",
+        "FileName":"Alderlake",
+        "Core":"GoldenCove",
+        "CoreType":"P-core",
+        "IsHybrid":true,
+        "DefaultLevel":2
+    },
+    {
+        "Name":"Alder Lake",
+        "ShortName":"ADL",
+        "FileName":"Alderlake",
+        "Core":"Gracemont",
+        "CoreType":"E-core",
+        "IsHybrid":true,
+        "DefaultLevel":0
+    },
+    {
+        "Name":"Arrow Lake",
+        "ShortName":"ARL",
+        "FileName":"Arrowlake",
+        "Core":"LionCove",
+        "CoreType":"P-core",
+        "IsHybrid":true,
+        "DefaultLevel":2
+    },
+    {
+        "Name":"Arrow Lake",
+        "ShortName":"ARL",
+        "FileName":"Arrowlake",
+        "Core":"SkyMont",
+        "CoreType":"E-core",
+        "IsHybrid":true,
+        "DefaultLevel":2
+    },
+    {
+        "Name":"Lunar Lake",
+        "ShortName":"LNL",
+        "FileName":"Lunarlake",
+        "Core":"LionCove",
+        "CoreType":"P-core",
+        "IsHybrid":true,
+        "DefaultLevel":2
+    },
+    {
+        "Name":"Lunar Lake",
+        "ShortName":"LNL",
+        "FileName":"Lunarlake",
+        "Core":"SkyMont",
+        "CoreType":"E-core",
+        "IsHybrid":true,
+        "DefaultLevel":2
+    },
+    {
+        "Name":"Meteor Lake",
+        "ShortName":"MTL",
+        "FileName":"Meteorlake",
+        "Core":"RedwoodCove",
+        "CoreType":"P-core",
+        "IsHybrid":true,
+        "DefaultLevel":2
+    },
+    {
+        "Name":"Meteor Lake",
+        "ShortName":"MTL",
+        "FileName":"Meteorlake",
+        "Core":"Crestmont",
+        "CoreType":"E-core",
+        "IsHybrid":true,
+        "DefaultLevel":2
+    }
+]
diff --git a/scripts/config/replacements_config.json b/scripts/config/replacements_config.json
@@ -38,7 +38,10 @@
         "FREERUN_DRAM_ENERGY_STATUS":"power@energy\\-ram@",
         "NUM_CPUS":"#num_cpus_online",
         "UNC_PKG_ENERGY_STATUS":"power@energy\\-pkg@",
-        "UNC_DRAM_ENERGY_STATUS":"power@energy\\-ram@"
+        "UNC_DRAM_ENERGY_STATUS":"power@energy\\-ram@",
+        "INST_RETIRED.ANY_P:SUP":"INST_RETIRED.ANY_P:k",
+        "BR_INST_RETIRED.FAR_BRANCH:USER":"BR_INST_RETIRED.FAR_BRANCH:u",
+        "OCR.DEMAND_RFO.L3_MISS:OCR_MSR_VAL=0X103B800002":"[email protected]_RFO.L3_MISS\\,offcore_rsp\\=0x103b800002@"
     },
     "metric_source_events":{
         "CHAS_PER_SOCKET":"UNC_CHA([^\\s]*)",
@@ -48,7 +51,7 @@
         {
             "events": ["ICACHE_", "INT_MISC", "UOPS_", "IDQ", "OFFCORE_", 
                 "L1D_", "DTLB_", "AMX_", "ITLB_", "EXE_", "INST_", "ASSISTS",
-                "SW_", "RS", "DSB2MITE_", "ARB_"],
+                "SW_", "RS", "DSB2MITE_", "ARB_", "LSD"],
             "unit":"cpu",
             "translations":{
                 "c":"cmask",
@@ -62,7 +65,8 @@
             "events": ["UNC_CHA_"],
             "unit":"cha",
             "translations":{
-                "filter1":"config1"
+                "filter1":"config1",
+                "c":"thresh"
             },
             "scale":100000000
         },