diff options
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/nir/nir_opt_loop_unroll.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/compiler/nir/nir_opt_loop_unroll.c b/src/compiler/nir/nir_opt_loop_unroll.c index 0ba150f1264..ea2012e292a 100644 --- a/src/compiler/nir/nir_opt_loop_unroll.c +++ b/src/compiler/nir/nir_opt_loop_unroll.c @@ -49,6 +49,9 @@ static void loop_prepare_for_unroll(nir_loop *loop) { + nir_rematerialize_derefs_in_use_blocks_impl( + nir_cf_node_get_function(&loop->cf_node)); + nir_convert_loop_to_lcssa(loop); /* Lower phis at the top level of the loop body */ @@ -691,17 +694,9 @@ nir_opt_loop_unroll_impl(nir_function_impl *impl, &has_nested_loop); } - if (progress) { + if (progress) nir_lower_regs_to_ssa_impl(impl); - /* Calling nir_convert_loop_to_lcssa() adds extra phi nodes which may - * not be valid if they're used for something such as a deref. - * Remove any unneeded phis. - */ - nir_copy_prop(impl->function->shader); - nir_opt_remove_phis_impl(impl); - } - return progress; } |