nir: fix memory leak in nir_cf_list_clone

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

diff --git a/src/compiler/nir/nir_opt_intrinsics.c b/src/compiler/nir/nir_opt_intrinsics.c
index bdb46e9300bc94ed523d96336e04374e8ed403eb..503462ecfbe545fb12c62dd39992b330e46e3a64 100644 (file)
--- a/src/compiler/nir/nir_opt_intrinsics.c
+++ b/src/compiler/nir/nir_opt_intrinsics.c
@@ -29,7 +29,8 @@
  */
 
 static bool
-opt_intrinsics_impl(nir_function_impl *impl)
+opt_intrinsics_impl(nir_function_impl *impl,
+                    const struct nir_shader_compiler_options *options)
 {
    nir_builder b;
    nir_builder_init(&b, impl);
@@ -46,22 +47,50 @@ opt_intrinsics_impl(nir_function_impl *impl)
 
          switch (intrin->intrinsic) {
          case nir_intrinsic_vote_any:
-         case nir_intrinsic_vote_all: {
-            nir_const_value *val = nir_src_as_const_value(intrin->src[0]);
-            if (!val && !b.shader->options->lower_vote_trivial)
-               continue;
-
-            replacement = nir_ssa_for_src(&b, intrin->src[0], 1);
+         case nir_intrinsic_vote_all:
+            if (nir_src_is_const(intrin->src[0]))
+               replacement = nir_ssa_for_src(&b, intrin->src[0], 1);
             break;
-         }
-         case nir_intrinsic_vote_eq: {
-            nir_const_value *val = nir_src_as_const_value(intrin->src[0]);
-            if (!val && !b.shader->options->lower_vote_trivial)
+         case nir_intrinsic_vote_feq:
+         case nir_intrinsic_vote_ieq:
+            if (nir_src_is_const(intrin->src[0]))
+               replacement = nir_imm_true(&b);
+            break;
+         case nir_intrinsic_load_sample_mask_in:
+            /* Transform:
+             *   gl_SampleMaskIn == 0 ---> gl_HelperInvocation
+             *   gl_SampleMaskIn != 0 ---> !gl_HelperInvocation
+             */
+            if (!options->optimize_sample_mask_in)
                continue;
 
-            replacement = nir_imm_int(&b, NIR_TRUE);
-            break;
-         }
+            nir_foreach_use_safe(use_src, &intrin->dest.ssa) {
+               if (use_src->parent_instr->type == nir_instr_type_alu) {
+                  nir_alu_instr *alu = nir_instr_as_alu(use_src->parent_instr);
+
+                  if (alu->op == nir_op_ieq ||
+                      alu->op == nir_op_ine) {
+                     /* Check for 0 in either operand. */
+                     nir_const_value *const_val =
+                         nir_src_as_const_value(alu->src[0].src);
+                     if (!const_val)
+                        const_val = nir_src_as_const_value(alu->src[1].src);
+                     if (!const_val || const_val->i32 != 0)
+                        continue;
+
+                     nir_ssa_def *new_expr = nir_load_helper_invocation(&b, 1);
+
+                     if (alu->op == nir_op_ine)
+                        new_expr = nir_inot(&b, new_expr);
+
+                     nir_ssa_def_rewrite_uses(&alu->dest.dest.ssa,
+                                              nir_src_for_ssa(new_expr));
+                     nir_instr_remove(&alu->instr);
+                     continue;
+                  }
+               }
+            }
+            continue;
          default:
             break;
          }
@@ -72,8 +101,6 @@ opt_intrinsics_impl(nir_function_impl *impl)
          nir_ssa_def_rewrite_uses(&intrin->dest.ssa,
                                   nir_src_for_ssa(replacement));
          nir_instr_remove(instr);
-         nir_metadata_preserve(impl, nir_metadata_block_index |
-                                     nir_metadata_dominance);
          progress = true;
       }
    }
@@ -87,9 +114,17 @@ nir_opt_intrinsics(nir_shader *shader)
    bool progress = false;
 
    nir_foreach_function(function, shader) {
-      if (function->impl)
-         progress |= opt_intrinsics_impl(function->impl);
+      if (!function->impl)
+         continue;
+
+      if (opt_intrinsics_impl(function->impl, shader->options)) {
+         progress = true;
+         nir_metadata_preserve(function->impl, nir_metadata_block_index |
+                                               nir_metadata_dominance);
+      } else {
+         nir_metadata_preserve(function->impl, nir_metadata_all);
+      }
    }
 
-   return false;
+   return progress;
 }