This is an archive of the discontinued LLVM Phabricator instance.

Differential D48151

[CUDA] Make __host__/__device__ min/max overloads constexpr in C++14.
ClosedPublic

Authored by jlebar on Jun 13 2018, 2:29 PM.

Details

Reviewers
rsmith
tra
Commits
rG2a192abaec7a: [CUDA] Make __host__/__device__ min/max overloads constexpr in C++14.
rC336026: [CUDA] Make __host__/__device__ min/max overloads constexpr in C++14.
rL336026: [CUDA] Make __host__/__device__ min/max overloads constexpr in C++14.
Summary

Tests in a separate change to the test-suite.

Diff Detail

Repository
rL LLVM

Event Timeline

jlebar created this revision.Jun 13 2018, 2:29 PM
Harbormaster completed remote builds in B19308: Diff 151248.Jun 13 2018, 2:29 PM
Herald added a subscriber: sanjoy. · View Herald TranscriptJun 13 2018, 2:29 PM
jlebar added a parent revision: D48036: [CUDA] Make min/max shims host+device..Jun 13 2018, 2:31 PM
jlebar added a child revision: D48152: [CUDA] Add tests that, in C++14 mode, min/max are constexpr..
tra accepted this revision.Jun 13 2018, 3:17 PM
This revision is now accepted and ready to land.Jun 13 2018, 3:17 PM
jlebar added 1 blocking reviewer(s): rsmith.Jun 15 2018, 8:32 AM
This revision now requires review to proceed.Jun 15 2018, 8:32 AM
jlebar added a comment.Jun 15 2018, 8:33 AM

@rsmith friendly ping on this review.

rsmith accepted this revision.Jun 15 2018, 12:22 PM

LGTM

This revision is now accepted and ready to land.Jun 15 2018, 12:22 PM
jlebar added a comment.Jun 15 2018, 1:45 PM
In D48151#1133954, @rsmith wrote:

LGTM

Thank you for the review, Richard.

Will check this in once the whole stack is ready -- just need D48036.

jlebar mentioned this in D48036: [CUDA] Make min/max shims host+device..Jun 29 2018, 3:22 PM
Closed by commit rL336026: [CUDA] Make __host__/__device__ min/max overloads constexpr in C++14. (authored by jlebar). · Explain WhyJun 29 2018, 3:32 PM
This revision was automatically updated to reflect the committed changes.
Herald added a subscriber: llvm-commits. · View Herald TranscriptJun 29 2018, 3:32 PM

Revision Contents

PathSize
cfe/
trunk/
lib/
Headers/
cuda_wrappers/
17 lines

Diff 153594

cfe/trunk/lib/Headers/cuda_wrappers/algorithm

Show First 20 Lines • Show All 61 Lines • ▼ Show 20 Lines
_LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_BEGIN_NAMESPACE_STD
#else #else
namespace std { namespace std {
#ifdef _GLIBCXX_BEGIN_NAMESPACE_VERSION #ifdef _GLIBCXX_BEGIN_NAMESPACE_VERSION
_GLIBCXX_BEGIN_NAMESPACE_VERSION _GLIBCXX_BEGIN_NAMESPACE_VERSION
#endif #endif
#endif #endif
#pragma push_macro("_CPP14_CONSTEXPR")
#if __cplusplus >= 201402L
#define _CPP14_CONSTEXPR constexpr
#else
#define _CPP14_CONSTEXPR
#endif
template <class __T, class __Cmp> template <class __T, class __Cmp>
__attribute__((enable_if(true, ""))) __attribute__((enable_if(true, "")))
inline __host__ __device__ const __T & inline _CPP14_CONSTEXPR __host__ __device__ const __T &
max(const __T &__a, const __T &__b, __Cmp __cmp) { max(const __T &__a, const __T &__b, __Cmp __cmp) {
return __cmp(__a, __b) ? __b : __a; return __cmp(__a, __b) ? __b : __a;
} }
template <class __T> template <class __T>
__attribute__((enable_if(true, ""))) __attribute__((enable_if(true, "")))
inline __host__ __device__ const __T & inline _CPP14_CONSTEXPR __host__ __device__ const __T &
max(const __T &__a, const __T &__b) { max(const __T &__a, const __T &__b) {
return __a < __b ? __b : __a; return __a < __b ? __b : __a;
} }
template <class __T, class __Cmp> template <class __T, class __Cmp>
__attribute__((enable_if(true, ""))) __attribute__((enable_if(true, "")))
inline __host__ __device__ const __T & inline _CPP14_CONSTEXPR __host__ __device__ const __T &
min(const __T &__a, const __T &__b, __Cmp __cmp) { min(const __T &__a, const __T &__b, __Cmp __cmp) {
return __cmp(__b, __a) ? __b : __a; return __cmp(__b, __a) ? __b : __a;
} }
template <class __T> template <class __T>
__attribute__((enable_if(true, ""))) __attribute__((enable_if(true, "")))
inline __host__ __device__ const __T & inline _CPP14_CONSTEXPR __host__ __device__ const __T &
min(const __T &__a, const __T &__b) { min(const __T &__a, const __T &__b) {
return __a < __b ? __a : __b; return __a < __b ? __a : __b;
} }
#pragma pop_macro("_CPP14_CONSTEXPR")
#ifdef _LIBCPP_END_NAMESPACE_STD #ifdef _LIBCPP_END_NAMESPACE_STD
_LIBCPP_END_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD
#else #else
#ifdef _GLIBCXX_BEGIN_NAMESPACE_VERSION #ifdef _GLIBCXX_BEGIN_NAMESPACE_VERSION
_GLIBCXX_END_NAMESPACE_VERSION _GLIBCXX_END_NAMESPACE_VERSION
#endif #endif
} // namespace std } // namespace std
#endif #endif
#endif // __CLANG_CUDA_WRAPPERS_ALGORITHM #endif // __CLANG_CUDA_WRAPPERS_ALGORITHM