fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 15:38:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

aco: fix DCE of rematerializable phi operands

Browse source 
Otherwise, if a phi gets spilled, the operand might be considered unused.

Fixes: d48d72e98a ('aco: Initial commit of independent AMD compiler')

Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8055>
(cherry picked from commit 0bccfd86f6)
This commit is contained in:
Daniel Schürmann 2020-12-11 14:30:30 +01:00 • committed by Dylan Baker
parent af6cadcc89
commit 02cd25463d
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -31,7 +31,7 @@
"description": "aco: fix DCE of rematerializable phi operands",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": "d48d72e98af9436babeeb3a94b312f94bc582b36"
},

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

@ -814,6 +814,12 @@ void add_coupling_code(spill_ctx& ctx, Block* block, unsigned block_idx)
phi->opcode != aco_opcode::p_linear_phi)
break;
/* prevent it's definining instruction from being DCE'd if it could be rematerialized */
for (const Operand& op : phi->operands) {
if (op.isTemp() && ctx.remat.count(op.getTemp()))
ctx.remat_used[ctx.remat[op.getTemp()].instr] = true;
}
/* if the phi is not spilled, add to instructions */
if (ctx.spills_entry[block_idx].find(phi->definitions[0].getTemp()) == ctx.spills_entry[block_idx].end()) {
instructions.emplace_back(std::move(phi));
@ -1075,14 +1081,7 @@ void process_block(spill_ctx& ctx, unsigned block_idx, Block* block,
/* phis are handled separetely */
while (block->instructions[idx]->opcode == aco_opcode::p_phi ||
block->instructions[idx]->opcode == aco_opcode::p_linear_phi) {
aco_ptr<Instruction>& instr = block->instructions[idx];
for (const Operand& op : instr->operands) {
/* prevent it's definining instruction from being DCE'd if it could be rematerialized */
if (op.isTemp() && ctx.remat.count(op.getTemp()))
ctx.remat_used[ctx.remat[op.getTemp()].instr] = true;
}
instructions.emplace_back(std::move(instr));
idx++;
instructions.emplace_back(std::move(block->instructions[idx++]));
}
if (block->register_demand.exceeds(ctx.target_pressure))