diff --git a/src/omniperf_analyze/configs/gfx906/0700_wavefront-launch.yaml b/src/omniperf_analyze/configs/gfx906/0700_wavefront-launch.yaml
index 89e4ce7c14..c0592783e6 100644
--- a/src/omniperf_analyze/configs/gfx906/0700_wavefront-launch.yaml
+++ b/src/omniperf_analyze/configs/gfx906/0700_wavefront-launch.yaml
@@ -107,25 +107,25 @@ Panel Config:
             avg: AVG(((4 * SQ_WAVE_CYCLES) / $denom))
             min: MIN(((4 * SQ_WAVE_CYCLES) / $denom))
             max: MAX(((4 * SQ_WAVE_CYCLES) / $denom))
-            unit: Cycles/$normUnit
+            unit: (Cycles + $normUnit)
             tips: 
           Dependency Wait Cycles:
             avg: AVG(((4 * SQ_WAIT_ANY) / $denom))
             min: MIN(((4 * SQ_WAIT_ANY) / $denom))
             max: MAX(((4 * SQ_WAIT_ANY) / $denom))
-            unit: Cycles/$normUnit
+            unit: (Cycles + $normUnit)
             tips: 
           Issue Wait Cycles:
             avg: AVG(((4 * SQ_WAIT_INST_ANY) / $denom))
             min: MIN(((4 * SQ_WAIT_INST_ANY) / $denom))
             max: MAX(((4 * SQ_WAIT_INST_ANY) / $denom))
-            unit: Cycles/$normUnit
+            unit: (Cycles + $normUnit)
             tips: 
           Active Cycles:
             avg: AVG(((4 * SQ_ACTIVE_INST_ANY) / $denom))
             min: MIN(((4 * SQ_ACTIVE_INST_ANY) / $denom))
             max: MAX(((4 * SQ_ACTIVE_INST_ANY) / $denom))
-            unit: Cycles/$normUnit
+            unit: (Cycles + $normUnit)
             tips: 
           Wavefront Occupancy:
             avg: AVG((SQ_ACCUM_PREV_HIRES / GRBM_GUI_ACTIVE))
diff --git a/src/omniperf_analyze/configs/gfx908/0700_wavefront-launch.yaml b/src/omniperf_analyze/configs/gfx908/0700_wavefront-launch.yaml
index 89e4ce7c14..c0592783e6 100644
--- a/src/omniperf_analyze/configs/gfx908/0700_wavefront-launch.yaml
+++ b/src/omniperf_analyze/configs/gfx908/0700_wavefront-launch.yaml
@@ -107,25 +107,25 @@ Panel Config:
             avg: AVG(((4 * SQ_WAVE_CYCLES) / $denom))
             min: MIN(((4 * SQ_WAVE_CYCLES) / $denom))
             max: MAX(((4 * SQ_WAVE_CYCLES) / $denom))
-            unit: Cycles/$normUnit
+            unit: (Cycles + $normUnit)
             tips: 
           Dependency Wait Cycles:
             avg: AVG(((4 * SQ_WAIT_ANY) / $denom))
             min: MIN(((4 * SQ_WAIT_ANY) / $denom))
             max: MAX(((4 * SQ_WAIT_ANY) / $denom))
-            unit: Cycles/$normUnit
+            unit: (Cycles + $normUnit)
             tips: 
           Issue Wait Cycles:
             avg: AVG(((4 * SQ_WAIT_INST_ANY) / $denom))
             min: MIN(((4 * SQ_WAIT_INST_ANY) / $denom))
             max: MAX(((4 * SQ_WAIT_INST_ANY) / $denom))
-            unit: Cycles/$normUnit
+            unit: (Cycles + $normUnit)
             tips: 
           Active Cycles:
             avg: AVG(((4 * SQ_ACTIVE_INST_ANY) / $denom))
             min: MIN(((4 * SQ_ACTIVE_INST_ANY) / $denom))
             max: MAX(((4 * SQ_ACTIVE_INST_ANY) / $denom))
-            unit: Cycles/$normUnit
+            unit: (Cycles + $normUnit)
             tips: 
           Wavefront Occupancy:
             avg: AVG((SQ_ACCUM_PREV_HIRES / GRBM_GUI_ACTIVE))
diff --git a/src/omniperf_analyze/configs/gfx90a/0700_wavefront-launch.yaml b/src/omniperf_analyze/configs/gfx90a/0700_wavefront-launch.yaml
index b5a86adeed..fa53bbff74 100644
--- a/src/omniperf_analyze/configs/gfx90a/0700_wavefront-launch.yaml
+++ b/src/omniperf_analyze/configs/gfx90a/0700_wavefront-launch.yaml
@@ -107,25 +107,25 @@ Panel Config:
             avg: AVG(((4 * SQ_WAVE_CYCLES) / $denom))
             min: MIN(((4 * SQ_WAVE_CYCLES) / $denom))
             max: MAX(((4 * SQ_WAVE_CYCLES) / $denom))
-            unit: Cycles/$normUnit
+            unit: (Cycles + $normUnit)
             tips: 
           Dependency Wait Cycles:
             avg: AVG(((4 * SQ_WAIT_ANY) / $denom))
             min: MIN(((4 * SQ_WAIT_ANY) / $denom))
             max: MAX(((4 * SQ_WAIT_ANY) / $denom))
-            unit: Cycles/$normUnit
+            unit: (Cycles + $normUnit)
             tips: 
           Issue Wait Cycles:
             avg: AVG(((4 * SQ_WAIT_INST_ANY) / $denom))
             min: MIN(((4 * SQ_WAIT_INST_ANY) / $denom))
             max: MAX(((4 * SQ_WAIT_INST_ANY) / $denom))
-            unit: Cycles/$normUnit
+            unit: (Cycles + $normUnit)
             tips: 
           Active Cycles:
             avg: AVG(((4 * SQ_ACTIVE_INST_ANY) / $denom))
             min: MIN(((4 * SQ_ACTIVE_INST_ANY) / $denom))
             max: MAX(((4 * SQ_ACTIVE_INST_ANY) / $denom))
-            unit: Cycles/$normUnit
+            unit: (Cycles + $normUnit)
             tips: 
           Wavefront Occupancy:
             avg: AVG((SQ_ACCUM_PREV_HIRES / GRBM_GUI_ACTIVE))