KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

freedreno/ir3: 8bit fixes 

Signed-off-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13300>
This commit is contained in:
Rob Clark 2021-08-23 17:18:50 -07:00 committed by Marge Bot
parent f7b2d613c5
commit 81eefe0090
3 changed files with 38 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/freedreno/ir3/instr-a3xx.h
View File

@ -382,6 +382,32 @@ type_size(type_t type)
}
}
static inline type_t
type_uint_size(unsigned bit_size)
{
switch (bit_size) {
case 8: return TYPE_U8;
case 1: /* 1b bools are treated as normal half-regs */
case 16: return TYPE_U16;
case 32: return TYPE_U32;
default:
ir3_assert(0); /* invalid size */
return 0;
}
}
static inline type_t
type_float_size(unsigned bit_size)
{
switch (bit_size) {
case 16: return TYPE_F16;
case 32: return TYPE_F32;
default:
ir3_assert(0); /* invalid size */
return 0;
}
}
static inline int
type_float(type_t type)
{

5
src/freedreno/ir3/ir3.h
View File

@ -1198,6 +1198,9 @@ half_type(type_t type)
case TYPE_U16:
case TYPE_S16:
return type;
case TYPE_U8:
case TYPE_S8:
return type;
default:
assert(0);
return ~0;
@ -1210,8 +1213,10 @@ full_type(type_t type)
switch (type) {
case TYPE_F16:
return TYPE_F32;
case TYPE_U8:
case TYPE_U16:
return TYPE_U32;
case TYPE_S8:
case TYPE_S16:
return TYPE_S32;
case TYPE_F32:

12
src/freedreno/ir3/ir3_compiler_nir.c
View File

@ -293,8 +293,7 @@ emit_alu(struct ir3_context *ctx, nir_alu_instr *alu)
unsigned bs[info->num_inputs]; /* bit size */
struct ir3_block *b = ctx->block;
unsigned dst_sz, wrmask;
type_t dst_type =
nir_dest_bit_size(alu->dest.dest) == 16 ? TYPE_U16 : TYPE_U32;
type_t dst_type = type_uint_size(nir_dest_bit_size(alu->dest.dest));
if (alu->dest.dest.is_ssa) {
dst_sz = alu->dest.dest.ssa.num_components;
@ -399,7 +398,7 @@ emit_alu(struct ir3_context *ctx, nir_alu_instr *alu)
case nir_op_f2b1:
dst[0] = ir3_CMPS_F(
b, src[0], 0,
create_immed_typed(b, 0, bs[0] == 16 ? TYPE_F16 : TYPE_F32), 0);
create_immed_typed(b, 0, type_float_size(bs[0])), 0);
dst[0]->cat2.condition = IR3_COND_NE;
break;
@ -409,7 +408,7 @@ emit_alu(struct ir3_context *ctx, nir_alu_instr *alu)
*/
dst[0] = ir3_CMPS_S(
b, src[0], 0,
create_immed_typed(b, 0, bs[0] == 16 ? TYPE_U16 : TYPE_U32), 0);
create_immed_typed(b, 0, type_uint_size(bs[0])), 0);
dst[0]->cat2.condition = IR3_COND_NE;
break;
@ -2246,7 +2245,10 @@ emit_load_const(struct ir3_context *ctx, nir_load_const_instr *instr)
ir3_get_dst_ssa(ctx, &instr->def, instr->def.num_components);
unsigned bit_size = ir3_bitsize(ctx, instr->def.bit_size);
if (bit_size <= 16) {
if (bit_size <= 8) {
for (int i = 0; i < instr->def.num_components; i++)
dst[i] = create_immed_typed(ctx->block, instr->value[i].u8, TYPE_U8);
} else if (bit_size <= 16) {
for (int i = 0; i < instr->def.num_components; i++)
dst[i] = create_immed_typed(ctx->block, instr->value[i].u16, TYPE_U16);
} else {