From 254a6412909057d809d361b297510aed9414554c Mon Sep 17 00:00:00 2001
From: Alyssa Rosenzweig <alyssa@collabora.com>
Date: Wed, 2 Mar 2022 11:19:41 -0500
Subject: [PATCH] pan/va: Fix LEA_BUF_IMM definition

Technically the table is folded, too; the 0xD refers to table 61. But this
instruction is more general than previously thought.

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

diff --git a/src/panfrost/bifrost/valhall/ISA.xml b/src/panfrost/bifrost/valhall/ISA.xml
index 6ad1581..6c8a67b 100644
--- a/src/panfrost/bifrost/valhall/ISA.xml
+++ b/src/panfrost/bifrost/valhall/ISA.xml
@@ -1011,22 +1011,15 @@
     <src>Index</src>
   </ins>
 
-  <ins name="LEA_VARY" title="Load varying effective address" opcode="0x5E" unit="LS">
-    <desc>
-      Loads the effective address of the position buffer (in a position shader)
-      or the varying buffer (in a varying shader). That is, the base pointer
-      plus the vertex's linear ID (the first source) times the buffer's
-      per-vertex stride. `LEA_VARY` should be executed once in a
-      position/varying shader, with the linear ID preloaded as `r59`. Each
-      position/varying store can then be constructed as `STORE` with the base
-      address sourced from the 64-bit destination of `LEA_VARY` and an
-      appropriately computed offset. Varying stores bypass the usual conversion
-      hardware for attributes; this diverges from earlier Mali hardware.
+  <ins name="LEA_BUF_IMM" title="Load buffer effective address" opcode="0x5E" unit="LS">
+    <desc>
+      Load effective address of a buffer with an immediate offset added.
     </desc>
     <sr write="true"/>
     <sr_count/>
     <slot/>
-    <imm name="unk" start="8" size="4"/>
+    <imm name="table" start="8" size="4"/>
+    <imm name="index" start="12" size="8"/>
     <src>Linear ID</src>
   </ins>
 
diff --git a/src/panfrost/bifrost/valhall/test/assembler-cases.txt b/src/panfrost/bifrost/valhall/test/assembler-cases.txt
index 78841db..73c3361 100644
--- a/src/panfrost/bifrost/valhall/test/assembler-cases.txt
+++ b/src/panfrost/bifrost/valhall/test/assembler-cases.txt
@@ -51,7 +51,7 @@ c0 00 00 00 00 f6 10 01    IADD_IMM.i32 r54, 0x0, #0x0
 3c d0 ea 00 02 bc 7d 68    ATEST.td @r60, r60, 0x3F800000, atest_datum
 40 db 05 04 00 c1 a1 00    MKVEC.v2i16 r1, `r0.h00, 0x3C000000.h10
 f0 00 3c 33 04 40 7f 78    BLEND.slot0.v4.f16.return @r0:r1, @r60, blend_descriptor_0_x, target:0x0
-7b 0d 00 40 04 84 5e 08    LEA_VARY.slot1.wait0 @r4:r5, `r59, unk:0xD
+7b 0d 00 40 04 84 5e 08    LEA_BUF_IMM.slot1.wait0 @r4:r5, `r59, table:0xD, index:0x0
 00 dd c0 08 14 c2 b2 00    FMA.f32 r2, r0, 0x44000000.neg.h1, 0x0.neg
 41 88 c0 00 04 c1 b2 00    FMA.f32 r1, `r1, u8, 0x0.neg
 40 88 c0 00 04 c0 b2 10    FMA.f32.wait1 r0, `r0, u8, 0x0.neg
-- 
2.7.4