Merge pull request #262 from ahoppen/6.0/swiftlang-migration

[6.0] Update links for repositories moved to the swiftlang org on GitHub

Author: ahoppen

README.md

@@ -25,7 +25,7 @@ $ ./swift/utils/build-script --test --skip-build-benchmark --skip-test-cmark --s
 
 ### For local development
 
-For local development, you'll first need to download and install a recent [swift.org development snapshot](https://swift.org/download/#snapshots) toolchain that matches the latest commit on main in the [SwiftSyntax](https://github.com/apple/swift-syntax). This is because the Stress Tester depends on the latest version of SwiftSyntax and SwiftSyntax integrates into the latest version of the compiler.
+For local development, you'll first need to download and install a recent [swift.org development snapshot](https://swift.org/download/#snapshots) toolchain that matches the latest commit on main in the [SwiftSyntax](https://github.com/swiftlang/swift-syntax). This is because the Stress Tester depends on the latest version of SwiftSyntax and SwiftSyntax integrates into the latest version of the compiler.
 
 The toolchain is installed into `/Library/Developer/Toolchains/` if installed for all users. Note that the `$TOOLCHAIN_DIR` variables below should include `/usr` at the end of their path, eg. `TOOLCHAIN_DIR=/Library/Developer/Toolchains/swift-DEVELOPMENT-SNAPSHOT-<...>.xctoolchain/usr`.
 
@@ -35,7 +35,7 @@ To generate an Xcode project that's set up correctly, run `build-script-helper.p
 ```
 $ ./build-script-helper.py --package-dir SourceKitStressTester --toolchain $TOOLCHAIN_DIR generate-xcodeproj --no-local-deps
 ```
-If you have the [SwiftSyntax](https://github.com/apple/swift-syntax) and [SwiftPM](https://github.com/apple/swift-package-manager) repositories already checked out next to the stress tester's repository, you can omit the `--no-local-deps` option to use the existing checkouts instead of fetching the dependencies using SwiftPM.
+If you have the [SwiftSyntax](https://github.com/swiftlang/swift-syntax) and [SwiftPM](https://github.com/swiftlang/swift-package-manager) repositories already checked out next to the stress tester's repository, you can omit the `--no-local-deps` option to use the existing checkouts instead of fetching the dependencies using SwiftPM.
 
 This will generate `SourceKitStressTester/SourceKitStressTester.xcodeproj`. Open it and select the toolchain you installed from the Xcode > Toolchains menu, before building the `SourceKitStressTester-Package` scheme.
 
@@ -45,7 +45,7 @@ To build, run `build-script-helper.py`, passing the path to the downloaded toolc
 ```
 $ ./build-script-helper.py --package-dir SourceKitStressTester --toolchain $TOOLCHAIN_DIR
 ```
-If you have the [SwiftSyntax](https://github.com/apple/swift-syntax) and [SwiftPM](https://github.com/apple/swift-package-manager) repositories already checked out next to the stress tester's repository, you can omit the `--no-local-deps` option to use the existing checkouts instead of fetching the dependencies using SwiftPM.
+If you have the [SwiftSyntax](https://github.com/swiftlang/swift-syntax) and [SwiftPM](https://github.com/swiftlang/swift-package-manager) repositories already checked out next to the stress tester's repository, you can omit the `--no-local-deps` option to use the existing checkouts instead of fetching the dependencies using SwiftPM.
 
 To run the tests, repeat the above command, but additionally, pass the `test` action:
 ```

SourceKitStressTester/Package.swift

@@ -174,7 +174,7 @@ if !useLocalDependencies {
     .package(url: "https://github.com/apple/swift-argument-parser.git", .upToNextMinor(from: "1.0.1")),
   ]
   if swiftSyntaxSearchPath == nil {
-    package.dependencies.append(.package(url: "https://github.com/apple/swift-syntax.git", .branch("release/6.0")))
+    package.dependencies.append(.package(url: "https://github.com/swiftlang/swift-syntax.git", .branch("release/6.0")))
   }
 } else {
   package.dependencies += [

SourceKitStressTester/Sources/StressTester/SourceKitDocument.swift

@@ -533,21 +533,7 @@ class SourceKitDocument {
         try throwIfInvalid(response, request: info)
         try validateResponse(response)
 
-        // Hack to make ACHNBrowserUI/extensions/Path.swift insideOut-893:884 a
-        // soft timeout. It seems to vary *wildly* between runs. We should
-        // investigate why that is, but just get the stress tester to stop
-        // failing for now.
-        var forceSoftTimeout = false
-        if case let .codeCompleteOpen(document, offset, _) = info,
-           offset == 884,
-           let modification = document.modification,
-           modification.mode == .insideOut,
-           modification.content.count == 893,
-           document.path.hasSuffix("ACHNBrowserUI/extensions/Path.swift") {
-          forceSoftTimeout = true
-        }
-
-        if forceSoftTimeout || requestDuration > TimeInterval(SOURCEKIT_REQUEST_TIMEOUT) / 10 {
+        if requestDuration > TimeInterval(SOURCEKIT_REQUEST_TIMEOUT) / 10 {
           // There was no error in the response, but the request took too long
           // throw a soft timeout.
           throw SourceKitError.softTimeout(request: info, duration: requestDuration, instructions: nil)

SourceKitStressTester/Sources/StressTester/StressTester.swift

@@ -129,7 +129,13 @@ public class StressTester {
         if case SourceKitError.softTimeout(request: let request, duration: _, instructions: let .some(instructions)) = error {
           reportPerformanceMeasurement(request: request, instructions: instructions, reusingASTContext: nil)
         }
-        errors.append(error)
+        if case SourceKitError.timedOut = error {
+          // Ignore timeout errors. In practice, we have always just added the timeouts to the XFails and keeping track
+          // of these timeouts is the major cause of stress tester failures, producing noise.
+          // We use instruction count measurements to keep track of performance.
+        } else {
+          errors.append(error)
+        }
       }
     }