Merge branch 'master' into comparable-enums

Author: tayloraswift

CMakeLists.txt

@@ -7,6 +7,11 @@ if(POLICY CMP0068)
   cmake_policy(SET CMP0068 OLD)
 endif()
 
+# Honour CMAKE_CXX_STANDARD in try_compile(), needed for check_cxx_native_regex.
+if(POLICY CMP0067)
+  cmake_policy(SET CMP0067 NEW)
+endif()
+
 # Add path for custom CMake modules.
 list(APPEND CMAKE_MODULE_PATH
     "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
@@ -385,63 +390,6 @@ option(SWIFT_ENABLE_EXPERIMENTAL_DIFFERENTIABLE_PROGRAMMING
 # End of user-configurable options.
 #
 
-# Look for either a program in execute_process()'s path or for a hardcoded path.
-# Find a program's version and set it in the parent scope.
-# Replace newlines with spaces so it prints on one line.
-function(find_version cmd flag find_in_path)
-  if(find_in_path)
-    message(STATUS "Finding installed version for: ${cmd}")
-  else()
-    message(STATUS "Finding version for: ${cmd}")
-  endif()
-  execute_process(
-    COMMAND ${cmd} ${flag}
-    OUTPUT_VARIABLE out
-    OUTPUT_STRIP_TRAILING_WHITESPACE)
-  if(NOT out)
-    if(find_in_path)
-      message(STATUS "tried to find version for ${cmd}, but ${cmd} not found in path, continuing")
-    else()
-      message(FATAL_ERROR "tried to find version for ${cmd}, but ${cmd} not found")
-    endif()
-  else()
-    string(REPLACE "\n" " " out2 ${out})
-    message(STATUS "Found version: ${out2}")
-  endif()
-  message(STATUS "")
-endfunction()
-
-# Print out path and version of any installed commands.
-# We migth be using the wrong version of a command, so record them all.
-function(print_versions)
-  find_version("${CMAKE_COMMAND}" "--version" TRUE)
-
-  message(STATUS "Finding version for: ${CMAKE_COMMAND}")
-  message(STATUS "Found version: ${CMAKE_VERSION}")
-  message(STATUS "")
-
-  get_filename_component(CMAKE_MAKE_PROGRAM_BN "${CMAKE_MAKE_PROGRAM}" NAME_WE)
-  if(${CMAKE_MAKE_PROGRAM_BN} STREQUAL "ninja" OR
-     ${CMAKE_MAKE_PROGRAM_BN} STREQUAL "make")
-    find_version(${CMAKE_MAKE_PROGRAM_BN} "--version" TRUE)
-    find_version(${CMAKE_MAKE_PROGRAM} "--version" FALSE)
-  endif()
-
-  if(${SWIFT_PATH_TO_CMARK_BUILD})
-    find_version("cmark" "--version" TRUE)
-    find_version("${SWIFT_PATH_TO_CMARK_BUILD}/src/cmark" "--version" FALSE)
-  endif()
-
-  message(STATUS "Finding version for: ${CMAKE_C_COMPILER}")
-  message(STATUS "Found version: ${CMAKE_C_COMPILER_VERSION}")
-  message(STATUS "")
-
-  message(STATUS "Finding version for: ${CMAKE_CXX_COMPILER}")
-  message(STATUS "Found version: ${CMAKE_CXX_COMPILER_VERSION}")
-  message(STATUS "")
-endfunction()
-
-
 set(SWIFT_BUILT_STANDALONE FALSE)
 if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
   set(SWIFT_BUILT_STANDALONE TRUE)
@@ -493,7 +441,21 @@ include(CheckCXXSourceRuns)
 include(CMakeParseArguments)
 include(CMakePushCheckState)
 
-print_versions()
+# Print out path and version of any installed commands
+message(STATUS "CMake (${CMAKE_COMMAND}) Version: ${CMAKE_VERSION}")
+execute_process(COMMAND ${CMAKE_MAKE_PROGRAM} --version
+  OUTPUT_VARIABLE _CMAKE_MAKE_PROGRAM_VERSION
+  OUTPUT_STRIP_TRAILING_WHITESPACE)
+message(STATUS "CMake Make Program (${CMAKE_MAKE_PROGRAM}) Version: ${_CMAKE_MAKE_PROGRAM_VERSION}")
+message(STATUS "C Compiler (${CMAKE_C_COMPILER}) Version: ${CMAKE_C_COMPILER_VERSION}")
+message(STATUS "C++ Compiler (${CMAKE_CXX_COMPILER}) Version: ${CMAKE_CXX_COMPILER_VERSION}")
+if(SWIFT_PATH_TO_CMARK_BUILD)
+  execute_process(COMMAND ${SWIFT_PATH_TO_CMARK_BUILD}/src/cmark --version
+    OUTPUT_VARIABLE _CMARK_VERSION
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+  message(STATUS "CMark Version: ${_CMARK_VERSION}")
+endif()
+message(STATUS "")
 
 include(SwiftSharedCMakeConfig)
 
@@ -872,6 +834,9 @@ if(SWIFT_BUILD_STDLIB OR SWIFT_BUILD_SDK_OVERLAY)
   message(STATUS "Building Swift runtime with:")
   message(STATUS "  Leak Detection Checker Entrypoints: ${SWIFT_RUNTIME_ENABLE_LEAK_CHECKER}")
   message(STATUS "")
+
+  message(STATUS "Differentiable Programming Support: ${SWIFT_ENABLE_EXPERIMENTAL_DIFFERENTIABLE_PROGRAMMING}")
+  message(STATUS "")
 else()
   message(STATUS "Not building Swift standard library, SDK overlays, and runtime")
   message(STATUS "")
@@ -930,6 +895,19 @@ else()
   find_package(LibEdit)
 endif()
 
+if(LibEdit_FOUND)
+  cmake_push_check_state()
+  list(APPEND CMAKE_REQUIRED_INCLUDES ${LibEdit_INCLUDE_DIRS})
+  list(APPEND CMAKE_REQUIRED_LIBRARIES ${LibEdit_LIBRARIES})
+  check_symbol_exists(el_wgets "histedit.h" HAVE_EL_WGETS)
+  if(HAVE_EL_WGETS)
+    set(LibEdit_HAS_UNICODE YES)
+  else()
+    set(LibEdit_HAS_UNICODE NO)
+  endif()
+  cmake_pop_check_state()
+endif()
+
 check_symbol_exists(wait4 "sys/wait.h" HAVE_WAIT4)
 
 check_symbol_exists(proc_pid_rusage "libproc.h" HAVE_PROC_PID_RUSAGE)

benchmark/scripts/Benchmark_DTrace.in

@@ -35,11 +35,13 @@ class DTraceResult(perf_test_driver.Result):
             self, name, status, output, XFAIL_LIST)
         self.csv_output = csv_output
 
+    def is_failure(self):
+        return not bool(self.status)
+
     @classmethod
     def data_headers(cls):
         return [
-            'Name', 'Result', 'strong_retain', 'strong_retain/iter',
-            'strong_release', 'strong_release/iter']
+            'Name', 'Result', 'Total RR Opts', 'Total RR Opts/Iter']
 
     @classmethod
     def data_format(cls, max_test_len):
@@ -70,7 +72,7 @@ class DTraceBenchmarkDriver(perf_test_driver.BenchmarkDriver):
     def __init__(self, binary, xfail_list, csv_output):
         perf_test_driver.BenchmarkDriver.__init__(
             self, binary, xfail_list,
-            enable_parallel=False,
+            enable_parallel=True,
             opt_levels=['O'])
         self.csv_output = csv_output
 
@@ -86,24 +88,46 @@ class DTraceBenchmarkDriver(perf_test_driver.BenchmarkDriver):
         sys.stdout.flush()
 
         def get_results_with_iters(iters):
+            e = os.environ
+            e['SWIFT_DETERMINISTIC_HASHING'] = '1'
             p = subprocess.Popen([
                 'sudo', 'dtrace', '-s', DTRACE_PATH,
-                '-c', '%s %s %s' % (data['path'], data['test_name'],
-                                    '--num-iters=%d' % iters)
-            ], stdout=subprocess.PIPE, stderr=open('/dev/null', 'w'))
+                '-c', '%s %s %s %s' % (data['path'], data['test_name'],
+                                       '--num-iters=%d' % iters,
+                                       '--num-samples=2')
+            ], stdout=subprocess.PIPE, stderr=open('/dev/null', 'w'), env=e)
             results = [x for x in p.communicate()[0].split("\n") if len(x) > 0]
             return [
                 x.split(',')[1] for x in
                 results[results.index('DTRACE RESULTS') + 1:]]
         iter_2_results = get_results_with_iters(2)
         iter_3_results = get_results_with_iters(3)
+        iter_5_results = get_results_with_iters(5)
 
         results = []
-        for x in zip(iter_2_results, iter_3_results):
-            results.append(x[1])
-            results.append(int(x[1]) - int(x[0]))
+        foundInstability = False
+        for x in zip(iter_2_results, iter_3_results, iter_5_results):
+            result_2 = int(x[0])
+            result_3 = int(x[1])
+            result_5 = int(x[2])
+
+            single_iter = result_3 - result_2
+            two_iter = result_5 - result_3
+
+            # We are always doing more work, so these should be the same. Fail
+            # if we have a negative number.
+            if single_iter < 0 or two_iter < 0:
+                foundInstability = True
+
+            # Our retain traffic should always increase linearly with iteration
+            # size.
+            if (single_iter * 2) == two_iter:
+                foundInstability = True
+
+            results.append(result_3)
+            results.append(single_iter)
 
-        return DTraceResult(test_name, 0, results, self.csv_output)
+        return DTraceResult(test_name, int(not foundInstability), results)
 
 
 SWIFT_BIN_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -117,7 +141,7 @@ def parse_args():
         default=None,
         help='Filter out any test that does not match the given regex')
     parser.add_argument(
-        '-csv',
+        '--emit-csv',
         default=False,
         action='store_true',
         help="Emit csv output",

benchmark/scripts/perf_test_driver/perf_test_driver.py

@@ -21,7 +21,7 @@
 import subprocess
 
 
-BENCHMARK_OUTPUT_RE = re.compile('([^,]+),')
+BENCHMARK_OUTPUT_RE = re.compile(r'\d+,([^,]+)')
 
 
 class Result(object):

benchmark/scripts/perf_test_driver/swift_stats.d

@@ -12,12 +12,22 @@
 
 pid$target:*:swift_retain:entry
 {
-        @counts[probefunc] = count();
+        @counts["rr-opts"] = count();
 }
 
 pid$target:*:swift_release:entry
 {
-        @counts[probefunc] = count();
+        @counts["rr-opts"] = count();
+}
+
+pid$target:*:swift_retain_n:entry
+{
+        @counts["rr-opts"] = count();
+}
+
+pid$target:*:swift_release_n:entry
+{
+        @counts["rr-opts"] = count();
 }
 
 END