From: Marek Olšák <marek.olsak@amd.com>
Date: Thu, 12 Dec 2019 22:00:51 +0000 (-0500)
Subject: ac: fix ac_get_i1_sgpr_mask for Wave32
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e5e3ffa6b93e005eb122b9cf510ee34b4cf6886b;p=mesa.git

ac: fix ac_get_i1_sgpr_mask for Wave32

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3095>
---

diff --git a/src/amd/llvm/ac_llvm_build.c b/src/amd/llvm/ac_llvm_build.c
index 47c27893fe5..a0e9eecd823 100644
--- a/src/amd/llvm/ac_llvm_build.c
+++ b/src/amd/llvm/ac_llvm_build.c
@@ -505,14 +505,23 @@ ac_build_ballot(struct ac_llvm_context *ctx,
 LLVMValueRef ac_get_i1_sgpr_mask(struct ac_llvm_context *ctx,
 				 LLVMValueRef value)
 {
-	const char *name = LLVM_VERSION_MAJOR >= 9 ? "llvm.amdgcn.icmp.i64.i1" : "llvm.amdgcn.icmp.i1";
+	const char *name;
+
+	if (LLVM_VERSION_MAJOR >= 9) {
+		if (ctx->wave_size == 64)
+			name = "llvm.amdgcn.icmp.i64.i1";
+		else
+			name = "llvm.amdgcn.icmp.i32.i1";
+	} else {
+		name = "llvm.amdgcn.icmp.i1";
+	}
 	LLVMValueRef args[3] = {
 		value,
 		ctx->i1false,
 		LLVMConstInt(ctx->i32, LLVMIntNE, 0),
 	};
 
-	return ac_build_intrinsic(ctx, name, ctx->i64, args, 3,
+	return ac_build_intrinsic(ctx, name, ctx->iN_wavemask, args, 3,
 				  AC_FUNC_ATTR_NOUNWIND |
 				  AC_FUNC_ATTR_READNONE |
 				  AC_FUNC_ATTR_CONVERGENT);