nir/opt_undef: Handle a couple more normal store intrinsics.

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

diff --git a/src/compiler/nir/nir_opt_undef.c b/src/compiler/nir/nir_opt_undef.c
index c4777a86c8f3cb26eab3dc7c78492b80e65a396f..e03e5b88efc6bb2629fddcd63c2b799f05d58291 100644 (file)
--- a/src/compiler/nir/nir_opt_undef.c
+++ b/src/compiler/nir/nir_opt_undef.c
@@ -63,7 +63,7 @@ opt_undef_csel(nir_alu_instr *instr)
       memset(&empty_src, 0, sizeof(empty_src));
       nir_instr_rewrite_src(&instr->instr, &instr->src[1].src, empty_src);
       nir_instr_rewrite_src(&instr->instr, &instr->src[2].src, empty_src);
-      instr->op = nir_op_imov;
+      instr->op = nir_op_mov;
 
       return true;
    }
@@ -77,24 +77,20 @@ opt_undef_csel(nir_alu_instr *instr)
 static bool
 opt_undef_vecN(nir_builder *b, nir_alu_instr *alu)
 {
-   if (alu->op != nir_op_vec2 &&
-       alu->op != nir_op_vec3 &&
-       alu->op != nir_op_vec4)
+   if (!nir_op_is_vec(alu->op))
       return false;
 
    assert(alu->dest.dest.is_ssa);
 
-   unsigned num_components = nir_op_infos[alu->op].num_inputs;
-
-   for (unsigned i = 0; i < num_components; i++) {
+   for (unsigned i = 0; i < nir_op_infos[alu->op].num_inputs; i++) {
       if (!alu->src[i].src.is_ssa ||
           alu->src[i].src.ssa->parent_instr->type != nir_instr_type_ssa_undef)
          return false;
    }
 
    b->cursor = nir_before_instr(&alu->instr);
-   nir_ssa_def *undef =
-      nir_ssa_undef(b, num_components, nir_dest_bit_size(alu->dest.dest));
+   nir_ssa_def *undef = nir_ssa_undef(b, alu->dest.dest.ssa.num_components,
+                                      nir_dest_bit_size(alu->dest.dest));
    nir_ssa_def_rewrite_uses(&alu->dest.dest.ssa, nir_src_for_ssa(undef));
 
    return true;
@@ -107,19 +103,25 @@ opt_undef_vecN(nir_builder *b, nir_alu_instr *alu)
 static bool
 opt_undef_store(nir_intrinsic_instr *intrin)
 {
+   int arg_index;
    switch (intrin->intrinsic) {
-   case nir_intrinsic_store_var:
+   case nir_intrinsic_store_deref:
+      arg_index = 1;
+      break;
    case nir_intrinsic_store_output:
    case nir_intrinsic_store_per_vertex_output:
    case nir_intrinsic_store_ssbo:
    case nir_intrinsic_store_shared:
+   case nir_intrinsic_store_global:
+   case nir_intrinsic_store_scratch:
+      arg_index =  0;
       break;
    default:
       return false;
    }
 
-   if (!intrin->src[0].is_ssa ||
-       intrin->src[0].ssa->parent_instr->type != nir_instr_type_ssa_undef)
+   if (!intrin->src[arg_index].is_ssa ||
+       intrin->src[arg_index].ssa->parent_instr->type != nir_instr_type_ssa_undef)
       return false;
 
    nir_instr_remove(&intrin->instr);
@@ -150,10 +152,13 @@ nir_opt_undef(nir_shader *shader)
             }
          }
 
-         if (progress)
+         if (progress) {
             nir_metadata_preserve(function->impl,
                                   nir_metadata_block_index |
                                   nir_metadata_dominance);
+         } else {
+            nir_metadata_preserve(function->impl, nir_metadata_all);
+         }
       }
    }