Skip to content

Commit 2b2b5b8

Browse files
committed
[benchmarks] Remove cmake based external perf testsuite build.
If we do an external benchmark build, we will do it via the toolchain benchmark build-script job. This will be simpler by allowing us to build against a just built toolchain and separate us from the rest of swift's main CMakeLists.txt.
1 parent dee6c0b commit 2b2b5b8

File tree

3 files changed

+0
-110
lines changed

3 files changed

+0
-110
lines changed

CMakeLists.txt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,6 @@ option(SWIFT_BUILD_PERF_TESTSUITE
9999
"Create in-tree targets for building swift performance benchmarks."
100100
FALSE)
101101

102-
option(SWIFT_BUILD_EXTERNAL_PERF_TESTSUITE
103-
"Create out-of-tree targets for building swift performance benchmarks."
104-
FALSE)
105-
106102
option(SWIFT_INCLUDE_TESTS "Create targets for building/running tests." TRUE)
107103

108104
option(SWIFT_INCLUDE_DOCS
@@ -1120,10 +1116,6 @@ if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
11201116
if(SWIFT_BUILD_PERF_TESTSUITE)
11211117
add_subdirectory(benchmark)
11221118
endif()
1123-
if(SWIFT_BUILD_EXTERNAL_PERF_TESTSUITE)
1124-
include(SwiftExternalBenchmarkBuild)
1125-
add_external_benchmark_suite()
1126-
endif()
11271119
endif()
11281120

11291121
if(SWIFT_INCLUDE_TESTS)

cmake/modules/SwiftExternalBenchmarkBuild.cmake

Lines changed: 0 additions & 99 deletions
This file was deleted.

utils/build-script-impl

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1622,7 +1622,6 @@ for host in "${ALL_HOSTS[@]}"; do
16221622

16231623
# Don't build benchmarks and tests when building cross compiler.
16241624
build_perf_testsuite_this_time=false
1625-
build_external_perf_testsuite_this_time=false
16261625
build_tests_this_time=false
16271626

16281627
native_llvm_tools_path="$(build_directory "${LOCAL_HOST}" llvm)/bin"
@@ -1631,7 +1630,6 @@ for host in "${ALL_HOSTS[@]}"; do
16311630
else
16321631
# FIXME: Why is the next line not using false_true?
16331632
build_perf_testsuite_this_time=$(true_false "$(not ${SKIP_BUILD_BENCHMARKS})")
1634-
build_external_perf_testsuite_this_time=$(false_true "${SKIP_BUILD_EXTERNAL_BENCHMARKS}")
16351633
build_tests_this_time=${SWIFT_INCLUDE_TESTS}
16361634
fi
16371635

@@ -1699,7 +1697,6 @@ for host in "${ALL_HOSTS[@]}"; do
16991697
-DSWIFT_BUILD_DYNAMIC_SDK_OVERLAY:BOOL=$(true_false "${BUILD_SWIFT_DYNAMIC_SDK_OVERLAY}")
17001698
-DSWIFT_BUILD_STATIC_SDK_OVERLAY:BOOL=$(true_false "${BUILD_SWIFT_STATIC_SDK_OVERLAY}")
17011699
-DSWIFT_BUILD_PERF_TESTSUITE:BOOL=$(true_false "${build_perf_testsuite_this_time}")
1702-
-DSWIFT_BUILD_EXTERNAL_PERF_TESTSUITE:BOOL=$(true_false "${build_external_perf_testsuite_this_time}")
17031700
-DSWIFT_BUILD_EXAMPLES:BOOL=$(true_false "${BUILD_SWIFT_EXAMPLES}")
17041701
-DSWIFT_INCLUDE_TESTS:BOOL=$(true_false "${build_tests_this_time}")
17051702
-DSWIFT_EMBED_BITCODE_SECTION:BOOL=$(true_false "${EMBED_BITCODE_SECTION}")

0 commit comments

Comments
 (0)