From 65caf46b3b827f4cf5a32972ca5844c69e598aa6 Mon Sep 17 00:00:00 2001 From: Yevhenii Kolesnikov Date: Thu, 21 Apr 2022 21:20:13 +0300 Subject: [PATCH] nir: Remove single-source phis before opt_if_loop_last_continue We might have some single-source phis leftover after prior optimizations. We want to get rid of them before merging the blocks. Fixes: 5921a19d4b0 ("nir: add if opt opt_if_loop_last_continue()") Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/6312 Signed-off-by: Yevhenii Kolesnikov Reviewed-by: Danylo Piliaiev Part-of: --- src/compiler/nir/nir_opt_if.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/compiler/nir/nir_opt_if.c b/src/compiler/nir/nir_opt_if.c index f72451faa2f..2327e1c07e3 100644 --- a/src/compiler/nir/nir_opt_if.c +++ b/src/compiler/nir/nir_opt_if.c @@ -818,6 +818,11 @@ opt_if_loop_last_continue(nir_loop *loop, bool aggressive_last_continue) exec_list_is_empty(&last_block->instr_list)) return false; + /* If there are single-source phis in the last block, + * get rid of them first + */ + nir_opt_remove_phis_block(last_block); + /* 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),