Skip to content

Commit b0a2fb9

Browse files
[SYCL][Graph] Kernel property bugfix (#12148)
Fixes kernel property tests. Improves PI exception messages. Removes queue clearing in the executable graph destructor as this is already done by the modifiable graph destructor. Fixes the temporary disabling of kernel prop test performed by #12137
1 parent abed346 commit b0a2fb9

File tree

5 files changed

+11
-13
lines changed

5 files changed

+11
-13
lines changed

sycl/source/detail/graph_impl.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -724,11 +724,6 @@ void exec_graph_impl::createCommandBuffers(
724724
}
725725

726726
exec_graph_impl::~exec_graph_impl() {
727-
WriteLock LockImpl(MGraphImpl->MMutex);
728-
729-
// clear all recording queue if not done before (no call to end_recording)
730-
MGraphImpl->clearQueues();
731-
732727
const sycl::detail::PluginPtr &Plugin =
733728
sycl::detail::getSyclObjImpl(MContext)->getPlugin();
734729
MSchedule.clear();

sycl/source/detail/scheduler/commands.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2488,8 +2488,9 @@ pi_int32 enqueueImpCommandBufferKernel(
24882488
}
24892489

24902490
if (Res != pi_result::PI_SUCCESS) {
2491-
throw sycl::exception(errc::invalid,
2492-
"Failed to add kernel to PI command-buffer");
2491+
const device_impl &DeviceImplem = *(DeviceImpl);
2492+
detail::enqueue_kernel_launch::handleErrorOrWarning(Res, DeviceImplem,
2493+
PiKernel, NDRDesc);
24932494
}
24942495

24952496
return Res;

sycl/test-e2e/Graph/Explicit/work_group_size_prop.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@
55
//
66
// CHECK-NOT: LEAK
77

8-
// Note: failing negative test with CUDA & HIP in the original test
9-
// UNSUPPORTED: cuda, hip
8+
// Temporarily disabled for CUDA.
9+
// XFAIL: cuda
10+
// Note: failing negative test with HIP in the original test
11+
// TODO: disable hip when HIP backend will be supported by Graph
1012

1113
#define GRAPH_E2E_EXPLICIT
1214

sycl/test-e2e/Graph/Inputs/work_group_size_prop.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,6 @@ int test(queue &Queue, PropertiesT Props, KernelType KernelFunc) {
8585
return 1;
8686
}
8787

88-
return 0;
89-
9088
// Negative test case: Specify local size that does not match required size.
9189
exp_ext::command_graph GraphN{Queue.get_context(), Queue.get_device()};
9290
try {

sycl/test-e2e/Graph/RecordReplay/work_group_size_prop.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@
55
//
66
// CHECK-NOT: LEAK
77

8-
// Note: failing negative test with CUDA & HIP in the original test
9-
// UNSUPPORTED: cuda, hip
8+
// Temporarily disabled for CUDA.
9+
// XFAIL: cuda
10+
// Note: failing negative test with HIP in the original test
11+
// TODO: disable hip when HIP backend will be supported by Graph
1012

1113
#define GRAPH_E2E_RECORD_REPLAY
1214

0 commit comments

Comments
 (0)