[Mesa-dev] [PATCH 2/4] nir/loop_unroll: Re-materialize derefs in use blocks before unrolling
Jason Ekstrand
jason at jlekstrand.net
Mon Sep 17 14:43:42 UTC 2018
When we're about to re-arrange a bunch of blocks, it's a good idea to
make sure that we don't have deref uses crossing block boundaries.
Otherwise we may end up with a deref going through a phi and that would
be bad.
---
src/compiler/nir/nir_opt_loop_unroll.c | 13 ++++---------
1 file 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;
}
--
2.17.1
More information about the mesa-dev
mailing list