From: Marek Olšák <marek.olsak@amd.com>
Date: Sun, 4 Dec 2022 06:33:33 +0000 (-0500)
Subject: ac/llvm: remove AC_FUNC_ATTR_INACCESSIBLE_MEM_ONLY because LLVM 16 removed it
X-Git-Tag: upstream/23.3.3~15933
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=834d59a83e64ef367ae5af174d8a968e7840f5c4;p=platform%2Fupstream%2Fmesa.git

ac/llvm: remove AC_FUNC_ATTR_INACCESSIBLE_MEM_ONLY because LLVM 16 removed it

We didn't use it reasonably anyway.

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20146>
---

diff --git a/src/amd/llvm/ac_llvm_build.c b/src/amd/llvm/ac_llvm_build.c
index 8f08ca4..65154a0 100644
--- a/src/amd/llvm/ac_llvm_build.c
+++ b/src/amd/llvm/ac_llvm_build.c
@@ -1250,7 +1250,7 @@ static void ac_build_buffer_store_common(struct ac_llvm_context *ctx, LLVMValueR
       snprintf(name, sizeof(name), "llvm.amdgcn.%s.buffer.store.%s", indexing_kind, type_name);
    }
 
-   ac_build_intrinsic(ctx, name, ctx->voidt, args, idx, AC_FUNC_ATTR_INACCESSIBLE_MEM_ONLY);
+   ac_build_intrinsic(ctx, name, ctx->voidt, args, idx, 0);
 }
 
 void ac_build_buffer_store_format(struct ac_llvm_context *ctx, LLVMValueRef rsrc, LLVMValueRef data,
@@ -4349,7 +4349,7 @@ LLVMValueRef ac_build_load_helper_invocation(struct ac_llvm_context *ctx)
 
    if (LLVM_VERSION_MAJOR >= 13) {
       result = ac_build_intrinsic(ctx, "llvm.amdgcn.live.mask", ctx->i1, NULL, 0,
-                                  AC_FUNC_ATTR_READONLY | AC_FUNC_ATTR_INACCESSIBLE_MEM_ONLY);
+                                  AC_FUNC_ATTR_READONLY);
    } else {
       result = ac_build_intrinsic(ctx, "llvm.amdgcn.ps.live", ctx->i1, NULL, 0,
                                   AC_FUNC_ATTR_READNONE);
diff --git a/src/amd/llvm/ac_llvm_util.c b/src/amd/llvm/ac_llvm_util.c
index be81084..3116471 100644
--- a/src/amd/llvm/ac_llvm_util.c
+++ b/src/amd/llvm/ac_llvm_util.c
@@ -265,8 +265,6 @@ static const char *attr_to_str(enum ac_func_attr attr)
       return "readonly";
    case AC_FUNC_ATTR_WRITEONLY:
       return "writeonly";
-   case AC_FUNC_ATTR_INACCESSIBLE_MEM_ONLY:
-      return "inaccessiblememonly";
    case AC_FUNC_ATTR_CONVERGENT:
       return "convergent";
    default:
diff --git a/src/amd/llvm/ac_llvm_util.h b/src/amd/llvm/ac_llvm_util.h
index f35c3ae..a670500 100644
--- a/src/amd/llvm/ac_llvm_util.h
+++ b/src/amd/llvm/ac_llvm_util.h
@@ -49,8 +49,7 @@ enum ac_func_attr
    AC_FUNC_ATTR_READNONE = (1 << 5),
    AC_FUNC_ATTR_READONLY = (1 << 6),
    AC_FUNC_ATTR_WRITEONLY = (1 << 7),
-   AC_FUNC_ATTR_INACCESSIBLE_MEM_ONLY = (1 << 8),
-   AC_FUNC_ATTR_CONVERGENT = (1 << 9),
+   AC_FUNC_ATTR_CONVERGENT = (1 << 8),
 
    /* Legacy intrinsic that needs attributes on function declarations
     * and they must match the internal LLVM definition exactly, otherwise