fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 08:40:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

intel/fs/ra: Do the spill loop inside RA

Browse source 
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Jason Ekstrand 2019-05-07 18:14:46 -05:00
parent 47b1dcdcab
commit 0fd60e95fb
2 changed files with 29 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/intel/compiler/brw_fs.cpp
View file

@ -7279,9 +7279,7 @@ fs_visitor::allocate_registers(unsigned min_dispatch_width, bool allow_spilling)
/* We should only spill registers on the last scheduling. */
assert(!spilled_any_registers);
do {
allocated = assign_regs(can_spill, spill_all);
} while (!allocated && can_spill && !failed);
allocated = assign_regs(can_spill, spill_all);
if (allocated)
break;
}

47
src/intel/compiler/brw_fs_reg_allocate.cpp
View file

@ -1051,32 +1051,36 @@ fs_reg_alloc::spill_reg(unsigned spill_reg)
bool
fs_reg_alloc::assign_regs(bool allow_spilling, bool spill_all)
{
build_interference_graph(fs->spilled_any_registers);
while (1) {
build_interference_graph(fs->spilled_any_registers);
/* Debug of register spilling: Go spill everything. */
if (unlikely(spill_all)) {
int reg = choose_spill_reg();
if (reg != -1) {
spill_reg(reg);
return false;
/* Debug of register spilling: Go spill everything. */
if (unlikely(spill_all)) {
int reg = choose_spill_reg();
if (reg != -1) {
spill_reg(reg);
ralloc_free(g);
g = NULL;
continue;
}
}
}
if (!ra_allocate(g)) {
if (ra_allocate(g))
break;
if (!allow_spilling)
return false;
/* Failed to allocate registers. Spill a reg, and the caller will
* loop back into here to try again.
*/
int reg = choose_spill_reg();
if (reg == -1)
return false;
if (reg == -1) {
fs->fail("no register to spill:\n");
fs->dump_instructions(NULL);
} else if (allow_spilling) {
spill_reg(reg);
}
return false;
spill_reg(reg);
ralloc_free(g);
g = NULL;
}
/* Get the chosen virtual registers for each node, and map virtual
@ -1109,5 +1113,10 @@ bool
fs_visitor::assign_regs(bool allow_spilling, bool spill_all)
{
fs_reg_alloc alloc(this);
return alloc.assign_regs(allow_spilling, spill_all);
bool success = alloc.assign_regs(allow_spilling, spill_all);
if (!success && allow_spilling) {
fail("no register to spill:\n");
dump_instructions(NULL);
}
return success;
}