Skip to content

[SYCL][NFC] Fix flaky behavior in cleanup related unit tests #7798

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.

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 4 commits into from
Dec 15, 2022
Merged
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
7 changes: 7 additions & 0 deletions sycl/unittests/scheduler/GraphCleanup.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,10 @@ TEST_F(SchedulerTest, HostTaskCleanup) {

Lock.unlock();
Event.wait();
// The command should be sent to graph cleanup as part of the task
// submitted to the thread pool, shortly after the event is marked
// as complete.
detail::GlobalHandler::instance().drainThreadPool();
ASSERT_EQ(EventImpl->getCommand(), nullptr);
}

Expand Down Expand Up @@ -345,6 +349,9 @@ TEST_F(SchedulerTest, StreamBufferDeallocation) {
// The buffers should have been released with graph cleanup once the work is
// finished.
EventImplPtr->wait(EventImplPtr);
// Drain the thread pool to ensure that the cleanup is able to acquire
// the graph lock.
detail::GlobalHandler::instance().drainThreadPool();
MSPtr->cleanupCommands({});
ASSERT_EQ(MSPtr->MDeferredMemObjRelease.size(), 0u);
}
Expand Down