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

aco: continue when try_remove_simple_block can't remove a predecessor

Browse source 
We should update linear_preds so that the predecessors we can remove are
actually removed.

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/35202>
This commit is contained in:
Rhys Perry 2025-05-27 16:40:07 +01:00 • committed by Marge Bot
parent 5344abbc56
commit 85db025cd7
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/amd/compiler/aco_lower_branches.cpp
View file

@ -52,6 +52,7 @@ try_remove_simple_block(branch_ctx& ctx, Block& block)
unsigned succ_idx = block.linear_succs[0];
Block& succ = ctx.program->blocks[succ_idx];
Block::edge_vec new_preds;
for (unsigned pred_idx : block.linear_preds) {
Block& pred = ctx.program->blocks[pred_idx];
assert(pred.index < block.index);
@ -82,12 +83,16 @@ try_remove_simple_block(branch_ctx& ctx, Block& block)
}
/* Otherwise, check if there is a fall-through path for the jump target. */
if (block.index >= pred.linear_succs[1])
return;
for (unsigned j = block.index + 1; j < pred.linear_succs[1]; j++) {
bool can_fallthrough = block.index < pred.linear_succs[1];
for (unsigned j = block.index + 1; can_fallthrough && j < pred.linear_succs[1]; j++) {
if (!ctx.program->blocks[j].instructions.empty())
return;
can_fallthrough = false;
}
if (!can_fallthrough) {
new_preds.push_back(pred_idx);
continue;
}
pred.linear_succs[0] = pred.linear_succs[1];
pred.linear_succs[1] = succ_idx;
succ.linear_preds.push_back(pred_idx);
@ -130,9 +135,11 @@ try_remove_simple_block(branch_ctx& ctx, Block& block)
block.logical_preds.clear();
}
remove_linear_successor(ctx, block, succ_idx);
block.linear_preds.clear();
block.instructions.clear();
block.linear_preds = new_preds;
if (block.linear_preds.empty()) {
remove_linear_successor(ctx, block, succ_idx);
block.instructions.clear();
}
}
bool