[SYCL][ABI-Break][NFC] Remove unusued members (#6731)

This commit removes the following:

- The unused member function `kernel_bundle::join_impl` overload.
- The unused member variable `Offset` from `stream`.
- The unused member function `buffer_impl::constructorNotification`
overload.

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

Author: steffenlarsen

sycl/CMakeLists.txt

@@ -30,7 +30,7 @@ set(SYCL_MINOR_VERSION 7)
 set(SYCL_PATCH_VERSION 0)
 # Don't forget to re-enable sycl_symbols_windows.dump once we leave ABI-breaking
 # window!
-set(SYCL_DEV_ABI_VERSION 15)
+set(SYCL_DEV_ABI_VERSION 16)
 if (SYCL_ADD_DEV_VERSION_POSTFIX)
   set(SYCL_VERSION_POSTFIX "-${SYCL_DEV_ABI_VERSION}")
 endif()

sycl/include/sycl/kernel_bundle.hpp

@@ -573,10 +573,6 @@ template <typename KernelName> bool is_compatible(const device &Dev) {
 
 namespace detail {
 
-// TODO: This is no longer in use. Remove when ABI break is allowed.
-__SYCL_EXPORT std::shared_ptr<detail::kernel_bundle_impl>
-join_impl(const std::vector<detail::KernelBundleImplPtr> &Bundles);
-
 __SYCL_EXPORT std::shared_ptr<detail::kernel_bundle_impl>
 join_impl(const std::vector<detail::KernelBundleImplPtr> &Bundles,
           bundle_state State);

sycl/include/sycl/stream.hpp

@@ -797,11 +797,6 @@ class __SYCL_EXPORT __SYCL_SPECIAL_CLASS stream {
   // Offset of the WI's flush buffer in the pool.
   mutable unsigned WIOffset = 0;
 
-  // Offset in the flush buffer
-  // TODO: This field is not used anymore.
-  // To be removed when API/ABI changes are allowed.
-  mutable unsigned Offset = 0;
-
   mutable size_t FlushBufferSize;
 
   // Fields and methods to work with manipulators

sycl/source/detail/buffer_impl.hpp

@@ -151,9 +151,6 @@ class __SYCL_EXPORT buffer_impl final : public SYCLMemObjT {
                                void *UserObj, const void *HostObj,
                                const void *Type, uint32_t Dim,
                                uint32_t ElemType, size_t Range[3]);
-  // TODO: remove once ABI break is allowed
-  void constructorNotification(const detail::code_location &CodeLoc,
-                               void *UserObj);
   void destructorNotification(void *UserObj);
 
   MemObjType getType() const override { return MemObjType::Buffer; }

sycl/source/kernel_bundle.cpp

@@ -157,12 +157,6 @@ get_empty_interop_kernel_bundle_impl(const context &Ctx,
   return std::make_shared<detail::kernel_bundle_impl>(Ctx, Devs);
 }
 
-std::shared_ptr<detail::kernel_bundle_impl>
-join_impl(const std::vector<detail::KernelBundleImplPtr> &Bundles) {
-  return std::make_shared<detail::kernel_bundle_impl>(Bundles,
-                                                      bundle_state::input);
-}
-
 std::shared_ptr<detail::kernel_bundle_impl>
 join_impl(const std::vector<detail::KernelBundleImplPtr> &Bundles,
           bundle_state State) {

sycl/test/abi/sycl_symbols_linux.dump

@@ -3863,7 +3863,6 @@ _ZN4sycl3_V16detail6OSUtil12getOSMemSizeEv
 _ZN4sycl3_V16detail6OSUtil16getCurrentDSODirB5cxx11Ev
 _ZN4sycl3_V16detail6OSUtil17getOSModuleHandleEPKv
 _ZN4sycl3_V16detail6OSUtil7makeDirEPKc
-_ZN4sycl3_V16detail9join_implERKSt6vectorISt10shared_ptrINS1_18kernel_bundle_implEESaIS5_EE
 _ZN4sycl3_V16detail9join_implERKSt6vectorISt10shared_ptrINS1_18kernel_bundle_implEESaIS5_EENS0_12bundle_stateE
 _ZN4sycl3_V16detail9link_implERKSt6vectorINS0_13kernel_bundleILNS0_12bundle_stateE1EEESaIS5_EERKS2_INS0_6deviceESaISA_EERKNS0_13property_listE
 _ZN4sycl3_V16device11get_devicesENS0_4info11device_typeE

sycl/test/abi/sycl_symbols_windows.dump

@@ -1515,7 +1515,6 @@
 ?compile_impl@detail@sycl@cl@@YA?AV?$shared_ptr@Vkernel_bundle_impl@detail@sycl@cl@@@std@@AEBV?$kernel_bundle@$0A@@23@AEBV?$vector@Vdevice@sycl@cl@@V?$allocator@Vdevice@sycl@cl@@@std@@@5@AEBVproperty_list@23@@Z
 ?compile_with_kernel_name@program@sycl@cl@@AEAAXV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@0_J@Z
 ?compile_with_source@program@sycl@cl@@QEAAXV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@0@Z
-?constructorNotification@buffer_impl@detail@sycl@cl@@QEAAXAEBUcode_location@234@PEAX@Z
 ?constructorNotification@buffer_impl@detail@sycl@cl@@QEAAXAEBUcode_location@234@PEAXPEBX2IIQEA_K@Z
 ?constructorNotification@detail@sycl@cl@@YAXPEAX0W4target@access@23@W4mode@523@AEBUcode_location@123@@Z
 ?contains_specialization_constants@kernel_bundle_plain@detail@sycl@cl@@QEBA_NXZ
@@ -2458,7 +2457,6 @@
 ?is_host@queue@sycl@cl@@QEBA_NXZ
 ?is_in_order@queue@sycl@cl@@QEBA_NXZ
 ?is_specialization_constant_set@kernel_bundle_plain@detail@sycl@cl@@IEBA_NPEBD@Z
-?join_impl@detail@sycl@cl@@YA?AV?$shared_ptr@Vkernel_bundle_impl@detail@sycl@cl@@@std@@AEBV?$vector@V?$shared_ptr@Vkernel_bundle_impl@detail@sycl@cl@@@std@@V?$allocator@V?$shared_ptr@Vkernel_bundle_impl@detail@sycl@cl@@@std@@@2@@5@@Z
 ?join_impl@detail@sycl@cl@@YA?AV?$shared_ptr@Vkernel_bundle_impl@detail@sycl@cl@@@std@@AEBV?$vector@V?$shared_ptr@Vkernel_bundle_impl@detail@sycl@cl@@@std@@V?$allocator@V?$shared_ptr@Vkernel_bundle_impl@detail@sycl@cl@@@std@@@2@@5@W4bundle_state@23@@Z
 ?ldexp@__host_std@cl@@YA?AV?$vec@M$00@sycl@2@V342@V?$vec@H$00@42@@Z
 ?ldexp@__host_std@cl@@YA?AV?$vec@M$01@sycl@2@V342@V?$vec@H$01@42@@Z