From 542ef93c65526f55500335b5b4e9039f05e82102 Mon Sep 17 00:00:00 2001 From: Alexey Bader Date: Fri, 10 Jul 2020 21:31:58 +0300 Subject: [PATCH 1/3] [SYCL][LIT] Add target to run SYCL LIT tests on OpenCL back-end --- sycl/test/CMakeLists.txt | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/sycl/test/CMakeLists.txt b/sycl/test/CMakeLists.txt index 00df5fd456ad3..8ebcd84c3b0e8 100644 --- a/sycl/test/CMakeLists.txt +++ b/sycl/test/CMakeLists.txt @@ -42,13 +42,6 @@ list(APPEND SYCL_DEPLOY_TEST_DEPS deploy-sycl-toolchain ) -add_lit_testsuite(check-sycl "Running the SYCL regression tests" - ${CMAKE_CURRENT_BINARY_DIR} - ARGS ${RT_TEST_ARGS} - PARAMS "SYCL_BE=PI_OPENCL" - DEPENDS ${SYCL_TEST_DEPS} - ) - add_lit_testsuite(check-sycl-deploy "Running the SYCL regression tests" ${CMAKE_CURRENT_BINARY_DIR} ARGS ${DEPLOY_RT_TEST_ARGS} @@ -56,7 +49,7 @@ add_lit_testsuite(check-sycl-deploy "Running the SYCL regression tests" DEPENDS ${SYCL_DEPLOY_TEST_DEPS} EXCLUDE_FROM_CHECK_ALL ) -set_target_properties(check-sycl PROPERTIES FOLDER "SYCL tests") +set_target_properties(check-sycl-deploy PROPERTIES FOLDER "SYCL tests") add_lit_testsuites(SYCL ${CMAKE_CURRENT_SOURCE_DIR} DEPENDS ${SYCL_TEST_DEPS} @@ -76,16 +69,29 @@ add_lit_target(check-sycl-inline-asm PARAMS "SYCL_BE=PI_OPENCL" DEPENDS ${SYCL_TEST_DEPS} ) +set_target_properties(check-sycl-inline-asm PROPERTIES FOLDER "SYCL tests") -add_lit_testsuite(check-level0 "Running the SYCL regression tests for Level Zero" +add_lit_testsuite(check-sycl-opencl "Running the SYCL regression tests for OpenCL" + ${CMAKE_CURRENT_BINARY_DIR} + ARGS ${RT_TEST_ARGS} + PARAMS "SYCL_BE=PI_OPENCL" + DEPENDS ${SYCL_TEST_DEPS} + EXCLUDE_FROM_CHECK_ALL + ) +set_target_properties(check-sycl-opencl PROPERTIES FOLDER "SYCL tests") + +add_lit_testsuite(check-sycl-level0 "Running the SYCL regression tests for Level Zero" ${CMAKE_CURRENT_BINARY_DIR} ARGS ${RT_TEST_ARGS} PARAMS "SYCL_BE=PI_LEVEL0" DEPENDS ${SYCL_TEST_DEPS} EXCLUDE_FROM_CHECK_ALL ) +set_target_properties(check-sycl-level0 PROPERTIES FOLDER "SYCL tests") -add_dependencies(check-sycl check-level0) +add_custom_target(check-sycl) +add_dependencies(check-sycl check-sycl-opencl check-sycl-level0) +set_target_properties(check-sycl PROPERTIES FOLDER "SYCL tests") if(SYCL_BUILD_PI_CUDA) add_lit_testsuite(check-sycl-cuda "Running the SYCL regression tests for CUDA" @@ -94,9 +100,10 @@ if(SYCL_BUILD_PI_CUDA) PARAMS "SYCL_BE=PI_CUDA" DEPENDS ${SYCL_TEST_DEPS} ) - set_target_properties(check-sycl-cuda PROPERTIES FOLDER "SYCL CUDA tests") + add_dependencies(check-sycl check-sycl-cuda) + add_lit_testsuites(SYCL-CUDA ${CMAKE_CURRENT_SOURCE_DIR} PARAMS "SYCL_BE=PI_CUDA" DEPENDS ${SYCL_TEST_DEPS} From c026a4ea420bb4a75faed7757e4e2e7e87f05b3e Mon Sep 17 00:00:00 2001 From: Alexey Bader Date: Sun, 12 Jul 2020 13:08:01 +0300 Subject: [PATCH 2/3] [SYCL] Exclude SYCL lit tests from check-all target --- sycl/test/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sycl/test/CMakeLists.txt b/sycl/test/CMakeLists.txt index 8ebcd84c3b0e8..784f27d6b6acb 100644 --- a/sycl/test/CMakeLists.txt +++ b/sycl/test/CMakeLists.txt @@ -53,6 +53,7 @@ set_target_properties(check-sycl-deploy PROPERTIES FOLDER "SYCL tests") add_lit_testsuites(SYCL ${CMAKE_CURRENT_SOURCE_DIR} DEPENDS ${SYCL_TEST_DEPS} + EXCLUDE_FROM_CHECK_ALL ) add_lit_testsuites(SYCL-DEPLOY ${CMAKE_CURRENT_SOURCE_DIR} @@ -68,6 +69,7 @@ add_lit_target(check-sycl-inline-asm ARGS ${RT_TEST_ARGS} PARAMS "SYCL_BE=PI_OPENCL" DEPENDS ${SYCL_TEST_DEPS} + EXCLUDE_FROM_CHECK_ALL ) set_target_properties(check-sycl-inline-asm PROPERTIES FOLDER "SYCL tests") @@ -99,6 +101,7 @@ if(SYCL_BUILD_PI_CUDA) ARGS ${RT_TEST_ARGS} PARAMS "SYCL_BE=PI_CUDA" DEPENDS ${SYCL_TEST_DEPS} + EXCLUDE_FROM_CHECK_ALL ) set_target_properties(check-sycl-cuda PROPERTIES FOLDER "SYCL CUDA tests") @@ -107,5 +110,6 @@ if(SYCL_BUILD_PI_CUDA) add_lit_testsuites(SYCL-CUDA ${CMAKE_CURRENT_SOURCE_DIR} PARAMS "SYCL_BE=PI_CUDA" DEPENDS ${SYCL_TEST_DEPS} + EXCLUDE_FROM_CHECK_ALL ) endif() From 507b8409e58339d7d9591be8a45cfde136fbe79a Mon Sep 17 00:00:00 2001 From: Alexey Bader Date: Sun, 12 Jul 2020 13:12:12 +0300 Subject: [PATCH 3/3] [SYCL] Remove EXCLUDE_FROM_CHECK_ALL argument from add_lit_target add_lit_target can't handle this argument --- sycl/test/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/sycl/test/CMakeLists.txt b/sycl/test/CMakeLists.txt index 784f27d6b6acb..4010c13d3b219 100644 --- a/sycl/test/CMakeLists.txt +++ b/sycl/test/CMakeLists.txt @@ -69,7 +69,6 @@ add_lit_target(check-sycl-inline-asm ARGS ${RT_TEST_ARGS} PARAMS "SYCL_BE=PI_OPENCL" DEPENDS ${SYCL_TEST_DEPS} - EXCLUDE_FROM_CHECK_ALL ) set_target_properties(check-sycl-inline-asm PROPERTIES FOLDER "SYCL tests")