panfrost/midgard: Fix regressions in -bjellyfish

Two fixes here, one is that we tried to copyprop non-strictly-SSA values
which was bound to fly in our face. The other was peeling back the imov
workaround.. Turns out we still need that. More research is needed
still, but let's not regress real apps.

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
This commit is contained in:
Alyssa Rosenzweig 2019-04-28 03:47:57 +00:00
parent bdaa23b32b
commit 68a1508dc9
1 changed files with 7 additions and 3 deletions

View File

@ -1135,9 +1135,11 @@ emit_alu(compiler_context *ctx, nir_alu_instr *instr)
ALU_CASE(imul, imul);
ALU_CASE(iabs, iabs);
/* XXX: Use fmov, not imov, since imov was causing major
* issues with texture precision? XXX research */
ALU_CASE(imov, imov);
/* XXX: Use fmov, not imov for now, since NIR does not
* differentiate well (it'll happily emits imov for floats,
* which the hardware rather dislikes and breaks e.g
* -bjellyfish */
ALU_CASE(imov, fmov);
ALU_CASE(feq32, feq);
ALU_CASE(fne32, fne);
@ -3156,6 +3158,8 @@ midgard_opt_copy_prop(compiler_context *ctx, midgard_block *block)
if (to >= SSA_FIXED_MINIMUM) continue;
if (from >= SSA_FIXED_MINIMUM) continue;
if (to >= ctx->func->impl->ssa_alloc) continue;
if (from >= ctx->func->impl->ssa_alloc) continue;
/* Also, if the move has side effects, we're helpless */