From: Nicolai Hähnle <nicolai.haehnle@amd.com>
Date: Thu, 10 Jan 2019 21:59:58 +0000 (+0100)
Subject: amd/common: use llvm.amdgcn.s.buffer.load for LLVM 8.0
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e4803ab7d2b61178e45985684457a34982ffb3c4;p=mesa.git

amd/common: use llvm.amdgcn.s.buffer.load for LLVM 8.0

llvm.SI.load.const is deprecated.

Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
---

diff --git a/src/amd/common/ac_llvm_build.c b/src/amd/common/ac_llvm_build.c
index 76047148a6a..4d7f15901e3 100644
--- a/src/amd/common/ac_llvm_build.c
+++ b/src/amd/common/ac_llvm_build.c
@@ -1241,11 +1241,15 @@ ac_build_buffer_load(struct ac_llvm_context *ctx,
 				offset = LLVMBuildAdd(ctx->builder, offset,
 						      LLVMConstInt(ctx->i32, 4, 0), "");
 			}
-			LLVMValueRef args[2] = {rsrc, offset};
-			result[i] = ac_build_intrinsic(ctx, "llvm.SI.load.const.v4i32",
-						       ctx->f32, args, 2,
+			const char *intrname =
+				HAVE_LLVM >= 0x0800 ? "llvm.amdgcn.s.buffer.load.f32"
+						    : "llvm.SI.load.const";
+			unsigned num_args = HAVE_LLVM >= 0x0800 ? 3 : 2;
+			LLVMValueRef args[3] = {rsrc, offset, ctx->i32_0};
+			result[i] = ac_build_intrinsic(ctx, intrname,
+						       ctx->f32, args, num_args,
 						       AC_FUNC_ATTR_READNONE |
-						       AC_FUNC_ATTR_LEGACY);
+						       (HAVE_LLVM < 0x0800 ? AC_FUNC_ATTR_LEGACY : 0));
 		}
 		if (num_channels == 1)
 			return result[0];