Skip to content

[SYCL] Cleanup queue's submission ABI entry points #20675

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: sycl
Choose a base branch
from
+0 −322
Open

[SYCL] Cleanup queue's submission ABI entry points #20675

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b41aa6d
[SYCL] Remove fallback assertion ABI entry points
againull Nov 17, 2025
1026f0e
Remove submission info and redundant submission entry points
againull Nov 21, 2025
217017e
update symbols
againull Nov 21, 2025
da98eaa
Merge remote-tracking branch 'origin/sycl' into abi/submission_info
againull Nov 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 0 additions & 35 deletions sycl/include/sycl/queue.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,17 +86,12 @@ namespace detail {
class queue_impl;

#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
Copy link
Contributor

@aelovikov-intel aelovikov-intel Nov 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMO, the scope of this PR should be bigger and remove entire non-preview SubmissionInfo. But if others disagree I won't insist.

Copy link
Contributor

@slawekptak slawekptak Nov 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@againull I would leave it up to you to decide.

using SubmitPostProcessF = std::function<void(bool, bool, event &)>;

struct SubmissionInfoImpl;

class __SYCL_EXPORT SubmissionInfo {
public:
SubmissionInfo();

sycl::detail::optional<SubmitPostProcessF> &PostProcessorFunc();
const sycl::detail::optional<SubmitPostProcessF> &PostProcessorFunc() const;

std::shared_ptr<detail::queue_impl> &SecondaryQueue();
const std::shared_ptr<detail::queue_impl> &SecondaryQueue() const;

Expand Down Expand Up @@ -131,13 +126,6 @@ class __SYCL_EXPORT SubmissionInfo {
SubmissionInfo(const detail::SubmissionInfo &SI)
: MSecondaryQueue(SI.SecondaryQueue()), MEventMode(SI.EventMode()) {}

sycl::detail::optional<SubmitPostProcessF> &PostProcessorFunc() {
return MPostProcessorFunc;
}
const sycl::detail::optional<SubmitPostProcessF> &PostProcessorFunc() const {
return MPostProcessorFunc;
}

std::shared_ptr<detail::queue_impl> &SecondaryQueue() {
return MSecondaryQueue;
}
Expand All @@ -153,7 +141,6 @@ class __SYCL_EXPORT SubmissionInfo {

private:
#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
optional<detail::SubmitPostProcessF> MPostProcessorFunc = std::nullopt;
std::shared_ptr<detail::queue_impl> MSecondaryQueue = nullptr;
#endif
ext::oneapi::experimental::event_mode_enum MEventMode =
Expand Down Expand Up @@ -3856,22 +3843,6 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase<queue> {
void submit_without_event_impl(std::function<void(handler &)> CGH,
const detail::code_location &CodeLoc,
bool IsTopCodeLoc);
event
submit_impl_and_postprocess(std::function<void(handler &)> CGH,
const detail::code_location &CodeLoc,
const detail::SubmitPostProcessF &PostProcess);
event submit_impl_and_postprocess(
std::function<void(handler &)> CGH, const detail::code_location &CodeLoc,
const detail::SubmitPostProcessF &PostProcess, bool IsTopCodeLoc);
event
submit_impl_and_postprocess(std::function<void(handler &)> CGH,
queue secondQueue,
const detail::code_location &CodeLoc,
const detail::SubmitPostProcessF &PostProcess);
event submit_impl_and_postprocess(
std::function<void(handler &)> 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<void(handler &)>`.
Expand Down Expand Up @@ -3925,9 +3896,6 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase<queue> {
/// \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 <typename PropertiesT>
event submit_with_event(PropertiesT Props,
const detail::type_erased_cgfo_ty &CGF,
Expand All @@ -3947,9 +3915,6 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase<queue> {
/// \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 <typename PropertiesT>
void submit_without_event(PropertiesT Props,
const detail::type_erased_cgfo_ty &CGF,
Expand Down
9 changes: 0 additions & 9 deletions sycl/source/detail/device_kernel_info.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,23 +74,14 @@ void DeviceKernelInfo::setCompileTimeInfoIfNeeded(
}

FastKernelSubcacheT &DeviceKernelInfo::getKernelSubcache() {
assertInitialized();
return MFastKernelSubcache;
}

const std::optional<int> &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
42 changes: 0 additions & 42 deletions sycl/source/queue.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,21 +25,6 @@ namespace detail {
SubmissionInfo::SubmissionInfo()
: impl{std::make_shared<SubmissionInfoImpl>()} {}

optional<SubmitPostProcessF> &SubmissionInfo::PostProcessorFunc() {
// No longer in use, but needs to be exposed for use in SYCL programs built
// with the old headers.
static optional<SubmitPostProcessF> DoNotUsePostProcessorFunc;
return DoNotUsePostProcessorFunc;
}

const optional<SubmitPostProcessF> &SubmissionInfo::PostProcessorFunc() const {
// No longer in use, but needs to be exposed for use in SYCL programs built
// with the old headers.
static optional<SubmitPostProcessF> DoNotUsePostProcessorFunc;
return DoNotUsePostProcessorFunc;
}

#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
std::shared_ptr<detail::queue_impl> &SubmissionInfo::SecondaryQueue() {
return impl->MSecondaryQueue;
}
Expand All @@ -48,7 +33,6 @@ const std::shared_ptr<detail::queue_impl> &
SubmissionInfo::SecondaryQueue() const {
return impl->MSecondaryQueue;
}
#endif

ext::oneapi::experimental::event_mode_enum &SubmissionInfo::EventMode() {
return impl->MEventMode;
Expand Down Expand Up @@ -239,32 +223,6 @@ void queue::submit_without_event_impl(std::function<void(handler &)> CGH,
submit_without_event_impl(std::move(CGH), {}, CodeLoc, IsTopCodeLoc);
}

event queue::submit_impl_and_postprocess(std::function<void(handler &)> 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<void(handler &)> 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<void(handler &)> 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<void(handler &)> 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<void(handler &)> CGH,
const detail::SubmissionInfo &SubmitInfo,
const detail::code_location &CodeLoc,
Expand Down
6 changes: 0 additions & 6 deletions sycl/test/abi/sycl_symbols_linux.dump
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
8 changes: 0 additions & 8 deletions sycl/test/abi/sycl_symbols_windows.dump
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading