Skip to content

[NFC][SYCL] Switch to std:: equivalents for utilities in stl_type_traits.hpp #9162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 24, 2023
Merged

[NFC][SYCL] Switch to std:: equivalents for utilities in stl_type_traits.hpp #9162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8d1f841
[NFC][SYCL] Switch to std:: equivalents for utilities in stl_type_tra…
aelovikov-intel Dec 7, 2022
e134bfd
More fixes
aelovikov-intel Apr 21, 2023
075f40c
Merge remote-tracking branch 'origin/sycl' into use-std
aelovikov-intel Apr 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions sycl/include/CL/__spirv/spirv_ops.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,23 +358,23 @@ __spirv_ImageSampleExplicitLod(SampledType, TempArgT, int, float);
// of atomic min/max based on the type
#define __SPIRV_ATOMIC_MINMAX(AS, Op) \
template <typename T> \
typename sycl::detail::enable_if_t< \
typename std::enable_if_t< \
std::is_integral<T>::value && std::is_signed<T>::value, T> \
__spirv_Atomic##Op(AS T *Ptr, __spv::Scope::Flag Memory, \
__spv::MemorySemanticsMask::Flag Semantics, \
T Value) { \
return __spirv_AtomicS##Op(Ptr, Memory, Semantics, Value); \
} \
template <typename T> \
typename sycl::detail::enable_if_t< \
typename std::enable_if_t< \
std::is_integral<T>::value && !std::is_signed<T>::value, T> \
__spirv_Atomic##Op(AS T *Ptr, __spv::Scope::Flag Memory, \
__spv::MemorySemanticsMask::Flag Semantics, \
T Value) { \
return __spirv_AtomicU##Op(Ptr, Memory, Semantics, Value); \
} \
template <typename T> \
typename sycl::detail::enable_if_t<std::is_floating_point<T>::value, T> \
typename std::enable_if_t<std::is_floating_point<T>::value, T> \
__spirv_Atomic##Op(AS T *Ptr, __spv::Scope::Flag Memory, \
__spv::MemorySemanticsMask::Flag Semantics, \
T Value) { \
Expand Down
250 changes: 123 additions & 127 deletions sycl/include/sycl/accessor.hpp
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions sycl/include/sycl/atomic.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ class __SYCL2020_DEPRECATED(
#ifdef __ENABLE_USM_ADDR_SPACE__
// Create atomic in global_space with one from ext_intel_global_device_space
template <access::address_space _Space = addressSpace,
typename = typename detail::enable_if_t<
typename = typename std::enable_if_t<
_Space == addressSpace &&
addressSpace == access::address_space::global_space>>
atomic(const atomic<T, access::address_space::ext_intel_global_device_space>
Expand All @@ -219,7 +219,7 @@ class __SYCL2020_DEPRECATED(
}

template <access::address_space _Space = addressSpace,
typename = typename detail::enable_if_t<
typename = typename std::enable_if_t<
_Space == addressSpace &&
addressSpace == access::address_space::global_space>>
atomic(
Expand All @@ -235,13 +235,13 @@ class __SYCL2020_DEPRECATED(

#ifdef __SYCL_DEVICE_ONLY__
template <typename T2 = T>
detail::enable_if_t<!std::is_same<cl_float, T2>::value, T>
std::enable_if_t<!std::is_same<cl_float, T2>::value, T>
load(memory_order Order = memory_order::relaxed) const {
return __spirv_AtomicLoad(Ptr, SpirvScope,
detail::getSPIRVMemorySemanticsMask(Order));
}
template <typename T2 = T>
detail::enable_if_t<std::is_same<cl_float, T2>::value, T>
std::enable_if_t<std::is_same<cl_float, T2>::value, T>
load(memory_order Order = memory_order::relaxed) const {
auto *TmpPtr = reinterpret_cast<typename multi_ptr<
cl_int, addressSpace, access::decorated::yes>::pointer>(Ptr);
Expand Down
17 changes: 8 additions & 9 deletions sycl/include/sycl/atomic_ref.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ template <sycl::access::address_space AS> struct IsValidAtomicRefAddressSpace {

// DefaultOrder parameter is limited to read-modify-write orders
template <memory_order Order>
using IsValidDefaultOrder = bool_constant<Order == memory_order::relaxed ||
Order == memory_order::acq_rel ||
Order == memory_order::seq_cst>;
using IsValidDefaultOrder = std::bool_constant<Order == memory_order::relaxed ||
Order == memory_order::acq_rel ||
Order == memory_order::seq_cst>;

template <memory_order ReadModifyWriteOrder> struct memory_order_traits;

Expand Down Expand Up @@ -90,7 +90,7 @@ inline constexpr memory_order getLoadOrder(memory_order order) {
template <typename T, typename = void> struct bit_equal;

template <typename T>
struct bit_equal<T, typename detail::enable_if_t<std::is_integral<T>::value>> {
struct bit_equal<T, typename std::enable_if_t<std::is_integral<T>::value>> {
bool operator()(const T &lhs, const T &rhs) { return lhs == rhs; }
};

Expand Down Expand Up @@ -275,7 +275,7 @@ template <typename T, bool IsAspectAtomic64AttrUsed, memory_order DefaultOrder,
memory_scope DefaultScope, access::address_space AddressSpace>
class atomic_ref_impl<T, IsAspectAtomic64AttrUsed, DefaultOrder, DefaultScope,
AddressSpace,
typename detail::enable_if_t<std::is_integral<T>::value>>
typename std::enable_if_t<std::is_integral<T>::value>>
: public atomic_ref_base<T, DefaultOrder, DefaultScope, AddressSpace> {

public:
Expand Down Expand Up @@ -423,7 +423,7 @@ template <typename T, bool IsAspectAtomic64AttrUsed, memory_order DefaultOrder,
memory_scope DefaultScope, access::address_space AddressSpace>
class atomic_ref_impl<
T, IsAspectAtomic64AttrUsed, DefaultOrder, DefaultScope, AddressSpace,
typename detail::enable_if_t<std::is_floating_point<T>::value>>
typename std::enable_if_t<std::is_floating_point<T>::value>>
: public atomic_ref_base<T, DefaultOrder, DefaultScope, AddressSpace> {

public:
Expand Down Expand Up @@ -536,7 +536,7 @@ class atomic_ref_impl<
class [[__sycl_detail__::__uses_aspects__(aspect::atomic64)]] atomic_ref_impl<
#endif
T, /*IsAspectAtomic64AttrUsed = */ true, DefaultOrder, DefaultScope,
AddressSpace, typename detail::enable_if_t<std::is_integral<T>::value>>
AddressSpace, typename std::enable_if_t<std::is_integral<T>::value>>
: public atomic_ref_impl<T, /*IsAspectAtomic64AttrUsed = */ false,
DefaultOrder, DefaultScope, AddressSpace> {
public:
Expand All @@ -556,8 +556,7 @@ class atomic_ref_impl<
class [[__sycl_detail__::__uses_aspects__(aspect::atomic64)]] atomic_ref_impl<
#endif
T, /*IsAspectAtomic64AttrUsed = */ true, DefaultOrder, DefaultScope,
AddressSpace,
typename detail::enable_if_t<std::is_floating_point<T>::value>>
AddressSpace, typename std::enable_if_t<std::is_floating_point<T>::value>>
: public atomic_ref_impl<T, /*IsAspectAtomic64AttrUsed = */ false,
DefaultOrder, DefaultScope, AddressSpace> {
public:
Expand Down
14 changes: 7 additions & 7 deletions sycl/include/sycl/backend/opencl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,32 +33,32 @@ __SYCL_EXPORT bool has_extension(const sycl::device &SyclDevice,
const std::string &Extension);

// Construction of SYCL platform.
template <typename T, typename detail::enable_if_t<
template <typename T, typename std::enable_if_t<
std::is_same<T, platform>::value> * = nullptr>
__SYCL_DEPRECATED("Use SYCL 2020 sycl::make_platform free function")
T make(typename detail::interop<backend::opencl, T>::type Interop) {
return make_platform(detail::pi::cast<pi_native_handle>(Interop));
}

// Construction of SYCL device.
template <typename T, typename detail::enable_if_t<
std::is_same<T, device>::value> * = nullptr>
template <typename T,
typename std::enable_if_t<std::is_same<T, device>::value> * = nullptr>
__SYCL_DEPRECATED("Use SYCL 2020 sycl::make_device free function")
T make(typename detail::interop<backend::opencl, T>::type Interop) {
return make_device(detail::pi::cast<pi_native_handle>(Interop));
}

// Construction of SYCL context.
template <typename T, typename detail::enable_if_t<
std::is_same<T, context>::value> * = nullptr>
template <typename T, typename std::enable_if_t<std::is_same<T, context>::value>
* = nullptr>
__SYCL_DEPRECATED("Use SYCL 2020 sycl::make_context free function")
T make(typename detail::interop<backend::opencl, T>::type Interop) {
return make_context(detail::pi::cast<pi_native_handle>(Interop));
}

// Construction of SYCL queue.
template <typename T, typename detail::enable_if_t<
std::is_same<T, queue>::value> * = nullptr>
template <typename T,
typename std::enable_if_t<std::is_same<T, queue>::value> * = nullptr>
__SYCL_DEPRECATED("Use SYCL 2020 sycl::make_queue free function")
T make(const context &Context,
typename detail::interop<backend::opencl, T>::type Interop) {
Expand Down
30 changes: 15 additions & 15 deletions sycl/include/sycl/buffer.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,8 @@ class __SYCL_EXPORT buffer_plain {
/// \ingroup sycl_api
template <typename T, int dimensions = 1,
typename AllocatorT = buffer_allocator<std::remove_const_t<T>>,
typename __Enabled = typename detail::enable_if_t<(dimensions > 0) &&
(dimensions <= 3)>>
typename __Enabled =
typename std::enable_if_t<(dimensions > 0) && (dimensions <= 3)>>
class buffer : public detail::buffer_plain,
public detail::OwnerLessBase<buffer<T, dimensions, AllocatorT>> {
// TODO check is_device_copyable<T>::value after converting sycl::vec into a
Expand All @@ -155,21 +155,21 @@ class buffer : public detail::buffer_plain,
using const_reference = const value_type &;
using allocator_type = AllocatorT;
template <int dims>
using EnableIfOneDimension = typename detail::enable_if_t<1 == dims>;
using EnableIfOneDimension = typename std::enable_if_t<1 == dims>;
// using same requirement for contiguous container as std::span
template <class Container>
using EnableIfContiguous =
detail::void_t<detail::enable_if_t<std::is_convertible<
detail::remove_pointer_t<
decltype(std::declval<Container>().data())> (*)[],
const T (*)[]>::value>,
decltype(std::declval<Container>().size())>;
std::void_t<std::enable_if_t<std::is_convertible<
detail::remove_pointer_t<
decltype(std::declval<Container>().data())> (*)[],
const T (*)[]>::value>,
decltype(std::declval<Container>().size())>;
template <class It>
using EnableIfItInputIterator = detail::enable_if_t<
using EnableIfItInputIterator = std::enable_if_t<
std::is_convertible<typename std::iterator_traits<It>::iterator_category,
std::input_iterator_tag>::value>;
template <typename ItA, typename ItB>
using EnableIfSameNonConstIterators = typename detail::enable_if_t<
using EnableIfSameNonConstIterators = typename std::enable_if_t<
std::is_same<ItA, ItB>::value && !std::is_const<ItA>::value, ItA>;

std::array<size_t, 3> rangeToArray(range<3> &r) { return {r[0], r[1], r[2]}; }
Expand Down Expand Up @@ -344,9 +344,9 @@ class buffer : public detail::buffer_plain,
using IteratorValueType =
detail::iterator_value_type_t<InputIterator>;
using IteratorNonConstValueType =
detail::remove_const_t<IteratorValueType>;
std::remove_const_t<IteratorValueType>;
using IteratorPointerToNonConstValueType =
detail::add_pointer_t<IteratorNonConstValueType>;
std::add_pointer_t<IteratorNonConstValueType>;
std::copy(first, last,
static_cast<IteratorPointerToNonConstValueType>(ToPtr));
},
Expand Down Expand Up @@ -377,9 +377,9 @@ class buffer : public detail::buffer_plain,
using IteratorValueType =
detail::iterator_value_type_t<InputIterator>;
using IteratorNonConstValueType =
detail::remove_const_t<IteratorValueType>;
std::remove_const_t<IteratorValueType>;
using IteratorPointerToNonConstValueType =
detail::add_pointer_t<IteratorNonConstValueType>;
std::add_pointer_t<IteratorNonConstValueType>;
std::copy(first, last,
static_cast<IteratorPointerToNonConstValueType>(ToPtr));
},
Expand Down Expand Up @@ -588,7 +588,7 @@ class buffer : public detail::buffer_plain,
}

template <template <typename WeakT> class WeakPtrT, typename WeakT>
detail::enable_if_t<
std::enable_if_t<
std::is_convertible<WeakPtrT<WeakT>, std::weak_ptr<WeakT>>::value>
set_final_data_internal(WeakPtrT<WeakT> FinalData) {
std::weak_ptr<WeakT> TempFinalData(FinalData);
Expand Down
Loading