Skip to content

Commit a2ce959

Browse files
[SYCL] Enable E2E testing for level zero v2 adapter (#17127)
Co-authored-by: Udit Kumar Agarwal <udit.agarwal@intel.com>
1 parent 0e9d697 commit a2ce959

40 files changed

+140
-33
lines changed

.github/workflows/sycl-linux-build.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,8 @@ jobs:
167167
--cmake-opt=-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
168168
--cmake-opt="-DLLVM_INSTALL_UTILS=ON" \
169169
--cmake-opt="-DNATIVECPU_USE_OCK=Off" \
170-
--cmake-opt="-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=SPIRV"
170+
--cmake-opt="-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=SPIRV" \
171+
--level_zero_v1_and_v2
171172
- name: Compile
172173
id: build
173174
run: cmake --build $GITHUB_WORKSPACE/build --target sycl-toolchain

.github/workflows/sycl-linux-precommit.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,12 @@ jobs:
7979
target_devices: level_zero:gpu;opencl:gpu
8080
reset_intel_gpu: true
8181
extra_lit_opts: --param matrix-xmx8=True
82+
- name: Intel Arc A-Series Graphics for L0 V2 adapter
83+
runner: '["Linux", "arc"]'
84+
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
85+
target_devices: level_zero_v2:gpu
86+
reset_intel_gpu: true
87+
extra_lit_opts: --param matrix-xmx8=True
8288
- name: E2E tests with dev igc on Intel Arc A-Series Graphics
8389
runner: '["Linux", "arc"]'
8490
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:devigc

buildbot/configure.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,9 @@ def do_configure(args):
7272
# https://github.com/intel/llvm/blob/sycl/unified-runtime/source/adapters/level_zero/v2/README.md
7373
if args.level_zero_v2:
7474
sycl_enabled_backends.append("level_zero_v2")
75+
elif args.level_zero_v1_and_v2:
76+
sycl_enabled_backends.append("level_zero")
77+
sycl_enabled_backends.append("level_zero_v2")
7578
else:
7679
sycl_enabled_backends.append("level_zero")
7780

@@ -338,6 +341,11 @@ def main():
338341
parser.add_argument(
339342
"--level_zero_v2", action="store_true", help="Enable SYCL Level Zero V2"
340343
)
344+
parser.add_argument(
345+
"--level_zero_v1_and_v2",
346+
action="store_true",
347+
help="Enable SYCL Level Zero Legacy and V2",
348+
)
341349
parser.add_argument(
342350
"--host-target",
343351
default="host",

sycl/test-e2e/Adapters/interop-l0-direct.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// REQUIRES: level_zero, level_zero_dev_kit
2-
// UNSUPPORTED: ze_debug
2+
// UNSUPPORTED: ze_debug, level_zero_v2_adapter
33

44
// DeviceSanitizer will report error for cross context USM usage, turn it off
55
// RUN: export UR_LAYER_ASAN_OPTIONS="detect_kernel_arguments:0"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// REQUIRES: gpu, level_zero, level_zero_dev_kit
22
// L0 adapter incorrectly reports memory leaks because it doesn't take into
33
// account direct calls to L0 API.
4-
// UNSUPPORTED: ze_debug
4+
// UNSUPPORTED: ze_debug, level_zero_v2_adapter
55
// RUN: %{build} %level_zero_options -o %t.out
66
// RUN: env SYCL_PI_LEVEL_ZERO_DISABLE_USM_ALLOCATOR=1 UR_L0_DEBUG=1 %{run} %t.out 2>&1 | FileCheck %s
77

sycl/test-e2e/Adapters/level_zero_barrier_optimization.cpp

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

3636
// CHECK: Test1
3737
// CHECK: ---> urEnqueueEventsWaitWithBarrierExt
38-
// CHECK: zeEventCreate
38+
// CHECK-OPT: zeEventCreate
3939
// CHECK-OPT: zeCommandListAppendWaitOnEvents
4040
// CHECK: zeCommandListAppendSignalEvent
4141
// CHECK: ) -> UR_RESULT_SUCCESS
@@ -75,7 +75,7 @@ int main() {
7575
Q3.wait();
7676
// CHECK: Test3
7777
// CHECK: ---> urEnqueueEventsWaitWithBarrierExt
78-
// CHECK: zeEventCreate
78+
// CHECK-OPT: zeEventCreate
7979
// CHECK-NOT: zeCommandListAppendWaitOnEvents
8080
// CHECK-NOT: zeCommandListAppendSignalEvent
8181
// CHECK: zeCommandListAppendBarrier

sycl/test-e2e/Adapters/level_zero_batch_barrier.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
// REQUIRES: gpu, level_zero, level_zero_dev_kit
2+
// UNSUPPORTED: level_zero_v2_adapter
3+
// UNSUPPORTED-INTENDED: v2 adapter does not support regular cmd lists
24

35
// RUN: %{build} %level_zero_options -o %t.out
46
// RUN: env SYCL_UR_TRACE=2 UR_L0_DEBUG=1 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %{run} %t.out 2>&1 | FileCheck %s

sycl/test-e2e/Adapters/level_zero_batch_event_status.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
// See https://github.com/intel/llvm-test-suite/issues/906
22
// REQUIRES: gpu, level_zero
3+
// UNSUPPORTED: level_zero_v2_adapter
4+
// UNSUPPORTED-INTENDED: v2 adapter does not support regular cmd lists
35

46
// RUN: %{build} -o %t.out
57

sycl/test-e2e/Adapters/level_zero_batch_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// RUN: %{build} -o %t.ooo.out
44
// RUN: %{build} -DUSING_INORDER -o %t.ino.out
55
// RUN: %{build} -DUSING_DISCARD_EVENTS -o %t.discard_events.out
6-
// UNSUPPORTED: ze_debug
6+
// UNSUPPORTED: ze_debug, level_zero_v2_adapter
77

88
// To test batching on out-of-order queue:
99
// Set batching to 4 explicitly

sycl/test-e2e/Adapters/level_zero_batch_test_copy_with_compute.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// REQUIRES: gpu, level_zero
2-
// UNSUPPORTED: ze_debug
2+
// UNSUPPORTED: ze_debug, level_zero_v2_adapter
33

44
// RUN: %{build} -o %t.out
55

0 commit comments

Comments
 (0)