nir/opt_remove_phis: optimize out phis with undef

[mesa.git] / src / compiler / nir / nir_opt_remove_phis.c

diff --git a/src/compiler/nir/nir_opt_remove_phis.c b/src/compiler/nir/nir_opt_remove_phis.c
index 966a982516e3c4c5a52ca3f98ff2a737e2c2f421..db58c618f6bd2070fecea18055dd47d9bb6144eb 100644 (file)
--- a/src/compiler/nir/nir_opt_remove_phis.c
+++ b/src/compiler/nir/nir_opt_remove_phis.c
@@ -52,7 +52,7 @@ matching_mov(nir_alu_instr *mov1, nir_ssa_def *ssa)
  * This is a pass for removing phi nodes that look like:
  * a = phi(b, b, b, ...)
  *
- * Note that we can't ignore undef sources here, or else we may create a
+ * Note that we can't always ignore undef sources here, or else we may create a
  * situation where the definition of b isn't dominated by its uses. We're
  * allowed to do this since the definition of b must dominate all of the
  * phi node's predecessors, which means it must dominate the phi node as well
@@ -98,6 +98,9 @@ remove_phis_block(nir_block *block, nir_builder *b)
          if (def == NULL) {
             def  = src->src.ssa;
             mov = get_parent_mov(def);
+         } else if (src->src.ssa->parent_instr->type == nir_instr_type_ssa_undef &&
+                    nir_block_dominates(def->parent_instr->block, src->pred)) {
+            /* Ignore this undef source. */
          } else {
             if (src->src.ssa != def && !matching_mov(mov, src->src.ssa)) {
                srcs_same = false;
@@ -153,6 +156,8 @@ nir_opt_remove_phis_impl(nir_function_impl *impl)
    nir_builder bld;
    nir_builder_init(&bld, impl);
 
+   nir_metadata_require(impl, nir_metadata_dominance);
+
    nir_foreach_block(block, impl) {
       progress |= remove_phis_block(block, &bld);
    }