diff options
| author | Matthias Braun <matze@braunis.de> | 2018-08-21 19:24:53 +0000 |
|---|---|---|
| committer | Matthias Braun <matze@braunis.de> | 2018-08-21 19:24:53 +0000 |
| commit | 6dc6eddddcb9c28c3be3abd11664af1ed7b3b55d (patch) | |
| tree | 5628036a9f28a7df95d08ce27a1008f7073a3b5a | |
| parent | 9008bbb8df41028391f7830ff53f4c19f62a9305 (diff) | |
cmake/litsupport: Always use timeit-target in lit; NFC
Simplify things by always using timeit-target instead of switching
between timeit/timeit-target depending on the configuration.
git-svn-id: https://llvm.org/svn/llvm-project/test-suite/trunk@340323 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | cmake/modules/TestSuite.cmake | 5 | ||||
| -rw-r--r-- | litsupport/modules/timeit.py | 4 | ||||
| -rw-r--r-- | tools/CMakeLists.txt | 15 |
3 files changed, 13 insertions, 11 deletions
diff --git a/cmake/modules/TestSuite.cmake b/cmake/modules/TestSuite.cmake index f465b5d8..8922d662 100644 --- a/cmake/modules/TestSuite.cmake +++ b/cmake/modules/TestSuite.cmake @@ -52,10 +52,7 @@ endfunction() # usually do not need to call this directly when using `llvm_test_executable` # or `llvm_test_library`. function(test_suite_add_build_dependencies target) - if(NOT TEST_SUITE_USE_PERF) - add_dependencies(${target} timeit-target) - endif() - add_dependencies(${target} timeit-host fpcmp-host) + add_dependencies(${target} build-timeit build-timeit-target build-fpcmp) endfunction() # Internal function that transforms a list of flags to a string and appends diff --git a/litsupport/modules/timeit.py b/litsupport/modules/timeit.py index 7da1b677..bde2f0ec 100644 --- a/litsupport/modules/timeit.py +++ b/litsupport/modules/timeit.py @@ -10,9 +10,7 @@ def _mutateCommandLine(context, commandline): config = context.config cmd = shellcommand.parse(commandline) - timeit = "%s/tools/timeit" % config.test_source_root - if config.remote_host: - timeit = "%s/tools/timeit-target" % config.test_source_root + timeit = "%s/tools/timeit-target" % config.test_source_root args = ["--limit-core", "0"] args += ["--limit-cpu", "7200"] args += ["--timeout", "7200"] diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index ef437d4b..2fa266ad 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -5,16 +5,23 @@ include(Host) -llvm_add_host_executable(fpcmp-host fpcmp fpcmp.c) +llvm_add_host_executable(build-fpcmp fpcmp fpcmp.c) option(TEST_SUITE_USE_PERF "Use perf (timeit.sh) instead of timeit.c" Off) if(TEST_SUITE_USE_PERF) add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/timeit - COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/timeit.sh ${CMAKE_CURRENT_BINARY_DIR}/timeit + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/timeit.sh ${CMAKE_CURRENT_BINARY_DIR}/timeit COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/timeit DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/timeit.sh) - add_custom_target(timeit-host DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/timeit) + add_custom_target(build-timeit DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/timeit) + + add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/timeit-target + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/timeit.sh ${CMAKE_CURRENT_BINARY_DIR}/timeit-target + COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/timeit-target + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/timeit.sh) + add_custom_target(build-timeit-target DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/timeit-target) else() add_executable(timeit-target ${CMAKE_CURRENT_SOURCE_DIR}/timeit.c) - llvm_add_host_executable(timeit-host timeit timeit.c) + add_executable(build-timeit-target ALIAS timeit-target) + llvm_add_host_executable(build-timeit timeit timeit.c) endif() |