Skip to content

[SYCL] Preserve in-order queue dependency chain between usm & host tasks #6840

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

Merged
merged 1 commit into from
Sep 22, 2022
Merged

[SYCL] Preserve in-order queue dependency chain between usm & host tasks #6840

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
97 changes: 79 additions & 18 deletions sycl/source/detail/queue_impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,34 @@ event queue_impl::memset(const std::shared_ptr<detail::queue_impl> &Self,
getOrWaitEvents(DepEvents, MContext), nullptr);
return createDiscardedEvent();
}
RT::PiEvent NativeEvent{};
MemoryManager::fill_usm(Ptr, Self, Count, Value,
getOrWaitEvents(DepEvents, MContext), &NativeEvent);
event ResEvent;
{
// We need to submit command and update the last event under same lock if we
// have in-order queue.
auto ScopeLock = isInOrder() ? std::unique_lock(MLastEventMtx)
: std::unique_lock<std::mutex>();
// If the last submitted command in the in-order queue is host_task then
// wait for it before submitting usm command.
if (isInOrder() && (MLastCGType == CG::CGTYPE::CodeplayHostTask ||
MLastCGType == CG::CGTYPE::CodeplayInteropTask))
MLastEvent.wait();

if (MContext->is_host())
return MDiscardEvents ? createDiscardedEvent() : event();
RT::PiEvent NativeEvent{};
MemoryManager::fill_usm(Ptr, Self, Count, Value,
getOrWaitEvents(DepEvents, MContext), &NativeEvent);

event ResEvent = prepareUSMEvent(Self, NativeEvent);
if (MContext->is_host())
return MDiscardEvents ? createDiscardedEvent() : event();

ResEvent = prepareUSMEvent(Self, NativeEvent);
if (isInOrder()) {
MLastEvent = ResEvent;
// We don't create a command group for usm commands, so set it to None.
// This variable is used to perform explicit dependency management when
// required.
MLastCGType = CG::CGTYPE::None;
}
}
// Track only if we won't be able to handle it with piQueueFinish.
if (!MSupportOOO)
addSharedEvent(ResEvent);
Expand All @@ -89,14 +109,34 @@ event queue_impl::memcpy(const std::shared_ptr<detail::queue_impl> &Self,
getOrWaitEvents(DepEvents, MContext), nullptr);
return createDiscardedEvent();
}
RT::PiEvent NativeEvent{};
MemoryManager::copy_usm(Src, Self, Count, Dest,
getOrWaitEvents(DepEvents, MContext), &NativeEvent);
event ResEvent;
{
// We need to submit command and update the last event under same lock if we
// have in-order queue.
auto ScopeLock = isInOrder() ? std::unique_lock(MLastEventMtx)
: std::unique_lock<std::mutex>();
// If the last submitted command in the in-order queue is host_task then
// wait for it before submitting usm command.
if (isInOrder() && (MLastCGType == CG::CGTYPE::CodeplayHostTask ||
MLastCGType == CG::CGTYPE::CodeplayInteropTask))
MLastEvent.wait();

RT::PiEvent NativeEvent{};
MemoryManager::copy_usm(Src, Self, Count, Dest,
getOrWaitEvents(DepEvents, MContext), &NativeEvent);

if (MContext->is_host())
return MDiscardEvents ? createDiscardedEvent() : event();
if (MContext->is_host())
return MDiscardEvents ? createDiscardedEvent() : event();

event ResEvent = prepareUSMEvent(Self, NativeEvent);
ResEvent = prepareUSMEvent(Self, NativeEvent);
if (isInOrder()) {
MLastEvent = ResEvent;
// We don't create a command group for usm commands, so set it to None.
// This variable is used to perform explicit dependency management when
// required.
MLastCGType = CG::CGTYPE::None;
}
}
// Track only if we won't be able to handle it with piQueueFinish.
if (!MSupportOOO)
addSharedEvent(ResEvent);
Expand All @@ -112,14 +152,35 @@ event queue_impl::mem_advise(const std::shared_ptr<detail::queue_impl> &Self,
getOrWaitEvents(DepEvents, MContext), nullptr);
return createDiscardedEvent();
}
RT::PiEvent NativeEvent{};
MemoryManager::advise_usm(Ptr, Self, Length, Advice,
getOrWaitEvents(DepEvents, MContext), &NativeEvent);
event ResEvent;
{
// We need to submit command and update the last event under same lock if we
// have in-order queue.
auto ScopeLock = isInOrder() ? std::unique_lock(MLastEventMtx)
: std::unique_lock<std::mutex>();
// If the last submitted command in the in-order queue is host_task then
// wait for it before submitting usm command.
if (isInOrder() && (MLastCGType == CG::CGTYPE::CodeplayHostTask ||
MLastCGType == CG::CGTYPE::CodeplayInteropTask))
MLastEvent.wait();

if (MContext->is_host())
return MDiscardEvents ? createDiscardedEvent() : event();
RT::PiEvent NativeEvent{};
MemoryManager::advise_usm(Ptr, Self, Length, Advice,
getOrWaitEvents(DepEvents, MContext),
&NativeEvent);

if (MContext->is_host())
return MDiscardEvents ? createDiscardedEvent() : event();

event ResEvent = prepareUSMEvent(Self, NativeEvent);
ResEvent = prepareUSMEvent(Self, NativeEvent);
if (isInOrder()) {
MLastEvent = ResEvent;
// We don't create a command group for usm commands, so set it to None.
// This variable is used to perform explicit dependency management when
// required.
MLastCGType = CG::CGTYPE::None;
}
}
// Track only if we won't be able to handle it with piQueueFinish.
if (!MSupportOOO)
addSharedEvent(ResEvent);
Expand Down