From b204dc0e07bcef8f36f7fde33f60a9ad9c934e33 Mon Sep 17 00:00:00 2001 From: Artem Belevich Date: Mon, 25 Sep 2017 17:55:26 +0000 Subject: [PATCH] [CUDA] Fix names of __nvvm_vote* intrinsics. Also fixed a syntax error in activemask(). Differential Revision: https://reviews.llvm.org/D38188 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@314129 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Headers/__clang_cuda_intrinsics.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/Headers/__clang_cuda_intrinsics.h b/lib/Headers/__clang_cuda_intrinsics.h index 15a5cc4352..0e2141a2a1 100644 --- a/lib/Headers/__clang_cuda_intrinsics.h +++ b/lib/Headers/__clang_cuda_intrinsics.h @@ -170,22 +170,22 @@ inline __device__ void __barrier_sync_count(unsigned int id, } inline __device__ int __all_sync(unsigned int mask, int pred) { - return __nvvm_vote_sync_all(mask, pred); + return __nvvm_vote_all_sync(mask, pred); } inline __device__ int __any_sync(unsigned int mask, int pred) { - return __nvvm_vote_sync_any(mask, pred); + return __nvvm_vote_any_sync(mask, pred); } inline __device__ int __uni_sync(unsigned int mask, int pred) { - return __nvvm_vote_sync_uni(mask, pred); + return __nvvm_vote_uni_sync(mask, pred); } inline __device__ unsigned int __ballot_sync(unsigned int mask, int pred) { - return __nvvm_vote_sync_ballot(mask, pred); + return __nvvm_vote_ballot_sync(mask, pred); } -inline __device__ activemask() { return __nvvm_vote.ballot(1); } +inline __device__ unsigned int activemask() { return __nvvm_vote_ballot(1); } #endif // __CUDA_VERSION >= 9000 && (!defined(__CUDA_ARCH__) || // __CUDA_ARCH__ >= 300) -- 2.40.0