diff options
| author | Ilia Mirkin <[email protected]> | 2014-10-03 15:55:12 -0400 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2014-12-03 23:15:05 +0000 |
| commit | b61192f2aef693628c290de1022c5e884462c4f4 (patch) | |
| tree | 8ca35a293e99d9044fa92b353e29a1428ba5dbf2 /src | |
| parent | 75c4824d2f48c20a9ad0de75dba07c598278c597 (diff) | |
freedreno/ir3: fix UMAD
Looks like none of the mad variants do u16 * u16 + u32, so just add in
the extra value "by hand".
Signed-off-by: Ilia Mirkin <[email protected]>
Cc: "10.3 10.4" <[email protected]>
(cherry picked from commit de83ef677f6d845e63f9e5e790d3078372f752df)
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/drivers/freedreno/ir3/ir3_compiler.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/gallium/drivers/freedreno/ir3/ir3_compiler.c b/src/gallium/drivers/freedreno/ir3/ir3_compiler.c index 275eec3016c..2d7ea1c48cb 100644 --- a/src/gallium/drivers/freedreno/ir3/ir3_compiler.c +++ b/src/gallium/drivers/freedreno/ir3/ir3_compiler.c @@ -2112,7 +2112,7 @@ trans_cov(const struct instr_translater *t, * madsh.m16 tmp1, a, b, tmp0 (mul-add shift high mix, i.e. ah * bl << 16) * madsh.m16 dst, b, a, tmp1 (i.e. al * bh << 16) * - * For UMAD, replace first mull.u with mad.u16. + * For UMAD, add in the extra argument after mull.u. */ static void trans_umul(const struct instr_translater *t, @@ -2135,16 +2135,16 @@ trans_umul(const struct instr_translater *t, if (is_rel_or_const(b)) b = get_unconst(ctx, b); - if (t->tgsi_opc == TGSI_OPCODE_UMUL) { - /* mull.u tmp0, a, b */ - instr = instr_create(ctx, 2, OPC_MULL_U); - vectorize(ctx, instr, &tmp0_dst, 2, a, 0, b, 0); - } else { + /* mull.u tmp0, a, b */ + instr = instr_create(ctx, 2, OPC_MULL_U); + vectorize(ctx, instr, &tmp0_dst, 2, a, 0, b, 0); + + if (t->tgsi_opc == TGSI_OPCODE_UMAD) { struct tgsi_src_register *c = &inst->Src[2].Register; - /* mad.u16 tmp0, a, b, c */ - instr = instr_create(ctx, 3, OPC_MAD_U16); - vectorize(ctx, instr, &tmp0_dst, 3, a, 0, b, 0, c, 0); + /* add.u tmp0, tmp0, c */ + instr = instr_create(ctx, 2, OPC_ADD_U); + vectorize(ctx, instr, &tmp0_dst, 2, tmp0_src, 0, c, 0); } /* madsh.m16 tmp1, a, b, tmp0 */ |