[Mesa-dev] [PATCH v2] nir: fix nir_copy_propagation test

[Michel Dänzer]

On 2018-10-23 4:55 p.m., Juan A. Suarez Romero wrote:
> 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 at igalia.com>
> ---
>  src/compiler/nir/tests/vars_tests.cpp | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> 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;
>        }
>     }
> 

Thanks Juan!

Tested-by: Michel Dänzer <michel.daenzer at amd.com>


-- 
Earthling Michel Dänzer               |               http://www.amd.com
Libre software enthusiast             |             Mesa and X developer