Skip to content

[SYCL] Fix test configurations when L0 and OpenCL are disabled #8247

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.

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 2 commits into from
Mar 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions sycl/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,12 @@ endif()
if ("esimd_emulator" IN_LIST SYCL_ENABLE_PLUGINS)
set(SYCL_BUILD_PI_ESIMD_EMULATOR ON)
endif()
if ("opencl" IN_LIST SYCL_ENABLE_PLUGINS)
set(SYCL_BUILD_PI_OPENCL ON)
endif()
if ("level_zero" IN_LIST SYCL_ENABLE_PLUGINS)
set(SYCL_BUILD_PI_LEVEL_ZERO ON)
endif()

# Configure SYCL version macro
set(sycl_inc_dir ${CMAKE_CURRENT_SOURCE_DIR}/include)
Expand Down
30 changes: 30 additions & 0 deletions sycl/test/basic_tests/interop-backend-traits-cuda.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
// REQUIRES: cuda_be
// RUN: %clangxx -fsycl -fsyntax-only %s
// RUN: %clangxx -fsycl -fsyntax-only -DUSE_CUDA_EXPERIMENTAL %s

#ifdef USE_CUDA_EXPERIMENTAL
#define SYCL_EXT_ONEAPI_BACKEND_CUDA 1
#define SYCL_EXT_ONEAPI_BACKEND_CUDA_EXPERIMENTAL 1
#include <sycl/ext/oneapi/experimental/backend/cuda.hpp>
#endif

#include <sycl/sycl.hpp>

constexpr auto Backend = sycl::backend::ext_oneapi_cuda;

int main() {
static_assert(
std::is_same_v<sycl::backend_traits<Backend>::return_type<sycl::device>,
sycl::detail::interop<Backend, sycl::device>::type>);
#ifndef USE_CUDA_EXPERIMENTAL
// CUDA experimental return type is different to input type
static_assert(
std::is_same_v<sycl::backend_traits<Backend>::return_type<sycl::context>,
sycl::detail::interop<Backend, sycl::context>::type>);
#endif
static_assert(
std::is_same_v<sycl::backend_traits<Backend>::return_type<sycl::queue>,
sycl::detail::interop<Backend, sycl::queue>::type>);

return 0;
}
17 changes: 17 additions & 0 deletions sycl/test/basic_tests/interop-backend-traits-hip.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// REQUIRES: hip_be
// RUN: %clangxx -fsycl -fsyntax-only %s

#include <sycl/sycl.hpp>

constexpr auto Backend = sycl::backend::ext_oneapi_hip;

int main() {
static_assert(
std::is_same_v<sycl::backend_traits<Backend>::return_type<sycl::device>,
sycl::detail::interop<Backend, sycl::device>::type>);
static_assert(
std::is_same_v<sycl::backend_traits<Backend>::return_type<sycl::queue>,
sycl::detail::interop<Backend, sycl::queue>::type>);

return 0;
}
24 changes: 24 additions & 0 deletions sycl/test/basic_tests/interop-backend-traits-level-zero.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
// REQUIRES: level_zero_be
// RUN: %clangxx %fsycl-host-only -fsyntax-only %s

#include <sycl/sycl.hpp>
#include <ze_api.h>

constexpr auto Backend = sycl::backend::ext_oneapi_level_zero;

int main() {
static_assert(
std::is_same_v<sycl::backend_traits<Backend>::input_type<sycl::platform>,
sycl::detail::interop<Backend, sycl::platform>::type>);
static_assert(
std::is_same_v<sycl::backend_traits<Backend>::return_type<sycl::platform>,
sycl::detail::interop<Backend, sycl::platform>::type>);
static_assert(
std::is_same_v<sycl::backend_traits<Backend>::return_type<sycl::device>,
sycl::detail::interop<Backend, sycl::device>::type>);
static_assert(
std::is_same_v<sycl::backend_traits<Backend>::return_type<sycl::queue>,
sycl::detail::interop<Backend, sycl::queue>::type>);

return 0;
}
36 changes: 36 additions & 0 deletions sycl/test/basic_tests/interop-backend-traits-opencl.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
// REQUIRES: opencl_be
// RUN: %clangxx -fsycl -fsyntax-only %s

#include <CL/cl.h>
#include <sycl/sycl.hpp>

constexpr auto Backend = sycl::backend::opencl;

int main() {
static_assert(
std::is_same_v<sycl::backend_traits<Backend>::input_type<sycl::device>,
sycl::detail::interop<Backend, sycl::device>::type>);
static_assert(
std::is_same_v<sycl::backend_traits<Backend>::input_type<sycl::context>,
sycl::detail::interop<Backend, sycl::context>::type>);
static_assert(
std::is_same_v<sycl::backend_traits<Backend>::input_type<sycl::queue>,
sycl::detail::interop<Backend, sycl::queue>::type>);
static_assert(
std::is_same_v<sycl::backend_traits<Backend>::input_type<sycl::event>,
sycl::detail::interop<Backend, sycl::event>::type>);
static_assert(
std::is_same_v<sycl::backend_traits<Backend>::input_type<sycl::platform>,
sycl::detail::interop<Backend, sycl::platform>::type>);
static_assert(
std::is_same_v<sycl::backend_traits<Backend>::return_type<sycl::platform>,
sycl::detail::interop<Backend, sycl::platform>::type>);
static_assert(
std::is_same_v<sycl::backend_traits<Backend>::return_type<sycl::device>,
sycl::detail::interop<Backend, sycl::device>::type>);
static_assert(
std::is_same_v<sycl::backend_traits<Backend>::return_type<sycl::queue>,
sycl::detail::interop<Backend, sycl::queue>::type>);

return 0;
}
87 changes: 0 additions & 87 deletions sycl/test/basic_tests/interop-backend-traits.cpp

This file was deleted.

13 changes: 12 additions & 1 deletion sycl/test/lit.cfg.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,12 @@
llvm_symbolizer = os.path.join(config.llvm_build_bin_dir, 'llvm-symbolizer')
llvm_config.with_environment('LLVM_SYMBOLIZER_PATH', llvm_symbolizer)

config.substitutions.append( ('%fsycl-host-only', '-std=c++17 -Xclang -fsycl-is-host -isystem %s -isystem %s -isystem %s -isystem %s' % (config.sycl_include, config.level_zero_include_dir, config.opencl_include_dir, config.sycl_include + '/sycl/') ) )
sycl_host_only_options = '-std=c++17 -Xclang -fsycl-is-host'
for include_dir in [config.sycl_include, config.level_zero_include_dir, config.opencl_include_dir, config.sycl_include + '/sycl/']:
if include_dir:
sycl_host_only_options += ' -isystem %s' % include_dir
config.substitutions.append( ('%fsycl-host-only', sycl_host_only_options) )

config.substitutions.append( ('%sycl_lib', ' -lsycl6' if platform.system() == "Windows" else '-lsycl') )

llvm_config.add_tool_substitutions(['llvm-spirv'], [config.sycl_tools_dir])
Expand All @@ -116,6 +121,12 @@
if config.esimd_emulator_be == "ON":
config.available_features.add('esimd_emulator_be')

if config.opencl_be == "ON":
config.available_features.add('opencl_be')

if config.level_zero_be == "ON":
config.available_features.add('level_zero_be')

if triple == 'nvptx64-nvidia-cuda':
llvm_config.with_system_environment('CUDA_PATH')
config.available_features.add('cuda')
Expand Down
2 changes: 2 additions & 0 deletions sycl/test/lit.site.cfg.py.in
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ config.extra_environment = lit_config.params.get("extra_environment", "@LIT_EXTR
config.cuda_be = '@SYCL_BUILD_PI_CUDA@'
config.esimd_emulator_be = '@SYCL_BUILD_PI_ESIMD_EMULATOR@'
config.hip_be = '@SYCL_BUILD_PI_HIP@'
config.opencl_be = '@SYCL_BUILD_PI_OPENCL@'
config.level_zero_be = '@SYCL_BUILD_PI_LEVEL_ZERO@'

import lit.llvm
lit.llvm.initialize(lit_config, config)
Expand Down