Skip to content

Commit e711ac0

Browse files
[SYCL] Cleanup handler ABI entry points and data members (#20746)
Co-authored-by: Steffen Larsen <steffen.larsen@intel.com>
1 parent 0f1533a commit e711ac0

File tree

12 files changed

+81
-823
lines changed

12 files changed

+81
-823
lines changed

sycl/include/sycl/handler.hpp

Lines changed: 5 additions & 230 deletions
Large diffs are not rendered by default.

sycl/source/detail/graph/dynamic_impl.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -309,12 +309,8 @@ void dynamic_command_group_impl::finalizeCGFList(
309309
const auto &CGF = CGFList[CGFIndex];
310310
// Handler defined inside the loop so it doesn't appear to the runtime
311311
// as a single command-group with multiple commands inside.
312-
#ifdef __INTEL_PREVIEW_BREAKING_CHANGES
313312
detail::handler_impl HandlerImpl{*MGraph};
314313
sycl::handler Handler{HandlerImpl};
315-
#else
316-
sycl::handler Handler{MGraph};
317-
#endif
318314
CGF(Handler);
319315

320316
if (Handler.getType() != sycl::detail::CGType::Kernel &&

sycl/source/detail/graph/graph_impl.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -416,12 +416,8 @@ node_impl &graph_impl::add(std::function<void(handler &)> CGF,
416416
const std::vector<sycl::detail::ArgDesc> &Args,
417417
nodes_range Deps) {
418418
(void)Args;
419-
#ifdef __INTEL_PREVIEW_BREAKING_CHANGES
420419
detail::handler_impl HandlerImpl{*this};
421420
sycl::handler Handler{HandlerImpl};
422-
#else
423-
sycl::handler Handler{shared_from_this()};
424-
#endif
425421

426422
// Pass the node deps to the handler so they are available when processing the
427423
// CGF, need for async_malloc nodes.

sycl/source/detail/handler_impl.hpp

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -224,15 +224,6 @@ class handler_impl {
224224
// Allocation ptr to be freed asynchronously.
225225
void *MFreePtr = nullptr;
226226

227-
#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
228-
// TODO: remove in the next ABI-breaking window
229-
// Today they are used only in the handler::setKernelNameBasedCachePtr
230-
int MKernelNumArgs = 0;
231-
detail::kernel_param_desc_t (*MKernelParamDescGetter)(int) = nullptr;
232-
bool MKernelIsESIMD = false;
233-
bool MKernelHasSpecialCaptures = true;
234-
#endif
235-
236227
KernelData MKernelData;
237228
};
238229

sycl/source/detail/queue_impl.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -289,12 +289,8 @@ queue_impl::submit_impl(const detail::type_erased_cgfo_ty &CGF,
289289
bool CallerNeedsEvent, const detail::code_location &Loc,
290290
bool IsTopCodeLoc,
291291
const v1::SubmissionInfo &SubmitInfo) {
292-
#ifdef __INTEL_PREVIEW_BREAKING_CHANGES
293292
detail::handler_impl HandlerImplVal(*this, CallerNeedsEvent);
294293
handler Handler(HandlerImplVal);
295-
#else
296-
handler Handler(shared_from_this(), CallerNeedsEvent);
297-
#endif
298294

299295
#ifdef XPTI_ENABLE_INSTRUMENTATION
300296
if (xptiTraceEnabled()) {

sycl/source/detail/queue_impl.hpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -729,18 +729,11 @@ class queue_impl : public std::enable_shared_from_this<queue_impl> {
729729
Handler.depends_on(*ExternalEvent);
730730
}
731731

732-
#ifdef __INTEL_PREVIEW_BREAKING_CHANGES
733732
inline const detail::EventImplPtr &
734733
parseEvent(const detail::EventImplPtr &Event) {
735734
assert(!Event || !Event->isDiscarded());
736735
return Event;
737736
}
738-
#else
739-
inline detail::EventImplPtr parseEvent(const event &Event) {
740-
const detail::EventImplPtr &EventImpl = getSyclObjImpl(Event);
741-
return EventImpl->isDiscarded() ? nullptr : EventImpl;
742-
}
743-
#endif
744737

745738
bool trySwitchingToNoEventsMode() {
746739
if (MNoLastEventMode.load(std::memory_order_relaxed))

0 commit comments

Comments
 (0)