Skip to content
This repository was archived by the owner on Mar 28, 2023. It is now read-only.

[SYCL] Add 2nd sycl include path to LIT tests #351

Merged
merged 2 commits into from
Jul 13, 2021
Merged

[SYCL] Add 2nd sycl include path to LIT tests #351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
61ca595
[SYCL] Add 2nd sycl include path to LIT tests
dm-vodopyanov Jul 12, 2021
6a5b80b
Remove unrellated syntax change
dm-vodopyanov Jul 12, 2021
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
8 changes: 5 additions & 3 deletions SYCL/lit.cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
fp.write('int main() { uint32_t t; zeDriverGet(&t,nullptr); return t; }')

config.level_zero_libs_dir=lit_config.params.get("level_zero_libs_dir", config.level_zero_libs_dir)
config.level_zero_include=lit_config.params.get("level_zero_include", (config.level_zero_include if config.level_zero_include else os.path.join(config.sycl_include, '..')))
config.level_zero_include=lit_config.params.get("level_zero_include", (config.level_zero_include if config.level_zero_include else config.sycl_include))

level_zero_options=level_zero_options = (' -L'+config.level_zero_libs_dir if config.level_zero_libs_dir else '')+' -lze_loader '+' -I'+config.level_zero_include
if cl_options:
Expand All @@ -134,12 +134,14 @@
config.substitutions.append( ('%opencl_include_dir', config.opencl_include_dir) )

if cl_options:
config.substitutions.append( ('%sycl_options', ' sycl.lib /I'+config.sycl_include ) )
config.substitutions.append( ('%sycl_options', ' sycl.lib /I' +
config.sycl_include + ' /I' + os.path.join(config.sycl_include, 'sycl')) )
config.substitutions.append( ('%include_option', '/FI' ) )
config.substitutions.append( ('%debug_option', '/DEBUG' ) )
config.substitutions.append( ('%cxx_std_option', '/std:' ) )
else:
config.substitutions.append( ('%sycl_options', ' -lsycl -I'+config.sycl_include ) )
config.substitutions.append( ('%sycl_options', ' -lsycl -I' +
config.sycl_include + ' -I' + os.path.join(config.sycl_include, 'sycl')) )
config.substitutions.append( ('%include_option', '-include' ) )
config.substitutions.append( ('%debug_option', '-g' ) )
config.substitutions.append( ('%cxx_std_option', '-std=' ) )
Expand Down
4 changes: 2 additions & 2 deletions SYCL/lit.site.cfg.py.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ config.llvm_tools_dir = os.path.join(config.dpcpp_root_dir, 'bin')
config.lit_tools_dir = os.path.dirname("@TEST_SUITE_LIT@")
config.dump_ir_supported = lit_config.params.get("dump_ir", ("@DUMP_IR_SUPPORTED@" if "@DUMP_IR_SUPPORTED@" else False))
config.sycl_tools_dir = config.llvm_tools_dir
config.sycl_include = os.path.join(config.dpcpp_root_dir, 'include', 'sycl')
config.sycl_include = os.path.join(config.dpcpp_root_dir, 'include')
config.sycl_obj_root = "@CMAKE_CURRENT_BINARY_DIR@"
config.sycl_libs_dir = os.path.join(config.dpcpp_root_dir, ('bin' if platform.system() == "Windows" else 'lib'))

config.opencl_libs_dir = (os.path.dirname("@OpenCL_LIBRARY@") if "@OpenCL_LIBRARY@" else "")
config.level_zero_libs_dir = "@LEVEL_ZERO_LIBS_DIR@"
config.level_zero_include = "@LEVEL_ZERO_INCLUDE@"

config.opencl_include_dir = config.sycl_include
config.opencl_include_dir = os.path.join(config.sycl_include, 'sycl')
config.target_devices = lit_config.params.get("target_devices", "@SYCL_TARGET_DEVICES@")
config.sycl_be = lit_config.params.get("sycl_be", "@SYCL_BE@")
config.sycl_threads_lib = '@SYCL_THREADS_LIB@'
Expand Down