From 3f0da1bbfa4a26fc45c79a4b1d11f8760c40fc1a Mon Sep 17 00:00:00 2001
From: Dylan Baker <dylan.c.baker@intel.com>
Date: Fri, 30 Sep 2022 11:59:19 -0700
Subject: [PATCH] intel/genxml: run gen_sort_tags on all of the xml

Reviewd-by: Jordan Justen <jordan.l.justen@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18917>
---
 src/intel/genxml/gen11.xml  |  22 ++--
 src/intel/genxml/gen12.xml  | 102 +++++++++----------
 src/intel/genxml/gen125.xml | 241 ++++++++++++++++++++++----------------------
 src/intel/genxml/gen7.xml   |   6 +-
 src/intel/genxml/gen75.xml  |   6 +-
 src/intel/genxml/gen_rt.xml | 182 ++++++++++++++++-----------------
 6 files changed, 276 insertions(+), 283 deletions(-)

diff --git a/src/intel/genxml/gen11.xml b/src/intel/genxml/gen11.xml
index cdf4a50..3da5b0a 100644
--- a/src/intel/genxml/gen11.xml
+++ b/src/intel/genxml/gen11.xml
@@ -6875,8 +6875,8 @@
   </instruction>
 
   <register name="3D_CHICKEN3" length="1" num="0x2090">
-     <field name="AA Line Quality Fix" start="5" end="5" type="bool"/>
-     <field name="AA Line Quality Fix Mask" start="21" end="21" type="bool"/>
+    <field name="AA Line Quality Fix" start="5" end="5" type="bool"/>
+    <field name="AA Line Quality Fix Mask" start="21" end="21" type="bool"/>
   </register>
 
   <register name="BCS_INSTDONE" length="1" num="0x2206c">
@@ -6928,14 +6928,6 @@
     <field name="Color Compression Disable Mask" start="31" end="31" type="bool"/>
   </register>
 
-  <register name="GT_MODE" length="1" num="0x7008">
-     <field name="Binding Table Alignment" start="10" end="10" type="uint">
-       <value name="BTP_15_5" value="0"/>
-       <value name="BTP_18_8" value="1"/>
-     </field>
-     <field name="Binding Table Alignment Mask" start="26" end="26" type="bool"/>
-  </register>
-
   <register name="CACHE_MODE_SS" length="1" num="0x0e420">
     <field name="Instruction Level 1 Cache Disable" start="0" end="0" type="bool"/>
     <field name="Instruction Level 1 Cache and In-Flight Queue Disable " start="1" end="1" type="bool"/>
@@ -6998,6 +6990,14 @@
     <field name="GS Primitives Count Report" start="0" end="63" type="uint"/>
   </register>
 
+  <register name="GT_MODE" length="1" num="0x7008">
+    <field name="Binding Table Alignment" start="10" end="10" type="uint">
+      <value name="BTP_15_5" value="0"/>
+      <value name="BTP_18_8" value="1"/>
+    </field>
+    <field name="Binding Table Alignment Mask" start="26" end="26" type="bool"/>
+  </register>
+
   <register name="HALF_SLICE_CHICKEN7" length="1" num="0x0e194">
     <field name="Enabled Texel Offset Precision Fix" start="1" end="1" type="bool"/>
     <field name="Enabled Texel Offset Precision Fix Mask" start="17" end="17" type="bool"/>
@@ -7121,8 +7121,8 @@
 
   <register name="SAMPLER_MODE" length="1" num="0x0e18c">
     <field name="Headerless Message for Pre-emptable Contexts" start="5" end="5" type="bool"/>
-    <field name="Headerless Message for Pre-emptable Contexts Mask" start="21" end="21" type="bool"/>
     <field name="Enable Small PL" start="15" end="15" type="bool"/>
+    <field name="Headerless Message for Pre-emptable Contexts Mask" start="21" end="21" type="bool"/>
     <field name="Enable Small PL Mask" start="31" end="31" type="bool"/>
   </register>
 
diff --git a/src/intel/genxml/gen12.xml b/src/intel/genxml/gen12.xml
index 14f35d7..50bf18d 100644
--- a/src/intel/genxml/gen12.xml
+++ b/src/intel/genxml/gen12.xml
@@ -2608,36 +2608,6 @@
     <field name="Last Pixel Enable" start="127" end="127" type="bool"/>
   </instruction>
 
-  <instruction name="3DSTATE_SUBSLICE_HASH_TABLE" bias="2" length="14">
-    <field name="DWord Length" start="0" end="7" type="uint" default="12"/>
-    <field name="3D Command Sub Opcode" start="16" end="23" type="uint" default="31"/>
-    <field name="3D Command Opcode" start="24" end="26" type="uint" default="1"/>
-    <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
-    <field name="Command Type" start="29" end="31" type="uint" default="3"/>
-    <group count="8" start="32" size="2">
-      <field name="Slice Hash Control" start="0" end="1" type="uint">
-        <value name="COMPUTED" value="0"/>
-        <value name="UNBALANCED_TABLE_0" value="1"/>
-        <value name="TABLE_0" value="2"/>
-        <value name="TABLE_1" value="3"/>
-      </field>
-    </group>
-    <field name="Slice Table Mode" start="62" end="63" type="uint">
-      <value name="SINGLE_TABLE" value="0"/>
-      <value name="DUAL_TABLE" value="1"/>
-    </field>
-    <group count="8" start="64" size="16">
-      <group count="16" start="0" size="1">
-        <field name="Two Way Table Entry" start="0" end="0" type="uint"/>
-      </group>
-    </group>
-    <group count="8" start="192" size="32">
-      <group count="16" start="0" size="2">
-        <field name="Three Way Table Entry" start="0" end="1" type="uint"/>
-      </group>
-    </group>
-  </instruction>
-
   <instruction name="3DSTATE_SLICE_TABLE_STATE_POINTERS" bias="2" length="2">
     <field name="DWord Length" start="0" end="7" type="uint" default="0"/>
     <field name="3D Command Sub Opcode" start="16" end="23" type="uint" default="32"/>
@@ -2787,6 +2757,36 @@
     <field name="Buffer 3 Surface Pitch" start="144" end="155" type="uint"/>
   </instruction>
 
+  <instruction name="3DSTATE_SUBSLICE_HASH_TABLE" bias="2" length="14">
+    <field name="DWord Length" start="0" end="7" type="uint" default="12"/>
+    <field name="3D Command Sub Opcode" start="16" end="23" type="uint" default="31"/>
+    <field name="3D Command Opcode" start="24" end="26" type="uint" default="1"/>
+    <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
+    <field name="Command Type" start="29" end="31" type="uint" default="3"/>
+    <group count="8" start="32" size="2">
+      <field name="Slice Hash Control" start="0" end="1" type="uint">
+        <value name="COMPUTED" value="0"/>
+        <value name="UNBALANCED_TABLE_0" value="1"/>
+        <value name="TABLE_0" value="2"/>
+        <value name="TABLE_1" value="3"/>
+      </field>
+    </group>
+    <field name="Slice Table Mode" start="62" end="63" type="uint">
+      <value name="SINGLE_TABLE" value="0"/>
+      <value name="DUAL_TABLE" value="1"/>
+    </field>
+    <group count="8" start="64" size="16">
+      <group count="16" start="0" size="1">
+        <field name="Two Way Table Entry" start="0" end="0" type="uint"/>
+      </group>
+    </group>
+    <group count="8" start="192" size="32">
+      <group count="16" start="0" size="2">
+        <field name="Three Way Table Entry" start="0" end="1" type="uint"/>
+      </group>
+    </group>
+  </instruction>
+
   <instruction name="3DSTATE_TE" bias="2" length="4" engine="render">
     <field name="DWord Length" start="0" end="7" type="uint" default="2"/>
     <field name="3D Command Sub Opcode" start="16" end="23" type="uint" default="28"/>
@@ -7067,11 +7067,11 @@
   <instruction name="XY_BLOCK_COPY_BLT" bias="2" length="12" engine="blitter">
     <field name="DWord Length" start="0" end="7" type="uint" default="10"/>
     <field name="Color Depth" start="19" end="21" type="uint" prefix="XY_BPP">
-      <value name="8_BIT"   value="0"/>
-      <value name="16_BIT"  value="1"/>
-      <value name="32_BIT"  value="2"/>
-      <value name="64_BIT"  value="3"/>
-      <value name="96_BIT"  value="4"/>
+      <value name="8_BIT" value="0"/>
+      <value name="16_BIT" value="1"/>
+      <value name="32_BIT" value="2"/>
+      <value name="64_BIT" value="3"/>
+      <value name="96_BIT" value="4"/>
       <value name="128_BIT" value="5"/>
     </field>
     <field name="Opcode" start="22" end="28" type="uint" default="0x41"/>
@@ -7105,11 +7105,11 @@
   <instruction name="XY_FAST_COLOR_BLT" bias="2" length="11" engine="blitter">
     <field name="DWord Length" start="0" end="7" type="uint" default="9"/>
     <field name="Color Depth" start="19" end="21" type="uint" prefix="XY_BPP">
-      <value name="8_BIT"   value="0"/>
-      <value name="16_BIT"  value="1"/>
-      <value name="32_BIT"  value="2"/>
-      <value name="64_BIT"  value="3"/>
-      <value name="96_BIT"  value="4"/>
+      <value name="8_BIT" value="0"/>
+      <value name="16_BIT" value="1"/>
+      <value name="32_BIT" value="2"/>
+      <value name="64_BIT" value="3"/>
+      <value name="96_BIT" value="4"/>
       <value name="128_BIT" value="5"/>
     </field>
     <field name="Opcode" start="22" end="28" type="uint" default="0x44"/>
@@ -7127,13 +7127,13 @@
     <field name="Destination X Offset" start="192" end="205" type="uint"/>
     <field name="Destination Y Offset" start="208" end="221" type="uint"/>
     <group count="4" start="224" size="32">
-       <field name="Fill Color" start="0" end="31" type="uint"/>
+      <field name="Fill Color" start="0" end="31" type="uint"/>
     </group>
   </instruction>
 
   <register name="3D_CHICKEN3" length="1" num="0x2090">
-     <field name="AA Line Quality Fix" start="5" end="5" type="bool"/>
-     <field name="AA Line Quality Fix Mask" start="21" end="21" type="bool"/>
+    <field name="AA Line Quality Fix" start="5" end="5" type="bool"/>
+    <field name="AA Line Quality Fix Mask" start="21" end="21" type="bool"/>
   </register>
 
   <register name="BCS_INSTDONE" length="1" num="0x2206c">
@@ -7185,14 +7185,6 @@
     <field name="Color Compression Disable Mask" start="31" end="31" type="bool"/>
   </register>
 
-  <register name="GT_MODE" length="1" num="0x7008">
-     <field name="Binding Table Alignment" start="10" end="10" type="uint">
-       <value name="BTP_15_5" value="0"/>
-       <value name="BTP_18_8" value="1"/>
-     </field>
-     <field name="Binding Table Alignment Mask" start="26" end="26" type="bool"/>
-  </register>
-
   <register name="CACHE_MODE_SS" length="1" num="0x0e420">
     <field name="Instruction Level 1 Cache Disable" start="0" end="0" type="bool"/>
     <field name="Instruction Level 1 Cache and In-Flight Queue Disable " start="1" end="1" type="bool"/>
@@ -7270,6 +7262,14 @@
     <field name="GS Primitives Count Report" start="0" end="63" type="uint"/>
   </register>
 
+  <register name="GT_MODE" length="1" num="0x7008">
+    <field name="Binding Table Alignment" start="10" end="10" type="uint">
+      <value name="BTP_15_5" value="0"/>
+      <value name="BTP_18_8" value="1"/>
+    </field>
+    <field name="Binding Table Alignment Mask" start="26" end="26" type="bool"/>
+  </register>
+
   <register name="HALF_SLICE_CHICKEN7" length="1" num="0x0e194">
     <field name="Enabled Texel Offset Precision Fix" start="1" end="1" type="bool"/>
     <field name="Enabled Texel Offset Precision Fix Mask" start="17" end="17" type="bool"/>
diff --git a/src/intel/genxml/gen125.xml b/src/intel/genxml/gen125.xml
index 4acd0e0..7bb04d2 100644
--- a/src/intel/genxml/gen125.xml
+++ b/src/intel/genxml/gen125.xml
@@ -761,7 +761,7 @@
       <value name="LINEAR" value="0"/>
       <value name="TILE64" value="1"/>
       <value name="XMAJOR" value="2"/>
-      <value name="TILE4"  value="3"/>
+      <value name="TILE4" value="3"/>
     </field>
     <field name="Surface Horizontal Alignment" start="14" end="15" type="uint">
       <value name="HALIGN_16" value="0"/>
@@ -910,6 +910,53 @@
     <field name="Meta" start="512" end="1023" type="RT_BVH_METADATA"/>
   </struct>
 
+  <struct name="RT_BVH_INSTANCE_LEAF" length="32">
+    <field name="Shader Index" start="0" end="23" type="uint"/>
+    <field name="Geometry Ray Mask" start="24" end="31" type="uint"/>
+    <field name="Instance Contribution To Hit Group Index" start="32" end="55" type="uint"/>
+    <field name="Leaf Type" start="61" end="61" type="uint">
+      <value name="TYPE_OPAQUE_CULLING_ENABLED" value="0"/>
+      <value name="TYPE_OPAQUE_CULLING_DISABLED" value="1"/>
+    </field>
+    <field name="Geometry Flags" start="62" end="63" type="uint">
+      <value name="GEOMETRY_OPAQUE" value="1"/>
+    </field>
+    <field name="Start Node Address" start="64" end="111" type="address"/>
+    <field name="Instance Flags" start="112" end="119" type="uint">
+      <value name="TRIANGLE_CULL_DISABLE" value="1"/>
+      <value name="TRIANGLE_FRONT_COUNTERCLOCKWISE" value="2"/>
+      <value name="FORCE_OPAQUE" value="4"/>
+      <value name="FORCE_NON_OPAQUE" value="8"/>
+    </field>
+    <field name="World To Object m00" start="128" end="159" type="float"/>
+    <field name="World To Object m01" start="160" end="191" type="float"/>
+    <field name="World To Object m02" start="192" end="223" type="float"/>
+    <field name="World To Object m10" start="224" end="255" type="float"/>
+    <field name="World To Object m11" start="256" end="287" type="float"/>
+    <field name="World To Object m12" start="288" end="319" type="float"/>
+    <field name="World To Object m20" start="320" end="351" type="float"/>
+    <field name="World To Object m21" start="352" end="383" type="float"/>
+    <field name="World To Object m22" start="384" end="415" type="float"/>
+    <field name="Object To World m30" start="416" end="447" type="float"/>
+    <field name="Object To World m31" start="448" end="479" type="float"/>
+    <field name="Object To World m32" start="480" end="511" type="float"/>
+    <field name="BVH Address" start="512" end="559" type="address"/>
+    <field name="Instance ID" start="576" end="607" type="uint"/>
+    <field name="Instance Index" start="608" end="639" type="uint"/>
+    <field name="Object To World m00" start="640" end="671" type="float"/>
+    <field name="Object To World m01" start="672" end="703" type="float"/>
+    <field name="Object To World m02" start="704" end="735" type="float"/>
+    <field name="Object To World m10" start="736" end="767" type="float"/>
+    <field name="Object To World m11" start="768" end="799" type="float"/>
+    <field name="Object To World m12" start="800" end="831" type="float"/>
+    <field name="Object To World m20" start="832" end="863" type="float"/>
+    <field name="Object To World m21" start="864" end="895" type="float"/>
+    <field name="Object To World m22" start="896" end="927" type="float"/>
+    <field name="World To Object m30" start="928" end="959" type="float"/>
+    <field name="World To Object m31" start="960" end="991" type="float"/>
+    <field name="World To Object m32" start="992" end="1023" type="float"/>
+  </struct>
+
   <struct name="RT_BVH_INTERNAL_NODE" length="16">
     <field name="Origin" start="0" end="95" type="RT_BVH_VEC3"/>
     <field name="Child Offset" start="96" end="127" type="int"/>
@@ -964,6 +1011,15 @@
     </field>
   </struct>
 
+  <struct name="RT_BVH_PROCEDURAL_LEAF" length="16">
+    <field name="Leaf Descriptor" start="0" end="63" type="RT_BVH_PRIMITIVE_LEAF_DESCRIPTOR"/>
+    <field name="Num Primitives" start="64" end="67" type="uint"/>
+    <field name="Last Primitive" start="83" end="95" type="uint"/>
+    <group count="13" start="96" size="32">
+      <field name="Primitive Index" start="0" end="31" type="uint"/>
+    </group>
+  </struct>
+
   <struct name="RT_BVH_QUAD_LEAF" length="16">
     <field name="Leaf Descriptor" start="0" end="63" type="RT_BVH_PRIMITIVE_LEAF_DESCRIPTOR"/>
     <field name="Primitive Index 0" start="64" end="95" type="uint"/>
@@ -977,64 +1033,6 @@
     </group>
   </struct>
 
-  <struct name="RT_BVH_INSTANCE_LEAF" length="32">
-    <field name="Shader Index" start="0" end="23" type="uint"/>
-    <field name="Geometry Ray Mask" start="24" end="31" type="uint"/>
-    <field name="Instance Contribution To Hit Group Index" start="32" end="55" type="uint"/>
-    <field name="Leaf Type" start="61" end="61" type="uint">
-      <value name="TYPE_OPAQUE_CULLING_ENABLED" value="0"/>
-      <value name="TYPE_OPAQUE_CULLING_DISABLED" value="1"/>
-    </field>
-    <field name="Geometry Flags" start="62" end="63" type="uint">
-      <value name="GEOMETRY_OPAQUE" value="1"/>
-    </field>
-    <field name="Start Node Address" start="64" end="111" type="address"/>
-    <field name="Instance Flags" start="112" end="119" type="uint">
-      <value name="TRIANGLE_CULL_DISABLE" value="1"/>
-      <value name="TRIANGLE_FRONT_COUNTERCLOCKWISE" value="2"/>
-      <value name="FORCE_OPAQUE" value="4"/>
-      <value name="FORCE_NON_OPAQUE" value="8"/>
-    </field>
-    <field name="World To Object m00" start="128" end="159" type="float"/>
-    <field name="World To Object m01" start="160" end="191" type="float"/>
-    <field name="World To Object m02" start="192" end="223" type="float"/>
-    <field name="World To Object m10" start="224" end="255" type="float"/>
-    <field name="World To Object m11" start="256" end="287" type="float"/>
-    <field name="World To Object m12" start="288" end="319" type="float"/>
-    <field name="World To Object m20" start="320" end="351" type="float"/>
-    <field name="World To Object m21" start="352" end="383" type="float"/>
-    <field name="World To Object m22" start="384" end="415" type="float"/>
-    <field name="Object To World m30" start="416" end="447" type="float"/>
-    <field name="Object To World m31" start="448" end="479" type="float"/>
-    <field name="Object To World m32" start="480" end="511" type="float"/>
-    <field name="BVH Address" start="512" end="559" type="address"/>
-    <field name="Instance ID" start="576" end="607" type="uint"/>
-    <field name="Instance Index" start="608" end="639" type="uint"/>
-    <field name="Object To World m00" start="640" end="671" type="float"/>
-    <field name="Object To World m01" start="672" end="703" type="float"/>
-    <field name="Object To World m02" start="704" end="735" type="float"/>
-    <field name="Object To World m10" start="736" end="767" type="float"/>
-    <field name="Object To World m11" start="768" end="799" type="float"/>
-    <field name="Object To World m12" start="800" end="831" type="float"/>
-    <field name="Object To World m20" start="832" end="863" type="float"/>
-    <field name="Object To World m21" start="864" end="895" type="float"/>
-    <field name="Object To World m22" start="896" end="927" type="float"/>
-    <field name="World To Object m30" start="928" end="959" type="float"/>
-    <field name="World To Object m31" start="960" end="991" type="float"/>
-    <field name="World To Object m32" start="992" end="1023" type="float"/>
-  </struct>
-
-  <struct name="RT_BVH_PROCEDURAL_LEAF" length="16">
-    <field name="Leaf Descriptor" start="0" end="63" type="RT_BVH_PRIMITIVE_LEAF_DESCRIPTOR"/>
-
-    <!-- Software defined -->
-    <field name="Num Primitives" start="64" end="67" type="uint"/>
-    <field name="Last Primitive" start="83" end="95" type="uint"/>
-    <group count="13" start="96" size="32">
-      <field name="Primitive Index" start="0" end="31" type="uint"/>
-    </group>
-  </struct>
-
   <struct name="SAMPLER_BORDER_COLOR_STATE" length="4">
     <field name="Border Color Float Red" start="0" end="31" type="float"/>
     <field name="Border Color 32bit Red" start="0" end="31" type="uint"/>
@@ -3015,36 +3013,6 @@
     <field name="Last Pixel Enable" start="127" end="127" type="bool"/>
   </instruction>
 
-  <instruction name="3DSTATE_SUBSLICE_HASH_TABLE" bias="2" length="14">
-    <field name="DWord Length" start="0" end="7" type="uint" default="12"/>
-    <field name="3D Command Sub Opcode" start="16" end="23" type="uint" default="31"/>
-    <field name="3D Command Opcode" start="24" end="26" type="uint" default="1"/>
-    <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
-    <field name="Command Type" start="29" end="31" type="uint" default="3"/>
-    <group count="8" start="32" size="2">
-      <field name="Slice Hash Control" start="0" end="1" type="uint">
-        <value name="COMPUTED" value="0"/>
-        <value name="UNBALANCED_TABLE_0" value="1"/>
-        <value name="TABLE_0" value="2"/>
-        <value name="TABLE_1" value="3"/>
-      </field>
-    </group>
-    <field name="Slice Table Mode" start="62" end="63" type="uint">
-      <value name="SINGLE_TABLE" value="0"/>
-      <value name="DUAL_TABLE" value="1"/>
-    </field>
-    <group count="8" start="64" size="16">
-      <group count="16" start="0" size="1">
-        <field name="Two Way Table Entry" start="0" end="0" type="uint"/>
-      </group>
-    </group>
-    <group count="8" start="192" size="32">
-      <group count="16" start="0" size="2">
-        <field name="Three Way Table Entry" start="0" end="1" type="uint"/>
-      </group>
-    </group>
-  </instruction>
-
   <instruction name="3DSTATE_SLICE_TABLE_STATE_POINTERS" bias="2" length="2">
     <field name="DWord Length" start="0" end="7" type="uint" default="0"/>
     <field name="3D Command Sub Opcode" start="16" end="23" type="uint" default="32"/>
@@ -3195,6 +3163,36 @@
     <field name="Buffer 3 Surface Pitch" start="144" end="155" type="uint"/>
   </instruction>
 
+  <instruction name="3DSTATE_SUBSLICE_HASH_TABLE" bias="2" length="14">
+    <field name="DWord Length" start="0" end="7" type="uint" default="12"/>
+    <field name="3D Command Sub Opcode" start="16" end="23" type="uint" default="31"/>
+    <field name="3D Command Opcode" start="24" end="26" type="uint" default="1"/>
+    <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
+    <field name="Command Type" start="29" end="31" type="uint" default="3"/>
+    <group count="8" start="32" size="2">
+      <field name="Slice Hash Control" start="0" end="1" type="uint">
+        <value name="COMPUTED" value="0"/>
+        <value name="UNBALANCED_TABLE_0" value="1"/>
+        <value name="TABLE_0" value="2"/>
+        <value name="TABLE_1" value="3"/>
+      </field>
+    </group>
+    <field name="Slice Table Mode" start="62" end="63" type="uint">
+      <value name="SINGLE_TABLE" value="0"/>
+      <value name="DUAL_TABLE" value="1"/>
+    </field>
+    <group count="8" start="64" size="16">
+      <group count="16" start="0" size="1">
+        <field name="Two Way Table Entry" start="0" end="0" type="uint"/>
+      </group>
+    </group>
+    <group count="8" start="192" size="32">
+      <group count="16" start="0" size="2">
+        <field name="Three Way Table Entry" start="0" end="1" type="uint"/>
+      </group>
+    </group>
+  </instruction>
+
   <instruction name="3DSTATE_TASK_CONTROL" bias="2" length="3">
     <field name="DWord Length" start="0" end="7" type="uint" default="1"/>
     <field name="3D Command Sub Opcode" start="16" end="23" type="uint" default="124"/>
@@ -7576,11 +7574,11 @@
       <value name="PARTIAL_RESOLVE" value="2"/>
     </field>
     <field name="Color Depth" start="19" end="21" type="uint" prefix="XY_BPP">
-      <value name="8_BIT"   value="0"/>
-      <value name="16_BIT"  value="1"/>
-      <value name="32_BIT"  value="2"/>
-      <value name="64_BIT"  value="3"/>
-      <value name="96_BIT"  value="4"/>
+      <value name="8_BIT" value="0"/>
+      <value name="16_BIT" value="1"/>
+      <value name="32_BIT" value="2"/>
+      <value name="64_BIT" value="3"/>
+      <value name="96_BIT" value="4"/>
       <value name="128_BIT" value="5"/>
     </field>
     <field name="Opcode" start="22" end="28" type="uint" default="0x41"/>
@@ -7664,7 +7662,6 @@
     <field name="Destination Mip Tail Start LOD" start="584" end="587" type="uint"/>
     <field name="Destination Depth/Stencil Resource" start="594" end="594" type="bool"/>
     <field name="Destination Array Index" start="597" end="607" type="uint"/>
-
     <field name="Source Surface Height" start="608" end="621" type="uint"/>
     <field name="Source Surface Width" start="622" end="635" type="uint"/>
     <field name="Source Surface Type" start="637" end="639" type="uint" prefix="XY_SURFTYPE">
@@ -7700,11 +7697,11 @@
       <value name="FAST_CLEAR_0" value="2"/>
     </field>
     <field name="Color Depth" start="19" end="21" type="uint" prefix="XY_BPP">
-      <value name="8_BIT"   value="0"/>
-      <value name="16_BIT"  value="1"/>
-      <value name="32_BIT"  value="2"/>
-      <value name="64_BIT"  value="3"/>
-      <value name="96_BIT"  value="4"/>
+      <value name="8_BIT" value="0"/>
+      <value name="16_BIT" value="1"/>
+      <value name="32_BIT" value="2"/>
+      <value name="64_BIT" value="3"/>
+      <value name="96_BIT" value="4"/>
       <value name="128_BIT" value="5"/>
     </field>
     <field name="Opcode" start="22" end="28" type="uint" default="0x44"/>
@@ -7735,7 +7732,7 @@
       <value name="SYSTEM" value="1"/>
     </field>
     <group count="4" start="224" size="32">
-       <field name="Fill Color" start="0" end="31" type="uint"/>
+      <field name="Fill Color" start="0" end="31" type="uint"/>
     </group>
     <field name="Destination Compression Format" start="352" end="356" type="uint"/>
     <field name="Destination Clear Value Enable" start="357" end="357" type="bool"/>
@@ -7828,8 +7825,8 @@
   </register>
 
   <register name="CHICKEN_RASTER_1" length="1" num="0x6204">
-     <field name="AA Line Quality Fix" start="5" end="5" type="bool"/>
-     <field name="AA Line Quality Fix Mask" start="21" end="21" type="bool"/>
+    <field name="AA Line Quality Fix" start="5" end="5" type="bool"/>
+    <field name="AA Line Quality Fix Mask" start="21" end="21" type="bool"/>
   </register>
 
   <register name="CL_INVOCATION_COUNT" length="2" num="0x2338">
@@ -7945,6 +7942,23 @@
     <field name="TSG1 Done" start="24" end="24" type="bool"/>
   </register>
 
+  <register name="INSTDONE_GEOM" length="1" num="0x666c">
+    <field name="VFL Done" start="1" end="1" type="bool"/>
+    <field name="VS Done" start="2" end="2" type="bool"/>
+    <field name="HS Done" start="3" end="3" type="bool"/>
+    <field name="TE Done" start="4" end="4" type="bool"/>
+    <field name="DS Done" start="5" end="5" type="bool"/>
+    <field name="GS Done" start="6" end="6" type="bool"/>
+    <field name="SOL Done" start="7" end="7" type="bool"/>
+    <field name="CL Done" start="8" end="8" type="bool"/>
+    <field name="SF Done" start="9" end="9" type="bool"/>
+    <field name="TDG1 Done" start="11" end="11" type="bool"/>
+    <field name="URBM Done" start="13" end="13" type="bool"/>
+    <field name="SVG Done" start="14" end="14" type="bool"/>
+    <field name="TSG0 Done" start="17" end="17" type="bool"/>
+    <field name="SDE Done" start="22" end="22" type="bool"/>
+  </register>
+
   <register name="L3ALLOC" length="1" num="0xB134">
     <field name="Allocation Error" start="0" end="0" type="uint"/>
     <field name="URB Allocation" start="1" end="7" type="uint"/>
@@ -8080,23 +8094,6 @@
     <field name="DAPRBE2 Done" start="13" end="13" type="bool"/>
   </register>
 
-  <register name="INSTDONE_GEOM" length="1" num="0x666c">
-    <field name="VFL Done" start="1" end="1" type="bool"/>
-    <field name="VS Done" start="2" end="2" type="bool"/>
-    <field name="HS Done" start="3" end="3" type="bool"/>
-    <field name="TE Done" start="4" end="4" type="bool"/>
-    <field name="DS Done" start="5" end="5" type="bool"/>
-    <field name="GS Done" start="6" end="6" type="bool"/>
-    <field name="SOL Done" start="7" end="7" type="bool"/>
-    <field name="CL Done" start="8" end="8" type="bool"/>
-    <field name="SF Done" start="9" end="9" type="bool"/>
-    <field name="TDG1 Done" start="11" end="11" type="bool"/>
-    <field name="URBM Done" start="13" end="13" type="bool"/>
-    <field name="SVG Done" start="14" end="14" type="bool"/>
-    <field name="TSG0 Done" start="17" end="17" type="bool"/>
-    <field name="SDE Done" start="22" end="22" type="bool"/>
-  </register>
-
   <register name="SLICE_COMMON_ECO_CHICKEN1" length="1" num="0x731c">
     <field name="State Cache Redirect To CS Section Enable" start="11" end="11" type="bool"/>
     <field name="State Cache Redirect To CS Section Enable Mask" start="27" end="27" type="bool"/>
@@ -8185,10 +8182,10 @@
   </register>
 
   <register name="VFG_PREEMPTION_CHICKEN_BITS" length="1" num="0x83B4">
-    <field name="Batch Preemption Disable" start="8" end="8" type="bool"/>
     <field name="PolygonTrifanLineLoop Preemption Disable" start="4" end="4" type="bool"/>
-    <field name="Batch Preemption Disable Mask" start="24" end="24" type="bool"/>
+    <field name="Batch Preemption Disable" start="8" end="8" type="bool"/>
     <field name="PolygonTrifanLineLoop Preemption Disable Mask" start="20" end="20" type="bool"/>
+    <field name="Batch Preemption Disable Mask" start="24" end="24" type="bool"/>
   </register>
 
   <register name="VS_INVOCATION_COUNT" length="2" num="0x2320">
diff --git a/src/intel/genxml/gen7.xml b/src/intel/genxml/gen7.xml
index 15a4451..45002c0 100644
--- a/src/intel/genxml/gen7.xml
+++ b/src/intel/genxml/gen7.xml
@@ -3790,13 +3790,13 @@
   </register>
 
   <register name="L3SQCREG1" length="1" num="0xb010">
+    <field name="L3SQ High Priority Credit Initialization" start="16" end="19" type="uint">
+      <value name="SQHPCI_DEFAULT" value="0x3"/>
+    </field>
     <field name="L3SQ General Priority Credit Initialization" start="20" end="23" type="uint">
       <value name="SQGPCI_DEFAULT" value="0x7"/>
       <value name="BYT_SQGPCI_DEFAULT" value="0xd"/>
     </field>
-    <field name="L3SQ High Priority Credit Initialization" start="16" end="19" type="uint">
-      <value name="SQHPCI_DEFAULT" value="0x3"/>
-    </field>
     <field name="Convert DC_UC" start="24" end="24" type="bool"/>
     <field name="Convert IS_UC" start="25" end="25" type="bool"/>
     <field name="Convert C_UC" start="26" end="26" type="bool"/>
diff --git a/src/intel/genxml/gen75.xml b/src/intel/genxml/gen75.xml
index 9db9979..f0de75d 100644
--- a/src/intel/genxml/gen75.xml
+++ b/src/intel/genxml/gen75.xml
@@ -4206,12 +4206,12 @@
   </register>
 
   <register name="L3SQCREG1" length="1" num="0xb010">
-    <field name="L3SQ General Priority Credit Initialization" start="19" end="23" type="uint">
-      <value name="SQGPCI_DEFAULT" value="0xc"/>
-    </field>
     <field name="L3SQ High Priority Credit Initialization" start="14" end="18" type="uint">
       <value name="SQHPCI_DEFAULT" value="0x4"/>
     </field>
+    <field name="L3SQ General Priority Credit Initialization" start="19" end="23" type="uint">
+      <value name="SQGPCI_DEFAULT" value="0xc"/>
+    </field>
     <field name="Convert DC_UC" start="24" end="24" type="bool"/>
     <field name="Convert IS_UC" start="25" end="25" type="bool"/>
     <field name="Convert C_UC" start="26" end="26" type="bool"/>
diff --git a/src/intel/genxml/gen_rt.xml b/src/intel/genxml/gen_rt.xml
index 929f5ca..d60de8e 100644
--- a/src/intel/genxml/gen_rt.xml
+++ b/src/intel/genxml/gen_rt.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" ?>
 <genxml name="RT" gen="">
+
   <struct name="BINDLESS_SHADER_RECORD" length="2">
     <field name="Offset To Local Arguments" start="0" end="2" type="uint"/>
     <field name="Bindless Shader Dispatch Mode" start="4" end="4" type="uint">
@@ -9,47 +10,6 @@
     <field name="Kernel Start Pointer" start="6" end="31" type="offset"/>
   </struct>
 
-  <struct name="RT_GENERAL_SBT_HANDLE" length="8">
-    <field name="General" start="0" end="63" type="BINDLESS_SHADER_RECORD"/>
-  </struct>
-
-  <struct name="RT_TRIANGLES_SBT_HANDLE" length="8">
-    <field name="Closest Hit" start="0" end="63" type="BINDLESS_SHADER_RECORD"/>
-    <field name="Any Hit" start="64" end="127" type="BINDLESS_SHADER_RECORD"/>
-  </struct>
-
-  <struct name="RT_PROCEDURAL_SBT_HANDLE" length="8">
-    <field name="Closest Hit" start="0" end="63" type="BINDLESS_SHADER_RECORD"/>
-    <field name="Intersection" start="64" end="127" type="BINDLESS_SHADER_RECORD"/>
-  </struct>
-
-  <struct name="RT_SHADER_TABLE" length="2">
-    <field name="Base Address" start="0" end="47" type="address"/>
-    <field name="Stride" start="48" end="63" type="uint"/>
-  </struct>
-
-  <struct name="RT_DISPATCH_GLOBALS" length="20">
-    <!-- These are dictated by hardware -->
-    <field name="Mem Base Address" start="0" end="63" type="address"/>
-    <field name="Call Stack Handler" start="64" end="127" type="BINDLESS_SHADER_RECORD"/>
-    <field name="Async RT Stack Size" start="128" end="159" type="uint"/>
-    <field name="Num DSS RT Stacks" start="160" end="175" type="uint"/>
-    <field name="Max BVH Levels" start="192" end="194" type="uint"/>
-    <field name="Flags" start="224" end="224" type="uint">
-      <value name="RT_DEPTH_TEST_LESS_EQUAL" value="1"/>
-    </field>
-
-    <!-- These are simply a software interface -->
-    <field name="Hit Group Table" start="256" end="319" type="RT_SHADER_TABLE"/>
-    <field name="Miss Group Table" start="320" end="383" type="RT_SHADER_TABLE"/>
-    <field name="SW Stack Size" start="384" end="415" type="uint"/>
-    <field name="Launch Width" start="416" end="447" type="uint"/>
-    <field name="Launch Height" start="448" end="479" type="uint"/>
-    <field name="Launch Depth" start="480" end="511" type="uint"/>
-    <field name="Callable Group Table" start="512" end="575" type="RT_SHADER_TABLE"/>
-    <field name="Resume Shader Table" start="576" end="639" type="address"/>
-  </struct>
-
   <struct name="RT_BVH_VEC3" length="3">
     <field name="X" start="0" end="31" type="float"/>
     <field name="Y" start="32" end="63" type="float"/>
@@ -66,6 +26,53 @@
     <field name="Meta" start="512" end="1023" type="RT_BVH_METADATA"/>
   </struct>
 
+  <struct name="RT_BVH_INSTANCE_LEAF" length="32">
+    <field name="Shader Index" start="0" end="23" type="uint"/>
+    <field name="Geometry Ray Mask" start="24" end="31" type="uint"/>
+    <field name="Instance Contribution To Hit Group Index" start="32" end="55" type="uint"/>
+    <field name="Leaf Type" start="61" end="61" type="uint">
+      <value name="TYPE_OPAQUE_CULLING_ENABLED" value="0"/>
+      <value name="TYPE_OPAQUE_CULLING_DISABLED" value="1"/>
+    </field>
+    <field name="Geometry Flags" start="62" end="63" type="uint">
+      <value name="GEOMETRY_OPAQUE" value="1"/>
+    </field>
+    <field name="Start Node Address" start="64" end="111" type="address"/>
+    <field name="Instance Flags" start="112" end="119" type="uint">
+      <value name="TRIANGLE_CULL_DISABLE" value="1"/>
+      <value name="TRIANGLE_FRONT_COUNTERCLOCKWISE" value="2"/>
+      <value name="FORCE_OPAQUE" value="4"/>
+      <value name="FORCE_NON_OPAQUE" value="8"/>
+    </field>
+    <field name="World To Object m00" start="128" end="159" type="float"/>
+    <field name="World To Object m01" start="160" end="191" type="float"/>
+    <field name="World To Object m02" start="192" end="223" type="float"/>
+    <field name="World To Object m10" start="224" end="255" type="float"/>
+    <field name="World To Object m11" start="256" end="287" type="float"/>
+    <field name="World To Object m12" start="288" end="319" type="float"/>
+    <field name="World To Object m20" start="320" end="351" type="float"/>
+    <field name="World To Object m21" start="352" end="383" type="float"/>
+    <field name="World To Object m22" start="384" end="415" type="float"/>
+    <field name="Object To World m30" start="416" end="447" type="float"/>
+    <field name="Object To World m31" start="448" end="479" type="float"/>
+    <field name="Object To World m32" start="480" end="511" type="float"/>
+    <field name="BVH Address" start="512" end="559" type="address"/>
+    <field name="Instance ID" start="576" end="607" type="uint"/>
+    <field name="Instance Index" start="608" end="639" type="uint"/>
+    <field name="Object To World m00" start="640" end="671" type="float"/>
+    <field name="Object To World m01" start="672" end="703" type="float"/>
+    <field name="Object To World m02" start="704" end="735" type="float"/>
+    <field name="Object To World m10" start="736" end="767" type="float"/>
+    <field name="Object To World m11" start="768" end="799" type="float"/>
+    <field name="Object To World m12" start="800" end="831" type="float"/>
+    <field name="Object To World m20" start="832" end="863" type="float"/>
+    <field name="Object To World m21" start="864" end="895" type="float"/>
+    <field name="Object To World m22" start="896" end="927" type="float"/>
+    <field name="World To Object m30" start="928" end="959" type="float"/>
+    <field name="World To Object m31" start="960" end="991" type="float"/>
+    <field name="World To Object m32" start="992" end="1023" type="float"/>
+  </struct>
+
   <struct name="RT_BVH_INTERNAL_NODE" length="16">
     <field name="Origin" start="0" end="95" type="RT_BVH_VEC3"/>
     <field name="Child Offset" start="96" end="127" type="int"/>
@@ -119,6 +126,15 @@
     </field>
   </struct>
 
+  <struct name="RT_BVH_PROCEDURAL_LEAF" length="16">
+    <field name="Leaf Descriptor" start="0" end="63" type="RT_BVH_PRIMITIVE_LEAF_DESCRIPTOR"/>
+    <field name="Num Primitives" start="64" end="67" type="uint"/>
+    <field name="Last Primitive" start="83" end="95" type="uint"/>
+    <group count="13" start="96" size="32">
+      <field name="Primitive Index" start="0" end="31" type="uint"/>
+    </group>
+  </struct>
+
   <struct name="RT_BVH_QUAD_LEAF" length="16">
     <field name="Leaf Descriptor" start="0" end="63" type="RT_BVH_PRIMITIVE_LEAF_DESCRIPTOR"/>
     <field name="Primitive Index 0" start="64" end="95" type="uint"/>
@@ -132,61 +148,41 @@
     </group>
   </struct>
 
-  <struct name="RT_BVH_INSTANCE_LEAF" length="32">
-    <field name="Shader Index" start="0" end="23" type="uint"/>
-    <field name="Geometry Ray Mask" start="24" end="31" type="uint"/>
-    <field name="Instance Contribution To Hit Group Index" start="32" end="55" type="uint"/>
-    <field name="Leaf Type" start="61" end="61" type="uint">
-      <value name="TYPE_OPAQUE_CULLING_ENABLED" value="0"/>
-      <value name="TYPE_OPAQUE_CULLING_DISABLED" value="1"/>
-    </field>
-    <field name="Geometry Flags" start="62" end="63" type="uint">
-      <value name="GEOMETRY_OPAQUE" value="1"/>
-    </field>
-    <field name="Start Node Address" start="64" end="111" type="address"/>
-    <field name="Instance Flags" start="112" end="119" type="uint">
-      <value name="TRIANGLE_CULL_DISABLE" value="1"/>
-      <value name="TRIANGLE_FRONT_COUNTERCLOCKWISE" value="2"/>
-      <value name="FORCE_OPAQUE" value="4"/>
-      <value name="FORCE_NON_OPAQUE" value="8"/>
+  <struct name="RT_SHADER_TABLE" length="2">
+    <field name="Base Address" start="0" end="47" type="address"/>
+    <field name="Stride" start="48" end="63" type="uint"/>
+  </struct>
+
+  <struct name="RT_DISPATCH_GLOBALS" length="20">
+    <field name="Mem Base Address" start="0" end="63" type="address"/>
+    <field name="Call Stack Handler" start="64" end="127" type="BINDLESS_SHADER_RECORD"/>
+    <field name="Async RT Stack Size" start="128" end="159" type="uint"/>
+    <field name="Num DSS RT Stacks" start="160" end="175" type="uint"/>
+    <field name="Max BVH Levels" start="192" end="194" type="uint"/>
+    <field name="Flags" start="224" end="224" type="uint">
+      <value name="RT_DEPTH_TEST_LESS_EQUAL" value="1"/>
     </field>
-    <field name="World To Object m00" start="128" end="159" type="float"/>
-    <field name="World To Object m01" start="160" end="191" type="float"/>
-    <field name="World To Object m02" start="192" end="223" type="float"/>
-    <field name="World To Object m10" start="224" end="255" type="float"/>
-    <field name="World To Object m11" start="256" end="287" type="float"/>
-    <field name="World To Object m12" start="288" end="319" type="float"/>
-    <field name="World To Object m20" start="320" end="351" type="float"/>
-    <field name="World To Object m21" start="352" end="383" type="float"/>
-    <field name="World To Object m22" start="384" end="415" type="float"/>
-    <field name="Object To World m30" start="416" end="447" type="float"/>
-    <field name="Object To World m31" start="448" end="479" type="float"/>
-    <field name="Object To World m32" start="480" end="511" type="float"/>
-    <field name="BVH Address" start="512" end="559" type="address"/>
-    <field name="Instance ID" start="576" end="607" type="uint"/>
-    <field name="Instance Index" start="608" end="639" type="uint"/>
-    <field name="Object To World m00" start="640" end="671" type="float"/>
-    <field name="Object To World m01" start="672" end="703" type="float"/>
-    <field name="Object To World m02" start="704" end="735" type="float"/>
-    <field name="Object To World m10" start="736" end="767" type="float"/>
-    <field name="Object To World m11" start="768" end="799" type="float"/>
-    <field name="Object To World m12" start="800" end="831" type="float"/>
-    <field name="Object To World m20" start="832" end="863" type="float"/>
-    <field name="Object To World m21" start="864" end="895" type="float"/>
-    <field name="Object To World m22" start="896" end="927" type="float"/>
-    <field name="World To Object m30" start="928" end="959" type="float"/>
-    <field name="World To Object m31" start="960" end="991" type="float"/>
-    <field name="World To Object m32" start="992" end="1023" type="float"/>
+    <field name="Hit Group Table" start="256" end="319" type="RT_SHADER_TABLE"/>
+    <field name="Miss Group Table" start="320" end="383" type="RT_SHADER_TABLE"/>
+    <field name="SW Stack Size" start="384" end="415" type="uint"/>
+    <field name="Launch Width" start="416" end="447" type="uint"/>
+    <field name="Launch Height" start="448" end="479" type="uint"/>
+    <field name="Launch Depth" start="480" end="511" type="uint"/>
+    <field name="Callable Group Table" start="512" end="575" type="RT_SHADER_TABLE"/>
+    <field name="Resume Shader Table" start="576" end="639" type="address"/>
   </struct>
 
-  <struct name="RT_BVH_PROCEDURAL_LEAF" length="16">
-    <field name="Leaf Descriptor" start="0" end="63" type="RT_BVH_PRIMITIVE_LEAF_DESCRIPTOR"/>
+  <struct name="RT_GENERAL_SBT_HANDLE" length="8">
+    <field name="General" start="0" end="63" type="BINDLESS_SHADER_RECORD"/>
+  </struct>
 
-    <!-- Software defined -->
-    <field name="Num Primitives" start="64" end="67" type="uint"/>
-    <field name="Last Primitive" start="83" end="95" type="uint"/>
-    <group count="13" start="96" size="32">
-      <field name="Primitive Index" start="0" end="31" type="uint"/>
-    </group>
+  <struct name="RT_PROCEDURAL_SBT_HANDLE" length="8">
+    <field name="Closest Hit" start="0" end="63" type="BINDLESS_SHADER_RECORD"/>
+    <field name="Intersection" start="64" end="127" type="BINDLESS_SHADER_RECORD"/>
+  </struct>
+
+  <struct name="RT_TRIANGLES_SBT_HANDLE" length="8">
+    <field name="Closest Hit" start="0" end="63" type="BINDLESS_SHADER_RECORD"/>
+    <field name="Any Hit" start="64" end="127" type="BINDLESS_SHADER_RECORD"/>
   </struct>
 </genxml>
-- 
2.7.4