AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aco: use scalar phi lowering for lcssa workaround

Browse Source 
This lets us use non-undef for the last operand, if necessary
(demonstrated in the test).

Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Daniel Schürmann <daniel@schuermann.dev>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29121>
This commit is contained in:
Rhys Perry
2024-05-02 19:24:57 +01:00
committed by Marge Bot
parent bbe4652430
commit b1964f03e7
2 changed files with 124 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/amd/compiler/aco_instruction_selection.cpp
+2 -5
View File
@@ -10317,8 +10317,6 @@ rename_temp(const std::map<unsigned, unsigned>& renames, Temp tmp)
static void
lcssa_workaround(isel_context* ctx, nir_loop* loop)
{
assert(ctx->block->linear_preds.size() == ctx->block->logical_preds.size() + 1);
nir_block* block_before_loop = nir_cf_node_as_block(nir_cf_node_prev(&loop->cf_node));
nir_block* block_after_loop = nir_cf_node_as_block(nir_cf_node_next(&loop->cf_node));
@@ -10334,11 +10332,10 @@ lcssa_workaround(isel_context* ctx, nir_loop* loop)
continue;
Temp new_tmp = ctx->program->allocateTmp(tmp.regClass());
aco_ptr<Instruction> phi(create_instruction(aco_opcode::p_linear_phi, Format::PSEUDO,
ctx->block->linear_preds.size(), 1));
aco_ptr<Instruction> phi(create_instruction(aco_opcode::p_phi, Format::PSEUDO,
ctx->block->logical_preds.size(), 1));
for (unsigned i = 0; i < ctx->block->logical_preds.size(); i++)
phi->operands[i] = Operand(new_tmp);
phi->operands.back() = Operand(tmp.regClass());
phi->definitions[0] = Definition(tmp);
ctx->block->instructions.emplace(ctx->block->instructions.begin(), std::move(phi));