Skip to content

Commit 06d3d10

Browse files
[NFCI][SYCL] Remove unused and inline/simplify some trivial traits (#15692)
1 parent f08e33f commit 06d3d10

File tree

4 files changed

+6
-55
lines changed

4 files changed

+6
-55
lines changed

sycl/include/sycl/detail/generic_type_lists.hpp

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -473,42 +473,7 @@ using scalar_bool_list = type_list<bool>;
473473

474474
using bool_list = tl_append<scalar_bool_list, marray_bool_list>;
475475

476-
using vector_bool_list = type_list<vec<bool, 1>, vec<bool, 2>, vec<bool, 3>,
477-
vec<bool, 4>, vec<bool, 8>, vec<bool, 16>>;
478-
479-
// basic types
480-
using scalar_signed_basic_list =
481-
tl_append<scalar_floating_list, scalar_signed_integer_list>;
482-
483-
using vector_signed_basic_list =
484-
tl_append<vector_floating_list, vector_signed_integer_list>;
485-
486-
using marray_signed_basic_list =
487-
tl_append<marray_floating_list, marray_signed_integer_list>;
488-
489-
using signed_basic_list =
490-
tl_append<scalar_signed_basic_list, vector_signed_basic_list,
491-
marray_signed_basic_list>;
492-
493-
using scalar_unsigned_basic_list = tl_append<scalar_unsigned_integer_list>;
494-
495-
using unsigned_basic_list =
496-
tl_append<scalar_unsigned_basic_list, vector_unsigned_integer_list,
497-
marray_unsigned_integer_list>;
498-
499-
using vector_basic_list =
500-
tl_append<vector_signed_basic_list, vector_unsigned_integer_list>;
501-
502476
} // namespace gtl
503-
namespace gvl {
504-
// address spaces
505-
using nonconst_address_space_list = address_space_list<
506-
access::address_space::local_space, access::address_space::global_space,
507-
access::address_space::private_space, access::address_space::generic_space,
508-
access::address_space::ext_intel_global_device_space,
509-
access::address_space::ext_intel_global_host_space>;
510-
511-
} // namespace gvl
512477
} // namespace detail
513478
} // namespace _V1
514479
} // namespace sycl

sycl/include/sycl/detail/generic_type_traits.hpp

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,6 @@ template <typename T>
3131
inline constexpr bool is_svgenfloatf_v =
3232
is_contained_v<T, gtl::scalar_vector_float_list>;
3333

34-
template <typename T>
35-
inline constexpr bool is_svgenfloatd_v =
36-
is_contained_v<T, gtl::scalar_vector_double_list>;
37-
3834
template <typename T>
3935
inline constexpr bool is_half_v = is_contained_v<T, gtl::scalar_half_list>;
4036

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

64-
template <typename T>
65-
inline constexpr bool is_svgenfloat_v =
66-
is_contained_v<T, gtl::scalar_vector_floating_list>;
67-
6860
template <typename T>
6961
inline constexpr bool is_genint_v = is_contained_v<T, gtl::signed_int_list>;
7062

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

74-
template <typename T>
75-
using is_geninteger = std::bool_constant<is_geninteger_v<T>>;
76-
7766
template <typename T>
7867
inline constexpr bool is_sgeninteger_v =
7968
is_contained_v<T, gtl::scalar_integer_list>;

sycl/include/sycl/ext/oneapi/experimental/cuda/builtins.hpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,9 @@ using ldg_vector_types = sycl::detail::type_list<
4747

4848
using ldg_types =
4949
sycl::detail::tl_append<ldg_vector_types,
50-
sycl::detail::gtl::scalar_signed_basic_list,
51-
sycl::detail::gtl::scalar_unsigned_basic_list>;
50+
sycl::detail::gtl::scalar_floating_list,
51+
sycl::detail::gtl::scalar_signed_integer_list,
52+
sycl::detail::gtl::scalar_unsigned_integer_list>;
5253
} // namespace detail
5354

5455
template <typename T>

sycl/include/sycl/vector.hpp

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,8 @@
3030
#include <sycl/aliases.hpp> // for half, cl_char, cl_int
3131
#include <sycl/detail/common.hpp> // for ArrayCreator, RepeatV...
3232
#include <sycl/detail/defines_elementary.hpp> // for __SYCL2020_DEPRECATED
33-
#include <sycl/detail/generic_type_lists.hpp> // for vector_basic_list
3433
#include <sycl/detail/generic_type_traits.hpp> // for is_sigeninteger, is_s...
3534
#include <sycl/detail/memcpy.hpp> // for memcpy
36-
#include <sycl/detail/type_list.hpp> // for is_contained
3735
#include <sycl/detail/type_traits.hpp> // for is_floating_point
3836
#include <sycl/detail/vector_arith.hpp>
3937
#include <sycl/half_type.hpp> // for StorageT, half, Vec16...
@@ -1242,11 +1240,9 @@ class SwizzleOp {
12421240
static_assert((sizeof(Tmp) == sizeof(asT)),
12431241
"The new SYCL vec type must have the same storage size in "
12441242
"bytes as this SYCL swizzled vec");
1245-
static_assert(
1246-
detail::is_contained<asT, detail::gtl::vector_basic_list>::value ||
1247-
detail::is_contained<asT, detail::gtl::vector_bool_list>::value,
1248-
"asT must be SYCL vec of a different element type and "
1249-
"number of elements specified by asT");
1243+
static_assert(detail::is_vec_v<asT>,
1244+
"asT must be SYCL vec of a different element type and "
1245+
"number of elements specified by asT");
12501246
return Tmp.template as<asT>();
12511247
}
12521248

0 commit comments

Comments
 (0)