Merge remote-tracking branch 'origin/master' into rename-conflicting-classes-and-methods

Author: mikeash

CHANGELOG.md

@@ -24,6 +24,20 @@ CHANGELOG
 Swift 5.0
 ---------
 
+* [SE-0227][]:
+
+  Key paths now support the `\.self` keypath, which is a `WritableKeyPath`
+  that refers to its entire input value:
+
+    ```swift
+    let id = \Int.self
+
+    var x = 2
+    print(x[keyPath: id]) // prints 2
+    x[keyPath: id] = 3
+    print(x[keyPath: id]) // prints 3
+    ```
+
 * [SE-0214][]:
 
   Renamed the `DictionaryLiteral` type to `KeyValuePairs`.
@@ -72,6 +86,8 @@ Swift 5.0
 Swift 4.2
 ---------
 
+### 2018-09-17 (Xcode 10.0)
+
 * [SE-0194][]
 
   The new CaseIterable protocol describes types which have a static
@@ -277,8 +293,6 @@ Swift 4.2
   conditionally conforms to `P`, will succeed when the conditional
   requirements are met.
 
-**Add new entries to the top of this section, not here!**
-
 Swift 4.1
 ---------
 

CMakeLists.txt

@@ -860,15 +860,14 @@ function(swift_icu_variables_set sdk arch result)
   endif()
 endfunction()
 
-# ICU is provided through CoreFoundation on Darwin.  On other hosts, assume that
-# we are compiling for the build as the host.  In such a case, if the ICU
+# ICU is provided through CoreFoundation on Darwin.  On other hosts, if the ICU
 # unicode and i18n include and library paths are not defined, perform a standard
 # package lookup.  Otherwise, rely on the paths specified by the user.  These
 # need to be defined when cross-compiling.
 if(NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin")
   if(SWIFT_BUILD_STDLIB OR SWIFT_BUILD_SDK_OVERLAY)
-    swift_icu_variables_set("${SWIFT_HOST_VARIANT_SDK_default}"
-                            "${SWIFT_HOST_VARIANT_ARCH_default}"
+    swift_icu_variables_set("${SWIFT_PRIMARY_VARIANT_SDK}"
+                            "${SWIFT_PRIMARY_VARIANT_ARCH}"
                             ICU_CONFIGURED)
     if("${SWIFT_PATH_TO_LIBICU_BUILD}" STREQUAL "" AND NOT ${ICU_CONFIGURED})
       find_package(ICU REQUIRED COMPONENTS uc i18n)

README.md

@@ -71,7 +71,7 @@ supported host development operating systems.
 
 #### macOS
 
-To build for macOS, you need [Xcode 10 beta 6](https://developer.apple.com/xcode/downloads/).
+To build for macOS, you need [Xcode 10.0](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.

benchmark/CMakeLists.txt

@@ -56,6 +56,7 @@ set(SWIFT_BENCH_MODULES
     single-source/Chars
     single-source/ClassArrayGetter
     single-source/Combos
+    single-source/CountAlgo
     single-source/DataBenchmarks
     single-source/DeadArray
     single-source/DictOfArraysToArrayOfDicts

benchmark/scripts/Benchmark_Driver

@@ -434,7 +434,7 @@ class BenchmarkDoctor(object):
         measurements = dict(
             [('{0} {1} i{2}{3}'.format(benchmark, o, i, suffix),
               self.driver.run(benchmark, num_samples=s, num_iters=i,
-                              verbose=True))
+                              verbose=True, measure_memory=True))
              for o in opts
              for s, i in run_args
              for suffix in list('abcde')

benchmark/scripts/compare_perf_tests.py

@@ -34,6 +34,7 @@ class `ReportFormatter` creates the test comparison report in specified format.
 import sys
 from bisect import bisect, bisect_left, bisect_right
 from collections import namedtuple
+from decimal import Decimal, ROUND_HALF_EVEN
 from math import sqrt
 
 
@@ -141,20 +142,32 @@ def max(self):
         """Maximum sampled value."""
         return self.samples[-1].runtime
 
+    def quantile(self, q):
+        """Return runtime of a sample nearest to the quantile.
+
+        Explicitly uses round-half-to-even rounding algorithm to match the
+        behavior of numpy's quantile(interpolation='nearest') and quantile
+        estimate type R-3, SAS-2. See:
+        https://en.wikipedia.org/wiki/Quantile#Estimating_quantiles_from_a_sample
+        """
+        index = int(Decimal((self.count - 1) * Decimal(q))
+                    .quantize(0, ROUND_HALF_EVEN))
+        return self.samples[index].runtime
+
     @property
     def median(self):
         """Median sampled value."""
-        return self.samples[self.count / 2].runtime
+        return self.quantile(0.5)
 
     @property
     def q1(self):
         """First Quartile (25th Percentile)."""
-        return self.samples[self.count / 4].runtime
+        return self.quantile(0.25)
 
     @property
     def q3(self):
         """Third Quartile (75th Percentile)."""
-        return self.samples[(self.count / 2) + (self.count / 4)].runtime
+        return self.quantile(0.75)
 
     @property
     def iqr(self):
@@ -487,7 +500,7 @@ def __init__(self, comparator, old_branch, new_branch, changes_only,
 {0} ({1}): {2}"""
 
     PERFORMANCE_TEST_RESULT_HEADER = ('TEST', 'MIN', 'MAX', 'MEAN', 'MAX_RSS')
-    RESULT_COMPARISON_HEADER = ('TEST', 'OLD', 'NEW', 'DELTA', 'SPEEDUP')
+    RESULT_COMPARISON_HEADER = ('TEST', 'OLD', 'NEW', 'DELTA', 'RATIO')
 
     @staticmethod
     def header_for(result):

benchmark/scripts/test_Benchmark_Driver.py

@@ -476,10 +476,10 @@ def test_measure_10_independent_1s_benchmark_series(self):
             # 5x i1 series, with 300 μs runtime its possible to take 4098
             # samples/s, but it should be capped at 2k
             ([(_run('B1', num_samples=2048, num_iters=1,
-                    verbose=True), _PTR(min=300))] * 5) +
+                    verbose=True, measure_memory=True), _PTR(min=300))] * 5) +
             # 5x i2 series
             ([(_run('B1', num_samples=2048, num_iters=2,
-                    verbose=True), _PTR(min=300))] * 5)
+                    verbose=True, measure_memory=True), _PTR(min=300))] * 5)
         ))
         doctor = BenchmarkDoctor(self.args, driver)
         with captured_output() as (out, _):

benchmark/scripts/test_compare_perf_tests.py

@@ -75,13 +75,13 @@ def test_computes_five_number_summary(self):
             self.samples, (1000, 1000, 1000, 1000, 1000))
         self.samples.add(Sample(2, 1, 1100))
         self.assertEqualFiveNumberSummary(
-            self.samples, (1000, 1000, 1100, 1100, 1100))
+            self.samples, (1000, 1000, 1000, 1100, 1100))
         self.samples.add(Sample(3, 1, 1050))
         self.assertEqualFiveNumberSummary(
-            self.samples, (1000, 1000, 1050, 1050, 1100))
+            self.samples, (1000, 1000, 1050, 1100, 1100))
         self.samples.add(Sample(4, 1, 1025))
         self.assertEqualFiveNumberSummary(
-            self.samples, (1000, 1025, 1050, 1100, 1100))
+            self.samples, (1000, 1025, 1050, 1050, 1100))
         self.samples.add(Sample(5, 1, 1075))
         self.assertEqualFiveNumberSummary(
             self.samples, (1000, 1025, 1050, 1075, 1100))
@@ -156,11 +156,12 @@ def test_excludes_outliers_zero_IQR(self):
         self.samples.add(Sample(0, 2, 23))
         self.samples.add(Sample(1, 2, 18))
         self.samples.add(Sample(2, 2, 18))
+        self.samples.add(Sample(3, 2, 18))
         self.assertEquals(self.samples.iqr, 0)
 
         self.samples.exclude_outliers()
 
-        self.assertEquals(self.samples.count, 2)
+        self.assertEquals(self.samples.count, 3)
         self.assertEqualStats(
             (self.samples.min, self.samples.max), (18, 18))
 
@@ -368,7 +369,6 @@ def test_parse_results_verbose(self):
     Sample 0,11812
     Measuring with scale 90.
     Sample 1,13898
-    Measuring with scale 91.
     Sample 2,11467
 1,AngryPhonebook,3,11467,13898,12392,1315,11812
 Running Array2D for 3 samples.
@@ -388,7 +388,7 @@ def test_parse_results_verbose(self):
         )
         self.assertEquals(r.num_samples, r.samples.num_samples)
         self.assertEquals(results[0].samples.all_samples,
-                          [(0, 78, 11812), (1, 90, 13898), (2, 91, 11467)])
+                          [(0, 78, 11812), (1, 90, 13898), (2, 90, 11467)])
 
         r = results[1]
         self.assertEquals(
@@ -587,21 +587,21 @@ def test_column_headers(self):
         comparison_result = self.tc.increased[0]
         self.assertEquals(
             ReportFormatter.header_for(comparison_result),
-            ('TEST', 'OLD', 'NEW', 'DELTA', 'SPEEDUP')
+            ('TEST', 'OLD', 'NEW', 'DELTA', 'RATIO')
         )
         self.assert_markdown_contains([
-            'TEST                  | OLD    | NEW    | DELTA   | SPEEDUP',
+            'TEST                  | OLD    | NEW    | DELTA   | RATIO',
             '---                   | ---    | ---    | ---     | ---    ',
             'TEST                  | MIN    | MAX    | MEAN    | MAX_RSS'])
         self.assert_git_contains([
-            'TEST                    OLD      NEW      DELTA     SPEEDUP',
+            'TEST                    OLD      NEW      DELTA     RATIO',
             'TEST                    MIN      MAX      MEAN      MAX_RSS'])
         self.assert_html_contains([
             """
                 <th align='left'>OLD</th>
                 <th align='left'>NEW</th>
                 <th align='left'>DELTA</th>
-                <th align='left'>SPEEDUP</th>""",
+                <th align='left'>RATIO</th>""",
             """
                 <th align='left'>MIN</th>
                 <th align='left'>MAX</th>
@@ -764,12 +764,12 @@ class Test_compare_perf_tests_main(OldAndNewLog, FileSystemIntegration):
     """Integration test that invokes the whole comparison script."""
     markdown = [
         '<summary>Regression (1)</summary>',
-        'TEST                  | OLD    | NEW    | DELTA   | SPEEDUP',
+        'TEST                  | OLD    | NEW    | DELTA   | RATIO',
         'BitCount              | 3      | 9      | +199.9% | **0.33x**',
     ]
     git = [
         'Regression (1):',
-        'TEST                    OLD      NEW      DELTA     SPEEDUP',
+        'TEST                    OLD      NEW      DELTA     RATIO',
         'BitCount                3        9        +199.9%   **0.33x**',
     ]
     html = ['<html>', "<td align='left'>BitCount</td>"]

benchmark/single-source/CountAlgo.swift

@@ -0,0 +1,126 @@
+//===--- CountAlgo.swift --------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2018 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
+
+public let CountAlgo = [
+  BenchmarkInfo(
+    name: "CountAlgoArray",
+    runFunction: run_CountAlgoArray,
+    tags: [.validation, .api]),
+  BenchmarkInfo(
+    name: "CountAlgoString",
+    runFunction: run_CountAlgoString,
+    tags: [.validation, .api]),
+]
+
+@inline(never)
+public func run_CountAlgoArray(_ N: Int) {
+  for _ in 1...10*N {
+    CheckResults(numbers.count(where: { $0 & 4095 == 0 }) == 25)
+  }
+}
+
+@inline(never)
+public func run_CountAlgoString(_ N: Int) {
+  let vowels = Set("aeiou")
+  for _ in 1...5*N {
+    CheckResults(text.count(where: vowels.contains) == 2014)
+  }
+}
+
+let numbers = Array(0..<100_000)
+
+let text = """
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas tempus
+    dictum tellus placerat ultrices. Proin mauris risus, eleifend a elit ut,
+    semper consectetur nibh. Nulla ultricies est a vehicula rhoncus. Morbi
+    sollicitudin efficitur est a hendrerit. Interdum et malesuada fames ac ante
+    ipsum primis in faucibus. Lorem ipsum dolor sit amet, consectetur
+    adipiscing elit. Nulla facilisi. Sed euismod sagittis laoreet. Ut elementum
+    tempus ultrices. Donec convallis mauris at faucibus maximus.
+    Nullam in nunc sit amet ante tristique elementum quis ut eros. Fusce
+    dignissim, ante at efficitur dapibus, ex massa convallis nibh, et venenatis
+    leo leo sit amet nisl. Lorem ipsum dolor sit amet, consectetur adipiscing
+    elit. Quisque sed mi eu mi rutrum accumsan vel non massa. Nunc condimentum,
+    arcu eget interdum hendrerit, ipsum mi pretium felis, ut mollis erat metus
+    non est. Donec eu sapien id urna lobortis eleifend et eu ipsum. Mauris
+    purus dolor, consequat ac nulla a, vehicula sollicitudin nulla.
+    Phasellus a congue diam. Curabitur sed orci at sem laoreet facilisis eget
+    quis est. Pellentesque habitant morbi tristique senectus et netus et
+    malesuada fames ac turpis egestas. Maecenas justo tellus, efficitur id
+    velit at, mollis pellentesque mi. Vivamus maximus nibh et ipsum porttitor
+    facilisis. Curabitur cursus lobortis erat. Sed vitae eros et dolor feugiat
+    consequat. In ac massa in odio gravida dignissim. Praesent aliquam gravida
+    ullamcorper.
+    Etiam feugiat sit amet odio sed tincidunt. Duis dolor odio, posuere at
+    pretium sed, dignissim eu diam. Aenean eu convallis orci, vitae finibus
+    erat. Aliquam nec mollis tellus. Morbi luctus sed quam et vestibulum.
+    Praesent id diam tempus, consectetur tortor vel, auctor orci. Aliquam
+    congue ex eu sagittis sodales. Suspendisse non convallis nulla. Praesent
+    elementum semper augue, et fringilla risus ullamcorper id. Fusce eu lorem
+    sit amet augue fermentum tincidunt. In aliquam libero sit amet dui rhoncus,
+    ac scelerisque sem porttitor. Cras venenatis, nisi quis ullamcorper
+    dapibus, odio dolor rutrum magna, vel pellentesque sem lectus in tellus.
+    Proin faucibus leo iaculis nulla egestas molestie.
+    Phasellus vitae tortor vitae erat elementum feugiat vel vel enim. Phasellus
+    fringilla lacus sed venenatis dapibus. Phasellus sagittis vel neque ut
+    varius. Proin aliquam, lectus sit amet auctor finibus, lorem libero
+    pellentesque turpis, ac condimentum augue felis sit amet sem. Pellentesque
+    pharetra nisl nec est congue, in posuere felis maximus. In ut nulla
+    sodales, pharetra neque et, venenatis dui. Mauris imperdiet, arcu vel
+    hendrerit vehicula, elit massa consectetur purus, eu blandit nunc orci sit
+    amet turpis. Vestibulum ultricies id lorem id maximus. Pellentesque
+    feugiat, lacus et aliquet consequat, mi leo vehicula justo, dapibus dictum
+    mi quam convallis magna. Quisque id pulvinar dui, consequat gravida nisl.
+    Nam nec justo venenatis, tincidunt enim a, iaculis odio. Maecenas eget
+    lorem posuere, euismod nisl vel, pulvinar ex. Maecenas vitae risus ipsum.
+    Proin congue sem ante, sit amet sagittis odio mattis sit amet. Nullam et
+    nisi nulla.
+    Donec vel hendrerit metus. Praesent quis finibus erat. Aliquam erat
+    volutpat. Fusce sit amet ultricies tellus, vitae dictum dolor. Morbi auctor
+    dolor vel ligula pretium aliquam. Aenean lobortis vel magna vel ultricies.
+    Aenean porta urna vitae ornare porta. Quisque pretium dui diam, quis
+    iaculis odio venenatis non. Maecenas at lacus et ligula tincidunt feugiat
+    eu vel ipsum. Proin fermentum elit et quam tempus, eget pulvinar nisl
+    pharetra.
+    Mauris sodales tempus erat in lobortis. Duis vitae lacinia sapien.
+    Pellentesque vitae massa eget orci sodales aliquet. Orci varius natoque
+    penatibus et magnis dis parturient montes, nascetur ridiculus mus. Fusce
+    nisi arcu, egestas vel consectetur eu, auctor et metus. In ultricies ligula
+    felis, vitae pellentesque dolor tempor ac. Praesent mi magna, ultrices ut
+    ultrices vel, sollicitudin a leo.
+    Nam porta, nisi in scelerisque consequat, leo lacus accumsan massa,
+    venenatis faucibus tellus quam eget tellus. Curabitur pulvinar, tellus ac
+    facilisis consectetur, lacus lacus venenatis est, eu pretium orci augue
+    gravida nunc. Aenean odio tellus, facilisis et finibus id, varius vitae
+    diam. Aenean at suscipit sem. Suspendisse porta neque at nibh semper, sit
+    amet suscipit libero egestas. Donec commodo vitae justo vitae laoreet.
+    Suspendisse dignissim erat id ante maximus porta. Curabitur hendrerit
+    maximus odio, et maximus felis malesuada eu. Integer dapibus finibus diam,
+    quis convallis metus bibendum non.
+    In vel vulputate nisi, non lacinia nunc. Nullam vitae ligula finibus,
+    varius arcu in, pellentesque ipsum. Morbi vel velit tincidunt quam cursus
+    lacinia non in neque. Suspendisse id feugiat nibh. Vestibulum egestas eu
+    leo viverra fringilla. Curabitur ultrices sollicitudin libero, non sagittis
+    felis consectetur id. Aenean non metus eget leo ornare porta sed in metus.
+    Nullam quis fermentum sapien, sit amet sodales mi. Maecenas nec purus urna.
+    Phasellus condimentum enim nec magna convallis, eu lacinia libero
+    scelerisque. Suspendisse justo libero, maximus in auctor id, euismod quis
+    risus. Nam eget augue diam. Ut id risus pulvinar elit consectetur varius.
+    Aliquam tincidunt tortor pretium feugiat tempor. Nunc nec feugiat ex.
+    Ut pulvinar augue eget pharetra vehicula. Phasellus malesuada tempor sem,
+    ut tincidunt velit convallis in. Vivamus luctus libero vitae massa tempus,
+    id elementum urna iaculis. Sed eleifend quis purus quis convallis. In
+    rhoncus interdum mollis. Pellentesque dictum euismod felis, eget lacinia
+    elit blandit vel. Praesent elit velit, pharetra a sodales in, cursus vitae
+    tortor. In vitae scelerisque tellus.
+    """