[Mesa-dev] [PATCH] ac: update llvm.amdgcn.icmp intrinsic name for LLVM 9+

[Bas Nieuwenhuizen]

r-b

On Fri, Jun 14, 2019 at 11:57 AM Samuel Pitoiset
<samuel.pitoiset at gmail.com> wrote:
>
> LLVM r363339 changed llvm.amdgcn.icmp.i* to llvm.amdgcn.icmp.i64.i*.
>
> Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
> ---
>  src/amd/common/ac_llvm_build.c | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/src/amd/common/ac_llvm_build.c b/src/amd/common/ac_llvm_build.c
> index 88e89d1dfb4..b93fdde023e 100644
> --- a/src/amd/common/ac_llvm_build.c
> +++ b/src/amd/common/ac_llvm_build.c
> @@ -441,6 +441,7 @@ LLVMValueRef
>  ac_build_ballot(struct ac_llvm_context *ctx,
>                 LLVMValueRef value)
>  {
> +       const char *name = HAVE_LLVM >= 0x900 ? "llvm.amdgcn.icmp.i64.i32" : "llvm.amdgcn.icmp.i32";
>         LLVMValueRef args[3] = {
>                 value,
>                 ctx->i32_0,
> @@ -454,8 +455,7 @@ ac_build_ballot(struct ac_llvm_context *ctx,
>
>         args[0] = ac_to_integer(ctx, args[0]);
>
> -       return ac_build_intrinsic(ctx,
> -                                 "llvm.amdgcn.icmp.i32",
> +       return ac_build_intrinsic(ctx, name,
>                                   ctx->i64, args, 3,
>                                   AC_FUNC_ATTR_NOUNWIND |
>                                   AC_FUNC_ATTR_READNONE |
> @@ -465,6 +465,7 @@ ac_build_ballot(struct ac_llvm_context *ctx,
>  LLVMValueRef ac_get_i1_sgpr_mask(struct ac_llvm_context *ctx,
>                                  LLVMValueRef value)
>  {
> +       const char *name = HAVE_LLVM >= 0x900 ? "llvm.amdgcn.icmp.i64.i1" : "llvm.amdgcn.icmp.i1";
>         LLVMValueRef args[3] = {
>                 value,
>                 ctx->i1false,
> @@ -472,7 +473,7 @@ LLVMValueRef ac_get_i1_sgpr_mask(struct ac_llvm_context *ctx,
>         };
>
>         assert(HAVE_LLVM >= 0x0800);
> -       return ac_build_intrinsic(ctx, "llvm.amdgcn.icmp.i1", ctx->i64, args, 3,
> +       return ac_build_intrinsic(ctx, name, ctx->i64, args, 3,
>                                   AC_FUNC_ATTR_NOUNWIND |
>                                   AC_FUNC_ATTR_READNONE |
>                                   AC_FUNC_ATTR_CONVERGENT);
> --
> 2.22.0
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev