From f0a046024d6d1bfc6b85829a690a8ea885cae124 Mon Sep 17 00:00:00 2001 From: Neil Roberts Date: Wed, 30 Jan 2019 16:33:05 +0100 Subject: [PATCH] freedreno/ir3: Support 16-bit comparison instructions v2. [Hyunjun Ko (zzoon@igalia.com)] Avoid using too much open code like "instr->regs[n]->flags |= FOO" v3. [Hyunjun Ko (zzoon@igalia.com)] Remove redundant code for both 16b and 32b operations. Reviewed-by: Rob Clark --- src/freedreno/ir3/ir3_compiler_nir.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/freedreno/ir3/ir3_compiler_nir.c b/src/freedreno/ir3/ir3_compiler_nir.c index 5e9eb9d1c3e..a960f0258ca 100644 --- a/src/freedreno/ir3/ir3_compiler_nir.c +++ b/src/freedreno/ir3/ir3_compiler_nir.c @@ -461,18 +461,22 @@ emit_alu(struct ir3_context *ctx, nir_alu_instr *alu) dst[0]->cat5.type = TYPE_F32; break; break; + case nir_op_flt16: case nir_op_flt32: dst[0] = ir3_CMPS_F(b, src[0], 0, src[1], 0); dst[0]->cat2.condition = IR3_COND_LT; break; + case nir_op_fge16: case nir_op_fge32: dst[0] = ir3_CMPS_F(b, src[0], 0, src[1], 0); dst[0]->cat2.condition = IR3_COND_GE; break; + case nir_op_feq16: case nir_op_feq32: dst[0] = ir3_CMPS_F(b, src[0], 0, src[1], 0); dst[0]->cat2.condition = IR3_COND_EQ; break; + case nir_op_fne16: case nir_op_fne32: dst[0] = ir3_CMPS_F(b, src[0], 0, src[1], 0); dst[0]->cat2.condition = IR3_COND_NE; @@ -572,26 +576,32 @@ emit_alu(struct ir3_context *ctx, nir_alu_instr *alu) case nir_op_ushr: dst[0] = ir3_SHR_B(b, src[0], 0, src[1], 0); break; + case nir_op_ilt16: case nir_op_ilt32: dst[0] = ir3_CMPS_S(b, src[0], 0, src[1], 0); dst[0]->cat2.condition = IR3_COND_LT; break; + case nir_op_ige16: case nir_op_ige32: dst[0] = ir3_CMPS_S(b, src[0], 0, src[1], 0); dst[0]->cat2.condition = IR3_COND_GE; break; + case nir_op_ieq16: case nir_op_ieq32: dst[0] = ir3_CMPS_S(b, src[0], 0, src[1], 0); dst[0]->cat2.condition = IR3_COND_EQ; break; + case nir_op_ine16: case nir_op_ine32: dst[0] = ir3_CMPS_S(b, src[0], 0, src[1], 0); dst[0]->cat2.condition = IR3_COND_NE; break; + case nir_op_ult16: case nir_op_ult32: dst[0] = ir3_CMPS_U(b, src[0], 0, src[1], 0); dst[0]->cat2.condition = IR3_COND_LT; break; + case nir_op_uge16: case nir_op_uge32: dst[0] = ir3_CMPS_U(b, src[0], 0, src[1], 0); dst[0]->cat2.condition = IR3_COND_GE; @@ -665,9 +675,19 @@ emit_alu(struct ir3_context *ctx, nir_alu_instr *alu) if (nir_alu_type_get_base_type(info->output_type) == nir_type_bool) { assert(dst_sz == 1); + + if (nir_dest_bit_size(alu->dest.dest) < 32) + dst[0]->regs[0]->flags |= IR3_REG_HALF; + dst[0] = ir3_n2b(b, dst[0]); } + if (nir_dest_bit_size(alu->dest.dest) < 32) { + for (unsigned i = 0; i < dst_sz; i++) { + dst[i]->regs[0]->flags |= IR3_REG_HALF; + } + } + ir3_put_dst(ctx, &alu->dest.dest); } -- 2.30.2