From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Wed, 28 Mar 2018 00:21:35 +0000 (-0700)
Subject: nir/copy_prop_vars: Re-order some logic in compare_derefs
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fa6ffcc0830bc97b82ad66fa8707e3bb39729b70;p=mesa.git

nir/copy_prop_vars: Re-order some logic in compare_derefs

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>
---

diff --git a/src/compiler/nir/nir_opt_copy_prop_vars.c b/src/compiler/nir/nir_opt_copy_prop_vars.c
index 2e1a2e0cd68..bf3b7933100 100644
--- a/src/compiler/nir/nir_opt_copy_prop_vars.c
+++ b/src/compiler/nir/nir_opt_copy_prop_vars.c
@@ -151,19 +151,19 @@ compare_derefs(nir_deref_var *a, nir_deref_var *b)
          nir_deref_array *a_arr = nir_deref_as_array(a_tail);
          nir_deref_array *b_arr = nir_deref_as_array(b_tail);
 
-         if (a_arr->deref_array_type == nir_deref_array_type_direct &&
-             b_arr->deref_array_type == nir_deref_array_type_direct) {
-            /* If they're both direct and have different offsets, they
-             * don't even alias much less anything else.
-             */
-            if (a_arr->base_offset != b_arr->base_offset)
-               return 0;
-         } else if (a_arr->deref_array_type == nir_deref_array_type_wildcard) {
+         if (a_arr->deref_array_type == nir_deref_array_type_wildcard) {
             if (b_arr->deref_array_type != nir_deref_array_type_wildcard)
                result &= ~derefs_b_contains_a_bit;
          } else if (b_arr->deref_array_type == nir_deref_array_type_wildcard) {
             if (a_arr->deref_array_type != nir_deref_array_type_wildcard)
                result &= ~derefs_a_contains_b_bit;
+         } else if (a_arr->deref_array_type == nir_deref_array_type_direct &&
+                    b_arr->deref_array_type == nir_deref_array_type_direct) {
+            /* If they're both direct and have different offsets, they
+             * don't even alias much less anything else.
+             */
+            if (a_arr->base_offset != b_arr->base_offset)
+               return 0;
          } else if (a_arr->deref_array_type == nir_deref_array_type_indirect &&
                     b_arr->deref_array_type == nir_deref_array_type_indirect) {
             assert(a_arr->indirect.is_ssa && b_arr->indirect.is_ssa);