Merge remote-tracking branch 'origin/master' into master-next

Author: Greg Parker

.dir-locals.el

@@ -6,7 +6,8 @@
         ((x (dir-locals-find-file default-directory))
          (this-directory (if (listp x) (car x) (file-name-directory x))))
         (unless (or (featurep 'swift-project-settings) 
-                    (tramp-tramp-file-p this-directory))
+                    (and (fboundp 'tramp-tramp-file-p)
+                         (tramp-tramp-file-p this-directory)))
           (add-to-list 'load-path
                        (concat this-directory "utils")
                        :append)

CODE_OWNERS.TXT

@@ -15,9 +15,9 @@ N: Erik Eckstein
 E: eeckstein@apple.com
 D: SILOptimizer
 
-N: David Farler
-E: dfarler@apple.com
-D: Markup, lib/Syntax, Swift Linux port
+N: Xi Ge
+E: xi_ge@apple.com
+D: Markup, Migrator, lib/Syntax
 
 N: Doug Gregor
 E: dgregor@apple.com

apinotes/CMakeLists.txt

@@ -30,6 +30,7 @@ set(SWIFT_API_NOTES_INPUTS
   MediaPlayer
   MessageUI
   Metal
+  ModelIO
   MultipeerConnectivity
   NetworkExtension
   NotificationCenter
@@ -39,6 +40,7 @@ set(SWIFT_API_NOTES_INPUTS
   QuickLook
   SafariServices
   SceneKit
+  ScreenSaver
   ScriptingBridge
   SpriteKit
   StoreKit

apinotes/ModelIO.apinotes

@@ -0,0 +1,43 @@
+---
+Name: ModelIO
+Classes:
+- Name: MDLAnimatedScalar
+  Methods:
+  - Selector: 'floatAtTime:'
+    MethodKind: Instance
+    SwiftName: 'floatValue(atTime:)'
+  - Selector: 'doubleAtTime:'
+    MethodKind: Instance
+    SwiftName: 'doubleValue(atTime:)'
+- Name: MDLAnimatedVector2
+  Methods:
+  - Selector: 'float2AtTime:'
+    MethodKind: Instance
+    SwiftName: 'float2Value(atTime:)'
+  - Selector: 'double2AtTime:'
+    MethodKind: Instance
+    SwiftName: 'double2Value(atTime:)'
+- Name: MDLAnimatedVector3
+  Methods:
+  - Selector: 'float3AtTime:'
+    MethodKind: Instance
+    SwiftName: 'float3Value(atTime:)'
+  - Selector: 'double3AtTime:'
+    MethodKind: Instance
+    SwiftName: 'double3Value(atTime:)'
+- Name: MDLAnimatedVector4
+  Methods:
+  - Selector: 'float4AtTime:'
+    MethodKind: Instance
+    SwiftName: 'float4Value(atTime:)'
+  - Selector: 'double4AtTime:'
+    MethodKind: Instance
+    SwiftName: 'double4Value(atTime:)'
+- Name: MDLAnimatedMatrix4x4
+  Methods:
+  - Selector: 'float4x4AtTime:'
+    MethodKind: Instance
+    SwiftName: 'float4x4Value(atTime:)'
+  - Selector: 'double4x4AtTime:'
+    MethodKind: Instance
+    SwiftName: 'double4x4Value(atTime:)'

apinotes/ScreenSaver.apinotes

@@ -0,0 +1,13 @@
+---
+Name: ScreenSaver
+SwiftVersions:
+- Version: 3
+  Classes:
+  - Name: ScreenSaverView
+    Properties:
+    - Name: hasConfigureSheet
+      PropertyKind: Instance
+      SwiftImportAsAccessors: true
+    - Name: configureSheet
+      PropertyKind: Instance
+      SwiftImportAsAccessors: true

benchmark/CMakeLists.txt

@@ -50,7 +50,6 @@ set(SWIFT_BENCH_MODULES
     single-source/ErrorHandling
     single-source/ExistentialPerformance
     single-source/Fibonacci
-    single-source/GlobalClass
     single-source/Hanoi
     single-source/Hash
     single-source/HashQuadratic

benchmark/scripts/Benchmark_Driver

@@ -124,13 +124,13 @@ def get_tests(driver_path, args):
     if args.benchmarks or args.filters:
         driver.append('--run-all')
     tests = subprocess.check_output(driver).split()[2:]
-    tests.extend(map(str, range(1, len(tests) + 1)))  # ordinal numbers
     if args.filters:
         regexes = [re.compile(pattern) for pattern in args.filters]
         return sorted(list(set([name for pattern in regexes
                                 for name in tests if pattern.match(name)])))
     if not args.benchmarks:
         return tests
+    tests.extend(map(str, range(1, len(tests) + 1)))  # ordinal numbers
     return sorted(list(set(tests).intersection(set(args.benchmarks))))
 
 

benchmark/single-source/BitCount.swift

@@ -31,10 +31,12 @@ func countBitSet(_ num: Int) -> Int {
 
 @inline(never)
 public func run_BitCount(_ N: Int) {
-  for _ in 1...100*N {
+  var sum = 0
+  for _ in 1...1000*N {
     // Check some results.
-    CheckResults(countBitSet(1) == 1)
-    CheckResults(countBitSet(2) == 1)
-    CheckResults(countBitSet(2457) == 6)
+    sum = sum &+ countBitSet(getInt(1))
+              &+ countBitSet(getInt(2))
+              &+ countBitSet(getInt(2457))
   }
+  CheckResults(sum == 8 * 1000 * N)
 }

benchmark/single-source/ByteSwap.swift

@@ -17,6 +17,7 @@ import Foundation
 import TestsUtils
 
 // a naive O(n) implementation of byteswap.
+@inline(never)
 func byteswap_n(_ a: UInt64) -> UInt64 {
 #if swift(>=4)
   return ((a & 0x00000000000000FF) &<< 56) |
@@ -40,6 +41,7 @@ func byteswap_n(_ a: UInt64) -> UInt64 {
 }
 
 // a O(logn) implementation of byteswap.
+@inline(never)
 func byteswap_logn(_ a: UInt64) -> UInt64 {
   var a = a
   a = (a & 0x00000000FFFFFFFF) << 32 | (a & 0xFFFFFFFF00000000) >> 32
@@ -50,10 +52,13 @@ func byteswap_logn(_ a: UInt64) -> UInt64 {
 
 @inline(never)
 public func run_ByteSwap(_ N: Int) {
-  for _ in 1...100*N {
+  var s: UInt64 = 0
+  for _ in 1...10000*N {
     // Check some results.
-    CheckResults(byteswap_logn(byteswap_n(2457)) == 2457)
-    CheckResults(byteswap_logn(byteswap_n(9129)) == 9129)
-    CheckResults(byteswap_logn(byteswap_n(3333)) == 3333)
+    let x : UInt64 = UInt64(getInt(0))
+    s = s &+ byteswap_logn(byteswap_n(x &+ 2457))
+          &+ byteswap_logn(byteswap_n(x &+ 9129))
+          &+ byteswap_logn(byteswap_n(x &+ 3333))
   }
+  CheckResults(s == (2457 &+ 9129 &+ 3333) &* 10000 &* N)
 }

benchmark/single-source/DictionaryGroup.swift

@@ -12,13 +12,16 @@
 
 import TestsUtils
 
+let count = 10_000
+let result = count / 10
+
 @inline(never)
 public func run_DictionaryGroup(_ N: Int) {
-    let count = 100 * N
-    let result = count / 10
+  for _ in 1...N {
     let dict = Dictionary(grouping: 0..<count, by: { $0 % 10 })
     CheckResults(dict.count == 10)
     CheckResults(dict[0]!.count == result)
+  }
 }
 
 class Box<T : Hashable> : Hashable {
@@ -39,9 +42,10 @@ class Box<T : Hashable> : Hashable {
 
 @inline(never)
 public func run_DictionaryGroupOfObjects(_ N: Int) {
-    let count = 20 * N
-    let result = count / 10
-    let dict = Dictionary(grouping: (0..<count).map { Box($0) }, by: { Box($0.value % 10) })
+  let objects = (0..<count).map { Box($0) }
+  for _ in 1...N {
+    let dict = Dictionary(grouping: objects, by: { Box($0.value % 10) })
     CheckResults(dict.count == 10)
     CheckResults(dict[Box(0)]!.count == result)
+  }
 }

benchmark/single-source/GlobalClass.swift

@@ -13,8 +13,8 @@
 import TestsUtils
 
 @inline(never)
-func buildString() -> String {
-  var sb = "a"
+func buildString(_ i: String) -> String {
+  var sb = i
   for str in ["b","c","d","pizza"] {
     sb += str
   }
@@ -24,26 +24,26 @@ func buildString() -> String {
 @inline(never)
 public func run_StringBuilder(_ N: Int) {
   for _ in 1...5000*N {
-    _ = buildString()
+    _ = buildString(getString("a"))
   }
 }
 
 @inline(never)
-func addString() -> String {
-  let s = "a" + "b" + "c" + "d" + "pizza"
+func addString(_ i: String) -> String {
+  let s = i + "b" + "c" + "d" + "pizza"
   return s
 }
 
 @inline(never)
 public func run_StringAdder(_ N: Int) {
   for _ in 1...5000*N {
-    _ = addString()
+    _ = addString(getString("a"))
   }
 }
 
 @inline(never)
-func buildStringUTF16() -> String {
-  var sb = "a"
+func buildStringUTF16(_ i: String) -> String {
+  var sb = i
   for str in ["🎉","c","d","pizza"] {
     sb += str
   }
@@ -53,14 +53,14 @@ func buildStringUTF16() -> String {
 @inline(never)
 public func run_StringUTF16Builder(_ N: Int) {
   for _ in 1...5000*N {
-    _ = buildStringUTF16()
+    _ = buildStringUTF16("a")
   }
 }
 
 
 @inline(never)
-func buildStringLong() -> String {
-  var sb = "👻"
+func buildStringLong(_ i: String) -> String {
+  var sb = i
   let long = "Swift is a multi-paradigm, compiled programming language created for iOS, OS X, watchOS, tvOS and Linux development by Apple Inc. Swift is designed to work with Apple's Cocoa and Cocoa Touch frameworks and the large body of existing Objective-C code written for Apple products. Swift is intended to be more resilient to erroneous code (\"safer\") than Objective-C and also more concise. It is built with the LLVM compiler framework included in Xcode 6 and later and uses the Objective-C runtime, which allows C, Objective-C, C++ and Swift code to run within a single program."
   sb += long
   return sb
@@ -71,7 +71,7 @@ func buildStringLong() -> String {
 @inline(never)
 public func run_StringBuilderLong(_ N: Int) {
   for _ in 1...5000*N {
-    _ = buildStringLong()
+    _ = buildStringLong("👻")
   }
 }