Skip to content

Commit 1267150

Browse files
authored
[SYCL] next portion of the tests (intel#33)
* Add/move tests covering different kernel param types * Add test covering loading kernel images from file * Added kernel/program compile/build tests * Add multi_ptr test * add function pointer tests * add functor tests * test for context with multiple devices * XFAIL kernel and program tests failing on CUDA
1 parent 4cf53f1 commit 1267150

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

SYCL/CMakeLists.txt

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
if( NOT OpenCL_LIBRARY )
2+
find_package(OpenCL)
3+
endif()
4+
15
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in" "${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg")
26

37
if(CHECK_SYCL_ALL)

SYCL/lit.cfg.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,9 @@
6969

7070
config.substitutions.append( ('%sycl_libs_dir', config.sycl_libs_dir ) )
7171
config.substitutions.append( ('%sycl_include', config.sycl_include ) )
72-
config.substitutions.append( ('%opencl_libs_dir', config.opencl_libs_dir) )
72+
if config.opencl_libs_dir:
73+
config.substitutions.append( ('%opencl_libs_dir', config.opencl_libs_dir) )
74+
config.available_features.add('opencl_icd')
7375
config.substitutions.append( ('%opencl_include_dir', config.opencl_include_dir) )
7476

7577
llvm_config.use_clang()

SYCL/lit.site.cfg.py.in

+3-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ config.sycl_obj_root = "@CMAKE_CURRENT_BINARY_DIR@"
1616
config.sycl_libs_dir = os.path.join(config.dpcpp_root_dir, ('bin' if platform.system() == "Windows" else 'lib'))
1717
config.target_triple = "x86_64-unknown-unknown-gnu"
1818
config.host_triple = "x86_64-unknown-unknown-gnu"
19-
config.opencl_libs_dir = config.sycl_libs_dir
19+
20+
config.opencl_libs_dir = (os.path.dirname("@OpenCL_LIBRARY@") if "@OpenCL_LIBRARY@" else "")
21+
2022
config.opencl_include_dir = config.sycl_include
2123
config.target_devices = lit_config.params.get("target_devices", "@SYCL_TARGET_DEVICES@")
2224
config.sycl_be = lit_config.params.get("sycl_be", "@SYCL_BE@")

0 commit comments

Comments
 (0)