From 441c47ff74d77f387ff8dc3d676ce7fe6d4837cc Mon Sep 17 00:00:00 2001
From: Alyssa Rosenzweig <alyssa@collabora.com>
Date: Sat, 29 Jan 2022 11:08:25 -0500
Subject: [PATCH] pan/va: Fix lane select for [US]_TO_[USF]32

The lane select is in bit 28, this is covered by the "16-bit swizzle" mode.
However, the source type isn't inferred from the name in valhall.py, so
explicitly annotate the source as 16-bit.

Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14833>
---
 src/panfrost/bifrost/valhall/ISA.xml | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/panfrost/bifrost/valhall/ISA.xml b/src/panfrost/bifrost/valhall/ISA.xml
index 01eab12ffc9..e97482cc14e 100644
--- a/src/panfrost/bifrost/valhall/ISA.xml
+++ b/src/panfrost/bifrost/valhall/ISA.xml
@@ -1158,14 +1158,10 @@
       is specified where it makes sense.
     </desc>
 
-    <ins name="S16_TO_S32" opcode2="0x4"/>
-    <ins name="S16_TO_F32" opcode2="0x5"/>
     <ins name="V2S16_TO_V2F16" opcode2="0x7"/>
 
     <ins name="S32_TO_F32" opcode2="0x9"/>
 
-    <ins name="U16_TO_U32" opcode2="0x14"/>
-    <ins name="U16_TO_F32" opcode2="0x15"/>
     <ins name="V2U16_TO_V2F16" opcode2="0x17"/>
 
     <ins name="U32_TO_F32" opcode2="0x19"/>
@@ -1174,6 +1170,19 @@
     <src widen="true">Value to convert</src>
   </group>
 
+  <group name="CONVERT" title="16->32 integer data conversions" dests="1" opcode="0x90" unit="CVT">
+    <desc>
+      Performs the given data conversion.
+    </desc>
+
+    <ins name="S16_TO_S32" opcode2="0x4"/>
+    <ins name="S16_TO_F32" opcode2="0x5"/>
+    <ins name="U16_TO_U32" opcode2="0x14"/>
+    <ins name="U16_TO_F32" opcode2="0x15"/>
+
+    <src swizzle="true" size="16">Value to convert</src>
+  </group>
+
   <group name="CONVERT" title="Float-to-int data conversions" dests="1" opcode="0x90" unit="CVT">
     <desc>Performs the given data conversion.</desc>
     <ins name="F32_TO_S32" opcode2="0xC"/>