diff options
| author | Nicolai Hähnle <[email protected]> | 2016-01-25 14:11:07 -0500 |
|---|---|---|
| committer | Nicolai Hähnle <[email protected]> | 2016-01-26 09:57:06 -0500 |
| commit | 8894b5f0086cd80e7b5ccbe350d94e02fe4f4adf (patch) | |
| tree | 2d4cfd7f6f68ba5b3cd1175d05b89c37a3c3aed8 | |
| parent | a443b5b7320ef0d8a63faf8a7fc6136f97460cea (diff) | |
radeonsi: use llvm.amdgcn.s.barrier instead of llvm.AMDGPU.barrier.local
The new name for the intrinsic was introduced in LLVM r258558.
v2: use ternary operator instead of preprocessor
Reviewed-by: Michel Dänzer <[email protected]> (v1)
Reviewed-by: Marek Olšák <[email protected]>
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_shader.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c index c365b149a86..94c1129c88d 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -3465,7 +3465,9 @@ static void si_llvm_emit_barrier(const struct lp_build_tgsi_action *action, { struct gallivm_state *gallivm = bld_base->base.gallivm; - lp_build_intrinsic(gallivm->builder, "llvm.AMDGPU.barrier.local", + lp_build_intrinsic(gallivm->builder, + HAVE_LLVM >= 0x0309 ? "llvm.amdgcn.s.barrier" + : "llvm.AMDGPU.barrier.local", LLVMVoidTypeInContext(gallivm->context), NULL, 0, LLVMNoUnwindAttribute); } |