From: Juan A. Suarez Romero <jasuarez@igalia.com>
Date: Tue, 23 Oct 2018 13:55:11 +0000 (+0200)
Subject: nir: fix nir_copy_propagation test
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3112da346bd006876d9ac23a781b0a3d0a366653;p=mesa.git

nir: fix nir_copy_propagation test

Use nir_src_comp_as_uint() to read the proper second component, as
nir_src_as_uint() returns the first one.

v2: Use nir_src_comp_as_uint() [Jason]

Fixes: 16870de8a0a ("nir: Use nir_src_is_const and nir_src_as_* in core
                     code")
Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108532
Tested-by: Michel Dänzer <michel.daenzer@amd.com>
Tested-by: Vinson Lee <vlee@freedesktop.org>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
---

diff --git a/src/compiler/nir/tests/vars_tests.cpp b/src/compiler/nir/tests/vars_tests.cpp
index 02c53804b84..a7bbeb02277 100644
--- a/src/compiler/nir/tests/vars_tests.cpp
+++ b/src/compiler/nir/tests/vars_tests.cpp
@@ -375,7 +375,7 @@ TEST_F(nir_copy_prop_vars_test, store_store_load_different_components)
          ASSERT_TRUE(store_to_v1->src[1].is_ssa);
 
          ASSERT_TRUE(nir_src_is_const(store_to_v1->src[1]));
-         ASSERT_EQ(nir_src_as_uint(store_to_v1->src[1]), 20);
+         ASSERT_EQ(nir_src_comp_as_uint(store_to_v1->src[1], 1), 20);
          break;
       }
    }
@@ -424,7 +424,7 @@ TEST_F(nir_copy_prop_vars_test, store_store_load_different_components_in_many_bl
          ASSERT_TRUE(store_to_v1->src[1].is_ssa);
 
          ASSERT_TRUE(nir_src_is_const(store_to_v1->src[1]));
-         ASSERT_EQ(nir_src_as_uint(store_to_v1->src[1]), 20);
+         ASSERT_EQ(nir_src_comp_as_uint(store_to_v1->src[1], 1), 20);
          break;
       }
    }