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

aco: fix spilling of phis without temp operands

Browse source 
These were spilled unconditionally.

Cc: mesa-stable
Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16708>
(cherry picked from commit 8e41c66639)
This commit is contained in:
Daniel Schürmann 2022-05-25 16:12:19 +02:00 • committed by Dylan Baker
parent 3e5aa02ee4
commit 4a846d12d1
2 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -228,7 +228,7 @@
"description": "aco: fix spilling of phis without temp operands",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"because_sha": null
},
{

23
src/amd/compiler/aco_spill.cpp
View file

@ -697,25 +697,22 @@ init_live_in_vars(spill_ctx& ctx, Block* block, unsigned block_idx)
std::vector<unsigned>& preds =
phi->opcode == aco_opcode::p_phi ? block->logical_preds : block->linear_preds;
bool spill = true;
bool is_all_spilled = true;
for (unsigned i = 0; i < phi->operands.size(); i++) {
/* non-temp operands can increase the register pressure */
if (!phi->operands[i].isTemp()) {
partial_spills.insert(phi->definitions[0].getTemp());
if (phi->operands[i].isUndefined())
continue;
}
if (!ctx.spills_exit[preds[i]].count(phi->operands[i].getTemp()))
spill = false;
else
partial_spills.insert(phi->definitions[0].getTemp());
is_all_spilled &= phi->operands[i].isTemp() &&
ctx.spills_exit[preds[i]].count(phi->operands[i].getTemp());
}
if (spill) {
if (is_all_spilled) {
/* The phi is spilled at all predecessors. Keep it spilled. */
ctx.spills_entry[block_idx][phi->definitions[0].getTemp()] =
ctx.allocate_spill_id(phi->definitions[0].regClass());
partial_spills.erase(phi->definitions[0].getTemp());
spilled_registers += phi->definitions[0].getTemp();
} else {
/* Phis might increase the register pressure. */
partial_spills.insert(phi->definitions[0].getTemp());
}
}