[SYCL] Simplify make_(un)signed (#11514)

Author: rolandschulz

sycl/include/sycl/detail/type_traits.hpp

@@ -184,80 +184,35 @@ template <typename T, typename R> struct copy_cv_qualifiers {
 };
 
 // make_signed with support SYCL vec class
-template <typename T, typename Enable = void> struct make_signed_impl;
-
-template <typename T>
-using make_signed_impl_t = typename make_signed_impl<T, T>::type;
-
-template <typename T>
-struct make_signed_impl<
-    T, std::enable_if_t<is_contained<T, gtl::scalar_integer_list>::value, T>> {
+template <typename T> struct make_signed {
   using type = std::make_signed_t<T>;
 };
-
-template <typename T>
-struct make_signed_impl<
-    T, std::enable_if_t<is_contained<T, gtl::vector_integer_list>::value, T>> {
-  using base_type = make_signed_impl_t<vector_element_t<T>>;
-  using type = change_base_type_t<T, base_type>;
+template <typename T> using make_signed_t = typename make_signed<T>::type;
+template <class T> struct make_signed<const T> {
+  using type = const make_signed_t<T>;
 };
-
-// TODO Delete this specialization after solving the problems in the test
-// infrastructure.
-template <typename T>
-struct make_signed_impl<
-    T, std::enable_if_t<!is_contained<T, gtl::integer_list>::value, T>> {
-  using type = T;
+template <class T, int N> struct make_signed<vec<T, N>> {
+  using type = vec<make_signed_t<T>, N>;
 };
-
-template <typename T> struct make_signed {
-  using new_type_wo_cv_qualifiers = make_signed_impl_t<std::remove_cv_t<T>>;
-  using type = copy_cv_qualifiers_t<T, new_type_wo_cv_qualifiers>;
+template <class T, std::size_t N> struct make_signed<marray<T, N>> {
+  using type = marray<make_signed_t<T>, N>;
 };
 
-template <typename T> using make_signed_t = typename make_signed<T>::type;
-
 // make_unsigned with support SYCL vec class
-template <typename T, typename Enable = void> struct make_unsigned_impl;
-
-template <typename T>
-using make_unsigned_impl_t = typename make_unsigned_impl<T, T>::type;
-
-template <typename T>
-struct make_unsigned_impl<
-    T, std::enable_if_t<is_contained<T, gtl::scalar_integer_list>::value, T>> {
+template <typename T> struct make_unsigned {
   using type = std::make_unsigned_t<T>;
 };
-
-template <typename T>
-struct make_unsigned_impl<
-    T, std::enable_if_t<is_contained<T, gtl::vector_integer_list>::value, T>> {
-  using base_type = make_unsigned_impl_t<vector_element_t<T>>;
-  using type = change_base_type_t<T, base_type>;
-};
-
-// TODO Delete this specialization after solving the problems in the test
-// infrastructure.
-template <typename T>
-struct make_unsigned_impl<
-    T, std::enable_if_t<!is_contained<T, gtl::integer_list>::value, T>> {
-  using type = T;
+template <typename T> using make_unsigned_t = typename make_unsigned<T>::type;
+template <class T> struct make_unsigned<const T> {
+  using type = const make_unsigned_t<T>;
 };
-
-template <typename T> struct make_unsigned {
-  using new_type_wo_cv_qualifiers = make_unsigned_impl_t<std::remove_cv_t<T>>;
-  using type = copy_cv_qualifiers_t<T, new_type_wo_cv_qualifiers>;
+template <class T, int N> struct make_unsigned<vec<T, N>> {
+  using type = vec<make_unsigned_t<T>, N>;
 };
-
-template <typename T, size_t N> struct make_unsigned<marray<T, N>> {
-  using base_type = marray_element_t<marray<T, N>>;
-  using new_type_wo_cv_qualifiers =
-      make_unsigned_impl_t<std::remove_cv_t<base_type>>;
-  using type = marray<copy_cv_qualifiers_t<T, new_type_wo_cv_qualifiers>, N>;
+template <class T, std::size_t N> struct make_unsigned<marray<T, N>> {
+  using type = marray<make_unsigned_t<T>, N>;
 };
 
-template <typename T> using make_unsigned_t = typename make_unsigned<T>::type;
-
 // Checks that sizeof base type of T equal N and T satisfies S<T>::value
 template <typename T, int N, template <typename> class S>
 using is_gen_based_on_type_sizeof =

sycl/test/basic_tests/vectors/vectors.cpp

@@ -30,12 +30,19 @@ template <typename From, typename To> void check_convert() {
   assert((int)result.w() == (int)vec.w());
 }
 
+template <class T>
+constexpr auto has_unsigned_v =
+    std::is_integral_v<T> && !std::is_same_v<T, bool>;
+
 template <typename From, typename To> void check_signed_unsigned_convert_to() {
   check_convert<From, To>();
-  check_convert<From, sycl::detail::make_unsigned_t<To>>();
-  check_convert<sycl::detail::make_unsigned_t<From>, To>();
-  check_convert<sycl::detail::make_unsigned_t<From>,
-                sycl::detail::make_unsigned_t<To>>();
+  if constexpr (has_unsigned_v<To>)
+    check_convert<From, sycl::detail::make_unsigned_t<To>>();
+  if constexpr (has_unsigned_v<From>)
+    check_convert<sycl::detail::make_unsigned_t<From>, To>();
+  if constexpr (has_unsigned_v<To> && has_unsigned_v<From>)
+    check_convert<sycl::detail::make_unsigned_t<From>,
+                  sycl::detail::make_unsigned_t<To>>();
 }
 
 template <typename From> void check_convert_from() {

sycl/test/regression/async_work_group_copy.cpp

@@ -46,12 +46,14 @@ template <typename T> void test() {
   async_work_group_test<vec<T, 4>>();
   async_work_group_test<vec<T, 8>>();
   async_work_group_test<vec<T, 16>>();
-  async_work_group_test<detail::make_unsigned_t<T>>();
-  async_work_group_test<vec<detail::make_unsigned_t<T>, 2>>();
-  async_work_group_test<vec<detail::make_unsigned_t<T>, 3>>();
-  async_work_group_test<vec<detail::make_unsigned_t<T>, 4>>();
-  async_work_group_test<vec<detail::make_unsigned_t<T>, 8>>();
-  async_work_group_test<vec<detail::make_unsigned_t<T>, 16>>();
+  if constexpr (std::is_integral_v<T>) {
+    async_work_group_test<detail::make_unsigned_t<T>>();
+    async_work_group_test<vec<detail::make_unsigned_t<T>, 2>>();
+    async_work_group_test<vec<detail::make_unsigned_t<T>, 3>>();
+    async_work_group_test<vec<detail::make_unsigned_t<T>, 4>>();
+    async_work_group_test<vec<detail::make_unsigned_t<T>, 8>>();
+    async_work_group_test<vec<detail::make_unsigned_t<T>, 16>>();
+  }
 }
 
 int main() {