---

yaml
---
r: 343353
b: refs/heads/master-rebranch
c: 2ad0360
h: refs/heads/master
i:
  343351: 4b110fc

Author: swift-ci

[refs]

@@ -1455,7 +1455,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-02-a: ddd2b2976aa9bfde5f20fe37f6bd2
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-03-a: 171cc166f2abeb5ca2a4003700a8a78a108bd300
 refs/heads/benlangmuir-patch-1: baaebaf39d52f3bf36710d4fe40cf212e996b212
 refs/heads/i-do-redeclare: 8c4e6d5de5c1e3f0a2cedccf319df713ea22c48e
-refs/heads/master-rebranch: 00c0a0363758c1e4694b3fb99ebffb5e138de1b6
+refs/heads/master-rebranch: 2ad0360d44587b884e76f47df3fc952e4325b736
 refs/heads/rdar-53901732: 9bd06af3284e18a109cdbf9aa59d833b24eeca7b
 refs/heads/revert-26776-subst-always-returns-a-type: 1b8e18fdd391903a348970a4c848995d4cdd789c
 refs/heads/tensorflow-merge: 8b854f62f80d4476cb383d43c4aac2001dde3cec

branches/master-rebranch/CMakeLists.txt

@@ -499,6 +499,18 @@ include(CMakePushCheckState)
 
 print_versions()
 
+include(SwiftSharedCMakeConfig)
+
+# NOTE: We include this before SwiftComponents as it relies on some LLVM CMake
+# functionality.
+# Support building Swift as a standalone project, using LLVM as an
+# external library.
+if(SWIFT_BUILT_STANDALONE)
+  swift_common_standalone_build_config(SWIFT)
+else()
+  swift_common_unified_build_config(SWIFT)
+endif()
+
 include(SwiftComponents)
 include(SwiftHandleGybSources)
 include(SwiftSetIfArchBitness)
@@ -527,16 +539,6 @@ if(NOT CMAKE_CROSSCOMPILING AND CMAKE_SYSTEM_PROCESSOR STREQUAL "i386")
       OUTPUT_STRIP_TRAILING_WHITESPACE)
 endif()
 
-include(SwiftSharedCMakeConfig)
-
-# Support building Swift as a standalone project, using LLVM as an
-# external library.
-if(SWIFT_BUILT_STANDALONE)
-  swift_common_standalone_build_config(SWIFT)
-else()
-  swift_common_unified_build_config(SWIFT)
-endif()
-
 get_filename_component(SWIFT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR} REALPATH)
 set(SWIFT_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}")
 set(SWIFT_CMAKE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
@@ -1051,6 +1053,7 @@ if(SWIFT_NEED_EXPLICIT_LIBDISPATCH)
   else()
     set(SOURCEKIT_RUNTIME_DIR lib)
   endif()
+  add_dependencies(sourcekit-inproc BlocksRuntime dispatch)
   swift_install_in_component(FILES
                                $<TARGET_FILE:dispatch>
                                $<TARGET_FILE:BlocksRuntime>

branches/master-rebranch/README.md

@@ -87,7 +87,7 @@ Please make sure you use Python 2.x. Python 3.x is not supported currently.
 
 #### macOS
 
-To build for macOS, you need [Xcode 11 beta 5](https://developer.apple.com/xcode/downloads/).
+To build for macOS, you need [Xcode 11 beta 6](https://developer.apple.com/xcode/downloads/).
 The required version of Xcode changes frequently, and is often a beta release.
 Check this document or the host information on <https://ci.swift.org> for the
 current required version.

branches/master-rebranch/apinotes/CMakeLists.txt

@@ -26,6 +26,7 @@ add_custom_target("copy_apinotes" ALL
     COMMENT "Copying API notes to ${output_dir}"
     SOURCES "${sources}")
 
+add_dependencies(compiler copy_apinotes)
 swift_install_in_component(DIRECTORY "${output_dir}"
                            DESTINATION "lib/swift/"
                            COMPONENT compiler)

branches/master-rebranch/benchmark/CMakeLists.txt

@@ -87,6 +87,7 @@ set(SWIFT_BENCH_MODULES
     single-source/Exclusivity
     single-source/ExistentialPerformance
     single-source/Fibonacci
+    single-source/FindStringNaive
     single-source/FlattenList
     single-source/FloatingPointParsing
     single-source/FloatingPointPrinting
@@ -151,6 +152,7 @@ set(SWIFT_BENCH_MODULES
     single-source/SetTests
     single-source/SevenBoom
     single-source/Sim2DArray
+    single-source/SortArrayInClass
     single-source/SortIntPyramids
     single-source/SortLargeExistentials
     single-source/SortLettersInPlace

branches/master-rebranch/benchmark/README.md

@@ -70,19 +70,17 @@ The following build options are available:
 
 The following build targets are available:
 
-1. `swift-benchmark-macosx-x86_64`
-2. `swift-benchmark-iphoneos-arm64`
-3. `swift-benchmark-iphoneos-armv7`
-4. `swift-benchmark-appletvos-arm64`
-5. `swift-benchmark-watchos-armv7k`
+* `swift-benchmark-macosx-x86_64`
+* `swift-benchmark-iphoneos-arm64`
+* `swift-benchmark-iphoneos-armv7`
+* `swift-benchmark-appletvos-arm64`
+* `swift-benchmark-watchos-armv7k`
 
 Build steps (with example options):
 
-1. `$ cd benchmark`
-2. `$ mkdir build`
-3. `$ cd build`
-4. `$ cmake ../benchmark -G Ninja -DSWIFT_EXEC=[path to built swiftc]`
-5. `$ ninja swift-benchmark-macosx-x86_64`
+1. `$ mkdir build; cd build`
+2. `$ cmake [path to swift src]/benchmark -G Ninja -DSWIFT_EXEC=[path to built swiftc]`
+3. `$ ninja swift-benchmark-macosx-x86_64`
 
 Benchmark binaries are placed in `bin`.
 
@@ -96,12 +94,12 @@ relative to the benchmark binary at the time it was executed
 For example, to benchmark against a locally built `swiftc`, including
 any standard library changes in that build, you might configure using:
 
-    cmake ../benchmark -G Ninja -DSWIFT_EXEC=<src>/swift/build/swift-macosx-x86_64/bin/swiftc
+    cmake <src>/benchmark -G Ninja -DSWIFT_EXEC=<build>/swift-macosx-x86_64/bin/swiftc
     ninja swift-benchmark-iphoneos-arm64
 
 To build against the installed Xcode, simply omit SWIFT_EXEC:
 
-    cmake ../benchmark -G Ninja
+    cmake <src>/benchmark -G Ninja
     ninja swift-benchmark-iphoneos-arm64
 
 In both examples above, to run the benchmarks on a device, the dynamic
@@ -110,7 +108,7 @@ relative to `swiftc`. To benchmark against the target machine's
 installed libraries instead, enable
 `SWIFT_BENCHMARK_USE_OS_LIBRARIES`.
 
-    cmake ../benchmark -G Ninja -DSWIFT_BENCHMARK_USE_OS_LIBRARIES=ON
+    cmake <src>/benchmark -G Ninja -DSWIFT_BENCHMARK_USE_OS_LIBRARIES=ON
     ninja swift-benchmark-iphoneos-arm64
 
 This will reflect the performance of the Swift standard library

branches/master-rebranch/benchmark/single-source/FindStringNaive.swift

@@ -0,0 +1,185 @@
+//===--- FindStringNaive.swift --------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2019 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 TestsUtils
+
+// Mini benchmark implementing a naive String search algorithm that
+// at the moment shows a lot of ARC traffic.
+let t: [BenchmarkCategory] = [.String, .refcount]
+let N = 100
+
+var longStringFoFoFoFox: String?
+var longArrayFoFoFoFox: [UInt8]?
+
+public let FindStringNaive = [
+  BenchmarkInfo(
+    name: "FindString.Loop1.Substring",
+    runFunction: runBenchLoop1Substring,
+    tags: t,
+    setUpFunction: {
+      longStringFoFoFoFox = String(repeating: "fo", count: 5_000) + "fox <-- needle"
+    }),
+  BenchmarkInfo(
+    name: "FindString.Rec3.String",
+    runFunction: runBenchRecursive3String,
+    tags: t,
+    setUpFunction: {
+      longStringFoFoFoFox = String(repeating: "fo", count: 500) + "fox <-- needle"
+    }),
+  BenchmarkInfo(
+    name: "FindString.Rec3.Substring",
+    runFunction: runBenchRecursive3Substring,
+    tags: t,
+    setUpFunction: {
+      longStringFoFoFoFox = String(repeating: "fo", count: 500) + "fox <-- needle"
+    }),
+  BenchmarkInfo(
+    name: "FindString.Loop1.Array",
+    runFunction: runBenchLoop1Array,
+    tags: t,
+    setUpFunction: {
+      longArrayFoFoFoFox = []
+      longArrayFoFoFoFox!.reserveCapacity(1_100_000)
+      for _ in 0 ..< 500_000 {
+        longArrayFoFoFoFox!.append(contentsOf: "fo".utf8)
+      }
+      longArrayFoFoFoFox!.append(contentsOf: "fox <-- needle".utf8)
+    }),
+  BenchmarkInfo(
+    name: "FindString.Rec3.Array",
+    runFunction: runBenchRecursive3ArrayOfUTF8,
+    tags: t,
+    setUpFunction: {
+      longArrayFoFoFoFox = []
+      longArrayFoFoFoFox!.reserveCapacity(11_000)
+      for _ in 0 ..< 5_000 {
+        longArrayFoFoFoFox!.append(contentsOf: "fo".utf8)
+      }
+      longArrayFoFoFoFox!.append(contentsOf: "fox <-- needle".utf8)
+    }),
+]
+
+func findOne<S: StringProtocol>(
+  _ string: S,
+  needle: Character
+) -> String.Index? {
+  var index = string.startIndex
+  while index < string.endIndex {
+    let nextIndex = string.index(after: index)
+    if string[index] == needle {
+      return index
+    }
+    index = nextIndex
+  }
+  return nil
+}
+
+func findThreeRecursive<S: StringProtocol>(
+  _ string: S,
+  needle1: Character,
+  needle2: Character?,
+  needle3: Character?
+) -> String.Index? {
+  var index = string.startIndex
+  while index < string.endIndex {
+    let nextIndex = string.index(after: index)
+    if string[index] == needle1 {
+      // Check subsequent needles recursively (if applicable)
+      guard let needle2 = needle2 else { return index }
+
+      if findThreeRecursive(
+        string[nextIndex...].prefix(2), needle1: needle2, needle2: needle3, needle3: nil
+      ) == nextIndex {
+        return index
+      }
+    }
+    index = nextIndex
+  }
+  return nil
+}
+
+func findOneOnUTF8Collection<Bytes: Collection>(
+  _ string: Bytes,
+  needle: UInt8
+) -> Bytes.Index? where Bytes.Element == UInt8 {
+  var index = string.startIndex
+  while index < string.endIndex {
+    let nextIndex = string.index(after: index)
+    if string[index] == needle {
+      return index
+    }
+    index = nextIndex
+  }
+  return nil
+}
+
+func findThreeOnUTF8Collection<Bytes: Collection>(
+  _ string: Bytes,
+  needle1: UInt8,
+  needle2: UInt8?,
+  needle3: UInt8?
+) -> Bytes.Index? where Bytes.Element == UInt8 {
+  var index = string.startIndex
+  while index < string.endIndex {
+    let nextIndex = string.index(after: index)
+    if string[index] == needle1 {
+      // Check subsequent needles recursively (if applicable)
+      guard let needle2 = needle2 else { return index }
+
+      if findThreeOnUTF8Collection(
+        string[nextIndex...].prefix(2), needle1: needle2, needle2: needle3, needle3: nil
+      ) == nextIndex {
+        return index
+      }
+    }
+    index = nextIndex
+  }
+  return nil
+}
+
+@inline(never)
+func runBenchLoop1Substring(iterations: Int) {
+  for _ in 0 ..< iterations {
+    precondition(findOne(longStringFoFoFoFox![...], needle: "x") != nil)
+  }
+}
+
+@inline(never)
+func runBenchLoop1Array(iterations: Int) {
+  for _ in 0 ..< iterations {
+    precondition(findOneOnUTF8Collection(longArrayFoFoFoFox!, needle: UInt8(ascii: "x")) != nil)
+  }
+}
+
+@inline(never)
+func runBenchRecursive3Substring(iterations: Int) {
+  for _ in 0 ..< iterations {
+    precondition(findThreeRecursive(longStringFoFoFoFox![...], needle1: "f", needle2: "o", needle3: "x") != nil)
+  }
+}
+
+@inline(never)
+func runBenchRecursive3String(iterations: Int) {
+  for _ in 0 ..< iterations {
+    precondition(findThreeRecursive(longStringFoFoFoFox!, needle1: "f", needle2: "o", needle3: "x") != nil)
+  }
+}
+
+@inline(never)
+func runBenchRecursive3ArrayOfUTF8(iterations: Int) {
+  for _ in 0 ..< iterations {
+    precondition(findThreeOnUTF8Collection(longArrayFoFoFoFox!,
+                                      needle1: UInt8(ascii: "f"),
+                                      needle2: UInt8(ascii: "o"),
+                                      needle3: UInt8(ascii: "x")) != nil)
+  }
+}