diff options
author | Karol Herbst <kherbst@redhat.com> | 2019-02-12 20:59:35 +0100 |
---|---|---|
committer | Karol Herbst <kherbst@redhat.com> | 2019-02-13 00:21:35 +0100 |
commit | 7e08f22a72cfc379902feeca3673db6aa344f782 (patch) | |
tree | 179211d909c919ee59af67a6fdd09b46bb758bbf /src/compiler/nir/nir_opt_if.c | |
parent | 3c540e0a748844258e77254fc4f864f3b875fe18 (diff) | |
download | mesa-7e08f22a72cfc379902feeca3673db6aa344f782.tar.gz |
nir/opt_if: don't mark progress if nothing changes
if we have something like this:
loop {
...
if x {
break;
} else {
continue;
}
}
opt_if_loop_last_continue returns true marking progress allthough nothing
changes.
Fixes: 5921a19d4b0c6 "nir: add if opt opt_if_loop_last_continue()"
Signed-off-by: Karol Herbst <kherbst@redhat.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Diffstat (limited to 'src/compiler/nir/nir_opt_if.c')
-rw-r--r-- | src/compiler/nir/nir_opt_if.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/compiler/nir/nir_opt_if.c b/src/compiler/nir/nir_opt_if.c index 9afb901be14..9909faf09a1 100644 --- a/src/compiler/nir/nir_opt_if.c +++ b/src/compiler/nir/nir_opt_if.c @@ -844,6 +844,13 @@ opt_if_loop_last_continue(nir_loop *loop) if (!then_ends_in_continue && !else_ends_in_continue) return false; + /* if the block after the if/else is empty we bail, otherwise we might end + * up looping forever + */ + if (&nif->cf_node == nir_cf_node_prev(&last_block->cf_node) && + exec_list_is_empty(&last_block->instr_list)) + return false; + /* Move the last block of the loop inside the last if-statement */ nir_cf_list tmp; nir_cf_extract(&tmp, nir_after_cf_node(if_node), |