Mesa (master): ac: fix 16-bit shifts

[GitLab Mirror]

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

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Thu Mar 21 11:59:37 2019 +0100

ac: fix 16-bit shifts

This fixes the following LLVM error when ckeckir is set:
Type too small for ZExt

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl

---

 src/amd/common/ac_nir_to_llvm.c | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c
index 82def9ab20f..37ef50fabaf 100644
--- a/src/amd/common/ac_nir_to_llvm.c
+++ b/src/amd/common/ac_nir_to_llvm.c
@@ -671,22 +671,31 @@ static void visit_alu(struct ac_nir_context *ctx, const nir_alu_instr *instr)
 		result = LLVMBuildXor(ctx->ac.builder, src[0], src[1], "");
 		break;
 	case nir_op_ishl:
-		result = LLVMBuildShl(ctx->ac.builder, src[0],
-				      LLVMBuildZExt(ctx->ac.builder, src[1],
-						    LLVMTypeOf(src[0]), ""),
-				      "");
+		if (ac_get_elem_bits(&ctx->ac, LLVMTypeOf(src[1])) < ac_get_elem_bits(&ctx->ac, LLVMTypeOf(src[0])))
+			src[1] = LLVMBuildZExt(ctx->ac.builder, src[1],
+					       LLVMTypeOf(src[0]), "");
+		else if (ac_get_elem_bits(&ctx->ac, LLVMTypeOf(src[1])) > ac_get_elem_bits(&ctx->ac, LLVMTypeOf(src[0])))
+			src[1] = LLVMBuildTrunc(ctx->ac.builder, src[1],
+						LLVMTypeOf(src[0]), "");
+		result = LLVMBuildShl(ctx->ac.builder, src[0], src[1], "");
 		break;
 	case nir_op_ishr:
-		result = LLVMBuildAShr(ctx->ac.builder, src[0],
-				       LLVMBuildZExt(ctx->ac.builder, src[1],
-						     LLVMTypeOf(src[0]), ""),
-				       "");
+		if (ac_get_elem_bits(&ctx->ac, LLVMTypeOf(src[1])) < ac_get_elem_bits(&ctx->ac, LLVMTypeOf(src[0])))
+			src[1] = LLVMBuildZExt(ctx->ac.builder, src[1],
+					       LLVMTypeOf(src[0]), "");
+		else if (ac_get_elem_bits(&ctx->ac, LLVMTypeOf(src[1])) > ac_get_elem_bits(&ctx->ac, LLVMTypeOf(src[0])))
+			src[1] = LLVMBuildTrunc(ctx->ac.builder, src[1],
+						LLVMTypeOf(src[0]), "");
+		result = LLVMBuildAShr(ctx->ac.builder, src[0], src[1], "");
 		break;
 	case nir_op_ushr:
-		result = LLVMBuildLShr(ctx->ac.builder, src[0],
-				       LLVMBuildZExt(ctx->ac.builder, src[1],
-						     LLVMTypeOf(src[0]), ""),
-				       "");
+		if (ac_get_elem_bits(&ctx->ac, LLVMTypeOf(src[1])) < ac_get_elem_bits(&ctx->ac, LLVMTypeOf(src[0])))
+			src[1] = LLVMBuildZExt(ctx->ac.builder, src[1],
+					       LLVMTypeOf(src[0]), "");
+		else if (ac_get_elem_bits(&ctx->ac, LLVMTypeOf(src[1])) > ac_get_elem_bits(&ctx->ac, LLVMTypeOf(src[0])))
+			src[1] = LLVMBuildTrunc(ctx->ac.builder, src[1],
+						LLVMTypeOf(src[0]), "");
+		result = LLVMBuildLShr(ctx->ac.builder, src[0], src[1], "");
 		break;
 	case nir_op_ilt32:
 		result = emit_int_cmp(&ctx->ac, LLVMIntSLT, src[0], src[1]);