Merge pull request #9 from apple/master

merge

Author: JacobMao

CMakeLists.txt

@@ -295,10 +295,6 @@ option(SWIFT_RUNTIME_ENABLE_LEAK_CHECKER
   "Should the runtime be built with support for non-thread-safe leak detecting entrypoints"
   FALSE)
 
-option(SWIFT_STDLIB_ENABLE_RESILIENCE
-    "Build the standard libraries and overlays with resilience enabled; see docs/LibraryEvolution.rst"
-    FALSE)
-
 option(SWIFT_STDLIB_USE_NONATOMIC_RC
     "Build the standard libraries and overlays with nonatomic reference count operations enabled"
     FALSE)
@@ -828,7 +824,7 @@ message(STATUS "  LTO:            ${SWIFT_TOOLS_ENABLE_LTO}")
 message(STATUS "  +0 Normal Args: ${SWIFT_ENABLE_GUARANTEED_NORMAL_ARGUMENTS}")
 message(STATUS "")
 
-if (SWIFT_BULID_STDLIB OR SWIFT_BUILD_SDK_OVERLAY)
+if (SWIFT_BUILD_STDLIB OR SWIFT_BUILD_SDK_OVERLAY)
 
   message(STATUS "Building Swift standard library and overlays for SDKs: ${SWIFT_SDKS}")
   message(STATUS "  Build type:       ${SWIFT_STDLIB_BUILD_TYPE}")

benchmark/CMakeLists.txt

@@ -55,13 +55,15 @@ set(SWIFT_BENCH_MODULES
     single-source/Chars
     single-source/ClassArrayGetter
     single-source/Combos
+    single-source/DataBenchmarks
     single-source/DeadArray
     single-source/DictOfArraysToArrayOfDicts
     single-source/DictTest
     single-source/DictTest2
     single-source/DictTest3
     single-source/DictTest4
     single-source/DictionaryBridge
+    single-source/DictionaryCopy
     single-source/DictionaryGroup
     single-source/DictionaryLiteral
     single-source/DictionaryRemove
@@ -75,6 +77,7 @@ set(SWIFT_BENCH_MODULES
     single-source/Exclusivity
     single-source/ExistentialPerformance
     single-source/Fibonacci
+    single-source/FloatingPointPrinting
     single-source/Hanoi
     single-source/Hash
     single-source/HashQuadratic

benchmark/scripts/Benchmark_QuickCheck.in

@@ -0,0 +1,114 @@
+#!/usr/bin/env python
+
+# ===--- Benchmark_QuickCheck.in -----------------------------------------===//
+#
+#  This source file is part of the Swift.org open source project
+#
+#  Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+#  Licensed under Apache License v2.0 with Runtime Library Exception
+#
+#  See https://swift.org/LICENSE.txt for license information
+#  See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+#
+# ===---------------------------------------------------------------------===//
+
+import json
+import os
+import subprocess
+import sys
+
+sys.path.append("@PATH_TO_DRIVER_LIBRARY@")
+
+import perf_test_driver  # noqa (E402 module level import not at top of file)
+
+# This is a hacked up XFAIL list. It should really be a json file, but it will
+# work for now. Add in the exact name of the pass to XFAIL.
+XFAIL_LIST = [
+]
+
+
+class QuickCheckResult(perf_test_driver.Result):
+
+    def __init__(self, name, success):
+        assert(isinstance(success, bool))
+        did_fail = not success
+        perf_test_driver.Result.__init__(self, name, did_fail, "", XFAIL_LIST)
+
+    def print_data(self, max_test_len):
+        fmt = '{:<%d}{:<10}' % (max_test_len + 5)
+        print(fmt.format(self.get_name(), self.get_result()))
+
+
+class QuickCheckBenchmarkDriver(perf_test_driver.BenchmarkDriver):
+
+    def __init__(self, binary, xfail_list, num_iters):
+        perf_test_driver.BenchmarkDriver.__init__(
+            self, binary, xfail_list,
+            enable_parallel=True)
+        self.num_iters = num_iters
+
+    def print_data_header(self, max_test_len):
+        fmt = '{:<%d}{:<10}{:}' % (max_test_len + 5)
+        print(fmt.format('Name', 'Result', 'RC Delta'))
+
+    # Propagate any data from this class that is needed for individual
+    # tests. The reason this is needed is to avoid issues with attempting to
+    # access a value in a different process.
+    def prepare_input(self, name):
+        return {'num_samples': 1, 'num_iters': self.num_iters}
+
+    def run_test_inner(self, data, num_iters):
+        p = subprocess.Popen([
+            data['path'],
+            "--num-samples={}".format(data['num_samples']),
+            "--num-iters={}".format(num_iters), data['test_name']],
+            stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        error_out = p.communicate()[1].split("\n")
+        result = p.returncode
+        if result is None:
+            raise RuntimeError("Expected one line of output")
+        if result != 0:
+            raise RuntimeError("Process segfaulted")
+        return error_out
+
+    def run_test(self, data, num_iters):
+        try:
+            args = [data, num_iters]
+            result = perf_test_driver.run_with_timeout(self.run_test_inner,
+                                                       args)
+        except Exception, e:
+            sys.stderr.write("Child Process Failed! (%s,%s). Error: %s\n" % (
+                data['path'], data['test_name'], e))
+            sys.stderr.flush()
+            return None
+        return True
+
+    def process_input(self, data):
+        test_name = '({},{})'.format(data['opt'], data['test_name'])
+        print("Running {}...".format(test_name))
+        sys.stdout.flush()
+        if self.run_test(data, data['num_iters']) is None:
+            return QuickCheckResult(test_name, success=False)
+        return QuickCheckResult(test_name, success=True)
+
+
+SWIFT_BIN_DIR = os.path.dirname(os.path.abspath(__file__))
+
+
+def parse_args():
+    import argparse
+    parser = argparse.ArgumentParser()
+    parser.add_argument(
+        '-filter', type=str, default=None,
+        help='Filter out any test that does not match the given regex')
+    parser.add_argument('-num-iters', type=int, default=2)
+    return parser.parse_args()
+
+
+if __name__ == "__main__":
+    args = parse_args()
+    l = QuickCheckBenchmarkDriver(SWIFT_BIN_DIR, XFAIL_LIST, args.num_iters)
+    if l.run(args.filter):
+        sys.exit(0)
+    else:
+        sys.exit(-1)

benchmark/scripts/CMakeLists.txt

@@ -8,6 +8,10 @@ configure_file(
   ${CMAKE_CURRENT_SOURCE_DIR}/Benchmark_RuntimeLeaksRunner.in
   ${CMAKE_CURRENT_BINARY_DIR}/Benchmark_RuntimeLeaksRunner
   @ONLY)
+configure_file(
+  ${CMAKE_CURRENT_SOURCE_DIR}/Benchmark_QuickCheck.in
+  ${CMAKE_CURRENT_BINARY_DIR}/Benchmark_QuickCheck
+  @ONLY)
 configure_file(
   ${CMAKE_CURRENT_SOURCE_DIR}/Benchmark_DTrace.in
   ${CMAKE_CURRENT_BINARY_DIR}/Benchmark_DTrace
@@ -24,6 +28,11 @@ file(COPY ${CMAKE_CURRENT_BINARY_DIR}/Benchmark_RuntimeLeaksRunner
      FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ
      GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 
+file(COPY ${CMAKE_CURRENT_BINARY_DIR}/Benchmark_QuickCheck
+     DESTINATION "${swift-bin-dir}"
+     FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ
+     GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+
 file(COPY ${CMAKE_CURRENT_BINARY_DIR}/Benchmark_DTrace
      DESTINATION "${swift-bin-dir}"
      FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ