diff --git a/src/intel/perf/oa-ehl.xml b/src/intel/perf/oa-ehl.xml
index b08437f0c77..d32e04492fc 100644
--- a/src/intel/perf/oa-ehl.xml
+++ b/src/intel/perf/oa-ehl.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<metrics version="1609843132" merge_md5="">
+<metrics version="1609843424" merge_md5="">
   <set name="Render Metrics Basic Gen11"
        chipset="EHL"
        symbol_name="RenderBasic"
@@ -652,7 +652,7 @@
        symbol_name="ComputeBasic"
        underscore_name="compute_basic"
        mdapi_supported_apis="VK OGL OCL IO BB"
-       hw_config_guid="54449e8a-196b-4c43-8ecd-540b0504b5c1"
+       hw_config_guid="ae4d01a9-fe55-453c-8c7a-036acd5eacff"
        >
     <counter name="GPU Time Elapsed"
              symbol_name="GpuTime"
@@ -1320,6 +1320,7 @@
         <register type="FLEX" address="0x0000E558" value="0x00000003" />
         <register type="FLEX" address="0x0000E658" value="0x00002001" />
         <register type="FLEX" address="0x0000E758" value="0x00000008" />
+        <register type="FLEX" address="0x0000E65C" value="0xFFFFFFFF" />
     </register_config>
   </set>
 
diff --git a/src/intel/perf/oa-icl.xml b/src/intel/perf/oa-icl.xml
index 2bfccd6005d..7fd0713d0ad 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="1609843132" merge_md5="">
+<metrics version="1609843424" merge_md5="">
   <set name="Render Metrics Basic Gen11"
        chipset="ICL"
        symbol_name="RenderBasic"
@@ -653,7 +653,7 @@
        symbol_name="ComputeBasic"
        underscore_name="compute_basic"
        mdapi_supported_apis="VK OGL OCL IO BB"
-       hw_config_guid="12ca7e9c-55cb-45cd-9f87-4fc821488e6d"
+       hw_config_guid="04546170-d541-4804-96f8-007a454a3f2c"
        >
     <counter name="GPU Time Elapsed"
              symbol_name="GpuTime"
@@ -1319,11 +1319,11 @@
         <register type="OA" address="0x00002724" value="0x00800000" />
     </register_config>
     <register_config type="FLEX">
-        <register type="FLEX" address="0x0000E65C" value="0xFFFFFFFF" />
         <register type="FLEX" address="0x0000E458" value="0x00005004" />
         <register type="FLEX" address="0x0000E558" value="0x00000003" />
         <register type="FLEX" address="0x0000E658" value="0x00002001" />
         <register type="FLEX" address="0x0000E758" value="0x00000008" />
+        <register type="FLEX" address="0x0000E65C" value="0xFFFFFFFF" />
     </register_config>
   </set>