[SYCL] Remove old ABI entry points from detail::stream_impl (#13387)

Author: aelovikov-intel

sycl/source/detail/stream_impl.cpp

@@ -18,12 +18,6 @@ namespace sycl {
 inline namespace _V1 {
 namespace detail {
 
-stream_impl::stream_impl(size_t BufferSize, size_t MaxStatementSize,
-                         handler &CGH)
-    : stream_impl(BufferSize, MaxStatementSize, {}) {
-  (void)CGH;
-}
-
 stream_impl::stream_impl(size_t BufferSize, size_t MaxStatementSize,
                          const property_list &PropList)
     : BufferSize_(BufferSize), MaxStatementSize_(MaxStatementSize),
@@ -72,10 +66,6 @@ size_t stream_impl::get_work_item_buffer_size() const {
   return MaxStatementSize_;
 }
 
-size_t stream_impl::get_size() const { return BufferSize_; }
-
-size_t stream_impl::get_max_statement_size() const { return MaxStatementSize_; }
-
 void stream_impl::initStreamHost(QueueImplPtr Queue) {
   // Real size of full flush buffer is saved only in buffer_impl field of
   // FlushBuf object.
@@ -138,7 +128,6 @@ void stream_impl::flush(const EventImplPtr &LeadEvent) {
   }
 }
 
-void stream_impl::flush() { flush(nullptr); }
 } // namespace detail
 } // namespace _V1
 } // namespace sycl

sycl/source/detail/stream_impl.hpp

@@ -24,10 +24,6 @@ namespace detail {
 
 class __SYCL_EXPORT stream_impl {
 public:
-  // TODO: This constructor is unused.
-  // To be removed when API/ABI changes are allowed.
-  stream_impl(size_t BufferSize, size_t MaxStatementSize, handler &CGH);
-
   stream_impl(size_t BufferSize, size_t MaxStatementSize,
               const property_list &PropList);
 
@@ -49,20 +45,10 @@ class __SYCL_EXPORT stream_impl {
   // LeadEvent as well as in queue LeadEvent associated with.
   void flush(const EventImplPtr &LeadEvent);
 
-  // Enqueue task to copy stream buffer to the host and print the contents
-  // Remove during next ABI breaking window
-  void flush();
-
   size_t size() const noexcept;
 
   size_t get_work_item_buffer_size() const;
 
-  // TODO: Unusued. Remove when ABI-break is allowed.
-  size_t get_size() const;
-
-  // TODO: Unusued. Remove when ABI-break is allowed.
-  size_t get_max_statement_size() const;
-
   template <typename propertyT> bool has_property() const noexcept {
     return PropList_.has_property<propertyT>();
   }

sycl/source/stream.cpp

@@ -56,7 +56,7 @@ stream::stream(size_t BufferSize, size_t MaxStatementSize, handler &CGH,
   detail::getSyclObjImpl(GlobalFlushBuf)->PerWI = true;
 }
 
-size_t stream::size() const noexcept { return impl->get_size(); }
+size_t stream::size() const noexcept { return impl->size(); }
 
 size_t stream::get_work_item_buffer_size() const {
   return impl->get_work_item_buffer_size();

sycl/test/abi/sycl_symbols_linux.dump

@@ -3236,11 +3236,8 @@ _ZN4sycl3_V16detail11stream_impl15accessGlobalBufERNS0_7handlerE
 _ZN4sycl3_V16detail11stream_impl18accessGlobalOffsetERNS0_7handlerE
 _ZN4sycl3_V16detail11stream_impl20accessGlobalFlushBufERNS0_7handlerE
 _ZN4sycl3_V16detail11stream_impl5flushERKSt10shared_ptrINS1_10event_implEE
-_ZN4sycl3_V16detail11stream_impl5flushEv
 _ZN4sycl3_V16detail11stream_implC1EmmRKNS0_13property_listE
-_ZN4sycl3_V16detail11stream_implC1EmmRNS0_7handlerE
 _ZN4sycl3_V16detail11stream_implC2EmmRKNS0_13property_listE
-_ZN4sycl3_V16detail11stream_implC2EmmRNS0_7handlerE
 _ZN4sycl3_V16detail12buffer_plain14deleteAccPropsERKNS1_16PropWithDataKindE
 _ZN4sycl3_V16detail12buffer_plain14set_write_backEb
 _ZN4sycl3_V16detail12buffer_plain23constructorNotificationERKNS1_13code_locationEPvPKvS8_jjPm
@@ -3849,10 +3846,8 @@ _ZNK4sycl3_V16detail11image_plain8get_sizeEv
 _ZNK4sycl3_V16detail11image_plain9get_countEv
 _ZNK4sycl3_V16detail11image_plain9get_pitchEv
 _ZNK4sycl3_V16detail11image_plain9get_rangeEv
-_ZNK4sycl3_V16detail11stream_impl22get_max_statement_sizeEv
 _ZNK4sycl3_V16detail11stream_impl25get_work_item_buffer_sizeEv
 _ZNK4sycl3_V16detail11stream_impl4sizeEv
-_ZNK4sycl3_V16detail11stream_impl8get_sizeEv
 _ZNK4sycl3_V16detail12buffer_plain12get_propertyINS0_3ext6oneapi4cuda8property7context19use_primary_contextEEET_v
 _ZNK4sycl3_V16detail12buffer_plain12get_propertyINS0_3ext6oneapi8property5queue12priority_lowEEET_v
 _ZNK4sycl3_V16detail12buffer_plain12get_propertyINS0_3ext6oneapi8property5queue13priority_highEEET_v

sycl/test/abi/sycl_symbols_windows.dump

@@ -685,7 +685,6 @@
 ??0stream@_V1@sycl@@QEAA@_K0AEAVhandler@12@AEBVproperty_list@12@@Z
 ??0stream_impl@detail@_V1@sycl@@QEAA@$$QEAV0123@@Z
 ??0stream_impl@detail@_V1@sycl@@QEAA@AEBV0123@@Z
-??0stream_impl@detail@_V1@sycl@@QEAA@_K0AEAVhandler@23@@Z
 ??0stream_impl@detail@_V1@sycl@@QEAA@_K0AEBVproperty_list@23@@Z
 ??0tls_code_loc_t@detail@_V1@sycl@@QEAA@AEBUcode_location@123@@Z
 ??0tls_code_loc_t@detail@_V1@sycl@@QEAA@XZ
@@ -4188,7 +4187,6 @@
 ?finalizeImpl@executable_command_graph@detail@experimental@oneapi@ext@_V1@sycl@@IEAAXXZ
 ?find_device_intersection@detail@_V1@sycl@@YA?AV?$vector@Vdevice@_V1@sycl@@V?$allocator@Vdevice@_V1@sycl@@@std@@@std@@AEBV?$vector@V?$kernel_bundle@$00@_V1@sycl@@V?$allocator@V?$kernel_bundle@$00@_V1@sycl@@@std@@@5@@Z
 ?flush@stream_impl@detail@_V1@sycl@@QEAAXAEBV?$shared_ptr@Vevent_impl@detail@_V1@sycl@@@std@@@Z
-?flush@stream_impl@detail@_V1@sycl@@QEAAXXZ
 ?free@_V1@sycl@@YAXPEAXAEBVcontext@12@AEBUcode_location@detail@12@@Z
 ?free@_V1@sycl@@YAXPEAXAEBVqueue@12@AEBUcode_location@detail@12@@Z
 ?free_image_mem@experimental@oneapi@ext@_V1@sycl@@YAXUimage_mem_handle@12345@AEBVdevice@45@AEBVcontext@45@@Z
@@ -4362,7 +4360,6 @@
 ?get_kernel_ids@_V1@sycl@@YA?AV?$vector@Vkernel_id@_V1@sycl@@V?$allocator@Vkernel_id@_V1@sycl@@@std@@@std@@XZ
 ?get_kernel_ids@kernel_bundle_plain@detail@_V1@sycl@@QEBA?AV?$vector@Vkernel_id@_V1@sycl@@V?$allocator@Vkernel_id@_V1@sycl@@@std@@@std@@XZ
 ?get_max_statement_size@stream@_V1@sycl@@QEBA_KXZ
-?get_max_statement_size@stream_impl@detail@_V1@sycl@@QEBA_KXZ
 ?get_mip_level_mem_handle@experimental@oneapi@ext@_V1@sycl@@YA?AUimage_mem_handle@12345@U612345@IAEBVdevice@45@AEBVcontext@45@@Z
 ?get_mip_level_mem_handle@experimental@oneapi@ext@_V1@sycl@@YA?AUimage_mem_handle@12345@U612345@IAEBVqueue@45@@Z
 ?get_mip_level_mem_handle@image_mem@experimental@oneapi@ext@_V1@sycl@@QEBA?AUimage_mem_handle@23456@I@Z
@@ -4387,7 +4384,6 @@
 ?get_root_nodes@modifiable_command_graph@detail@experimental@oneapi@ext@_V1@sycl@@QEBA?AV?$vector@Vnode@experimental@oneapi@ext@_V1@sycl@@V?$allocator@Vnode@experimental@oneapi@ext@_V1@sycl@@@std@@@std@@XZ
 ?get_size@image_plain@detail@_V1@sycl@@IEBA_KXZ
 ?get_size@stream@_V1@sycl@@QEBA_KXZ
-?get_size@stream_impl@detail@_V1@sycl@@QEBA_KXZ
 ?get_specialization_constant_impl@kernel_bundle_plain@detail@_V1@sycl@@IEBAXPEBDPEAX@Z
 ?get_stream_mode@stream@_V1@sycl@@QEBA?AW4stream_manipulator@23@XZ
 ?get_successors@node@experimental@oneapi@ext@_V1@sycl@@QEBA?AV?$vector@Vnode@experimental@oneapi@ext@_V1@sycl@@V?$allocator@Vnode@experimental@oneapi@ext@_V1@sycl@@@std@@@std@@XZ

sycl/unittests/scheduler/StreamInitDependencyOnHost.cpp

@@ -97,7 +97,7 @@ TEST_F(SchedulerTest, StreamInitDependencyOnHost) {
 
   // Emulating construction of stream object inside command group
   detail::StreamImplPtr StreamImpl =
-      std::make_shared<detail::stream_impl>(1024, 200, MockCGH);
+      std::make_shared<detail::stream_impl>(1024, 200, property_list{});
   detail::GlobalBufAccessorT FlushBufAcc =
       StreamImpl->accessGlobalFlushBuf(MockCGH);
   MockCGH.addStream(StreamImpl);