summaryrefslogtreecommitdiffstats
path: root/src/compiler
diff options
context:
space:
mode:
authorMatt Turner <[email protected]>2017-02-24 15:34:40 -0800
committerMatt Turner <[email protected]>2017-03-23 14:34:43 -0700
commit19345fc160e1cd6d8176068f9919b1f0e7f5164c (patch)
treebaff5fee73ddbfc1df5d7b19deab38c6f1571b05 /src/compiler
parentb831b8d2e1ec00f11207343e131d74e53fe2c4a5 (diff)
nir: Return progress from nir_lower_var_copies().
Reviewed-by: Jason Ekstrand <[email protected]>
Diffstat (limited to 'src/compiler')
-rw-r--r--src/compiler/nir/nir.h2
-rw-r--r--src/compiler/nir/nir_lower_var_copies.c18
2 files changed, 16 insertions, 4 deletions
diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h
index d570ee74a45..80efa063f31 100644
--- a/src/compiler/nir/nir.h
+++ b/src/compiler/nir/nir.h
@@ -2355,7 +2355,7 @@ bool nir_inline_functions(nir_shader *shader);
bool nir_propagate_invariant(nir_shader *shader);
void nir_lower_var_copy_instr(nir_intrinsic_instr *copy, nir_shader *shader);
-void nir_lower_var_copies(nir_shader *shader);
+bool nir_lower_var_copies(nir_shader *shader);
bool nir_lower_global_vars_to_local(nir_shader *shader);
diff --git a/src/compiler/nir/nir_lower_var_copies.c b/src/compiler/nir/nir_lower_var_copies.c
index 30d28351d53..6288bdc465b 100644
--- a/src/compiler/nir/nir_lower_var_copies.c
+++ b/src/compiler/nir/nir_lower_var_copies.c
@@ -154,10 +154,11 @@ nir_lower_var_copy_instr(nir_intrinsic_instr *copy, nir_shader *shader)
&copy->variables[1]->deref, shader);
}
-static void
+static bool
lower_var_copies_impl(nir_function_impl *impl)
{
nir_shader *shader = impl->function->shader;
+ bool progress = false;
nir_foreach_block(block, impl) {
nir_foreach_instr_safe(instr, block) {
@@ -171,19 +172,30 @@ lower_var_copies_impl(nir_function_impl *impl)
nir_lower_var_copy_instr(copy, shader);
nir_instr_remove(&copy->instr);
+ progress = true;
ralloc_free(copy);
}
}
+
+ if (progress)
+ nir_metadata_preserve(impl, nir_metadata_block_index |
+ nir_metadata_dominance);
+
+ return progress;
}
/* Lowers every copy_var instruction in the program to a sequence of
* load/store instructions.
*/
-void
+bool
nir_lower_var_copies(nir_shader *shader)
{
+ bool progress = false;
+
nir_foreach_function(function, shader) {
if (function->impl)
- lower_var_copies_impl(function->impl);
+ progress |= lower_var_copies_impl(function->impl);
}
+
+ return progress;
}