Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
235 changes: 5 additions & 230 deletions sycl/include/sycl/handler.hpp

Large diffs are not rendered by default.

4 changes: 0 additions & 4 deletions sycl/source/detail/graph/dynamic_impl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -309,12 +309,8 @@ void dynamic_command_group_impl::finalizeCGFList(
const auto &CGF = CGFList[CGFIndex];
// Handler defined inside the loop so it doesn't appear to the runtime
// as a single command-group with multiple commands inside.
#ifdef __INTEL_PREVIEW_BREAKING_CHANGES
detail::handler_impl HandlerImpl{*MGraph};
sycl::handler Handler{HandlerImpl};
#else
sycl::handler Handler{MGraph};
#endif
CGF(Handler);

if (Handler.getType() != sycl::detail::CGType::Kernel &&
Expand Down
4 changes: 0 additions & 4 deletions sycl/source/detail/graph/graph_impl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -416,12 +416,8 @@ node_impl &graph_impl::add(std::function<void(handler &)> CGF,
const std::vector<sycl::detail::ArgDesc> &Args,
nodes_range Deps) {
(void)Args;
#ifdef __INTEL_PREVIEW_BREAKING_CHANGES
detail::handler_impl HandlerImpl{*this};
sycl::handler Handler{HandlerImpl};
#else
sycl::handler Handler{shared_from_this()};
#endif

// Pass the node deps to the handler so they are available when processing the
// CGF, need for async_malloc nodes.
Expand Down
9 changes: 0 additions & 9 deletions sycl/source/detail/handler_impl.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -224,15 +224,6 @@ class handler_impl {
// Allocation ptr to be freed asynchronously.
void *MFreePtr = nullptr;

#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
// TODO: remove in the next ABI-breaking window
// Today they are used only in the handler::setKernelNameBasedCachePtr
int MKernelNumArgs = 0;
detail::kernel_param_desc_t (*MKernelParamDescGetter)(int) = nullptr;
bool MKernelIsESIMD = false;
bool MKernelHasSpecialCaptures = true;
#endif

KernelData MKernelData;
};

Expand Down
4 changes: 0 additions & 4 deletions sycl/source/detail/queue_impl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -289,12 +289,8 @@ queue_impl::submit_impl(const detail::type_erased_cgfo_ty &CGF,
bool CallerNeedsEvent, const detail::code_location &Loc,
bool IsTopCodeLoc,
const v1::SubmissionInfo &SubmitInfo) {
#ifdef __INTEL_PREVIEW_BREAKING_CHANGES
detail::handler_impl HandlerImplVal(*this, CallerNeedsEvent);
handler Handler(HandlerImplVal);
#else
handler Handler(shared_from_this(), CallerNeedsEvent);
#endif

#ifdef XPTI_ENABLE_INSTRUMENTATION
if (xptiTraceEnabled()) {
Expand Down
7 changes: 0 additions & 7 deletions sycl/source/detail/queue_impl.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -729,18 +729,11 @@ class queue_impl : public std::enable_shared_from_this<queue_impl> {
Handler.depends_on(*ExternalEvent);
}

#ifdef __INTEL_PREVIEW_BREAKING_CHANGES
inline const detail::EventImplPtr &
parseEvent(const detail::EventImplPtr &Event) {
assert(!Event || !Event->isDiscarded());
return Event;
}
#else
inline detail::EventImplPtr parseEvent(const event &Event) {
const detail::EventImplPtr &EventImpl = getSyclObjImpl(Event);
return EventImpl->isDiscarded() ? nullptr : EventImpl;
}
#endif

bool trySwitchingToNoEventsMode() {
if (MNoLastEventMode.load(std::memory_order_relaxed))
Expand Down
Loading