From 76a09b8cd3370eae12041f529ee4db170d43053e Mon Sep 17 00:00:00 2001
From: Alyssa Rosenzweig <alyssa@collabora.com>
Date: Thu, 17 Mar 2022 16:47:00 -0400
Subject: [PATCH] pan/va: Fix ST_CVT definitions

They are basicallly just STORE with an extra source and the memory access
modifier in a different place.

Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15461>
---
 src/panfrost/bifrost/valhall/ISA.xml            | 17 +++++++----------
 .../bifrost/valhall/test/assembler-cases.txt    |  6 +++---
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/panfrost/bifrost/valhall/ISA.xml b/src/panfrost/bifrost/valhall/ISA.xml
index 8a14ba3683b..f73cc1aa944 100644
--- a/src/panfrost/bifrost/valhall/ISA.xml
+++ b/src/panfrost/bifrost/valhall/ISA.xml
@@ -1168,22 +1168,19 @@
     <desc>
       Store to memory with data conversion. The address to store to is given in
       the first source, which must be a 64-bit register (a pair of 32-bit
-      registers). For backwards compatibility with Bifrost, there is a second
-      source which should be the high 32-bits of the register. However, on
-      Valhall the first source is 64-bit so the second source is unused. The
-      third source is the conversion descriptor used for the store.
+      registers). The other source is the conversion descriptor used for the store.
 
       Used with LEA_IMAGE_IMM to implement image stores.
     </desc>
-    <sr read="true"/>
-    <sr_count/>
+    <slot/>
+    <mod name="memory_access" start="37" size="3"/>
     <vecsize/>
     <regfmt/>
-    <slot/>
-    <src>64-bit address to store to (low)</src>
-    <src>64-bit address to store to (high)</src>
+    <sr read="true"/>
+    <sr_count/>
+    <src size="64">64-bit address to store to</src>
+    <imm name="offset" start="8" size="8"/>
     <src>Internal conversion descriptor</src>
-    <imm name="unk" start="36" size="4"/>
   </ins>
 
   <ins name="LD_TILE" title="Load from tilebuffer" opcode="0x78" unit="NONE">
diff --git a/src/panfrost/bifrost/valhall/test/assembler-cases.txt b/src/panfrost/bifrost/valhall/test/assembler-cases.txt
index dd4745803b5..8a40d0a8843 100644
--- a/src/panfrost/bifrost/valhall/test/assembler-cases.txt
+++ b/src/panfrost/bifrost/valhall/test/assembler-cases.txt
@@ -106,9 +106,9 @@ c0 01 00 00 00 c4 10 51    IADD_IMM.i32.reconverge r4, 0x0, #0x1
 42 00 00 38 08 44 61 00    STORE.i128.slot0 @r4:r5:r6:r7, `r2, offset:0
 41 f8 ff ff 07 c0 1f 50    BRANCHZ.reconverge `r1, offset:-8
 7d c0 00 08 10 bc a1 00    IADD.v2u16 r60.h1, `r61.h10, 0x0
-44 00 46 32 28 40 71 78    ST_CVT.v4.f32.slot0.return @r0:r1:r2:r3, `r4, r0, `r6, unk:0x2
-44 00 46 34 28 40 71 78    ST_CVT.v4.s32.slot0.return @r0:r1:r2:r3, `r4, r0, `r6, unk:0x2
-44 00 46 36 28 40 71 78    ST_CVT.v4.u32.slot0.return @r0:r1:r2:r3, `r4, r0, `r6, unk:0x2
+44 00 46 32 28 40 71 78    ST_CVT.slot0.istream.v4.f32.return @r0:r1:r2:r3, `r4, `r6, offset:0x0
+44 00 46 34 28 40 71 78    ST_CVT.slot0.istream.v4.s32.return @r0:r1:r2:r3, `r4, `r6, offset:0x0
+44 00 46 36 28 40 71 78    ST_CVT.slot0.istream.v4.u32.return @r0:r1:r2:r3, `r4, `r6, offset:0x0
 7c c0 12 00 26 84 67 00    LEA_TEX_IMM.slot0 @r4:r5:r6, `r60, 0x0, table:0x2, index:0x1
 7c c0 02 00 26 84 67 00    LEA_TEX_IMM.slot0 @r4:r5:r6, `r60, 0x0, table:0x2, index:0x0
 82 81 00 28 f4 82 6a 00    LD_BUFFER.i64.unsigned.slot0 @r2:r3, u2, u1