From f4902bb189c810cc333a87d93babfc5a51e56ae5 Mon Sep 17 00:00:00 2001
From: Jason Ekstrand <jason@jlekstrand.net>
Date: Wed, 17 Jun 2020 14:04:02 -0500
Subject: [PATCH] intel/genxml,anv,iris: Drop the legacy compute path from
 gen125.xml

Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8342>
---
 src/gallium/drivers/iris/iris_state.c |   2 +-
 src/intel/genxml/gen125.xml           | 226 +-------------------------
 src/intel/vulkan/genX_cmd_buffer.c    |   2 +-
 3 files changed, 3 insertions(+), 227 deletions(-)

diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c
index 155eedbfbb6..3cef43bd3bf 100644
--- a/src/gallium/drivers/iris/iris_state.c
+++ b/src/gallium/drivers/iris/iris_state.c
@@ -6723,7 +6723,7 @@ iris_upload_compute_walker(struct iris_context *ice,
       cw.ThreadGroupIDZDimension        = grid->grid[2];
       cw.ExecutionMask                  = last_mask;
 
-      cw.InterfaceDescriptor = (struct GENX(INTERFACE_DESCRIPTOR_DATA_HP)) {
+      cw.InterfaceDescriptor = (struct GENX(INTERFACE_DESCRIPTOR_DATA)) {
          .KernelStartPointer = KSP(shader),
          .NumberofThreadsinGPGPUThreadGroup = threads,
          .SharedLocalMemorySize =
diff --git a/src/intel/genxml/gen125.xml b/src/intel/genxml/gen125.xml
index 4800923353f..94f5d3344c9 100644
--- a/src/intel/genxml/gen125.xml
+++ b/src/intel/genxml/gen125.xml
@@ -519,59 +519,6 @@
   </struct>
 
   <struct name="INTERFACE_DESCRIPTOR_DATA" length="8">
-    <field name="Kernel Start Pointer" start="6" end="47" type="offset"/>
-    <field name="Software Exception Enable" start="71" end="71" type="bool"/>
-    <field name="Mask Stack Exception Enable" start="75" end="75" type="bool"/>
-    <field name="Illegal Opcode Exception Enable" start="77" end="77" type="bool"/>
-    <field name="Floating Point Mode" start="80" end="80" type="uint">
-      <value name="IEEE-754" value="0"/>
-      <value name="Alternate" value="1"/>
-    </field>
-    <field name="Thread Priority" start="81" end="81" type="uint">
-      <value name="Normal Priority" value="0"/>
-      <value name="High Priority" value="1"/>
-    </field>
-    <field name="Single Program Flow" start="82" end="82" type="bool"/>
-    <field name="Denorm Mode" start="83" end="83" type="uint">
-      <value name="Ftz" value="0"/>
-      <value name="SetByKernel" value="1"/>
-    </field>
-    <field name="Thread Preemption Disable" start="84" end="84" type="bool"/>
-    <field name="Sampler Count" start="98" end="100" type="uint">
-      <value name="No samplers used" value="0"/>
-      <value name="Between 1 and 4 samplers used" value="1"/>
-      <value name="Between 5 and 8 samplers used" value="2"/>
-      <value name="Between 9 and 12 samplers used" value="3"/>
-      <value name="Between 13 and 16 samplers used" value="4"/>
-    </field>
-    <field name="Sampler State Pointer" start="101" end="127" type="offset"/>
-    <field name="Binding Table Entry Count" start="128" end="132" type="uint"/>
-    <field name="Binding Table Pointer" start="133" end="143" type="offset"/>
-    <field name="Constant URB Entry Read Offset" start="160" end="175" type="uint"/>
-    <field name="Constant URB Entry Read Length" start="176" end="191" type="uint"/>
-    <field name="Number of Threads in GPGPU Thread Group" start="192" end="201" type="uint"/>
-    <field name="Global Barrier Enable" start="207" end="207" type="bool"/>
-    <field name="Shared Local Memory Size" start="208" end="212" type="uint">
-      <value name="Encodes 0K" value="0"/>
-      <value name="Encodes 1K" value="1"/>
-      <value name="Encodes 2K" value="2"/>
-      <value name="Encodes 4K" value="3"/>
-      <value name="Encodes 8K" value="4"/>
-      <value name="Encodes 16K" value="5"/>
-      <value name="Encodes 32K" value="6"/>
-      <value name="Encodes 64K" value="7"/>
-    </field>
-    <field name="Barrier Enable" start="213" end="213" type="bool"/>
-    <field name="Rounding Mode" start="214" end="215" type="uint">
-      <value name="RTNE" value="0"/>
-      <value name="RU" value="1"/>
-      <value name="RD" value="2"/>
-      <value name="RTZ" value="3"/>
-    </field>
-    <field name="Cross-Thread Constant Data Read Length" start="224" end="231" type="uint"/>
-  </struct>
-
-  <struct name="INTERFACE_DESCRIPTOR_DATA_HP" length="8">
     <field name="Kernel Start Pointer" start="6" end="31" type="offset"/>
     <field name="Software Exception Enable" start="71" end="71" type="bool"/>
     <field name="Mask Stack Exception Enable" start="75" end="75" type="bool"/>
@@ -3300,7 +3247,7 @@
     <field name="Preempt X" start="480" end="511" type="uint"/>
     <field name="Preempt Y" start="512" end="543" type="uint"/>
     <field name="Preempt Z" start="544" end="575" type="uint"/>
-    <field name="Interface Descriptor" start="576" end="831" type="INTERFACE_DESCRIPTOR_DATA_HP"/>
+    <field name="Interface Descriptor" start="576" end="831" type="INTERFACE_DESCRIPTOR_DATA"/>
     <field name="Post Sync" start="832" end="991" type="POSTSYNC_DATA"/>
     <group count="8" start="992" size="32">
       <field name="Inline Data" start="0" end="31" type="uint"/>
@@ -4296,177 +4243,6 @@
     </group>
   </instruction>
 
-  <instruction name="MEDIA_CURBE_LOAD" bias="2" length="4" engine="render">
-    <field name="DWord Length" start="0" end="15" type="uint" default="2"/>
-    <field name="SubOpcode" start="16" end="23" type="uint" default="1"/>
-    <field name="Media Command Opcode" start="24" end="26" type="uint" default="0"/>
-    <field name="Pipeline" start="27" end="28" type="uint" default="2"/>
-    <field name="Command Type" start="29" end="31" type="uint" default="3"/>
-    <field name="CURBE Total Data Length" start="64" end="80" type="uint"/>
-    <field name="CURBE Data Start Address" start="96" end="127" type="uint"/>
-  </instruction>
-
-  <instruction name="MEDIA_INTERFACE_DESCRIPTOR_LOAD" bias="2" length="4" engine="render">
-    <field name="DWord Length" start="0" end="15" type="uint" default="2"/>
-    <field name="SubOpcode" start="16" end="23" type="uint" default="2"/>
-    <field name="Media Command Opcode" start="24" end="26" type="uint" default="0"/>
-    <field name="Pipeline" start="27" end="28" type="uint" default="2"/>
-    <field name="Command Type" start="29" end="31" type="uint" default="3"/>
-    <field name="Interface Descriptor Total Length" start="64" end="80" type="uint"/>
-    <field name="Interface Descriptor Data Start Address" start="96" end="127" type="offset"/>
-  </instruction>
-
-  <instruction name="MEDIA_OBJECT" bias="2" engine="render">
-    <field name="DWord Length" start="0" end="14" type="uint" default="4"/>
-    <field name="Media Command Sub-Opcode" start="16" end="23" type="uint" default="0"/>
-    <field name="Media Command Opcode" start="24" end="26" type="uint" default="1"/>
-    <field name="Media Command Pipeline" start="27" end="28" type="uint" default="2"/>
-    <field name="Command Type" start="29" end="31" type="uint" default="3"/>
-    <field name="Interface Descriptor Offset" start="32" end="37" type="uint"/>
-    <field name="Indirect Data Length" start="64" end="80" type="uint"/>
-    <field name="SubSlice Destination Select" start="81" end="82" type="uint">
-      <value name="Subslice 3" value="3"/>
-      <value name="SubSlice 2" value="2"/>
-      <value name="SubSlice 1" value="1"/>
-      <value name="SubSlice 0" value="0"/>
-    </field>
-    <field name="Slice Destination Select" start="83" end="84" type="uint">
-      <value name="Slice 0" value="0"/>
-      <value name="Slice 1" value="1"/>
-      <value name="Slice 2" value="2"/>
-    </field>
-    <field name="Force Destination" start="86" end="86" type="uint"/>
-    <field name="Thread Synchronization" start="88" end="88" type="uint">
-      <value name="No thread synchronization" value="0"/>
-      <value name="Thread dispatch is synchronized by the 'spawn root thread' message" value="1"/>
-    </field>
-    <field name="Slice Destination Select MSBs" start="89" end="90" type="uint"/>
-    <field name="Children Present" start="95" end="95" type="bool"/>
-    <field name="Indirect Data Start Address" start="96" end="127" type="address"/>
-    <field name="X Position" start="128" end="136" type="uint"/>
-    <field name="Y Position" start="144" end="152" type="uint"/>
-    <field name="Block Color" start="176" end="183" type="uint"/>
-    <group count="0" start="192" size="32">
-      <field name="Inline Data" start="0" end="31" type="uint"/>
-    </group>
-  </instruction>
-
-  <instruction name="MEDIA_OBJECT_GRPID" bias="2" engine="render">
-    <field name="DWord Length" start="0" end="15" type="uint" default="5"/>
-    <field name="Media Command Sub-Opcode" start="16" end="23" type="uint" default="6"/>
-    <field name="Media Command Opcode" start="24" end="26" type="uint" default="1"/>
-    <field name="Media Command Pipeline" start="27" end="28" type="uint" default="2"/>
-    <field name="Command Type" start="29" end="31" type="uint" default="3"/>
-    <field name="Interface Descriptor Offset" start="32" end="37" type="uint"/>
-    <field name="Indirect Data Length" start="64" end="80" type="uint"/>
-    <field name="End of Thread Group" start="87" end="87" type="uint"/>
-    <field name="Indirect Data Start Address" start="96" end="127" type="address"/>
-    <field name="X Position" start="128" end="136" type="uint"/>
-    <field name="Y Position" start="144" end="152" type="uint"/>
-    <field name="Block Color" start="176" end="183" type="uint"/>
-    <field name="GroupID" start="192" end="223" type="uint"/>
-    <group count="0" start="224" size="32">
-      <field name="Inline Data" start="0" end="31" type="uint"/>
-    </group>
-  </instruction>
-
-  <instruction name="MEDIA_OBJECT_PRT" bias="2" length="16" engine="render">
-    <field name="DWord Length" start="0" end="14" type="uint" default="14"/>
-    <field name="SubOpcode" start="16" end="23" type="uint" default="2"/>
-    <field name="Media Command Opcode" start="24" end="26" type="uint" default="1"/>
-    <field name="Pipeline" start="27" end="28" type="uint" default="2"/>
-    <field name="Command Type" start="29" end="31" type="uint" default="3"/>
-    <field name="Interface Descriptor Offset" start="32" end="37" type="uint"/>
-    <field name="PRT_FenceType" start="86" end="86" type="uint">
-      <value name="Root thread queue" value="0"/>
-      <value name="VFE state flush" value="1"/>
-    </field>
-    <field name="PRT_Fence Needed" start="87" end="87" type="bool"/>
-    <field name="Children Present" start="95" end="95" type="bool"/>
-    <group count="12" start="128" size="32">
-      <field name="Inline Data" start="0" end="31" type="uint"/>
-    </group>
-  </instruction>
-
-  <instruction name="MEDIA_OBJECT_WALKER" bias="2" engine="render">
-    <field name="DWord Length" start="0" end="14" type="uint" default="15"/>
-    <field name="SubOpcode" start="16" end="23" type="uint" default="3"/>
-    <field name="Media Command Opcode" start="24" end="26" type="uint" default="1"/>
-    <field name="Pipeline" start="27" end="28" type="uint" default="2"/>
-    <field name="Command Type" start="29" end="31" type="uint" default="3"/>
-    <field name="Interface Descriptor Offset" start="32" end="37" type="uint"/>
-    <field name="Indirect Data Length" start="64" end="80" type="uint"/>
-    <field name="Masked Dispatch" start="86" end="87" type="uint"/>
-    <field name="Thread Synchronization" start="88" end="88" type="uint">
-      <value name="No thread synchronization" value="0"/>
-      <value name="Thread dispatch is synchronized by the 'spawn root thread' message" value="1"/>
-    </field>
-    <field name="Indirect Data Start Address" start="96" end="127" type="uint"/>
-    <field name="Group ID Loop Select" start="168" end="191" type="uint">
-      <value name="No_Groups" value="0"/>
-      <value name="Color_Groups" value="1"/>
-      <value name="InnerLocal_Groups" value="2"/>
-      <value name="MidLocal_Groups" value="3"/>
-      <value name="OuterLocal_Groups" value="4"/>
-      <value name="InnerGlobal_Groups" value="5"/>
-    </field>
-    <field name="Mid-Loop Unit X" start="200" end="201" type="int"/>
-    <field name="Local Mid-Loop Unit Y" start="204" end="205" type="int"/>
-    <field name="Middle Loop Extra Steps" start="208" end="212" type="uint"/>
-    <field name="Color Count Minus One" start="216" end="223" type="uint"/>
-    <field name="Local Loop Exec Count" start="224" end="235" type="uint"/>
-    <field name="Global Loop Exec Count" start="240" end="251" type="uint"/>
-    <field name="Block Resolution X" start="256" end="266" type="uint"/>
-    <field name="Block Resolution Y" start="272" end="282" type="uint"/>
-    <field name="Local Start X" start="288" end="298" type="uint"/>
-    <field name="Local Start Y" start="304" end="314" type="uint"/>
-    <field name="Local Outer Loop Stride X" start="352" end="363" type="int"/>
-    <field name="Local Outer Loop Stride Y" start="368" end="379" type="int"/>
-    <field name="Local Inner Loop Unit X" start="384" end="395" type="int"/>
-    <field name="Local Inner Loop Unit Y" start="400" end="411" type="int"/>
-    <field name="Global Resolution X" start="416" end="426" type="uint"/>
-    <field name="Global Resolution Y" start="432" end="442" type="uint"/>
-    <field name="Global Start X" start="448" end="459" type="int"/>
-    <field name="Global Start Y" start="464" end="475" type="int"/>
-    <field name="Global Outer Loop Stride X" start="480" end="491" type="int"/>
-    <field name="Global Outer Loop Stride Y" start="496" end="507" type="int"/>
-    <field name="Global Inner Loop Unit X" start="512" end="523" type="int"/>
-    <field name="Global Inner Loop Unit Y" start="528" end="539" type="int"/>
-    <group count="0" start="544" size="32">
-      <field name="Inline Data" start="0" end="31" type="uint"/>
-    </group>
-  </instruction>
-
-  <instruction name="MEDIA_STATE_FLUSH" bias="2" length="2" engine="render">
-    <field name="DWord Length" start="0" end="15" type="uint" default="0"/>
-    <field name="SubOpcode" start="16" end="23" type="uint" default="4"/>
-    <field name="Media Command Opcode" start="24" end="26" type="uint" default="0"/>
-    <field name="Pipeline" start="27" end="28" type="uint" default="2"/>
-    <field name="Command Type" start="29" end="31" type="uint" default="3"/>
-    <field name="Interface Descriptor Offset" start="32" end="37" type="uint"/>
-    <field name="Flush to GO" start="39" end="39" type="bool"/>
-  </instruction>
-
-  <instruction name="MEDIA_VFE_STATE" bias="2" length="9" engine="render">
-    <field name="DWord Length" start="0" end="15" type="uint" default="7"/>
-    <field name="SubOpcode" start="16" end="23" type="uint" default="0"/>
-    <field name="Media Command Opcode" start="24" end="26" type="uint" default="0"/>
-    <field name="Pipeline" start="27" end="28" type="uint" default="2"/>
-    <field name="Command Type" start="29" end="31" type="uint" default="3"/>
-    <field name="Per Thread Scratch Space" start="32" end="35" type="uint"/>
-    <field name="Stack Size" start="36" end="39" type="uint"/>
-    <field name="Scratch Space Base Pointer" start="42" end="79" type="address"/>
-    <field name="Dispatch Load Balance" start="98" end="98" type="uint">
-      <value name="Color LSB" value="1"/>
-      <value name="Least Loaded" value="0"/>
-    </field>
-    <field name="Number of URB Entries" start="104" end="111" type="uint"/>
-    <field name="Maximum Number of Threads" start="112" end="127" type="uint"/>
-    <field name="Maximum Number of Dual-Subslices" start="128" end="135" type="uint"/>
-    <field name="CURBE Allocation Size" start="160" end="175" type="uint"/>
-    <field name="URB Entry Allocation Size" start="176" end="191" type="uint"/>
-  </instruction>
-
   <instruction name="MFC_AVC_PAK_OBJECT" bias="2" length="12" engine="video">
     <field name="DWord Length" start="0" end="11" type="uint" default="10"/>
     <field name="SubOpcode B" start="16" end="20" type="uint" default="9"/>
diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c
index c8854d728f7..ba67aa65f02 100644
--- a/src/intel/vulkan/genX_cmd_buffer.c
+++ b/src/intel/vulkan/genX_cmd_buffer.c
@@ -4548,7 +4548,7 @@ emit_compute_walker(struct anv_cmd_buffer *cmd_buffer,
       cw.ThreadGroupIDZDimension        = groupCountZ;
       cw.ExecutionMask                  = pipeline->cs_right_mask;
 
-      cw.InterfaceDescriptor = (struct GENX(INTERFACE_DESCRIPTOR_DATA_HP)) {
+      cw.InterfaceDescriptor = (struct GENX(INTERFACE_DESCRIPTOR_DATA)) {
          .KernelStartPointer = cs_bin->kernel.offset,
          .SamplerStatePointer =
             cmd_buffer->state.samplers[MESA_SHADER_COMPUTE].offset,