Skip to content

[SYCL] Add check-sycl-dumps target for dumps-only testing #7830

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.

Sign up for GitHub

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
Dec 19, 2022
Merged

[SYCL] Add check-sycl-dumps target for dumps-only testing #7830

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
9fe36ad
[SYCL] Add check-sycl-dumps target for dumps-only testing
steffenlarsen Dec 19, 2022
1216c39
Remove unused TOOLCHAIN option
steffenlarsen Dec 19, 2022
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: 5 additions & 1 deletion sycl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,8 +298,12 @@ add_custom_target(sycl-compiler
opencl-aot
)

add_custom_target( sycl-toolchain
add_custom_target( sycl-runtime-libraries
DEPENDS ${SYCL_RT_LIBS}
)

add_custom_target( sycl-toolchain
DEPENDS sycl-runtime-libraries
sycl-compiler
sycl-ls
${XPTIFW_LIBS}
Expand Down
7 changes: 2 additions & 5 deletions sycl/cmake/modules/AddSYCL.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
function(add_sycl_library LIB_NAME TYPE)
cmake_parse_arguments("ARG"
"TOOLCHAIN"
""
"LINKER_SCRIPT"
"SOURCES;INCLUDE_DIRS;LIBRARIES"
${ARGN}
Expand All @@ -9,9 +9,7 @@ function(add_sycl_library LIB_NAME TYPE)
target_include_directories(${LIB_NAME} PRIVATE ${ARG_INCLUDE_DIRS})
target_link_libraries(${LIB_NAME} PRIVATE ${ARG_LIBRARIES})

if (ARG_TOOLCHAIN)
add_dependencies(sycl-toolchain ${LIB_NAME})
endif()
add_dependencies(sycl-runtime-libraries ${LIB_NAME})

if (ARG_LINKER_SCRIPT AND UNIX AND NOT APPLE)
target_link_libraries(${LIB_NAME} PRIVATE
Expand Down Expand Up @@ -39,7 +37,6 @@ function(add_sycl_plugin PLUGIN_NAME)
)

add_sycl_library("pi_${PLUGIN_NAME}" SHARED
TOOLCHAIN
LINKER_SCRIPT "${PROJECT_SOURCE_DIR}/plugins/ld-version-script.txt"
SOURCES ${ARG_SOURCES}
INCLUDE_DIRS
Expand Down
8 changes: 8 additions & 0 deletions sycl/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,14 @@ add_lit_testsuite(check-sycl-spirv "Running device-agnostic SYCL regression test
${SYCL_TEST_EXCLUDE}
)

add_lit_testsuite(check-sycl-dumps "Running ABI dump tests only"
${CMAKE_CURRENT_BINARY_DIR}
ARGS ${RT_TEST_ARGS}
PARAMS "SYCL_LIB_DUMPS_ONLY=True"
DEPENDS sycl-runtime-libraries llvm-readobj
EXCLUDE_FROM_CHECK_ALL
)

add_custom_target(check-sycl)
add_dependencies(check-sycl check-sycl-spirv)
set_target_properties(check-sycl PROPERTIES FOLDER "SYCL tests")
Expand Down
10 changes: 8 additions & 2 deletions sycl/test/lit.cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,11 @@
config.test_format = lit.formats.ShTest()

# suffixes: A list of file extensions to treat as test files.
config.suffixes = ['.c', '.cpp', '.dump', '.test'] #add .spv. Currently not clear what to do with those
dump_only_tests = bool(lit_config.params.get('SYCL_LIB_DUMPS_ONLY', False))
if dump_only_tests:
config.suffixes = ['.dump'] # Only run dump testing
else:
config.suffixes = ['.c', '.cpp', '.dump', '.test'] #add .spv. Currently not clear what to do with those

# feature tests are considered not so lightweight, so, they are excluded by default
config.excludes = ['Inputs', 'feature-tests']
Expand Down Expand Up @@ -118,7 +122,9 @@
additional_flags += ['-Xsycl-target-backend=amdgcn-amd-amdhsa',
'--offload-arch=gfx906']

llvm_config.use_clang(additional_flags=additional_flags)
# Dump-only tests do not have clang available
if not dump_only_tests:
llvm_config.use_clang(additional_flags=additional_flags)

# Set timeout for test = 10 mins
try:
Expand Down