diff --git a/src/intel/perf/oa-cflgt2.xml b/src/intel/perf/oa-cflgt2.xml
index d568b91d0f8..020eeb5f34e 100644
--- a/src/intel/perf/oa-cflgt2.xml
+++ b/src/intel/perf/oa-cflgt2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<metrics version="1599482527" merge_md5="">
+<metrics version="1609841995" merge_md5="">
   <set name="Render Metrics Basic Gen9"
        chipset="CFLGT2"
        symbol_name="RenderBasic"
@@ -10562,7 +10562,7 @@
        symbol_name="TestOa"
        underscore_name="test_oa"
        mdapi_supported_apis="VK OGL OCL IO BB"
-       hw_config_guid="74fb4902-d3d3-4237-9e90-cbdc68d0a446"
+       hw_config_guid="d3c99326-e161-4e44-9745-7772bdc579c5"
        >
     <counter name="GPU Time Elapsed"
              symbol_name="GpuTime"
@@ -10760,6 +10760,9 @@
         <register type="OA" address="0x000027A8" value="0x00100001" />
         <register type="OA" address="0x000027AC" value="0x0000FFE7" />
     </register_config>
+    <register_config type="FLEX">
+        <register type="FLEX" address="0x0000E65C" value="0x00222222" />
+    </register_config>
   </set>
 
   <set name="Metric set PMA Stall"
diff --git a/src/intel/perf/oa-cflgt3.xml b/src/intel/perf/oa-cflgt3.xml
index 9ac9156a3f4..bcf5ad71972 100644
--- a/src/intel/perf/oa-cflgt3.xml
+++ b/src/intel/perf/oa-cflgt3.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<metrics version="1599482527" merge_md5="">
+<metrics version="1609842035" merge_md5="">
   <set name="Render Metrics Basic Gen9"
        chipset="CFLGT3"
        symbol_name="RenderBasic"
@@ -10629,7 +10629,7 @@
        symbol_name="TestOa"
        underscore_name="test_oa"
        mdapi_supported_apis="VK OGL OCL IO BB"
-       hw_config_guid="577e8e2c-3fa0-4875-8743-3538d585e3b0"
+       hw_config_guid="f240ef8d-4a2e-4961-a63c-cc43b01ed923"
        >
     <counter name="GPU Time Elapsed"
              symbol_name="GpuTime"
@@ -10827,6 +10827,9 @@
         <register type="OA" address="0x000027A8" value="0x00100001" />
         <register type="OA" address="0x000027AC" value="0x0000FFE7" />
     </register_config>
+    <register_config type="FLEX">
+        <register type="FLEX" address="0x0000E65C" value="0x00222222" />
+    </register_config>
   </set>
 
   <set name="Metric set PMA Stall"
diff --git a/src/intel/perf/oa-ehl.xml b/src/intel/perf/oa-ehl.xml
index 96e5ca9fb3e..a4ddcd0dd59 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="1582124706" merge_md5="">
+<metrics version="1609842445" merge_md5="">
   <set name="Render Metrics Basic Gen11"
        chipset="EHL"
        symbol_name="RenderBasic"
@@ -11585,7 +11585,7 @@
        symbol_name="TestOa"
        underscore_name="test_oa"
        mdapi_supported_apis="VK OGL OCL IO BB"
-       hw_config_guid="9dace73d-0364-45bc-9a22-f27c2acda706"
+       hw_config_guid="4cbcfaf7-3c0c-42b8-a324-b1e58329c732"
        >
     <counter name="GPU Time Elapsed"
              symbol_name="GpuTime"
@@ -11783,6 +11783,9 @@
         <register type="OA" address="0x000027A8" value="0x00100001" />
         <register type="OA" address="0x000027AC" value="0x0000FFE7" />
     </register_config>
+    <register_config type="FLEX">
+        <register type="FLEX" address="0x0000E65C" value="0xFFFFFFFF" />
+    </register_config>
   </set>
 
 </metrics>
diff --git a/src/intel/perf/oa-icl.xml b/src/intel/perf/oa-icl.xml
index cbcd647db38..bc299de49ea 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="1598356969" merge_md5="">
+<metrics version="1609842547" merge_md5="">
   <set name="Render Metrics Basic Gen11"
        chipset="ICL"
        symbol_name="RenderBasic"
@@ -11668,7 +11668,7 @@
        symbol_name="TestOa"
        underscore_name="test_oa"
        mdapi_supported_apis="VK OGL OCL IO BB"
-       hw_config_guid="3c0bf614-5d67-4326-887f-a24eb8a58244"
+       hw_config_guid="e617cfd5-6cc5-4143-8994-cd36cebb921f"
        >
     <counter name="GPU Time Elapsed"
              symbol_name="GpuTime"
@@ -11864,6 +11864,9 @@
         <register type="OA" address="0x000027A8" value="0x00100001" />
         <register type="OA" address="0x000027AC" value="0x0000FFE7" />
     </register_config>
+    <register_config type="FLEX">
+        <register type="FLEX" address="0x0000E65C" value="0xFFFFFFFF" />
+    </register_config>
   </set>
 
   <set name="AsyncCompute"
diff --git a/src/intel/perf/oa-kblgt2.xml b/src/intel/perf/oa-kblgt2.xml
index 6137be6cde3..619cda923bd 100644
--- a/src/intel/perf/oa-kblgt2.xml
+++ b/src/intel/perf/oa-kblgt2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<metrics version="1599482527" merge_md5="">
+<metrics version="1609842130" merge_md5="">
   <set name="Render Metrics Basic Gen9"
        chipset="KBLGT2"
        symbol_name="RenderBasic"
@@ -10562,7 +10562,7 @@
        symbol_name="TestOa"
        underscore_name="test_oa"
        mdapi_supported_apis="VK OGL OCL IO BB"
-       hw_config_guid="baa3c7e4-52b6-4b85-801e-465a94b746dd"
+       hw_config_guid="cd4b577b-073a-423f-a948-e198dd818c71"
        >
     <counter name="GPU Time Elapsed"
              symbol_name="GpuTime"
@@ -10760,6 +10760,9 @@
         <register type="OA" address="0x000027A8" value="0x00100001" />
         <register type="OA" address="0x000027AC" value="0x0000FFE7" />
     </register_config>
+    <register_config type="FLEX">
+        <register type="FLEX" address="0x0000E65C" value="0x00222222" />
+    </register_config>
   </set>
 
   <set name="Metric set PMA Stall"
diff --git a/src/intel/perf/oa-kblgt3.xml b/src/intel/perf/oa-kblgt3.xml
index 117a2889fd9..64a54e96872 100644
--- a/src/intel/perf/oa-kblgt3.xml
+++ b/src/intel/perf/oa-kblgt3.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<metrics version="1599482527" merge_md5="">
+<metrics version="1609842140" merge_md5="">
   <set name="Render Metrics Basic Gen9"
        chipset="KBLGT3"
        symbol_name="RenderBasic"
@@ -10629,7 +10629,7 @@
        symbol_name="TestOa"
        underscore_name="test_oa"
        mdapi_supported_apis="VK OGL OCL IO BB"
-       hw_config_guid="f1792f32-6db2-4b50-b4b2-557128f1688d"
+       hw_config_guid="bb3344bf-2551-40f7-b75f-cbf29e4195f7"
        >
     <counter name="GPU Time Elapsed"
              symbol_name="GpuTime"
@@ -10827,6 +10827,9 @@
         <register type="OA" address="0x000027A8" value="0x00100001" />
         <register type="OA" address="0x000027AC" value="0x0000FFE7" />
     </register_config>
+    <register_config type="FLEX">
+        <register type="FLEX" address="0x0000E65C" value="0x00222222" />
+    </register_config>
   </set>
 
   <set name="Metric set PMA Stall"
diff --git a/src/intel/perf/oa-sklgt2.xml b/src/intel/perf/oa-sklgt2.xml
index f1125bd2acd..12e01180d59 100644
--- a/src/intel/perf/oa-sklgt2.xml
+++ b/src/intel/perf/oa-sklgt2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<metrics version="1599482527" merge_md5="">
+<metrics version="1609842167" merge_md5="">
   <set name="Render Metrics Basic Gen9"
        chipset="SKLGT2"
        symbol_name="RenderBasic"
@@ -11592,7 +11592,7 @@
        symbol_name="TestOa"
        underscore_name="test_oa"
        mdapi_supported_apis="VK OGL OCL IO BB"
-       hw_config_guid="1651949f-0ac0-4cb1-a06f-dafd74a407d1"
+       hw_config_guid="c5384091-ce4c-406c-ab4d-4c530f71c7ae"
        >
     <counter name="GPU Time Elapsed"
              symbol_name="GpuTime"
@@ -11789,6 +11789,9 @@
         <register type="OA" address="0x000027A8" value="0x00100001" />
         <register type="OA" address="0x000027AC" value="0x0000FFE7" />
     </register_config>
+    <register_config type="FLEX">
+        <register type="FLEX" address="0x0000E65C" value="0x00222222" />
+    </register_config>
   </set>
 
   <set name="Metric set PMA Stall"
diff --git a/src/intel/perf/oa-sklgt3.xml b/src/intel/perf/oa-sklgt3.xml
index 0870791f742..2e32bc7d828 100644
--- a/src/intel/perf/oa-sklgt3.xml
+++ b/src/intel/perf/oa-sklgt3.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<metrics version="1599482527" merge_md5="">
+<metrics version="1609842186" merge_md5="">
   <set name="Render Metrics Basic Gen9"
        chipset="SKLGT3"
        symbol_name="RenderBasic"
@@ -10629,7 +10629,7 @@
        symbol_name="TestOa"
        underscore_name="test_oa"
        mdapi_supported_apis="VK OGL OCL IO BB"
-       hw_config_guid="2b985803-d3c9-4629-8a4f-634bfecba0e8"
+       hw_config_guid="14cadcfd-fb3a-46a3-8c13-0a4f850a4b18"
        >
     <counter name="GPU Time Elapsed"
              symbol_name="GpuTime"
@@ -10827,6 +10827,9 @@
         <register type="OA" address="0x000027A8" value="0x00100001" />
         <register type="OA" address="0x000027AC" value="0x0000FFE7" />
     </register_config>
+    <register_config type="FLEX">
+        <register type="FLEX" address="0x0000E65C" value="0x00222222" />
+    </register_config>
   </set>
 
   <set name="Metric set PMA Stall"
diff --git a/src/intel/perf/oa-sklgt4.xml b/src/intel/perf/oa-sklgt4.xml
index 4e223a861d6..570919df72c 100644
--- a/src/intel/perf/oa-sklgt4.xml
+++ b/src/intel/perf/oa-sklgt4.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<metrics version="1599482527" merge_md5="">
+<metrics version="1609842208" merge_md5="">
   <set name="Render Metrics Basic Gen9"
        chipset="SKLGT4"
        symbol_name="RenderBasic"
@@ -10652,7 +10652,7 @@
        symbol_name="TestOa"
        underscore_name="test_oa"
        mdapi_supported_apis="VK OGL OCL IO BB"
-       hw_config_guid="882fa433-1f4a-4a67-a962-c741888fe5f5"
+       hw_config_guid="c1c2d40e-652a-482c-98fc-28bdb7c6ee44"
        >
     <counter name="GPU Time Elapsed"
              symbol_name="GpuTime"
@@ -10850,6 +10850,9 @@
         <register type="OA" address="0x000027A8" value="0x00100001" />
         <register type="OA" address="0x000027AC" value="0x0000FFE7" />
     </register_config>
+    <register_config type="FLEX">
+        <register type="FLEX" address="0x0000E65C" value="0x00222222" />
+    </register_config>
   </set>
 
   <set name="Metric set PMA Stall"