diff options
| author | Daniel Schürmann <daniel@schuermann.dev> | 2020-12-11 14:30:30 +0100 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2020-12-14 16:42:49 +0000 |
| commit | 0bccfd86f6e97611a3b9b4f227aa414bc3d04e02 (patch) | |
| tree | 2ee6f1a7c23fbfcae05b0075ca068a9bddd0596e | |
| parent | a791c1f3a714cd54a3a97067c911bcfb5b4421f5 (diff) | |
aco: fix DCE of rematerializable phi operands
Otherwise, if a phi gets spilled, the operand might be considered unused.
Fixes: d48d72e98af9436babeeb3a94b312f94bc582b36 ('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>
| -rw-r--r-- | src/amd/compiler/aco_spill.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/amd/compiler/aco_spill.cpp b/src/amd/compiler/aco_spill.cpp index 42fb2cbc229..fd25b96ca94 100644 --- a/src/amd/compiler/aco_spill.cpp +++ b/src/amd/compiler/aco_spill.cpp @@ -816,6 +816,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)); @@ -1077,14 +1083,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)) |