Skip to content

[SYCL] Fix barrier on barrier dependency between queues #20125

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 18, 2025
Merged

[SYCL] Fix barrier on barrier dependency between queues #20125

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions sycl/source/detail/queue_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -667,6 +667,7 @@ class queue_impl : public std::enable_shared_from_this<queue_impl> {
getAdapter().call<UrApiKind::urEnqueueEventsWait>(getHandleRef(), 0,
nullptr, &UREvent);
ResEvent->setHandle(UREvent);
ResEvent->setEnqueued();
return ResEvent;
}

Expand Down
22 changes: 21 additions & 1 deletion sycl/unittests/queue/Barrier.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,19 @@

#include <helpers/TestKernel.hpp>
#include <helpers/UrMock.hpp>
#include <sycl/sycl.hpp>

#include <gtest/gtest.h>

static unsigned NumOfEventsWaitWithBarrierCalls = 0;
static unsigned NumEventsInWaitList = 0;

static ur_result_t redefined_urEnqueueEventsWaitWithBarrierExt(void *) {
static ur_result_t redefined_urEnqueueEventsWaitWithBarrierExt(void *pParams) {
NumOfEventsWaitWithBarrierCalls++;
// Get the number of events in the wait list
auto params =
*static_cast<ur_enqueue_events_wait_with_barrier_ext_params_t *>(pParams);
NumEventsInWaitList = *params.pnumEventsInWaitList;

return UR_RESULT_SUCCESS;
}
Expand Down Expand Up @@ -94,3 +100,17 @@ TEST(Queue, ExtOneAPISubmitBarrierWithWaitList) {

ASSERT_EQ(NumOfEventsWaitWithBarrierCalls, 1u);
}

TEST(Queue, BarrierWithBarrierDep) {
sycl::unittest::UrMock<> Mock;
mock::getCallbacks().set_before_callback(
"urEnqueueEventsWaitWithBarrierExt",
&redefined_urEnqueueEventsWaitWithBarrierExt);
sycl::queue Q1(sycl::property::queue::in_order{});
sycl::queue Q2(sycl::property::queue::in_order{});
Q1.submit([&](sycl::handler &cgh) { cgh.single_task<TestKernel>([=]() {}); });
sycl::event Barrier1 = Q1.ext_oneapi_submit_barrier();
NumEventsInWaitList = 0;
Q2.ext_oneapi_submit_barrier({Barrier1});
ASSERT_EQ(NumEventsInWaitList, 1u);
}
Loading