Skip to content

[test-e2e][L0] do not rely on specific log format #16897

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
Feb 19, 2025
Merged

[test-e2e][L0] do not rely on specific log format #16897

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
2 changes: 1 addition & 1 deletion sycl/test-e2e/Adapters/interop-level-zero-image-ownership.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
// If ownership is ::transfer then the ~image destructor will end up calling
// zeImageDestroy
// CHECK: test ownership::transfer
// CHECK: ZE ---> zeImageDestroy
// CHECK: zeImageDestroy

// With ownership ::keep it is must be called manually.
// CHECK: test ownership::keep
Expand Down
20 changes: 10 additions & 10 deletions sycl/test-e2e/Adapters/level_zero_barrier_optimization.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ int main() {

// CHECK: Test1
// CHECK: ---> urEnqueueEventsWaitWithBarrierExt
// CHECK: ZE ---> zeEventCreate
// CHECK-OPT: ZE ---> zeCommandListAppendWaitOnEvents
// CHECK: ZE ---> zeCommandListAppendSignalEvent
// CHECK: zeEventCreate
// CHECK-OPT: zeCommandListAppendWaitOnEvents
// CHECK: zeCommandListAppendSignalEvent
// CHECK: ) -> UR_RESULT_SUCCESS
auto BarrierEvent = Q2.ext_oneapi_submit_barrier({EventA, EventB});
BarrierEvent.wait();
Expand All @@ -55,9 +55,9 @@ int main() {

// CHECK: Test2
// CHECK: ---> urEnqueueEventsWaitWithBarrierExt
// CHECK-OPT: ZE ---> {{zeEventCreate|zeEventHostReset}}
// CHECK-OPT: ZE ---> zeCommandListAppendWaitOnEvents
// CHECK: ZE ---> zeCommandListAppendSignalEvent
// CHECK-OPT: {{zeEventCreate|zeEventHostReset}}
// CHECK-OPT: zeCommandListAppendWaitOnEvents
// CHECK: zeCommandListAppendSignalEvent
// CHECK: ) -> UR_RESULT_SUCCESS
auto BarrierEvent = Q1.ext_oneapi_submit_barrier({EventA, EventB});
BarrierEvent.wait();
Expand All @@ -75,10 +75,10 @@ int main() {
Q3.wait();
// CHECK: Test3
// CHECK: ---> urEnqueueEventsWaitWithBarrierExt
// CHECK: ZE ---> zeEventCreate
// CHECK-NOT: ZE ---> zeCommandListAppendWaitOnEvents
// CHECK-NOT: ZE ---> zeCommandListAppendSignalEvent
// CHECK: ZE ---> zeCommandListAppendBarrier
// CHECK: zeEventCreate
// CHECK-NOT: zeCommandListAppendWaitOnEvents
// CHECK-NOT: zeCommandListAppendSignalEvent
// CHECK: zeCommandListAppendBarrier
// CHECK: ) -> UR_RESULT_SUCCESS
auto BarrierEvent = Q3.ext_oneapi_submit_barrier({EventA, EventB});
BarrierEvent.wait();
Expand Down
8 changes: 4 additions & 4 deletions sycl/test-e2e/Adapters/level_zero_batch_barrier.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,22 @@ int main(int argc, char *argv[]) {

submit_kernel(q); // starts a batch
// CHECK: ---> urEnqueueKernelLaunch
// CHECK-NOT: ZE ---> zeCommandQueueExecuteCommandLists
// CHECK-NOT: zeCommandQueueExecuteCommandLists

// continue the batch
event barrier = q.ext_oneapi_submit_barrier();
// CHECK: ---> urEnqueueEventsWaitWithBarrierExt
// CHECK-NOT: ZE ---> zeCommandQueueExecuteCommandLists
// CHECK-NOT: zeCommandQueueExecuteCommandLists

submit_kernel(q);
// CHECK: ---> urEnqueueKernelLaunch
// CHECK-NOT: ZE ---> zeCommandQueueExecuteCommandLists
// CHECK-NOT: zeCommandQueueExecuteCommandLists

// interop should close the batch
ze_event_handle_t ze_event =
get_native<backend::ext_oneapi_level_zero>(barrier);
// CHECK: ---> urEventGetNativeHandle
// CHECK: ZE ---> zeCommandQueueExecuteCommandLists
// CHECK: zeCommandQueueExecuteCommandLists
zeEventHostSynchronize(ze_event, UINT64_MAX);

// CHECK: ---> urQueueFinish
Expand Down
8 changes: 4 additions & 4 deletions sycl/test-e2e/Adapters/level_zero_batch_event_status.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
// CHECK: UR ---> UrQueue->executeOpenCommandList
// CHECK: ---> urQueueFinish
// Look for close and Execute after urQueueFinish
// CHECK: ZE ---> zeCommandListClose
// CHECK: ZE ---> zeCommandQueueExecuteCommandLists
// CHECK: zeCommandListClose
// CHECK: zeCommandQueueExecuteCommandLists
// CHECK: ---> urEventGetInfo
// No close and execute here, should already have happened.
// CHECK-NOT: ZE ---> zeCommandListClose
// CHECK-NOT: ZE ---> zeCommandQueueExecuteCommandLists
// CHECK-NOT: zeCommandListClose
// CHECK-NOT: zeCommandQueueExecuteCommandLists
// CHECK-NOT: Test Fail
// CHECK: Test Pass
// UNSUPPORTED: ze_debug
Expand Down
Loading
Loading