Mesa (master): panfrost/midgard: Make sure promote_fmov() only promotes 32-bit imovs

[GitLab Mirror]

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

Author: Boris Brezillon <boris.brezillon at collabora.com>
Date:   Mon Jan 20 15:55:21 2020 +0100

panfrost/midgard: Make sure promote_fmov() only promotes 32-bit imovs

mir_constant_float() assumes we're dealing with 32-bit integers/floats,
which is only the case if reg_mode is equal to midgard_reg_mode_32.

Signed-off-by: Boris Brezillon <boris.brezillon at collabora.com>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3478>

---

 src/panfrost/midgard/midgard_opt_float.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/panfrost/midgard/midgard_opt_float.c b/src/panfrost/midgard/midgard_opt_float.c
index ab6e57be3f8..43e1cd2ea78 100644
--- a/src/panfrost/midgard/midgard_opt_float.c
+++ b/src/panfrost/midgard/midgard_opt_float.c
@@ -56,6 +56,7 @@ midgard_opt_promote_fmov(compiler_context *ctx, midgard_block *block)
                 if (!ins->has_constants) continue;
                 if (mir_nontrivial_source2_mod_simple(ins)) continue;
                 if (mir_nontrivial_outmod(ins)) continue;
+                if (ins->alu.reg_mode != midgard_reg_mode_32) continue;
 
                 /* We found an imov with a constant. Check the constants */
                 bool ok = true;