Some improvements on hip cmake file

1.Fix unexpected repeated hip runtime lib building
2.Seperate test cmake from top cmake.

Change-Id: I1ae457effd639d6c25bca293c1724b026be21ecd
Esse commit está contido em:
Tao Sang authored and Tao Sang committed 2020-12-11 13:32:15 -05:00
1 pai 09a1c22208
commit d074c2491f
4 files changed
+34 -51

No files matched your search

+31
Ver Arquivo
@@ -0,0 +1,31 @@
###############################################################################
# Tests.cmake
###############################################################################
# Add tests
include_directories(${HIP_SRC_PATH}/tests/src)
hit_add_directory_recursive(${HIP_CTEST_CONFIG_DEFAULT} ${HIP_SRC_PATH}/tests/src "directed_tests")
# Add unit tests
include_directories(${HIP_SRC_PATH}/tests/unit)
hit_add_directory_recursive(${HIP_CTEST_CONFIG_DEFAULT} ${HIP_SRC_PATH}/tests/unit "unit_tests")
# Add performance tests
include_directories(${HIP_SRC_PATH}/tests/performance)
hit_add_directory_recursive(${HIP_CTEST_CONFIG_PERFORMANCE} ${HIP_SRC_PATH}/tests/performance "performance_tests")
# Add top-level tests to build_tests
add_custom_target(build_tests DEPENDS directed_tests unit_tests)
# Add top-level tests to build performance_tests.
# To build performance tests, just run "make build_perf"
add_custom_target(build_perf DEPENDS performance_tests)
# Add custom target: perf.
# To run performance tests, just run "make perf"
add_custom_target(perf COMMAND "${CMAKE_CTEST_COMMAND}" -C "${HIP_CTEST_CONFIG_PERFORMANCE}" -R "performance_tests/" --verbose)
# Add custom target: check
add_custom_target(check COMMAND "${CMAKE_COMMAND}" --build . --target test DEPENDS build_tests)
# vim: ts=4:sw=4:expandtab:smartindent
-13
Ver Arquivo
@@ -1,13 +0,0 @@
cmake_minimum_required(VERSION 2.8.3)
project(hip_tests)
# Setup
#set(HIP_PATH @CMAKE_INSTALL_PREFIX@)
#set(ENV{HIP_PATH} ${HIP_PATH})
set(HIP_SRC_PATH @hip_SOURCE_DIR@)
set(CMAKE_MODULE_PATH "${HIP_PATH}/cmake" ${CMAKE_MODULE_PATH})
include(${HIP_SRC_PATH}/tests/hit/HIT.cmake)
# Add tests
include_directories(${HIP_SRC_PATH}/tests/src)
hit_add_directory_recursive(${HIP_CTEST_CONFIG_DEFAULT} ${HIP_SRC_PATH}/tests/src "directed_tests")