Bump WasmKit to 0.1.0 (#17)

This improves mixed module rendering performance to due optimizations available in the latest version of WasmKit.

Author: MaxDesiatov

ServerHost/Package.resolved

@@ -21,7 +21,7 @@ let package = Package(
     dependencies: [
         .package(url: "https://github.com/apple/swift-nio.git", from: "2.72.0"),
         .package(url: "https://github.com/apple/swift-system.git", from: "1.3.2"),
-        .package(url: "https://github.com/swiftwasm/WasmKit.git", from: "0.0.8"),
+        .package(url: "https://github.com/swiftwasm/WasmKit.git", from: "0.1.0"),
         .package(url: "https://github.com/hummingbird-project/hummingbird.git", from: "2.0.0"),
         .package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.3.0")
     ],

ServerHost/Package.swift

@@ -24,50 +24,54 @@ struct MixedOutput: ResponseGenerator {
 
     func response(from request: Request, context: some RequestContext) throws -> Response {
         var samples = [Float32]()
-        var memoryIndex = 0
 
-        let runtime = Runtime(
-            hostModules: ["audio": .init(functions: [
-                "encode": HostFunction(type: .init(
-                    parameters: [.i32, .i32, .i32]
-                )) { caller, args in
-                    let start = args[1].i32
-                    let byteCount = args[2].i32
+        let engine = Engine()
+        let store = Store(engine: engine)
+        var moduleInstances = [Instance]()
 
-                    // Read audio buffer from Wasm linear memory.
-                    caller.runtime.store.memory(
-                        at: memoryIndex
-                    ).data[Int(start)..<Int(start + byteCount)].withUnsafeBytes {
-                        // Rebind memory bytes to `Float`.
-                        $0.withMemoryRebound(to: Float.self) {
-                            // Enumerate each floating point sample
-                            for (i, sample) in $0.enumerated() {
-                                // Extend `samples` buffer if needed.
-                                if samples.count < $0.count {
-                                    // 0.0 (no signal) is the default sample.
-                                    samples.append(0.0)
-                                }
+        // Instantiate each Wasm module
+        for (moduleIndex, module) in modules.enumerated() {
+            let encode = ExternalValue.function(.init(store: store, type: .init(
+                parameters: [.i32, .i32, .i32]
+            )) { caller, args in
+                let start = args[1].i32
+                let byteCount = args[2].i32
 
-                                // Mix current sample with an existing value.
-                                samples[i] += sample
+                // Read audio buffer from Wasm linear memory.
+                moduleInstances[moduleIndex].exports[memory: "memory"]!.data[
+                    Int(start)..<Int(start + byteCount)
+                ].withUnsafeBytes {
+                    // Rebind memory bytes to `Float`.
+                    $0.withMemoryRebound(to: Float.self) {
+                        // Enumerate each floating point sample
+                        for (i, sample) in $0.enumerated() {
+                            // Extend `samples` buffer if needed.
+                            if samples.count < $0.count {
+                                // 0.0 (no signal) is the default sample.
+                                samples.append(0.0)
                             }
 
-                            assert(samples.count == $0.count)
+                            // Mix current sample with an existing value.
+                            samples[i] += sample
                         }
-                    }
 
-                    return []
+                        assert(samples.count == $0.count)
+                    }
                 }
-            ])]
-        )
 
-        // Instantiate each Wasm module
-        for module in modules {
-            let moduleInstance = try runtime.instantiate(module: module)
+                return []
+            })
+
+            let imports: Imports = [
+                "audio": [ "encode": encode ]
+            ]
+            let instance = try module.instantiate(store: store, imports: imports)
+            moduleInstances.append(instance)
 
             // Call entrypoint module function
-            _ = try runtime.invoke(moduleInstance, function: "main", with: [.i32(0)])
-            memoryIndex += 1
+
+            let main = instance.exports[function: "main"]!
+            try main([.i32(0)])
         }
 
         var body = ByteBuffer()

ServerHost/Sources/Server/MixedOutput.swift

@@ -7,7 +7,7 @@ let package = Package(
     name: "WasmHost",
     platforms: [.macOS(.v14)],
     dependencies: [
-        .package(url: "https://github.com/swiftwasm/WasmKit.git", from: "0.0.8"),
+        .package(url: "https://github.com/swiftwasm/WasmKit.git", from: "0.1.0"),
     ],
     targets: [
         // Targets are the basic building blocks of a package, defining a module or a test suite.

WATExample/Package.resolved

@@ -15,37 +15,35 @@ let binaryModule = try wat2wasm(String(decoding: Data(contentsOf: watURL), as: U
 // Parse as WasmKit IR.
 let parsedModule = try parseWasm(bytes: binaryModule)
 
+let engine = Engine()
+let store = Store(engine: engine)
+
 // Initialize WasmKit runtime
-let runtime = Runtime(
-    hostModules: [
-        "host": .init(
-            functions: [
-                // Pass host printer function as a closure
-                "print": HostFunction(type: .init(parameters: [.i32, .i32])) { instance, args in
-                    guard let start = args.first?.i32,
-                          let offset = args.last?.i32
-                    else { return [] }
-
-                    // Decode linear memory
-                    let string = String(
-                        decoding: instance.store
-                            .memory(at: 0)
-                            .data[Int(start) ..< Int(start + offset)],
-                        as: UTF8.self
-                    )
-
-                    // Print the result
-                    print("Guest module printed: \(string)")
-                    return []
-                },
-            ]
+let imports: Imports = [
+    "host": [
+        // Pass host printer function as a closure
+        "print": ExternalValue.function(Function(store: store, type: .init(parameters: [.i32, .i32])) { caller, args in
+                guard let start = args.first?.i32,
+                      let offset = args.last?.i32
+                else { return [] }
+
+                // Decode linear memory
+                let string = String(
+                    decoding: caller.instance!.exports[memory: "memory"]!.data[Int(start) ..< Int(start + offset)],
+                    as: UTF8.self
+                )
+
+                // Print the result
+                print("Guest module printed: \(string)")
+                return []
+            }
         ),
     ]
-)
+]
 
 // Instantiate the module
-let moduleInstance = try runtime.instantiate(module: parsedModule)
+let moduleInstance = try parsedModule.instantiate(store: store, imports: imports)
 
 // Call `main` function
-let result = try runtime.invoke(moduleInstance, function: "main")
+let result = try moduleInstance.exports[function: "main"]!()
 print("Returned value: \(result)")

WATExample/Package.swift

@@ -3,7 +3,8 @@
     (func $print (param (; pointer ;) i32 (; length ;) i32)))
   (export "main" (func $main))
 
-  (memory 1)
+  (memory $memory 1)
+  (export "memory" (memory $memory))
 
   ;; n! = n * (n - 1) * (n - 2) * ... * 2 * 1
   (func $factorial (param $arg i64) (result i64)

WATExample/Sources/WATExample/main.swift

@@ -3,7 +3,8 @@
     (func $print (param (; pointer ;) i32 (; length ;) i32)))
   (export "main" (func $main))
 
-  (memory 1)
+  (memory $memory 1)
+  (export "memory" (memory $memory))
 
   ;; n! = n * (n - 1) * (n - 2) * ... * 2 * 1
   (func $factorial (param $arg i64) (result i64)