Added perf translation for power events

intel · Jan 25, 2024 · fa61138 · fa61138
1 parent 918b4eb
commit fa61138
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 6 deletions.
diff --git a/BDX/metrics/perf/broadwellx_metrics_perf.json b/BDX/metrics/perf/broadwellx_metrics_perf.json
@@ -1118,7 +1118,7 @@
     },
     {
         "BriefDescription": "Total package Power in Watts",
-        "MetricExpr": "( FREERUN_PKG_ENERGY_STATUS * ( 61 ) + 15.6 * FREERUN_DRAM_ENERGY_STATUS ) / ( ( ( duration_time * 1000 ) / 1000 ) * ( 1000000 ) )",
+        "MetricExpr": "( power@energy\\-pkg@ * ( 61 ) + 15.6 * power@energy\\-ram@ ) / ( ( ( duration_time * 1000 ) / 1000 ) * ( 1000000 ) )",
         "MetricGroup": "Power;SoC;TopdownL1;tma_L1_group",
         "MetricName": "tma_info_system_power"
     },

diff --git a/CLX/metrics/perf/cascadelakex_metrics_perf.json b/CLX/metrics/perf/cascadelakex_metrics_perf.json
@@ -1613,7 +1613,7 @@
     },
     {
         "BriefDescription": "Total package Power in Watts",
-        "MetricExpr": "( FREERUN_PKG_ENERGY_STATUS * ( 61 ) + 15.6 * FREERUN_DRAM_ENERGY_STATUS ) / ( ( ( duration_time * 1000 ) / 1000 ) * ( 1000000 ) )",
+        "MetricExpr": "( power@energy\\-pkg@ * ( 61 ) + 15.6 * power@energy\\-ram@ ) / ( ( ( duration_time * 1000 ) / 1000 ) * ( 1000000 ) )",
         "MetricGroup": "Power;SoC;TopdownL1;tma_L1_group",
         "MetricName": "tma_info_system_power"
     },

diff --git a/HSX/metrics/perf/haswellx_metrics_perf.json b/HSX/metrics/perf/haswellx_metrics_perf.json
@@ -965,7 +965,7 @@
     },
     {
         "BriefDescription": "Total package Power in Watts",
-        "MetricExpr": "( FREERUN_PKG_ENERGY_STATUS * ( 61 ) + 15.6 * FREERUN_DRAM_ENERGY_STATUS ) / ( ( ( duration_time * 1000 ) / 1000 ) * ( 1000000 ) )",
+        "MetricExpr": "( power@energy\\-pkg@ * ( 61 ) + 15.6 * power@energy\\-ram@ ) / ( ( ( duration_time * 1000 ) / 1000 ) * ( 1000000 ) )",
         "MetricGroup": "Power;SoC;TopdownL1;tma_L1_group",
         "MetricName": "tma_info_system_power"
     },

diff --git a/ICX/metrics/perf/icelakex_metrics_perf.json b/ICX/metrics/perf/icelakex_metrics_perf.json
@@ -1649,7 +1649,7 @@
     },
     {
         "BriefDescription": "Total package Power in Watts",
-        "MetricExpr": "( FREERUN_PKG_ENERGY_STATUS * ( 61 ) + 15.6 * FREERUN_DRAM_ENERGY_STATUS ) / ( ( ( duration_time * 1000 ) / 1000 ) * ( 1000000 ) )",
+        "MetricExpr": "( power@energy\\-pkg@ * ( 61 ) + 15.6 * power@energy\\-ram@ ) / ( ( ( duration_time * 1000 ) / 1000 ) * ( 1000000 ) )",
         "MetricGroup": "Power;SoC;TopdownL1;tma_L1_group",
         "MetricName": "tma_info_system_power"
     },

diff --git a/SKX/metrics/perf/skylakex_metrics_perf.json b/SKX/metrics/perf/skylakex_metrics_perf.json
@@ -1554,7 +1554,7 @@
     },
     {
         "BriefDescription": "Total package Power in Watts",
-        "MetricExpr": "( FREERUN_PKG_ENERGY_STATUS * ( 61 ) + 15.6 * FREERUN_DRAM_ENERGY_STATUS ) / ( ( ( duration_time * 1000 ) / 1000 ) * ( 1000000 ) )",
+        "MetricExpr": "( power@energy\\-pkg@ * ( 61 ) + 15.6 * power@energy\\-ram@ ) / ( ( ( duration_time * 1000 ) / 1000 ) * ( 1000000 ) )",
         "MetricGroup": "Power;SoC;TopdownL1;tma_L1_group",
         "MetricName": "tma_info_system_power"
     },

diff --git a/scripts/config/replacements_config.json b/scripts/config/replacements_config.json
@@ -28,7 +28,9 @@
         "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@"
+        "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]*)",