[SYCL][ABI-break] Promote relational return type changes (#9602)

This commit promotes the return type changes of SYCL relational builtins
that changed between SYCL 1.2.1 and SYCL 2020 out from the guard of
SYCL2020_CONFORMANT_APIS.

---------

Signed-off-by: Larsen, Steffen <[email protected]>

Author: steffenlarsen

sycl/CMakeLists.txt

@@ -36,7 +36,7 @@ set(SYCL_MAJOR_VERSION 7)
 set(SYCL_MINOR_VERSION 0)
 set(SYCL_PATCH_VERSION 0)
 
-set(SYCL_DEV_ABI_VERSION 2)
+set(SYCL_DEV_ABI_VERSION 3)
 if (SYCL_ADD_DEV_VERSION_POSTFIX)
   set(SYCL_VERSION_POSTFIX "-${SYCL_DEV_ABI_VERSION}")
 endif()

sycl/include/sycl/builtins.hpp

@@ -2001,18 +2001,9 @@ __SYCL_MARRAY_RELATIONAL_FUNCTION_BINOP_OVERLOAD(isordered)
 __SYCL_MARRAY_RELATIONAL_FUNCTION_BINOP_OVERLOAD(isunordered)
 __SYCL_MARRAY_RELATIONAL_FUNCTION_UNOP_OVERLOAD(signbit)
 
-namespace detail {
-#if defined(SYCL2020_CONFORMANT_APIS) && SYCL_LANGUAGE_VERSION >= 202001
-using anyall_ret_t = bool;
-#else
-using anyall_ret_t = int;
-#endif
-} // namespace detail
-
-// int any (sigeninteger x)
+// bool any (sigeninteger x)
 template <typename T>
-std::enable_if_t<detail::is_sigeninteger<T>::value, detail::anyall_ret_t>
-any(T x) __NOEXC {
+std::enable_if_t<detail::is_sigeninteger<T>::value, bool> any(T x) __NOEXC {
   return detail::Boolean<1>(int(detail::msbIsSet(x)));
 }
 
@@ -2024,10 +2015,9 @@ std::enable_if_t<detail::is_vigeninteger<T>::value, int> any(T x) __NOEXC {
           detail::rel_sign_bit_test_arg_t<T>(x)));
 }
 
-// int all (sigeninteger x)
+// bool all (sigeninteger x)
 template <typename T>
-std::enable_if_t<detail::is_sigeninteger<T>::value, detail::anyall_ret_t>
-all(T x) __NOEXC {
+std::enable_if_t<detail::is_sigeninteger<T>::value, bool> all(T x) __NOEXC {
   return detail::Boolean<1>(int(detail::msbIsSet(x)));
 }
 

sycl/include/sycl/detail/generic_type_traits.hpp

@@ -642,7 +642,6 @@ template <typename T> inline constexpr bool msbIsSet(const T x) {
   return (x & msbMask(x));
 }
 
-#if defined(SYCL2020_CONFORMANT_APIS) && SYCL_LANGUAGE_VERSION >= 202001
 // SYCL 2020 4.17.9 (Relation functions), e.g. table 178
 //
 //  genbool isequal (genfloatf x, genfloatf y)
@@ -653,27 +652,6 @@ template <typename T>
 using common_rel_ret_t =
     std::conditional_t<is_vgentype<T>::value, make_singed_integer_t<T>, bool>;
 
-// TODO: Remove this when common_rel_ret_t is promoted.
-template <typename T>
-using internal_host_rel_ret_t =
-    std::conditional_t<is_vgentype<T>::value, make_singed_integer_t<T>, int>;
-#else
-// SYCL 1.2.1 4.13.7 (Relation functions), e.g.
-//
-//   igeninteger32bit isequal (genfloatf x, genfloatf y)
-//   igeninteger64bit isequal (genfloatd x, genfloatd y)
-//
-// However, we have pre-existing bug so
-//
-//   igeninteger32bit isequal (genfloatd x, genfloatd y)
-//
-// Fixing it would be an ABI-breaking change so isn't done.
-template <typename T>
-using common_rel_ret_t =
-    std::conditional_t<is_vgentype<T>::value, make_singed_integer_t<T>, int>;
-template <typename T> using internal_host_rel_ret_t = common_rel_ret_t<T>;
-#endif
-
 // forward declaration
 template <int N> struct Boolean;
 
@@ -696,15 +674,7 @@ template <typename T> struct RelationalReturnType {
 #ifdef __SYCL_DEVICE_ONLY__
   using type = Boolean<TryToGetNumElements<T>::value>;
 #else
-  // After changing the return type of scalar relational operations to boolean
-  // we keep the old representation of the internal implementation of the
-  // host-side builtins to avoid ABI-breaks.
-  // TODO: Use common_rel_ret_t when ABI break is allowed and the boolean return
-  //       type for relationals are promoted out of SYCL2020_CONFORMANT_APIS.
-  //       The scalar relational builtins in
-  //       sycl/source/detail/builtins_relational.cpp should likewise be updated
-  //       to return boolean values.
-  using type = internal_host_rel_ret_t<T>;
+  using type = common_rel_ret_t<T>;
 #endif
 };