[Mesa-dev] [PATCH 26/59] i965/fs: always pass the bitsize to brw_type_for_nir_type()

[Samuel Iglesias Gonsálvez]

On 02/05/16 09:22, Pohjolainen, Topi wrote:
> On Fri, Apr 29, 2016 at 01:29:23PM +0200, Samuel Iglesias Gons?lvez wrote:
>> From: Connor Abbott <connor.w.abbott at intel.com>
>>
>> v2 (Sam):
>> - Add bitsize to brw_type_for_nir_type() in optimize_extract_to_float()
>> ---
>>  src/mesa/drivers/dri/i965/brw_fs_nir.cpp | 12 +++++++++---
>>  1 file changed, 9 insertions(+), 3 deletions(-)
>>
>> diff --git a/src/mesa/drivers/dri/i965/brw_fs_nir.cpp b/src/mesa/drivers/dri/i965/brw_fs_nir.cpp
>> index 333ca2b..3ed3343 100644
>> --- a/src/mesa/drivers/dri/i965/brw_fs_nir.cpp
>> +++ b/src/mesa/drivers/dri/i965/brw_fs_nir.cpp
>> @@ -527,7 +527,9 @@ fs_visitor::optimize_extract_to_float(nir_alu_instr *instr,
>>     }
>>  
>>     fs_reg op0 = get_nir_src(src0->src[0].src);
>> -   op0.type = brw_type_for_nir_type(nir_op_infos[src0->op].input_types[0]);
>> +   op0.type =
>> +      brw_type_for_nir_type((nir_alu_type)(nir_op_infos[src0->op].input_types[0] |
>> +                                           nir_src_bit_size(src0->src[0].src)));
> 
> If we wrote it like this, for example, we wouldn't overflow the line width:
> 
>       op0.type = brw_type_for_nir_type((nir_alu_type)(
>                     nir_op_infos[src0->op].input_types[0] |
>                     nir_src_bit_size(src0->src[0].src)));
> 

What about this?

   op0.type = brw_type_for_nir_type(
      (nir_alu_type)(nir_op_infos[src0->op].input_types[0] |
                     nir_src_bit_size(src0->src[0].src)));


>>     op0 = offset(op0, bld, src0->src[0].swizzle[0]);
>>  
>>     set_saturate(instr->dest.saturate,
>> @@ -620,12 +622,16 @@ fs_visitor::nir_emit_alu(const fs_builder &bld, nir_alu_instr *instr)
>>     fs_inst *inst;
>>  
>>     fs_reg result = get_nir_dest(instr->dest.dest);
>> -   result.type = brw_type_for_nir_type(nir_op_infos[instr->op].output_type);
>> +   result.type =
>> +      brw_type_for_nir_type((nir_alu_type)(nir_op_infos[instr->op].output_type |
>> +                                           nir_dest_bit_size(instr->dest.dest)));
>>  
>>     fs_reg op[4];
>>     for (unsigned i = 0; i < nir_op_infos[instr->op].num_inputs; i++) {
>>        op[i] = get_nir_src(instr->src[i].src);
>> -      op[i].type = brw_type_for_nir_type(nir_op_infos[instr->op].input_types[i]);
>> +      op[i].type =
>> +         brw_type_for_nir_type((nir_alu_type)(nir_op_infos[instr->op].input_types[i] |
>> +                                              nir_src_bit_size(instr->src[i].src)));
>>        op[i].abs = instr->src[i].abs;
>>        op[i].negate = instr->src[i].negate;
>>     }
>> -- 
>> 2.5.0
>>
>> _______________________________________________
>> mesa-dev mailing list
>> mesa-dev at lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>