diff --git a/src/intel/perf/oa-icl.xml b/src/intel/perf/oa-icl.xml
index 4a6e7132305..eac32092485 100644
--- a/src/intel/perf/oa-icl.xml
+++ b/src/intel/perf/oa-icl.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<metrics version="1582124705" merge_md5="">
+<metrics version="1598349212" merge_md5="">
   <set name="Render Metrics Basic Gen11"
        chipset="ICL"
        symbol_name="RenderBasic"
@@ -815,20 +815,6 @@
              mdapi_supported_apis=""
              mdapi_hw_unit_type="gpu"
              />
-    <counter name="EU AVG IPC Rate"
-             symbol_name="EuAvgIpcRate"
-             underscore_name="eu_avg_ipc_rate"
-             description="The average rate of IPC calculated for 2 FPU pipelines."
-             data_type="float"
-             max_equation="2"
-             units="number"
-             semantic_type="ratio"
-             equation="A 9 READ A 10 READ A 11 READ FADD A 9 READ FSUB FDIV 1 FADD"
-             mdapi_group="EU Array"
-             mdapi_usage_flags="Tier4 Overview System Frame Batch Draw"
-             mdapi_supported_apis=""
-             mdapi_hw_unit_type="gpu"
-             />
     <counter name="EU Both FPU Pipes Active"
              symbol_name="EuFpuBothActive"
              underscore_name="eu_fpu_both_active"
@@ -871,6 +857,20 @@
              mdapi_supported_apis=""
              mdapi_hw_unit_type="gpu"
              />
+    <counter name="EU AVG IPC Rate"
+             symbol_name="EuAvgIpcRate"
+             underscore_name="eu_avg_ipc_rate"
+             description="The average rate of IPC calculated for 2 FPU pipelines."
+             data_type="float"
+             max_equation="2"
+             units="number"
+             semantic_type="ratio"
+             equation="A 9 READ  A 10 READ  A 11 READ FADD  A 9 READ FSUB FDIV 1 FADD"
+             mdapi_group="EU Array"
+             mdapi_usage_flags="Tier4 Overview System Frame Batch Draw"
+             mdapi_supported_apis=""
+             mdapi_hw_unit_type="gpu"
+             />
     <counter name="EU Send Pipe Active"
              symbol_name="EuSendActive"
              underscore_name="eu_send_active"
@@ -9071,7 +9071,7 @@
              data_type="uint64"
              units="cycles"
              semantic_type="event"
-             equation="A 13 READ A 1 READ UDIV"
+             equation="A 13 READ $VsThreads UDIV"
              mdapi_group="EU Array/Vertex Shader"
              mdapi_usage_flags="Tier4 Frame Batch Draw"
              mdapi_supported_apis=""
@@ -9098,7 +9098,7 @@
              data_type="uint64"
              units="cycles"
              semantic_type="event"
-             equation="A 14 READ A 1 READ UDIV"
+             equation="A 14 READ $VsThreads UDIV"
              mdapi_group="EU Array/Vertex Shader"
              mdapi_usage_flags="Tier4 Frame Batch Draw"
              mdapi_supported_apis=""
@@ -9181,7 +9181,7 @@
              data_type="uint64"
              units="cycles"
              semantic_type="event"
-             equation="A 19 READ A 6 READ UDIV"
+             equation="A 19 READ $PsThreads UDIV"
              mdapi_group="EU Array/Fragment Shader"
              mdapi_usage_flags="Tier4 Frame Batch Draw"
              mdapi_supported_apis=""
@@ -9208,7 +9208,7 @@
              data_type="uint64"
              units="cycles"
              semantic_type="event"
-             equation="A 20 READ A 6 READ UDIV"
+             equation="A 20 READ $PsThreads UDIV"
              mdapi_group="EU Array/Fragment Shader"
              mdapi_usage_flags="Tier4 Frame Batch Draw"
              mdapi_supported_apis=""