OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aco/spill: reload spilled exec masks directly to exec

Browse Source 
This handles the case of
   exec = p_linear_phi %a, %b
where %a or %b might have been spilled.
By directly reloading these variables into the exec mask register,
we can avoid additional CSSA parallelcopies.

Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9196>
This commit is contained in:
Daniel Schürmann
2021-02-22 11:00:22 +01:00
committed by Marge Bot
parent beb292343a
commit 99936d7142
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/amd/compiler/aco_spill.cpp
View File

@@ -939,7 +939,7 @@ void add_coupling_code(spill_ctx& ctx, Block* block, unsigned block_idx)
continue; continue;
unsigned pred_idx = preds[i]; unsigned pred_idx = preds[i];
/* rename operand */ /* if the operand was reloaded, rename */
if (ctx.spills_exit[pred_idx].find(phi->operands[i].getTemp()) == ctx.spills_exit[pred_idx].end()) { if (ctx.spills_exit[pred_idx].find(phi->operands[i].getTemp()) == ctx.spills_exit[pred_idx].end()) {
std::map<Temp, Temp>::iterator it = ctx.renames[pred_idx].find(phi->operands[i].getTemp()); std::map<Temp, Temp>::iterator it = ctx.renames[pred_idx].find(phi->operands[i].getTemp());
if (it != ctx.renames[pred_idx].end()) if (it != ctx.renames[pred_idx].end())
@@ -961,13 +961,20 @@ void add_coupling_code(spill_ctx& ctx, Block* block, unsigned block_idx)
idx--; idx--;
} while (phi->opcode == aco_opcode::p_phi && pred.instructions[idx]->opcode != aco_opcode::p_logical_end); } while (phi->opcode == aco_opcode::p_phi && pred.instructions[idx]->opcode != aco_opcode::p_logical_end);
std::vector<aco_ptr<Instruction>>::iterator it = std::next(pred.instructions.begin(), idx); std::vector<aco_ptr<Instruction>>::iterator it = std::next(pred.instructions.begin(), idx);
aco_ptr<Instruction> reload = do_reload(ctx, tmp, new_name, ctx.spills_exit[pred_idx][tmp]); aco_ptr<Instruction> reload = do_reload(ctx, tmp, new_name, ctx.spills_exit[pred_idx][tmp]);
pred.instructions.insert(it, std::move(reload));
ctx.spills_exit[pred_idx].erase(tmp); /* reload spilled exec mask directly to exec */
ctx.renames[pred_idx][tmp] = new_name; if (!phi->definitions[0].isTemp()) {
phi->operands[i].setTemp(new_name); assert(phi->definitions[0].isFixed() && phi->definitions[0].physReg() == exec);
reload->definitions[0] = phi->definitions[0];
phi->operands[i] = Operand(exec, ctx.program->lane_mask);
} else {
ctx.spills_exit[pred_idx].erase(tmp);
ctx.renames[pred_idx][tmp] = new_name;
phi->operands[i].setTemp(new_name);
}
pred.instructions.insert(it, std::move(reload));
} }
} }