Merge pull request #340 from intel/SPR_EMR_cstate_metric_update

1perrytaylor · web-flow · commit 86bc75d2b6a3 · 2025-09-25T08:15:28.000-07:00
SPR_EMR_cstate_metric_update
diff --git a/EMR/metrics/emeraldrapids_metrics.json b/EMR/metrics/emeraldrapids_metrics.json
@@ -1115,7 +1115,7 @@
           "Alias": "socket_count"
         }
       ],
-      "Formula": "(b / a[0]) * socket_count",
+      "Formula": "(b / a) * socket_count",
       "Category": "Power",
       "ResolutionLevels": "SOCKET, SYSTEM",
       "MetricGroup": "cpu_cstate"
@@ -1142,7 +1142,7 @@
           "Alias": "socket_count"
         }
       ],
-      "Formula": "(b / a[0]) * socket_count",
+      "Formula": "(b / a) * socket_count",
       "Category": "Power",
       "ResolutionLevels": "SOCKET, SYSTEM",
       "MetricGroup": "cpu_cstate"
diff --git a/EMR/metrics/perf/emeraldrapids_metrics_perf.json b/EMR/metrics/perf/emeraldrapids_metrics_perf.json
@@ -321,13 +321,13 @@
     },
     {
         "BriefDescription": "The average number of cores that are in cstate C0 as observed by the power control unit (PCU)",
-        "MetricExpr": "( UNC_P_POWER_STATE_OCCUPANCY_CORES_C0 / pcu_0@UNC_P_CLOCKTICKS@ ) * #num_packages",
+        "MetricExpr": "( UNC_P_POWER_STATE_OCCUPANCY_CORES_C0 / UNC_P_CLOCKTICKS ) * #num_packages",
         "MetricGroup": "cpu_cstate",
         "MetricName": "cpu_cstate_c0"
     },
     {
         "BriefDescription": "The average number of cores are in cstate C6 as observed by the power control unit (PCU)",
-        "MetricExpr": "( UNC_P_POWER_STATE_OCCUPANCY_CORES_C6 / pcu_0@UNC_P_CLOCKTICKS@ ) * #num_packages",
+        "MetricExpr": "( UNC_P_POWER_STATE_OCCUPANCY_CORES_C6 / UNC_P_CLOCKTICKS ) * #num_packages",
         "MetricGroup": "cpu_cstate",
         "MetricName": "cpu_cstate_c6"
     }
diff --git a/SPR/metrics/perf/sapphirerapids_metrics_perf.json b/SPR/metrics/perf/sapphirerapids_metrics_perf.json
@@ -398,13 +398,13 @@
     },
     {
         "BriefDescription": "The average number of cores that are in cstate C0 as observed by the power control unit (PCU)",
-        "MetricExpr": "( UNC_P_POWER_STATE_OCCUPANCY_CORES_C0 / pcu_0@UNC_P_CLOCKTICKS@ ) * #num_packages",
+        "MetricExpr": "( UNC_P_POWER_STATE_OCCUPANCY_CORES_C0 / UNC_P_CLOCKTICKS ) * #num_packages",
         "MetricGroup": "cpu_cstate",
         "MetricName": "cpu_cstate_c0"
     },
     {
         "BriefDescription": "The average number of cores are in cstate C6 as observed by the power control unit (PCU)",
-        "MetricExpr": "( UNC_P_POWER_STATE_OCCUPANCY_CORES_C6 / pcu_0@UNC_P_CLOCKTICKS@ ) * #num_packages",
+        "MetricExpr": "( UNC_P_POWER_STATE_OCCUPANCY_CORES_C6 / @UNC_P_CLOCKTICKS ) * #num_packages",
         "MetricGroup": "cpu_cstate",
         "MetricName": "cpu_cstate_c6"
     }
diff --git a/SPR/metrics/perf/sapphirerapidshbm_metrics_perf.json b/SPR/metrics/perf/sapphirerapidshbm_metrics_perf.json
@@ -398,13 +398,13 @@
     },
     {
         "BriefDescription": "The average number of cores that are in cstate C0 as observed by the power control unit (PCU)",
-        "MetricExpr": "( UNC_P_POWER_STATE_OCCUPANCY_CORES_C0 / pcu_0@UNC_P_CLOCKTICKS@ ) * #num_packages",
+        "MetricExpr": "( UNC_P_POWER_STATE_OCCUPANCY_CORES_C0 / UNC_P_CLOCKTICKS ) * #num_packages",
         "MetricGroup": "cpu_cstate",
         "MetricName": "cpu_cstate_c0"
     },
     {
         "BriefDescription": "The average number of cores are in cstate C6 as observed by the power control unit (PCU)",
-        "MetricExpr": "( UNC_P_POWER_STATE_OCCUPANCY_CORES_C6 / pcu_0@UNC_P_CLOCKTICKS@ ) * #num_packages",
+        "MetricExpr": "( UNC_P_POWER_STATE_OCCUPANCY_CORES_C6 / UNC_P_CLOCKTICKS ) * #num_packages",
         "MetricGroup": "cpu_cstate",
         "MetricName": "cpu_cstate_c6"
     }
diff --git a/SPR/metrics/sapphirerapids_metrics.json b/SPR/metrics/sapphirerapids_metrics.json
@@ -1334,7 +1334,7 @@
           "Alias": "socket_count"
         }
       ],
-      "Formula": "(b / a[0]) * socket_count",
+      "Formula": "(b / a) * socket_count",
       "Category": "Power",
       "ResolutionLevels": "SOCKET, SYSTEM",
       "MetricGroup": "cpu_cstate"
@@ -1361,7 +1361,7 @@
           "Alias": "socket_count"
         }
       ],
-      "Formula": "(b / a[0]) * socket_count",
+      "Formula": "(b / a) * socket_count",
       "Category": "Power",
       "ResolutionLevels": "SOCKET, SYSTEM",
       "MetricGroup": "cpu_cstate"
diff --git a/SPR/metrics/sapphirerapidshbm_metrics.json b/SPR/metrics/sapphirerapidshbm_metrics.json
@@ -1334,7 +1334,7 @@
           "Alias": "socket_count"
         }
       ],
-      "Formula": "(b / a[0]) * socket_count",
+      "Formula": "(b / a) * socket_count",
       "Category": "Power",
       "ResolutionLevels": "SOCKET, SYSTEM",
       "MetricGroup": "cpu_cstate"
@@ -1361,7 +1361,7 @@
           "Alias": "socket_count"
         }
       ],
-      "Formula": "(b / a[0]) * socket_count",
+      "Formula": "(b / a) * socket_count",
       "Category": "Power",
       "ResolutionLevels": "SOCKET, SYSTEM",
       "MetricGroup": "cpu_cstate"

Original file line number	Diff line number	Diff line change
`@@ -321,13 +321,13 @@`
`321`	`321`	`},`
`322`	`322`	`{`
`323`	`323`	`"BriefDescription": "The average number of cores that are in cstate C0 as observed by the power control unit (PCU)",`
`324`		`- "MetricExpr": "( UNC_P_POWER_STATE_OCCUPANCY_CORES_C0 / pcu_0@UNC_P_CLOCKTICKS@ ) * #num_packages",`
	`324`	`+ "MetricExpr": "( UNC_P_POWER_STATE_OCCUPANCY_CORES_C0 / UNC_P_CLOCKTICKS ) * #num_packages",`
`325`	`325`	`"MetricGroup": "cpu_cstate",`
`326`	`326`	`"MetricName": "cpu_cstate_c0"`
`327`	`327`	`},`
`328`	`328`	`{`
`329`	`329`	`"BriefDescription": "The average number of cores are in cstate C6 as observed by the power control unit (PCU)",`
`330`		`- "MetricExpr": "( UNC_P_POWER_STATE_OCCUPANCY_CORES_C6 / pcu_0@UNC_P_CLOCKTICKS@ ) * #num_packages",`
	`330`	`+ "MetricExpr": "( UNC_P_POWER_STATE_OCCUPANCY_CORES_C6 / UNC_P_CLOCKTICKS ) * #num_packages",`
`331`	`331`	`"MetricGroup": "cpu_cstate",`
`332`	`332`	`"MetricName": "cpu_cstate_c6"`
`333`	`333`	`}`
Original file line number	Diff line number	Diff line change
`@@ -398,13 +398,13 @@`
`398`	`398`	`},`
`399`	`399`	`{`
`400`	`400`	`"BriefDescription": "The average number of cores that are in cstate C0 as observed by the power control unit (PCU)",`
`401`		`- "MetricExpr": "( UNC_P_POWER_STATE_OCCUPANCY_CORES_C0 / pcu_0@UNC_P_CLOCKTICKS@ ) * #num_packages",`
	`401`	`+ "MetricExpr": "( UNC_P_POWER_STATE_OCCUPANCY_CORES_C0 / UNC_P_CLOCKTICKS ) * #num_packages",`
`402`	`402`	`"MetricGroup": "cpu_cstate",`
`403`	`403`	`"MetricName": "cpu_cstate_c0"`
`404`	`404`	`},`
`405`	`405`	`{`
`406`	`406`	`"BriefDescription": "The average number of cores are in cstate C6 as observed by the power control unit (PCU)",`
`407`		`- "MetricExpr": "( UNC_P_POWER_STATE_OCCUPANCY_CORES_C6 / pcu_0@UNC_P_CLOCKTICKS@ ) * #num_packages",`
	`407`	`+ "MetricExpr": "( UNC_P_POWER_STATE_OCCUPANCY_CORES_C6 / @UNC_P_CLOCKTICKS ) * #num_packages",`
`408`	`408`	`"MetricGroup": "cpu_cstate",`
`409`	`409`	`"MetricName": "cpu_cstate_c6"`
`410`	`410`	`}`