From b41aa6dac35f30012f5ea5814cfc9c935ad56932 Mon Sep 17 00:00:00 2001 From: Artur Gainullin Date: Mon, 17 Nov 2025 15:35:27 -0800 Subject: [PATCH 1/4] [SYCL] Remove fallback assertion ABI entry points --- sycl/include/sycl/queue.hpp | 35 ------------------- sycl/source/detail/device_kernel_info.cpp | 9 ----- sycl/source/queue.cpp | 42 ----------------------- sycl/test/abi/sycl_symbols_linux.dump | 6 ---- sycl/test/abi/sycl_symbols_windows.dump | 8 ----- 5 files changed, 100 deletions(-) diff --git a/sycl/include/sycl/queue.hpp b/sycl/include/sycl/queue.hpp index 826bc39982408..7ecf5210b6c7f 100644 --- a/sycl/include/sycl/queue.hpp +++ b/sycl/include/sycl/queue.hpp @@ -86,17 +86,12 @@ namespace detail { class queue_impl; #ifndef __INTEL_PREVIEW_BREAKING_CHANGES -using SubmitPostProcessF = std::function; - struct SubmissionInfoImpl; class __SYCL_EXPORT SubmissionInfo { public: SubmissionInfo(); - sycl::detail::optional &PostProcessorFunc(); - const sycl::detail::optional &PostProcessorFunc() const; - std::shared_ptr &SecondaryQueue(); const std::shared_ptr &SecondaryQueue() const; @@ -131,13 +126,6 @@ class __SYCL_EXPORT SubmissionInfo { SubmissionInfo(const detail::SubmissionInfo &SI) : MSecondaryQueue(SI.SecondaryQueue()), MEventMode(SI.EventMode()) {} - sycl::detail::optional &PostProcessorFunc() { - return MPostProcessorFunc; - } - const sycl::detail::optional &PostProcessorFunc() const { - return MPostProcessorFunc; - } - std::shared_ptr &SecondaryQueue() { return MSecondaryQueue; } @@ -153,7 +141,6 @@ class __SYCL_EXPORT SubmissionInfo { private: #ifndef __INTEL_PREVIEW_BREAKING_CHANGES - optional MPostProcessorFunc = std::nullopt; std::shared_ptr MSecondaryQueue = nullptr; #endif ext::oneapi::experimental::event_mode_enum MEventMode = @@ -3856,22 +3843,6 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase { void submit_without_event_impl(std::function CGH, const detail::code_location &CodeLoc, bool IsTopCodeLoc); - event - submit_impl_and_postprocess(std::function CGH, - const detail::code_location &CodeLoc, - const detail::SubmitPostProcessF &PostProcess); - event submit_impl_and_postprocess( - std::function CGH, const detail::code_location &CodeLoc, - const detail::SubmitPostProcessF &PostProcess, bool IsTopCodeLoc); - event - submit_impl_and_postprocess(std::function CGH, - queue secondQueue, - const detail::code_location &CodeLoc, - const detail::SubmitPostProcessF &PostProcess); - event submit_impl_and_postprocess( - std::function CGH, queue secondQueue, - const detail::code_location &CodeLoc, - const detail::SubmitPostProcessF &PostProcess, bool IsTopCodeLoc); // Old version when `std::function` was used in place of // `std::function`. @@ -3925,9 +3896,6 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase { /// \param CodeLoc is the code location of the submit call (default argument) /// \return a SYCL event object for the submitted command group. // - // UseFallBackAssert as template param vs `#if` in function body is necessary - // to prevent ODR-violation between TUs built with different fallback assert - // modes. template event submit_with_event(PropertiesT Props, const detail::type_erased_cgfo_ty &CGF, @@ -3947,9 +3915,6 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase { /// \param CGF is a function object containing command group. /// \param CodeLoc is the code location of the submit call (default argument) // - // UseFallBackAssert as template param vs `#if` in function body is necessary - // to prevent ODR-violation between TUs built with different fallback assert - // modes. template void submit_without_event(PropertiesT Props, const detail::type_erased_cgfo_ty &CGF, diff --git a/sycl/source/detail/device_kernel_info.cpp b/sycl/source/detail/device_kernel_info.cpp index 5c6dfad0d633d..f5217b61533e8 100644 --- a/sycl/source/detail/device_kernel_info.cpp +++ b/sycl/source/detail/device_kernel_info.cpp @@ -74,23 +74,14 @@ void DeviceKernelInfo::setCompileTimeInfoIfNeeded( } FastKernelSubcacheT &DeviceKernelInfo::getKernelSubcache() { - assertInitialized(); return MFastKernelSubcache; } - const std::optional &DeviceKernelInfo::getImplicitLocalArgPos() { - assertInitialized(); return MImplicitLocalArgPos; } bool DeviceKernelInfo::isCompileTimeInfoSet() const { return KernelSize != 0; } -void DeviceKernelInfo::assertInitialized() { -#ifndef __INTEL_PREVIEW_BREAKING_CHANGES - assert(MInitialized.load() && "Data needs to be initialized before use"); -#endif -} - } // namespace detail } // namespace _V1 } // namespace sycl diff --git a/sycl/source/queue.cpp b/sycl/source/queue.cpp index a58b4b234ab3a..41220a8e530fe 100644 --- a/sycl/source/queue.cpp +++ b/sycl/source/queue.cpp @@ -25,21 +25,6 @@ namespace detail { SubmissionInfo::SubmissionInfo() : impl{std::make_shared()} {} -optional &SubmissionInfo::PostProcessorFunc() { - // No longer in use, but needs to be exposed for use in SYCL programs built - // with the old headers. - static optional DoNotUsePostProcessorFunc; - return DoNotUsePostProcessorFunc; -} - -const optional &SubmissionInfo::PostProcessorFunc() const { - // No longer in use, but needs to be exposed for use in SYCL programs built - // with the old headers. - static optional DoNotUsePostProcessorFunc; - return DoNotUsePostProcessorFunc; -} - -#ifndef __INTEL_PREVIEW_BREAKING_CHANGES std::shared_ptr &SubmissionInfo::SecondaryQueue() { return impl->MSecondaryQueue; } @@ -48,7 +33,6 @@ const std::shared_ptr & SubmissionInfo::SecondaryQueue() const { return impl->MSecondaryQueue; } -#endif ext::oneapi::experimental::event_mode_enum &SubmissionInfo::EventMode() { return impl->MEventMode; @@ -239,32 +223,6 @@ void queue::submit_without_event_impl(std::function CGH, submit_without_event_impl(std::move(CGH), {}, CodeLoc, IsTopCodeLoc); } -event queue::submit_impl_and_postprocess(std::function CGH, - const detail::code_location &CodeLoc, - const detail::SubmitPostProcessF &) { - return submit_with_event_impl(std::move(CGH), {}, CodeLoc, true); -} -event queue::submit_impl_and_postprocess(std::function CGH, - const detail::code_location &CodeLoc, - const detail::SubmitPostProcessF &, - bool IsTopCodeLoc) { - return submit_with_event_impl(std::move(CGH), {}, CodeLoc, IsTopCodeLoc); -} - -event queue::submit_impl_and_postprocess(std::function CGH, - [[maybe_unused]] queue SecondQueue, - const detail::code_location &CodeLoc, - const detail::SubmitPostProcessF &) { - return impl->submit(CGH, CodeLoc, true); -} -event queue::submit_impl_and_postprocess(std::function CGH, - [[maybe_unused]] queue SecondQueue, - const detail::code_location &CodeLoc, - const detail::SubmitPostProcessF &, - bool IsTopCodeLoc) { - return impl->submit(CGH, CodeLoc, IsTopCodeLoc); -} - event queue::submit_with_event_impl(std::function CGH, const detail::SubmissionInfo &SubmitInfo, const detail::code_location &CodeLoc, diff --git a/sycl/test/abi/sycl_symbols_linux.dump b/sycl/test/abi/sycl_symbols_linux.dump index e42759431d374..112a329848409 100644 --- a/sycl/test/abi/sycl_symbols_linux.dump +++ b/sycl/test/abi/sycl_symbols_linux.dump @@ -3183,10 +3183,6 @@ _ZN4sycl3_V15queue25submit_without_event_implERKNS0_6detail19type_erased_cgfo_ty _ZN4sycl3_V15queue25submit_without_event_implESt8functionIFvRNS0_7handlerEEERKNS0_6detail13code_locationE _ZN4sycl3_V15queue25submit_without_event_implESt8functionIFvRNS0_7handlerEEERKNS0_6detail13code_locationEb _ZN4sycl3_V15queue25submit_without_event_implESt8functionIFvRNS0_7handlerEEERKNS0_6detail14SubmissionInfoERKNS7_13code_locationEb -_ZN4sycl3_V15queue27submit_impl_and_postprocessESt8functionIFvRNS0_7handlerEEERKNS0_6detail13code_locationERKS2_IFvbbRNS0_5eventEEE -_ZN4sycl3_V15queue27submit_impl_and_postprocessESt8functionIFvRNS0_7handlerEEERKNS0_6detail13code_locationERKS2_IFvbbRNS0_5eventEEEb -_ZN4sycl3_V15queue27submit_impl_and_postprocessESt8functionIFvRNS0_7handlerEEES1_RKNS0_6detail13code_locationERKS2_IFvbbRNS0_5eventEEE -_ZN4sycl3_V15queue27submit_impl_and_postprocessESt8functionIFvRNS0_7handlerEEES1_RKNS0_6detail13code_locationERKS2_IFvbbRNS0_5eventEEEb _ZN4sycl3_V15queue29ext_oneapi_set_external_eventERKNS0_5eventE _ZN4sycl3_V15queue6memcpyEPvPKvmNS0_5eventERKNS0_6detail13code_locationE _ZN4sycl3_V15queue6memcpyEPvPKvmRKNS0_6detail13code_locationE @@ -3289,7 +3285,6 @@ _ZN4sycl3_V16detail13make_platformEmNS0_7backendE _ZN4sycl3_V16detail13select_deviceERKSt8functionIFiRKNS0_6deviceEEE _ZN4sycl3_V16detail13select_deviceERKSt8functionIFiRKNS0_6deviceEEERKNS0_7contextE _ZN4sycl3_V16detail14SubmissionInfo14SecondaryQueueEv -_ZN4sycl3_V16detail14SubmissionInfo17PostProcessorFuncEv _ZN4sycl3_V16detail14SubmissionInfo9EventModeEv _ZN4sycl3_V16detail14SubmissionInfoC1Ev _ZN4sycl3_V16detail14SubmissionInfoC2Ev @@ -3831,7 +3826,6 @@ _ZNK4sycl3_V16detail12buffer_plain15getNativeVectorENS0_7backendE _ZNK4sycl3_V16detail12buffer_plain22get_allocator_internalEv _ZNK4sycl3_V16detail12buffer_plain7getSizeEv _ZNK4sycl3_V16detail14SubmissionInfo14SecondaryQueueEv -_ZNK4sycl3_V16detail14SubmissionInfo17PostProcessorFuncEv _ZNK4sycl3_V16detail14SubmissionInfo9EventModeEv _ZNK4sycl3_V16detail16AccessorBaseHost11getElemSizeEv _ZNK4sycl3_V16detail16AccessorBaseHost11getPropListEv diff --git a/sycl/test/abi/sycl_symbols_windows.dump b/sycl/test/abi/sycl_symbols_windows.dump index 1db98f1b5cf9d..8d0c1a5628a4d 100644 --- a/sycl/test/abi/sycl_symbols_windows.dump +++ b/sycl/test/abi/sycl_symbols_windows.dump @@ -727,10 +727,6 @@ ?GDBMethodsAnchor@UnsampledImageAccessorBaseHost@detail@_V1@sycl@@IEAAXXZ ?GetRangeRoundingSettings@handler@_V1@sycl@@AEAAXAEA_K00@Z ?HasAssociatedAccessor@handler@_V1@sycl@@AEBA_NPEAVAccessorImplHost@detail@23@W4target@access@23@@Z -?PostProcessorFunc@SubmissionInfo@detail@_V1@sycl@@QEAAAEAV?$optional@V?$function@$$A6AX_N0AEAVevent@_V1@sycl@@@Z@std@@@234@XZ -?PostProcessorFunc@SubmissionInfo@detail@_V1@sycl@@QEBAAEBV?$optional@V?$function@$$A6AX_N0AEAVevent@_V1@sycl@@@Z@std@@@234@XZ -?PostProcessorFunc@SubmissionInfo@v1@detail@_V1@sycl@@QEAAAEAV?$optional@V?$function@$$A6AX_N0AEAVevent@_V1@sycl@@@Z@std@@@345@XZ -?PostProcessorFunc@SubmissionInfo@v1@detail@_V1@sycl@@QEBAAEBV?$optional@V?$function@$$A6AX_N0AEAVevent@_V1@sycl@@@Z@std@@@345@XZ ?PushBack@exception_list@_V1@sycl@@AEAAX$$QEAVexception_ptr@std@@@Z ?PushBack@exception_list@_V1@sycl@@AEAAXAEBVexception_ptr@std@@@Z ?RangeRoundingTrace@handler@_V1@sycl@@AEAA_NXZ @@ -4480,10 +4476,6 @@ ?submit_impl@queue@_V1@sycl@@AEAA?AVevent@23@V?$function@$$A6AXAEAVhandler@_V1@sycl@@@Z@std@@AEBUcode_location@detail@23@_N@Z ?submit_impl@queue@_V1@sycl@@AEAA?AVevent@23@V?$function@$$A6AXAEAVhandler@_V1@sycl@@@Z@std@@V123@AEBUcode_location@detail@23@@Z ?submit_impl@queue@_V1@sycl@@AEAA?AVevent@23@V?$function@$$A6AXAEAVhandler@_V1@sycl@@@Z@std@@V123@AEBUcode_location@detail@23@_N@Z -?submit_impl_and_postprocess@queue@_V1@sycl@@AEAA?AVevent@23@V?$function@$$A6AXAEAVhandler@_V1@sycl@@@Z@std@@AEBUcode_location@detail@23@AEBV?$function@$$A6AX_N0AEAVevent@_V1@sycl@@@Z@6@@Z -?submit_impl_and_postprocess@queue@_V1@sycl@@AEAA?AVevent@23@V?$function@$$A6AXAEAVhandler@_V1@sycl@@@Z@std@@AEBUcode_location@detail@23@AEBV?$function@$$A6AX_N0AEAVevent@_V1@sycl@@@Z@6@_N@Z -?submit_impl_and_postprocess@queue@_V1@sycl@@AEAA?AVevent@23@V?$function@$$A6AXAEAVhandler@_V1@sycl@@@Z@std@@V123@AEBUcode_location@detail@23@AEBV?$function@$$A6AX_N0AEAVevent@_V1@sycl@@@Z@6@@Z -?submit_impl_and_postprocess@queue@_V1@sycl@@AEAA?AVevent@23@V?$function@$$A6AXAEAVhandler@_V1@sycl@@@Z@std@@V123@AEBUcode_location@detail@23@AEBV?$function@$$A6AX_N0AEAVevent@_V1@sycl@@@Z@6@_N@Z ?submit_with_event_impl@queue@_V1@sycl@@AEAA?AVevent@23@AEBVtype_erased_cgfo_ty@detail@23@AEBVSubmissionInfo@623@AEBUcode_location@623@_N@Z ?submit_with_event_impl@queue@_V1@sycl@@AEAA?AVevent@23@AEBVtype_erased_cgfo_ty@detail@23@AEBVSubmissionInfo@v1@623@AEBUcode_location@623@_N@Z ?submit_with_event_impl@queue@_V1@sycl@@AEAA?AVevent@23@V?$function@$$A6AXAEAVhandler@_V1@sycl@@@Z@std@@AEBVSubmissionInfo@detail@23@AEBUcode_location@823@_N@Z From 1026f0eae1704df2d6cd3b68039f024da203e99c Mon Sep 17 00:00:00 2001 From: Artur Gainullin Date: Fri, 21 Nov 2025 08:12:42 -0800 Subject: [PATCH 2/4] Remove submission info and redundant submission entry points --- sycl/include/sycl/queue.hpp | 79 -------------------------- sycl/source/queue.cpp | 107 ------------------------------------ 2 files changed, 186 deletions(-) diff --git a/sycl/include/sycl/queue.hpp b/sycl/include/sycl/queue.hpp index 7ecf5210b6c7f..50f404c72718a 100644 --- a/sycl/include/sycl/queue.hpp +++ b/sycl/include/sycl/queue.hpp @@ -85,24 +85,6 @@ void __SYCL_EXPORT submit_kernel_direct_without_event_impl( namespace detail { class queue_impl; -#ifndef __INTEL_PREVIEW_BREAKING_CHANGES -struct SubmissionInfoImpl; - -class __SYCL_EXPORT SubmissionInfo { -public: - SubmissionInfo(); - - std::shared_ptr &SecondaryQueue(); - const std::shared_ptr &SecondaryQueue() const; - - ext::oneapi::experimental::event_mode_enum &EventMode(); - const ext::oneapi::experimental::event_mode_enum &EventMode() const; - -private: - std::shared_ptr impl = nullptr; -}; -#endif - namespace v1 { // This class is a part of the ABI, so it's moved to a separate namespace to @@ -122,18 +104,6 @@ class __SYCL_EXPORT SubmissionInfo { public: SubmissionInfo() {} -#ifndef __INTEL_PREVIEW_BREAKING_CHANGES - SubmissionInfo(const detail::SubmissionInfo &SI) - : MSecondaryQueue(SI.SecondaryQueue()), MEventMode(SI.EventMode()) {} - - std::shared_ptr &SecondaryQueue() { - return MSecondaryQueue; - } - const std::shared_ptr &SecondaryQueue() const { - return MSecondaryQueue; - } -#endif - ext::oneapi::experimental::event_mode_enum &EventMode() { return MEventMode; } const ext::oneapi::experimental::event_mode_enum &EventMode() const { return MEventMode; @@ -3827,55 +3797,6 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase { } } -#ifndef __INTEL_PREVIEW_BREAKING_CHANGES - /// TODO: Unused. Remove these when ABI-break window is open. - /// Not using `type_erased_cgfo_ty` on purpose. - event submit_impl(std::function CGH, - const detail::code_location &CodeLoc); - event submit_impl(std::function CGH, - const detail::code_location &CodeLoc, bool IsTopCodeLoc); - event submit_impl(std::function CGH, queue secondQueue, - const detail::code_location &CodeLoc); - event submit_impl(std::function CGH, queue secondQueue, - const detail::code_location &CodeLoc, bool IsTopCodeLoc); - void submit_without_event_impl(std::function CGH, - const detail::code_location &CodeLoc); - void submit_without_event_impl(std::function CGH, - const detail::code_location &CodeLoc, - bool IsTopCodeLoc); - - // Old version when `std::function` was used in place of - // `std::function`. - event submit_with_event_impl(std::function CGH, - const detail::SubmissionInfo &SubmitInfo, - const detail::code_location &CodeLoc, - bool IsTopCodeLoc); - - void submit_without_event_impl(std::function CGH, - const detail::SubmissionInfo &SubmitInfo, - const detail::code_location &CodeLoc, - bool IsTopCodeLoc); - event submit_with_event_impl(const detail::type_erased_cgfo_ty &CGH, - const detail::SubmissionInfo &SubmitInfo, - const detail::code_location &CodeLoc, - bool IsTopCodeLoc); - void submit_without_event_impl(const detail::type_erased_cgfo_ty &CGH, - const detail::SubmissionInfo &SubmitInfo, - const detail::code_location &CodeLoc, - bool IsTopCodeLoc); - - /// A template-free versions of submit. - event submit_with_event_impl(const detail::type_erased_cgfo_ty &CGH, - const detail::v1::SubmissionInfo &SubmitInfo, - const detail::code_location &CodeLoc, - bool IsTopCodeLoc); - /// A template-free version of submit_without_event. - void submit_without_event_impl(const detail::type_erased_cgfo_ty &CGH, - const detail::v1::SubmissionInfo &SubmitInfo, - const detail::code_location &CodeLoc, - bool IsTopCodeLoc); -#endif // __INTEL_PREVIEW_BREAKING_CHANGES - /// A template-free version of submit as const member function. event submit_with_event_impl(const detail::type_erased_cgfo_ty &CGH, const detail::v1::SubmissionInfo &SubmitInfo, diff --git a/sycl/source/queue.cpp b/sycl/source/queue.cpp index 41220a8e530fe..7ca5aae376d78 100644 --- a/sycl/source/queue.cpp +++ b/sycl/source/queue.cpp @@ -20,32 +20,6 @@ namespace sycl { inline namespace _V1 { -#ifndef __INTEL_PREVIEW_BREAKING_CHANGES -namespace detail { -SubmissionInfo::SubmissionInfo() - : impl{std::make_shared()} {} - -std::shared_ptr &SubmissionInfo::SecondaryQueue() { - return impl->MSecondaryQueue; -} - -const std::shared_ptr & -SubmissionInfo::SecondaryQueue() const { - return impl->MSecondaryQueue; -} - -ext::oneapi::experimental::event_mode_enum &SubmissionInfo::EventMode() { - return impl->MEventMode; -} - -const ext::oneapi::experimental::event_mode_enum & -SubmissionInfo::EventMode() const { - return impl->MEventMode; -} -} // namespace detail - -#endif // __INTEL_PREVIEW_BREAKING_CHANGES - queue::queue(const context &SyclContext, const device_selector &DeviceSelector, const async_handler &AsyncHandler, const property_list &PropList) { const std::vector Devs = SyclContext.get_devices(); @@ -189,87 +163,6 @@ event queue::mem_advise(const void *Ptr, size_t Length, int Advice, /*CallerNeedsEvent=*/true); } -#ifndef __INTEL_PREVIEW_BREAKING_CHANGES -/// TODO: Unused. Remove these when ABI-break window is open. -event queue::submit_impl(std::function CGH, - const detail::code_location &CodeLoc) { - return submit_with_event_impl(std::move(CGH), {}, CodeLoc, true); -} -event queue::submit_impl(std::function CGH, - const detail::code_location &CodeLoc, - bool IsTopCodeLoc) { - return submit_with_event_impl(std::move(CGH), {}, CodeLoc, IsTopCodeLoc); -} - -event queue::submit_impl(std::function CGH, - [[maybe_unused]] queue SecondQueue, - const detail::code_location &CodeLoc) { - return impl->submit(CGH, CodeLoc, true); -} -event queue::submit_impl(std::function CGH, - [[maybe_unused]] queue SecondQueue, - const detail::code_location &CodeLoc, - bool IsTopCodeLoc) { - return impl->submit(CGH, CodeLoc, IsTopCodeLoc); -} - -void queue::submit_without_event_impl(std::function CGH, - const detail::code_location &CodeLoc) { - submit_without_event_impl(std::move(CGH), {}, CodeLoc, true); -} -void queue::submit_without_event_impl(std::function CGH, - const detail::code_location &CodeLoc, - bool IsTopCodeLoc) { - submit_without_event_impl(std::move(CGH), {}, CodeLoc, IsTopCodeLoc); -} - -event queue::submit_with_event_impl(std::function CGH, - const detail::SubmissionInfo &SubmitInfo, - const detail::code_location &CodeLoc, - bool IsTopCodeLoc) { - return impl->submit_with_event(CGH, SubmitInfo, CodeLoc, IsTopCodeLoc); -} - -void queue::submit_without_event_impl(std::function CGH, - const detail::SubmissionInfo &SubmitInfo, - const detail::code_location &CodeLoc, - bool IsTopCodeLoc) { - impl->submit_without_event(CGH, SubmitInfo, CodeLoc, IsTopCodeLoc); -} - -event queue::submit_with_event_impl(const detail::type_erased_cgfo_ty &CGH, - const detail::SubmissionInfo &SubmitInfo, - const detail::code_location &CodeLoc, - bool IsTopCodeLoc) { - detail::v1::SubmissionInfo SI{SubmitInfo}; - return impl->submit_with_event(CGH, SI, CodeLoc, IsTopCodeLoc); -} - -void queue::submit_without_event_impl(const detail::type_erased_cgfo_ty &CGH, - const detail::SubmissionInfo &SubmitInfo, - const detail::code_location &CodeLoc, - bool IsTopCodeLoc) { - detail::v1::SubmissionInfo SI{SubmitInfo}; - impl->submit_without_event(CGH, SI, CodeLoc, IsTopCodeLoc); -} - -event queue::submit_with_event_impl( - const detail::type_erased_cgfo_ty &CGH, - const detail::v1::SubmissionInfo &SubmitInfo, - const detail::code_location &CodeLoc, bool IsTopCodeLoc) { - return std::as_const(*this).submit_with_event_impl(CGH, SubmitInfo, CodeLoc, - IsTopCodeLoc); -} - -void queue::submit_without_event_impl( - const detail::type_erased_cgfo_ty &CGH, - const detail::v1::SubmissionInfo &SubmitInfo, - const detail::code_location &CodeLoc, bool IsTopCodeLoc) { - std::as_const(*this).submit_without_event_impl(CGH, SubmitInfo, CodeLoc, - IsTopCodeLoc); -} -#endif // __INTEL_PREVIEW_BREAKING_CHANGES - event queue::submit_with_event_impl( const detail::type_erased_cgfo_ty &CGH, const detail::v1::SubmissionInfo &SubmitInfo, From 217017e1762d62d5d00fa1f30a265c2f863902ea Mon Sep 17 00:00:00 2001 From: Artur Gainullin Date: Fri, 21 Nov 2025 08:24:16 -0800 Subject: [PATCH 3/4] update symbols --- sycl/test/abi/sycl_symbols_linux.dump | 18 ------------------ sycl/test/abi/sycl_symbols_windows.dump | 25 ------------------------- 2 files changed, 43 deletions(-) diff --git a/sycl/test/abi/sycl_symbols_linux.dump b/sycl/test/abi/sycl_symbols_linux.dump index 112a329848409..311f15bbf97b2 100644 --- a/sycl/test/abi/sycl_symbols_linux.dump +++ b/sycl/test/abi/sycl_symbols_linux.dump @@ -3164,25 +3164,13 @@ _ZN4sycl3_V15queue10mem_adviseEPKvmiNS0_5eventERKNS0_6detail13code_locationE _ZN4sycl3_V15queue10mem_adviseEPKvmiRKNS0_6detail13code_locationE _ZN4sycl3_V15queue10mem_adviseEPKvmiRKSt6vectorINS0_5eventESaIS5_EERKNS0_6detail13code_locationE _ZN4sycl3_V15queue10wait_proxyERKNS0_6detail13code_locationE -_ZN4sycl3_V15queue11submit_implESt8functionIFvRNS0_7handlerEEERKNS0_6detail13code_locationE -_ZN4sycl3_V15queue11submit_implESt8functionIFvRNS0_7handlerEEERKNS0_6detail13code_locationEb -_ZN4sycl3_V15queue11submit_implESt8functionIFvRNS0_7handlerEEES1_RKNS0_6detail13code_locationE -_ZN4sycl3_V15queue11submit_implESt8functionIFvRNS0_7handlerEEES1_RKNS0_6detail13code_locationEb _ZN4sycl3_V15queue15ext_oneapi_prodEv _ZN4sycl3_V15queue18throw_asynchronousEv _ZN4sycl3_V15queue20memcpyToDeviceGlobalEPvPKvbmmRKSt6vectorINS0_5eventESaIS6_EE _ZN4sycl3_V15queue20wait_and_throw_proxyERKNS0_6detail13code_locationE _ZN4sycl3_V15queue22memcpyFromDeviceGlobalEPvPKvbmmRKSt6vectorINS0_5eventESaIS6_EE -_ZN4sycl3_V15queue22submit_with_event_implERKNS0_6detail19type_erased_cgfo_tyERKNS2_14SubmissionInfoERKNS2_13code_locationEb -_ZN4sycl3_V15queue22submit_with_event_implERKNS0_6detail19type_erased_cgfo_tyERKNS2_2v114SubmissionInfoERKNS2_13code_locationEb -_ZN4sycl3_V15queue22submit_with_event_implESt8functionIFvRNS0_7handlerEEERKNS0_6detail14SubmissionInfoERKNS7_13code_locationEb _ZN4sycl3_V15queue25ext_oneapi_submit_barrierERKNS0_6detail13code_locationE _ZN4sycl3_V15queue25ext_oneapi_submit_barrierERKSt6vectorINS0_5eventESaIS3_EERKNS0_6detail13code_locationE -_ZN4sycl3_V15queue25submit_without_event_implERKNS0_6detail19type_erased_cgfo_tyERKNS2_14SubmissionInfoERKNS2_13code_locationEb -_ZN4sycl3_V15queue25submit_without_event_implERKNS0_6detail19type_erased_cgfo_tyERKNS2_2v114SubmissionInfoERKNS2_13code_locationEb -_ZN4sycl3_V15queue25submit_without_event_implESt8functionIFvRNS0_7handlerEEERKNS0_6detail13code_locationE -_ZN4sycl3_V15queue25submit_without_event_implESt8functionIFvRNS0_7handlerEEERKNS0_6detail13code_locationEb -_ZN4sycl3_V15queue25submit_without_event_implESt8functionIFvRNS0_7handlerEEERKNS0_6detail14SubmissionInfoERKNS7_13code_locationEb _ZN4sycl3_V15queue29ext_oneapi_set_external_eventERKNS0_5eventE _ZN4sycl3_V15queue6memcpyEPvPKvmNS0_5eventERKNS0_6detail13code_locationE _ZN4sycl3_V15queue6memcpyEPvPKvmRKNS0_6detail13code_locationE @@ -3284,10 +3272,6 @@ _ZN4sycl3_V16detail13lgamma_r_implEfPi _ZN4sycl3_V16detail13make_platformEmNS0_7backendE _ZN4sycl3_V16detail13select_deviceERKSt8functionIFiRKNS0_6deviceEEE _ZN4sycl3_V16detail13select_deviceERKSt8functionIFiRKNS0_6deviceEEERKNS0_7contextE -_ZN4sycl3_V16detail14SubmissionInfo14SecondaryQueueEv -_ZN4sycl3_V16detail14SubmissionInfo9EventModeEv -_ZN4sycl3_V16detail14SubmissionInfoC1Ev -_ZN4sycl3_V16detail14SubmissionInfoC2Ev _ZN4sycl3_V16detail14addCounterInitERNS0_7handlerERSt10shared_ptrINS1_10queue_implEERS4_IiE _ZN4sycl3_V16detail14getBorderColorENS0_19image_channel_orderE _ZN4sycl3_V16detail14tls_code_loc_t5queryEv @@ -3825,8 +3809,6 @@ _ZNK4sycl3_V16detail12buffer_plain13handleReleaseEv _ZNK4sycl3_V16detail12buffer_plain15getNativeVectorENS0_7backendE _ZNK4sycl3_V16detail12buffer_plain22get_allocator_internalEv _ZNK4sycl3_V16detail12buffer_plain7getSizeEv -_ZNK4sycl3_V16detail14SubmissionInfo14SecondaryQueueEv -_ZNK4sycl3_V16detail14SubmissionInfo9EventModeEv _ZNK4sycl3_V16detail16AccessorBaseHost11getElemSizeEv _ZNK4sycl3_V16detail16AccessorBaseHost11getPropListEv _ZNK4sycl3_V16detail16AccessorBaseHost13isPlaceholderEv diff --git a/sycl/test/abi/sycl_symbols_windows.dump b/sycl/test/abi/sycl_symbols_windows.dump index 8d0c1a5628a4d..646765535afec 100644 --- a/sycl/test/abi/sycl_symbols_windows.dump +++ b/sycl/test/abi/sycl_symbols_windows.dump @@ -313,12 +313,8 @@ ??0SampledImageAccessorBaseHost@detail@_V1@sycl@@QEAA@$$QEAV0123@@Z ??0SampledImageAccessorBaseHost@detail@_V1@sycl@@QEAA@AEBV0123@@Z ??0SampledImageAccessorBaseHost@detail@_V1@sycl@@QEAA@V?$range@$02@23@PEAXHHV?$id@$02@23@W4image_channel_type@23@W4image_channel_order@23@Uimage_sampler@23@AEBVproperty_list@23@@Z -??0SubmissionInfo@detail@_V1@sycl@@QEAA@$$QEAV0123@@Z -??0SubmissionInfo@detail@_V1@sycl@@QEAA@AEBV0123@@Z -??0SubmissionInfo@detail@_V1@sycl@@QEAA@XZ ??0SubmissionInfo@v1@detail@_V1@sycl@@QEAA@$$QEAV01234@@Z ??0SubmissionInfo@v1@detail@_V1@sycl@@QEAA@AEBV01234@@Z -??0SubmissionInfo@v1@detail@_V1@sycl@@QEAA@AEBV0234@@Z ??0SubmissionInfo@v1@detail@_V1@sycl@@QEAA@XZ ??0UnsampledImageAccessorBaseHost@detail@_V1@sycl@@IEAA@AEBV?$shared_ptr@VUnsampledImageAccessorImplHost@detail@_V1@sycl@@@std@@@Z ??0UnsampledImageAccessorBaseHost@detail@_V1@sycl@@QEAA@$$QEAV0123@@Z @@ -517,7 +513,6 @@ ??1LocalAccessorBaseHost@detail@_V1@sycl@@QEAA@XZ ??1SYCLCategory@detail@_V1@sycl@@UEAA@XZ ??1SampledImageAccessorBaseHost@detail@_V1@sycl@@QEAA@XZ -??1SubmissionInfo@detail@_V1@sycl@@QEAA@XZ ??1SubmissionInfo@v1@detail@_V1@sycl@@QEAA@XZ ??1UnsampledImageAccessorBaseHost@detail@_V1@sycl@@QEAA@XZ ??1accelerator_selector@_V1@sycl@@UEAA@XZ @@ -594,8 +589,6 @@ ??4OSUtil@detail@_V1@sycl@@QEAAAEAV0123@AEBV0123@@Z ??4SampledImageAccessorBaseHost@detail@_V1@sycl@@QEAAAEAV0123@$$QEAV0123@@Z ??4SampledImageAccessorBaseHost@detail@_V1@sycl@@QEAAAEAV0123@AEBV0123@@Z -??4SubmissionInfo@detail@_V1@sycl@@QEAAAEAV0123@$$QEAV0123@@Z -??4SubmissionInfo@detail@_V1@sycl@@QEAAAEAV0123@AEBV0123@@Z ??4SubmissionInfo@v1@detail@_V1@sycl@@QEAAAEAV01234@$$QEAV01234@@Z ??4SubmissionInfo@v1@detail@_V1@sycl@@QEAAAEAV01234@AEBV01234@@Z ??4UnsampledImageAccessorBaseHost@detail@_V1@sycl@@QEAAAEAV0123@$$QEAV0123@@Z @@ -719,8 +712,6 @@ ?Clear@exception_list@_V1@sycl@@AEAAXXZ ?DirSep@OSUtil@detail@_V1@sycl@@2QEBDEB ?DisableRangeRounding@handler@_V1@sycl@@AEAA_NXZ -?EventMode@SubmissionInfo@detail@_V1@sycl@@QEAAAEAW4event_mode_enum@experimental@oneapi@ext@34@XZ -?EventMode@SubmissionInfo@detail@_V1@sycl@@QEBAAEBW4event_mode_enum@experimental@oneapi@ext@34@XZ ?EventMode@SubmissionInfo@v1@detail@_V1@sycl@@QEAAAEAW4event_mode_enum@experimental@oneapi@ext@45@XZ ?EventMode@SubmissionInfo@v1@detail@_V1@sycl@@QEBAAEBW4event_mode_enum@experimental@oneapi@ext@45@XZ ?GDBMethodsAnchor@SampledImageAccessorBaseHost@detail@_V1@sycl@@IEAAXXZ @@ -730,10 +721,6 @@ ?PushBack@exception_list@_V1@sycl@@AEAAX$$QEAVexception_ptr@std@@@Z ?PushBack@exception_list@_V1@sycl@@AEAAXAEBVexception_ptr@std@@@Z ?RangeRoundingTrace@handler@_V1@sycl@@AEAA_NXZ -?SecondaryQueue@SubmissionInfo@detail@_V1@sycl@@QEAAAEAV?$shared_ptr@Vqueue_impl@detail@_V1@sycl@@@std@@XZ -?SecondaryQueue@SubmissionInfo@detail@_V1@sycl@@QEBAAEBV?$shared_ptr@Vqueue_impl@detail@_V1@sycl@@@std@@XZ -?SecondaryQueue@SubmissionInfo@v1@detail@_V1@sycl@@QEAAAEAV?$shared_ptr@Vqueue_impl@detail@_V1@sycl@@@std@@XZ -?SecondaryQueue@SubmissionInfo@v1@detail@_V1@sycl@@QEBAAEBV?$shared_ptr@Vqueue_impl@detail@_V1@sycl@@@std@@XZ ?SetHostTask@handler@_V1@sycl@@AEAAX$$QEAV?$function@$$A6AXVinterop_handle@_V1@sycl@@@Z@std@@@Z ?SetHostTask@handler@_V1@sycl@@AEAAX$$QEAV?$function@$$A6AXXZ@std@@@Z ?SetKernelLaunchpropertiesIfNotEmpty@handler@_V1@sycl@@AEAAXAEBU?$PropsHolder@Uwork_group_scratch_size@experimental@oneapi@ext@_V1@sycl@@Ucache_config@2intel@456@Uuse_root_sync_key@23456@Uwork_group_progress_key@23456@Usub_group_progress_key@23456@Uwork_item_progress_key@23456@U?$cluster_size@$00@cuda@23456@U?$cluster_size@$01@cuda@23456@U?$cluster_size@$02@cuda@23456@@kernel_launch_properties_v1@detail@23@@Z @@ -4472,19 +4459,7 @@ ?storeRawArg@handler@_V1@sycl@@AEAAPEAXAEBVraw_kernel_arg@experimental@oneapi@ext@23@@Z ?storeRawArg@handler@_V1@sycl@@AEAAPEAXPEBX_K@Z ?stringifyErrorCode@detail@_V1@sycl@@YAPEBDH@Z -?submit_impl@queue@_V1@sycl@@AEAA?AVevent@23@V?$function@$$A6AXAEAVhandler@_V1@sycl@@@Z@std@@AEBUcode_location@detail@23@@Z -?submit_impl@queue@_V1@sycl@@AEAA?AVevent@23@V?$function@$$A6AXAEAVhandler@_V1@sycl@@@Z@std@@AEBUcode_location@detail@23@_N@Z -?submit_impl@queue@_V1@sycl@@AEAA?AVevent@23@V?$function@$$A6AXAEAVhandler@_V1@sycl@@@Z@std@@V123@AEBUcode_location@detail@23@@Z -?submit_impl@queue@_V1@sycl@@AEAA?AVevent@23@V?$function@$$A6AXAEAVhandler@_V1@sycl@@@Z@std@@V123@AEBUcode_location@detail@23@_N@Z -?submit_with_event_impl@queue@_V1@sycl@@AEAA?AVevent@23@AEBVtype_erased_cgfo_ty@detail@23@AEBVSubmissionInfo@623@AEBUcode_location@623@_N@Z -?submit_with_event_impl@queue@_V1@sycl@@AEAA?AVevent@23@AEBVtype_erased_cgfo_ty@detail@23@AEBVSubmissionInfo@v1@623@AEBUcode_location@623@_N@Z -?submit_with_event_impl@queue@_V1@sycl@@AEAA?AVevent@23@V?$function@$$A6AXAEAVhandler@_V1@sycl@@@Z@std@@AEBVSubmissionInfo@detail@23@AEBUcode_location@823@_N@Z ?submit_with_event_impl@queue@_V1@sycl@@AEBA?AVevent@23@AEBVtype_erased_cgfo_ty@detail@23@AEBVSubmissionInfo@v1@623@AEBUcode_location@623@_N@Z -?submit_without_event_impl@queue@_V1@sycl@@AEAAXAEBVtype_erased_cgfo_ty@detail@23@AEBVSubmissionInfo@523@AEBUcode_location@523@_N@Z -?submit_without_event_impl@queue@_V1@sycl@@AEAAXAEBVtype_erased_cgfo_ty@detail@23@AEBVSubmissionInfo@v1@523@AEBUcode_location@523@_N@Z -?submit_without_event_impl@queue@_V1@sycl@@AEAAXV?$function@$$A6AXAEAVhandler@_V1@sycl@@@Z@std@@AEBUcode_location@detail@23@@Z -?submit_without_event_impl@queue@_V1@sycl@@AEAAXV?$function@$$A6AXAEAVhandler@_V1@sycl@@@Z@std@@AEBUcode_location@detail@23@_N@Z -?submit_without_event_impl@queue@_V1@sycl@@AEAAXV?$function@$$A6AXAEAVhandler@_V1@sycl@@@Z@std@@AEBVSubmissionInfo@detail@23@AEBUcode_location@723@_N@Z ?submit_without_event_impl@queue@_V1@sycl@@AEBAXAEBVtype_erased_cgfo_ty@detail@23@AEBVSubmissionInfo@v1@523@AEBUcode_location@523@_N@Z ?supportsUSMFill2D@handler@_V1@sycl@@AEAA_NXZ ?supportsUSMMemcpy2D@handler@_V1@sycl@@AEAA_NXZ From 8e014e562d3593c1f8897c6b8f2b5aa3484fa7c8 Mon Sep 17 00:00:00 2001 From: "Gainullin, Artur" Date: Mon, 24 Nov 2025 09:31:09 -0800 Subject: [PATCH 4/4] Restore --- sycl/test/abi/sycl_symbols_windows.dump | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sycl/test/abi/sycl_symbols_windows.dump b/sycl/test/abi/sycl_symbols_windows.dump index 24be355e5f461..12352d6cedc1f 100644 --- a/sycl/test/abi/sycl_symbols_windows.dump +++ b/sycl/test/abi/sycl_symbols_windows.dump @@ -4455,6 +4455,8 @@ ?start_fusion@fusion_wrapper@experimental@codeplay@ext@_V1@sycl@@QEAAXXZ ?storeRawArg@handler@_V1@sycl@@AEAAPEAXAEBVraw_kernel_arg@experimental@oneapi@ext@23@@Z ?storeRawArg@handler@_V1@sycl@@AEAAPEAXPEBX_K@Z +?submit_kernel_direct_with_event_impl@_V1@sycl@@YA?AVevent@12@AEBVqueue@12@AEBVnd_range_view@nd_range_view_v1@detail@12@AEAVHostKernelRefBase@712@PEAVDeviceKernelInfo@712@V?$span@$$CBVevent@_V1@sycl@@$0?0@12@AEBU?$PropsHolder@Uwork_group_scratch_size@experimental@oneapi@ext@_V1@sycl@@Ucache_config@2intel@456@Uuse_root_sync_key@23456@Uwork_group_progress_key@23456@Usub_group_progress_key@23456@Uwork_item_progress_key@23456@U?$cluster_size@$00@cuda@23456@U?$cluster_size@$01@cuda@23456@U?$cluster_size@$02@cuda@23456@@kernel_launch_properties_v1@712@AEBUcode_location@712@_N@Z +?submit_kernel_direct_without_event_impl@_V1@sycl@@YAXAEBVqueue@12@AEBVnd_range_view@nd_range_view_v1@detail@12@AEAVHostKernelRefBase@612@PEAVDeviceKernelInfo@612@V?$span@$$CBVevent@_V1@sycl@@$0?0@12@AEBU?$PropsHolder@Uwork_group_scratch_size@experimental@oneapi@ext@_V1@sycl@@Ucache_config@2intel@456@Uuse_root_sync_key@23456@Uwork_group_progress_key@23456@Usub_group_progress_key@23456@Uwork_item_progress_key@23456@U?$cluster_size@$00@cuda@23456@U?$cluster_size@$01@cuda@23456@U?$cluster_size@$02@cuda@23456@@kernel_launch_properties_v1@612@AEBUcode_location@612@_N@Z ?submit_with_event_impl@queue@_V1@sycl@@AEBA?AVevent@23@AEBVtype_erased_cgfo_ty@detail@23@AEBVSubmissionInfo@v1@623@AEBUcode_location@623@_N@Z ?submit_without_event_impl@queue@_V1@sycl@@AEBAXAEBVtype_erased_cgfo_ty@detail@23@AEBVSubmissionInfo@v1@523@AEBUcode_location@523@_N@Z ?supportsUSMFill2D@handler@_V1@sycl@@AEAA_NXZ