Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
35 changes: 0 additions & 35 deletions sycl/include/sycl/detail/generic_type_lists.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -473,42 +473,7 @@ using scalar_bool_list = type_list<bool>;

using bool_list = tl_append<scalar_bool_list, marray_bool_list>;

using vector_bool_list = type_list<vec<bool, 1>, vec<bool, 2>, vec<bool, 3>,
vec<bool, 4>, vec<bool, 8>, vec<bool, 16>>;

// basic types
using scalar_signed_basic_list =
tl_append<scalar_floating_list, scalar_signed_integer_list>;

using vector_signed_basic_list =
tl_append<vector_floating_list, vector_signed_integer_list>;

using marray_signed_basic_list =
tl_append<marray_floating_list, marray_signed_integer_list>;

using signed_basic_list =
tl_append<scalar_signed_basic_list, vector_signed_basic_list,
marray_signed_basic_list>;

using scalar_unsigned_basic_list = tl_append<scalar_unsigned_integer_list>;

using unsigned_basic_list =
tl_append<scalar_unsigned_basic_list, vector_unsigned_integer_list,
marray_unsigned_integer_list>;

using vector_basic_list =
tl_append<vector_signed_basic_list, vector_unsigned_integer_list>;

} // 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
11 changes: 0 additions & 11 deletions sycl/include/sycl/detail/generic_type_traits.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,6 @@ template <typename T>
inline constexpr bool is_svgenfloatf_v =
is_contained_v<T, gtl::scalar_vector_float_list>;

template <typename T>
inline constexpr bool is_svgenfloatd_v =
is_contained_v<T, gtl::scalar_vector_double_list>;

template <typename T>
inline constexpr bool is_half_v = is_contained_v<T, gtl::scalar_half_list>;

Expand All @@ -61,19 +57,12 @@ template <typename T>
inline constexpr bool is_vgenfloat_v =
is_contained_v<T, gtl::vector_floating_list>;

template <typename T>
inline constexpr bool is_svgenfloat_v =
is_contained_v<T, gtl::scalar_vector_floating_list>;

template <typename T>
inline constexpr bool is_genint_v = is_contained_v<T, gtl::signed_int_list>;

template <typename T>
inline constexpr bool is_geninteger_v = is_contained_v<T, gtl::integer_list>;

template <typename T>
using is_geninteger = std::bool_constant<is_geninteger_v<T>>;

template <typename T>
inline constexpr bool is_sgeninteger_v =
is_contained_v<T, gtl::scalar_integer_list>;
Expand Down
5 changes: 3 additions & 2 deletions sycl/include/sycl/ext/oneapi/experimental/cuda/builtins.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,9 @@ using ldg_vector_types = sycl::detail::type_list<

using ldg_types =
sycl::detail::tl_append<ldg_vector_types,
sycl::detail::gtl::scalar_signed_basic_list,
sycl::detail::gtl::scalar_unsigned_basic_list>;
sycl::detail::gtl::scalar_floating_list,
sycl::detail::gtl::scalar_signed_integer_list,
sycl::detail::gtl::scalar_unsigned_integer_list>;
} // namespace detail

template <typename T>
Expand Down
10 changes: 3 additions & 7 deletions sycl/include/sycl/vector.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,8 @@
#include <sycl/aliases.hpp> // for half, cl_char, cl_int
#include <sycl/detail/common.hpp> // for ArrayCreator, RepeatV...
#include <sycl/detail/defines_elementary.hpp> // for __SYCL2020_DEPRECATED
#include <sycl/detail/generic_type_lists.hpp> // for vector_basic_list
#include <sycl/detail/generic_type_traits.hpp> // for is_sigeninteger, is_s...
#include <sycl/detail/memcpy.hpp> // for memcpy
#include <sycl/detail/type_list.hpp> // for is_contained
#include <sycl/detail/type_traits.hpp> // for is_floating_point
#include <sycl/detail/vector_arith.hpp>
#include <sycl/half_type.hpp> // for StorageT, half, Vec16...
Expand Down Expand Up @@ -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<asT, detail::gtl::vector_basic_list>::value ||
detail::is_contained<asT, detail::gtl::vector_bool_list>::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>,
"asT must be SYCL vec of a different element type and "
"number of elements specified by asT");
return Tmp.template as<asT>();
}

Expand Down
Loading