ac: use struct/raw load intrinsics for 8-bit/16-bit int with LLVM 9+

This changes requires LLVM r356465.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>

diff --git a/src/amd/common/ac_llvm_build.c b/src/amd/common/ac_llvm_build.c
index c7100e52295f0b6faf360683672fc441c86f9b08..55ad3534ae20c7dbf15fdf1a15c78c24874f00ee 100644 (file)
--- a/src/amd/common/ac_llvm_build.c
+++ b/src/amd/common/ac_llvm_build.c
@@ -1603,15 +1603,28 @@ ac_build_tbuffer_load_short(struct ac_llvm_context *ctx,
                            LLVMValueRef immoffset,
                            bool glc)
 {
-       unsigned dfmt = V_008F0C_BUF_DATA_FORMAT_16;
-       unsigned nfmt = V_008F0C_BUF_NUM_FORMAT_UINT;
        LLVMValueRef res;
 
-       res = ac_build_raw_tbuffer_load(ctx, rsrc, voffset, soffset,
-                                       immoffset, 1, dfmt, nfmt, glc, false,
-                                       false);
+       if (HAVE_LLVM >= 0x900) {
+               voffset = LLVMBuildAdd(ctx->builder, voffset, immoffset, "");
+
+               /* LLVM 9+ supports i8/i16 with struct/raw intrinsics. */
+               res = ac_build_llvm8_buffer_load_common(ctx, rsrc, NULL,
+                                                       voffset, soffset,
+                                                       1, ctx->i16, glc, false,
+                                                       false, false, false);
+       } else {
+               unsigned dfmt = V_008F0C_BUF_DATA_FORMAT_16;
+               unsigned nfmt = V_008F0C_BUF_NUM_FORMAT_UINT;
 
-       return LLVMBuildTrunc(ctx->builder, res, ctx->i16, "");
+               res = ac_build_raw_tbuffer_load(ctx, rsrc, voffset, soffset,
+                                               immoffset, 1, dfmt, nfmt, glc, false,
+                                               false);
+
+               res = LLVMBuildTrunc(ctx->builder, res, ctx->i16, "");
+       }
+
+       return res;
 }
 
 LLVMValueRef
@@ -1622,15 +1635,28 @@ ac_build_tbuffer_load_byte(struct ac_llvm_context *ctx,
                           LLVMValueRef immoffset,
                           bool glc)
 {
-       unsigned dfmt = V_008F0C_BUF_DATA_FORMAT_8;
-       unsigned nfmt = V_008F0C_BUF_NUM_FORMAT_UINT;
        LLVMValueRef res;
 
-       res = ac_build_raw_tbuffer_load(ctx, rsrc, voffset, soffset,
-                                       immoffset, 1, dfmt, nfmt, glc, false,
-                                       false);
+       if (HAVE_LLVM >= 0x900) {
+               voffset = LLVMBuildAdd(ctx->builder, voffset, immoffset, "");
+
+               /* LLVM 9+ supports i8/i16 with struct/raw intrinsics. */
+               res = ac_build_llvm8_buffer_load_common(ctx, rsrc, NULL,
+                                                       voffset, soffset,
+                                                       1, ctx->i8, glc, false,
+                                                       false, false, false);
+       } else {
+               unsigned dfmt = V_008F0C_BUF_DATA_FORMAT_8;
+               unsigned nfmt = V_008F0C_BUF_NUM_FORMAT_UINT;
 
-       return LLVMBuildTrunc(ctx->builder, res, ctx->i8, "");
+               res = ac_build_raw_tbuffer_load(ctx, rsrc, voffset, soffset,
+                                               immoffset, 1, dfmt, nfmt, glc, false,
+                                               false);
+
+               res = LLVMBuildTrunc(ctx->builder, res, ctx->i8, "");
+       }
+
+       return res;
 }
 static void
 ac_build_llvm8_tbuffer_store(struct ac_llvm_context *ctx,