Skip to content

Commit 121a7d5

Browse files
authored
[SYCL] sycl/test should not be repeated for different triples (#14949)
This change modifies sycl/test/CMakeLists.txt because tests should set the right triple explicitly to removes need to repeat every other test for a different triple. Fixes #14671
1 parent 3647352 commit 121a7d5

File tree

1 file changed

+0
-52
lines changed

1 file changed

+0
-52
lines changed

sycl/test/CMakeLists.txt

Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -77,15 +77,6 @@ add_custom_target(check-sycl)
7777
add_dependencies(check-sycl check-sycl-combined-triples)
7878
set_target_properties(check-sycl PROPERTIES FOLDER "SYCL tests")
7979

80-
add_lit_testsuite(check-sycl-spirv "Running device-agnostic SYCL regression tests for SPIR-V"
81-
${CMAKE_CURRENT_BINARY_DIR}
82-
ARGS ${RT_TEST_ARGS}
83-
PARAMS "SYCL_TRIPLE=spir64-unknown-unknown"
84-
DEPENDS ${SYCL_TEST_DEPS}
85-
${SYCL_TEST_EXCLUDE}
86-
EXCLUDE_FROM_CHECK_ALL
87-
)
88-
8980
add_lit_testsuite(check-sycl-dumps "Running ABI dump tests only"
9081
${CMAKE_CURRENT_BINARY_DIR}
9182
ARGS ${RT_TEST_ARGS}
@@ -94,49 +85,6 @@ add_lit_testsuite(check-sycl-dumps "Running ABI dump tests only"
9485
EXCLUDE_FROM_CHECK_ALL
9586
)
9687

97-
if(SYCL_BUILD_BACKEND_CUDA)
98-
add_lit_testsuite(check-sycl-ptx "Running device-agnostic SYCL regression tests for NVidia PTX"
99-
${CMAKE_CURRENT_BINARY_DIR}
100-
ARGS ${RT_TEST_ARGS}
101-
PARAMS "SYCL_TRIPLE=nvptx64-nvidia-cuda"
102-
DEPENDS ${SYCL_TEST_DEPS}
103-
${SYCL_TEST_EXCLUDE}
104-
EXCLUDE_FROM_CHECK_ALL
105-
)
106-
107-
add_custom_target(check-sycl-cuda)
108-
add_dependencies(check-sycl-cuda check-sycl-ptx)
109-
endif()
110-
111-
if(SYCL_BUILD_BACKEND_HIP)
112-
add_custom_target(check-sycl-hip)
113-
if("${SYCL_BUILD_PI_HIP_PLATFORM}" STREQUAL "NVIDIA")
114-
add_lit_testsuite(check-sycl-hip-ptx "Running device-agnostic SYCL regression tests for HIP NVidia PTX"
115-
${CMAKE_CURRENT_BINARY_DIR}
116-
ARGS ${RT_TEST_ARGS}
117-
PARAMS "SYCL_TRIPLE=nvptx64-nvidia-cuda"
118-
DEPENDS ${SYCL_TEST_DEPS}
119-
${SYCL_TEST_EXCLUDE}
120-
EXCLUDE_FROM_CHECK_ALL
121-
)
122-
123-
add_dependencies(check-sycl-hip check-sycl-hip-ptx)
124-
elseif("${SYCL_BUILD_PI_HIP_PLATFORM}" STREQUAL "AMD")
125-
add_lit_testsuite(check-sycl-hip-gcn "Running device-agnostic SYCL regression tests for HIP AMDGCN"
126-
${CMAKE_CURRENT_BINARY_DIR}
127-
ARGS ${RT_TEST_ARGS}
128-
PARAMS "SYCL_TRIPLE=amdgcn-amd-amdhsa"
129-
DEPENDS ${SYCL_TEST_DEPS}
130-
${SYCL_TEST_EXCLUDE}
131-
EXCLUDE_FROM_CHECK_ALL
132-
)
133-
134-
add_dependencies(check-sycl-hip check-sycl-hip-gcn)
135-
else()
136-
message(FATAL_ERROR "SYCL_BUILD_PI_HIP_PLATFORM must be set to either 'AMD' or 'NVIDIA' (set to: '${SYCL_BUILD_PI_HIP_PLATFORM}')")
137-
endif()
138-
endif()
139-
14088
if(SYCL_ENABLE_EXTENSION_JIT)
14189
add_dependencies(check-sycl check-sycl-jit)
14290
endif(SYCL_ENABLE_EXTENSION_JIT)

0 commit comments

Comments
 (0)