From: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Date: Fri, 6 Dec 2019 21:22:06 +0000 (-0500)
Subject: pan/midgard: Force alignment for csel_v
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5e75eb547ff7efb8dc1d2845d034e62c1ab12442;p=mesa.git

pan/midgard: Force alignment for csel_v

The swizzle on the conditional gets lost.

Fixes "horizontal mirroring" in godot. See
https://gitlab.freedesktop.org/mesa/mesa/issues/2108 which has attached
apitrace.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Fixes: d3b3daa9d3f ("pan/midgard: Use new scheduler")
Reported-by: Icecream95
---

diff --git a/src/panfrost/midgard/midgard_ra.c b/src/panfrost/midgard/midgard_ra.c
index 2fe406d6e7a..c084a896a40 100644
--- a/src/panfrost/midgard/midgard_ra.c
+++ b/src/panfrost/midgard/midgard_ra.c
@@ -473,6 +473,14 @@ allocate_registers(compiler_context *ctx, bool *spilled)
 
                 if (ins->type == TAG_LOAD_STORE_4 && ins->load_64)
                         min_alignment[dest] = 3;
+
+                /* We don't have a swizzle for the conditional and we don't
+                 * want to muck with the conditional itself, so just force
+                 * alignment for now */
+
+                if (ins->type == TAG_ALU_4 && OP_IS_CSEL_V(ins->alu.op))
+                        min_alignment[dest] = 4; /* 1 << 4= 16-byte = vec4 */
+
         }
 
         for (unsigned i = 0; i < ctx->temp_count; ++i) {