From 33f839511d920e5e807d230bc9e0eb2d42c55182 Mon Sep 17 00:00:00 2001
From: Dmitry Vodopyanov <dmitry.vodopyanov@intel.com>
Date: Sun, 16 Jan 2022 14:23:57 +0300
Subject: [PATCH] Revert "[SYCL] Adjust Level Zero tests to queue::wait()
 changes (#631)"

This reverts commit 3ee9891000812fb7462c6b8c841fa051f2955398.
---
 SYCL/Plugin/level_zero_batch_event_status.cpp |  4 ++--
 SYCL/Plugin/level_zero_batch_test.cpp         | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/SYCL/Plugin/level_zero_batch_event_status.cpp b/SYCL/Plugin/level_zero_batch_event_status.cpp
index f932338115..e0484be567 100644
--- a/SYCL/Plugin/level_zero_batch_event_status.cpp
+++ b/SYCL/Plugin/level_zero_batch_event_status.cpp
@@ -28,8 +28,8 @@
 // CHECK-NOT: piEventsWait
 // CHECK: ---> piEnqueueKernelLaunch
 // CHECK: ZE ---> zeCommandListAppendLaunchKernel
-// CHECK: ---> piQueueFinish
-// Look for close and Execute after piQueueFinish
+// CHECK: ---> piEventsWait
+// Look for close and Execute after piEventsWait
 // CHECK:  ZE ---> zeCommandListClose
 // CHECK:  ZE ---> zeCommandQueueExecuteCommandLists
 // CHECK: ---> piEventGetInfo
diff --git a/SYCL/Plugin/level_zero_batch_test.cpp b/SYCL/Plugin/level_zero_batch_test.cpp
index f05f421bbf..5bfff90edb 100644
--- a/SYCL/Plugin/level_zero_batch_test.cpp
+++ b/SYCL/Plugin/level_zero_batch_test.cpp
@@ -33,10 +33,10 @@
 // Expected output is that for batching =1 you will see zeCommandListClose,
 // and zeCommandQueueExecuteCommandLists after every piEnqueueKernelLaunch.
 // For batching=3 you will see that after 3rd and 6th enqueues, and then after
-// piQueueFinish. For 5, after 5th piEnqueue, and then after piQueueFinish.  For
+// piEventsWait. For 5, after 5th piEnqueue, and then after piEventsWait.  For
 // 4 you will see these after 4th and 8th Enqueue, and for 8, only after the
 // 8th enqueue.  And lastly for 9, you will see the Close and Execute calls
-// only after the piQueueFinish.
+// only after the piEventsWait.
 // Since the test does this 3 times, this pattern will repeat 2 more times,
 // and then the test will print Test Passed 8 times, once for each kernel
 // validation check.
@@ -87,7 +87,7 @@
 // CKB4:  ZE ---> zeCommandQueueExecuteCommandLists(
 // CKB8:  ZE ---> zeCommandListClose(
 // CKB8:  ZE ---> zeCommandQueueExecuteCommandLists(
-// CKALL: ---> piQueueFinish(
+// CKALL: ---> piEventsWait(
 // CKB3:  ZE ---> zeCommandListClose(
 // CKB3:  ZE ---> zeCommandQueueExecuteCommandLists(
 // CKB5:  ZE ---> zeCommandListClose(
@@ -143,7 +143,7 @@
 // CKB4:  ZE ---> zeCommandQueueExecuteCommandLists(
 // CKB8:  ZE ---> zeCommandListClose(
 // CKB8:  ZE ---> zeCommandQueueExecuteCommandLists(
-// CKALL: ---> piQueueFinish(
+// CKALL: ---> piEventsWait(
 // CKB3:  ZE ---> zeCommandListClose(
 // CKB3:  ZE ---> zeCommandQueueExecuteCommandLists(
 // CKB5:  ZE ---> zeCommandListClose(
@@ -199,7 +199,7 @@
 // CKB4:  ZE ---> zeCommandQueueExecuteCommandLists(
 // CKB8:  ZE ---> zeCommandListClose(
 // CKB8:  ZE ---> zeCommandQueueExecuteCommandLists(
-// CKALL: ---> piQueueFinish(
+// CKALL: ---> piEventsWait(
 // CKB3:  ZE ---> zeCommandListClose(
 // CKB3:  ZE ---> zeCommandQueueExecuteCommandLists(
 // CKB5:  ZE ---> zeCommandListClose(