From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Sat, 15 Oct 2016 05:55:21 +0000 (-0700)
Subject: intel/genxml; Make "Use Global GTT a boolean
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=468e1042cb76ded17efdd3529caae5dd450d9790;p=mesa.git

intel/genxml; Make "Use Global GTT a boolean

We also remove the redundant zero defaults since everything without an
explicit default gets zeroed automatically.

Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
---

diff --git a/src/intel/genxml/gen6.xml b/src/intel/genxml/gen6.xml
index b7bbd802892..57e6d45e9b2 100644
--- a/src/intel/genxml/gen6.xml
+++ b/src/intel/genxml/gen6.xml
@@ -1695,10 +1695,7 @@
   <instruction name="MI_CLFLUSH" bias="2">
     <field name="Command Type" start="29" end="31" type="uint" default="0"/>
     <field name="MI Command Opcode" start="23" end="28" type="uint" default="39"/>
-    <field name="Use Global GTT" start="22" end="22" type="uint">
-      <value name="Per Process Graphics Address" value="0"/>
-      <value name="Global Graphics Address" value="1"/>
-    </field>
+    <field name="Use Global GTT" start="22" end="22" type="bool"/>
     <field name="DWord Length" start="0" end="5" type="uint" default="0"/>
     <field name="Page Base Address" start="44" end="63" type="address"/>
     <field name="Starting Cacheline Offset" start="38" end="43" type="uint"/>
@@ -1710,7 +1707,7 @@
   <instruction name="MI_CONDITIONAL_BATCH_BUFFER_END" bias="2" length="2">
     <field name="Command Type" start="29" end="31" type="uint" default="0"/>
     <field name="MI Command Opcode" start="23" end="28" type="uint" default="54"/>
-    <field name="Use Global GTT" start="22" end="22" type="uint" default="0"/>
+    <field name="Use Global GTT" start="22" end="22" type="bool"/>
     <field name="Compare Semaphore" start="21" end="21" type="uint" default="0"/>
     <field name="DWord Length" start="0" end="7" type="uint" default="0"/>
     <field name="Compare Data Dword" start="32" end="63" type="uint"/>
@@ -1798,7 +1795,7 @@
   <instruction name="MI_STORE_DATA_IMM" bias="2" length="4">
     <field name="Command Type" start="29" end="31" type="uint" default="0"/>
     <field name="MI Command Opcode" start="23" end="28" type="uint" default="32"/>
-    <field name="Use Global GTT" start="22" end="22" type="uint"/>
+    <field name="Use Global GTT" start="22" end="22" type="bool"/>
     <field name="DWord Length" start="0" end="5" type="uint" default="2"/>
     <field name="Address" start="66" end="95" type="uint"/>
     <field name="Core Mode Enable" start="64" end="64" type="uint"/>
@@ -1818,7 +1815,7 @@
   <instruction name="MI_STORE_REGISTER_MEM" bias="2" length="3">
     <field name="Command Type" start="29" end="31" type="uint" default="0"/>
     <field name="MI Command Opcode" start="23" end="28" type="uint" default="36"/>
-    <field name="Use Global GTT" start="22" end="22" type="uint"/>
+    <field name="Use Global GTT" start="22" end="22" type="bool"/>
     <field name="DWord Length" start="0" end="7" type="uint" default="1"/>
     <field name="Register Address" start="34" end="54" type="offset"/>
     <field name="Memory Address" start="66" end="95" type="address"/>
diff --git a/src/intel/genxml/gen7.xml b/src/intel/genxml/gen7.xml
index a4a96e2ad2c..0105b42a38e 100644
--- a/src/intel/genxml/gen7.xml
+++ b/src/intel/genxml/gen7.xml
@@ -2200,10 +2200,7 @@
   <instruction name="MI_CLFLUSH" bias="2">
     <field name="Command Type" start="29" end="31" type="uint" default="0"/>
     <field name="MI Command Opcode" start="23" end="28" type="uint" default="39"/>
-    <field name="Use Global GTT" start="22" end="22" type="uint">
-      <value name="Per Process Graphics Address" value="0"/>
-      <value name="Global Graphics Address" value="1"/>
-    </field>
+    <field name="Use Global GTT" start="22" end="22" type="bool"/>
     <field name="DWord Length" start="0" end="9" type="uint" default="1"/>
     <field name="Page Base Address" start="44" end="63" type="address"/>
     <field name="Starting Cacheline Offset" start="38" end="43" type="uint"/>
@@ -2216,7 +2213,7 @@
   <instruction name="MI_CONDITIONAL_BATCH_BUFFER_END" bias="2" length="2">
     <field name="Command Type" start="29" end="31" type="uint" default="0"/>
     <field name="MI Command Opcode" start="23" end="28" type="uint" default="54"/>
-    <field name="Use Global GTT" start="22" end="22" type="uint" default="0"/>
+    <field name="Use Global GTT" start="22" end="22" type="bool"/>
     <field name="Compare Semaphore" start="21" end="21" type="uint" default="0"/>
     <field name="DWord Length" start="0" end="7" type="uint" default="0"/>
     <field name="Compare Data Dword" start="32" end="63" type="uint"/>
@@ -2254,7 +2251,7 @@
   <instruction name="MI_LOAD_REGISTER_MEM" bias="2" length="3">
     <field name="Command Type" start="29" end="31" type="uint" default="0"/>
     <field name="MI Command Opcode" start="23" end="28" type="uint" default="41"/>
-    <field name="Use Global GTT" start="22" end="22" type="uint"/>
+    <field name="Use Global GTT" start="22" end="22" type="bool"/>
     <field name="Async Mode Enable" start="21" end="21" type="bool"/>
     <field name="DWord Length" start="0" end="7" type="uint" default="1"/>
     <field name="Register Address" start="34" end="54" type="offset"/>
@@ -2298,7 +2295,7 @@
     <field name="MI Command Opcode" start="23" end="28" type="uint" default="40"/>
     <field name="DWord Length" start="0" end="5" type="uint" default="1"/>
     <field name="Memory Address" start="38" end="63" type="address"/>
-    <field name="Use Global GTT" start="32" end="32" type="uint"/>
+    <field name="Use Global GTT" start="32" end="32" type="bool"/>
     <field name="Report ID" start="64" end="95" type="uint"/>
   </instruction>
 
@@ -2329,7 +2326,7 @@
   <instruction name="MI_STORE_DATA_IMM" bias="2" length="4">
     <field name="Command Type" start="29" end="31" type="uint" default="0"/>
     <field name="MI Command Opcode" start="23" end="28" type="uint" default="32"/>
-    <field name="Use Global GTT" start="22" end="22" type="uint"/>
+    <field name="Use Global GTT" start="22" end="22" type="bool"/>
     <field name="DWord Length" start="0" end="5" type="uint" default="2"/>
     <field name="Address" start="66" end="95" type="uint"/>
     <field name="Core Mode Enable" start="64" end="64" type="uint"/>
@@ -2349,7 +2346,7 @@
   <instruction name="MI_STORE_REGISTER_MEM" bias="2" length="3">
     <field name="Command Type" start="29" end="31" type="uint" default="0"/>
     <field name="MI Command Opcode" start="23" end="28" type="uint" default="36"/>
-    <field name="Use Global GTT" start="22" end="22" type="uint"/>
+    <field name="Use Global GTT" start="22" end="22" type="bool"/>
     <field name="DWord Length" start="0" end="7" type="uint" default="1"/>
     <field name="Register Address" start="34" end="54" type="offset"/>
     <field name="Memory Address" start="66" end="95" type="address"/>
diff --git a/src/intel/genxml/gen75.xml b/src/intel/genxml/gen75.xml
index 52d0e95541c..5022d8f2f97 100644
--- a/src/intel/genxml/gen75.xml
+++ b/src/intel/genxml/gen75.xml
@@ -2493,10 +2493,7 @@
   <instruction name="MI_CLFLUSH" bias="2">
     <field name="Command Type" start="29" end="31" type="uint" default="0"/>
     <field name="MI Command Opcode" start="23" end="28" type="uint" default="39"/>
-    <field name="Use Global GTT" start="22" end="22" type="uint">
-      <value name="Per Process Graphics Address" value="0"/>
-      <value name="Global Graphics Address" value="1"/>
-    </field>
+    <field name="Use Global GTT" start="22" end="22" type="bool"/>
     <field name="DWord Length" start="0" end="9" type="uint" default="1"/>
     <field name="Page Base Address" start="44" end="63" type="address"/>
     <field name="Starting Cacheline Offset" start="38" end="43" type="uint"/>
@@ -2509,7 +2506,7 @@
   <instruction name="MI_CONDITIONAL_BATCH_BUFFER_END" bias="2" length="2">
     <field name="Command Type" start="29" end="31" type="uint" default="0"/>
     <field name="MI Command Opcode" start="23" end="28" type="uint" default="54"/>
-    <field name="Use Global GTT" start="22" end="22" type="uint" default="0"/>
+    <field name="Use Global GTT" start="22" end="22" type="bool"/>
     <field name="Compare Semaphore" start="21" end="21" type="uint" default="0"/>
     <field name="DWord Length" start="0" end="7" type="uint" default="0"/>
     <field name="Compare Data Dword" start="32" end="63" type="uint"/>
@@ -2547,7 +2544,7 @@
   <instruction name="MI_LOAD_REGISTER_MEM" bias="2" length="3">
     <field name="Command Type" start="29" end="31" type="uint" default="0"/>
     <field name="MI Command Opcode" start="23" end="28" type="uint" default="41"/>
-    <field name="Use Global GTT" start="22" end="22" type="uint"/>
+    <field name="Use Global GTT" start="22" end="22" type="bool"/>
     <field name="Async Mode Enable" start="21" end="21" type="bool"/>
     <field name="DWord Length" start="0" end="7" type="uint" default="1"/>
     <field name="Register Address" start="34" end="54" type="offset"/>
@@ -2645,7 +2642,7 @@
     <field name="DWord Length" start="0" end="5" type="uint" default="1"/>
     <field name="Memory Address" start="38" end="63" type="address"/>
     <field name="Core Mode Enable" start="36" end="36" type="uint"/>
-    <field name="Use Global GTT" start="32" end="32" type="uint"/>
+    <field name="Use Global GTT" start="32" end="32" type="bool"/>
     <field name="Report ID" start="64" end="95" type="uint"/>
   </instruction>
 
@@ -2712,7 +2709,7 @@
   <instruction name="MI_STORE_DATA_IMM" bias="2" length="4">
     <field name="Command Type" start="29" end="31" type="uint" default="0"/>
     <field name="MI Command Opcode" start="23" end="28" type="uint" default="32"/>
-    <field name="Use Global GTT" start="22" end="22" type="uint"/>
+    <field name="Use Global GTT" start="22" end="22" type="bool"/>
     <field name="DWord Length" start="0" end="5" type="uint" default="2"/>
     <field name="Address" start="66" end="95" type="uint"/>
     <field name="Core Mode Enable" start="64" end="64" type="uint"/>
@@ -2732,7 +2729,7 @@
   <instruction name="MI_STORE_REGISTER_MEM" bias="2" length="3">
     <field name="Command Type" start="29" end="31" type="uint" default="0"/>
     <field name="MI Command Opcode" start="23" end="28" type="uint" default="36"/>
-    <field name="Use Global GTT" start="22" end="22" type="uint"/>
+    <field name="Use Global GTT" start="22" end="22" type="bool"/>
     <field name="Predicate Enable" start="21" end="21" type="bool"/>
     <field name="DWord Length" start="0" end="7" type="uint" default="1"/>
     <field name="Register Address" start="34" end="54" type="offset"/>
diff --git a/src/intel/genxml/gen8.xml b/src/intel/genxml/gen8.xml
index 9258b71c498..07fe0149578 100644
--- a/src/intel/genxml/gen8.xml
+++ b/src/intel/genxml/gen8.xml
@@ -2711,10 +2711,7 @@
   <instruction name="MI_CLFLUSH" bias="2">
     <field name="Command Type" start="29" end="31" type="uint" default="0"/>
     <field name="MI Command Opcode" start="23" end="28" type="uint" default="39"/>
-    <field name="Use Global GTT" start="22" end="22" type="uint">
-      <value name="Per Process Graphics Address" value="0"/>
-      <value name="Global Graphics Address" value="1"/>
-    </field>
+    <field name="Use Global GTT" start="22" end="22" type="bool"/>
     <field name="DWord Length" start="0" end="9" type="uint" default="1"/>
     <field name="Page Base Address" start="44" end="79" type="address"/>
     <field name="Starting Cacheline Offset" start="38" end="43" type="uint"/>
@@ -2726,7 +2723,7 @@
   <instruction name="MI_CONDITIONAL_BATCH_BUFFER_END" bias="2" length="3">
     <field name="Command Type" start="29" end="31" type="uint" default="0"/>
     <field name="MI Command Opcode" start="23" end="28" type="uint" default="54"/>
-    <field name="Use Global GTT" start="22" end="22" type="uint" default="0"/>
+    <field name="Use Global GTT" start="22" end="22" type="bool"/>
     <field name="Compare Semaphore" start="21" end="21" type="uint" default="0"/>
     <field name="DWord Length" start="0" end="7" type="uint" default="1"/>
     <field name="Compare Data Dword" start="32" end="63" type="uint"/>
@@ -2736,14 +2733,8 @@
   <instruction name="MI_COPY_MEM_MEM" bias="2" length="5">
     <field name="Command Type" start="29" end="31" type="uint" default="0"/>
     <field name="MI Command Opcode" start="23" end="28" type="uint" default="46"/>
-    <field name="Use Global GTT Source" start="22" end="22" type="uint">
-      <value name="Per Process Graphics Address" value="0"/>
-      <value name="Global Graphics Address" value="1"/>
-    </field>
-    <field name="Use Global GTT Destination" start="21" end="21" type="uint">
-      <value name="Per Process Graphics Address" value="0"/>
-      <value name="Global Graphics Address" value="1"/>
-    </field>
+    <field name="Use Global GTT Source" start="22" end="22" type="bool"/>
+    <field name="Use Global GTT Destination" start="21" end="21" type="bool"/>
     <field name="DWord Length" start="0" end="7" type="uint" default="3"/>
     <field name="Destination Memory Address" start="34" end="95" type="address"/>
     <field name="Source Memory Address" start="98" end="159" type="address"/>
@@ -2761,7 +2752,7 @@
   <instruction name="MI_LOAD_REGISTER_MEM" bias="2" length="4">
     <field name="Command Type" start="29" end="31" type="uint" default="0"/>
     <field name="MI Command Opcode" start="23" end="28" type="uint" default="41"/>
-    <field name="Use Global GTT" start="22" end="22" type="uint"/>
+    <field name="Use Global GTT" start="22" end="22" type="bool"/>
     <field name="Async Mode Enable" start="21" end="21" type="bool"/>
     <field name="DWord Length" start="0" end="7" type="uint" default="2"/>
     <field name="Register Address" start="34" end="54" type="offset"/>
@@ -2860,7 +2851,7 @@
     <field name="DWord Length" start="0" end="5" type="uint" default="2"/>
     <field name="Memory Address" start="38" end="95" type="address"/>
     <field name="Core Mode Enable" start="36" end="36" type="uint"/>
-    <field name="Use Global GTT" start="32" end="32" type="uint"/>
+    <field name="Use Global GTT" start="32" end="32" type="bool"/>
     <field name="Report ID" start="96" end="127" type="uint"/>
   </instruction>
 
@@ -2963,7 +2954,7 @@
   <instruction name="MI_STORE_DATA_IMM" bias="2" length="4">
     <field name="Command Type" start="29" end="31" type="uint" default="0"/>
     <field name="MI Command Opcode" start="23" end="28" type="uint" default="32"/>
-    <field name="Use Global GTT" start="22" end="22" type="uint"/>
+    <field name="Use Global GTT" start="22" end="22" type="bool"/>
     <field name="Store Qword" start="21" end="21" type="uint"/>
     <field name="DWord Length" start="0" end="9" type="uint" default="2"/>
     <field name="Address" start="34" end="79" type="address"/>
@@ -2985,7 +2976,7 @@
   <instruction name="MI_STORE_REGISTER_MEM" bias="2" length="4">
     <field name="Command Type" start="29" end="31" type="uint" default="0"/>
     <field name="MI Command Opcode" start="23" end="28" type="uint" default="36"/>
-    <field name="Use Global GTT" start="22" end="22" type="uint"/>
+    <field name="Use Global GTT" start="22" end="22" type="bool"/>
     <field name="Predicate Enable" start="21" end="21" type="bool"/>
     <field name="DWord Length" start="0" end="7" type="uint" default="2"/>
     <field name="Register Address" start="34" end="54" type="offset"/>
diff --git a/src/intel/genxml/gen9.xml b/src/intel/genxml/gen9.xml
index a82d1e0b49d..fe59ee94d0f 100644
--- a/src/intel/genxml/gen9.xml
+++ b/src/intel/genxml/gen9.xml
@@ -2945,10 +2945,7 @@
   <instruction name="MI_CLFLUSH" bias="2">
     <field name="Command Type" start="29" end="31" type="uint" default="0"/>
     <field name="MI Command Opcode" start="23" end="28" type="uint" default="39"/>
-    <field name="Use Global GTT" start="22" end="22" type="uint">
-      <value name="Per Process Graphics Address" value="0"/>
-      <value name="Global Graphics Address" value="1"/>
-    </field>
+    <field name="Use Global GTT" start="22" end="22" type="bool"/>
     <field name="DWord Length" start="0" end="9" type="uint" default="1"/>
     <field name="Page Base Address" start="44" end="79" type="address"/>
     <field name="Starting Cacheline Offset" start="38" end="43" type="uint"/>
@@ -2960,7 +2957,7 @@
   <instruction name="MI_CONDITIONAL_BATCH_BUFFER_END" bias="2" length="4">
     <field name="Command Type" start="29" end="31" type="uint" default="0"/>
     <field name="MI Command Opcode" start="23" end="28" type="uint" default="54"/>
-    <field name="Use Global GTT" start="22" end="22" type="uint" default="0"/>
+    <field name="Use Global GTT" start="22" end="22" type="bool"/>
     <field name="Compare Semaphore" start="21" end="21" type="uint" default="0"/>
     <field name="Compare Mask Mode" start="19" end="19" type="uint">
       <value name="Compare Mask Mode Disabled" value="0"/>
@@ -2974,14 +2971,8 @@
   <instruction name="MI_COPY_MEM_MEM" bias="2" length="5">
     <field name="Command Type" start="29" end="31" type="uint" default="0"/>
     <field name="MI Command Opcode" start="23" end="28" type="uint" default="46"/>
-    <field name="Use Global GTT Source" start="22" end="22" type="uint">
-      <value name="Per Process Graphics Address" value="0"/>
-      <value name="Global Graphics Address" value="1"/>
-    </field>
-    <field name="Use Global GTT Destination" start="21" end="21" type="uint">
-      <value name="Per Process Graphics Address" value="0"/>
-      <value name="Global Graphics Address" value="1"/>
-    </field>
+    <field name="Use Global GTT Source" start="22" end="22" type="bool"/>
+    <field name="Use Global GTT Destination" start="21" end="21" type="bool"/>
     <field name="DWord Length" start="0" end="7" type="uint" default="3"/>
     <field name="Destination Memory Address" start="34" end="95" type="address"/>
     <field name="Source Memory Address" start="98" end="159" type="address"/>
@@ -3039,7 +3030,7 @@
   <instruction name="MI_LOAD_REGISTER_MEM" bias="2" length="4">
     <field name="Command Type" start="29" end="31" type="uint" default="0"/>
     <field name="MI Command Opcode" start="23" end="28" type="uint" default="41"/>
-    <field name="Use Global GTT" start="22" end="22" type="uint"/>
+    <field name="Use Global GTT" start="22" end="22" type="bool"/>
     <field name="Async Mode Enable" start="21" end="21" type="bool"/>
     <field name="DWord Length" start="0" end="7" type="uint" default="2"/>
     <field name="Register Address" start="34" end="54" type="offset"/>
@@ -3138,7 +3129,7 @@
     <field name="DWord Length" start="0" end="5" type="uint" default="2"/>
     <field name="Memory Address" start="38" end="95" type="address"/>
     <field name="Core Mode Enable" start="36" end="36" type="uint"/>
-    <field name="Use Global GTT" start="32" end="32" type="uint"/>
+    <field name="Use Global GTT" start="32" end="32" type="bool"/>
     <field name="Report ID" start="96" end="127" type="uint"/>
   </instruction>
 
@@ -3241,7 +3232,7 @@
   <instruction name="MI_STORE_DATA_IMM" bias="2" length="4">
     <field name="Command Type" start="29" end="31" type="uint" default="0"/>
     <field name="MI Command Opcode" start="23" end="28" type="uint" default="32"/>
-    <field name="Use Global GTT" start="22" end="22" type="uint"/>
+    <field name="Use Global GTT" start="22" end="22" type="bool"/>
     <field name="Store Qword" start="21" end="21" type="uint"/>
     <field name="DWord Length" start="0" end="9" type="uint" default="2"/>
     <field name="Address" start="34" end="79" type="address"/>
@@ -3263,7 +3254,7 @@
   <instruction name="MI_STORE_REGISTER_MEM" bias="2" length="4">
     <field name="Command Type" start="29" end="31" type="uint" default="0"/>
     <field name="MI Command Opcode" start="23" end="28" type="uint" default="36"/>
-    <field name="Use Global GTT" start="22" end="22" type="uint"/>
+    <field name="Use Global GTT" start="22" end="22" type="bool"/>
     <field name="Predicate Enable" start="21" end="21" type="bool"/>
     <field name="DWord Length" start="0" end="7" type="uint" default="2"/>
     <field name="Register Address" start="34" end="54" type="offset"/>