Skip to content

[SYCL] Fix a thread pool data race during shutdown #15535

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 2 commits into from
Sep 27, 2024
Merged

[SYCL] Fix a thread pool data race during shutdown #15535

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7dabb34
[SYCL] Fix a thread pool data race during shutdown
sergey-semenov Sep 27, 2024
a312a73
Fix test header
sergey-semenov Sep 27, 2024
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
14 changes: 8 additions & 6 deletions sycl/source/detail/thread_pool.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,17 @@ class ThreadPool {
std::queue<std::function<void()>> MJobQueue;
std::mutex MJobQueueMutex;
std::condition_variable MDoSmthOrStop;
std::atomic_bool MStop;
bool MStop = false;
std::atomic_uint MJobsInPool;

void worker() {
GlobalHandler::instance().registerSchedulerUsage(/*ModifyCounter*/ false);
std::unique_lock<std::mutex> Lock(MJobQueueMutex);
while (true) {
MDoSmthOrStop.wait(
Lock, [this]() { return !MJobQueue.empty() || MStop.load(); });
MDoSmthOrStop.wait(Lock,
[this]() { return !MJobQueue.empty() || MStop; });

if (MStop.load())
if (MStop)
break;

std::function<void()> Job = std::move(MJobQueue.front());
Expand All @@ -57,7 +57,6 @@ class ThreadPool {
void start() {
MLaunchedThreads.reserve(MThreadCount);

MStop.store(false);
MJobsInPool.store(0);

for (size_t Idx = 0; Idx < MThreadCount; ++Idx)
Expand All @@ -83,7 +82,10 @@ class ThreadPool {
}

void finishAndWait() {
MStop.store(true);
{
std::lock_guard<std::mutex> Lock(MJobQueueMutex);
MStop = true;
}

MDoSmthOrStop.notify_all();

Expand Down
16 changes: 16 additions & 0 deletions sycl/test-e2e/Regression/unwaited_for_host_task.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
// RUN: %{build} -o %t.out
// RUN: %{run} %t.out

#include <sycl/sycl.hpp>

using namespace sycl;

// This test checks that host tasks that haven't been waited for do not cause
// issues during shutdown.
int main(int argc, char *argv[]) {
queue q;

q.submit([&](handler &h) { h.host_task([=]() {}); });

return 0;
}
Loading