[Mesa-dev] [PATCH v2 19/24] anv/cmd_buffer: Move the mi_alu helper higher up

[Pohjolainen, Topi]

On Fri, Jan 19, 2018 at 03:47:36PM -0800, Jason Ekstrand wrote:
> ---
>  src/intel/vulkan/genX_cmd_buffer.c | 34 +++++++++++++++++++---------------
>  1 file changed, 19 insertions(+), 15 deletions(-)
> 
> diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c
> index 9e2eba3..15e805f 100644
> --- a/src/intel/vulkan/genX_cmd_buffer.c
> +++ b/src/intel/vulkan/genX_cmd_buffer.c
> @@ -431,6 +431,25 @@ genX(set_image_needs_resolve)(struct anv_cmd_buffer *cmd_buffer,
>     }
>  }
>  
> +#if GEN_IS_HASWELL || GEN_GEN >= 8
> +static inline uint32_t
> +mi_alu(uint32_t opcode, uint32_t operand1, uint32_t operand2)
> +{
> +   struct GENX(MI_MATH_ALU_INSTRUCTION) instr = {
> +      .ALUOpcode = opcode,
> +      .Operand1 = operand1,
> +      .Operand2 = operand2,
> +   };
> +
> +   uint32_t dw;
> +   GENX(MI_MATH_ALU_INSTRUCTION_pack)(NULL, &dw, &instr);
> +
> +   return dw;
> +}
> +#endif
> +
> +#define CS_GPR(n) (0x2600 + (n) * 8)
> +
>  static void
>  genX(load_needs_resolve_predicate)(struct anv_cmd_buffer *cmd_buffer,
>                                     const struct anv_image *image,
> @@ -2312,21 +2331,6 @@ void genX(CmdDrawIndexed)(
>  /* MI_MATH only exists on Haswell+ */
>  #if GEN_IS_HASWELL || GEN_GEN >= 8
>  
> -static uint32_t
> -mi_alu(uint32_t opcode, uint32_t op1, uint32_t op2)
> -{
> -   struct GENX(MI_MATH_ALU_INSTRUCTION) instr = {
> -      .ALUOpcode = opcode,
> -      .Operand1 = op1,
> -      .Operand2 = op2,
> -   };
> -
> -   uint32_t dw;
> -   GENX(MI_MATH_ALU_INSTRUCTION_pack)(NULL, &dw, &instr);
> -
> -   return dw;
> -}
> -
>  #define CS_GPR(n) (0x2600 + (n) * 8)

This needs to be removed as well. With that:

Reviewed-by: Topi Pohjolainen <topi.pohjolainen at intel.com>

>  
>  /* Emit dwords to multiply GPR0 by N */
> -- 
> 2.5.0.400.gff86faf
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev