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

nir/opt_dead_cf: remove nodes after a jump earlier

Browse source 
In the case of:
   halt
   // succs: b9
   if %618 {
       block b3:// preds:
       break
       // succs: b6
   } else {
       block b4:  // preds: , succs: b5
   }
   block b5:    // preds: b4
   32    %556 = iadd %617, %2 (0x1)
opt_constant_if() doesn't work because stitch_blocks() can't join blocks if the
before ends in a jump and the after isn't empty.

Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Konstantin Seurer <konstantin.seurer@gmail.com>
Cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24235>
(cherry picked from commit 21f0aca948)
This commit is contained in:
Rhys Perry 2023-07-19 14:05:11 +01:00 • committed by Dylan Baker
parent 25fb78c855
commit e1f8eaadf4
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -24754,7 +24754,7 @@
"description": "nir/opt_dead_cf: remove nodes after a jump earlier",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null,
"notes": null

13
src/compiler/nir/nir_opt_dead_cf.c
View file

@ -275,6 +275,13 @@ node_is_dead(nir_cf_node *node)
static bool
dead_cf_block(nir_block *block)
{
/* opt_constant_if() doesn't handle this case. */
if (nir_block_ends_in_jump(block) &&
!exec_node_is_tail_sentinel(block->cf_node.node.next)) {
remove_after_cf_node(&block->cf_node);
return true;
}
nir_if *following_if = nir_block_get_following_if(block);
if (following_if) {
if (nir_src_is_const(following_if->condition)) {
@ -332,12 +339,8 @@ dead_cf_list(struct exec_list *list, bool *list_ends_in_jump)
}
if (nir_block_ends_in_jump(block)) {
assert(exec_node_is_tail_sentinel(cur->node.next));
*list_ends_in_jump = true;
if (!exec_node_is_tail_sentinel(cur->node.next)) {
remove_after_cf_node(cur);
return true;
}
}
break;