[Mesa-dev] [PATCH 1/7] i965: Pass devinfo pointer to brw_instruction_name().

[Iago Toral]

I made a couple of very minor comments to some patches but do with them
as you wish. The series is:

Reviewed-by: Iago Toral Quiroga <itoral at igalia.com>

On Thu, 2016-04-28 at 00:19 -0700, Francisco Jerez wrote:
> A future series will implement support for an instruction that happens
> to have the same opcode number as another instruction we support
> already on a disjoint set of hardware generations.  In order to
> disambiguate which instruction it is brw_instruction_name() will need
> some way to find out which device we are generating code for.
> ---
>  src/mesa/drivers/dri/i965/brw_fs.cpp     | 2 +-
>  src/mesa/drivers/dri/i965/brw_shader.cpp | 2 +-
>  src/mesa/drivers/dri/i965/brw_shader.h   | 3 ++-
>  src/mesa/drivers/dri/i965/brw_vec4.cpp   | 2 +-
>  4 files changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp
> index 78f7d40..c7c7a45 100644
> --- a/src/mesa/drivers/dri/i965/brw_fs.cpp
> +++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
> @@ -4796,7 +4796,7 @@ fs_visitor::dump_instruction(backend_instruction *be_inst, FILE *file)
>               inst->flag_subreg);
>     }
>  
> -   fprintf(file, "%s", brw_instruction_name(inst->opcode));
> +   fprintf(file, "%s", brw_instruction_name(devinfo, inst->opcode));
>     if (inst->saturate)
>        fprintf(file, ".sat");
>     if (inst->conditional_mod) {
> diff --git a/src/mesa/drivers/dri/i965/brw_shader.cpp b/src/mesa/drivers/dri/i965/brw_shader.cpp
> index 80fddfc..a2281a7 100644
> --- a/src/mesa/drivers/dri/i965/brw_shader.cpp
> +++ b/src/mesa/drivers/dri/i965/brw_shader.cpp
> @@ -163,7 +163,7 @@ brw_texture_offset(int *offsets, unsigned num_components)
>  }
>  
>  const char *
> -brw_instruction_name(enum opcode op)
> +brw_instruction_name(const struct brw_device_info *devinfo, enum opcode op)
>  {
>     switch (op) {
>     case BRW_OPCODE_ILLEGAL ... BRW_OPCODE_NOP:
> diff --git a/src/mesa/drivers/dri/i965/brw_shader.h b/src/mesa/drivers/dri/i965/brw_shader.h
> index fc228f6..8ab8d5b 100644
> --- a/src/mesa/drivers/dri/i965/brw_shader.h
> +++ b/src/mesa/drivers/dri/i965/brw_shader.h
> @@ -235,7 +235,8 @@ struct backend_shader;
>  enum brw_reg_type brw_type_for_base_type(const struct glsl_type *type);
>  enum brw_conditional_mod brw_conditional_for_comparison(unsigned int op);
>  uint32_t brw_math_function(enum opcode op);
> -const char *brw_instruction_name(enum opcode op);
> +const char *brw_instruction_name(const struct brw_device_info *devinfo,
> +                                 enum opcode op);
>  bool brw_saturate_immediate(enum brw_reg_type type, struct brw_reg *reg);
>  bool brw_negate_immediate(enum brw_reg_type type, struct brw_reg *reg);
>  bool brw_abs_immediate(enum brw_reg_type type, struct brw_reg *reg);
> diff --git a/src/mesa/drivers/dri/i965/brw_vec4.cpp b/src/mesa/drivers/dri/i965/brw_vec4.cpp
> index a2b3560..599e45e 100644
> --- a/src/mesa/drivers/dri/i965/brw_vec4.cpp
> +++ b/src/mesa/drivers/dri/i965/brw_vec4.cpp
> @@ -1393,7 +1393,7 @@ vec4_visitor::dump_instruction(backend_instruction *be_inst, FILE *file)
>                pred_ctrl_align16[inst->predicate]);
>     }
>  
> -   fprintf(file, "%s", brw_instruction_name(inst->opcode));
> +   fprintf(file, "%s", brw_instruction_name(devinfo, inst->opcode));
>     if (inst->saturate)
>        fprintf(file, ".sat");
>     if (inst->conditional_mod) {