OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 6
Code Issues Packages Projects Releases Wiki Activity

[CUDA] Unbreak CUDA compilation with -std=c++20 

Standard libc++ headers in stdc++ mode include <new> which picks up
cuda_wrappers/new before any of the CUDA macros have been defined.

We can not include CUDA headers that early, so the work-around is to define
__device__ in the wrapper header itself.

Differential Revision: https://reviews.llvm.org/D91807
This commit is contained in:
Artem Belevich 2020-11-19 10:06:57 -08:00
parent 332710e704
commit 9a465057a6
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
clang/lib/Headers/cuda_wrappers/new
View File

@ -33,66 +33,76 @@
#define CUDA_NOEXCEPT #define CUDA_NOEXCEPT
#endif #endif
#pragma push_macro("__DEVICE__")
#if defined __device__
#define __DEVICE__ __device__
#else
// <new> has been included too early from the standard libc++ headers and the
// standard CUDA macros are not available yet. We have to define our own.
#define __DEVICE__ __attribute__((device))
#endif
// Device overrides for non-placement new and delete. // Device overrides for non-placement new and delete.
__device__ inline void *operator new(__SIZE_TYPE__ size) { __DEVICE__ inline void *operator new(__SIZE_TYPE__ size) {
if (size == 0) { if (size == 0) {
size = 1; size = 1;
} }
return ::malloc(size); return ::malloc(size);
} }
__device__ inline void *operator new(__SIZE_TYPE__ size, __DEVICE__ inline void *operator new(__SIZE_TYPE__ size,
const std::nothrow_t &) CUDA_NOEXCEPT { const std::nothrow_t &) CUDA_NOEXCEPT {
return ::operator new(size); return ::operator new(size);
} }
__device__ inline void *operator new[](__SIZE_TYPE__ size) { __DEVICE__ inline void *operator new[](__SIZE_TYPE__ size) {
return ::operator new(size); return ::operator new(size);
} }
__device__ inline void *operator new[](__SIZE_TYPE__ size, __DEVICE__ inline void *operator new[](__SIZE_TYPE__ size,
const std::nothrow_t &) { const std::nothrow_t &) {
return ::operator new(size); return ::operator new(size);
} }
__device__ inline void operator delete(void* ptr) CUDA_NOEXCEPT { __DEVICE__ inline void operator delete(void* ptr) CUDA_NOEXCEPT {
if (ptr) { if (ptr) {
::free(ptr); ::free(ptr);
} }
} }
__device__ inline void operator delete(void *ptr, __DEVICE__ inline void operator delete(void *ptr,
const std::nothrow_t &) CUDA_NOEXCEPT { const std::nothrow_t &) CUDA_NOEXCEPT {
::operator delete(ptr); ::operator delete(ptr);
} }
__device__ inline void operator delete[](void* ptr) CUDA_NOEXCEPT { __DEVICE__ inline void operator delete[](void* ptr) CUDA_NOEXCEPT {
::operator delete(ptr); ::operator delete(ptr);
} }
__device__ inline void operator delete[](void *ptr, __DEVICE__ inline void operator delete[](void *ptr,
const std::nothrow_t &) CUDA_NOEXCEPT { const std::nothrow_t &) CUDA_NOEXCEPT {
::operator delete(ptr); ::operator delete(ptr);
} }
// Sized delete, C++14 only. // Sized delete, C++14 only.
#if __cplusplus >= 201402L #if __cplusplus >= 201402L
__device__ inline void operator delete(void *ptr, __DEVICE__ inline void operator delete(void *ptr,
__SIZE_TYPE__ size) CUDA_NOEXCEPT { __SIZE_TYPE__ size) CUDA_NOEXCEPT {
::operator delete(ptr); ::operator delete(ptr);
} }
__device__ inline void operator delete[](void *ptr, __DEVICE__ inline void operator delete[](void *ptr,
__SIZE_TYPE__ size) CUDA_NOEXCEPT { __SIZE_TYPE__ size) CUDA_NOEXCEPT {
::operator delete(ptr); ::operator delete(ptr);
} }
#endif #endif
// Device overrides for placement new and delete. // Device overrides for placement new and delete.
__device__ inline void *operator new(__SIZE_TYPE__, void *__ptr) CUDA_NOEXCEPT { __DEVICE__ inline void *operator new(__SIZE_TYPE__, void *__ptr) CUDA_NOEXCEPT {
return __ptr; return __ptr;
} }
__device__ inline void *operator new[](__SIZE_TYPE__, void *__ptr) CUDA_NOEXCEPT { __DEVICE__ inline void *operator new[](__SIZE_TYPE__, void *__ptr) CUDA_NOEXCEPT {
return __ptr; return __ptr;
} }
__device__ inline void operator delete(void *, void *) CUDA_NOEXCEPT {} __DEVICE__ inline void operator delete(void *, void *) CUDA_NOEXCEPT {}
__device__ inline void operator delete[](void *, void *) CUDA_NOEXCEPT {} __DEVICE__ inline void operator delete[](void *, void *) CUDA_NOEXCEPT {}
#pragma pop_macro("__DEVICE__")
#pragma pop_macro("CUDA_NOEXCEPT") #pragma pop_macro("CUDA_NOEXCEPT")
#endif // include guard #endif // include guard