This is an archive of the discontinued LLVM Phabricator instance.

[CUDA] Fix std::min on device side to return the min, not the max.
ClosedPublic

Authored by jlebar on Nov 8 2017, 1:55 PM.

Reviewers

Commits

Summary

How embarrassing.

This is tested in the test-suite -- fix to come there in a separate
patch.

Ouch. LGTM.

This revision is now accepted and ready to land.Nov 8 2017, 2:08 PM

This revision was automatically updated to reflect the committed changes.

Path

Size

cfe/

trunk/

lib/

Headers/

cuda_wrappers/

2 lines

	Show First 20 Lines • Show All 74 Lines • ▼ Show 20 Lines
	inline __device__ const __T &			inline __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>
	inline __device__ const __T &			inline __device__ const __T &
	min(const __T &__a, const __T &__b) {			min(const __T &__a, const __T &__b) {
	return __a < __b ? __b : __a;			return __a < __b ? __a : __b;
	}			}

	#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 // __cplusplus <= 201103L			#endif // __cplusplus <= 201103L
	#endif // __CLANG_CUDA_WRAPPERS_ALGORITHM			#endif // __CLANG_CUDA_WRAPPERS_ALGORITHM