diff options
| author | Alyssa Rosenzweig <[email protected]> | 2019-08-05 15:00:11 -0700 |
|---|---|---|
| committer | Alyssa Rosenzweig <[email protected]> | 2019-08-12 12:43:01 -0700 |
| commit | 2ec4f9a74ba46781ce61615a61e968b647217c2f (patch) | |
| tree | a3cdf3a8c0405ca2907c0cf6639c700b2f061d86 /src/panfrost/midgard/midgard_schedule.c | |
| parent | 7090971f2f604e30a809001b9ab765c9751d6b05 (diff) | |
pan/midgard: Add no_spill flag
Hint for the RA to avoid infinite spilling loops.
Signed-off-by: Alyssa Rosenzweig <[email protected]>
Diffstat (limited to 'src/panfrost/midgard/midgard_schedule.c')
| -rw-r--r-- | src/panfrost/midgard/midgard_schedule.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/panfrost/midgard/midgard_schedule.c b/src/panfrost/midgard/midgard_schedule.c index d7d8254bd6b..958e109346b 100644 --- a/src/panfrost/midgard/midgard_schedule.c +++ b/src/panfrost/midgard/midgard_schedule.c @@ -717,7 +717,10 @@ v_load_store_scratch( /* Splattered across, TODO combine logically */ .varying_parameters = (byte & 0x1FF) << 1, .address = (byte >> 9) - } + }, + + /* If we spill an unspill, RA goes into an infinite loop */ + .no_spill = true }; if (is_store) { @@ -752,11 +755,10 @@ static void mir_spill_register( } mir_foreach_instr_global(ctx, ins) { - if (ins->type != TAG_LOAD_STORE_4) continue; - if (ins->load_store.op != midgard_op_ld_int4) continue; - if (ins->load_store.arg_1 != 0xEA) continue; - if (ins->load_store.arg_2 != 0x1E) continue; - ra_set_node_spill_cost(g, ins->ssa_args.dest, -1.0); + if (ins->no_spill && + ins->ssa_args.dest >= 0 && + ins->ssa_args.dest < ctx->temp_count) + ra_set_node_spill_cost(g, ins->ssa_args.dest, -1.0); } int spill_node = ra_get_best_spill_node(g); @@ -791,6 +793,7 @@ static void mir_spill_register( if (is_special_w) { spill_slot = spill_index++; st = v_mov(spill_node, blank_alu_src, spill_slot); + st.no_spill = true; } else { ins->ssa_args.dest = SSA_FIXED_REGISTER(26); st = v_load_store_scratch(ins->ssa_args.dest, spill_slot, true, ins->mask); @@ -852,6 +855,7 @@ static void mir_spill_register( if (is_special) { /* Move */ st = v_mov(spill_node, blank_alu_src, consecutive_index); + st.no_spill = true; } else { /* TLS load */ st = v_load_store_scratch(consecutive_index, spill_slot, false, 0xF); |