diff --git a/sycl/test-e2e/KernelCompiler/sycl.cpp b/sycl/test-e2e/KernelCompiler/sycl.cpp index 0c903049594ac..4391492ed632e 100644 --- a/sycl/test-e2e/KernelCompiler/sycl.cpp +++ b/sycl/test-e2e/KernelCompiler/sycl.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// REQUIRES: aspect-usm_device_allocations +// REQUIRES: sycl-jit, aspect-usm_device_allocations // RUN: %{build} -o %t.out // RUN: %if hip %{ env SYCL_JIT_AMDGCN_PTX_TARGET_CPU=%{amd_arch} %} %{l0_leak_check} %{run} %t.out diff --git a/sycl/test-e2e/KernelCompiler/sycl_basic.cpp b/sycl/test-e2e/KernelCompiler/sycl_basic.cpp index fbb7768fd8ac8..40a99c9681e7b 100644 --- a/sycl/test-e2e/KernelCompiler/sycl_basic.cpp +++ b/sycl/test-e2e/KernelCompiler/sycl_basic.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// REQUIRES: aspect-usm_device_allocations +// REQUIRES: sycl-jit, aspect-usm_device_allocations // RUN: %{build} -o %t.out // RUN: %if hip %{ env SYCL_JIT_AMDGCN_PTX_TARGET_CPU=%{amd_arch} %} %{l0_leak_check} %{run} %t.out diff --git a/sycl/test-e2e/KernelCompiler/sycl_cache.cpp b/sycl/test-e2e/KernelCompiler/sycl_cache.cpp index 0cffec11ffa47..c926b5ad8a39d 100644 --- a/sycl/test-e2e/KernelCompiler/sycl_cache.cpp +++ b/sycl/test-e2e/KernelCompiler/sycl_cache.cpp @@ -12,7 +12,7 @@ // target. Don't run eviction check for CUDA/HIP, so that we don't have to find // a magic number that works for all binaries (and by definition is flaky). -// REQUIRES: aspect-usm_device_allocations +// REQUIRES: sycl-jit, aspect-usm_device_allocations // DEFINE: %{cache_vars} = env SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_TRACE=7 SYCL_CACHE_DIR=%t/cache_dir // DEFINE: %{max_cache_size} = SYCL_CACHE_MAX_SIZE=30000 diff --git a/sycl/test-e2e/KernelCompiler/sycl_cache_pm.cpp b/sycl/test-e2e/KernelCompiler/sycl_cache_pm.cpp index 83b6f425ec308..b900ab7b80b10 100644 --- a/sycl/test-e2e/KernelCompiler/sycl_cache_pm.cpp +++ b/sycl/test-e2e/KernelCompiler/sycl_cache_pm.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// // REQUIRES: (opencl || level_zero) -// REQUIRES: aspect-usm_device_allocations +// REQUIRES: sycl-jit, aspect-usm_device_allocations // -- Test the kernel_compiler with SYCL source. // RUN: %{build} -o %t.out diff --git a/sycl/test-e2e/KernelCompiler/sycl_device_globals.cpp b/sycl/test-e2e/KernelCompiler/sycl_device_globals.cpp index ba8b08584df81..25e09ab6df446 100644 --- a/sycl/test-e2e/KernelCompiler/sycl_device_globals.cpp +++ b/sycl/test-e2e/KernelCompiler/sycl_device_globals.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// REQUIRES: aspect-usm_device_allocations +// REQUIRES: sycl-jit, aspect-usm_device_allocations // UNSUPPORTED: opencl && gpu // UNSUPPORTED-TRACKER: GSD-4287 diff --git a/sycl/test-e2e/KernelCompiler/sycl_imf.cpp b/sycl/test-e2e/KernelCompiler/sycl_imf.cpp index 363728b318580..8c6b5625e84d3 100644 --- a/sycl/test-e2e/KernelCompiler/sycl_imf.cpp +++ b/sycl/test-e2e/KernelCompiler/sycl_imf.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// REQUIRES: aspect-usm_device_allocations +// REQUIRES: sycl-jit, aspect-usm_device_allocations // REQUIRES: (opencl || level_zero) // UNSUPPORTED: accelerator diff --git a/sycl/test-e2e/KernelCompiler/sycl_include_paths.cpp b/sycl/test-e2e/KernelCompiler/sycl_include_paths.cpp index d073390a3d6a9..86b4b6f9b0d71 100644 --- a/sycl/test-e2e/KernelCompiler/sycl_include_paths.cpp +++ b/sycl/test-e2e/KernelCompiler/sycl_include_paths.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// REQUIRES: aspect-usm_device_allocations +// REQUIRES: sycl-jit, aspect-usm_device_allocations // RUN: %{build} -o %t.out // RUN: %if hip %{ env SYCL_JIT_AMDGCN_PTX_TARGET_CPU=%{amd_arch} %} %{run} %t.out %S | FileCheck %s --check-prefixes=CHECK,CHECK-NOCWD diff --git a/sycl/test-e2e/KernelCompiler/sycl_join.cpp b/sycl/test-e2e/KernelCompiler/sycl_join.cpp index f11af750accab..f8b44a8cc1748 100644 --- a/sycl/test-e2e/KernelCompiler/sycl_join.cpp +++ b/sycl/test-e2e/KernelCompiler/sycl_join.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// REQUIRES: aspect-usm_shared_allocations +// REQUIRES: sycl-jit, aspect-usm_shared_allocations // RUN: %{build} -o %t.out // RUN: %if hip %{ env SYCL_JIT_AMDGCN_PTX_TARGET_CPU=%{amd_arch} %} %{run} %t.out diff --git a/sycl/test-e2e/KernelCompiler/sycl_lifetimes.cpp b/sycl/test-e2e/KernelCompiler/sycl_lifetimes.cpp index 7d38e44cab6c2..ec606d6222ee9 100644 --- a/sycl/test-e2e/KernelCompiler/sycl_lifetimes.cpp +++ b/sycl/test-e2e/KernelCompiler/sycl_lifetimes.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// REQUIRES: aspect-usm_device_allocations +// REQUIRES: sycl-jit, aspect-usm_device_allocations // RUN: %{build} -o %t.out // RUN: %if hip %{ env SYCL_JIT_AMDGCN_PTX_TARGET_CPU=%{amd_arch} %} env SYCL_UR_TRACE=-1 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s diff --git a/sycl/test-e2e/KernelCompiler/sycl_namespaces.cpp b/sycl/test-e2e/KernelCompiler/sycl_namespaces.cpp index 29c54161506f9..6e4b4d6133abe 100644 --- a/sycl/test-e2e/KernelCompiler/sycl_namespaces.cpp +++ b/sycl/test-e2e/KernelCompiler/sycl_namespaces.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// REQUIRES: aspect-usm_device_allocations +// REQUIRES: sycl-jit, aspect-usm_device_allocations // RUN: %{build} -o %t.out // RUN: %if hip %{ env SYCL_JIT_AMDGCN_PTX_TARGET_CPU=%{amd_arch} %} %{l0_leak_check} %{run} %t.out diff --git a/sycl/test-e2e/KernelCompiler/sycl_overload.cpp b/sycl/test-e2e/KernelCompiler/sycl_overload.cpp index a1b6cb787d030..af7a65561ef57 100644 --- a/sycl/test-e2e/KernelCompiler/sycl_overload.cpp +++ b/sycl/test-e2e/KernelCompiler/sycl_overload.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// REQUIRES: aspect-usm_device_allocations +// REQUIRES: sycl-jit, aspect-usm_device_allocations // RUN: %{build} -o %t.out // RUN: %if hip %{ env SYCL_JIT_AMDGCN_PTX_TARGET_CPU=%{amd_arch} %} %{l0_leak_check} %{run} %t.out diff --git a/sycl/test-e2e/KernelCompiler/sycl_time_trace.cpp b/sycl/test-e2e/KernelCompiler/sycl_time_trace.cpp index 4b1a04d1bcb8d..badaaa5d7d034 100644 --- a/sycl/test-e2e/KernelCompiler/sycl_time_trace.cpp +++ b/sycl/test-e2e/KernelCompiler/sycl_time_trace.cpp @@ -6,6 +6,8 @@ // //===----------------------------------------------------------------------===// +// REQUIRES: sycl-jit + // RUN: %{build} -o %t.out // RUN: %if hip %{ env SYCL_JIT_AMDGCN_PTX_TARGET_CPU=%{amd_arch} %} %{run} %t.out | FileCheck %s diff --git a/sycl/test-e2e/lit.cfg.py b/sycl/test-e2e/lit.cfg.py index 85d3858e22f32..a777434bed9da 100644 --- a/sycl/test-e2e/lit.cfg.py +++ b/sycl/test-e2e/lit.cfg.py @@ -970,6 +970,19 @@ def get_sycl_ls_verbose(sycl_device, env): config.available_features.add("device-config-file") config.substitutions.append(("%device_config_file_include_flag", "")) +# Check for sycl-jit library +if config.test_mode != "build-only": + if platform.system() == "Linux": + if os.path.exists(os.path.join(config.sycl_libs_dir, "libsycl-jit.so")): + config.available_features.add("sycl-jit") + elif platform.system() == "Windows": + if os.path.exists(os.path.join(config.dpcpp_bin_dir, "sycl-jit.dll")): + config.available_features.add("sycl-jit") + if "sycl-jit" not in config.available_features: + lit_config.note( + "sycl-jit was not found. Tests requiring sycl-jit will be skipped." + ) + # That has to be executed last so that all device-independent features have been # discovered already. config.sycl_dev_features = {}