diff --git a/sycl/include/sycl/detail/generic_type_lists.hpp b/sycl/include/sycl/detail/generic_type_lists.hpp index c6a62504efbec..bb18e2fb29876 100644 --- a/sycl/include/sycl/detail/generic_type_lists.hpp +++ b/sycl/include/sycl/detail/generic_type_lists.hpp @@ -473,42 +473,7 @@ using scalar_bool_list = type_list; using bool_list = tl_append; -using vector_bool_list = type_list, vec, vec, - vec, vec, vec>; - -// basic types -using scalar_signed_basic_list = - tl_append; - -using vector_signed_basic_list = - tl_append; - -using marray_signed_basic_list = - tl_append; - -using signed_basic_list = - tl_append; - -using scalar_unsigned_basic_list = tl_append; - -using unsigned_basic_list = - tl_append; - -using vector_basic_list = - tl_append; - } // namespace gtl -namespace gvl { -// address spaces -using nonconst_address_space_list = address_space_list< - access::address_space::local_space, access::address_space::global_space, - access::address_space::private_space, access::address_space::generic_space, - access::address_space::ext_intel_global_device_space, - access::address_space::ext_intel_global_host_space>; - -} // namespace gvl } // namespace detail } // namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/detail/generic_type_traits.hpp b/sycl/include/sycl/detail/generic_type_traits.hpp index aafef77a12067..c01963b25c687 100644 --- a/sycl/include/sycl/detail/generic_type_traits.hpp +++ b/sycl/include/sycl/detail/generic_type_traits.hpp @@ -31,10 +31,6 @@ template inline constexpr bool is_svgenfloatf_v = is_contained_v; -template -inline constexpr bool is_svgenfloatd_v = - is_contained_v; - template inline constexpr bool is_half_v = is_contained_v; @@ -61,19 +57,12 @@ template inline constexpr bool is_vgenfloat_v = is_contained_v; -template -inline constexpr bool is_svgenfloat_v = - is_contained_v; - template inline constexpr bool is_genint_v = is_contained_v; template inline constexpr bool is_geninteger_v = is_contained_v; -template -using is_geninteger = std::bool_constant>; - template inline constexpr bool is_sgeninteger_v = is_contained_v; diff --git a/sycl/include/sycl/ext/oneapi/experimental/cuda/builtins.hpp b/sycl/include/sycl/ext/oneapi/experimental/cuda/builtins.hpp index 06d5318c525db..23b0eeeb814e2 100644 --- a/sycl/include/sycl/ext/oneapi/experimental/cuda/builtins.hpp +++ b/sycl/include/sycl/ext/oneapi/experimental/cuda/builtins.hpp @@ -47,8 +47,9 @@ using ldg_vector_types = sycl::detail::type_list< using ldg_types = sycl::detail::tl_append; + sycl::detail::gtl::scalar_floating_list, + sycl::detail::gtl::scalar_signed_integer_list, + sycl::detail::gtl::scalar_unsigned_integer_list>; } // namespace detail template diff --git a/sycl/include/sycl/vector.hpp b/sycl/include/sycl/vector.hpp index c8d2273094c60..f18924054e252 100644 --- a/sycl/include/sycl/vector.hpp +++ b/sycl/include/sycl/vector.hpp @@ -30,10 +30,8 @@ #include // for half, cl_char, cl_int #include // for ArrayCreator, RepeatV... #include // for __SYCL2020_DEPRECATED -#include // for vector_basic_list #include // for is_sigeninteger, is_s... #include // for memcpy -#include // for is_contained #include // for is_floating_point #include #include // for StorageT, half, Vec16... @@ -1242,11 +1240,9 @@ class SwizzleOp { static_assert((sizeof(Tmp) == sizeof(asT)), "The new SYCL vec type must have the same storage size in " "bytes as this SYCL swizzled vec"); - static_assert( - detail::is_contained::value || - detail::is_contained::value, - "asT must be SYCL vec of a different element type and " - "number of elements specified by asT"); + static_assert(detail::is_vec_v, + "asT must be SYCL vec of a different element type and " + "number of elements specified by asT"); return Tmp.template as(); }