[benchmarks] Change the build_script_helper to use subdirectories for each build and install final binaries in a toplevel ./bin build directory.

This will let me:

1. Add -Osize support easily.
2. Put all of the binaries in the same directory so that Benchmark_Driver can
   work with them via the -tools argument.

Author: gottesmm

benchmark/scripts/build_script_helper.py

@@ -4,41 +4,53 @@
 
 import argparse
 import os
+import shutil
 import subprocess
 
 
-def main():
-    parser = argparse.ArgumentParser()
-    parser.add_argument('--verbose', '-v', action='store_true')
-    parser.add_argument('--package-path', type=str, required=True)
-    parser.add_argument('--build-path', type=str, required=True)
-    parser.add_argument('--toolchain', type=str, required=True)
-
-    # Build the debug/release versions.
-    args = parser.parse_args()
-    swiftbuild_path = os.path.join(args.toolchain, 'usr', 'bin', 'swift-build')
-    swiftbuild_args = [
-        swiftbuild_path,
-        '--package-path', args.package_path,
-        '--build-path', args.build_path,
-        '--configuration', 'debug',
-    ]
-    if args.verbose:
-        swiftbuild_args.append('--verbose')
-    subprocess.call(swiftbuild_args)
+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'])
 
+    inner_build_dir = os.path.join(args.build_path, binary_name)
     swiftbuild_args = [
         swiftbuild_path,
         '--package-path', args.package_path,
-        '--build-path', args.build_path,
-        '--configuration', 'release',
+        '--build-path', inner_build_dir,
+        '--configuration', config,
         '-Xswiftc', '-Xllvm',
         '-Xswiftc', '-align-module-to-page-size',
+        '-Xswiftc', opt_flag,
     ]
     if args.verbose:
         swiftbuild_args.append('--verbose')
     subprocess.call(swiftbuild_args)
 
+    # Copy the benchmark file into the final ./bin directory.
+    binpath = os.path.join(inner_build_dir, config, 'SwiftBench')
+    finalpath = os.path.join(args.build_path, 'bin', binary_name)
+    shutil.copy(binpath, finalpath)
+
+
+def main():
+    parser = argparse.ArgumentParser()
+    parser.add_argument('--verbose', '-v', action='store_true')
+    parser.add_argument('--package-path', type=str, required=True)
+    parser.add_argument('--build-path', type=str, required=True)
+    parser.add_argument('--toolchain', type=str, required=True)
+
+    args = parser.parse_args()
+
+    # Create our bin directory so we can copy in the binaries.
+    bin_dir = os.path.join(args.build_path, 'bin')
+    if not os.path.isdir(bin_dir):
+        os.makedirs(bin_dir)
+
+    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_O', '-O')
+
 
 if __name__ == "__main__":
     main()

utils/swift_build_support/swift_build_support/products/benchmarks.py

@@ -36,11 +36,11 @@ def test(self, host_target):
            .release.
         """
         cmdline = ['--num-iters=1', 'XorLoop']
-        debug_bench = os.path.join(self.build_dir, 'debug', 'SwiftBench')
-        shell.call([debug_bench] + cmdline)
+        bench_Onone = os.path.join(self.build_dir, 'bin', 'Benchmark_Onone')
+        shell.call([bench_Onone] + cmdline)
 
-        release_bench = os.path.join(self.build_dir, 'release', 'SwiftBench')
-        shell.call([release_bench] + cmdline)
+        bench_O = os.path.join(self.build_dir, 'bin', 'Benchmark_O')
+        shell.call([bench_O] + cmdline)
 
 
 def run_build_script_helper(host_target, product, args):