From: Alyssa Rosenzweig <alyssa@collabora.com>
Date: Wed, 9 Jun 2021 17:19:41 +0000 (-0400)
Subject: pan/mdg: Insert moves to load/store registers
X-Git-Tag: upstream/21.2.3~2150
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=43cff98dfff18c11cb6d94da516f7683085c1c54;p=platform%2Fupstream%2Fmesa.git

pan/mdg: Insert moves to load/store registers

Ensures a valid schedule/regalloc is possible when vectors are used in
funny ways, as occurs in dEQP-GLES31 resulting in a scheduler hang (or
with prior patches, an RA failure).

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

diff --git a/src/panfrost/midgard/midgard_schedule.c b/src/panfrost/midgard/midgard_schedule.c
index 020980b..e3d49aa 100644
--- a/src/panfrost/midgard/midgard_schedule.c
+++ b/src/panfrost/midgard/midgard_schedule.c
@@ -1497,9 +1497,36 @@ schedule_block(compiler_context *ctx, midgard_block *block)
         free(liveness);
 }
 
+/* Insert moves to ensure we can register allocate load/store registers */
+static void
+mir_lower_ldst(compiler_context *ctx)
+{
+        mir_foreach_instr_global_safe(ctx, I) {
+                if (I->type != TAG_LOAD_STORE_4) continue;
+
+                mir_foreach_src(I, s) {
+                        if (s == 0) continue;
+                        if (I->src[s] == ~0) continue;
+                        if (I->swizzle[s][0] == 0) continue;
+
+                        unsigned temp = make_compiler_temp(ctx);
+                        midgard_instruction mov = v_mov(I->src[s], temp);
+                        mov.mask = 0x1;
+                        mov.dest_type = I->src_types[s];
+                        for (unsigned c = 0; c < NIR_MAX_VEC_COMPONENTS; ++c)
+                                mov.swizzle[1][c] = I->swizzle[s][0];
+
+                        mir_insert_instruction_before(ctx, I, mov);
+                        I->src[s] = mov.dest;
+                        I->swizzle[s][0] = 0;
+                }
+        }
+}
+
 void
 midgard_schedule_program(compiler_context *ctx)
 {
+        mir_lower_ldst(ctx);
         midgard_promote_uniforms(ctx);
 
         /* Must be lowered right before scheduling */