nir/algebraic: Add missing 16-bit extract_[iu]8 patterns

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

diff --git a/src/compiler/nir/nir_opt_constant_folding.c b/src/compiler/nir/nir_opt_constant_folding.c
index d011e4f6562a2767a498e840dbab6db9b23338f7..83be0d78dbd7d48b6dceab9c712cc4694e1115e7 100644 (file)
--- a/src/compiler/nir/nir_opt_constant_folding.c
+++ b/src/compiler/nir/nir_opt_constant_folding.c
@@ -41,7 +41,7 @@ struct constant_fold_state {
 static bool
 constant_fold_alu_instr(nir_alu_instr *instr, void *mem_ctx)
 {
-   nir_const_value src[4];
+   nir_const_value src[NIR_MAX_VEC_COMPONENTS];
 
    if (!instr->dest.dest.is_ssa)
       return false;
@@ -64,9 +64,8 @@ constant_fold_alu_instr(nir_alu_instr *instr, void *mem_ctx)
          return false;
 
       if (bit_size == 0 &&
-          !nir_alu_type_get_type_size(nir_op_infos[instr->op].input_sizes[i])) {
+          !nir_alu_type_get_type_size(nir_op_infos[instr->op].input_types[i]))
          bit_size = instr->src[i].src.ssa->bit_size;
-      }
 
       nir_instr *src_instr = instr->src[i].src.ssa->parent_instr;
 
@@ -89,6 +88,11 @@ constant_fold_alu_instr(nir_alu_instr *instr, void *mem_ctx)
          case 8:
             src[i].u8[j] = load_const->value.u8[instr->src[i].swizzle[j]];
             break;
+         case 1:
+            src[i].b[j] = load_const->value.b[instr->src[i].swizzle[j]];
+            break;
+         default:
+            unreachable("Invalid bit size");
          }
       }
 
@@ -129,12 +133,9 @@ constant_fold_intrinsic_instr(nir_intrinsic_instr *instr)
 {
    bool progress = false;
 
-   if (instr->intrinsic == nir_intrinsic_discard_if) {
-      nir_const_value *src_val = nir_src_as_const_value(instr->src[0]);
-      if (src_val && src_val->u32[0] == NIR_FALSE) {
-         nir_instr_remove(&instr->instr);
-         progress = true;
-      } else if (src_val && src_val->u32[0] == NIR_TRUE) {
+   if (instr->intrinsic == nir_intrinsic_discard_if &&
+       nir_src_is_const(instr->src[0])) {
+      if (nir_src_as_bool(instr->src[0])) {
          /* This method of getting a nir_shader * from a nir_instr is
           * admittedly gross, but given the rarity of hitting this case I think
           * it's preferable to plumbing an otherwise unused nir_shader *
@@ -149,6 +150,10 @@ constant_fold_intrinsic_instr(nir_intrinsic_instr *instr)
          nir_instr_insert_before(&instr->instr, &discard->instr);
          nir_instr_remove(&instr->instr);
          progress = true;
+      } else {
+         /* We're not discarding, just delete the instruction */
+         nir_instr_remove(&instr->instr);
+         progress = true;
       }
    }
 
@@ -188,9 +193,14 @@ nir_opt_constant_folding_impl(nir_function_impl *impl)
       progress |= constant_fold_block(block, mem_ctx);
    }
 
-   if (progress)
+   if (progress) {
       nir_metadata_preserve(impl, nir_metadata_block_index |
                                   nir_metadata_dominance);
+   } else {
+#ifndef NDEBUG
+      impl->valid_metadata &= ~nir_metadata_not_properly_reset;
+#endif
+   }
 
    return progress;
 }