Skip to content

[SYCL] Fix race condition in EnqueueNativeCommand #14717

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 6 commits into from
Jul 29, 2024
Merged

[SYCL] Fix race condition in EnqueueNativeCommand #14717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3738af7
Fix race condition
Jul 23, 2024
f419975
Refactor context getting
Jul 24, 2024
3ad165f
Test CI
Jul 26, 2024
acf56c1
Merge branch 'sycl' into early-exit-test
Jul 26, 2024
1daa04a
Merge branch 'sycl' into early-exit-test
Jul 29, 2024
72dc4c9
Fix merge with UR types
Jul 29, 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
2 changes: 1 addition & 1 deletion sycl/include/sycl/handler.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1875,7 +1875,7 @@ class __SYCL_EXPORT handler {
setArgsToAssociatedAccessors();

SetHostTask(std::move(Func));
setType(detail::CGType::CodeplayHostTask);
setType(detail::CGType::EnqueueNativeCommand);
}

/// @brief Get the command graph if any associated with this handler. It can
Expand Down
7 changes: 4 additions & 3 deletions sycl/source/detail/scheduler/commands.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3162,8 +3162,8 @@ ur_result_t ExecCGCommand::enqueueImpQueue() {
Req->MSYCLMemObj->MRecord->MAllocaCommands;

for (AllocaCommandBase *AllocaCmd : AllocaCmds)
if (HostTask->MQueue->getContextImplPtr() ==
AllocaCmd->getQueue()->getContextImplPtr()) {
if (getContext(HostTask->MQueue) ==
getContext(AllocaCmd->getQueue())) {
auto MemArg = reinterpret_cast<ur_mem_handle_t>(
AllocaCmd->getMemAllocation());
ReqToMem.emplace_back(std::make_pair(Req, MemArg));
Expand All @@ -3177,7 +3177,8 @@ ur_result_t ExecCGCommand::enqueueImpQueue() {

throw sycl::exception(
sycl::make_error_code(sycl::errc::runtime),
"Can't get memory object due to no allocation available ");
"Can't get memory object due to no allocation available " +
codeToString(UR_RESULT_ERROR_INVALID_MEM_OBJECT));
};
std::for_each(std::begin(HandlerReq), std::end(HandlerReq), ReqToMemConv);
std::sort(std::begin(ReqToMem), std::end(ReqToMem));
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/EnqueueNativeCommand/custom-command-multiple-dev-cuda.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// RUN: %{run} %t.out

// TODO: Reenable, see https://github.com/intel/llvm/issues/14598
// UNSUPPORTED: windows, linux
// UNSUPPORTED: windows

#include <cuda.h>

Expand Down