panfrost/midgard: Promote to *move*, not rewrite for non-SSA

Fixes promoted uniform loads to registers.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
This commit is contained in:
Alyssa Rosenzweig 2019-07-19 15:51:51 -07:00
parent 40abf11708
commit bc741599f2
1 changed files with 9 additions and 2 deletions

View File

@ -67,9 +67,16 @@ midgard_promote_uniforms(compiler_context *ctx, unsigned register_pressure)
/* It is, great! Let's promote */
ctx->uniform_cutoff = MAX2(ctx->uniform_cutoff, address + 1);
unsigned promoted = SSA_FIXED_REGISTER(uniform_reg);
mir_rewrite_index_src(ctx, ins->ssa_args.dest, promoted);
/* We do need the move for safety for a non-SSA dest */
if (ins->ssa_args.dest >= ctx->func->impl->ssa_alloc) {
midgard_instruction mov = v_mov(promoted, blank_alu_src, ins->ssa_args.dest);
mir_insert_instruction_before(ins, mov);
} else {
mir_rewrite_index_src(ctx, ins->ssa_args.dest, promoted);
}
mir_remove_instruction(ins);
}