Skip to content

Commit 1072231

Browse files
authored
[test-e2e][L0] do not rely on specific log format (#16897)
from UR_L0_DEBUG. L0 API logging will most likely be moved to the L0 loader and we would like to keep formatting consistent with current logger format, this means no "ZE --->" prefix.
1 parent 0f7fca9 commit 1072231

15 files changed

+352
-352
lines changed

sycl/test-e2e/Adapters/interop-level-zero-image-ownership.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
// If ownership is ::transfer then the ~image destructor will end up calling
1515
// zeImageDestroy
1616
// CHECK: test ownership::transfer
17-
// CHECK: ZE ---> zeImageDestroy
17+
// CHECK: zeImageDestroy
1818

1919
// With ownership ::keep it is must be called manually.
2020
// CHECK: test ownership::keep

sycl/test-e2e/Adapters/level_zero_barrier_optimization.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ int main() {
3535

3636
// CHECK: Test1
3737
// CHECK: ---> urEnqueueEventsWaitWithBarrierExt
38-
// CHECK: ZE ---> zeEventCreate
39-
// CHECK-OPT: ZE ---> zeCommandListAppendWaitOnEvents
40-
// CHECK: ZE ---> zeCommandListAppendSignalEvent
38+
// CHECK: zeEventCreate
39+
// CHECK-OPT: zeCommandListAppendWaitOnEvents
40+
// CHECK: zeCommandListAppendSignalEvent
4141
// CHECK: ) -> UR_RESULT_SUCCESS
4242
auto BarrierEvent = Q2.ext_oneapi_submit_barrier({EventA, EventB});
4343
BarrierEvent.wait();
@@ -55,9 +55,9 @@ int main() {
5555

5656
// CHECK: Test2
5757
// CHECK: ---> urEnqueueEventsWaitWithBarrierExt
58-
// CHECK-OPT: ZE ---> {{zeEventCreate|zeEventHostReset}}
59-
// CHECK-OPT: ZE ---> zeCommandListAppendWaitOnEvents
60-
// CHECK: ZE ---> zeCommandListAppendSignalEvent
58+
// CHECK-OPT: {{zeEventCreate|zeEventHostReset}}
59+
// CHECK-OPT: zeCommandListAppendWaitOnEvents
60+
// CHECK: zeCommandListAppendSignalEvent
6161
// CHECK: ) -> UR_RESULT_SUCCESS
6262
auto BarrierEvent = Q1.ext_oneapi_submit_barrier({EventA, EventB});
6363
BarrierEvent.wait();
@@ -75,10 +75,10 @@ int main() {
7575
Q3.wait();
7676
// CHECK: Test3
7777
// CHECK: ---> urEnqueueEventsWaitWithBarrierExt
78-
// CHECK: ZE ---> zeEventCreate
79-
// CHECK-NOT: ZE ---> zeCommandListAppendWaitOnEvents
80-
// CHECK-NOT: ZE ---> zeCommandListAppendSignalEvent
81-
// CHECK: ZE ---> zeCommandListAppendBarrier
78+
// CHECK: zeEventCreate
79+
// CHECK-NOT: zeCommandListAppendWaitOnEvents
80+
// CHECK-NOT: zeCommandListAppendSignalEvent
81+
// CHECK: zeCommandListAppendBarrier
8282
// CHECK: ) -> UR_RESULT_SUCCESS
8383
auto BarrierEvent = Q3.ext_oneapi_submit_barrier({EventA, EventB});
8484
BarrierEvent.wait();

sycl/test-e2e/Adapters/level_zero_batch_barrier.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,22 +23,22 @@ int main(int argc, char *argv[]) {
2323

2424
submit_kernel(q); // starts a batch
2525
// CHECK: ---> urEnqueueKernelLaunch
26-
// CHECK-NOT: ZE ---> zeCommandQueueExecuteCommandLists
26+
// CHECK-NOT: zeCommandQueueExecuteCommandLists
2727

2828
// continue the batch
2929
event barrier = q.ext_oneapi_submit_barrier();
3030
// CHECK: ---> urEnqueueEventsWaitWithBarrierExt
31-
// CHECK-NOT: ZE ---> zeCommandQueueExecuteCommandLists
31+
// CHECK-NOT: zeCommandQueueExecuteCommandLists
3232

3333
submit_kernel(q);
3434
// CHECK: ---> urEnqueueKernelLaunch
35-
// CHECK-NOT: ZE ---> zeCommandQueueExecuteCommandLists
35+
// CHECK-NOT: zeCommandQueueExecuteCommandLists
3636

3737
// interop should close the batch
3838
ze_event_handle_t ze_event =
3939
get_native<backend::ext_oneapi_level_zero>(barrier);
4040
// CHECK: ---> urEventGetNativeHandle
41-
// CHECK: ZE ---> zeCommandQueueExecuteCommandLists
41+
// CHECK: zeCommandQueueExecuteCommandLists
4242
zeEventHostSynchronize(ze_event, UINT64_MAX);
4343

4444
// CHECK: ---> urQueueFinish

sycl/test-e2e/Adapters/level_zero_batch_event_status.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
// CHECK: UR ---> UrQueue->executeOpenCommandList
2121
// CHECK: ---> urQueueFinish
2222
// Look for close and Execute after urQueueFinish
23-
// CHECK: ZE ---> zeCommandListClose
24-
// CHECK: ZE ---> zeCommandQueueExecuteCommandLists
23+
// CHECK: zeCommandListClose
24+
// CHECK: zeCommandQueueExecuteCommandLists
2525
// CHECK: ---> urEventGetInfo
2626
// No close and execute here, should already have happened.
27-
// CHECK-NOT: ZE ---> zeCommandListClose
28-
// CHECK-NOT: ZE ---> zeCommandQueueExecuteCommandLists
27+
// CHECK-NOT: zeCommandListClose
28+
// CHECK-NOT: zeCommandQueueExecuteCommandLists
2929
// CHECK-NOT: Test Fail
3030
// CHECK: Test Pass
3131
// UNSUPPORTED: ze_debug

0 commit comments

Comments
 (0)