Skip to content
This repository was archived by the owner on Mar 28, 2023. It is now read-only.

Commit 8a55945

Browse files
authored
[SYCL] [L0] Specify standard command lists explicitly when the test depends on it. (#1585)
* Make use of standard command lists explicit, when the test depends on it. * Extended a test to work with imm cmdlists.
1 parent 43237de commit 8a55945

File tree

4 files changed

+12
-6
lines changed

4 files changed

+12
-6
lines changed

SYCL/Plugin/interop-level-zero-thread.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,7 @@ sycl::event operation(sycl::queue q) {
168168
{l0_event, sycl::ext::oneapi::level_zero::ownership::keep},
169169
q.get_context());
170170

171+
zeEventHostSignal(l0_event);
171172
auto return_event = q.ext_oneapi_submit_barrier({sycl_event});
172173
struct operation new_op = {std::move(deps), l0_event, sycl_event,
173174
return_event};

SYCL/Plugin/level_zero_device_scope_events.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// REQUIRES: gpu, level_zero
22

33
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
4-
// RUN: env SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=1 SYCL_PI_TRACE=-1 ZE_DEBUG=1 %GPU_RUN_PLACEHOLDER %t.out 2>&1 | FileCheck --check-prefixes=MODE1 %s
5-
// RUN: env SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_TRACE=-1 ZE_DEBUG=1 %GPU_RUN_PLACEHOLDER %t.out 2>&1 | FileCheck --check-prefixes=MODE2 %s
4+
// RUN: env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=1 SYCL_PI_TRACE=-1 ZE_DEBUG=1 %GPU_RUN_PLACEHOLDER %t.out 2>&1 | FileCheck --check-prefixes=MODE1 %s
5+
// RUN: env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_TRACE=-1 ZE_DEBUG=1 %GPU_RUN_PLACEHOLDER %t.out 2>&1 | FileCheck --check-prefixes=MODE2 %s
66
// UNSUPPORTED: ze_debug-1,ze_debug4
77

88
// Checks that with L0 device-scope events enabled the only host-visible L0

SYCL/Plugin/level_zero_events_caching.cpp

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,20 @@
44
// UNSUPPORTED: windows
55

66
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %level_zero_options %s -o %t.out
7-
// RUN: env SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=0 ZE_DEBUG=4 %GPU_RUN_PLACEHOLDER %t.out 2>&1 | FileCheck --check-prefixes=CACHING-ENABLED %s
8-
// RUN: env SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=0 SYCL_PI_LEVEL_ZERO_DISABLE_EVENTS_CACHING=1 ZE_DEBUG=4 %GPU_RUN_PLACEHOLDER %t.out 2>&1 | FileCheck --check-prefixes=CACHING-DISABLED %s
7+
// RUN: env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=0 ZE_DEBUG=4 %GPU_RUN_PLACEHOLDER %t.out 2>&1 | FileCheck --check-prefixes=CACHING-ENABLED %s
8+
// RUN: env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=0 SYCL_PI_LEVEL_ZERO_DISABLE_EVENTS_CACHING=1 ZE_DEBUG=4 %GPU_RUN_PLACEHOLDER %t.out 2>&1 | FileCheck --check-prefixes=CACHING-DISABLED-STD %s
9+
// RUN: env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=1 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=0 SYCL_PI_LEVEL_ZERO_DISABLE_EVENTS_CACHING=1 ZE_DEBUG=4 %GPU_RUN_PLACEHOLDER %t.out 2>&1 | FileCheck --check-prefixes=CACHING-DISABLED-IMM %s
910

1011
// With events caching we should be reusing them and 9 should be enough.
1112
// Might require more than one if previous one hasn't been released by the time
1213
// we need a new one.
1314

15+
// With immediate commandlists there is one additional event created
16+
// during queue sync, so the expected count increases by 1 to 257.
17+
1418
// CACHING-ENABLED: zeEventCreate = {{[1-9]}}
15-
// CACHING-DISABLED: zeEventCreate = 256
19+
// CACHING-DISABLED-STD: zeEventCreate = 256
20+
// CACHING-DISABLED-IMM: zeEventCreate = 257
1621

1722
// Check event caching modes in the L0 plugin.
1823

SYCL/Plugin/level_zero_queue_create.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// UNSUPPORTED: windows
44

55
// RUN: %clangxx -fsycl -fsycl-unnamed-lambda -fsycl-targets=%sycl_triple %level_zero_options %s -o %t.out
6-
// RUN: env ZE_DEBUG=4 %GPU_RUN_PLACEHOLDER %t.out 2>&1 %GPU_CHECK_PLACEHOLDER
6+
// RUN: env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 ZE_DEBUG=4 %GPU_RUN_PLACEHOLDER %t.out 2>&1 %GPU_CHECK_PLACEHOLDER
77
//
88
// CHECK: zeCommandQueueCreate = 1 \---> zeCommandQueueDestroy = 1
99
// The test is to check that there is only a single level zero queue created

0 commit comments

Comments
 (0)