nir: fix nir_copy_propagation test
authorJuan A. Suarez Romero <jasuarez@igalia.com>
Tue, 23 Oct 2018 13:55:11 +0000 (15:55 +0200)
committerJuan A. Suarez Romero <jasuarez@igalia.com>
Wed, 24 Oct 2018 07:13:24 +0000 (09:13 +0200)
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>
src/compiler/nir/tests/vars_tests.cpp

index 02c53804b843bec8dbff446008edd6bceeea59de..a7bbeb02277992ba3f922791576a9c7acc0f1b81 100644 (file)
@@ -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;
       }
    }