Merge branch 'swiftlang:main' into proposal/progress-reporter

Author: chloe-yeo

Benchmarks/Benchmarks/AttributedString/BenchmarkAttributedString.swift

@@ -414,6 +414,11 @@ let benchmarks = {
 #endif
 
     let manyAttributesString2 = createManyAttributesString()
+    let manyAttributesString3 =  {
+        var str = createManyAttributesString()
+        str.characters.append("a")
+        return str
+    }()
     let manyAttributesStringRange = manyAttributesString.characters.index(manyAttributesString.startIndex, offsetBy: manyAttributesString.characters.count / 2)...
     let manyAttributesSubstring = manyAttributesString[manyAttributesStringRange]
     let manyAttributes2Substring = manyAttributesString2[manyAttributesStringRange]
@@ -422,6 +427,10 @@ let benchmarks = {
         blackHole(manyAttributesString == manyAttributesString2)
     }
 
+    Benchmark("equalityDifferingCharacters") { benchmark in
+        blackHole(manyAttributesString == manyAttributesString3)
+    }
+    
     Benchmark("substringEquality") { benchmark in
         blackHole(manyAttributesSubstring == manyAttributes2Substring)
     }
@@ -455,6 +464,43 @@ let benchmarks = {
         blackHole(hasher.finalize())
     }
 #endif
+    
+    let manyAttributesWithParagraph = {
+        var str = createManyAttributesString()
+        str.testParagraphConstrained = 2
+        return str
+    }()
+    
+    Benchmark("paragraphBoundSliceEnumeration-shortRuns") { benchmark in
+        for (value, range) in manyAttributesWithParagraph.runs[\.testParagraphConstrained] {
+            blackHole(value)
+        }
+    }
+    
+    Benchmark("paragraphBoundSliceEnumeration-shortRuns-reversed") { benchmark in
+        for (value, range) in manyAttributesWithParagraph.runs[\.testParagraphConstrained].reversed() {
+            blackHole(value)
+        }
+    }
+    
+    let longParagraphsString = {
+        var str = String(repeating: "a", count: 10000) + "\n"
+        str += String(repeating: "b", count: 10000) + "\n"
+        str += String(repeating: "c", count: 10000)
+        return AttributedString(str, attributes: AttributeContainer.testParagraphConstrained(1).testInt(2))
+    }()
+    
+    Benchmark("paragraphBoundSliceEnumeration-longRuns") { benchmark in
+        for (value, range) in longParagraphsString.runs[\.testParagraphConstrained] {
+            blackHole(value)
+        }
+    }
+    
+    Benchmark("paragraphBoundSliceEnumeration-longRuns-reversed") { benchmark in
+        for (value, range) in longParagraphsString.runs[\.testParagraphConstrained].reversed() {
+            blackHole(value)
+        }
+    }
 }
 
 

Benchmarks/Benchmarks/Base64/Base64.swift

@@ -24,7 +24,7 @@ private func autoreleasepool<T>(_ block: () -> T) -> T { block() }
 #endif
 
 #if canImport(Glibc)
-import Glibc
+@preconcurrency import Glibc
 #endif
 #if canImport(Darwin)
 import Darwin

Benchmarks/Benchmarks/DataIO/BenchmarkDataIO.swift

@@ -24,7 +24,7 @@ private func autoreleasepool<T>(_ block: () -> T) -> T { block() }
 #endif
 
 #if canImport(Glibc)
-import Glibc
+@preconcurrency import Glibc
 #endif
 #if canImport(Darwin)
 import Darwin
@@ -88,9 +88,11 @@ let benchmarks = {
         try data.write(to: testPath)
     }
 
+#if !os(WASI) // atomic writing is unavailable on WASI
     Benchmark("write-regularFile-atomic", configuration: .cleanupTestPathConfig) { benchmark in
         try data.write(to: testPath, options: .atomic)
     }
+#endif
 
     Benchmark("write-regularFile-alreadyExists",
               configuration: .init(
@@ -103,6 +105,7 @@ let benchmarks = {
         try? data.write(to: testPath)
     }
 
+#if !os(WASI) // atomic writing is unavailable on WASI
     Benchmark("write-regularFile-alreadyExists-atomic",
               configuration: .init(
                 setup: {
@@ -113,6 +116,7 @@ let benchmarks = {
     ) { benchmark in
         try? data.write(to: testPath, options: .atomic)
     }
+#endif
 
     Benchmark("read-regularFile", 
               configuration: .init(

Benchmarks/Benchmarks/Formatting/BenchmarkFormatting.swift

@@ -45,15 +45,15 @@ let benchmarks = {
 
     let preformatted = formats.map { ($0, $0.format(date)) }
 
-    Benchmark("iso860-format", configuration: .init(scalingFactor: .kilo)) { benchmark in
+    Benchmark("iso8601-format", configuration: .init(scalingFactor: .kilo)) { benchmark in
         for _ in benchmark.scaledIterations {
             for fmt in formats {
                 blackHole(fmt.format(date))
             }
         }
     }
 
-    Benchmark("iso860-parse", configuration: .init(scalingFactor: .kilo)) { benchmark in
+    Benchmark("iso8601-parse", configuration: .init(scalingFactor: .kilo)) { benchmark in
         for _ in benchmark.scaledIterations {
             for fmt in preformatted {
                 let result = try? fmt.0.parse(fmt.1)

Benchmarks/Benchmarks/URL/BenchmarkURL.swift

@@ -231,4 +231,50 @@ let benchmarks = {
         }
     }
 
+    Benchmark("URL-Template-parsing") { benchmark in
+        for _ in benchmark.scaledIterations {
+            blackHole(URL.Template("/api/{version}/accounts/{accountId}/transactions/{transactionId}{?expand*,fields*,embed*,format}")!)
+            blackHole(URL.Template("/special/{+a}/details")!)
+            blackHole(URL.Template("/documents/{documentId}{#section,paragraph}")!)
+        }
+    }
+
+    let templates = [
+        URL.Template("/var/{var}/who/{who}/x/{x}{?keys*,count*,list*,y}")!,
+        URL.Template("/special/{+keys}/details")!,
+        URL.Template("x/y/{#path:6}/here")!,
+        URL.Template("a/b{/var,x}/here")!,
+        URL.Template("a{?var,y}")!,
+    ]
+
+    var variables: [URL.Template.VariableName: URL.Template.Value] = [
+        "count": ["one", "two", "three"],
+        "dom": ["example", "com"],
+        "dub": "me/too",
+        "hello": "Hello World!",
+        "half": "50%",
+        "var": "value",
+        "who": "fred",
+        "base": "http://example.com/home/",
+        "path": "/foo/bar",
+        "list": ["red", "green", "blue"],
+        "keys": [
+            "semi": ";",
+            "dot": ".",
+            "comma": ",",
+        ],
+        "v": "6",
+        "x": "1024",
+        "y": "768",
+        "empty": "",
+        "empty_keys": [:],
+    ]
+
+    Benchmark("URL-Template-expansion") { benchmark in
+        for _ in benchmark.scaledIterations {
+            for t in templates {
+                blackHole(URL(template: t, variables: variables))
+            }
+        }
+    }
 }

CMakeLists.txt

@@ -46,6 +46,13 @@ if(NOT CMAKE_HOST_SYSTEM_NAME STREQUAL Windows)
     endif()
 endif()
 
+if(CMAKE_SYSTEM_NAME STREQUAL Linux)
+    # Pass -fno-omit-frame-pointer while compiling for better backtraces
+    add_compile_options(
+        "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xcc -fno-omit-frame-pointer>"
+        "$<$<COMPILE_LANGUAGE:C,CXX>:-fno-omit-frame-pointer>")
+endif()
+
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)