diff options
| author | Justin Lebar <jlebar@google.com> | 2016-07-07 18:14:55 +0000 |
|---|---|---|
| committer | Justin Lebar <jlebar@google.com> | 2016-07-07 18:14:55 +0000 |
| commit | e5c910f8ae1e7699798aeadbf0a14959009e2ef8 (patch) | |
| tree | 7cf12c8637a61861faf54285630a14fe16edeb5d /llvm | |
| parent | 30ca81f1f71e8ac51a517f9d0e731eb8bf3aec04 (diff) | |
| download | bcm5719-llvm-e5c910f8ae1e7699798aeadbf0a14959009e2ef8.tar.gz bcm5719-llvm-e5c910f8ae1e7699798aeadbf0a14959009e2ef8.zip | |
[NVVM] Rename __nvvm_bar0 builtin back to __syncthreads.
__syncthreads was renamed to __nvvm_bar0 in r274664. But __syncthreads
is part of our user-facing API, so we need to keep the name.
This will momentarily break clang; we need a matching patch there.
Patch by Justin Bogner.
llvm-svn: 274779
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/include/llvm/IR/IntrinsicsNVVM.td | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/llvm/include/llvm/IR/IntrinsicsNVVM.td b/llvm/include/llvm/IR/IntrinsicsNVVM.td index 4f356fe3d9f..30ee3ff96b8 100644 --- a/llvm/include/llvm/IR/IntrinsicsNVVM.td +++ b/llvm/include/llvm/IR/IntrinsicsNVVM.td @@ -729,7 +729,10 @@ def llvm_anyi64ptr_ty : LLVMAnyPointerType<llvm_i64_ty>; // (space)i64* [IntrArgMemOnly, NoCapture<0>]>; // Bar.Sync - def int_nvvm_barrier0 : GCCBuiltin<"__nvvm_bar0">, + + // The builtin for "bar.sync 0" is called __syncthreads. Unlike most of the + // intrinsics in this file, this one is a user-facing API. + def int_nvvm_barrier0 : GCCBuiltin<"__syncthreads">, Intrinsic<[], [], [IntrConvergent]>; def int_nvvm_barrier0_popc : GCCBuiltin<"__nvvm_bar0_popc">, Intrinsic<[llvm_i32_ty], [llvm_i32_ty], [IntrConvergent]>; |

