fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-15 11:40:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

pan/midgard: Use hint on midgard_instruction for spill_move

Browse source 
This allows us to have multiple spill moves, whereas otherwise for N
spill moves, the first N-1 would be clobbered. Issue found in Krita.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
This commit is contained in:
Alyssa Rosenzweig 2019-08-13 15:58:49 -07:00
parent 3e6f2e7aba
commit 2a9031ea44
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/panfrost/midgard/compiler.h
View file

@ -134,6 +134,9 @@ typedef struct midgard_instruction {
bool no_spill;
/* Generic hint for intra-pass use */
bool hint;
union {
midgard_load_store_word load_store;
midgard_vector_alu alu;

17
src/panfrost/midgard/midgard_schedule.c
View file

@ -775,7 +775,6 @@ static void mir_spill_register(
/* Allocate TLS slot (maybe) */
unsigned spill_slot = !is_special ? (*spill_count)++ : 0;
midgard_instruction *spill_move = NULL;
/* For TLS, replace all stores to the spilled node. For
* special reads, just keep as-is; the class will be demoted
@ -796,7 +795,10 @@ static void mir_spill_register(
st = v_load_store_scratch(ins->ssa_args.dest, spill_slot, true, ins->mask);
}
spill_move = mir_insert_instruction_before(mir_next_op(ins), st);
/* Hint: don't rewrite this node */
st.hint = true;
mir_insert_instruction_before(mir_next_op(ins), st);
if (!is_special)
ctx->spills++;
@ -824,8 +826,9 @@ static void mir_spill_register(
unsigned consecutive_index = 0;
mir_foreach_instr_in_block(block, ins) {
/* We can't rewrite the move used to spill in the first place */
if (ins == spill_move) continue;
/* We can't rewrite the moves used to spill in the
* first place. These moves are hinted. */
if (ins->hint) continue;
if (!mir_has_arg(ins, spill_node)) {
consecutive_skip = false;
@ -878,6 +881,12 @@ static void mir_spill_register(
ctx->fills++;
}
}
/* Reset hints */
mir_foreach_instr_global(ctx, ins) {
ins->hint = false;
}
}
void