[PATCH] D38188: [CUDA] Fix names of __nvvm_vote* intrinsics.
This revision was automatically updated to reflect the committed changes. Closed by commit rL314129: [CUDA] Fix names of __nvvm_vote* intrinsics. (authored by tra). Changed prior to commit: https://reviews.llvm.org/D38188?vs=116400=116576#toc Repository: rL LLVM https://reviews.llvm.org/D38188 Files: cfe/trunk/lib/Headers/__clang_cuda_intrinsics.h Index: cfe/trunk/lib/Headers/__clang_cuda_intrinsics.h === --- cfe/trunk/lib/Headers/__clang_cuda_intrinsics.h +++ cfe/trunk/lib/Headers/__clang_cuda_intrinsics.h @@ -170,22 +170,22 @@ } 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) Index: cfe/trunk/lib/Headers/__clang_cuda_intrinsics.h === --- cfe/trunk/lib/Headers/__clang_cuda_intrinsics.h +++ cfe/trunk/lib/Headers/__clang_cuda_intrinsics.h @@ -170,22 +170,22 @@ } 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) ___ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D38188: [CUDA] Fix names of __nvvm_vote* intrinsics.
tra added a comment. In https://reviews.llvm.org/D38188#880318, @jlebar wrote: > Should we add tests to the test-suite? Or, are these already caught by the > existing tests we have? That's the plan. Once clang can compile CUDA headers, I'll add CUDA-9 specific tests to the testsuite and update the buildbot to compile/run tests with CUDA-9. https://reviews.llvm.org/D38188 ___ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D38188: [CUDA] Fix names of __nvvm_vote* intrinsics.
jlebar accepted this revision. jlebar added a comment. This revision is now accepted and ready to land. Should we add tests to the test-suite? Or, are these already caught by the existing tests we have? https://reviews.llvm.org/D38188 ___ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D38188: [CUDA] Fix names of __nvvm_vote* intrinsics.
tra created this revision. Herald added a subscriber: sanjoy. Also fixed a syntax error in activemask(). https://reviews.llvm.org/D38188 Files: clang/lib/Headers/__clang_cuda_intrinsics.h Index: clang/lib/Headers/__clang_cuda_intrinsics.h === --- clang/lib/Headers/__clang_cuda_intrinsics.h +++ clang/lib/Headers/__clang_cuda_intrinsics.h @@ -170,22 +170,22 @@ } 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) Index: clang/lib/Headers/__clang_cuda_intrinsics.h === --- clang/lib/Headers/__clang_cuda_intrinsics.h +++ clang/lib/Headers/__clang_cuda_intrinsics.h @@ -170,22 +170,22 @@ } 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) ___ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits