Update benchmarks to Swift 4 (#14623)

This commit is contained in:
Ben Cohen
2018-02-14 17:26:58 -08:00
committed by GitHub
parent 6c6f0d0d5f
commit 3b4eacc3a8
15 changed files with 51 additions and 63 deletions

View File

@@ -219,7 +219,6 @@ function (swift_benchmark_compile_archopts)
endif()
endif()
set(common_swift3_options ${common_options} "-swift-version" "3")
set(common_swift4_options ${common_options} "-swift-version" "4")
# Always optimize the driver modules.
@@ -247,7 +246,7 @@ function (swift_benchmark_compile_archopts)
SOURCE_DIR "${srcdir}"
OBJECT_DIR "${objdir}"
SOURCES ${sources}
LIBRARY_FLAGS ${common_swift3_options})
LIBRARY_FLAGS ${common_swift4_options})
precondition(objfile_out)
list(APPEND bench_library_objects "${objfile_out}")
if (SWIFT_BENCHMARK_EMIT_SIB)
@@ -316,7 +315,7 @@ function (swift_benchmark_compile_archopts)
${stdlib_dependencies} ${bench_library_objects}
"${srcdir}/${module_name_path}.swift"
COMMAND "${SWIFT_EXEC}"
${common_swift3_options}
${common_swift4_options}
${extra_options}
"-parse-as-library"
${bench_flags}
@@ -334,7 +333,7 @@ function (swift_benchmark_compile_archopts)
${stdlib_dependencies} ${bench_library_sibfiles}
"${srcdir}/${module_name_path}.swift"
COMMAND "${SWIFT_EXEC}"
${common_swift3_options}
${common_swift4_options}
"-parse-as-library"
${bench_flags}
"-module-name" "${module_name}"
@@ -364,7 +363,7 @@ function (swift_benchmark_compile_archopts)
SOURCE_DIR "${srcdir}"
OBJECT_DIR "${objdir}"
SOURCES ${${module_name}_sources}
LIBRARY_FLAGS ${common_swift3_options} ${bench_flags}
LIBRARY_FLAGS ${common_swift4_options} ${bench_flags}
DEPENDS ${bench_library_objects} ${stdlib_dependencies})
precondition(objfile_out)
list(APPEND SWIFT_BENCH_OBJFILES "${objfile_out}")
@@ -382,7 +381,7 @@ function (swift_benchmark_compile_archopts)
SOURCE_DIR "${srcdir}"
OBJECT_DIR "${objdir}"
SOURCES ${${module_name}_sources}
LIBRARY_FLAGS ${common_swift3_options} ${bench_flags}
LIBRARY_FLAGS ${common_swift4_options} ${bench_flags}
DEPENDS ${bench_library_objects} ${stdlib_dependencies})
precondition(objfiles_out)
list(APPEND SWIFT_BENCH_OBJFILES ${objfiles_out})
@@ -435,7 +434,7 @@ function (swift_benchmark_compile_archopts)
${bench_library_sibfiles} ${bench_driver_sibfiles}
${SWIFT_BENCH_SIBFILES} "${source}"
COMMAND "${SWIFT_EXEC}"
${common_swift3_options}
${common_swift4_options}
"-force-single-frontend-invocation"
"-emit-module" "-module-name" "${module_name}"
"-I" "${objdir}"