From f0b472b3016c9625e1324fc7f70fc875e5926e00 Mon Sep 17 00:00:00 2001
From: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Date: Sun, 31 Mar 2019 10:41:17 +0100
Subject: [PATCH] i965: perf: update render basic configs for big core
 gen9/gen10

This updates allows an MI_LRI to trigger a OA report write in the
global OA buffer. This isn't really useful for us, we just keep close
to the internal public configs.

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Acked-by: Kenneth Graunke <kenneth@whitecape.org>
---
 src/mesa/drivers/dri/i965/brw_oa_cflgt2.xml | 6 +++---
 src/mesa/drivers/dri/i965/brw_oa_cflgt3.xml | 6 +++---
 src/mesa/drivers/dri/i965/brw_oa_cnl.xml    | 5 +++--
 src/mesa/drivers/dri/i965/brw_oa_kblgt2.xml | 6 +++---
 src/mesa/drivers/dri/i965/brw_oa_kblgt3.xml | 6 +++---
 src/mesa/drivers/dri/i965/brw_oa_sklgt2.xml | 6 +++---
 src/mesa/drivers/dri/i965/brw_oa_sklgt3.xml | 6 +++---
 src/mesa/drivers/dri/i965/brw_oa_sklgt4.xml | 6 +++---
 8 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_oa_cflgt2.xml b/src/mesa/drivers/dri/i965/brw_oa_cflgt2.xml
index f098a4488c9..b167c11fc75 100644
--- a/src/mesa/drivers/dri/i965/brw_oa_cflgt2.xml
+++ b/src/mesa/drivers/dri/i965/brw_oa_cflgt2.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
-<metrics version="1553958552" merge_md5="">
+<metrics version="1553959549" merge_md5="">
   <set name="Render Metrics Basic Gen9"
        mdapi_supported_apis="OGL OCL IO BB"
        underscore_name="render_basic"
-       hw_config_guid="2bceea0d-babc-48ba-9289-0d6997c93083"
+       hw_config_guid="7fa796a4-0c7a-4201-afc6-cff0b2f528a2"
        chipset="CFLGT2"
        symbol_name="RenderBasic"
        >
@@ -808,7 +808,7 @@
         <register type="FLEX" address="0x0000E758" value="0x00015014" />
         <register type="FLEX" address="0x0000E45C" value="0x00051050" />
         <register type="FLEX" address="0x0000E55C" value="0x00053052" />
-        <register type="FLEX" address="0x0000E65C" value="0x00055054" />
+        <register type="FLEX" address="0x0000E65C" value="0x00222222" />
     </register_config>
   </set>
 
diff --git a/src/mesa/drivers/dri/i965/brw_oa_cflgt3.xml b/src/mesa/drivers/dri/i965/brw_oa_cflgt3.xml
index 986668f672a..f8b878977f9 100644
--- a/src/mesa/drivers/dri/i965/brw_oa_cflgt3.xml
+++ b/src/mesa/drivers/dri/i965/brw_oa_cflgt3.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
-<metrics version="1522878594" merge_md5="">
+<metrics version="1553959550" merge_md5="">
   <set name="Render Metrics Basic Gen9"
        mdapi_supported_apis="OGL OCL IO BB"
        underscore_name="render_basic"
-       hw_config_guid="80b55814-32e9-4988-95fd-77aded3ac0fe"
+       hw_config_guid="b316bcab-212f-4228-97de-af6b5a1a2ea1"
        chipset="CFLGT3"
        symbol_name="RenderBasic"
        >
@@ -821,7 +821,7 @@
         <register type="FLEX" address="0x0000E758" value="0x00015014" />
         <register type="FLEX" address="0x0000E45C" value="0x00051050" />
         <register type="FLEX" address="0x0000E55C" value="0x00053052" />
-        <register type="FLEX" address="0x0000E65C" value="0x00055054" />
+        <register type="FLEX" address="0x0000E65C" value="0x00222222" />
     </register_config>
   </set>
 
diff --git a/src/mesa/drivers/dri/i965/brw_oa_cnl.xml b/src/mesa/drivers/dri/i965/brw_oa_cnl.xml
index 3a2f8bc250b..182d6c4aa65 100644
--- a/src/mesa/drivers/dri/i965/brw_oa_cnl.xml
+++ b/src/mesa/drivers/dri/i965/brw_oa_cnl.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
-<metrics version="1508419706" merge_md5="">
+<metrics version="1553959724" merge_md5="">
   <set name="Render Metrics Basic Gen10"
        mdapi_supported_apis="OGL OCL IO BB"
        underscore_name="render_basic"
-       hw_config_guid="ee9f2b17-a8b3-44c3-bf0c-2608b9665e23"
+       hw_config_guid="2d975e19-7130-41d2-b06f-79d74f91e7c8"
        chipset="CNL"
        symbol_name="RenderBasic"
        >
@@ -825,6 +825,7 @@
         <register type="FLEX" address="0x0000E658" value="0x00012011" />
         <register type="FLEX" address="0x0000E45C" value="0x00051050" />
         <register type="FLEX" address="0x0000E55C" value="0x00053052" />
+        <register type="FLEX" address="0x0000E65C" value="0x00222222" />
     </register_config>
   </set>
 
diff --git a/src/mesa/drivers/dri/i965/brw_oa_kblgt2.xml b/src/mesa/drivers/dri/i965/brw_oa_kblgt2.xml
index c9150c8dcbe..c6f66c504cc 100644
--- a/src/mesa/drivers/dri/i965/brw_oa_kblgt2.xml
+++ b/src/mesa/drivers/dri/i965/brw_oa_kblgt2.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
-<metrics version="1522878593" merge_md5="">
+<metrics version="1553959549" merge_md5="">
   <set name="Render Metrics Basic Gen9"
        mdapi_supported_apis="OGL OCL IO BB"
        underscore_name="render_basic"
-       hw_config_guid="f8d677e9-ff6f-4df1-9310-0334c6efacce"
+       hw_config_guid="99c1a40e-a090-4354-86e3-4d068bb1917e"
        chipset="KBLGT2"
        symbol_name="RenderBasic"
        >
@@ -808,7 +808,7 @@
         <register type="FLEX" address="0x0000E758" value="0x00015014" />
         <register type="FLEX" address="0x0000E45C" value="0x00051050" />
         <register type="FLEX" address="0x0000E55C" value="0x00053052" />
-        <register type="FLEX" address="0x0000E65C" value="0x00055054" />
+        <register type="FLEX" address="0x0000E65C" value="0x00222222" />
     </register_config>
   </set>
 
diff --git a/src/mesa/drivers/dri/i965/brw_oa_kblgt3.xml b/src/mesa/drivers/dri/i965/brw_oa_kblgt3.xml
index 20911267138..0d90451a2e7 100644
--- a/src/mesa/drivers/dri/i965/brw_oa_kblgt3.xml
+++ b/src/mesa/drivers/dri/i965/brw_oa_kblgt3.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
-<metrics version="1522878593" merge_md5="">
+<metrics version="1553959549" merge_md5="">
   <set name="Render Metrics Basic Gen9"
        mdapi_supported_apis="OGL OCL IO BB"
        underscore_name="render_basic"
-       hw_config_guid="0286c920-2f6d-493b-b22d-7a5280df43de"
+       hw_config_guid="17b4f3e0-d578-4ae3-b7a8-98d756d1e0df"
        chipset="KBLGT3"
        symbol_name="RenderBasic"
        >
@@ -821,7 +821,7 @@
         <register type="FLEX" address="0x0000E758" value="0x00015014" />
         <register type="FLEX" address="0x0000E45C" value="0x00051050" />
         <register type="FLEX" address="0x0000E55C" value="0x00053052" />
-        <register type="FLEX" address="0x0000E65C" value="0x00055054" />
+        <register type="FLEX" address="0x0000E65C" value="0x00222222" />
     </register_config>
   </set>
 
diff --git a/src/mesa/drivers/dri/i965/brw_oa_sklgt2.xml b/src/mesa/drivers/dri/i965/brw_oa_sklgt2.xml
index 68349919037..4fe6f877e4c 100644
--- a/src/mesa/drivers/dri/i965/brw_oa_sklgt2.xml
+++ b/src/mesa/drivers/dri/i965/brw_oa_sklgt2.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
-<metrics version="1525362003" merge_md5="">
+<metrics version="1553959547" merge_md5="">
   <set name="Render Metrics Basic Gen9"
        mdapi_supported_apis="OGL OCL IO BB"
        underscore_name="render_basic"
-       hw_config_guid="f519e481-24d2-4d42-87c9-3fdd12c00202"
+       hw_config_guid="07b25942-d9fd-4fce-bd58-e29abd66b7de"
        chipset="SKLGT2"
        symbol_name="RenderBasic"
        >
@@ -811,7 +811,7 @@
         <register type="FLEX" address="0x0000E758" value="0x00015014" />
         <register type="FLEX" address="0x0000E45C" value="0x00051050" />
         <register type="FLEX" address="0x0000E55C" value="0x00053052" />
-        <register type="FLEX" address="0x0000E65C" value="0x00055054" />
+        <register type="FLEX" address="0x0000E65C" value="0x00222222" />
     </register_config>
   </set>
 
diff --git a/src/mesa/drivers/dri/i965/brw_oa_sklgt3.xml b/src/mesa/drivers/dri/i965/brw_oa_sklgt3.xml
index 571248cb243..7fc5e8da02b 100644
--- a/src/mesa/drivers/dri/i965/brw_oa_sklgt3.xml
+++ b/src/mesa/drivers/dri/i965/brw_oa_sklgt3.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
-<metrics version="1522878593" merge_md5="">
+<metrics version="1553959548" merge_md5="">
   <set name="Render Metrics Basic Gen9"
        mdapi_supported_apis="OGL OCL IO BB"
        underscore_name="render_basic"
-       hw_config_guid="4616d450-2393-4836-8146-53c5ed84d359"
+       hw_config_guid="21fef15a-83f4-4ffa-bb81-7da6e38b8e4b"
        chipset="SKLGT3"
        symbol_name="RenderBasic"
        >
@@ -821,7 +821,7 @@
         <register type="FLEX" address="0x0000E758" value="0x00015014" />
         <register type="FLEX" address="0x0000E45C" value="0x00051050" />
         <register type="FLEX" address="0x0000E55C" value="0x00053052" />
-        <register type="FLEX" address="0x0000E65C" value="0x00055054" />
+        <register type="FLEX" address="0x0000E65C" value="0x00222222" />
     </register_config>
   </set>
 
diff --git a/src/mesa/drivers/dri/i965/brw_oa_sklgt4.xml b/src/mesa/drivers/dri/i965/brw_oa_sklgt4.xml
index ea50d993a27..30a1d172996 100644
--- a/src/mesa/drivers/dri/i965/brw_oa_sklgt4.xml
+++ b/src/mesa/drivers/dri/i965/brw_oa_sklgt4.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
-<metrics version="1522878593" merge_md5="">
+<metrics version="1553959548" merge_md5="">
   <set name="Render Metrics Basic Gen9"
        mdapi_supported_apis="OGL OCL IO BB"
        underscore_name="render_basic"
-       hw_config_guid="bad77c24-cc64-480d-99bf-e7b740713800"
+       hw_config_guid="95322a71-bb05-4437-bc27-f7dd7b27d136"
        chipset="SKLGT4"
        symbol_name="RenderBasic"
        >
@@ -815,7 +815,7 @@
         <register type="FLEX" address="0x0000E758" value="0x00015014" />
         <register type="FLEX" address="0x0000E45C" value="0x00051050" />
         <register type="FLEX" address="0x0000E55C" value="0x00053052" />
-        <register type="FLEX" address="0x0000E65C" value="0x00055054" />
+        <register type="FLEX" address="0x0000E65C" value="0x00222222" />
     </register_config>
   </set>