Mesa (master): broadcom/compiler: emit ldunifarf when needed

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 878555976e9171ceb06d2688c56f0419cf9b23f7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=878555976e9171ceb06d2688c56f0419cf9b23f7

Author: Iago Toral Quiroga <itoral at igalia.com>
Date:   Thu Feb 11 12:24:57 2021 +0100

broadcom/compiler: emit ldunifarf when needed

Just like ldunif and ldunifrf, ldunifa writes to the r5 accumulator
and ldunifarf writes to the register file.

Reviewed-by: Alejandro Piñeiro <apinheiro at igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8980>

---

 src/broadcom/compiler/vir_to_qpu.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/broadcom/compiler/vir_to_qpu.c b/src/broadcom/compiler/vir_to_qpu.c
index 2d72f2f744d..abb0d0ce2a5 100644
--- a/src/broadcom/compiler/vir_to_qpu.c
+++ b/src/broadcom/compiler/vir_to_qpu.c
@@ -272,7 +272,7 @@ v3d_generate_code_block(struct v3d_compile *c,
                 }
 
                 if (qinst->qpu.type == V3D_QPU_INSTR_TYPE_ALU) {
-                        if (qinst->qpu.sig.ldunif) {
+                        if (qinst->qpu.sig.ldunif || qinst->qpu.sig.ldunifa) {
                                 assert(qinst->qpu.alu.add.op == V3D_QPU_A_NOP);
                                 assert(qinst->qpu.alu.mul.op == V3D_QPU_M_NOP);
 
@@ -280,8 +280,13 @@ v3d_generate_code_block(struct v3d_compile *c,
                                     dst.index != V3D_QPU_WADDR_R5) {
                                         assert(c->devinfo->ver >= 40);
 
-                                        qinst->qpu.sig.ldunif = false;
-                                        qinst->qpu.sig.ldunifrf = true;
+                                        if (qinst->qpu.sig.ldunif) {
+                                           qinst->qpu.sig.ldunif = false;
+                                           qinst->qpu.sig.ldunifrf = true;
+                                        } else {
+                                           qinst->qpu.sig.ldunifa = false;
+                                           qinst->qpu.sig.ldunifarf = true;
+                                        }
                                         qinst->qpu.sig_addr = dst.index;
                                         qinst->qpu.sig_magic = dst.magic;
                                 }