Mesa (master): ac/nir: fix translation of nir_op_frsq for doubles

Timothy Arceri tarceri at kemper.freedesktop.org
Thu Jan 11 22:29:52 UTC 2018


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

Author: Timothy Arceri <tarceri at itsqueeze.com>
Date:   Thu Jan 11 17:04:22 2018 +1100

ac/nir: fix translation of nir_op_frsq for doubles

Without this we end up with the llvm error message:

"Both operands to a binary operator are not of the same type!"

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

---

 src/amd/common/ac_nir_to_llvm.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c
index 7153c9708d..372a424ce5 100644
--- a/src/amd/common/ac_nir_to_llvm.c
+++ b/src/amd/common/ac_nir_to_llvm.c
@@ -1842,7 +1842,8 @@ static void visit_alu(struct ac_nir_context *ctx, const nir_alu_instr *instr)
 	case nir_op_frsq:
 		result = emit_intrin_1f_param(&ctx->ac, "llvm.sqrt",
 		                              ac_to_float_type(&ctx->ac, def_type), src[0]);
-		result = ac_build_fdiv(&ctx->ac, ctx->ac.f32_1, result);
+		result = ac_build_fdiv(&ctx->ac, instr->dest.dest.ssa.bit_size == 32 ? ctx->ac.f32_1 : ctx->ac.f64_1,
+				       result);
 		break;
 	case nir_op_fpow:
 		result = emit_intrin_2f_param(&ctx->ac, "llvm.pow",




More information about the mesa-commit mailing list