Merge pull request #3287 from kkebo/enable-wasi-test-ci

[CI] Enable Wasm SDK tests

Author: ahoppen

.github/workflows/pull_request.yml

@@ -19,6 +19,7 @@ jobs:
     uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@0.0.7
     with:
       enable_wasm_sdk_build: true
+      wasm_sdk_build_command: "swift test -c release --explicit-target-dependency-import-check error --toolset Toolsets/wasi-test-toolset.json"
       linux_build_command: "swift test --explicit-target-dependency-import-check error"
       windows_build_command: "Invoke-Program swift test --explicit-target-dependency-import-check error"
   soundness:

Sources/_InstructionCounter/include/InstructionsExecuted.h

@@ -14,4 +14,4 @@
 
 /// On macOS returns the number of instructions the process has executed since
 /// it was launched, on all other platforms returns 0.
-uint64_t getInstructionsExecuted();
+uint64_t getInstructionsExecuted(void);

Tests/SwiftParserTest/Assertions.swift

@@ -757,7 +757,7 @@ extension ParserTestCase {
     }
 
     if !longTestsDisabled {
-      DispatchQueue.concurrentPerform(iterations: Array(tree.tokens(viewMode: .all)).count) { tokenIndex in
+      performConcurrentIfPossible(iterations: Array(tree.tokens(viewMode: .all)).count) { tokenIndex in
         let flippedTokenTree = TokenPresenceFlipper(flipTokenAtIndex: tokenIndex).rewrite(Syntax(tree))
         _ = ParseDiagnosticsGenerator.diagnostics(for: flippedTokenTree)
         Self.assertMutationRoundTrip(
@@ -776,7 +776,7 @@ extension ParserTestCase {
         replacements in
         return replacements.map { (offset, $0) }
       }
-      DispatchQueue.concurrentPerform(iterations: mutations.count) { index in
+      performConcurrentIfPossible(iterations: mutations.count) { index in
         let mutation = mutations[index]
         let alternateSource = MutatedTreePrinter.print(
           tree: Syntax(tree),

Tests/SwiftParserTest/ParserTests.swift

@@ -10,7 +10,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Dispatch
 import SwiftParser
 import SwiftParserDiagnostics
 import SwiftSyntax
@@ -59,8 +58,8 @@ class ParserTests: ParserTestCase {
     name: String,
     path: URL,
     checkDiagnostics: Bool,
-    shouldExclude: @Sendable (URL) -> Bool = { _ in false }
-  ) {
+    shouldExclude: @escaping @Sendable (URL) -> Bool = { _ in false }
+  ) async throws {
     let fileURLs = FileManager.default
       .enumerator(at: path, includingPropertiesForKeys: nil)!
       .compactMap({ $0 as? URL })
@@ -71,16 +70,15 @@ class ParserTests: ParserTestCase {
       }
 
     print("\(name) - processing \(fileURLs.count) source files")
-    DispatchQueue.concurrentPerform(iterations: fileURLs.count) { fileURLIndex in
-      let fileURL = fileURLs[fileURLIndex]
-      if shouldExclude(fileURL) {
-        return
-      }
-
-      do {
-        try Self.runParseTest(fileURL: fileURL, checkDiagnostics: checkDiagnostics)
-      } catch {
-        XCTFail("\(name): \(fileURL) failed due to \(error)")
+    await withTaskGroup(of: Void.self) { group in
+      for fileURL in fileURLs where !shouldExclude(fileURL) {
+        group.addTask {
+          do {
+            try Self.runParseTest(fileURL: fileURL, checkDiagnostics: checkDiagnostics)
+          } catch {
+            XCTFail("\(name): \(fileURL) failed due to \(error)")
+          }
+        }
       }
     }
   }
@@ -90,14 +88,14 @@ class ParserTests: ParserTestCase {
     .deletingLastPathComponent()
     .deletingLastPathComponent()
 
-  func testSelfParse() throws {
+  func testSelfParse() async throws {
     // Allow skipping the self parse test in local development environments
     // because it takes very long compared to all the other tests.
     try XCTSkipIf(longTestsDisabled)
     let currentDir =
       packageDir
       .appendingPathComponent("Sources")
-    runParserTests(
+    try await runParserTests(
       name: "Self-parse tests",
       path: currentDir,
       checkDiagnostics: true
@@ -107,14 +105,14 @@ class ParserTests: ParserTestCase {
   /// Test all of the files in the "test" directory of the main Swift compiler.
   /// This requires the Swift compiler to have been checked out into the "swift"
   /// directory alongside swift-syntax.
-  func testSwiftTestsuite() throws {
+  func testSwiftTestsuite() async throws {
     try XCTSkipIf(longTestsDisabled)
     let testDir =
       packageDir
       .deletingLastPathComponent()
       .appendingPathComponent("swift")
       .appendingPathComponent("test")
-    runParserTests(
+    try await runParserTests(
       name: "Swift tests",
       path: testDir,
       checkDiagnostics: false
@@ -124,14 +122,14 @@ class ParserTests: ParserTestCase {
   /// Test all of the files in the "validation-text" directory of the main
   /// Swift compiler. This requires the Swift compiler to have been checked
   /// out into the "swift" directory alongside swift-syntax.
-  func testSwiftValidationTestsuite() throws {
+  func testSwiftValidationTestsuite() async throws {
     try XCTSkipIf(longTestsDisabled)
     let testDir =
       packageDir
       .deletingLastPathComponent()
       .appendingPathComponent("swift")
       .appendingPathComponent("validation-test")
-    runParserTests(
+    try await runParserTests(
       name: "Swift validation tests",
       path: testDir,
       checkDiagnostics: false

Tests/SwiftParserTest/Utils.swift

@@ -12,10 +12,24 @@
 
 @_spi(Testing) import SwiftParser
 
+#if !os(WASI)
+import Dispatch
+#endif
+
 func withParser<T>(source: String, _ body: (inout Parser) throws -> T) rethrows -> T {
   var source = source
   return try source.withUTF8 { buffer in
     var parser = Parser(buffer)
     return try body(&parser)
   }
 }
+
+func performConcurrentIfPossible(iterations: Int, execute work: @Sendable (Int) -> Void) {
+  #if os(WASI)
+  for i in 0..<iterations {
+    work(i)
+  }
+  #else
+  DispatchQueue.concurrentPerform(iterations: iterations, execute: work)
+  #endif
+}

Tests/SwiftSyntaxTest/MultithreadingTests.swift

@@ -23,19 +23,23 @@ extension SyntaxProtocol {
 // Marked as `@unchecked Sendable` to work around rdar://130094927, which complains about `MultithreadingTests` not conforming to
 // `Sendable`.
 class MultithreadingTests: XCTestCase, @unchecked Sendable {
-  public func testPathological() {
+  public func testPathological() async {
     let tuple = TupleTypeSyntax(
       leftParen: .leftParenToken(),
       elements: TupleTypeElementListSyntax([]),
       rightParen: .rightParenToken()
     )
 
-    DispatchQueue.concurrentPerform(iterations: 100) { _ in
-      XCTAssertEqual(tuple.leftParen, tuple.leftParen)
+    await withTaskGroup(of: Void.self) { group in
+      for _ in 0..<100 {
+        group.addTask {
+          XCTAssertEqual(tuple.leftParen, tuple.leftParen)
+        }
+      }
     }
   }
 
-  public func testConcurrentMutation() {
+  public func testConcurrentMutation() async {
     // 'base.member()'
     let methodCall = FunctionCallExprSyntax(
       calledExpression: MemberAccessExprSyntax(
@@ -50,15 +54,19 @@ class MultithreadingTests: XCTestCase, @unchecked Sendable {
       rightParen: .rightParenToken()
     )
 
-    DispatchQueue.concurrentPerform(iterations: 100) { i in
-      var copied = methodCall
-      copied
-        .calledExpression[as: MemberAccessExprSyntax.self]
-        .base![as: DeclReferenceExprSyntax.self]
-        .baseName = .identifier("ident\(i)")
-      copied = copied.with(\.leadingTrivia, [.newlines(1)])
+    await withTaskGroup(of: Void.self) { group in
+      for i in 0..<100 {
+        group.addTask {
+          var copied = methodCall
+          copied
+            .calledExpression[as: MemberAccessExprSyntax.self]
+            .base![as: DeclReferenceExprSyntax.self]
+            .baseName = .identifier("ident\(i)")
+          copied = copied.with(\.leadingTrivia, [.newlines(1)])
 
-      XCTAssertEqual(copied.description, "\nident\(i).member()")
+          XCTAssertEqual(copied.description, "\nident\(i).member()")
+        }
+      }
     }
   }
 

Toolsets/wasi-test-toolset.json

@@ -0,0 +1,18 @@
+{
+    "schemaVersion": "1.0",
+    "linker": {
+        "extraCLIOptions": [
+            "-z", "stack-size=16777216"
+        ]
+    },
+    "testRunner": {
+        "path": "/usr/bin/env",
+        "extraCLIOptions": [
+            "wasmkit",
+            "run",
+            "--dir", ".build",
+            "--dir", "/",
+            "--stack-size", "16777216"
+        ]
+    }
+}