[SYCL][ABI-break] Remove host_half_impl::half (#6527)

Author: raaiq1

sycl/include/sycl/ext/intel/esimd/detail/elem_type_traits.hpp

@@ -582,7 +582,7 @@ class WrapperElementTypeProxy {
   template <class T = sycl::half>
   static inline T bitcast_to_half(__raw_t<T> Bits) {
 #ifndef __SYCL_DEVICE_ONLY__
-    return sycl::half(::sycl::detail::host_half_impl::half_v2(Bits));
+    return sycl::half(::sycl::detail::host_half_impl::half(Bits));
 #else
     sycl::half Res;
     Res.Data = Bits;

sycl/include/sycl/half_type.hpp

@@ -133,124 +133,63 @@ inline __SYCL_CONSTEXPR_HALF float half2Float(const uint16_t &Val) {
 
 namespace host_half_impl {
 
-// This class is legacy and it is needed only to avoid breaking ABI
+// The main host half class
 class __SYCL_EXPORT half {
 public:
   half() = default;
   constexpr half(const half &) = default;
   constexpr half(half &&) = default;
 
-  half(const float &rhs);
-
-  half &operator=(const half &rhs) = default;
-
-  // Operator +=, -=, *=, /=
-  half &operator+=(const half &rhs);
-
-  half &operator-=(const half &rhs);
-
-  half &operator*=(const half &rhs);
-
-  half &operator/=(const half &rhs);
-
-  // Operator ++, --
-  half &operator++() {
-    *this += 1;
-    return *this;
-  }
-
-  half operator++(int) {
-    half ret(*this);
-    operator++();
-    return ret;
-  }
-
-  half &operator--() {
-    *this -= 1;
-    return *this;
-  }
-
-  half operator--(int) {
-    half ret(*this);
-    operator--();
-    return ret;
-  }
-
-  // Operator neg
-  constexpr half &operator-() {
-    Buf ^= 0x8000;
-    return *this;
-  }
-
-  // Operator float
-  operator float() const;
-
-  template <typename Key> friend struct std::hash;
-
-  // Initialize underlying data
-  constexpr explicit half(uint16_t x) : Buf(x) {}
-
-private:
-  uint16_t Buf;
-};
-
-// The main host half class
-class __SYCL_EXPORT half_v2 {
-public:
-  half_v2() = default;
-  constexpr half_v2(const half_v2 &) = default;
-  constexpr half_v2(half_v2 &&) = default;
-
-  __SYCL_CONSTEXPR_HALF half_v2(const float &rhs) : Buf(float2Half(rhs)) {}
+  __SYCL_CONSTEXPR_HALF half(const float &rhs) : Buf(float2Half(rhs)) {}
 
-  constexpr half_v2 &operator=(const half_v2 &rhs) = default;
+  constexpr half &operator=(const half &rhs) = default;
 
   // Operator +=, -=, *=, /=
-  __SYCL_CONSTEXPR_HALF half_v2 &operator+=(const half_v2 &rhs) {
+  __SYCL_CONSTEXPR_HALF half &operator+=(const half &rhs) {
     *this = operator float() + static_cast<float>(rhs);
     return *this;
   }
 
-  __SYCL_CONSTEXPR_HALF half_v2 &operator-=(const half_v2 &rhs) {
+  __SYCL_CONSTEXPR_HALF half &operator-=(const half &rhs) {
     *this = operator float() - static_cast<float>(rhs);
     return *this;
   }
 
-  __SYCL_CONSTEXPR_HALF half_v2 &operator*=(const half_v2 &rhs) {
+  __SYCL_CONSTEXPR_HALF half &operator*=(const half &rhs) {
     *this = operator float() * static_cast<float>(rhs);
     return *this;
   }
 
-  __SYCL_CONSTEXPR_HALF half_v2 &operator/=(const half_v2 &rhs) {
+  __SYCL_CONSTEXPR_HALF half &operator/=(const half &rhs) {
     *this = operator float() / static_cast<float>(rhs);
     return *this;
   }
 
   // Operator ++, --
-  __SYCL_CONSTEXPR_HALF half_v2 &operator++() {
+  __SYCL_CONSTEXPR_HALF half &operator++() {
     *this += 1;
     return *this;
   }
 
-  __SYCL_CONSTEXPR_HALF half_v2 operator++(int) {
-    half_v2 ret(*this);
+  __SYCL_CONSTEXPR_HALF half operator++(int) {
+    half ret(*this);
     operator++();
     return ret;
   }
 
-  __SYCL_CONSTEXPR_HALF half_v2 &operator--() {
+  __SYCL_CONSTEXPR_HALF half &operator--() {
     *this -= 1;
     return *this;
   }
 
-  __SYCL_CONSTEXPR_HALF half_v2 operator--(int) {
-    half_v2 ret(*this);
+  __SYCL_CONSTEXPR_HALF half operator--(int) {
+    half ret(*this);
     operator--();
     return ret;
   }
 
   // Operator neg
-  constexpr half_v2 &operator-() {
+  constexpr half &operator-() {
     Buf ^= 0x8000;
     return *this;
   }
@@ -261,7 +200,7 @@ class __SYCL_EXPORT half_v2 {
   template <typename Key> friend struct std::hash;
 
   // Initialize underlying data
-  constexpr explicit half_v2(uint16_t x) : Buf(x) {}
+  constexpr explicit half(uint16_t x) : Buf(x) {}
 
   friend class sycl::ext::intel::esimd::detail::WrapperElementTypeProxy;
 
@@ -298,7 +237,7 @@ using Vec4StorageT = StorageT __attribute__((ext_vector_type(4)));
 using Vec8StorageT = StorageT __attribute__((ext_vector_type(8)));
 using Vec16StorageT = StorageT __attribute__((ext_vector_type(16)));
 #else
-using StorageT = detail::host_half_impl::half_v2;
+using StorageT = detail::host_half_impl::half;
 // No need to extract underlying data type for built-in functions operating on
 // host
 using BIsRepresentationT = half;
@@ -339,8 +278,8 @@ class half {
 #ifndef __SYCL_DEVICE_ONLY__
   // Since StorageT and BIsRepresentationT are different on host, these two
   // helpers are required for 'vec' class
-  constexpr half(const detail::host_half_impl::half_v2 &rhs) : Data(rhs) {}
-  constexpr operator detail::host_half_impl::half_v2() const { return Data; }
+  constexpr half(const detail::host_half_impl::half &rhs) : Data(rhs) {}
+  constexpr operator detail::host_half_impl::half() const { return Data; }
 #endif // __SYCL_DEVICE_ONLY__
 
   // Operator +=, -=, *=, /=
@@ -688,7 +627,7 @@ template <> struct numeric_limits<sycl::half> {
 #ifdef __SYCL_DEVICE_ONLY__
     return __builtin_huge_valf();
 #else
-    return sycl::detail::host_half_impl::half_v2(static_cast<uint16_t>(0x7C00));
+    return sycl::detail::host_half_impl::half(static_cast<uint16_t>(0x7C00));
 #endif
   }
 

sycl/include/sycl/known_identity.hpp

@@ -166,7 +166,7 @@ struct known_identity_impl<
 #ifdef __SYCL_DEVICE_ONLY__
       0;
 #else
-      sycl::detail::host_half_impl::half_v2(static_cast<uint16_t>(0));
+      sycl::detail::host_half_impl::half(static_cast<uint16_t>(0));
 #endif
 };
 
@@ -206,7 +206,7 @@ struct known_identity_impl<
 #ifdef __SYCL_DEVICE_ONLY__
       1;
 #else
-      sycl::detail::host_half_impl::half_v2(static_cast<uint16_t>(0x3C00));
+      sycl::detail::host_half_impl::half(static_cast<uint16_t>(0x3C00));
 #endif
 };
 

sycl/include/sycl/types.hpp

@@ -702,13 +702,13 @@ template <typename Type, int NumElements> class vec {
   using EnableIfNotHostHalf = typename detail::enable_if_t<
       !std::is_same<DataT, sycl::detail::half_impl::half>::value ||
           !std::is_same<sycl::detail::half_impl::StorageT,
-                        sycl::detail::host_half_impl::half_v2>::value,
+                        sycl::detail::host_half_impl::half>::value,
       T>;
   template <typename T = void>
   using EnableIfHostHalf = typename detail::enable_if_t<
       std::is_same<DataT, sycl::detail::half_impl::half>::value &&
           std::is_same<sycl::detail::half_impl::StorageT,
-                       sycl::detail::host_half_impl::half_v2>::value,
+                       sycl::detail::host_half_impl::half>::value,
       T>;
 
   template <typename Ty = DataT>

sycl/source/CMakeLists.txt

@@ -171,7 +171,6 @@ set(SYCL_SOURCES
     "exception.cpp"
     "exception_list.cpp"
     "function_pointer.cpp"
-    "half_type.cpp"
     "handler.cpp"
     "interop_handle.cpp"
     "interop_handler.cpp"

sycl/source/half_type.cpp

@@ -3841,12 +3841,6 @@ _ZN4sycl3_V16detail13make_platformEmNS0_7backendE
 _ZN4sycl3_V16detail13select_deviceERKSt8functionIFiRKNS0_6deviceEEE
 _ZN4sycl3_V16detail13select_deviceERKSt8functionIFiRKNS0_6deviceEEERKNS0_7contextE
 _ZN4sycl3_V16detail14getBorderColorENS0_19image_channel_orderE
-_ZN4sycl3_V16detail14host_half_impl4halfC1ERKf
-_ZN4sycl3_V16detail14host_half_impl4halfC2ERKf
-_ZN4sycl3_V16detail14host_half_impl4halfdVERKS3_
-_ZN4sycl3_V16detail14host_half_impl4halfmIERKS3_
-_ZN4sycl3_V16detail14host_half_impl4halfmLERKS3_
-_ZN4sycl3_V16detail14host_half_impl4halfpLERKS3_
 _ZN4sycl3_V16detail15getOrWaitEventsESt6vectorINS0_5eventESaIS3_EESt10shared_ptrINS1_12context_implEE
 _ZN4sycl3_V16detail16AccessorImplHost6resizeEm
 _ZN4sycl3_V16detail16AccessorImplHostD1Ev
@@ -4112,7 +4106,6 @@ _ZNK4sycl3_V16detail11stream_impl8get_sizeEv
 _ZNK4sycl3_V16detail12sampler_impl18get_filtering_modeEv
 _ZNK4sycl3_V16detail12sampler_impl19get_addressing_modeEv
 _ZNK4sycl3_V16detail12sampler_impl33get_coordinate_normalization_modeEv
-_ZNK4sycl3_V16detail14host_half_impl4halfcvfEv
 _ZNK4sycl3_V16detail18device_image_plain10has_kernelERKNS0_9kernel_idE
 _ZNK4sycl3_V16detail18device_image_plain10has_kernelERKNS0_9kernel_idERKNS0_6deviceE
 _ZNK4sycl3_V16detail18device_image_plain9getNativeEv