nir: Remove deref chain support from opt_peephole_select
authorJason Ekstrand <jason.ekstrand@intel.com>
Tue, 27 Mar 2018 16:45:23 +0000 (09:45 -0700)
committerJason Ekstrand <jason.ekstrand@intel.com>
Sat, 23 Jun 2018 03:54:00 +0000 (20:54 -0700)
Acked-by: Rob Clark <robdclark@gmail.com>
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Acked-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
src/compiler/nir/nir_opt_peephole_select.c

index 608701ab55c921fac2e63dbcc0af282e915577d5..51c03a1aa9cd286b57cacbba215fa516276d2039 100644 (file)
@@ -66,17 +66,6 @@ block_check_for_allowed_instrs(nir_block *block, unsigned *count, bool alu_ok)
          nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr);
 
          switch (intrin->intrinsic) {
-         case nir_intrinsic_load_var:
-            switch (intrin->variables[0]->var->data.mode) {
-            case nir_var_shader_in:
-            case nir_var_uniform:
-               break;
-
-            default:
-               return false;
-            }
-            break;
-
          case nir_intrinsic_load_deref:
             switch (nir_src_as_deref(intrin->src[0])->mode) {
             case nir_var_shader_in:
@@ -266,6 +255,8 @@ nir_opt_peephole_select(nir_shader *shader, unsigned limit)
 {
    bool progress = false;
 
+   nir_assert_unlowered_derefs(shader, nir_lower_load_store_derefs);
+
    nir_foreach_function(function, shader) {
       if (function->impl)
          progress |= nir_opt_peephole_select_impl(function->impl, limit);