From 579d5db3e0988aa9be519234c29b4950f2c6b556 Mon Sep 17 00:00:00 2001 From: Artur Gainullin Date: Thu, 4 Dec 2025 16:54:21 -0800 Subject: [PATCH 01/11] [SYCL][ABI-break] Remove unused get_pointer ABI entry points --- sycl/include/sycl/usm/usm_pointer_info.hpp | 12 +++++------- sycl/source/detail/usm/usm_impl.cpp | 5 ----- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/sycl/include/sycl/usm/usm_pointer_info.hpp b/sycl/include/sycl/usm/usm_pointer_info.hpp index b16c183e71578..4ca94f0d31ade 100644 --- a/sycl/include/sycl/usm/usm_pointer_info.hpp +++ b/sycl/include/sycl/usm/usm_pointer_info.hpp @@ -7,8 +7,10 @@ // ===--------------------------------------------------------------------=== // #pragma once -#include // for __SYCL_EXPORT -#include // for alloc +#include +#include +#include +#include namespace sycl { inline namespace _V1 { @@ -26,13 +28,9 @@ __SYCL_EXPORT usm::alloc get_pointer_type(const void *ptr, context_impl &ctxt); /// /// \param ptr is the USM pointer to query /// \param ctxt is the sycl context the ptr was allocated in -#ifdef __INTEL_PREVIEW_BREAKING_CHANGES inline usm::alloc get_pointer_type(const void *ptr, const context &ctxt) { - return get_pointer_type(ptr, *getSyclObjImpl(ctxt)); + return get_pointer_type(ptr, *detail::getSyclObjImpl(ctxt)); } -#else -__SYCL_EXPORT usm::alloc get_pointer_type(const void *ptr, const context &ctxt); -#endif /// Queries the device against which the pointer was allocated /// Throws an exception with errc::invalid error code if ptr is a host diff --git a/sycl/source/detail/usm/usm_impl.cpp b/sycl/source/detail/usm/usm_impl.cpp index 27e05a2c636b4..486ee62bd9bc4 100644 --- a/sycl/source/detail/usm/usm_impl.cpp +++ b/sycl/source/detail/usm/usm_impl.cpp @@ -576,11 +576,6 @@ alloc get_pointer_type(const void *Ptr, context_impl &Ctxt) { return ResultAlloc; } } // namespace detail -#ifndef __INTEL_PREVIEW_BREAKING_CHANGES -__SYCL_EXPORT alloc get_pointer_type(const void *Ptr, const context &Ctxt) { - return get_pointer_type(Ptr, *getSyclObjImpl(Ctxt)); -} -#endif /// Queries the device against which the pointer was allocated /// From a9673c7eac0fdcad610f00b0912757a316801f5b Mon Sep 17 00:00:00 2001 From: Artur Gainullin Date: Thu, 4 Dec 2025 13:21:36 -0800 Subject: [PATCH 02/11] [SYCL][ABI-break] Remove has_extension with std::string parameter --- sycl/source/backend/opencl.cpp | 23 ---------------------- sycl/test/abi/sycl_abi_neutrality_test.cpp | 4 ---- sycl/test/abi/sycl_symbols_linux.dump | 2 -- 3 files changed, 29 deletions(-) diff --git a/sycl/source/backend/opencl.cpp b/sycl/source/backend/opencl.cpp index 39389791feb7b..bc3359fdfc090 100644 --- a/sycl/source/backend/opencl.cpp +++ b/sycl/source/backend/opencl.cpp @@ -54,29 +54,6 @@ __SYCL_EXPORT bool has_extension(const sycl::device &SyclDevice, std::string::npos; } } // namespace detail - -#ifndef __INTEL_PREVIEW_BREAKING_CHANGES -// Magic combination found by trial and error: -__SYCL_EXPORT -#if _WIN32 -inline -#endif - bool - has_extension(const sycl::device &SyclDevice, - const std::string &Extension) { - return detail::has_extension(SyclDevice, detail::string_view{Extension}); -} -// Magic combination found by trial and error: -__SYCL_EXPORT -#if _WIN32 -inline -#endif - bool - has_extension(const sycl::platform &SyclPlatform, - const std::string &Extension) { - return detail::has_extension(SyclPlatform, detail::string_view{Extension}); -} -#endif } // namespace opencl } // namespace _V1 } // namespace sycl diff --git a/sycl/test/abi/sycl_abi_neutrality_test.cpp b/sycl/test/abi/sycl_abi_neutrality_test.cpp index a6afca7e26cdc..ade1c4671aaa5 100644 --- a/sycl/test/abi/sycl_abi_neutrality_test.cpp +++ b/sycl/test/abi/sycl_abi_neutrality_test.cpp @@ -21,7 +21,3 @@ // https://github.com/intel/llvm/pull/16178 // CHECK:_ZN4sycl3_V13ext5intel12experimental9pipe_base13get_pipe_nameB5cxx11EPKv -// -// https://github.com/intel/llvm/pull/16176 -// CHECK:_ZN4sycl3_V16opencl13has_extensionERKNS0_6deviceERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE -// CHECK:_ZN4sycl3_V16opencl13has_extensionERKNS0_8platformERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE diff --git a/sycl/test/abi/sycl_symbols_linux.dump b/sycl/test/abi/sycl_symbols_linux.dump index 956fb7a053f96..7943cd8d29489 100644 --- a/sycl/test/abi/sycl_symbols_linux.dump +++ b/sycl/test/abi/sycl_symbols_linux.dump @@ -3480,8 +3480,6 @@ _ZN4sycl3_V16native13__divide_implENS0_3vecIfLi3EEES3_ _ZN4sycl3_V16native13__divide_implENS0_3vecIfLi4EEES3_ _ZN4sycl3_V16native13__divide_implENS0_3vecIfLi8EEES3_ _ZN4sycl3_V16native13__divide_implEff -_ZN4sycl3_V16opencl13has_extensionERKNS0_6deviceERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE -_ZN4sycl3_V16opencl13has_extensionERKNS0_8platformERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE _ZN4sycl3_V16opencl6detail13has_extensionERKNS0_6deviceENS0_6detail11string_viewE _ZN4sycl3_V16opencl6detail13has_extensionERKNS0_8platformENS0_6detail11string_viewE _ZN4sycl3_V16streamC1EmmRNS0_7handlerE From 54a7d6abb8021dd47e2d1ea4a67c8112fadd9572 Mon Sep 17 00:00:00 2001 From: Artur Gainullin Date: Fri, 5 Dec 2025 09:06:05 -0800 Subject: [PATCH 03/11] [SYCL][ABI-break] Rename handler method --- sycl/include/sycl/handler.hpp | 7 ++----- sycl/source/handler.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/sycl/include/sycl/handler.hpp b/sycl/include/sycl/handler.hpp index 2217e3cade53b..54537e2f4516b 100644 --- a/sycl/include/sycl/handler.hpp +++ b/sycl/include/sycl/handler.hpp @@ -777,7 +777,7 @@ class __SYCL_EXPORT handler { // If the kernel lambda is callable with a kernel_handler argument, manifest // the associated kernel handler. if constexpr (IsCallableWithKernelHandler) { - getOrInsertHandlerKernelBundlePtr(/*Insert=*/true); + getOrInsertHandlerKernelBundle(/*Insert=*/true); } } @@ -1237,11 +1237,8 @@ class __SYCL_EXPORT handler { void setStateSpecConstSet(); bool isStateExplicitKernelBundle() const; -#ifdef __INTEL_PREVIEW_BREAKING_CHANGES - // Rename to just getOrInsertHandlerKernelBundle -#endif detail::kernel_bundle_impl * - getOrInsertHandlerKernelBundlePtr(bool Insert) const; + getOrInsertHandlerKernelBundle(bool Insert) const; void setHandlerKernelBundle(kernel Kernel); diff --git a/sycl/source/handler.cpp b/sycl/source/handler.cpp index 1cf9b00714471..c571e3637af00 100644 --- a/sycl/source/handler.cpp +++ b/sycl/source/handler.cpp @@ -397,7 +397,7 @@ bool handler::isStateExplicitKernelBundle() const { // returns newly created kernel_bundle if Insert is true // returns nullptr if Insert is false detail::kernel_bundle_impl * -handler::getOrInsertHandlerKernelBundlePtr(bool Insert) const { +handler::getOrInsertHandlerKernelBundle(bool Insert) const { if (impl->MKernelBundle || !Insert) return impl->MKernelBundle.get(); @@ -495,7 +495,7 @@ detail::EventImplPtr handler::finalize() { // If there were uses of set_specialization_constant build the kernel_bundle detail::kernel_bundle_impl *KernelBundleImpPtr = - getOrInsertHandlerKernelBundlePtr(/*Insert=*/false); + getOrInsertHandlerKernelBundle(/*Insert=*/false); if (KernelBundleImpPtr) { // Make sure implicit non-interop kernel bundles have the kernel if (!impl->isStateExplicitKernelBundle() && @@ -872,7 +872,7 @@ void handler::extractArgsAndReqs() { void handler::verifyUsedKernelBundleInternal(detail::string_view KernelName) { detail::kernel_bundle_impl *UsedKernelBundleImplPtr = - getOrInsertHandlerKernelBundlePtr(/*Insert=*/false); + getOrInsertHandlerKernelBundle(/*Insert=*/false); if (!UsedKernelBundleImplPtr) return; @@ -1663,7 +1663,7 @@ void handler::setUserFacingNodeType(ext::oneapi::experimental::node_type Type) { kernel_bundle handler::getKernelBundle() const { detail::kernel_bundle_impl *KernelBundleImplPtr = - getOrInsertHandlerKernelBundlePtr(/*Insert=*/true); + getOrInsertHandlerKernelBundle(/*Insert=*/true); return detail::createSyclObjFromImpl>( *KernelBundleImplPtr); From a83c0eb87f31bd9e1e6431b22faa9bb8bd89650d Mon Sep 17 00:00:00 2001 From: Artur Gainullin Date: Fri, 5 Dec 2025 10:54:48 -0800 Subject: [PATCH 04/11] Remove unused getPluginOpaqueData from ur.hpp --- sycl/include/sycl/detail/ur.hpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sycl/include/sycl/detail/ur.hpp b/sycl/include/sycl/detail/ur.hpp index 1ed65046c0c1b..5b29cb62bcfd3 100644 --- a/sycl/include/sycl/detail/ur.hpp +++ b/sycl/include/sycl/detail/ur.hpp @@ -102,10 +102,6 @@ __SYCL_EXPORT void contextSetExtendedDeleter(const sycl::context &constext, void *user_data); } -// TODO: To be removed as this was only introduced for esimd which was removed. -template -__SYCL_EXPORT void *getPluginOpaqueData(void *opaquedata_arg); - namespace ur { // Function to load a shared library // Implementation is OS dependent From 946018d028433a0d1667891d68c206782828878d Mon Sep 17 00:00:00 2001 From: Artur Gainullin Date: Fri, 5 Dec 2025 10:27:43 -0800 Subject: [PATCH 05/11] [SYCL][ABI-break] Remove unused make_kernel and make_kernel_bundle --- sycl/include/sycl/backend.hpp | 14 ++++---------- sycl/source/backend.cpp | 16 ---------------- 2 files changed, 4 insertions(+), 26 deletions(-) diff --git a/sycl/include/sycl/backend.hpp b/sycl/include/sycl/backend.hpp index 0721a8bfc3abc..0f7c8bb792bed 100644 --- a/sycl/include/sycl/backend.hpp +++ b/sycl/include/sycl/backend.hpp @@ -272,18 +272,10 @@ __SYCL_EXPORT event make_event(ur_native_handle_t NativeHandle, __SYCL_EXPORT event make_event(ur_native_handle_t NativeHandle, const context &TargetContext, bool KeepOwnership, backend Backend); -// TODO: Unused. Remove when allowed. -__SYCL_EXPORT kernel make_kernel(ur_native_handle_t NativeHandle, - const context &TargetContext, backend Backend); __SYCL_EXPORT kernel make_kernel( const context &TargetContext, const kernel_bundle &KernelBundle, ur_native_handle_t NativeKernelHandle, bool KeepOwnership, backend Backend); -// TODO: Unused. Remove when allowed. -__SYCL_EXPORT std::shared_ptr -make_kernel_bundle(ur_native_handle_t NativeHandle, - const context &TargetContext, bundle_state State, - backend Backend); __SYCL_EXPORT std::shared_ptr make_kernel_bundle(ur_native_handle_t NativeHandle, const context &TargetContext, bool KeepOwnership, @@ -403,8 +395,10 @@ make_kernel(const typename backend_traits::template input_type &BackendObject, const context &TargetContext) { return detail::make_kernel( - detail::ur::cast(BackendObject), TargetContext, - Backend); + TargetContext, + detail::get_empty_interop_kernel_bundle( + TargetContext), + detail::ur::cast(BackendObject), false, Backend); } template diff --git a/sycl/source/backend.cpp b/sycl/source/backend.cpp index 304d5c8cce436..71eb6e0222e04 100644 --- a/sycl/source/backend.cpp +++ b/sycl/source/backend.cpp @@ -309,14 +309,6 @@ make_kernel_bundle(ur_native_handle_t NativeHandle, std::move(UrProgram), ImageOriginInterop)}); } -// TODO: Unused. Remove when allowed. -std::shared_ptr -make_kernel_bundle(ur_native_handle_t NativeHandle, - const context &TargetContext, bundle_state State, - backend Backend) { - return make_kernel_bundle(NativeHandle, TargetContext, false, State, Backend); -} - kernel make_kernel(const context &TargetContext, const kernel_bundle &KernelBundle, ur_native_handle_t NativeHandle, bool KeepOwnership, @@ -363,14 +355,6 @@ kernel make_kernel(const context &TargetContext, std::move(UrKernel), ContextImpl, &KernelBundleImpl)); } -kernel make_kernel(ur_native_handle_t NativeHandle, - const context &TargetContext, backend Backend) { - return make_kernel( - TargetContext, - get_empty_interop_kernel_bundle(TargetContext), - NativeHandle, false, Backend); -} - } // namespace detail } // namespace _V1 } // namespace sycl From 14a037a861d0c8fda0531da6885e35f355cfd955 Mon Sep 17 00:00:00 2001 From: Artur Gainullin Date: Tue, 2 Dec 2025 12:48:51 -0800 Subject: [PATCH 06/11] [SYCL][ABI-break] Cleanup get native API --- sycl/include/sycl/kernel_bundle.hpp | 5 ----- sycl/include/sycl/queue.hpp | 9 --------- 2 files changed, 14 deletions(-) diff --git a/sycl/include/sycl/kernel_bundle.hpp b/sycl/include/sycl/kernel_bundle.hpp index b4af63c854b08..9e8619b3d9ed0 100644 --- a/sycl/include/sycl/kernel_bundle.hpp +++ b/sycl/include/sycl/kernel_bundle.hpp @@ -115,13 +115,8 @@ class __SYCL_EXPORT device_image_plain { bool has_kernel(const kernel_id &KernelID, const device &Dev) const noexcept; -#ifndef __INTEL_PREVIEW_BREAKING_CHANGES - ur_native_handle_t getNative() const; -#endif protected: -#ifdef __INTEL_PREVIEW_BREAKING_CHANGES ur_native_handle_t getNative() const; -#endif std::shared_ptr impl; diff --git a/sycl/include/sycl/queue.hpp b/sycl/include/sycl/queue.hpp index 6032ed720f628..c8b10f08b60ab 100644 --- a/sycl/include/sycl/queue.hpp +++ b/sycl/include/sycl/queue.hpp @@ -3719,13 +3719,6 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase { bool khr_empty() const; #endif -#ifndef __INTEL_PREVIEW_BREAKING_CHANGES - // TODO: to be made private in the next ABI-breaking window - __SYCL_DEPRECATED( - "This is a non-standard method, use sycl::get_native instead") - ur_native_handle_t getNative(int32_t &NativeHandleDesc) const; -#endif - std::optional ext_oneapi_get_last_event() const { return static_cast>(ext_oneapi_get_last_event_impl()); } @@ -3733,9 +3726,7 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase { void ext_oneapi_set_external_event(const event &external_event); private: -#ifdef __INTEL_PREVIEW_BREAKING_CHANGES ur_native_handle_t getNative(int32_t &NativeHandleDesc) const; -#endif std::shared_ptr impl; queue(std::shared_ptr impl) : impl(impl) {} From 2a25ef458afcf9b0989d4ba238e3074e92441a5a Mon Sep 17 00:00:00 2001 From: Artur Gainullin Date: Thu, 4 Dec 2025 17:02:22 -0800 Subject: [PATCH 07/11] [SYCL] Remove unspecified typ and unused helper --- sycl/include/sycl/ext/oneapi/bfloat16.hpp | 6 ------ sycl/source/detail/helpers.cpp | 8 -------- 2 files changed, 14 deletions(-) diff --git a/sycl/include/sycl/ext/oneapi/bfloat16.hpp b/sycl/include/sycl/ext/oneapi/bfloat16.hpp index cbbf9cf94532a..dd514739596d3 100644 --- a/sycl/include/sycl/ext/oneapi/bfloat16.hpp +++ b/sycl/include/sycl/ext/oneapi/bfloat16.hpp @@ -21,12 +21,6 @@ namespace ext::oneapi { class bfloat16 { public: -#ifndef __INTEL_PREVIEW_BREAKING_CHANGES - using Bfloat16StorageT - __SYCL_DEPRECATED("bfloat16::Bfloat16StorageT is non-standard and has " - "been deprecated.") = uint16_t; -#endif - bfloat16() = default; ~bfloat16() = default; constexpr bfloat16(const bfloat16 &) = default; diff --git a/sycl/source/detail/helpers.cpp b/sycl/source/detail/helpers.cpp index 680cd01c6305d..09655575771ba 100644 --- a/sycl/source/detail/helpers.cpp +++ b/sycl/source/detail/helpers.cpp @@ -25,14 +25,6 @@ namespace sycl { inline namespace _V1 { namespace detail { -#ifndef __INTEL_PREVIEW_BREAKING_CHANGES -// Unused, only keeping for ABI compatibility reasons. -__SYCL_EXPORT void waitEvents(std::vector DepEvents) { - for (auto SyclEvent : DepEvents) { - detail::getSyclObjImpl(SyclEvent)->waitInternal(); - } -} -#endif const RTDeviceBinaryImage *retrieveKernelBinary(queue_impl &Queue, std::string_view KernelName, From 205d3de840d04db8851215d063a1ed005a9f372a Mon Sep 17 00:00:00 2001 From: Artur Gainullin Date: Thu, 4 Dec 2025 16:59:43 -0800 Subject: [PATCH 08/11] [SYCL] Remove queue data members and entry points --- sycl/include/sycl/queue.hpp | 25 ++++++------------------- sycl/source/detail/queue_impl.cpp | 4 ++-- sycl/source/detail/queue_impl.hpp | 23 +++-------------------- sycl/source/queue.cpp | 11 ++--------- 4 files changed, 13 insertions(+), 50 deletions(-) diff --git a/sycl/include/sycl/queue.hpp b/sycl/include/sycl/queue.hpp index c8b10f08b60ab..7ad0ee8276483 100644 --- a/sycl/include/sycl/queue.hpp +++ b/sycl/include/sycl/queue.hpp @@ -98,7 +98,7 @@ void __SYCL_EXPORT submit_graph_direct_without_event_impl( namespace detail { class queue_impl; -namespace v1 { +inline namespace _V1 { // This class is a part of the ABI, so it's moved to a separate namespace to // simplify changes. @@ -110,9 +110,6 @@ namespace v1 { // overloaded with a new variant using v(N+1) namespace, // * old namespace vN should be moved under #ifndef // __INTEL_PREVIEW_BREAKING_CHANGES guard. -// TODO: inline namespace can be employed here after SubmissionInfo removed from -// the enclosing scope. - class __SYCL_EXPORT SubmissionInfo { public: SubmissionInfo() {} @@ -123,9 +120,6 @@ class __SYCL_EXPORT SubmissionInfo { } private: -#ifndef __INTEL_PREVIEW_BREAKING_CHANGES - std::shared_ptr MSecondaryQueue = nullptr; -#endif ext::oneapi::experimental::event_mode_enum MEventMode = ext::oneapi::experimental::event_mode_enum::none; }; @@ -513,13 +507,6 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase { typename detail::is_backend_info_desc::return_type get_backend_info() const; -#ifndef __INTEL_PREVIEW_BREAKING_CHANGES -private: - // A shorthand for `get_device().has()' which is expected to be a bit quicker - // than the long version - bool device_has(aspect Aspect) const; -#endif - public: /// Submits a command group function object to the queue, in order to be /// scheduled for execution on the device. @@ -3751,7 +3738,7 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase { template void ProcessSubmitProperties(PropertiesT Props, - detail::v1::SubmissionInfo &SI) const { + detail::SubmissionInfo &SI) const { if constexpr (Props.template has_property< ext::oneapi::experimental::event_mode_key>()) { ext::oneapi::experimental::event_mode EventModeProp = @@ -3764,13 +3751,13 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase { /// 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, + const detail::SubmissionInfo &SubmitInfo, const detail::code_location &CodeLoc, bool IsTopCodeLoc) const; /// A template-free version of submit_without_event as const member function. void submit_without_event_impl(const detail::type_erased_cgfo_ty &CGH, - const detail::v1::SubmissionInfo &SubmitInfo, + const detail::SubmissionInfo &SubmitInfo, const detail::code_location &CodeLoc, bool IsTopCodeLoc) const; @@ -3788,7 +3775,7 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase { const detail::code_location &CodeLoc = detail::code_location::current()) const { detail::tls_code_loc_t TlsCodeLocCapture(CodeLoc); - detail::v1::SubmissionInfo SI{}; + detail::SubmissionInfo SI{}; ProcessSubmitProperties(Props, SI); return submit_with_event_impl(CGF, SI, TlsCodeLocCapture.query(), TlsCodeLocCapture.isToplevel()); @@ -3806,7 +3793,7 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase { const detail::type_erased_cgfo_ty &CGF, const detail::code_location &CodeLoc) const { detail::tls_code_loc_t TlsCodeLocCapture(CodeLoc); - detail::v1::SubmissionInfo SI{}; + detail::SubmissionInfo SI{}; ProcessSubmitProperties(Props, SI); submit_without_event_impl(CGF, SI, TlsCodeLocCapture.query(), TlsCodeLocCapture.isToplevel()); diff --git a/sycl/source/detail/queue_impl.cpp b/sycl/source/detail/queue_impl.cpp index 746554cd91a97..50fd63b05b291 100644 --- a/sycl/source/detail/queue_impl.cpp +++ b/sycl/source/detail/queue_impl.cpp @@ -298,7 +298,7 @@ detail::EventImplPtr queue_impl::submit_impl(const detail::type_erased_cgfo_ty &CGF, bool CallerNeedsEvent, const detail::code_location &Loc, bool IsTopCodeLoc, - const v1::SubmissionInfo &SubmitInfo) { + const detail::SubmissionInfo &SubmitInfo) { detail::handler_impl HandlerImplVal(*this, CallerNeedsEvent); handler Handler(HandlerImplVal); @@ -722,7 +722,7 @@ template event queue_impl::submitWithHandler(const std::vector &DepEvents, bool CallerNeedsEvent, HandlerFuncT HandlerFunc) { - v1::SubmissionInfo SI{}; + detail::SubmissionInfo SI{}; auto L = [&](handler &CGH) { CGH.depends_on(DepEvents); HandlerFunc(CGH); diff --git a/sycl/source/detail/queue_impl.hpp b/sycl/source/detail/queue_impl.hpp index a9b2f217f37d3..da606acfdc0f4 100644 --- a/sycl/source/detail/queue_impl.hpp +++ b/sycl/source/detail/queue_impl.hpp @@ -64,9 +64,6 @@ enum QueueOrder { Ordered, OOO }; // Implementation of the submission information storage. struct SubmissionInfoImpl { -#ifndef __INTEL_PREVIEW_BREAKING_CHANGES - std::shared_ptr MSecondaryQueue = nullptr; -#endif ext::oneapi::experimental::event_mode_enum MEventMode = ext::oneapi::experimental::event_mode_enum::none; }; @@ -287,12 +284,6 @@ class queue_impl : public std::enable_shared_from_this { adapter_impl &getAdapter() const { return MContext->getAdapter(); } -#ifndef __INTEL_PREVIEW_BREAKING_CHANGES - const std::shared_ptr &getContextImplPtr() const { - return MContext; - } -#endif - context_impl &getContextImpl() const { return *MContext; } std::weak_ptr getContextImplWeakPtr() const { return MContext; } @@ -352,7 +343,7 @@ class queue_impl : public std::enable_shared_from_this { /// \param StoreAdditionalInfo makes additional info be stored in event_impl /// \return a SYCL event object for the submitted command group. event submit_with_event(const detail::type_erased_cgfo_ty &CGF, - const v1::SubmissionInfo &SubmitInfo, + const detail::SubmissionInfo &SubmitInfo, const detail::code_location &Loc, bool IsTopCodeLoc) { detail::EventImplPtr ResEvent = submit_impl(CGF, /*CallerNeedsEvent=*/true, @@ -404,7 +395,7 @@ class queue_impl : public std::enable_shared_from_this { } void submit_without_event(const detail::type_erased_cgfo_ty &CGF, - const v1::SubmissionInfo &SubmitInfo, + const detail::SubmissionInfo &SubmitInfo, const detail::code_location &Loc, bool IsTopCodeLoc) { submit_impl(CGF, /*CallerNeedsEvent=*/false, Loc, IsTopCodeLoc, SubmitInfo); @@ -898,7 +889,7 @@ class queue_impl : public std::enable_shared_from_this { bool CallerNeedsEvent, const detail::code_location &Loc, bool IsTopCodeLoc, - const v1::SubmissionInfo &SubmitInfo); + const detail::SubmissionInfo &SubmitInfo); /// Performs kernel submission to the queue. /// @@ -1105,14 +1096,6 @@ class queue_impl : public std::enable_shared_from_this { // recording commands to it. std::weak_ptr MGraph{}; -#ifndef __INTEL_PREVIEW_BREAKING_CHANGES - // CMPLRLLVM-66082 - // This member should be part of the sycl::interop_handle class, but it - // is an API breaking change. So member lives here temporarily where it can - // be accessed through the queue member of the interop_handle - ur_exp_command_buffer_handle_t MInteropGraph{}; -#endif - unsigned long long MQueueID; static std::atomic MNextAvailableQueueID; diff --git a/sycl/source/queue.cpp b/sycl/source/queue.cpp index 550fdba176868..cd7d445396946 100644 --- a/sycl/source/queue.cpp +++ b/sycl/source/queue.cpp @@ -165,14 +165,14 @@ event queue::mem_advise(const void *Ptr, size_t Length, int Advice, event queue::submit_with_event_impl( const detail::type_erased_cgfo_ty &CGH, - const detail::v1::SubmissionInfo &SubmitInfo, + const detail::SubmissionInfo &SubmitInfo, const detail::code_location &CodeLoc, bool IsTopCodeLoc) const { return impl->submit_with_event(CGH, SubmitInfo, CodeLoc, IsTopCodeLoc); } void queue::submit_without_event_impl( const detail::type_erased_cgfo_ty &CGH, - const detail::v1::SubmissionInfo &SubmitInfo, + const detail::SubmissionInfo &SubmitInfo, const detail::code_location &CodeLoc, bool IsTopCodeLoc) const { impl->submit_without_event(CGH, SubmitInfo, CodeLoc, IsTopCodeLoc); } @@ -277,13 +277,6 @@ event queue::memcpyFromDeviceGlobal(void *Dest, const void *DeviceGlobalPtr, /*CallerNeedsEvent=*/true); } -#ifndef __INTEL_PREVIEW_BREAKING_CHANGES -bool queue::device_has(aspect Aspect) const { - // avoid creating sycl object from impl - return impl->getDeviceImpl().has(Aspect); -} -#endif - sycl::detail::optional queue::ext_oneapi_get_last_event_impl() const { if (!is_in_order()) throw sycl::exception( From da97e15ef41635eeb34ad37c7a121c30990d9cd4 Mon Sep 17 00:00:00 2001 From: Artur Gainullin Date: Thu, 4 Dec 2025 16:50:33 -0800 Subject: [PATCH 09/11] [SYCL] DeviceKernelInfo related breaking changes --- sycl/source/detail/global_handler.hpp | 10 ---------- sycl/source/handler.cpp | 7 ------- 2 files changed, 17 deletions(-) diff --git a/sycl/source/detail/global_handler.hpp b/sycl/source/detail/global_handler.hpp index c7306d5b19519..0b73f18b8f18a 100644 --- a/sycl/source/detail/global_handler.hpp +++ b/sycl/source/detail/global_handler.hpp @@ -11,9 +11,6 @@ #include #include -#ifndef __INTEL_PREVIEW_BREAKING_CHANGES -#include -#endif #include #include @@ -29,10 +26,6 @@ class adapter_impl; class ods_target_list; class XPTIRegistry; class ThreadPool; -#ifndef __INTEL_PREVIEW_BREAKING_CHANGES -struct KernelNameBasedCacheT; -class DeviceKernelInfo; -#endif /// Wrapper class for global data structures with non-trivial destructors. /// @@ -130,9 +123,6 @@ class GlobalHandler { InstWithLock MXPTIRegistry; // Thread pool for host task and event callbacks execution InstWithLock MHostTaskThreadPool; -#ifndef __INTEL_PREVIEW_BREAKING_CHANGES - InstWithLock> MDeviceKernelInfoStorage; -#endif static GlobalHandler *RTGlobalObjHandler; }; diff --git a/sycl/source/handler.cpp b/sycl/source/handler.cpp index c571e3637af00..5e3ca043a9031 100644 --- a/sycl/source/handler.cpp +++ b/sycl/source/handler.cpp @@ -859,13 +859,6 @@ void handler::setArgHelper(int ArgIndex, stream &&Str) { void handler::extractArgsAndReqs() { assert(MKernel && "MKernel is not initialized"); -#ifndef __INTEL_PREVIEW_BREAKING_CHANGES - if (impl->MKernelData.getDeviceKernelInfoPtr() == nullptr) { - impl->MKernelData.setDeviceKernelInfoPtr( - &detail::ProgramManager::getInstance().getOrCreateDeviceKernelInfo( - std::string_view(MKernel->getName()))); - } -#endif assert(impl->MKernelData.getDeviceKernelInfoPtr() != nullptr); impl->MKernelData.extractArgsAndReqs(MKernel->isCreatedFromSource()); } From 1cd5591c3dac4c020512f50e2966111e345be43c Mon Sep 17 00:00:00 2001 From: Artur Gainullin Date: Fri, 5 Dec 2025 13:10:34 -0800 Subject: [PATCH 10/11] Update test --- sycl/test/abi/sycl_symbols_linux.dump | 11 +++------ sycl/test/abi/sycl_symbols_windows.dump | 30 +++++++++---------------- 2 files changed, 13 insertions(+), 28 deletions(-) diff --git a/sycl/test/abi/sycl_symbols_linux.dump b/sycl/test/abi/sycl_symbols_linux.dump index 7943cd8d29489..485e7fcae0b15 100644 --- a/sycl/test/abi/sycl_symbols_linux.dump +++ b/sycl/test/abi/sycl_symbols_linux.dump @@ -2830,7 +2830,6 @@ _ZN4sycl3_V116__remainder_implENS0_3vecIfLi8EEES2_ _ZN4sycl3_V116__remainder_implENS0_6detail9half_impl4halfES3_ _ZN4sycl3_V116__remainder_implEdd _ZN4sycl3_V116__remainder_implEff -_ZN4sycl3_V116get_pointer_typeEPKvRKNS0_7contextE _ZN4sycl3_V117__isnotequal_implENS0_3vecINS0_6detail9half_impl4halfELi16EEES5_ _ZN4sycl3_V117__isnotequal_implENS0_3vecINS0_6detail9half_impl4halfELi1EEES5_ _ZN4sycl3_V117__isnotequal_implENS0_3vecINS0_6detail9half_impl4halfELi2EEES5_ @@ -3195,7 +3194,6 @@ _ZN4sycl3_V16detail10frexp_implEfPi _ZN4sycl3_V16detail10make_eventEmRKNS0_7contextENS0_7backendE _ZN4sycl3_V16detail10make_eventEmRKNS0_7contextEbNS0_7backendE _ZN4sycl3_V16detail10make_queueEmiRKNS0_7contextEPKNS0_6deviceEbRKNS0_13property_listERKSt8functionIFvNS0_14exception_listEEENS0_7backendE -_ZN4sycl3_V16detail10waitEventsESt6vectorINS0_5eventESaIS3_EE _ZN4sycl3_V16detail11image_plain14set_write_backEb _ZN4sycl3_V16detail11image_plain23set_final_data_internalERKSt8functionIFvRKS3_IFvPvEEEE _ZN4sycl3_V16detail11image_plain23set_final_data_internalEv @@ -3231,7 +3229,6 @@ _ZN4sycl3_V16detail11image_plainC2ERKSt10shared_ptrIKvENS0_19image_channel_order _ZN4sycl3_V16detail11image_plainC2EmRKNS0_7contextENS0_5eventESt10unique_ptrINS1_19SYCLMemObjAllocatorESt14default_deleteIS8_EEhNS0_19image_channel_orderENS0_18image_channel_typeEbNS0_5rangeILi3EEE _ZN4sycl3_V16detail11make_deviceEmNS0_7backendE _ZN4sycl3_V16detail11make_kernelERKNS0_7contextERKNS0_13kernel_bundleILNS0_12bundle_stateE2EEEmbNS0_7backendE -_ZN4sycl3_V16detail11make_kernelEmRKNS0_7contextENS0_7backendE _ZN4sycl3_V16detail11remquo_implENS1_9half_impl4halfES3_Pi _ZN4sycl3_V16detail11remquo_implEddPi _ZN4sycl3_V16detail11remquo_implEffPi @@ -3293,7 +3290,6 @@ _ZN4sycl3_V16detail17HostProfilingInfo5startEv _ZN4sycl3_V16detail17device_global_map3addEPKvPKc _ZN4sycl3_V16detail17reduComputeWGSizeEmmRm _ZN4sycl3_V16detail18get_kernel_id_implENS1_11string_viewE -_ZN4sycl3_V16detail18make_kernel_bundleEmRKNS0_7contextENS0_12bundle_stateENS0_7backendE _ZN4sycl3_V16detail18make_kernel_bundleEmRKNS0_7contextEbNS0_12bundle_stateENS0_7backendE _ZN4sycl3_V16detail19getDeviceKernelInfoERKNS1_27compile_time_kernel_info_v123CompileTimeKernelInfoTyE _ZN4sycl3_V16detail19kernel_bundle_plain21ext_oneapi_get_kernelENS1_11string_viewE @@ -3673,7 +3669,6 @@ _ZNK4sycl3_V15event8get_infoINS0_4info5event24command_execution_statusEEENS0_6de _ZNK4sycl3_V15event9getNativeEv _ZNK4sycl3_V15eventeqERKS1_ _ZNK4sycl3_V15eventneERKS1_ -_ZNK4sycl3_V15queue10device_hasENS0_6aspectE _ZNK4sycl3_V15queue10get_deviceEv _ZNK4sycl3_V15queue11getPropListEv _ZNK4sycl3_V15queue11get_backendEv @@ -3682,8 +3677,8 @@ _ZNK4sycl3_V15queue11is_in_orderEv _ZNK4sycl3_V15queue16ext_oneapi_emptyEv _ZNK4sycl3_V15queue20ext_oneapi_get_graphEv _ZNK4sycl3_V15queue20ext_oneapi_get_stateEv -_ZNK4sycl3_V15queue22submit_with_event_implERKNS0_6detail19type_erased_cgfo_tyERKNS2_2v114SubmissionInfoERKNS2_13code_locationEb -_ZNK4sycl3_V15queue25submit_without_event_implERKNS0_6detail19type_erased_cgfo_tyERKNS2_2v114SubmissionInfoERKNS2_13code_locationEb +_ZNK4sycl3_V15queue22submit_with_event_implERKNS0_6detail19type_erased_cgfo_tyERKNS2_3_V114SubmissionInfoERKNS2_13code_locationEb +_ZNK4sycl3_V15queue25submit_without_event_implERKNS0_6detail19type_erased_cgfo_tyERKNS2_3_V114SubmissionInfoERKNS2_13code_locationEb _ZNK4sycl3_V15queue30ext_oneapi_get_last_event_implEv _ZNK4sycl3_V15queue3getEv _ZNK4sycl3_V15queue8get_infoINS0_4info5queue15reference_countEEENS0_6detail18is_queue_info_descIT_E11return_typeEv @@ -3995,7 +3990,7 @@ _ZNK4sycl3_V17handler15getKernelBundleEv _ZNK4sycl3_V17handler16getDeviceBackendEv _ZNK4sycl3_V17handler21HasAssociatedAccessorEPNS0_6detail16AccessorImplHostENS0_6access6targetE _ZNK4sycl3_V17handler27isStateExplicitKernelBundleEv -_ZNK4sycl3_V17handler33getOrInsertHandlerKernelBundlePtrEb +_ZNK4sycl3_V17handler30getOrInsertHandlerKernelBundleEb _ZNK4sycl3_V17handler7getTypeEv _ZNK4sycl3_V17sampler11getPropListEv _ZNK4sycl3_V17sampler18get_filtering_modeEv diff --git a/sycl/test/abi/sycl_symbols_windows.dump b/sycl/test/abi/sycl_symbols_windows.dump index 505ea8f7dfa3b..3c68f29686914 100644 --- a/sycl/test/abi/sycl_symbols_windows.dump +++ b/sycl/test/abi/sycl_symbols_windows.dump @@ -247,9 +247,7 @@ ??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@v1@detail@_V1@sycl@@QEAA@$$QEAV01234@@Z -??0SubmissionInfo@v1@detail@_V1@sycl@@QEAA@AEBV01234@@Z -??0SubmissionInfo@v1@detail@_V1@sycl@@QEAA@XZ +??0SubmissionInfo@_V1@detail@1sycl@@QEAA@XZ ??0UnsampledImageAccessorBaseHost@detail@_V1@sycl@@IEAA@AEBV?$shared_ptr@VUnsampledImageAccessorImplHost@detail@_V1@sycl@@@std@@@Z ??0UnsampledImageAccessorBaseHost@detail@_V1@sycl@@QEAA@$$QEAV0123@@Z ??0UnsampledImageAccessorBaseHost@detail@_V1@sycl@@QEAA@AEBV0123@@Z @@ -438,7 +436,6 @@ ??1LocalAccessorBaseHost@detail@_V1@sycl@@QEAA@XZ ??1SYCLCategory@detail@_V1@sycl@@UEAA@XZ ??1SampledImageAccessorBaseHost@detail@_V1@sycl@@QEAA@XZ -??1SubmissionInfo@v1@detail@_V1@sycl@@QEAA@XZ ??1UnsampledImageAccessorBaseHost@detail@_V1@sycl@@QEAA@XZ ??1accelerator_selector@_V1@sycl@@UEAA@XZ ??1buffer_plain@detail@_V1@sycl@@QEAA@XZ @@ -513,8 +510,8 @@ ??4OSUtil@detail@_V1@sycl@@QEAAAEAV0123@AEBV0123@@Z ??4SampledImageAccessorBaseHost@detail@_V1@sycl@@QEAAAEAV0123@$$QEAV0123@@Z ??4SampledImageAccessorBaseHost@detail@_V1@sycl@@QEAAAEAV0123@AEBV0123@@Z -??4SubmissionInfo@v1@detail@_V1@sycl@@QEAAAEAV01234@$$QEAV01234@@Z -??4SubmissionInfo@v1@detail@_V1@sycl@@QEAAAEAV01234@AEBV01234@@Z +??4SubmissionInfo@_V1@detail@1sycl@@QEAAAEAV01213@$$QEAV01213@@Z +??4SubmissionInfo@_V1@detail@1sycl@@QEAAAEAV01213@AEBV01213@@Z ??4UnsampledImageAccessorBaseHost@detail@_V1@sycl@@QEAAAEAV0123@$$QEAV0123@@Z ??4UnsampledImageAccessorBaseHost@detail@_V1@sycl@@QEAAAEAV0123@AEBV0123@@Z ??4accelerator_selector@_V1@sycl@@QEAAAEAV012@$$QEAV012@@Z @@ -633,8 +630,8 @@ ?Clear@exception_list@_V1@sycl@@AEAAXXZ ?DirSep@OSUtil@detail@_V1@sycl@@2QEBDEB ?DisableRangeRounding@handler@_V1@sycl@@AEAA_NXZ -?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 +?EventMode@SubmissionInfo@_V1@detail@2sycl@@QEAAAEAW4event_mode_enum@experimental@oneapi@ext@24@XZ +?EventMode@SubmissionInfo@_V1@detail@2sycl@@QEBAAEBW4event_mode_enum@experimental@oneapi@ext@24@XZ ?GDBMethodsAnchor@SampledImageAccessorBaseHost@detail@_V1@sycl@@IEAAXXZ ?GDBMethodsAnchor@UnsampledImageAccessorBaseHost@detail@_V1@sycl@@IEAAXXZ ?GetRangeRoundingSettings@handler@_V1@sycl@@AEAAXAEA_K00@Z @@ -3769,7 +3766,6 @@ ?destroy_image_handle@experimental@oneapi@ext@_V1@sycl@@YAXAEAUsampled_image_handle@12345@AEBVqueue@45@@Z ?destroy_image_handle@experimental@oneapi@ext@_V1@sycl@@YAXAEAUunsampled_image_handle@12345@AEBVdevice@45@AEBVcontext@45@@Z ?destroy_image_handle@experimental@oneapi@ext@_V1@sycl@@YAXAEAUunsampled_image_handle@12345@AEBVqueue@45@@Z -?device_has@queue@_V1@sycl@@AEBA_NW4aspect@23@@Z ?empty@kernel_bundle_plain@detail@_V1@sycl@@QEBA_NXZ ?enable_ext_oneapi_default_context@detail@_V1@sycl@@YAX_N@Z ?end@HostProfilingInfo@detail@_V1@sycl@@QEAAXXZ @@ -3985,11 +3981,11 @@ ?getMemoryRange@AccessorBaseHost@detail@_V1@sycl@@QEBAAEBV?$range@$02@34@XZ ?getNative@context@_V1@sycl@@AEBA_KXZ ?getNative@device@_V1@sycl@@AEBA_KXZ -?getNative@device_image_plain@detail@_V1@sycl@@QEBA_KXZ +?getNative@device_image_plain@detail@_V1@sycl@@IEBA_KXZ ?getNative@event@_V1@sycl@@AEBA_KXZ ?getNative@kernel@_V1@sycl@@AEBA_KXZ ?getNative@platform@_V1@sycl@@AEBA_KXZ -?getNative@queue@_V1@sycl@@QEBA_KAEAH@Z +?getNative@queue@_V1@sycl@@AEBA_KAEAH@Z ?getNativeContext@interop_handle@_V1@sycl@@AEBA_KXZ ?getNativeDevice@interop_handle@_V1@sycl@@AEBA_KXZ ?getNativeGraph@interop_handle@_V1@sycl@@AEBA_KXZ @@ -4004,7 +4000,7 @@ ?getOSMemSize@OSUtil@detail@_V1@sycl@@SA_KXZ ?getOffset@AccessorBaseHost@detail@_V1@sycl@@QEAAAEAV?$id@$02@34@XZ ?getOffset@AccessorBaseHost@detail@_V1@sycl@@QEBAAEBV?$id@$02@34@XZ -?getOrInsertHandlerKernelBundlePtr@handler@_V1@sycl@@AEBAPEAVkernel_bundle_impl@detail@23@_N@Z +?getOrInsertHandlerKernelBundle@handler@_V1@sycl@@AEBAPEAVkernel_bundle_impl@detail@23@_N@Z ?getPitch@SampledImageAccessorBaseHost@detail@_V1@sycl@@QEBA?AV?$id@$02@34@XZ ?getPitch@UnsampledImageAccessorBaseHost@detail@_V1@sycl@@QEBA?AV?$id@$02@34@XZ ?getPixelCoordLinearFiltMode@detail@_V1@sycl@@YA?AV?$vec@H$07@23@V?$vec@M$03@23@W4addressing_mode@23@V?$range@$02@23@AEAV523@@Z @@ -4114,7 +4110,6 @@ ?get_platform@device@_V1@sycl@@QEBA?AVplatform@23@XZ ?get_platforms@platform@_V1@sycl@@SA?AV?$vector@Vplatform@_V1@sycl@@V?$allocator@Vplatform@_V1@sycl@@@std@@@std@@XZ ?get_pointer_device@_V1@sycl@@YA?AVdevice@12@PEBXAEBVcontext@12@@Z -?get_pointer_type@_V1@sycl@@YA?AW4alloc@usm@12@PEBXAEBVcontext@12@@Z ?get_pointer_type@detail@_V1@sycl@@YA?AW4alloc@usm@23@PEBXAEAVcontext_impl@123@@Z ?get_precision@stream@_V1@sycl@@QEBA_KXZ ?get_predecessors@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 @@ -4144,8 +4139,6 @@ ?has_extension@detail@opencl@_V1@sycl@@YA_NAEBVplatform@34@Vstring_view@134@@Z ?has_extension@device@_V1@sycl@@AEBA_NVstring_view@detail@23@@Z ?has_extension@device@_V1@sycl@@QEBA_NAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z -?has_extension@opencl@_V1@sycl@@YA_NAEBVdevice@23@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z -?has_extension@opencl@_V1@sycl@@YA_NAEBVplatform@23@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z ?has_extension@platform@_V1@sycl@@AEBA_NVstring_view@detail@23@@Z ?has_extension@platform@_V1@sycl@@QEBA_NAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z ?has_kernel@device_image_plain@detail@_V1@sycl@@QEBA_NAEBVkernel_id@34@@Z @@ -4194,8 +4187,6 @@ ?make_event@detail@_V1@sycl@@YA?AVevent@23@_KAEBVcontext@23@W4backend@23@@Z ?make_event@detail@_V1@sycl@@YA?AVevent@23@_KAEBVcontext@23@_NW4backend@23@@Z ?make_kernel@detail@_V1@sycl@@YA?AVkernel@23@AEBVcontext@23@AEBV?$kernel_bundle@$01@23@_K_NW4backend@23@@Z -?make_kernel@detail@_V1@sycl@@YA?AVkernel@23@_KAEBVcontext@23@W4backend@23@@Z -?make_kernel_bundle@detail@_V1@sycl@@YA?AV?$shared_ptr@Vkernel_bundle_impl@detail@_V1@sycl@@@std@@_KAEBVcontext@23@W4bundle_state@23@W4backend@23@@Z ?make_kernel_bundle@detail@_V1@sycl@@YA?AV?$shared_ptr@Vkernel_bundle_impl@detail@_V1@sycl@@@std@@_KAEBVcontext@23@_NW4bundle_state@23@W4backend@23@@Z ?make_kernel_bundle_from_source@detail@experimental@oneapi@ext@_V1@sycl@@YA?AV?$kernel_bundle@$02@56@AEBVcontext@56@W4source_language@23456@AEBV?$vector@W4byte@std@@V?$allocator@W4byte@std@@@2@@std@@V?$vector@U?$pair@Vstring_view@detail@_V1@sycl@@V1234@@std@@V?$allocator@U?$pair@Vstring_view@detail@_V1@sycl@@V1234@@std@@@2@@std@@@Z ?make_kernel_bundle_from_source@detail@experimental@oneapi@ext@_V1@sycl@@YA?AV?$kernel_bundle@$02@56@AEBVcontext@56@W4source_language@23456@Vstring_view@156@V?$vector@U?$pair@Vstring_view@detail@_V1@sycl@@V1234@@std@@V?$allocator@U?$pair@Vstring_view@detail@_V1@sycl@@V1234@@std@@@2@@std@@@Z @@ -4352,8 +4343,8 @@ ?submit_graph_direct_without_event_impl@_V1@sycl@@YAXAEBVqueue@12@AEAV?$command_graph@$00@experimental@oneapi@ext@12@V?$span@$$CBVevent@_V1@sycl@@$0?0@12@AEBUcode_location@detail@12@@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 +?submit_with_event_impl@queue@_V1@sycl@@AEBA?AVevent@23@AEBVtype_erased_cgfo_ty@detail@23@AEBVSubmissionInfo@2623@AEBUcode_location@623@_N@Z +?submit_without_event_impl@queue@_V1@sycl@@AEBAXAEBVtype_erased_cgfo_ty@detail@23@AEBVSubmissionInfo@2523@AEBUcode_location@523@_N@Z ?supportsUSMFill2D@handler@_V1@sycl@@AEAA_NXZ ?supportsUSMMemcpy2D@handler@_V1@sycl@@AEAA_NXZ ?supportsUSMMemset2D@handler@_V1@sycl@@AEAA_NXZ @@ -4384,7 +4375,6 @@ ?wait@event@_V1@sycl@@QEAAXXZ ?wait@event@_V1@sycl@@SAXAEBV?$vector@Vevent@_V1@sycl@@V?$allocator@Vevent@_V1@sycl@@@std@@@std@@@Z ?wait@queue@_V1@sycl@@QEAAXAEBUcode_location@detail@23@@Z -?waitEvents@detail@_V1@sycl@@YAXV?$vector@Vevent@_V1@sycl@@V?$allocator@Vevent@_V1@sycl@@@std@@@std@@@Z ?wait_and_throw@event@_V1@sycl@@QEAAXXZ ?wait_and_throw@event@_V1@sycl@@SAXAEBV?$vector@Vevent@_V1@sycl@@V?$allocator@Vevent@_V1@sycl@@@std@@@std@@@Z ?wait_and_throw@queue@_V1@sycl@@QEAAXAEBUcode_location@detail@23@@Z From cca7337bd3c361f6bbfa0d7678b96d64e845fcb5 Mon Sep 17 00:00:00 2001 From: Artur Gainullin Date: Fri, 5 Dec 2025 13:37:22 -0800 Subject: [PATCH 11/11] Format --- sycl/include/sycl/handler.hpp | 3 +-- sycl/include/sycl/queue.hpp | 2 +- sycl/source/queue.cpp | 16 ++++++++-------- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/sycl/include/sycl/handler.hpp b/sycl/include/sycl/handler.hpp index 54537e2f4516b..bd28418611760 100644 --- a/sycl/include/sycl/handler.hpp +++ b/sycl/include/sycl/handler.hpp @@ -1237,8 +1237,7 @@ class __SYCL_EXPORT handler { void setStateSpecConstSet(); bool isStateExplicitKernelBundle() const; - detail::kernel_bundle_impl * - getOrInsertHandlerKernelBundle(bool Insert) const; + detail::kernel_bundle_impl *getOrInsertHandlerKernelBundle(bool Insert) const; void setHandlerKernelBundle(kernel Kernel); diff --git a/sycl/include/sycl/queue.hpp b/sycl/include/sycl/queue.hpp index 7ad0ee8276483..9aa5fe0197604 100644 --- a/sycl/include/sycl/queue.hpp +++ b/sycl/include/sycl/queue.hpp @@ -124,7 +124,7 @@ class __SYCL_EXPORT SubmissionInfo { ext::oneapi::experimental::event_mode_enum::none; }; -} // namespace v1 +} // namespace _V1 template submit_with_event(CGH, SubmitInfo, 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) const { +void queue::submit_without_event_impl(const detail::type_erased_cgfo_ty &CGH, + const detail::SubmissionInfo &SubmitInfo, + const detail::code_location &CodeLoc, + bool IsTopCodeLoc) const { impl->submit_without_event(CGH, SubmitInfo, CodeLoc, IsTopCodeLoc); }