fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-04-24 13:40:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

ir3: fix adding physical edges multiple times

Browse source 
After opt_jump, we might end up with weird control flow likes this:

block0: br block2
[more blocks]
block1: br block3
block2: ...
block3: ...

Since block2 is a logical successor of block1 (due to the fall through),
a physical edge will be added. However, another one will be added
because the branch to block3 crosses block2 (which is a reconvergence
point due to the branch from block0). This currently results in an
assert. This commit fixes this by ignoring successors of the start block
of edges that cross reconvergence points.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29409>
This commit is contained in:
Job Noorman 2024-08-16 15:54:24 +02:00 • committed by Marge Bot
parent f432eb691e
commit d9977a6176
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/freedreno/ir3/ir3_reconvergence.c
View file

@ -294,10 +294,16 @@ ir3_calc_reconvergence(struct ir3_shader_variant *so)
* adding redundant physical edges in case multiple edges have the
* same start point by comparing with the previous edge. Therefore
* we should only add the physical edge once.
* However, we should skip logical successors of the edge's start
* block since physical edges for those have already been added
* initially.
*/
for (unsigned i = 0; i < block->physical_predecessors_count; i++)
assert(block->physical_predecessors[i] != edge->start_block);
ir3_block_link_physical(edge->start_block, block);
if (block != edge->start_block->successors[0] &&
block != edge->start_block->successors[1]) {
for (unsigned i = 0; i < block->physical_predecessors_count; i++)
assert(block->physical_predecessors[i] != edge->start_block);
ir3_block_link_physical(edge->start_block, block);
}
}
prev = edge;
}