---

yaml
---
r: 293791
b: refs/heads/tensorflow
c: 28adf81
h: refs/heads/master
i:
  293789: 20377bd
  293787: 935d327
  293783: 20ddc5c
  293775: 50dd1eb
  293759: d1893ee

Author: palimondo

[refs]

@@ -816,7 +816,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-04-25-a: 22f738a831d43aff2b9c9773bcb65
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-05-08-a: 7d98cc16689baba5c8a3b90a9329bdcc1a12b4e9
 refs/heads/cherr42: a566ad54b073c2c56ac0a705d0a5bed9743135a5
 "refs/heads/codable_test_comment_fix": fc8f6824f7f347e1e8db55bff62db385c5728b5a
-refs/heads/tensorflow: b6d036220412d72b4a0fbbdffb1d65b937196fcb
+refs/heads/tensorflow: 28adf81af15ddc7a23c2e70e81f7b00a5a30bb3c
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-11-a: 8126fd7a652e2f70ad6d76505239e34fb2ef3e1a
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-12-a: b3fd3dd84df6717f2e2e9df58c6d7e99fed57086
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-13-a: 71135119579039dc321c5f65d870050fe36efda2

branches/tensorflow/benchmark/single-source/Breadcrumbs.swift

@@ -45,23 +45,6 @@ extension String {
   }
 }
 
-let seed = 0x12345678
-
-/// A linear congruential PRNG.
-struct LCRNG: RandomNumberGenerator {
-  private var state: UInt64
-
-  init(seed: Int) {
-    state = UInt64(truncatingIfNeeded: seed)
-    for _ in 0..<10 { _ = next() }
-  }
-
-  mutating func next() -> UInt64 {
-    state = 2862933555777941757 &* state &+ 3037000493
-    return state
-  }
-}
-
 extension Collection {
   /// Returns a randomly ordered array of random non-overlapping index ranges
   /// that cover this collection entirely.
@@ -254,7 +237,7 @@ class UTF16ToIdx: BenchmarkBase {
 
   override func setUp() {
     super.setUp()
-    var rng = LCRNG(seed: seed)
+    var rng = SplitMix64(seed: 42)
     let range = 0 ..< inputString.utf16.count
     inputOffsets = Array(range.shuffled(using: &rng).prefix(count))
   }
@@ -286,7 +269,7 @@ class IdxToUTF16: BenchmarkBase {
 
   override func setUp() {
     super.setUp()
-    var rng = LCRNG(seed: seed)
+    var rng = SplitMix64(seed: 42)
     inputIndices = Array(inputString.indices.shuffled(using: &rng).prefix(count))
   }
 
@@ -318,7 +301,7 @@ class UTF16ToIdxRange: BenchmarkBase {
 
   override func setUp() {
     super.setUp()
-    var rng = LCRNG(seed: seed)
+    var rng = SplitMix64(seed: 42)
     inputOffsets = (
       0 ..< inputString.utf16.count
     ).randomIndexRanges(count: count, using: &rng)
@@ -352,7 +335,7 @@ class IdxToUTF16Range: BenchmarkBase {
 
   override func setUp() {
     super.setUp()
-    var rng = LCRNG(seed: seed)
+    var rng = SplitMix64(seed: 42)
     inputIndices = self.inputString.randomIndexRanges(count: count, using: &rng)
   }
 
@@ -384,7 +367,7 @@ class CopyUTF16CodeUnits: BenchmarkBase {
 
   override func setUp() {
     super.setUp()
-    var rng = LCRNG(seed: seed)
+    var rng = SplitMix64(seed: 42)
     inputIndices = (
       0 ..< inputString.utf16.count
     ).randomIndexRanges(count: count, using: &rng)
@@ -425,7 +408,7 @@ class MutatedUTF16ToIdx: BenchmarkBase {
 
   override func setUp() {
     super.setUp()
-    var generator = LCRNG(seed: seed)
+    var generator = SplitMix64(seed: 42)
     let range = 0 ..< inputString.utf16.count
     inputOffsets = Array(range.shuffled(using: &generator).prefix(count))
   }
@@ -469,7 +452,7 @@ class MutatedIdxToUTF16: BenchmarkBase {
 
   override func setUp() {
     super.setUp()
-    var rng = LCRNG(seed: seed)
+    var rng = SplitMix64(seed: 42)
     inputIndices = Array(inputString.indices.shuffled(using: &rng).prefix(count))
   }
 

branches/tensorflow/benchmark/single-source/BucketSort.swift

@@ -1,4 +1,4 @@
-//===--- BucketSort.swift -------------------------------------------------===//
+//===--- BucketSort.swift ----------------------------------------------------===//
 //
 // This source file is part of the Swift.org open source project
 //
@@ -9,21 +9,21 @@
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 //===----------------------------------------------------------------------===//
-// This benchmark demonstrates the benefits of ExistentialSpecializer
-// optimization pass. It's a generic version of the classic BucketSort algorithm
-// adapted from an original implementation from the Swift Algorithm Club.
-// See https://en.wikipedia.org/wiki/Bucket_sort and
+// Adapted from the original implementation: 
 // https://github.com/raywenderlich/swift-algorithm-club/tree/master/Bucket%20Sort
-//
-// It sorts an array of generic `SortableItem`s. If the type of `sortingAlgo`
-// is not known to the call site at line 90, the `sort` method can not be
-// specialized to integer array sorting, which will lead to a huge performance
-// loss. Since `SortingAlgorithm` and `InsertionSort` are declared to be
-// `public` and the lines 89-91 can not be inlined in `bucketSort` (due to
-// inlining heuristic limitations), compiler without ExistentialSpecializer
-// optimization can not achieve this feat. With ExistentialSpecializer which
-// enables generic specialization recursively in a call chain, we're able to
-// specialize line 90 for `InsertionSort` on integers.
+// Issue: https://github.com/raywenderlich/swift-algorithm-club/issues/863
+
+// This benchmark implements the classical BucketSort algorithm described at
+// https://en.wikipedia.org/wiki/Bucket_sort. The implementation allows for an
+// array of generic type of "SortableItem" to be sorted. Unfortunately,  if
+// ``sortingAlgo'' type is not known for the callsite in line 84, then the 
+// ``sort'' method can not be specialized to integer array sorting, which will 
+// lead to a huge performance loss. Since SortingAlgorithm and InsertionSort are 
+// declared to be ``public'' and that lines 83-85 can not be inlined in
+// BucketSortImpl (due to inlining heuristic limitations), today swift 
+// compiler (without ExistentialSpecializer) can not achieve this feat.  With 
+// ExistentialSpecializer which enables generic specialization recursively in a
+// call chain, we are able to specialize line 84 for InsertionSort on integers.
 
 import TestsUtils
 import Foundation
@@ -32,25 +32,21 @@ public let BucketSort = BenchmarkInfo(
   name: "BucketSort",
   runFunction: run_BucketSort,
   tags: [.validation, .algorithm],
-  setUpFunction: { blackHole(buckets) }
-)
+  setUpFunction: { buildWorkload() },
+  legacyFactor: 10)
 
 public protocol IntegerConvertible {
     func convertToInt() -> Int
 }
-
 extension Int: IntegerConvertible, SortableItem {
     public func convertToInt() -> Int {
         return self
     }
 }
-
 public protocol SortableItem: IntegerConvertible, Comparable { }
-
 public protocol SortingAlgorithm {
     func sort<T: SortableItem>(_ items: [T]) -> [T]
 }
-
 public struct InsertionSort: SortingAlgorithm {
     public func sort<T: SortableItem>(_ items: [T]) -> [T] {
         var sortedItems = items
@@ -66,14 +62,12 @@ public struct InsertionSort: SortingAlgorithm {
         return sortedItems
     }
 }
-
 func distribute<T>(_ item: T, bucketArray: inout [Bucket<T>]) {
   let val = item.convertToInt()
   let capacity = bucketArray.first!.capacity
   let index = val / capacity
   bucketArray[index].add(item)
 }
-
 struct Bucket<T: SortableItem> {
   var items: [T]
   let capacity: Int
@@ -90,10 +84,7 @@ struct Bucket<T: SortableItem> {
     return sortingAlgo.sort(items)
   }
 }
-
-func bucketSort<T>(
-  _ items: [T], sortingAlgorithm: SortingAlgorithm, bucketArray: [Bucket<T>]
-) -> [T] {
+func BucketSortImpl<T>(_ items: [T], sortingAlgorithm: SortingAlgorithm, bucketArray: [Bucket<T>]) -> [T] {
   var copyBucketArray = bucketArray
   for item in items {
     distribute(item, bucketArray: &copyBucketArray)
@@ -104,28 +95,45 @@ func bucketSort<T>(
   }
   return sortedArray
 }
-
-func isAscending(_ a: [Int]) -> Bool {
-  return zip(a, a.dropFirst()).allSatisfy(<=)
+func isArraySorted(_ arr: [Int]) -> Bool {
+  var idx = 0
+  while idx < (arr.count - 1) {
+    if arr[idx] > arr[idx+1] {
+       return false
+    }
+    idx += 1
+  }
+  return true
 }
-
+let NUMITEMS = 2500
+let MAXBUCKETSIZE = 1000
+let NUMBUCKETS: Int = 10
 let items: [Int] = {
-  var g = SplitMix64(seed: 42)
-  return (0..<10_000).map {_ in Int.random(in: 0..<1000, using: &g) }
+  var array: [Int]? = [Int]()
+  for _ in 0..<NUMITEMS {
+    array!.append(Int.random(in: 0..<MAXBUCKETSIZE))
+  }
+  return array!
 }()
 
 let buckets: [Bucket<Int>] = {
-  let bucketCount = 10
-  let maxValue = items.max()!.convertToInt()
-  let maxCapacity = Int(ceil(Double(maxValue + 1) / Double(bucketCount)))
-  return (0..<bucketCount).map { _ in Bucket<Int>(capacity: maxCapacity) }
+  let val = (items.max()?.convertToInt())! + 1
+  let maxCapacity = Int( ceil( Double(val) / Double(NUMBUCKETS)))
+  var bucketArray = [Bucket<Int>]()
+  for _ in 0..<NUMBUCKETS {
+    bucketArray.append(Bucket<Int>(capacity: maxCapacity))
+  }
+  return bucketArray
 }()
-
 @inline(never)
 func run_BucketSort(_ N : Int) {
   for _ in 0..<N {
-    let sortedArray = bucketSort(
-      items, sortingAlgorithm: InsertionSort(), bucketArray: buckets)
-    CheckResults(isAscending(sortedArray))
+    let sortedArray = BucketSortImpl(items, sortingAlgorithm: InsertionSort(), bucketArray: buckets)
+    CheckResults(isArraySorted(sortedArray))
   }
 }
+@inline(never)
+func buildWorkload() {
+  blackHole(items)
+  blackHole(buckets)
+}

branches/tensorflow/benchmark/single-source/ObjectiveCBridging.swift

@@ -73,9 +73,6 @@ public let ObjectiveCBridging = [
   BenchmarkInfo(name: "ObjectiveCBridgeFromNSDateComponents",
     runFunction: run_ObjectiveCBridgeFromNSDateComponents, tags: t,
     setUpFunction: setup_dateComponents),
-  BenchmarkInfo(name: "ObjectiveCBridgeASCIIStringFromFile",
-                runFunction: run_ASCIIStringFromFile, tags: ts,
-                setUpFunction: setup_ASCIIStringFromFile),
 ]
 
 #if _runtime(_ObjC)
@@ -712,35 +709,3 @@ public func run_ObjectiveCBridgeFromNSDateComponents(_ N: Int) {
   }
   #endif
 }
-
-var ASCIIStringFromFile:String? = nil
-public func setup_ASCIIStringFromFile() {
-  #if _runtime(_ObjC)
-  let url:URL
-  if #available(OSX 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *) {
-    url = FileManager.default.temporaryDirectory.appendingPathComponent(
-      "sphinx.txt"
-    )
-  } else {
-    url = URL(fileURLWithPath: "/tmp/sphinx.txt")
-  }
-  var str = "Sphinx of black quartz judge my vow"
-  str = Array(repeating: str, count: 100).joined()
-  try? str.write(
-    to: url,
-    atomically: true,
-    encoding: .ascii
-  )
-  ASCIIStringFromFile = try! String(contentsOf: url, encoding: .ascii)
-  #endif
-}
-
-@inline(never)
-public func run_ASCIIStringFromFile(_ N: Int) {
-  #if _runtime(_ObjC)
-  for _ in 0 ..< N {
-    blackHole((ASCIIStringFromFile! + "").utf8.count)
-  }
-  #endif
-}
-

branches/tensorflow/cmake/modules/StandaloneOverlay.cmake

@@ -10,13 +10,9 @@ endif()
 
 set(CMAKE_INSTALL_PREFIX "${SWIFT_DEST_ROOT}${TOOLCHAIN_DIR}/usr")
 
-set(SWIFT_STDLIB_BUILD_TYPE "Release" CACHE STRING
-    "Build type for the Swift standard library and SDK overlays [Debug, RelWithDebInfo, Release, MinSizeRel]")
-set_property(CACHE SWIFT_STDLIB_BUILD_TYPE PROPERTY
-    STRINGS "Debug" "RelWithDebInfo" "Release" "MinSizeRel")
-
 # Only happens if it's called from a top-level cmake invocation.
 set(BUILD_STANDALONE TRUE)
+set(SWIFT_STDLIB_BUILD_TYPE "Release")
 set(SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES "SHARED")
 set(SWIFT_INSTALL_COMPONENTS "sdk-overlay" CACHE STRING "")
 set(SWIFT_DARWIN_DEPLOYMENT_VERSION_OSX "10.9" CACHE STRING "")

branches/tensorflow/cmake/modules/SwiftSource.cmake

@@ -260,7 +260,7 @@ function(_compile_swift_files
 
   # Force swift 4 compatibility mode for overlays.
   if (SWIFTFILE_IS_SDK_OVERLAY)
-    list(APPEND swift_flags "-swift-version" "5")
+    list(APPEND swift_flags "-swift-version" "4")
   endif()
 
   if(SWIFTFILE_IS_SDK_OVERLAY)

branches/tensorflow/lib/IRGen/GenEnum.cpp

@@ -630,18 +630,6 @@ namespace {
       IGF.Builder.CreateCall(
                     IGF.IGM.getInitEnumMetadataSingleCaseFn(),
                     {metadata, flags, payloadLayout});
-
-      // Pre swift-5.1 runtimes were missing the initialization of the
-      // the extraInhabitantCount field. Do it here instead.
-      auto payloadRef = IGF.Builder.CreateBitOrPointerCast(
-          payloadLayout, IGF.IGM.TypeLayoutTy->getPointerTo());
-      auto payloadExtraInhabitantCount =
-          IGF.Builder.CreateLoad(IGF.Builder.CreateStructGEP(
-              Address(payloadRef, Alignment(1)), 3,
-              Size(IGF.IGM.DataLayout.getTypeAllocSize(IGF.IGM.SizeTy) * 2 +
-                   IGF.IGM.DataLayout.getTypeAllocSize(IGF.IGM.Int32Ty))));
-      emitStoreOfExtraInhabitantCount(IGF, payloadExtraInhabitantCount,
-                                      metadata);
     }
 
     bool mayHaveExtraInhabitants(IRGenModule &IGM) const override {

branches/tensorflow/lib/IRGen/GenOpaque.cpp

@@ -343,9 +343,11 @@ llvm::Value *irgen::emitInvariantLoadOfOpaqueWitness(IRGenFunction &IGF,
   return witness;
 }
 
-static Address emitAddressOfValueWitnessTableValue(IRGenFunction &IGF,
-                                                   llvm::Value *table,
-                                                   ValueWitness witness) {
+/// Given a value witness table, load one of the value witnesses.
+/// The result has the appropriate type for the witness.
+static llvm::Value *emitLoadOfValueWitnessValue(IRGenFunction &IGF,
+                                                llvm::Value *table,
+                                                ValueWitness witness) {
   assert(!isValueWitnessFunction(witness));
   assert(unsigned(witness) <= unsigned(ValueWitness::ExtraInhabitantCount) &&
          "extraInhabitantCount not the last non-function value witness");
@@ -366,15 +368,7 @@ static Address emitAddressOfValueWitnessTableValue(IRGenFunction &IGF,
   Address addr = Address(table, IGF.IGM.getPointerAlignment());
   addr = IGF.Builder.CreateBitCast(addr, IGF.IGM.getValueWitnessTablePtrTy());
   addr = IGF.Builder.CreateStructGEP(addr, unsigned(witness), offset);
-  return addr;
-}
 
-/// Given a value witness table, load one of the value witnesses.
-/// The result has the appropriate type for the witness.
-static llvm::Value *emitLoadOfValueWitnessValue(IRGenFunction &IGF,
-                                                llvm::Value *table,
-                                                ValueWitness witness) {
-  auto addr = emitAddressOfValueWitnessTableValue(IGF, table, witness);
   auto load = IGF.Builder.CreateLoad(addr, getValueWitnessLabel(witness));
   IGF.setInvariantLoad(load);
   return load;
@@ -918,15 +912,6 @@ llvm::Value *irgen::emitLoadOfExtraInhabitantCount(IRGenFunction &IGF,
   return IGF.emitValueWitnessValue(T, ValueWitness::ExtraInhabitantCount);
 }
 
-void irgen::emitStoreOfExtraInhabitantCount(IRGenFunction &IGF,
-                                            llvm::Value *value,
-                                            llvm::Value *metadata) {
-  auto vwTable = IGF.emitValueWitnessTableRefForMetadata(metadata);
-  auto addr = emitAddressOfValueWitnessTableValue(
-      IGF, vwTable, ValueWitness::ExtraInhabitantCount);
-  IGF.Builder.CreateStore(value, addr);
-}
-
 std::pair<llvm::Value *, llvm::Value *>
 irgen::emitLoadOfIsInline(IRGenFunction &IGF, llvm::Value *metadata) {
   auto *flags = emitLoadOfValueWitnessValueFromMetadata(IGF, metadata,

branches/tensorflow/lib/IRGen/GenOpaque.h

@@ -215,10 +215,6 @@ namespace irgen {
   /// Emit a load of the 'extraInhabitantCount' value witness.
   llvm::Value *emitLoadOfExtraInhabitantCount(IRGenFunction &IGF, SILType T);
 
-  /// Emit a stored to the 'extraInhabitantCount' value witness.
-  void emitStoreOfExtraInhabitantCount(IRGenFunction &IGF, llvm::Value *val,
-                                       llvm::Value *metadata);
-
   /// Returns the IsInline flag and the loaded flags value.
   std::pair<llvm::Value *, llvm::Value *>
   emitLoadOfIsInline(IRGenFunction &IGF, llvm::Value *metadata);