Skip to content

[SYCL][NFC] Employ the is_same_v helper in SYCL library #2778

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

Closed
wants to merge 4 commits into from
Closed

[SYCL][NFC] Employ the is_same_v helper in SYCL library #2778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3dbab10
[SYCL][NFC] Employ the is_same_v helper in SYCL library
Nov 13, 2020
7e69de4
Use a namespace alias for sycl::detail
Nov 17, 2020
b4fd5f5
Apply clang-format, as weird as it may seem
Nov 17, 2020
b9a044b
Merge branch 'sycl' into private/agindins/templates-refactor
Feb 4, 2021
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
2 changes: 1 addition & 1 deletion sycl/include/CL/sycl/INTEL/esimd/detail/esimd_intrin.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ readRegion(const vector_type_t<BT, BN> &Base, std::pair<T, U> Region) {
return readRegion<BT1, BN1>(Base1, Region.first);
else {
static_assert(T::Is_2D);
static_assert(std::is_same<ElemTy, BT1>::value);
static_assert(csd::is_same_v<ElemTy, BT1>);
// To read a 2D region, we need the parent region
// Read full rows with non-trivial vertical and horizontal stride = 1.
constexpr int M = T::Size_y * PaTy::Size_x;
Expand Down
6 changes: 3 additions & 3 deletions sycl/include/CL/sycl/INTEL/esimd/detail/esimd_types.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ template <typename U> constexpr bool is_type() { return false; }
template <typename U, typename T, typename... Ts> constexpr bool is_type() {
using UU = typename detail::remove_const_t<U>;
using TT = typename detail::remove_const_t<T>;
return std::is_same<UU, TT>::value || is_type<UU, Ts...>();
return csd::is_same_v<UU, TT> || is_type<UU, Ts...>();
}

// calculates the number of elements in "To" type
Expand All @@ -228,12 +228,12 @@ struct bitcast_helper {
template <typename ToEltTy, typename FromEltTy, int FromN,
typename = csd::enable_if_t<is_vectorizable<ToEltTy>::value>>
ESIMD_INLINE typename detail::conditional_t<
std::is_same<FromEltTy, ToEltTy>::value, vector_type_t<FromEltTy, FromN>,
csd::is_same_v<FromEltTy, ToEltTy>, vector_type_t<FromEltTy, FromN>,
vector_type_t<ToEltTy,
bitcast_helper<ToEltTy, FromEltTy, FromN>::nToElems()>>
bitcast(vector_type_t<FromEltTy, FromN> Val) {
// Noop.
if constexpr (std::is_same<FromEltTy, ToEltTy>::value)
if constexpr (csd::is_same_v<FromEltTy, ToEltTy>)
return Val;

// Bitcast
Expand Down
48 changes: 21 additions & 27 deletions sycl/include/CL/sycl/INTEL/esimd/detail/esimd_util.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,10 @@ struct is_esimd_scalar
template <typename T>
struct is_dword_type
: std::integral_constant<
bool,
std::is_same<int, typename sycl::detail::remove_const_t<T>>::value ||
std::is_same<unsigned int,
typename sycl::detail::remove_const_t<T>>::value> {};
bool, csd::is_same_v<int, typename sycl::detail::remove_const_t<T>> ||
csd::is_same_v<unsigned int,
typename sycl::detail::remove_const_t<T>>> {
};

template <typename T, int N>
struct is_dword_type<sycl::INTEL::gpu::vector_type<T, N>> {
Expand All @@ -119,10 +119,9 @@ template <typename T>
struct is_word_type
: std::integral_constant<
bool,
std::is_same<short,
typename sycl::detail::remove_const_t<T>>::value ||
std::is_same<unsigned short,
typename sycl::detail::remove_const_t<T>>::value> {};
csd::is_same_v<short, typename sycl::detail::remove_const_t<T>> ||
csd::is_same_v<unsigned short,
typename sycl::detail::remove_const_t<T>>> {};

template <typename T, int N>
struct is_word_type<sycl::INTEL::gpu::vector_type<T, N>> {
Expand All @@ -137,9 +136,9 @@ template <typename T>
struct is_byte_type
: std::integral_constant<
bool,
std::is_same<char, typename sycl::detail::remove_const_t<T>>::value ||
std::is_same<unsigned char,
typename sycl::detail::remove_const_t<T>>::value> {};
csd::is_same_v<char, typename sycl::detail::remove_const_t<T>> ||
csd::is_same_v<unsigned char,
typename sycl::detail::remove_const_t<T>>> {};

template <typename T, int N>
struct is_byte_type<sycl::INTEL::gpu::vector_type<T, N>> {
Expand All @@ -153,36 +152,31 @@ template <typename T, int N> struct is_byte_type<sycl::INTEL::gpu::simd<T, N>> {
template <typename T>
struct is_fp_type
: std::integral_constant<
bool, std::is_same<float,
typename sycl::detail::remove_const_t<T>>::value> {
};
bool,
csd::is_same_v<float, typename sycl::detail::remove_const_t<T>>> {};

template <typename T>
struct is_df_type
: std::integral_constant<
bool, std::is_same<double,
typename sycl::detail::remove_const_t<T>>::value> {
};
bool,
csd::is_same_v<double, typename sycl::detail::remove_const_t<T>>> {};

template <typename T>
struct is_fp_or_dword_type
: std::integral_constant<
bool,
std::is_same<float,
typename sycl::detail::remove_const_t<T>>::value ||
std::is_same<int,
typename sycl::detail::remove_const_t<T>>::value ||
std::is_same<unsigned int,
typename sycl::detail::remove_const_t<T>>::value> {};
csd::is_same_v<float, typename sycl::detail::remove_const_t<T>> ||
csd::is_same_v<int, typename sycl::detail::remove_const_t<T>> ||
csd::is_same_v<unsigned int,
typename sycl::detail::remove_const_t<T>>> {};

template <typename T>
struct is_qword_type
: std::integral_constant<
bool,
std::is_same<long long,
typename sycl::detail::remove_const_t<T>>::value ||
std::is_same<unsigned long long,
typename sycl::detail::remove_const_t<T>>::value> {};
csd::is_same_v<long long, typename sycl::detail::remove_const_t<T>> ||
csd::is_same_v<unsigned long long,
typename sycl::detail::remove_const_t<T>>> {};

template <typename T, int N>
struct is_qword_type<sycl::INTEL::gpu::vector_type<T, N>> {
Expand Down
2 changes: 1 addition & 1 deletion sycl/include/CL/sycl/INTEL/esimd/esimd.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ template <typename Ty, int N> class simd {
Base1 = __esimd_wrregion<ElemTy, BN1, M,
/*VS*/ 0, M, Stride>(Base1, Val, Offset);
} else {
static_assert(std::is_same<ElemTy, BT>::value);
static_assert(csd::is_same_v<ElemTy, BT>);
// Read columns with non-trivial horizontal stride.
constexpr int M = TR::length;
constexpr int VS = PaTy::Size_x * TR::Stride_y;
Expand Down
15 changes: 7 additions & 8 deletions sycl/include/CL/sycl/INTEL/esimd/esimd_math.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,17 +73,17 @@ __esimd_abs_common_internal(T1 src0, int flag = GENX_NOSAT) {

template <typename T0, typename T1, int SZ>
ESIMD_NODEBUG ESIMD_INLINE typename sycl::detail::enable_if_t<
!std::is_same<typename sycl::detail::remove_const_t<T0>,
typename sycl::detail::remove_const_t<T1>>::value,
!csd::is_same_v<typename sycl::detail::remove_const_t<T0>,
typename sycl::detail::remove_const_t<T1>>,
simd<T0, SZ>>
esimd_abs(simd<T1, SZ> src0, int flag = GENX_NOSAT) {
return detail::__esimd_abs_common_internal<T0, T1, SZ>(src0, flag);
}

template <typename T0, typename T1>
ESIMD_NODEBUG ESIMD_INLINE typename sycl::detail::enable_if_t<
!std::is_same<typename sycl::detail::remove_const_t<T0>,
typename sycl::detail::remove_const_t<T1>>::value &&
!csd::is_same_v<typename sycl::detail::remove_const_t<T0>,
typename sycl::detail::remove_const_t<T1>> &&
detail::is_esimd_scalar<T0>::value &&
detail::is_esimd_scalar<T1>::value,
typename sycl::detail::remove_const_t<T0>>
Expand Down Expand Up @@ -1964,12 +1964,11 @@ ESIMD_INLINE ESIMD_NODEBUG T0 hmin(simd<T1, SZ> v) {

template <typename T0, typename T1, int SZ, typename BinaryOperation>
ESIMD_INLINE ESIMD_NODEBUG T0 reduce(simd<T1, SZ> v, BinaryOperation op) {
if constexpr (std::is_same<remove_cvref_t<BinaryOperation>,
std::plus<>>::value) {
if constexpr (csd::is_same_v<remove_cvref_t<BinaryOperation>, std::plus<>>) {
T0 retv = detail::esimd_sum<T0>(v);
return retv;
} else if constexpr (std::is_same<remove_cvref_t<BinaryOperation>,
std::multiplies<>>::value) {
} else if constexpr (csd::is_same_v<remove_cvref_t<BinaryOperation>,
std::multiplies<>>) {
T0 retv = detail::esimd_prod<T0>(v);
return retv;
}
Expand Down
2 changes: 1 addition & 1 deletion sycl/include/CL/sycl/ONEAPI/accessor_property_list.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ class accessor_property_list : protected sycl::detail::PropertyListBase {
auto... Args>
struct ContainsPropertyInstance
: detail::conditional_t<
!std::is_same_v<typename ContainerT::Head, void> &&
!detail::is_same_v<typename ContainerT::Head, void> &&
AreSameTemplate<PropT<Args...>,
typename ContainerT::Head>::value,
std::true_type,
Expand Down
12 changes: 6 additions & 6 deletions sycl/include/CL/sycl/ONEAPI/atomic_ref.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,14 +126,14 @@ class atomic_ref_base {
static_assert(
detail::IsValidAtomicType<T>::value,
"Invalid atomic type. Valid types are arithmetic and pointer types");
static_assert(!std::is_same<T, bool>::value,
static_assert(!detail::is_same_v<T, bool>,
"ONEAPI::atomic_ref does not support bool type");
static_assert(!(std::is_same<T, char>::value ||
std::is_same<T, signed char>::value ||
std::is_same<T, unsigned char>::value),
static_assert(!(detail::is_same_v<T, char> ||
detail::is_same_v<T, signed char> ||
detail::is_same_v<T, unsigned char>),
"ONEAPI::atomic_ref does not support char type");
static_assert(!(std::is_same<T, short>::value ||
std::is_same<T, unsigned short>::value),
static_assert(!(detail::is_same_v<T, short> ||
detail::is_same_v<T, unsigned short>),
"ONEAPI::atomic_ref does not support short type");
static_assert(detail::IsValidAtomicAddressSpace<AddressSpace>::value,
"Invalid atomic address_space. Valid address spaces are: "
Expand Down
Loading