intel/genxml: Make "Single Program Flow" a boolean

We also get rid of the "(SPF)" a few places.

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 5be46261708b011c3a6d647e06c653773379199e..8a57e6795069de7900392a106da1abcb6f62511a 100644 (file)
--- a/src/intel/genxml/gen6.xml
+++ b/src/intel/genxml/gen6.xml
@@ -265,7 +265,7 @@
 
   <struct name="INTERFACE_DESCRIPTOR_DATA" length="8">
     <field name="Kernel Start Pointer" start="6" end="31" type="offset"/>
-    <field name="Single Program Flow" start="50" end="50" type="uint"/>
+    <field name="Single Program Flow" start="50" end="50" type="bool"/>
     <field name="Thread Priority" start="49" end="49" type="uint">
       <value name="Normal Priority" value="0"/>
       <value name="High Priority" value="1"/>
@@ -990,7 +990,7 @@
     <field name="3D Command Sub Opcode" start="16" end="23" type="uint" default="17"/>
     <field name="DWord Length" start="0" end="7" type="uint" default="5"/>
     <field name="Kernel Start Pointer" start="38" end="63" type="offset"/>
-    <field name="Single Program Flow (SPF)" start="95" end="95" type="uint"/>
+    <field name="Single Program Flow" start="95" end="95" type="bool"/>
     <field name="Vector Mask Enable (VME)" start="94" end="94" type="uint"/>
     <field name="Sampler Count" start="91" end="93" type="uint">
       <value name="No Samplers" value="0"/>
@@ -1407,7 +1407,7 @@
     <field name="3D Command Sub Opcode" start="16" end="23" type="uint" default="20"/>
     <field name="DWord Length" start="0" end="7" type="uint" default="7"/>
     <field name="Kernel Start Pointer[0]" start="38" end="63" type="offset"/>
-    <field name="Single Program Flow (SPF)" start="95" end="95" type="uint"/>
+    <field name="Single Program Flow" start="95" end="95" type="bool"/>
     <field name="Vector Mask Enable (VME)" start="94" end="94" type="uint"/>
     <field name="Sampler Count" start="91" end="93" type="uint"/>
     <field name="Binding Table Entry Count" start="82" end="89" type="uint"/>

diff --git a/src/intel/genxml/gen7.xml b/src/intel/genxml/gen7.xml
index ad866c1a8a1989c405b53a77f49b860fcb5d1b65..c349c6c400c6bba82eb39b991ce5e2d194f9fcc5 100644 (file)
--- a/src/intel/genxml/gen7.xml
+++ b/src/intel/genxml/gen7.xml
@@ -288,7 +288,7 @@
 
   <struct name="INTERFACE_DESCRIPTOR_DATA" length="8">
     <field name="Kernel Start Pointer" start="6" end="31" type="offset"/>
-    <field name="Single Program Flow" start="50" end="50" type="uint"/>
+    <field name="Single Program Flow" start="50" end="50" type="bool"/>
     <field name="Thread Priority" start="49" end="49" type="uint">
       <value name="Normal Priority" value="0"/>
       <value name="High Priority" value="1"/>
@@ -1141,7 +1141,7 @@
     <field name="3D Command Sub Opcode" start="16" end="23" type="uint" default="17"/>
     <field name="DWord Length" start="0" end="7" type="uint" default="5"/>
     <field name="Kernel Start Pointer" start="38" end="63" type="offset"/>
-    <field name="Single Program Flow (SPF)" start="95" end="95" type="uint"/>
+    <field name="Single Program Flow" start="95" end="95" type="bool"/>
     <field name="Vector Mask Enable (VME)" start="94" end="94" type="uint"/>
     <field name="Sampler Count" start="91" end="93" type="uint">
       <value name="No Samplers" value="0"/>
@@ -1232,7 +1232,7 @@
     <field name="Kernel Start Pointer" start="102" end="127" type="offset"/>
     <field name="Scratch Space Base Pointer" start="138" end="159" type="address"/>
     <field name="Per-Thread Scratch Space" start="128" end="131" type="uint"/>
-    <field name="Single Program Flow" start="187" end="187" type="uint"/>
+    <field name="Single Program Flow" start="187" end="187" type="bool"/>
     <field name="Vector Mask Enable" start="186" end="186" type="bool"/>
     <field name="Include Vertex Handles" start="184" end="184" type="uint"/>
     <field name="Dispatch GRF Start Register For URB Data" start="179" end="183" type="uint"/>
@@ -1343,7 +1343,7 @@
     <field name="3D Command Sub Opcode" start="16" end="23" type="uint" default="32"/>
     <field name="DWord Length" start="0" end="7" type="uint" default="6"/>
     <field name="Kernel Start Pointer[0]" start="38" end="63" type="offset"/>
-    <field name="Single Program Flow (SPF)" start="95" end="95" type="uint"/>
+    <field name="Single Program Flow" start="95" end="95" type="bool"/>
     <field name="Vector Mask Enable (VME)" start="94" end="94" type="uint"/>
     <field name="Sampler Count" start="91" end="93" type="uint"/>
     <field name="Denormal Mode" start="90" end="90" type="uint">

diff --git a/src/intel/genxml/gen75.xml b/src/intel/genxml/gen75.xml
index ab320fc27e4a499049586eba5d57c0586d8fb86b..625e24c80c299d36098b3ed62273894e94d31420 100644 (file)
--- a/src/intel/genxml/gen75.xml
+++ b/src/intel/genxml/gen75.xml
@@ -298,7 +298,7 @@
 
   <struct name="INTERFACE_DESCRIPTOR_DATA" length="8">
     <field name="Kernel Start Pointer" start="6" end="31" type="offset"/>
-    <field name="Single Program Flow" start="50" end="50" type="uint"/>
+    <field name="Single Program Flow" start="50" end="50" type="bool"/>
     <field name="Thread Priority" start="49" end="49" type="uint">
       <value name="Normal Priority" value="0"/>
       <value name="High Priority" value="1"/>
@@ -1349,7 +1349,7 @@
     <field name="3D Command Sub Opcode" start="16" end="23" type="uint" default="17"/>
     <field name="DWord Length" start="0" end="7" type="uint" default="5"/>
     <field name="Kernel Start Pointer" start="38" end="63" type="offset"/>
-    <field name="Single Program Flow (SPF)" start="95" end="95" type="uint"/>
+    <field name="Single Program Flow" start="95" end="95" type="bool"/>
     <field name="Vector Mask Enable (VME)" start="94" end="94" type="uint"/>
     <field name="Sampler Count" start="91" end="93" type="uint">
       <value name="No Samplers" value="0"/>
@@ -1447,7 +1447,7 @@
     <field name="Kernel Start Pointer" start="102" end="127" type="offset"/>
     <field name="Scratch Space Base Pointer" start="138" end="159" type="address"/>
     <field name="Per-Thread Scratch Space" start="128" end="131" type="uint"/>
-    <field name="Single Program Flow" start="187" end="187" type="uint"/>
+    <field name="Single Program Flow" start="187" end="187" type="bool"/>
     <field name="Vector Mask Enable" start="186" end="186" type="bool"/>
     <field name="HS accesses UAV" start="185" end="185" type="bool"/>
     <field name="Include Vertex Handles" start="184" end="184" type="uint"/>
@@ -1559,7 +1559,7 @@
     <field name="3D Command Sub Opcode" start="16" end="23" type="uint" default="32"/>
     <field name="DWord Length" start="0" end="7" type="uint" default="6"/>
     <field name="Kernel Start Pointer[0]" start="38" end="63" type="offset"/>
-    <field name="Single Program Flow (SPF)" start="95" end="95" type="uint"/>
+    <field name="Single Program Flow" start="95" end="95" type="bool"/>
     <field name="Vector Mask Enable (VME)" start="94" end="94" type="uint"/>
     <field name="Sampler Count" start="91" end="93" type="uint"/>
     <field name="Denormal Mode" start="90" end="90" type="uint">

diff --git a/src/intel/genxml/gen8.xml b/src/intel/genxml/gen8.xml
index 0dbcbcd7f9a8e0748162ffe8645f01de07b2c9d6..24b24a999d4e4eeed00c48808e264bf39231d0ef 100644 (file)
--- a/src/intel/genxml/gen8.xml
+++ b/src/intel/genxml/gen8.xml
@@ -192,7 +192,7 @@
       <value name="Ftz" value="0"/>
       <value name="SetByKernel" value="1"/>
     </field>
-    <field name="Single Program Flow" start="82" end="82" type="uint"/>
+    <field name="Single Program Flow" start="82" end="82" type="bool"/>
     <field name="Thread Priority" start="81" end="81" type="uint">
       <value name="Normal Priority" value="0"/>
       <value name="High Priority" value="1"/>
@@ -1386,7 +1386,7 @@
     <field name="3D Command Sub Opcode" start="16" end="23" type="uint" default="17"/>
     <field name="DWord Length" start="0" end="7" type="uint" default="8"/>
     <field name="Kernel Start Pointer" start="38" end="95" type="offset"/>
-    <field name="Single Program Flow" start="127" end="127" type="uint"/>
+    <field name="Single Program Flow" start="127" end="127" type="bool"/>
     <field name="Vector Mask Enable" start="126" end="126" type="bool"/>
     <field name="Sampler Count" start="123" end="125" type="uint">
       <value name="No Samplers" value="0"/>
@@ -1581,7 +1581,7 @@
     <field name="3D Command Sub Opcode" start="16" end="23" type="uint" default="32"/>
     <field name="DWord Length" start="0" end="7" type="uint" default="10"/>
     <field name="Kernel Start Pointer 0" start="38" end="95" type="offset"/>
-    <field name="Single Program Flow" start="127" end="127" type="uint"/>
+    <field name="Single Program Flow" start="127" end="127" type="bool"/>
     <field name="Vector Mask Enable" start="126" end="126" type="bool"/>
     <field name="Sampler Count" start="123" end="125" type="uint">
       <value name="No Samplers" value="0"/>

diff --git a/src/intel/genxml/gen9.xml b/src/intel/genxml/gen9.xml
index be5cc01f2879e6e9c4b719a11583658794d58720..ec0d0dcbdef5a4d8f317b0ab002c74d9915b10c4 100644 (file)
--- a/src/intel/genxml/gen9.xml
+++ b/src/intel/genxml/gen9.xml
@@ -181,7 +181,7 @@
       <value name="Ftz" value="0"/>
       <value name="SetByKernel" value="1"/>
     </field>
-    <field name="Single Program Flow" start="82" end="82" type="uint"/>
+    <field name="Single Program Flow" start="82" end="82" type="bool"/>
     <field name="Thread Priority" start="81" end="81" type="uint">
       <value name="Normal Priority" value="0"/>
       <value name="High Priority" value="1"/>
@@ -1488,7 +1488,7 @@
     <field name="3D Command Sub Opcode" start="16" end="23" type="uint" default="17"/>
     <field name="DWord Length" start="0" end="7" type="uint" default="8"/>
     <field name="Kernel Start Pointer" start="38" end="95" type="offset"/>
-    <field name="Single Program Flow" start="127" end="127" type="uint"/>
+    <field name="Single Program Flow" start="127" end="127" type="bool"/>
     <field name="Vector Mask Enable" start="126" end="126" type="bool"/>
     <field name="Sampler Count" start="123" end="125" type="uint">
       <value name="No Samplers" value="0"/>
@@ -1691,7 +1691,7 @@
     <field name="3D Command Sub Opcode" start="16" end="23" type="uint" default="32"/>
     <field name="DWord Length" start="0" end="7" type="uint" default="10"/>
     <field name="Kernel Start Pointer 0" start="38" end="95" type="offset"/>
-    <field name="Single Program Flow" start="127" end="127" type="uint"/>
+    <field name="Single Program Flow" start="127" end="127" type="bool"/>
     <field name="Vector Mask Enable" start="126" end="126" type="bool"/>
     <field name="Sampler Count" start="123" end="125" type="uint">
       <value name="No Samplers" value="0"/>