Mesa (main): pan/va: Generalize LD_VAR_IMM_* to support flat varyings

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: f5161f6cec701d60a430b004c28d7daa6964e80a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f5161f6cec701d60a430b004c28d7daa6964e80a

Author: Alyssa Rosenzweig <alyssa at collabora.com>
Date:   Wed Dec 22 12:47:19 2021 -0500

pan/va: Generalize LD_VAR_IMM_* to support flat varyings

Signed-off-by: Alyssa Rosenzweig <alyssa at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14292>

---

 src/panfrost/bifrost/valhall/ISA.xml                  | 3 ++-
 src/panfrost/bifrost/valhall/test/assembler-cases.txt | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/panfrost/bifrost/valhall/ISA.xml b/src/panfrost/bifrost/valhall/ISA.xml
index c4ffa073c4e..f50103a9b65 100644
--- a/src/panfrost/bifrost/valhall/ISA.xml
+++ b/src/panfrost/bifrost/valhall/ISA.xml
@@ -727,7 +727,8 @@
     <sr write="true"/>
     <vecsize/>
     <sr_count/>
-    <regfmt/>
+    <mod name="half" start="24" size="1"/>
+    <mod name="smooth" start="25" size="1"/>
     <sample/>
     <update/>
     <slot/>
diff --git a/src/panfrost/bifrost/valhall/test/assembler-cases.txt b/src/panfrost/bifrost/valhall/test/assembler-cases.txt
index 4185c9be400..804a70daa65 100644
--- a/src/panfrost/bifrost/valhall/test/assembler-cases.txt
+++ b/src/panfrost/bifrost/valhall/test/assembler-cases.txt
@@ -133,7 +133,7 @@ c0 01 00 00 00 c4 10 51    IADD_IMM.i32.reconverge r4, 0x0, #0x1
 42 43 84 85 04 c1 50 01    CSEL.u32.lt r1, `r2, `r3, u4, u5
 42 43 84 85 04 c1 58 01    CSEL.s32.lt r1, `r2, `r3, u4, u5
 3d 00 00 12 b4 82 56 08    LD_VAR_SPECIAL.v2.f32.sample.clobber.slot0.wait0 @r2:r3, r61, index:0x0
-3d 00 00 33 14 82 5d 08    LD_VAR_IMM_F16.v4.f16.center.retrieve.slot0.wait0 @r2:r3, r61, r0, index:0x0
-3d 00 00 33 84 80 5d 08    LD_VAR_IMM_F16.v4.f16.sample.store.slot0.wait0 @r0:r1, r61, r0, index:0x0
-3d 00 08 33 44 80 5d 08    LD_VAR_IMM_F16.v4.f16.centroid.store.slot0.wait0 @r0:r1, r61, r0, index:0x8
+3d 00 00 33 14 82 5d 08    LD_VAR_IMM_F16.v4.half.smooth.center.retrieve.slot0.wait0 @r2:r3, r61, index:0x0
+3d 00 00 33 84 80 5d 08    LD_VAR_IMM_F16.v4.half.smooth.sample.store.slot0.wait0 @r0:r1, r61, index:0x0
+3d 00 08 33 44 80 5d 08    LD_VAR_IMM_F16.v4.half.smooth.centroid.store.slot0.wait0 @r0:r1, r61, index:0x8
 7c 7d 11 33 04 80 66 00    LD_ATTR_IMM.v4.f16.slot0 @r0:r1, `r60, `r61, index:0x1, table:0x1