Fix Segmentation Fault in piEnqueueEventsWaitWithBarrier in pi_level0.cpp

Signed-off-by: Dmitry Vodopyanov <[email protected]>

Author: dm-vodopyanov

sycl/plugins/level_zero/pi_level0.cpp

@@ -2505,12 +2505,23 @@ pi_result piEnqueueEventsWaitWithBarrier(pi_queue Queue,
                                          pi_event *Event) {
 
   assert(Queue);
+
   // Get a new command list to be used on this call
   ze_command_list_handle_t ZeCommandList = nullptr;
   if (auto Res = Queue->Context->Device->createCommandList(&ZeCommandList))
     return Res;
 
-  ze_event_handle_t ZeEvent = (*Event)->ZeEvent;
+  ze_event_handle_t ZeEvent = nullptr;
+  if (Event) {
+    auto Res = piEventCreate(Queue->Context, Event);
+    if (Res != PI_SUCCESS)
+      return Res;
+
+    (*Event)->Queue = Queue;
+    (*Event)->ZeCommandList = ZeCommandList;
+
+    ZeEvent = (*Event)->ZeEvent;
+  }
 
   // TODO: use unique_ptr with custom deleter in the whole Level Zero plugin for
   // wrapping ze_event_handle_t *ZeEventWaitList to avoid memory leaks in case

sycl/test/enqueue_barrier/enqueue_barrier.cpp

@@ -10,7 +10,7 @@
 
 int main() {
   sycl::context Context;
-  sycl::queue Q1(Context, sycl::cpu_selector{});
+  sycl::queue Q1(Context, sycl::default_selector{});
 
   Q1.submit([&](sycl::handler &cgh) {
     cgh.single_task<class kernel1>([]() {});
@@ -34,8 +34,8 @@ int main() {
   // call queue::submit_barrier()
   Q1.submit_barrier();
 
-  sycl::queue Q2(Context, sycl::cpu_selector{});
-  sycl::queue Q3(Context, sycl::cpu_selector{});
+  sycl::queue Q2(Context, sycl::default_selector{});
+  sycl::queue Q3(Context, sycl::default_selector{});
 
   auto Event1 = Q1.submit([&](sycl::handler &cgh) {
     cgh.single_task<class kernel5>([]() {});