Skip to content

Commit b765a2e

Browse files
againullagainull
authored
[SYCL] Cleanup queue's submission ABI entry points (#20675)
1 parent aed079a commit b765a2e

File tree

4 files changed

+0
-320
lines changed

4 files changed

+0
-320
lines changed

‎sycl/include/sycl/queue.hpp‎

Lines changed: 0 additions & 114 deletions
Original file line numberDiff line numberDiff line change
@@ -84,29 +84,6 @@ void __SYCL_EXPORT submit_kernel_direct_without_event_impl(
8484
namespace detail {
8585
class queue_impl;
8686

87-
#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
88-
using SubmitPostProcessF = std::function<void(bool, bool, event &)>;
89-
90-
struct SubmissionInfoImpl;
91-
92-
class __SYCL_EXPORT SubmissionInfo {
93-
public:
94-
SubmissionInfo();
95-
96-
sycl::detail::optional<SubmitPostProcessF> &PostProcessorFunc();
97-
const sycl::detail::optional<SubmitPostProcessF> &PostProcessorFunc() const;
98-
99-
std::shared_ptr<detail::queue_impl> &SecondaryQueue();
100-
const std::shared_ptr<detail::queue_impl> &SecondaryQueue() const;
101-
102-
ext::oneapi::experimental::event_mode_enum &EventMode();
103-
const ext::oneapi::experimental::event_mode_enum &EventMode() const;
104-
105-
private:
106-
std::shared_ptr<SubmissionInfoImpl> impl = nullptr;
107-
};
108-
#endif
109-
11087
namespace v1 {
11188

11289
// This class is a part of the ABI, so it's moved to a separate namespace to
@@ -126,33 +103,13 @@ class __SYCL_EXPORT SubmissionInfo {
126103
public:
127104
SubmissionInfo() {}
128105

129-
#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
130-
SubmissionInfo(const detail::SubmissionInfo &SI)
131-
: MSecondaryQueue(SI.SecondaryQueue()), MEventMode(SI.EventMode()) {}
132-
133-
sycl::detail::optional<SubmitPostProcessF> &PostProcessorFunc() {
134-
return MPostProcessorFunc;
135-
}
136-
const sycl::detail::optional<SubmitPostProcessF> &PostProcessorFunc() const {
137-
return MPostProcessorFunc;
138-
}
139-
140-
std::shared_ptr<detail::queue_impl> &SecondaryQueue() {
141-
return MSecondaryQueue;
142-
}
143-
const std::shared_ptr<detail::queue_impl> &SecondaryQueue() const {
144-
return MSecondaryQueue;
145-
}
146-
#endif
147-
148106
ext::oneapi::experimental::event_mode_enum &EventMode() { return MEventMode; }
149107
const ext::oneapi::experimental::event_mode_enum &EventMode() const {
150108
return MEventMode;
151109
}
152110

153111
private:
154112
#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
155-
optional<detail::SubmitPostProcessF> MPostProcessorFunc = std::nullopt;
156113
std::shared_ptr<detail::queue_impl> MSecondaryQueue = nullptr;
157114
#endif
158115
ext::oneapi::experimental::event_mode_enum MEventMode =
@@ -3828,71 +3785,6 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase<queue> {
38283785
}
38293786
}
38303787

3831-
#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
3832-
/// TODO: Unused. Remove these when ABI-break window is open.
3833-
/// Not using `type_erased_cgfo_ty` on purpose.
3834-
event submit_impl(std::function<void(handler &)> CGH,
3835-
const detail::code_location &CodeLoc);
3836-
event submit_impl(std::function<void(handler &)> CGH,
3837-
const detail::code_location &CodeLoc, bool IsTopCodeLoc);
3838-
event submit_impl(std::function<void(handler &)> CGH, queue secondQueue,
3839-
const detail::code_location &CodeLoc);
3840-
event submit_impl(std::function<void(handler &)> CGH, queue secondQueue,
3841-
const detail::code_location &CodeLoc, bool IsTopCodeLoc);
3842-
void submit_without_event_impl(std::function<void(handler &)> CGH,
3843-
const detail::code_location &CodeLoc);
3844-
void submit_without_event_impl(std::function<void(handler &)> CGH,
3845-
const detail::code_location &CodeLoc,
3846-
bool IsTopCodeLoc);
3847-
event
3848-
submit_impl_and_postprocess(std::function<void(handler &)> CGH,
3849-
const detail::code_location &CodeLoc,
3850-
const detail::SubmitPostProcessF &PostProcess);
3851-
event submit_impl_and_postprocess(
3852-
std::function<void(handler &)> CGH, const detail::code_location &CodeLoc,
3853-
const detail::SubmitPostProcessF &PostProcess, bool IsTopCodeLoc);
3854-
event
3855-
submit_impl_and_postprocess(std::function<void(handler &)> CGH,
3856-
queue secondQueue,
3857-
const detail::code_location &CodeLoc,
3858-
const detail::SubmitPostProcessF &PostProcess);
3859-
event submit_impl_and_postprocess(
3860-
std::function<void(handler &)> CGH, queue secondQueue,
3861-
const detail::code_location &CodeLoc,
3862-
const detail::SubmitPostProcessF &PostProcess, bool IsTopCodeLoc);
3863-
3864-
// Old version when `std::function` was used in place of
3865-
// `std::function<void(handler &)>`.
3866-
event submit_with_event_impl(std::function<void(handler &)> CGH,
3867-
const detail::SubmissionInfo &SubmitInfo,
3868-
const detail::code_location &CodeLoc,
3869-
bool IsTopCodeLoc);
3870-
3871-
void submit_without_event_impl(std::function<void(handler &)> CGH,
3872-
const detail::SubmissionInfo &SubmitInfo,
3873-
const detail::code_location &CodeLoc,
3874-
bool IsTopCodeLoc);
3875-
event submit_with_event_impl(const detail::type_erased_cgfo_ty &CGH,
3876-
const detail::SubmissionInfo &SubmitInfo,
3877-
const detail::code_location &CodeLoc,
3878-
bool IsTopCodeLoc);
3879-
void submit_without_event_impl(const detail::type_erased_cgfo_ty &CGH,
3880-
const detail::SubmissionInfo &SubmitInfo,
3881-
const detail::code_location &CodeLoc,
3882-
bool IsTopCodeLoc);
3883-
3884-
/// A template-free versions of submit.
3885-
event submit_with_event_impl(const detail::type_erased_cgfo_ty &CGH,
3886-
const detail::v1::SubmissionInfo &SubmitInfo,
3887-
const detail::code_location &CodeLoc,
3888-
bool IsTopCodeLoc);
3889-
/// A template-free version of submit_without_event.
3890-
void submit_without_event_impl(const detail::type_erased_cgfo_ty &CGH,
3891-
const detail::v1::SubmissionInfo &SubmitInfo,
3892-
const detail::code_location &CodeLoc,
3893-
bool IsTopCodeLoc);
3894-
#endif // __INTEL_PREVIEW_BREAKING_CHANGES
3895-
38963788
/// A template-free version of submit as const member function.
38973789
event submit_with_event_impl(const detail::type_erased_cgfo_ty &CGH,
38983790
const detail::v1::SubmissionInfo &SubmitInfo,
@@ -3913,9 +3805,6 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase<queue> {
39133805
/// \param CodeLoc is the code location of the submit call (default argument)
39143806
/// \return a SYCL event object for the submitted command group.
39153807
//
3916-
// UseFallBackAssert as template param vs `#if` in function body is necessary
3917-
// to prevent ODR-violation between TUs built with different fallback assert
3918-
// modes.
39193808
template <typename PropertiesT>
39203809
event submit_with_event(PropertiesT Props,
39213810
const detail::type_erased_cgfo_ty &CGF,
@@ -3935,9 +3824,6 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase<queue> {
39353824
/// \param CGF is a function object containing command group.
39363825
/// \param CodeLoc is the code location of the submit call (default argument)
39373826
//
3938-
// UseFallBackAssert as template param vs `#if` in function body is necessary
3939-
// to prevent ODR-violation between TUs built with different fallback assert
3940-
// modes.
39413827
template <typename PropertiesT>
39423828
void submit_without_event(PropertiesT Props,
39433829
const detail::type_erased_cgfo_ty &CGF,

‎sycl/source/queue.cpp‎

Lines changed: 0 additions & 149 deletions
Original file line numberDiff line numberDiff line change
@@ -20,48 +20,6 @@
2020
namespace sycl {
2121
inline namespace _V1 {
2222

23-
#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
24-
namespace detail {
25-
SubmissionInfo::SubmissionInfo()
26-
: impl{std::make_shared<SubmissionInfoImpl>()} {}
27-
28-
optional<SubmitPostProcessF> &SubmissionInfo::PostProcessorFunc() {
29-
// No longer in use, but needs to be exposed for use in SYCL programs built
30-
// with the old headers.
31-
static optional<SubmitPostProcessF> DoNotUsePostProcessorFunc;
32-
return DoNotUsePostProcessorFunc;
33-
}
34-
35-
const optional<SubmitPostProcessF> &SubmissionInfo::PostProcessorFunc() const {
36-
// No longer in use, but needs to be exposed for use in SYCL programs built
37-
// with the old headers.
38-
static optional<SubmitPostProcessF> DoNotUsePostProcessorFunc;
39-
return DoNotUsePostProcessorFunc;
40-
}
41-
42-
#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
43-
std::shared_ptr<detail::queue_impl> &SubmissionInfo::SecondaryQueue() {
44-
return impl->MSecondaryQueue;
45-
}
46-
47-
const std::shared_ptr<detail::queue_impl> &
48-
SubmissionInfo::SecondaryQueue() const {
49-
return impl->MSecondaryQueue;
50-
}
51-
#endif
52-
53-
ext::oneapi::experimental::event_mode_enum &SubmissionInfo::EventMode() {
54-
return impl->MEventMode;
55-
}
56-
57-
const ext::oneapi::experimental::event_mode_enum &
58-
SubmissionInfo::EventMode() const {
59-
return impl->MEventMode;
60-
}
61-
} // namespace detail
62-
63-
#endif // __INTEL_PREVIEW_BREAKING_CHANGES
64-
6523
queue::queue(const context &SyclContext, const device_selector &DeviceSelector,
6624
const async_handler &AsyncHandler, const property_list &PropList) {
6725
const std::vector<device> Devs = SyclContext.get_devices();
@@ -205,113 +163,6 @@ event queue::mem_advise(const void *Ptr, size_t Length, int Advice,
205163
/*CallerNeedsEvent=*/true);
206164
}
207165

208-
#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
209-
/// TODO: Unused. Remove these when ABI-break window is open.
210-
event queue::submit_impl(std::function<void(handler &)> CGH,
211-
const detail::code_location &CodeLoc) {
212-
return submit_with_event_impl(std::move(CGH), {}, CodeLoc, true);
213-
}
214-
event queue::submit_impl(std::function<void(handler &)> CGH,
215-
const detail::code_location &CodeLoc,
216-
bool IsTopCodeLoc) {
217-
return submit_with_event_impl(std::move(CGH), {}, CodeLoc, IsTopCodeLoc);
218-
}
219-
220-
event queue::submit_impl(std::function<void(handler &)> CGH,
221-
[[maybe_unused]] queue SecondQueue,
222-
const detail::code_location &CodeLoc) {
223-
return impl->submit(CGH, CodeLoc, true);
224-
}
225-
event queue::submit_impl(std::function<void(handler &)> CGH,
226-
[[maybe_unused]] queue SecondQueue,
227-
const detail::code_location &CodeLoc,
228-
bool IsTopCodeLoc) {
229-
return impl->submit(CGH, CodeLoc, IsTopCodeLoc);
230-
}
231-
232-
void queue::submit_without_event_impl(std::function<void(handler &)> CGH,
233-
const detail::code_location &CodeLoc) {
234-
submit_without_event_impl(std::move(CGH), {}, CodeLoc, true);
235-
}
236-
void queue::submit_without_event_impl(std::function<void(handler &)> CGH,
237-
const detail::code_location &CodeLoc,
238-
bool IsTopCodeLoc) {
239-
submit_without_event_impl(std::move(CGH), {}, CodeLoc, IsTopCodeLoc);
240-
}
241-
242-
event queue::submit_impl_and_postprocess(std::function<void(handler &)> CGH,
243-
const detail::code_location &CodeLoc,
244-
const detail::SubmitPostProcessF &) {
245-
return submit_with_event_impl(std::move(CGH), {}, CodeLoc, true);
246-
}
247-
event queue::submit_impl_and_postprocess(std::function<void(handler &)> CGH,
248-
const detail::code_location &CodeLoc,
249-
const detail::SubmitPostProcessF &,
250-
bool IsTopCodeLoc) {
251-
return submit_with_event_impl(std::move(CGH), {}, CodeLoc, IsTopCodeLoc);
252-
}
253-
254-
event queue::submit_impl_and_postprocess(std::function<void(handler &)> CGH,
255-
[[maybe_unused]] queue SecondQueue,
256-
const detail::code_location &CodeLoc,
257-
const detail::SubmitPostProcessF &) {
258-
return impl->submit(CGH, CodeLoc, true);
259-
}
260-
event queue::submit_impl_and_postprocess(std::function<void(handler &)> CGH,
261-
[[maybe_unused]] queue SecondQueue,
262-
const detail::code_location &CodeLoc,
263-
const detail::SubmitPostProcessF &,
264-
bool IsTopCodeLoc) {
265-
return impl->submit(CGH, CodeLoc, IsTopCodeLoc);
266-
}
267-
268-
event queue::submit_with_event_impl(std::function<void(handler &)> CGH,
269-
const detail::SubmissionInfo &SubmitInfo,
270-
const detail::code_location &CodeLoc,
271-
bool IsTopCodeLoc) {
272-
return impl->submit_with_event(CGH, SubmitInfo, CodeLoc, IsTopCodeLoc);
273-
}
274-
275-
void queue::submit_without_event_impl(std::function<void(handler &)> CGH,
276-
const detail::SubmissionInfo &SubmitInfo,
277-
const detail::code_location &CodeLoc,
278-
bool IsTopCodeLoc) {
279-
impl->submit_without_event(CGH, SubmitInfo, CodeLoc, IsTopCodeLoc);
280-
}
281-
282-
event queue::submit_with_event_impl(const detail::type_erased_cgfo_ty &CGH,
283-
const detail::SubmissionInfo &SubmitInfo,
284-
const detail::code_location &CodeLoc,
285-
bool IsTopCodeLoc) {
286-
detail::v1::SubmissionInfo SI{SubmitInfo};
287-
return impl->submit_with_event(CGH, SI, CodeLoc, IsTopCodeLoc);
288-
}
289-
290-
void queue::submit_without_event_impl(const detail::type_erased_cgfo_ty &CGH,
291-
const detail::SubmissionInfo &SubmitInfo,
292-
const detail::code_location &CodeLoc,
293-
bool IsTopCodeLoc) {
294-
detail::v1::SubmissionInfo SI{SubmitInfo};
295-
impl->submit_without_event(CGH, SI, CodeLoc, IsTopCodeLoc);
296-
}
297-
298-
event queue::submit_with_event_impl(
299-
const detail::type_erased_cgfo_ty &CGH,
300-
const detail::v1::SubmissionInfo &SubmitInfo,
301-
const detail::code_location &CodeLoc, bool IsTopCodeLoc) {
302-
return std::as_const(*this).submit_with_event_impl(CGH, SubmitInfo, CodeLoc,
303-
IsTopCodeLoc);
304-
}
305-
306-
void queue::submit_without_event_impl(
307-
const detail::type_erased_cgfo_ty &CGH,
308-
const detail::v1::SubmissionInfo &SubmitInfo,
309-
const detail::code_location &CodeLoc, bool IsTopCodeLoc) {
310-
std::as_const(*this).submit_without_event_impl(CGH, SubmitInfo, CodeLoc,
311-
IsTopCodeLoc);
312-
}
313-
#endif // __INTEL_PREVIEW_BREAKING_CHANGES
314-
315166
event queue::submit_with_event_impl(
316167
const detail::type_erased_cgfo_ty &CGH,
317168
const detail::v1::SubmissionInfo &SubmitInfo,

‎sycl/test/abi/sycl_symbols_linux.dump‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3163,29 +3163,13 @@ _ZN4sycl3_V15queue10mem_adviseEPKvmiNS0_5eventERKNS0_6detail13code_locationE
31633163
_ZN4sycl3_V15queue10mem_adviseEPKvmiRKNS0_6detail13code_locationE
31643164
_ZN4sycl3_V15queue10mem_adviseEPKvmiRKSt6vectorINS0_5eventESaIS5_EERKNS0_6detail13code_locationE
31653165
_ZN4sycl3_V15queue10wait_proxyERKNS0_6detail13code_locationE
3166-
_ZN4sycl3_V15queue11submit_implESt8functionIFvRNS0_7handlerEEERKNS0_6detail13code_locationE
3167-
_ZN4sycl3_V15queue11submit_implESt8functionIFvRNS0_7handlerEEERKNS0_6detail13code_locationEb
3168-
_ZN4sycl3_V15queue11submit_implESt8functionIFvRNS0_7handlerEEES1_RKNS0_6detail13code_locationE
3169-
_ZN4sycl3_V15queue11submit_implESt8functionIFvRNS0_7handlerEEES1_RKNS0_6detail13code_locationEb
31703166
_ZN4sycl3_V15queue15ext_oneapi_prodEv
31713167
_ZN4sycl3_V15queue18throw_asynchronousEv
31723168
_ZN4sycl3_V15queue20memcpyToDeviceGlobalEPvPKvbmmRKSt6vectorINS0_5eventESaIS6_EE
31733169
_ZN4sycl3_V15queue20wait_and_throw_proxyERKNS0_6detail13code_locationE
31743170
_ZN4sycl3_V15queue22memcpyFromDeviceGlobalEPvPKvbmmRKSt6vectorINS0_5eventESaIS6_EE
3175-
_ZN4sycl3_V15queue22submit_with_event_implERKNS0_6detail19type_erased_cgfo_tyERKNS2_14SubmissionInfoERKNS2_13code_locationEb
3176-
_ZN4sycl3_V15queue22submit_with_event_implERKNS0_6detail19type_erased_cgfo_tyERKNS2_2v114SubmissionInfoERKNS2_13code_locationEb
3177-
_ZN4sycl3_V15queue22submit_with_event_implESt8functionIFvRNS0_7handlerEEERKNS0_6detail14SubmissionInfoERKNS7_13code_locationEb
31783171
_ZN4sycl3_V15queue25ext_oneapi_submit_barrierERKNS0_6detail13code_locationE
31793172
_ZN4sycl3_V15queue25ext_oneapi_submit_barrierERKSt6vectorINS0_5eventESaIS3_EERKNS0_6detail13code_locationE
3180-
_ZN4sycl3_V15queue25submit_without_event_implERKNS0_6detail19type_erased_cgfo_tyERKNS2_14SubmissionInfoERKNS2_13code_locationEb
3181-
_ZN4sycl3_V15queue25submit_without_event_implERKNS0_6detail19type_erased_cgfo_tyERKNS2_2v114SubmissionInfoERKNS2_13code_locationEb
3182-
_ZN4sycl3_V15queue25submit_without_event_implESt8functionIFvRNS0_7handlerEEERKNS0_6detail13code_locationE
3183-
_ZN4sycl3_V15queue25submit_without_event_implESt8functionIFvRNS0_7handlerEEERKNS0_6detail13code_locationEb
3184-
_ZN4sycl3_V15queue25submit_without_event_implESt8functionIFvRNS0_7handlerEEERKNS0_6detail14SubmissionInfoERKNS7_13code_locationEb
3185-
_ZN4sycl3_V15queue27submit_impl_and_postprocessESt8functionIFvRNS0_7handlerEEERKNS0_6detail13code_locationERKS2_IFvbbRNS0_5eventEEE
3186-
_ZN4sycl3_V15queue27submit_impl_and_postprocessESt8functionIFvRNS0_7handlerEEERKNS0_6detail13code_locationERKS2_IFvbbRNS0_5eventEEEb
3187-
_ZN4sycl3_V15queue27submit_impl_and_postprocessESt8functionIFvRNS0_7handlerEEES1_RKNS0_6detail13code_locationERKS2_IFvbbRNS0_5eventEEE
3188-
_ZN4sycl3_V15queue27submit_impl_and_postprocessESt8functionIFvRNS0_7handlerEEES1_RKNS0_6detail13code_locationERKS2_IFvbbRNS0_5eventEEEb
31893173
_ZN4sycl3_V15queue29ext_oneapi_set_external_eventERKNS0_5eventE
31903174
_ZN4sycl3_V15queue6memcpyEPvPKvmNS0_5eventERKNS0_6detail13code_locationE
31913175
_ZN4sycl3_V15queue6memcpyEPvPKvmRKNS0_6detail13code_locationE
@@ -3287,11 +3271,6 @@ _ZN4sycl3_V16detail13lgamma_r_implEfPi
32873271
_ZN4sycl3_V16detail13make_platformEmNS0_7backendE
32883272
_ZN4sycl3_V16detail13select_deviceERKSt8functionIFiRKNS0_6deviceEEE
32893273
_ZN4sycl3_V16detail13select_deviceERKSt8functionIFiRKNS0_6deviceEEERKNS0_7contextE
3290-
_ZN4sycl3_V16detail14SubmissionInfo14SecondaryQueueEv
3291-
_ZN4sycl3_V16detail14SubmissionInfo17PostProcessorFuncEv
3292-
_ZN4sycl3_V16detail14SubmissionInfo9EventModeEv
3293-
_ZN4sycl3_V16detail14SubmissionInfoC1Ev
3294-
_ZN4sycl3_V16detail14SubmissionInfoC2Ev
32953274
_ZN4sycl3_V16detail14addCounterInitERNS0_7handlerERSt10shared_ptrINS1_10queue_implEERS4_IiE
32963275
_ZN4sycl3_V16detail14getBorderColorENS0_19image_channel_orderE
32973276
_ZN4sycl3_V16detail14tls_code_loc_t5queryEv
@@ -3817,9 +3796,6 @@ _ZNK4sycl3_V16detail12buffer_plain13handleReleaseEv
38173796
_ZNK4sycl3_V16detail12buffer_plain15getNativeVectorENS0_7backendE
38183797
_ZNK4sycl3_V16detail12buffer_plain22get_allocator_internalEv
38193798
_ZNK4sycl3_V16detail12buffer_plain7getSizeEv
3820-
_ZNK4sycl3_V16detail14SubmissionInfo14SecondaryQueueEv
3821-
_ZNK4sycl3_V16detail14SubmissionInfo17PostProcessorFuncEv
3822-
_ZNK4sycl3_V16detail14SubmissionInfo9EventModeEv
38233799
_ZNK4sycl3_V16detail16AccessorBaseHost11getElemSizeEv
38243800
_ZNK4sycl3_V16detail16AccessorBaseHost11getPropListEv
38253801
_ZNK4sycl3_V16detail16AccessorBaseHost13isPlaceholderEv

0 commit comments

Comments
 (0)