KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ac/nir: fix 64-bit division for GL CTS 

This fixes: KHR-GL45.gpu_shader_fp64.builtin.mod_*

Fixes: ba2ec1f3 "ac/nir: use llvm.amdgcn.rcp in ac_build_fdiv()"

Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5531>
This commit is contained in:
Marek Olšák 2020-06-17 15:25:28 -04:00 committed by Marge Bot
parent 3fec2f67c3
commit 2b8b62c55b
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/amd/llvm/ac_llvm_build.c
View File

@ -705,6 +705,11 @@ ac_build_fdiv(struct ac_llvm_context *ctx,
unsigned type_size = ac_get_type_size(LLVMTypeOf(den));
const char *name;
/* For doubles, we need precise division to pass GLCTS. */
if (ctx->float_mode == AC_FLOAT_MODE_DEFAULT_OPENGL &&
type_size == 8)
return LLVMBuildFDiv(ctx->builder, num, den, "");
if (type_size == 2)
name = "llvm.amdgcn.rcp.f16";
else if (type_size == 4)

11
src/amd/llvm/ac_nir_to_llvm.c
View File

@ -704,8 +704,15 @@ static void visit_alu(struct ac_nir_context *ctx, const nir_alu_instr *instr)
result = LLVMBuildFMul(ctx->ac.builder, src[0], src[1], "");
break;
case nir_op_frcp:
result = emit_intrin_1f_param(&ctx->ac, "llvm.amdgcn.rcp",
ac_to_float_type(&ctx->ac, def_type), src[0]);
/* For doubles, we need precise division to pass GLCTS. */
if (ctx->ac.float_mode == AC_FLOAT_MODE_DEFAULT_OPENGL &&
ac_get_type_size(def_type) == 8) {
result = LLVMBuildFDiv(ctx->ac.builder, ctx->ac.f64_1,
ac_to_float(&ctx->ac, src[0]), "");
} else {
result = emit_intrin_1f_param(&ctx->ac, "llvm.amdgcn.rcp",
ac_to_float_type(&ctx->ac, def_type), src[0]);
}
break;
case nir_op_iand:
result = LLVMBuildAnd(ctx->ac.builder, src[0], src[1], "");