Merge branch 'master' into remove-strideable-closed-range-operator

Author: airspeedswift

CMakeLists.txt

@@ -176,6 +176,10 @@ option(SWIFT_FORCE_OPTIMIZED_TYPECHECKER "Override the optimization setting of
   the type checker so that it always compiles with optimization. This eases
   debugging after type checking occurs by speeding up type checking" FALSE)
 
+option(SWIFT_ENABLE_PARSEABLE_MODULE_INTERFACES
+       "Generate .swiftinterface files alongside .swiftmodule files"
+       TRUE)
+
 #
 # User-configurable Android specific options.
 #
@@ -395,23 +399,37 @@ endif()
 
 precondition(CMAKE_SYSTEM_NAME)
 if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
+  set(SWIFT_BUILD_SYNTAXPARSERLIB_default TRUE)
   set(SWIFT_BUILD_SOURCEKIT_default TRUE)
 elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
   if(EXISTS ${SWIFT_PATH_TO_LIBDISPATCH_SOURCE})
+    set(SWIFT_BUILD_SYNTAXPARSERLIB_default TRUE)
     set(SWIFT_BUILD_SOURCEKIT_default TRUE)
   else()
+    set(SWIFT_BUILD_SYNTAXPARSERLIB_default FALSE)
     set(SWIFT_BUILD_SOURCEKIT_default FALSE)
   endif()
 else()
+    set(SWIFT_BUILD_SYNTAXPARSERLIB_default FALSE)
     set(SWIFT_BUILD_SOURCEKIT_default FALSE)
 endif()
+option(SWIFT_BUILD_SYNTAXPARSERLIB
+    "Build the Swift Syntax Parser library"
+    ${SWIFT_BUILD_SYNTAXPARSERLIB_default})
 option(SWIFT_BUILD_SOURCEKIT
     "Build SourceKit"
     ${SWIFT_BUILD_SOURCEKIT_default})
 option(SWIFT_ENABLE_SOURCEKIT_TESTS
     "Enable running SourceKit tests"
     ${SWIFT_BUILD_SOURCEKIT_default})
 
+if(NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin" AND
+  (SWIFT_BUILD_SYNTAXPARSERLIB OR SWIFT_BUILD_SOURCEKIT))
+  set(SWIFT_NEED_EXPLICIT_LIBDISPATCH TRUE)
+else()
+  set(SWIFT_NEED_EXPLICIT_LIBDISPATCH FALSE)
+endif()
+
 #
 # Assume a new enough ar to generate the index at construction time. This avoids
 # having to invoke ranlib as a secondary command.
@@ -876,6 +894,96 @@ if (LLVM_ENABLE_DOXYGEN)
   message(STATUS "Doxygen: enabled")
 endif()
 
+if(SWIFT_NEED_EXPLICIT_LIBDISPATCH)
+  if(CMAKE_C_COMPILER_ID STREQUAL Clang AND
+     CMAKE_C_COMPILER_VERSION VERSION_GREATER 3.8
+     OR LLVM_USE_SANITIZER)
+   set(SWIFT_LIBDISPATCH_C_COMPILER ${CMAKE_C_COMPILER})
+   set(SWIFT_LIBDISPATCH_CXX_COMPILER ${CMAKE_CXX_COMPILER})
+ elseif(${CMAKE_SYSTEM_NAME} STREQUAL ${CMAKE_HOST_SYSTEM_NAME})
+   set(SWIFT_LIBDISPATCH_C_COMPILER ${PATH_TO_CLANG_BUILD}/bin/clang)
+   set(SWIFT_LIBDISPATCH_CXX_COMPILER ${PATH_TO_CLANG_BUILD}/bin/clang++)
+ else()
+   message(SEND_ERROR "libdispatch requires a newer clang compiler (${CMAKE_C_COMPILER_VERSION} < 3.9)")
+ endif()
+
+  include(ExternalProject)
+  ExternalProject_Add(libdispatch
+                      SOURCE_DIR
+                        "${SWIFT_PATH_TO_LIBDISPATCH_SOURCE}"
+                      CMAKE_ARGS
+                        -DCMAKE_AR=${CMAKE_AR}
+                        -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+                        -DCMAKE_C_COMPILER=${SWIFT_LIBDISPATCH_C_COMPILER}
+                        -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
+                        -DCMAKE_CXX_COMPILER=${SWIFT_LIBDISPATCH_CXX_COMPILER}
+                        -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
+                        -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
+                        -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
+                        -DCMAKE_LINKER=${CMAKE_LINKER}
+                        -DCMAKE_RANLIB=${CMAKE_RANLIB}
+                        -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
+                        -DENABLE_SWIFT=NO
+                        -DENABLE_TESTING=NO
+                      INSTALL_COMMAND
+                        # NOTE(compnerd) provide a custom install command to
+                        # ensure that we strip out the DESTDIR environment
+                        # from the sub-build
+                        ${CMAKE_COMMAND} -E env --unset=DESTDIR ${CMAKE_COMMAND} --build . --target install
+                      STEP_TARGETS
+                        install
+                      BUILD_BYPRODUCTS
+                        <INSTALL_DIR>/lib/${CMAKE_SHARED_LIBRARY_PREFIX}dispatch${CMAKE_SHARED_LIBRARY_SUFFIX}
+                        <INSTALL_DIR>/lib/${CMAKE_IMPORT_LIBRARY_PREFIX}dispatch${CMAKE_IMPORT_LIBRARY_SUFFIX}
+                        <INSTALL_DIR>/lib/${CMAKE_SHARED_LIBRARY_PREFIX}BlocksRuntime${CMAKE_SHARED_LIBRARY_SUFFIX}
+                        <INSTALL_DIR>/lib/${CMAKE_IMPORT_LIBRARY_PREFIX}BlocksRuntime${CMAKE_IMPORT_LIBRARY_SUFFIX}
+                      BUILD_ALWAYS
+                        1)
+
+  ExternalProject_Get_Property(libdispatch install_dir)
+
+  # CMake does not like the addition of INTERFACE_INCLUDE_DIRECTORIES without
+  # the directory existing.  Just create the location which will be populated
+  # during the installation.
+  file(MAKE_DIRECTORY ${install_dir}/include)
+
+  add_library(dispatch SHARED IMPORTED)
+  set_target_properties(dispatch
+                        PROPERTIES
+                          IMPORTED_LOCATION
+                            ${install_dir}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}dispatch${CMAKE_SHARED_LIBRARY_SUFFIX}
+                          IMPORTED_IMPLIB
+                            ${install_dir}/lib/${CMAKE_IMPORT_LIBRARY_PREFIX}dispatch${CMAKE_IMPORT_LIBRARY_SUFFIX}
+                          INTERFACE_INCLUDE_DIRECTORIES
+                            ${install_dir}/include)
+
+  add_library(BlocksRuntime SHARED IMPORTED)
+  set_target_properties(BlocksRuntime
+                        PROPERTIES
+                          IMPORTED_LOCATION
+                            ${install_dir}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}BlocksRuntime${CMAKE_SHARED_LIBRARY_SUFFIX}
+                          IMPORTED_IMPLIB
+                            ${install_dir}/lib/${CMAKE_IMPORT_LIBRARY_PREFIX}BlocksRuntime${CMAKE_IMPORT_LIBRARY_SUFFIX}
+                          INTERFACE_INCLUDE_DIRECTORIES
+                            ${SWIFT_PATH_TO_LIBDISPATCH_SOURCE}/src/BlocksRuntime)
+
+  add_dependencies(dispatch libdispatch-install)
+  add_dependencies(BlocksRuntime libdispatch-install)
+
+  swift_install_in_component(sourcekit-inproc
+                             FILES
+                               $<TARGET_FILE:dispatch>
+                               $<TARGET_FILE:BlocksRuntime>
+                             DESTINATION
+                               lib${LLVM_LIBDIR_SUFFIX})
+
+  # FIXME(compnerd) this should be taken care of by the
+  # INTERFACE_INCLUDE_DIRECTORIES above
+  include_directories(AFTER
+                        ${SWIFT_PATH_TO_LIBDISPATCH_SOURCE}/src/BlocksRuntime
+                        ${SWIFT_PATH_TO_LIBDISPATCH_SOURCE})
+endif()
+
 #
 # Set up global CMake variables for API notes.
 #
@@ -908,8 +1016,9 @@ endif()
 # https://bugs.swift.org/browse/SR-5975
 add_subdirectory(stdlib)
 
+add_subdirectory(include)
+
 if(SWIFT_INCLUDE_TOOLS)
-  add_subdirectory(include)
   add_subdirectory(lib)
 
   # Always include this after including stdlib/!
@@ -920,10 +1029,6 @@ endif()
 
 add_subdirectory(utils)
 
-if(SWIFT_BUILD_DYNAMIC_STDLIB AND SWIFT_INCLUDE_TESTS)
-  add_subdirectory(tools/swift-reflection-test)
-endif()
-
 if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
   if(SWIFT_BUILD_PERF_TESTSUITE)
     add_subdirectory(benchmark)

benchmark/CMakeLists.txt

@@ -42,6 +42,7 @@ set(SWIFT_BENCH_MODULES
     single-source/BinaryFloatingPointConversionFromBinaryInteger
     single-source/BinaryFloatingPointProperties
     single-source/BitCount
+    single-source/Breadcrumbs
     single-source/ByteSwap
     single-source/COWTree
     single-source/COWArrayGuaranteedParameterOverhead
@@ -55,6 +56,7 @@ set(SWIFT_BENCH_MODULES
     single-source/CharacterProperties
     single-source/Chars
     single-source/ClassArrayGetter
+    single-source/Codable
     single-source/Combos
     single-source/CountAlgo
     single-source/DataBenchmarks

benchmark/scripts/Benchmark_Driver

@@ -261,6 +261,51 @@ class LoggingReportFormatter(logging.Formatter):
             '{0} {1}{2}'.format(record.levelname, category, msg))
 
 
+class MarkdownReportHandler(logging.StreamHandler):
+    r"""Write custom formatted messages from BenchmarkDoctor to the stream.
+
+    It works around StreamHandler's hardcoded '\n' and handles the custom
+    level and category formatting for BenchmarkDoctor's check report.
+    """
+
+    def __init__(self, stream):
+        """Initialize the handler and write a Markdown table header."""
+        super(MarkdownReportHandler, self).__init__(stream)
+        self.setLevel(logging.INFO)
+        self.stream.write('\n✅  | Benchmark Check Report\n---|---')
+        self.stream.flush()
+
+    levels = {logging.WARNING: '\n⚠️', logging.ERROR: '\n⛔️',
+              logging.INFO: ' <br><sub> '}
+    categories = {'naming': '🔤', 'runtime': '⏱', 'memory': 'Ⓜ️'}
+    quotes_re = re.compile("'")
+
+    def format(self, record):
+        msg = super(MarkdownReportHandler, self).format(record)
+        return (self.levels.get(record.levelno, '') +
+                ('' if record.levelno == logging.INFO else
+                 self.categories.get(record.name.split('.')[-1], '') + ' | ') +
+                self.quotes_re.sub('`', msg))
+
+    def emit(self, record):
+        msg = self.format(record)
+        stream = self.stream
+        try:
+            if (isinstance(msg, unicode) and
+                    getattr(stream, 'encoding', None)):
+                stream.write(msg.encode(stream.encoding))
+            else:
+                stream.write(msg)
+        except UnicodeError:
+            stream.write(msg.encode("UTF-8"))
+        self.flush()
+
+    def close(self):
+        self.stream.write('\n\n')
+        self.stream.flush()
+        super(MarkdownReportHandler, self).close()
+
+
 class BenchmarkDoctor(object):
     """Checks that the benchmark conforms to the standard set of requirements.
 
@@ -302,8 +347,9 @@ class BenchmarkDoctor(object):
         ]
 
     def __del__(self):
-        """Unregister handler on exit."""
-        self.log.removeHandler(self.console_handler)
+        """Close log handlers on exit."""
+        for handler in list(self.log.handlers):
+            handler.close()
 
     capital_words_re = re.compile('[A-Z][a-zA-Z0-9]+')
 
@@ -407,20 +453,25 @@ class BenchmarkDoctor(object):
         range_i1, range_i2 = max_i1 - min_i1, max_i2 - min_i2
         normal_range = 15  # pages
         name = measurements['name']
+        more_info = False
 
         if abs(min_i1 - min_i2) > max(range_i1, range_i2, normal_range):
+            more_info = True
             BenchmarkDoctor.log_memory.error(
                 "'%s' varies the memory footprint of the base "
                 "workload depending on the `num-iters`.", name)
 
         if max(range_i1, range_i2) > normal_range:
+            more_info = True
             BenchmarkDoctor.log_memory.warning(
                 "'%s' has very wide range of memory used between "
                 "independent, repeated measurements.", name)
 
-        BenchmarkDoctor.log_memory.debug(
-            "%s mem_pages [i1, i2]:  min=[%d, %d] 𝚫=%d R=[%d, %d]", name,
-            *[min_i1, min_i2, abs(min_i1 - min_i2), range_i1, range_i2])
+        if more_info:
+            BenchmarkDoctor.log_memory.info(
+                "'%s' mem_pages [i1, i2]: min=[%d, %d] 𝚫=%d R=[%d, %d]",
+                name,
+                *[min_i1, min_i2, abs(min_i1 - min_i2), range_i1, range_i2])
 
     @staticmethod
     def _adjusted_1s_samples(runtime):
@@ -445,7 +496,7 @@ class BenchmarkDoctor(object):
         num_samples = self._adjusted_1s_samples(r.samples.min)
 
         def capped(s):
-            return min(s, 2048)
+            return min(s, 200)
         run_args = [(capped(num_samples), 1), (capped(num_samples / 2), 2)]
         opts = self.driver.args.optimization
         opts = opts if isinstance(opts, list) else [opts]