Skip to content

Commit 1026f0e

Browse files
againullagainull
committed
Remove submission info and redundant submission entry points
1 parent b41aa6d commit 1026f0e

File tree

2 files changed

+0
-186
lines changed

2 files changed

+0
-186
lines changed

‎sycl/include/sycl/queue.hpp‎

Lines changed: 0 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -85,24 +85,6 @@ void __SYCL_EXPORT submit_kernel_direct_without_event_impl(
8585
namespace detail {
8686
class queue_impl;
8787

88-
#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
89-
struct SubmissionInfoImpl;
90-
91-
class __SYCL_EXPORT SubmissionInfo {
92-
public:
93-
SubmissionInfo();
94-
95-
std::shared_ptr<detail::queue_impl> &SecondaryQueue();
96-
const std::shared_ptr<detail::queue_impl> &SecondaryQueue() const;
97-
98-
ext::oneapi::experimental::event_mode_enum &EventMode();
99-
const ext::oneapi::experimental::event_mode_enum &EventMode() const;
100-
101-
private:
102-
std::shared_ptr<SubmissionInfoImpl> impl = nullptr;
103-
};
104-
#endif
105-
10688
namespace v1 {
10789

10890
// 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 {
122104
public:
123105
SubmissionInfo() {}
124106

125-
#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
126-
SubmissionInfo(const detail::SubmissionInfo &SI)
127-
: MSecondaryQueue(SI.SecondaryQueue()), MEventMode(SI.EventMode()) {}
128-
129-
std::shared_ptr<detail::queue_impl> &SecondaryQueue() {
130-
return MSecondaryQueue;
131-
}
132-
const std::shared_ptr<detail::queue_impl> &SecondaryQueue() const {
133-
return MSecondaryQueue;
134-
}
135-
#endif
136-
137107
ext::oneapi::experimental::event_mode_enum &EventMode() { return MEventMode; }
138108
const ext::oneapi::experimental::event_mode_enum &EventMode() const {
139109
return MEventMode;
@@ -3827,55 +3797,6 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase<queue> {
38273797
}
38283798
}
38293799

3830-
#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
3831-
/// TODO: Unused. Remove these when ABI-break window is open.
3832-
/// Not using `type_erased_cgfo_ty` on purpose.
3833-
event submit_impl(std::function<void(handler &)> CGH,
3834-
const detail::code_location &CodeLoc);
3835-
event submit_impl(std::function<void(handler &)> CGH,
3836-
const detail::code_location &CodeLoc, bool IsTopCodeLoc);
3837-
event submit_impl(std::function<void(handler &)> CGH, queue secondQueue,
3838-
const detail::code_location &CodeLoc);
3839-
event submit_impl(std::function<void(handler &)> CGH, queue secondQueue,
3840-
const detail::code_location &CodeLoc, bool IsTopCodeLoc);
3841-
void submit_without_event_impl(std::function<void(handler &)> CGH,
3842-
const detail::code_location &CodeLoc);
3843-
void submit_without_event_impl(std::function<void(handler &)> CGH,
3844-
const detail::code_location &CodeLoc,
3845-
bool IsTopCodeLoc);
3846-
3847-
// Old version when `std::function` was used in place of
3848-
// `std::function<void(handler &)>`.
3849-
event submit_with_event_impl(std::function<void(handler &)> CGH,
3850-
const detail::SubmissionInfo &SubmitInfo,
3851-
const detail::code_location &CodeLoc,
3852-
bool IsTopCodeLoc);
3853-
3854-
void submit_without_event_impl(std::function<void(handler &)> CGH,
3855-
const detail::SubmissionInfo &SubmitInfo,
3856-
const detail::code_location &CodeLoc,
3857-
bool IsTopCodeLoc);
3858-
event submit_with_event_impl(const detail::type_erased_cgfo_ty &CGH,
3859-
const detail::SubmissionInfo &SubmitInfo,
3860-
const detail::code_location &CodeLoc,
3861-
bool IsTopCodeLoc);
3862-
void submit_without_event_impl(const detail::type_erased_cgfo_ty &CGH,
3863-
const detail::SubmissionInfo &SubmitInfo,
3864-
const detail::code_location &CodeLoc,
3865-
bool IsTopCodeLoc);
3866-
3867-
/// A template-free versions of submit.
3868-
event submit_with_event_impl(const detail::type_erased_cgfo_ty &CGH,
3869-
const detail::v1::SubmissionInfo &SubmitInfo,
3870-
const detail::code_location &CodeLoc,
3871-
bool IsTopCodeLoc);
3872-
/// A template-free version of submit_without_event.
3873-
void submit_without_event_impl(const detail::type_erased_cgfo_ty &CGH,
3874-
const detail::v1::SubmissionInfo &SubmitInfo,
3875-
const detail::code_location &CodeLoc,
3876-
bool IsTopCodeLoc);
3877-
#endif // __INTEL_PREVIEW_BREAKING_CHANGES
3878-
38793800
/// A template-free version of submit as const member function.
38803801
event submit_with_event_impl(const detail::type_erased_cgfo_ty &CGH,
38813802
const detail::v1::SubmissionInfo &SubmitInfo,

‎sycl/source/queue.cpp‎

Lines changed: 0 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -20,32 +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-
std::shared_ptr<detail::queue_impl> &SubmissionInfo::SecondaryQueue() {
29-
return impl->MSecondaryQueue;
30-
}
31-
32-
const std::shared_ptr<detail::queue_impl> &
33-
SubmissionInfo::SecondaryQueue() const {
34-
return impl->MSecondaryQueue;
35-
}
36-
37-
ext::oneapi::experimental::event_mode_enum &SubmissionInfo::EventMode() {
38-
return impl->MEventMode;
39-
}
40-
41-
const ext::oneapi::experimental::event_mode_enum &
42-
SubmissionInfo::EventMode() const {
43-
return impl->MEventMode;
44-
}
45-
} // namespace detail
46-
47-
#endif // __INTEL_PREVIEW_BREAKING_CHANGES
48-
4923
queue::queue(const context &SyclContext, const device_selector &DeviceSelector,
5024
const async_handler &AsyncHandler, const property_list &PropList) {
5125
const std::vector<device> Devs = SyclContext.get_devices();
@@ -189,87 +163,6 @@ event queue::mem_advise(const void *Ptr, size_t Length, int Advice,
189163
/*CallerNeedsEvent=*/true);
190164
}
191165

192-
#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
193-
/// TODO: Unused. Remove these when ABI-break window is open.
194-
event queue::submit_impl(std::function<void(handler &)> CGH,
195-
const detail::code_location &CodeLoc) {
196-
return submit_with_event_impl(std::move(CGH), {}, CodeLoc, true);
197-
}
198-
event queue::submit_impl(std::function<void(handler &)> CGH,
199-
const detail::code_location &CodeLoc,
200-
bool IsTopCodeLoc) {
201-
return submit_with_event_impl(std::move(CGH), {}, CodeLoc, IsTopCodeLoc);
202-
}
203-
204-
event queue::submit_impl(std::function<void(handler &)> CGH,
205-
[[maybe_unused]] queue SecondQueue,
206-
const detail::code_location &CodeLoc) {
207-
return impl->submit(CGH, CodeLoc, true);
208-
}
209-
event queue::submit_impl(std::function<void(handler &)> CGH,
210-
[[maybe_unused]] queue SecondQueue,
211-
const detail::code_location &CodeLoc,
212-
bool IsTopCodeLoc) {
213-
return impl->submit(CGH, CodeLoc, IsTopCodeLoc);
214-
}
215-
216-
void queue::submit_without_event_impl(std::function<void(handler &)> CGH,
217-
const detail::code_location &CodeLoc) {
218-
submit_without_event_impl(std::move(CGH), {}, CodeLoc, true);
219-
}
220-
void queue::submit_without_event_impl(std::function<void(handler &)> CGH,
221-
const detail::code_location &CodeLoc,
222-
bool IsTopCodeLoc) {
223-
submit_without_event_impl(std::move(CGH), {}, CodeLoc, IsTopCodeLoc);
224-
}
225-
226-
event queue::submit_with_event_impl(std::function<void(handler &)> CGH,
227-
const detail::SubmissionInfo &SubmitInfo,
228-
const detail::code_location &CodeLoc,
229-
bool IsTopCodeLoc) {
230-
return impl->submit_with_event(CGH, SubmitInfo, CodeLoc, IsTopCodeLoc);
231-
}
232-
233-
void queue::submit_without_event_impl(std::function<void(handler &)> CGH,
234-
const detail::SubmissionInfo &SubmitInfo,
235-
const detail::code_location &CodeLoc,
236-
bool IsTopCodeLoc) {
237-
impl->submit_without_event(CGH, SubmitInfo, CodeLoc, IsTopCodeLoc);
238-
}
239-
240-
event queue::submit_with_event_impl(const detail::type_erased_cgfo_ty &CGH,
241-
const detail::SubmissionInfo &SubmitInfo,
242-
const detail::code_location &CodeLoc,
243-
bool IsTopCodeLoc) {
244-
detail::v1::SubmissionInfo SI{SubmitInfo};
245-
return impl->submit_with_event(CGH, SI, CodeLoc, IsTopCodeLoc);
246-
}
247-
248-
void queue::submit_without_event_impl(const detail::type_erased_cgfo_ty &CGH,
249-
const detail::SubmissionInfo &SubmitInfo,
250-
const detail::code_location &CodeLoc,
251-
bool IsTopCodeLoc) {
252-
detail::v1::SubmissionInfo SI{SubmitInfo};
253-
impl->submit_without_event(CGH, SI, CodeLoc, IsTopCodeLoc);
254-
}
255-
256-
event queue::submit_with_event_impl(
257-
const detail::type_erased_cgfo_ty &CGH,
258-
const detail::v1::SubmissionInfo &SubmitInfo,
259-
const detail::code_location &CodeLoc, bool IsTopCodeLoc) {
260-
return std::as_const(*this).submit_with_event_impl(CGH, SubmitInfo, CodeLoc,
261-
IsTopCodeLoc);
262-
}
263-
264-
void queue::submit_without_event_impl(
265-
const detail::type_erased_cgfo_ty &CGH,
266-
const detail::v1::SubmissionInfo &SubmitInfo,
267-
const detail::code_location &CodeLoc, bool IsTopCodeLoc) {
268-
std::as_const(*this).submit_without_event_impl(CGH, SubmitInfo, CodeLoc,
269-
IsTopCodeLoc);
270-
}
271-
#endif // __INTEL_PREVIEW_BREAKING_CHANGES
272-
273166
event queue::submit_with_event_impl(
274167
const detail::type_erased_cgfo_ty &CGH,
275168
const detail::v1::SubmissionInfo &SubmitInfo,

0 commit comments

Comments
 (0)