diff --git a/src/intel/genxml/gen4.xml b/src/intel/genxml/gen4.xml
index ed45ca6744e..869f342c2d5 100644
--- a/src/intel/genxml/gen4.xml
+++ b/src/intel/genxml/gen4.xml
@@ -135,7 +135,7 @@
     </field>
     <field name="Illegal Opcode Exception Enable" start="45" end="45" type="bool"/>
     <field name="Mask Stack Exception Enable" start="43" end="43" 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="Scratch Space Base Pointer" start="74" end="95" type="address"/>
     <field name="Per-Thread Scratch Space" start="64" end="67" type="uint"/>
     <field name="Constant URB Entry Read Length" start="121" end="126" type="uint"/>
@@ -254,7 +254,7 @@
     </field>
     <field name="Illegal Opcode Exception Enable" start="45" end="45" type="bool"/>
     <field name="Mask Stack Exception Enable" start="43" end="43" 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="Scratch Space Base Pointer" start="74" end="95" type="address"/>
     <field name="Per-Thread Scratch Space" start="64" end="67" type="uint"/>
     <field name="Constant URB Entry Read Length" start="121" end="126" type="uint"/>
@@ -411,7 +411,7 @@
     </field>
     <field name="Illegal Opcode Exception Enable" start="45" end="45" type="bool"/>
     <field name="Mask Stack Exception Enable" start="43" end="43" 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="Scratch Space Base Pointer" start="74" end="95" type="address"/>
     <field name="Per-Thread Scratch Space" start="64" end="67" type="uint"/>
     <field name="Constant URB Entry Read Length" start="121" end="126" type="uint"/>
@@ -528,7 +528,7 @@
     </field>
     <field name="Illegal Opcode Exception Enable" start="45" end="45" type="bool"/>
     <field name="Mask Stack Exception Enable" start="43" end="43" 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="Scratch Space Base Pointer" start="74" end="95" type="address"/>
     <field name="Per-Thread Scratch Space" start="64" end="67" type="uint"/>
     <field name="Constant URB Entry Read Length" start="121" end="126" type="uint"/>
@@ -561,7 +561,7 @@
     <field name="Depth Coefficient URB Read Offset" start="40" end="45" type="uint"/>
     <field name="Illegal Opcode Exception Enable" start="36" end="36" type="bool"/>
     <field name="Mask Stack Exception Enable" start="34" end="34" type="bool"/>
-    <field name="Software  Exception Enable" start="33" end="33" type="bool"/>
+    <field name="Software Exception Enable" start="33" end="33" type="bool"/>
     <field name="Scratch Space Base Pointer" start="74" end="95" type="address"/>
     <field name="Per-Thread Scratch Space" start="64" end="67" type="uint"/>
     <field name="Constant URB Entry Read Length" start="121" end="126" type="uint"/>
diff --git a/src/intel/genxml/gen45.xml b/src/intel/genxml/gen45.xml
index 9fd6e63721c..c56394cf8cd 100644
--- a/src/intel/genxml/gen45.xml
+++ b/src/intel/genxml/gen45.xml
@@ -135,7 +135,7 @@
     </field>
     <field name="Illegal Opcode Exception Enable" start="45" end="45" type="bool"/>
     <field name="Mask Stack Exception Enable" start="43" end="43" 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="Scratch Space Base Pointer" start="74" end="95" type="address"/>
     <field name="Per-Thread Scratch Space" start="64" end="67" type="uint"/>
     <field name="Constant URB Entry Read Length" start="121" end="126" type="uint"/>
@@ -255,7 +255,7 @@
     </field>
     <field name="Illegal Opcode Exception Enable" start="45" end="45" type="bool"/>
     <field name="Mask Stack Exception Enable" start="43" end="43" 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="Scratch Space Base Pointer" start="74" end="95" type="address"/>
     <field name="Per-Thread Scratch Space" start="64" end="67" type="uint"/>
     <field name="Constant URB Entry Read Length" start="121" end="126" type="uint"/>
@@ -420,7 +420,7 @@
     </field>
     <field name="Illegal Opcode Exception Enable" start="45" end="45" type="bool"/>
     <field name="Mask Stack Exception Enable" start="43" end="43" 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="Scratch Space Base Pointer" start="74" end="95" type="address"/>
     <field name="Per-Thread Scratch Space" start="64" end="67" type="uint"/>
     <field name="Constant URB Entry Read Length" start="121" end="126" type="uint"/>
@@ -542,7 +542,7 @@
     </field>
     <field name="Illegal Opcode Exception Enable" start="45" end="45" type="bool"/>
     <field name="Mask Stack Exception Enable" start="43" end="43" 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="Scratch Space Base Pointer" start="74" end="95" type="address"/>
     <field name="Per-Thread Scratch Space" start="64" end="67" type="uint"/>
     <field name="Constant URB Entry Read Length" start="121" end="126" type="uint"/>
@@ -576,7 +576,7 @@
     <field name="Depth Coefficient URB Read Offset" start="40" end="45" type="uint"/>
     <field name="Illegal Opcode Exception Enable" start="36" end="36" type="bool"/>
     <field name="Mask Stack Exception Enable" start="34" end="34" type="bool"/>
-    <field name="Software  Exception Enable" start="33" end="33" type="bool"/>
+    <field name="Software Exception Enable" start="33" end="33" type="bool"/>
     <field name="Scratch Space Base Pointer" start="74" end="95" type="address"/>
     <field name="Per-Thread Scratch Space" start="64" end="67" type="uint"/>
     <field name="Constant URB Entry Read Length" start="121" end="126" type="uint"/>
diff --git a/src/intel/genxml/gen5.xml b/src/intel/genxml/gen5.xml
index f2d945b8367..ca78681ffb1 100644
--- a/src/intel/genxml/gen5.xml
+++ b/src/intel/genxml/gen5.xml
@@ -135,7 +135,7 @@
     </field>
     <field name="Illegal Opcode Exception Enable" start="45" end="45" type="bool"/>
     <field name="Mask Stack Exception Enable" start="43" end="43" 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="Scratch Space Base Pointer" start="74" end="95" type="address"/>
     <field name="Per-Thread Scratch Space" start="64" end="67" type="uint"/>
     <field name="Constant URB Entry Read Length" start="121" end="126" type="uint"/>
@@ -253,7 +253,7 @@
     </field>
     <field name="Illegal Opcode Exception Enable" start="45" end="45" type="bool"/>
     <field name="Mask Stack Exception Enable" start="43" end="43" 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="Scratch Space Base Pointer" start="74" end="95" type="address"/>
     <field name="Per-Thread Scratch Space" start="64" end="67" type="uint"/>
     <field name="Constant URB Entry Read Length" start="121" end="126" type="uint"/>
@@ -512,7 +512,7 @@
     </field>
     <field name="Illegal Opcode Exception Enable" start="45" end="45" type="bool"/>
     <field name="Mask Stack Exception Enable" start="43" end="43" 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="Scratch Space Base Pointer" start="74" end="95" type="address"/>
     <field name="Per-Thread Scratch Space" start="64" end="67" type="uint"/>
     <field name="Constant URB Entry Read Length" start="121" end="126" type="uint"/>
@@ -634,7 +634,7 @@
     </field>
     <field name="Illegal Opcode Exception Enable" start="45" end="45" type="bool"/>
     <field name="Mask Stack Exception Enable" start="43" end="43" 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="Scratch Space Base Pointer" start="74" end="95" type="address"/>
     <field name="Per-Thread Scratch Space" start="64" end="67" type="uint"/>
     <field name="Constant URB Entry Read Length" start="121" end="126" type="uint"/>
@@ -667,7 +667,7 @@
     <field name="Depth Coefficient URB Read Offset" start="40" end="45" type="uint"/>
     <field name="Illegal Opcode Exception Enable" start="36" end="36" type="bool"/>
     <field name="Mask Stack Exception Enable" start="34" end="34" type="bool"/>
-    <field name="Software  Exception Enable" start="33" end="33" type="bool"/>
+    <field name="Software Exception Enable" start="33" end="33" type="bool"/>
     <field name="Scratch Space Base Pointer" start="74" end="95" type="address"/>
     <field name="Per-Thread Scratch Space" start="64" end="67" type="uint"/>
     <field name="Constant URB Entry Read Length" start="121" end="126" type="uint"/>