[Mesa-dev] [PATCH 1/2] spirv: handle OpUndef as part of the variable parsing pass

[Juan A. Suarez Romero]

Reviewed-by: Juan A. Suarez Romero <jasuarez at igalia.com>

On Thu, 2017-01-26 at 17:08 +0000, Lionel Landwerlin wrote:
> Looking at the following bit of SPIRV shader :
> 
> ...
> %zero        = OpConstant %i32 0
> %ivec3_0     = OpConstantComposite %ivec3 %zero %zero %zero
> %vec3_undef  = OpUndef %ivec3
> %sc_0        = OpSpecConstant %i32 0
> %sc_1        = OpSpecConstant %i32 0
> %sc_2        = OpSpecConstant %i32 0
> ...
> 
> Our compiler currently stops parsing variables & types on the OpUndef
> and switches to instructions, leaving the following sc_[0-2] variables
> untreated.
> 
> Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
> ---
>  src/compiler/spirv/spirv_to_nir.c  | 1 +
>  src/compiler/spirv/vtn_variables.c | 6 ++++++
>  2 files changed, 7 insertions(+)
> 
> diff --git a/src/compiler/spirv/spirv_to_nir.c b/src/compiler/spirv/spirv_to_nir.c
> index 261be65e9f..2d773b4373 100644
> --- a/src/compiler/spirv/spirv_to_nir.c
> +++ b/src/compiler/spirv/spirv_to_nir.c
> @@ -2923,6 +2923,7 @@ vtn_handle_variable_or_type_instruction(struct vtn_builder *b, SpvOp opcode,
>        vtn_handle_constant(b, opcode, w, count);
>        break;
>  
> +   case SpvOpUndef:
>     case SpvOpVariable:
>        vtn_handle_variables(b, opcode, w, count);
>        break;
> diff --git a/src/compiler/spirv/vtn_variables.c b/src/compiler/spirv/vtn_variables.c
> index b6c36f3d6a..098cfb5de7 100644
> --- a/src/compiler/spirv/vtn_variables.c
> +++ b/src/compiler/spirv/vtn_variables.c
> @@ -1287,6 +1287,12 @@ vtn_handle_variables(struct vtn_builder *b, SpvOp opcode,
>                       const uint32_t *w, unsigned count)
>  {
>     switch (opcode) {
> +   case SpvOpUndef: {
> +      struct vtn_value *val = vtn_push_value(b, w[2], vtn_value_type_undef);
> +      val->type = vtn_value(b, w[1], vtn_value_type_type)->type;
> +      break;
> +   }
> +
>     case SpvOpVariable: {
>        struct vtn_variable *var = rzalloc(b, struct vtn_variable);
>        var->type = vtn_value(b, w[1], vtn_value_type_type)->type;