Mesa (master): ac: fix f2b and i2b for doubles

Timothy Arceri tarceri at kemper.freedesktop.org
Tue Feb 27 22:26:46 UTC 2018


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

Author: Timothy Arceri <tarceri at itsqueeze.com>
Date:   Mon Feb 26 16:12:41 2018 +1100

ac: fix f2b and i2b for doubles

Without this llvm was asserting in debug builds.

V2: use LLVMConstNull()

Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>

---

 src/amd/common/ac_nir_to_llvm.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c
index 3f0bfedfa7..96bbecd110 100644
--- a/src/amd/common/ac_nir_to_llvm.c
+++ b/src/amd/common/ac_nir_to_llvm.c
@@ -1437,8 +1437,9 @@ static LLVMValueRef emit_f2b(struct ac_llvm_context *ctx,
 			     LLVMValueRef src0)
 {
 	src0 = ac_to_float(ctx, src0);
+	LLVMValueRef zero = LLVMConstNull(LLVMTypeOf(src0));
 	return LLVMBuildSExt(ctx->builder,
-			     LLVMBuildFCmp(ctx->builder, LLVMRealUNE, src0, ctx->f32_0, ""),
+			     LLVMBuildFCmp(ctx->builder, LLVMRealUNE, src0, zero, ""),
 			     ctx->i32, "");
 }
 
@@ -1457,8 +1458,9 @@ static LLVMValueRef emit_b2i(struct ac_llvm_context *ctx,
 static LLVMValueRef emit_i2b(struct ac_llvm_context *ctx,
 			     LLVMValueRef src0)
 {
+	LLVMValueRef zero = LLVMConstNull(LLVMTypeOf(src0));
 	return LLVMBuildSExt(ctx->builder,
-			     LLVMBuildICmp(ctx->builder, LLVMIntNE, src0, ctx->i32_0, ""),
+			     LLVMBuildICmp(ctx->builder, LLVMIntNE, src0, zero, ""),
 			     ctx->i32, "");
 }
 




More information about the mesa-commit mailing list