From e6621746dc71dfa618c0e2518cd0591a13a6c994 Mon Sep 17 00:00:00 2001
From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Fri, 24 Mar 2017 14:26:20 -0700
Subject: genxml: Whitespace fixes

Some field names had extra spaces and some had places where we should
have had a space but didn't.

Reviewed-by: Chad Versace <chadversary@chromium.org>
---
 src/intel/genxml/gen6.xml  | 16 ++++++++--------
 src/intel/genxml/gen7.xml  | 24 ++++++++++++------------
 src/intel/genxml/gen75.xml | 22 +++++++++++-----------
 src/intel/genxml/gen8.xml  |  8 ++++----
 src/intel/genxml/gen9.xml  |  8 ++++----
 5 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/src/intel/genxml/gen6.xml b/src/intel/genxml/gen6.xml
index 8eef7bf739a..33969d937e3 100644
--- a/src/intel/genxml/gen6.xml
+++ b/src/intel/genxml/gen6.xml
@@ -811,9 +811,9 @@
       <value name="APIMODE_OGL" value="0"/>
       <value name="APIMODE_D3D" value="1"/>
     </field>
-    <field name="Viewport XY ClipTest Enable" start="92" end="92" type="bool"/>
-    <field name="Viewport Z ClipTest Enable" start="91" end="91" type="bool"/>
-    <field name="Guardband ClipTest Enable" start="90" end="90" type="bool"/>
+    <field name="Viewport XY Clip Test Enable" start="92" end="92" type="bool"/>
+    <field name="Viewport Z Clip Test Enable" start="91" end="91" type="bool"/>
+    <field name="Guardband Clip Test Enable" start="90" end="90" type="bool"/>
     <field name="User Clip Distance Clip Test Enable Bitmask" start="80" end="87" type="uint"/>
     <field name="Clip Mode" start="77" end="79" type="uint">
       <value name="CLIPMODE_NORMAL" value="0"/>
@@ -839,8 +839,8 @@
     </field>
     <field name="Minimum Point Width" start="113" end="123" type="u8.3"/>
     <field name="Maximum Point Width" start="102" end="112" type="u8.3"/>
-    <field name="Force Zero RTAIndex Enable" start="101" end="101" type="bool"/>
-    <field name="Maximum VPIndex" start="96" end="99" type="uint"/>
+    <field name="Force Zero RTA Index Enable" start="101" end="101" type="bool"/>
+    <field name="Maximum VP Index" start="96" end="99" type="uint"/>
   </instruction>
 
   <instruction name="3DSTATE_CONSTANT_GS" bias="2" length="5">
@@ -996,7 +996,7 @@
     </field>
     <field name="Illegal Opcode Exception Enable" start="77" end="77" type="bool"/>
     <field name="Mask Stack Exception Enable" start="75" end="75" type="bool"/>
-    <field name="Software  Exception Enable" start="71" end="71" type="bool"/>
+    <field name="Software Exception Enable" start="71" end="71" type="bool"/>
     <field name="Scratch Space Base Pointer" start="106" end="127" type="address"/>
     <field name="Per-Thread Scratch Space" start="96" end="99" type="uint"/>
     <field name="Vertex URB Entry Read Length" start="139" end="144" type="uint"/>
@@ -1230,7 +1230,7 @@
       <value name="4.0 pixels" value="3"/>
     </field>
     <field name="Scissor Rectangle Enable" start="107" end="107" type="bool"/>
-    <field name="Multisample Rasterization  Mode" start="104" end="105" type="uint"/>
+    <field name="Multisample Rasterization Mode" start="104" end="105" type="uint"/>
     <field name="Last Pixel Enable" start="159" end="159" type="bool"/>
     <field name="Triangle Strip/List Provoking Vertex Select" start="157" end="158" type="uint">
       <value name="Vertex 0" value="0"/>
@@ -1374,7 +1374,7 @@
       <value name="Alternate" value="1"/>
     </field>
     <field name="Illegal Opcode Exception Enable" start="77" end="77" type="bool"/>
-    <field name="Software  Exception Enable" start="71" end="71" type="bool"/>
+    <field name="Software Exception Enable" start="71" end="71" type="bool"/>
     <field name="Scratch Space Base Pointer" start="106" end="127" type="address"/>
     <field name="Per-Thread Scratch Space" start="96" end="99" type="uint"/>
     <field name="Dispatch GRF Start Register For URB Data" start="148" end="152" type="uint"/>
diff --git a/src/intel/genxml/gen7.xml b/src/intel/genxml/gen7.xml
index ee7877acb92..f46dae7ce05 100644
--- a/src/intel/genxml/gen7.xml
+++ b/src/intel/genxml/gen7.xml
@@ -918,7 +918,7 @@
     <field name="DWord Length" start="0" end="7" type="uint" default="2"/>
     <field name="Front Winding" start="52" end="52" type="uint"/>
     <field name="Vertex Sub Pixel Precision Select" start="51" end="51" type="uint"/>
-    <field name="EarlyCull Enable" start="50" end="50" type="bool"/>
+    <field name="Early Cull Enable" start="50" end="50" type="bool"/>
     <field name="Cull Mode" start="48" end="49" type="uint" prefix="CULLMODE">
       <value name="BOTH" value="0"/>
       <value name="NONE" value="1"/>
@@ -932,9 +932,9 @@
       <value name="APIMODE_OGL" value="0"/>
       <value name="APIMODE_D3D" value="1"/>
     </field>
-    <field name="Viewport XY ClipTest Enable" start="92" end="92" type="bool"/>
-    <field name="Viewport Z ClipTest Enable" start="91" end="91" type="bool"/>
-    <field name="Guardband ClipTest Enable" start="90" end="90" type="bool"/>
+    <field name="Viewport XY Clip Test Enable" start="92" end="92" type="bool"/>
+    <field name="Viewport Z Clip Test Enable" start="91" end="91" type="bool"/>
+    <field name="Guardband Clip Test Enable" start="90" end="90" type="bool"/>
     <field name="User Clip Distance Clip Test Enable Bitmask" start="80" end="87" type="uint"/>
     <field name="Clip Mode" start="77" end="79" type="uint">
       <value name="CLIPMODE_NORMAL" value="0"/>
@@ -959,8 +959,8 @@
     </field>
     <field name="Minimum Point Width" start="113" end="123" type="u8.3"/>
     <field name="Maximum Point Width" start="102" end="112" type="u8.3"/>
-    <field name="Force Zero RTAIndex Enable" start="101" end="101" type="bool"/>
-    <field name="Maximum VPIndex" start="96" end="99" type="uint"/>
+    <field name="Force Zero RTA Index Enable" start="101" end="101" type="bool"/>
+    <field name="Maximum VP Index" start="96" end="99" type="uint"/>
   </instruction>
 
   <instruction name="3DSTATE_CONSTANT_DS" bias="2" length="7">
@@ -1131,7 +1131,7 @@
     </field>
     <field name="Illegal Opcode Exception Enable" start="77" end="77" type="bool"/>
     <field name="Mask Stack Exception Enable" start="75" end="75" type="bool"/>
-    <field name="Software  Exception Enable" start="71" end="71" type="bool"/>
+    <field name="Software Exception Enable" start="71" end="71" type="bool"/>
     <field name="Scratch Space Base Pointer" start="106" end="127" type="address"/>
     <field name="Per-Thread Scratch Space" start="96" end="99" type="uint"/>
     <field name="Output Vertex Size" start="151" end="156" type="uint"/>
@@ -1194,7 +1194,7 @@
       <value name="alternate" value="1"/>
     </field>
     <field name="Illegal Opcode Exception Enable" start="45" end="45" type="bool"/>
-    <field name="Software  Exception Enable" start="39" end="39" type="bool"/>
+    <field name="Software Exception Enable" start="39" end="39" type="bool"/>
     <field name="Maximum Number of Threads" start="32" end="38" type="uint"/>
     <field name="Function Enable" start="95" end="95" type="bool"/>
     <field name="Statistics Enable" start="93" end="93" type="bool"/>
@@ -1333,7 +1333,7 @@
     </field>
     <field name="Illegal Opcode Exception Enable" start="77" end="77" type="bool"/>
     <field name="Mask Stack Exception Enable" start="75" end="75" type="bool"/>
-    <field name="Software  Exception Enable" start="71" end="71" type="bool"/>
+    <field name="Software Exception Enable" start="71" end="71" type="bool"/>
     <field name="Scratch Space Base Pointer" start="106" end="127" type="address"/>
     <field name="Per Thread Scratch Space" start="96" end="99" type="uint"/>
     <field name="Maximum Number of Threads" start="152" end="159" type="uint"/>
@@ -1602,7 +1602,7 @@
       <value name="4.0 pixels" value="3"/>
     </field>
     <field name="Scissor Rectangle Enable" start="75" end="75" type="bool"/>
-    <field name="Multisample Rasterization  Mode" start="72" end="73" type="uint"/>
+    <field name="Multisample Rasterization Mode" start="72" end="73" type="uint"/>
     <field name="Last Pixel Enable" start="127" end="127" type="bool"/>
     <field name="Triangle Strip/List Provoking Vertex Select" start="125" end="126" type="uint">
       <value name="Vertex 0" value="0"/>
@@ -1846,7 +1846,7 @@
       <value name="Alternate" value="1"/>
     </field>
     <field name="Illegal Opcode Exception Enable" start="77" end="77" type="bool"/>
-    <field name="Software  Exception Enable" start="71" end="71" type="bool"/>
+    <field name="Software Exception Enable" start="71" end="71" type="bool"/>
     <field name="Scratch Space Base Pointer" start="106" end="127" type="address"/>
     <field name="Per-Thread Scratch Space" start="96" end="99" type="uint"/>
     <field name="Dispatch GRF Start Register For URB Data" start="148" end="152" type="uint"/>
@@ -2430,7 +2430,7 @@
     <field name="Indirect State Pointers Disable" start="41" end="41" type="bool"/>
     <field name="Notify Enable" start="40" end="40" type="bool"/>
     <field name="Pipe Control Flush Enable" start="39" end="39" type="bool"/>
-    <field name="DC  Flush Enable" start="37" end="37" type="bool"/>
+    <field name="DC Flush Enable" start="37" end="37" type="bool"/>
     <field name="VF Cache Invalidation Enable" start="36" end="36" type="bool"/>
     <field name="Constant Cache Invalidation Enable" start="35" end="35" type="bool"/>
     <field name="State Cache Invalidation Enable" start="34" end="34" type="bool"/>
diff --git a/src/intel/genxml/gen75.xml b/src/intel/genxml/gen75.xml
index 094095e1d50..7fe9b02d6e7 100644
--- a/src/intel/genxml/gen75.xml
+++ b/src/intel/genxml/gen75.xml
@@ -1037,7 +1037,7 @@
     <field name="DWord Length" start="0" end="7" type="uint" default="2"/>
     <field name="Front Winding" start="52" end="52" type="uint"/>
     <field name="Vertex Sub Pixel Precision Select" start="51" end="51" type="uint"/>
-    <field name="EarlyCull Enable" start="50" end="50" type="bool"/>
+    <field name="Early Cull Enable" start="50" end="50" type="bool"/>
     <field name="Cull Mode" start="48" end="49" type="uint" prefix="CULLMODE">
       <value name="BOTH" value="0"/>
       <value name="NONE" value="1"/>
@@ -1051,9 +1051,9 @@
       <value name="APIMODE_OGL" value="0"/>
       <value name="APIMODE_D3D" value="1"/>
     </field>
-    <field name="Viewport XY ClipTest Enable" start="92" end="92" type="bool"/>
-    <field name="Viewport Z ClipTest Enable" start="91" end="91" type="bool"/>
-    <field name="Guardband ClipTest Enable" start="90" end="90" type="bool"/>
+    <field name="Viewport XY Clip Test Enable" start="92" end="92" type="bool"/>
+    <field name="Viewport Z Clip Test Enable" start="91" end="91" type="bool"/>
+    <field name="Guardband Clip Test Enable" start="90" end="90" type="bool"/>
     <field name="User Clip Distance Clip Test Enable Bitmask" start="80" end="87" type="uint"/>
     <field name="Clip Mode" start="77" end="79" type="uint">
       <value name="CLIPMODE_NORMAL" value="0"/>
@@ -1078,8 +1078,8 @@
     </field>
     <field name="Minimum Point Width" start="113" end="123" type="u8.3"/>
     <field name="Maximum Point Width" start="102" end="112" type="u8.3"/>
-    <field name="Force Zero RTAIndex Enable" start="101" end="101" type="bool"/>
-    <field name="Maximum VPIndex" start="96" end="99" type="uint"/>
+    <field name="Force Zero RTA Index Enable" start="101" end="101" type="bool"/>
+    <field name="Maximum VP Index" start="96" end="99" type="uint"/>
   </instruction>
 
   <instruction name="3DSTATE_CONSTANT_DS" bias="2" length="7">
@@ -1350,7 +1350,7 @@
     <field name="Illegal Opcode Exception Enable" start="77" end="77" type="bool"/>
     <field name="GS accesses UAV" start="76" end="76" type="uint"/>
     <field name="Mask Stack Exception Enable" start="75" end="75" type="bool"/>
-    <field name="Software  Exception Enable" start="71" end="71" type="bool"/>
+    <field name="Software Exception Enable" start="71" end="71" type="bool"/>
     <field name="Scratch Space Base Pointer" start="106" end="127" type="address"/>
     <field name="Per-Thread Scratch Space" start="96" end="99" type="uint"/>
     <field name="Output Vertex Size" start="151" end="156" type="uint"/>
@@ -1562,7 +1562,7 @@
     </field>
     <field name="Illegal Opcode Exception Enable" start="77" end="77" type="bool"/>
     <field name="Mask Stack Exception Enable" start="75" end="75" type="bool"/>
-    <field name="Software  Exception Enable" start="71" end="71" type="bool"/>
+    <field name="Software Exception Enable" start="71" end="71" type="bool"/>
     <field name="Scratch Space Base Pointer" start="106" end="127" type="address"/>
     <field name="Per Thread Scratch Space" start="96" end="99" type="uint"/>
     <field name="Maximum Number of Threads" start="151" end="159" type="uint"/>
@@ -1859,7 +1859,7 @@
     <field name="Line Stipple Enable" start="78" end="78" type="bool"/>
     <field name="Scissor Rectangle Enable" start="75" end="75" type="bool"/>
     <field name="RT Independent Rasterization Enable" start="74" end="74" type="bool"/>
-    <field name="Multisample Rasterization  Mode" start="72" end="73" type="uint"/>
+    <field name="Multisample Rasterization Mode" start="72" end="73" type="uint"/>
     <field name="Last Pixel Enable" start="127" end="127" type="bool"/>
     <field name="Triangle Strip/List Provoking Vertex Select" start="125" end="126" type="uint">
       <value name="Vertex 0" value="0"/>
@@ -2119,7 +2119,7 @@
     </field>
     <field name="Illegal Opcode Exception Enable" start="77" end="77" type="bool"/>
     <field name="VS accesses UAV" start="76" end="76" type="bool"/>
-    <field name="Software  Exception Enable" start="71" end="71" type="bool"/>
+    <field name="Software Exception Enable" start="71" end="71" type="bool"/>
     <field name="Scratch Space Base Pointer" start="106" end="127" type="address"/>
     <field name="Per-Thread Scratch Space" start="96" end="99" type="uint"/>
     <field name="Dispatch GRF Start Register For URB Data" start="148" end="152" type="uint"/>
@@ -2839,7 +2839,7 @@
     <field name="Indirect State Pointers Disable" start="41" end="41" type="bool"/>
     <field name="Notify Enable" start="40" end="40" type="bool"/>
     <field name="Pipe Control Flush Enable" start="39" end="39" type="bool"/>
-    <field name="DC  Flush Enable" start="37" end="37" type="bool"/>
+    <field name="DC Flush Enable" start="37" end="37" type="bool"/>
     <field name="VF Cache Invalidation Enable" start="36" end="36" type="bool"/>
     <field name="Constant Cache Invalidation Enable" start="35" end="35" type="bool"/>
     <field name="State Cache Invalidation Enable" start="34" end="34" type="bool"/>
diff --git a/src/intel/genxml/gen8.xml b/src/intel/genxml/gen8.xml
index 193a1838f98..0ebf2aa9c09 100644
--- a/src/intel/genxml/gen8.xml
+++ b/src/intel/genxml/gen8.xml
@@ -1415,7 +1415,7 @@
     <field name="Illegal Opcode Exception Enable" start="109" end="109" type="bool"/>
     <field name="Accesses UAV" start="108" end="108" type="bool"/>
     <field name="Mask Stack Exception Enable" start="107" end="107" type="bool"/>
-    <field name="Software  Exception Enable" start="103" end="103" type="bool"/>
+    <field name="Software Exception Enable" start="103" end="103" type="bool"/>
     <field name="Expected Vertex Count" start="96" end="101" type="uint"/>
     <field name="Scratch Space Base Pointer" start="138" end="191" type="address"/>
     <field name="Per-Thread Scratch Space" start="128" end="131" type="uint"/>
@@ -1619,7 +1619,7 @@
     </field>
     <field name="Illegal Opcode Exception Enable" start="109" end="109" type="bool"/>
     <field name="Mask Stack Exception Enable" start="107" end="107" type="bool"/>
-    <field name="Software  Exception Enable" start="103" end="103" type="bool"/>
+    <field name="Software Exception Enable" start="103" end="103" type="bool"/>
     <field name="Scratch Space Base Pointer" start="138" end="191" type="address"/>
     <field name="Per Thread Scratch Space" start="128" end="131" type="uint"/>
     <field name="Maximum Number of Threads Per PSD" start="215" end="223" type="uint"/>
@@ -2280,7 +2280,7 @@
     <field name="Accesses UAV" start="108" end="108" type="bool"/>
     <field name="Software Exception Enable" start="103" end="103" type="bool"/>
     <field name="Scratch Space Base Pointer" start="138" end="191" type="address"/>
-    <field name="Per-Thread Scratch Space " start="128" end="131" type="uint"/>
+    <field name="Per-Thread Scratch Space" start="128" end="131" type="uint"/>
     <field name="Dispatch GRF Start Register For URB Data" start="212" end="216" type="uint"/>
     <field name="Vertex URB Entry Read Length" start="203" end="208" type="uint"/>
     <field name="Vertex URB Entry Read Offset" start="196" end="201" type="uint"/>
@@ -3099,7 +3099,7 @@
     <field name="Indirect State Pointers Disable" start="41" end="41" type="bool"/>
     <field name="Notify Enable" start="40" end="40" type="bool"/>
     <field name="Pipe Control Flush Enable" start="39" end="39" type="bool"/>
-    <field name="DC  Flush Enable" start="37" end="37" type="bool"/>
+    <field name="DC Flush Enable" start="37" end="37" type="bool"/>
     <field name="VF Cache Invalidation Enable" start="36" end="36" type="bool"/>
     <field name="Constant Cache Invalidation Enable" start="35" end="35" type="bool"/>
     <field name="State Cache Invalidation Enable" start="34" end="34" type="bool"/>
diff --git a/src/intel/genxml/gen9.xml b/src/intel/genxml/gen9.xml
index bfe49320b03..79fad000b25 100644
--- a/src/intel/genxml/gen9.xml
+++ b/src/intel/genxml/gen9.xml
@@ -1520,7 +1520,7 @@
     <field name="Illegal Opcode Exception Enable" start="109" end="109" type="bool"/>
     <field name="Accesses UAV" start="108" end="108" type="bool"/>
     <field name="Mask Stack Exception Enable" start="107" end="107" type="bool"/>
-    <field name="Software  Exception Enable" start="103" end="103" type="bool"/>
+    <field name="Software Exception Enable" start="103" end="103" type="bool"/>
     <field name="Expected Vertex Count" start="96" end="101" type="uint"/>
     <field name="Scratch Space Base Pointer" start="138" end="191" type="address"/>
     <field name="Per-Thread Scratch Space" start="128" end="131" type="uint"/>
@@ -1732,7 +1732,7 @@
     </field>
     <field name="Illegal Opcode Exception Enable" start="109" end="109" type="bool"/>
     <field name="Mask Stack Exception Enable" start="107" end="107" type="bool"/>
-    <field name="Software  Exception Enable" start="103" end="103" type="bool"/>
+    <field name="Software Exception Enable" start="103" end="103" type="bool"/>
     <field name="Scratch Space Base Pointer" start="138" end="191" type="address"/>
     <field name="Per Thread Scratch Space" start="128" end="131" type="uint"/>
     <field name="Maximum Number of Threads Per PSD" start="215" end="223" type="uint"/>
@@ -2508,7 +2508,7 @@
     <field name="Accesses UAV" start="108" end="108" type="bool"/>
     <field name="Software Exception Enable" start="103" end="103" type="bool"/>
     <field name="Scratch Space Base Pointer" start="138" end="191" type="address"/>
-    <field name="Per-Thread Scratch Space " start="128" end="131" type="uint"/>
+    <field name="Per-Thread Scratch Space" start="128" end="131" type="uint"/>
     <field name="Dispatch GRF Start Register For URB Data" start="212" end="216" type="uint"/>
     <field name="Vertex URB Entry Read Length" start="203" end="208" type="uint"/>
     <field name="Vertex URB Entry Read Offset" start="196" end="201" type="uint"/>
@@ -3382,7 +3382,7 @@
     <field name="Indirect State Pointers Disable" start="41" end="41" type="bool"/>
     <field name="Notify Enable" start="40" end="40" type="bool"/>
     <field name="Pipe Control Flush Enable" start="39" end="39" type="bool"/>
-    <field name="DC  Flush Enable" start="37" end="37" type="bool"/>
+    <field name="DC Flush Enable" start="37" end="37" type="bool"/>
     <field name="VF Cache Invalidation Enable" start="36" end="36" type="bool"/>
     <field name="Constant Cache Invalidation Enable" start="35" end="35" type="bool"/>
     <field name="State Cache Invalidation Enable" start="34" end="34" type="bool"/>
-- 
cgit v1.2.3