Mesa (master): freedreno/ir3: Add a 16-bit implementation of nir_op_imul

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 3222216a589f0952f11af76ce591c10ba96cdeb7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3222216a589f0952f11af76ce591c10ba96cdeb7

Author: Neil Roberts <nroberts at igalia.com>
Date:   Thu Feb 28 16:13:56 2019 +0100

freedreno/ir3: Add a 16-bit implementation of nir_op_imul

Signed-off-by: Rob Clark <robdclark at chromium.org>

---

 src/freedreno/ir3/ir3_compiler_nir.c | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/freedreno/ir3/ir3_compiler_nir.c b/src/freedreno/ir3/ir3_compiler_nir.c
index 8692869d5ef..a441eadee84 100644
--- a/src/freedreno/ir3/ir3_compiler_nir.c
+++ b/src/freedreno/ir3/ir3_compiler_nir.c
@@ -543,15 +543,21 @@ emit_alu(struct ir3_context *ctx, nir_alu_instr *alu)
 		dst[0] = ir3_MIN_U(b, src[0], 0, src[1], 0);
 		break;
 	case nir_op_imul:
-		/*
-		 * dst = (al * bl) + (ah * bl << 16) + (al * bh << 16)
-		 *   mull.u tmp0, a, b           ; mul low, i.e. al * bl
-		 *   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
-		 */
-		dst[0] = ir3_MADSH_M16(b, src[1], 0, src[0], 0,
-					ir3_MADSH_M16(b, src[0], 0, src[1], 0,
-						ir3_MULL_U(b, src[0], 0, src[1], 0), 0), 0);
+		if (bs[0] > 16 || bs[1] > 16) {
+			/*
+			 * dst = (al * bl) + (ah * bl << 16) + (al * bh << 16)
+			 *   mull.u tmp0, a, b           ; mul low, i.e. al * bl
+			 *   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
+			 */
+			dst[0] = ir3_MADSH_M16(b, src[1], 0, src[0], 0,
+								   ir3_MADSH_M16(b, src[0], 0, src[1], 0,
+												 ir3_MULL_U(b, src[0], 0,
+															src[1], 0), 0), 0);
+		} else {
+			dst[0] = ir3_MUL_S(b, src[0], 0, src[1], 0);
+		}
 		break;
 	case nir_op_ineg:
 		dst[0] = ir3_ABSNEG_S(b, src[0], IR3_REG_SNEG);