Merge remote-tracking branch 'origin/master' into master-next

Author: swift-ci

benchmark/scripts/build_script_helper.py

@@ -10,8 +10,9 @@
 
 def perform_build(args, swiftbuild_path, config, binary_name, opt_flag):
     assert(config in ['debug', 'release'])
-    assert(binary_name in ['Benchmark_O', 'Benchmark_Onone'])
-    assert(opt_flag in ['-O', '-Onone'])
+    assert(binary_name in ['Benchmark_O', 'Benchmark_Osize',
+                           'Benchmark_Onone'])
+    assert(opt_flag in ['-O', '-Osize', '-Onone'])
 
     inner_build_dir = os.path.join(args.build_path, binary_name)
     swiftbuild_args = [
@@ -49,6 +50,8 @@ def main():
 
     swiftbuild_path = os.path.join(args.toolchain, 'usr', 'bin', 'swift-build')
     perform_build(args, swiftbuild_path, 'debug', 'Benchmark_Onone', '-Onone')
+    perform_build(args, swiftbuild_path, 'release', 'Benchmark_Osize',
+                  '-Osize')
     perform_build(args, swiftbuild_path, 'release', 'Benchmark_O', '-O')
 
 

utils/build-script

@@ -895,7 +895,7 @@ class BuildScriptInvocation(object):
         if self.args.build_sourcekitlsp:
             product_classes.append(products.SourceKitLSP)
         if self.args.build_toolchainbenchmarks:
-            product_classes.append(products.ToolchainBenchmarks)
+            product_classes.append(products.Benchmarks)
         return product_classes
 
     def execute(self):

utils/swift_build_support/swift_build_support/products/__init__.py

@@ -10,7 +10,7 @@
 #
 # ----------------------------------------------------------------------------
 
-from .benchmarks import ToolchainBenchmarks
+from .benchmarks import Benchmarks
 from .cmark import CMark
 from .foundation import Foundation
 from .indexstoredb import IndexStoreDB
@@ -48,5 +48,5 @@
     'SwiftEvolve',
     'IndexStoreDB',
     'SourceKitLSP',
-    'ToolchainBenchmarks',
+    'Benchmarks',
 ]

utils/swift_build_support/swift_build_support/products/benchmarks.py

@@ -19,7 +19,7 @@
 
 
 # Build against the current installed toolchain.
-class ToolchainBenchmarks(product.Product):
+class Benchmarks(product.Product):
     @classmethod
     def product_source_name(cls):
         return "benchmarks"
@@ -42,6 +42,9 @@ def test(self, host_target):
         bench_O = os.path.join(self.build_dir, 'bin', 'Benchmark_O')
         shell.call([bench_O] + cmdline)
 
+        bench_Osize = os.path.join(self.build_dir, 'bin', 'Benchmark_Osize')
+        shell.call([bench_Osize] + cmdline)
+
 
 def run_build_script_helper(host_target, product, args):
     toolchain_path = args.install_destdir