Skip to content

Commit be8ad8f

Browse files
authored
[SYCL][NATIVECPU] Separate lit tag for oneAPI Construction Kit (#12864)
Currently the oneAPI Construction Kit is an optional dependency for the Native CPU backend, so we need to differentiate test requirements based on whether or not it is available.
1 parent 80c8366 commit be8ad8f

File tree

5 files changed

+7
-3
lines changed

5 files changed

+7
-3
lines changed

sycl/test/check_device_code/native_cpu/vectorization.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// REQUIRES: native_cpu_be
1+
// REQUIRES: native_cpu_ock
22
// RUN: %clangxx -fsycl-device-only -fsycl-targets=native_cpu -Xclang -sycl-std=2020 -mllvm -sycl-opt -mllvm -inline-threshold=500 -S -emit-llvm -o %t_temp.ll %s
33
// RUN: %clangxx -O2 -mllvm -sycl-native-cpu-backend -S -emit-llvm -o - %t_temp.ll | FileCheck %s --check-prefix=CHECK-DEFAULT
44
// RUN: %clangxx -O2 -mllvm -sycl-native-cpu-backend -mllvm -sycl-native-cpu-vecz-width=16 -S -emit-llvm -o - %t_temp.ll | FileCheck %s --check-prefix=CHECK-16

sycl/test/lit.cfg.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,9 @@
159159
if config.native_cpu_be == "ON":
160160
config.available_features.add("native_cpu_be")
161161

162+
if config.native_cpu_ock == "ON":
163+
config.available_features.add("native_cpu_ock")
164+
162165
if "nvptx64-nvidia-cuda" in triple:
163166
llvm_config.with_system_environment("CUDA_PATH")
164167
config.available_features.add("cuda")

sycl/test/lit.site.cfg.py.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ config.hip_be = '@SYCL_BUILD_PI_HIP@'
3131
config.opencl_be = '@SYCL_BUILD_PI_OPENCL@'
3232
config.level_zero_be = '@SYCL_BUILD_PI_LEVEL_ZERO@'
3333
config.native_cpu_be = '@SYCL_BUILD_NATIVE_CPU@'
34+
config.native_cpu_ock = '@NATIVECPU_USE_OCK@'
3435
config.sycl_preview_lib_enabled = '@SYCL_ENABLE_MAJOR_RELEASE_PREVIEW_LIB@'
3536

3637
import lit.llvm

sycl/test/native_cpu/barrier-external.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// REQUIRES: native_cpu_be
1+
// REQUIRES: native_cpu_ock
22
// RUN: %clangxx -DFILE1 -fsycl -fsycl-targets=native_cpu %s -g -c -o %t1.o
33
// RUN: %clangxx -DFILE2 -fsycl -fsycl-targets=native_cpu %s -g -c -o %t2.o
44
// RUN: %clangxx -fsycl -fsycl-targets=native_cpu %t1.o %t2.o -g -o %t

sycl/test/native_cpu/barrier-simple.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// REQUIRES: native_cpu_be
1+
// REQUIRES: native_cpu_ock
22
// RUN: %clangxx -fsycl -fsycl-targets=native_cpu %s -o %t
33
// RUN: env ONEAPI_DEVICE_SELECTOR="native_cpu:cpu" %t
44

0 commit comments

Comments
 (0)