Mesa (main): ac/llvm: add helper ac_build_is_inf_or_nan
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Tue Oct 19 13:11:45 UTC 2021
Module: Mesa
Branch: main
Commit: efaab0ec500473bea07c626b7c99ed253865ab8d
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=efaab0ec500473bea07c626b7c99ed253865ab8d
Author: Marek Olšák <marek.olsak at amd.com>
Date: Fri Oct 15 05:23:02 2021 -0400
ac/llvm: add helper ac_build_is_inf_or_nan
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13380>
---
src/amd/llvm/ac_llvm_build.c | 10 ++++++++++
src/amd/llvm/ac_llvm_build.h | 1 +
src/amd/llvm/ac_nir_to_llvm.c | 6 +-----
3 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/amd/llvm/ac_llvm_build.c b/src/amd/llvm/ac_llvm_build.c
index fe40a8a3ec3..815410412a5 100644
--- a/src/amd/llvm/ac_llvm_build.c
+++ b/src/amd/llvm/ac_llvm_build.c
@@ -4776,3 +4776,13 @@ void ac_build_triangle_strip_indices_to_triangle(struct ac_llvm_context *ctx, LL
LLVMBuildSelect(builder, is_odd, index[1], index[2], ""), index[2], "");
memcpy(index, out, sizeof(out));
}
+
+LLVMValueRef ac_build_is_inf_or_nan(struct ac_llvm_context *ctx, LLVMValueRef a)
+{
+ LLVMValueRef args[2] = {
+ a,
+ LLVMConstInt(ctx->i32, S_NAN | Q_NAN | N_INFINITY | P_INFINITY, 0),
+ };
+ return ac_build_intrinsic(ctx, "llvm.amdgcn.class.f32", ctx->i1, args, 2,
+ AC_FUNC_ATTR_READNONE);
+}
diff --git a/src/amd/llvm/ac_llvm_build.h b/src/amd/llvm/ac_llvm_build.h
index 939cfab7509..1f38cbdae0e 100644
--- a/src/amd/llvm/ac_llvm_build.h
+++ b/src/amd/llvm/ac_llvm_build.h
@@ -615,6 +615,7 @@ void ac_build_s_endpgm(struct ac_llvm_context *ctx);
void ac_build_triangle_strip_indices_to_triangle(struct ac_llvm_context *ctx, LLVMValueRef is_odd,
LLVMValueRef flatshade_first,
LLVMValueRef index[3]);
+LLVMValueRef ac_build_is_inf_or_nan(struct ac_llvm_context *ctx, LLVMValueRef a);
#ifdef __cplusplus
}
diff --git a/src/amd/llvm/ac_nir_to_llvm.c b/src/amd/llvm/ac_nir_to_llvm.c
index 6f13f44ab8f..bd72e39a0af 100644
--- a/src/amd/llvm/ac_nir_to_llvm.c
+++ b/src/amd/llvm/ac_nir_to_llvm.c
@@ -3348,11 +3348,7 @@ static LLVMValueRef load_interpolated_input(struct ac_nir_context *ctx, LLVMValu
/* Workaround for issue 2647: kill threads with infinite interpolation coeffs */
if (ctx->verified_interp && !_mesa_hash_table_search(ctx->verified_interp, interp_param)) {
- LLVMValueRef args[2];
- args[0] = i;
- args[1] = LLVMConstInt(ctx->ac.i32, S_NAN | Q_NAN | N_INFINITY | P_INFINITY, false);
- LLVMValueRef cond = ac_build_intrinsic(&ctx->ac, "llvm.amdgcn.class.f32", ctx->ac.i1, args, 2,
- AC_FUNC_ATTR_READNONE);
+ LLVMValueRef cond = ac_build_is_inf_or_nan(&ctx->ac, i);
ac_build_kill_if_false(&ctx->ac, LLVMBuildNot(ctx->ac.builder, cond, ""));
_mesa_hash_table_insert(ctx->verified_interp, interp_param, interp_param);
}
More information about the mesa-commit
mailing list