Begin adding WASI support #72
Conversation
|
Thanks! Can you rebase on top of |
Hywan
added
🎉 enhancement
MarkMcCaskey
force-pushed
the
feature/wasi-support
branch
from
2e53e15
to
d76dd29
Compare
|
How far along is this branch? We currently have completed a machine learning C++ application that compiles nicely using both clang and emscripten standalone, and now runs on both Wasmer and WAVM. But it fails to instantiate the wasm using go-ext-wasm, dueto some missing WASI imports. Would be super if we can make this work, as it would be the final step towards completing our framework. |
|
I'm literally working on this right now. Expect to be merged in a couple of hours if everything goes smoothly. |
|
Incredible! The timing couldn't be any better. Thanks! |
| wasmer-runtime-c-api = { path = "../wasmer/lib/runtime-c-api", version = "0.8.0", features = ["wasi"] } |
There was a problem hiding this comment.
We can just require wasmer 0.11.0, which has wasi as a default feature.
| @@ -56,6 +58,109 @@ func cNewWasmerImportT(moduleName string, importName string, function *cWasmerIm | |||
| return (cWasmerImportT)(importedFunction) | |||
| } | |||
|
|
|||
| func cGetParamsForImportFunc(function *cWasmerImportFuncT) []cWasmerValueTag { | |||
| var arity C.uint32_t = 0 | |||
There was a problem hiding this comment.
0 is the value, it's suggested to remove it.
| } | ||
|
|
||
| func cGetReturnsForImportFunc(function *cWasmerImportFuncT) []cWasmerValueTag { | ||
| var arity C.uint32_t = 0 |
There was a problem hiding this comment.
0 is the default value, it's suggested to remove it.
| message string | ||
| } | ||
|
|
||
| // A type that owns a set of imports. |
There was a problem hiding this comment.
Documentation must start by the name of the type or the name of the function. So it becomes:
ImportObject owns a set of imports.
It's a Go rule.
| if params == nil { | ||
| return imports, NewImportedFunctionError(importName, fmt.Sprintf("could not get parameters for %s %s", namespace, importName)) | ||
| } | ||
| returns := cGetParamsForImportFunc(wasmerImportFunc) |
There was a problem hiding this comment.
Aren't we suppose to use cGetReturnsForImportfunc here?
| } | ||
|
|
||
| // Adds the given imports to the exsiting import object | ||
| func (importObject *ImportObject) Extend(imports Imports) error { |
There was a problem hiding this comment.
What do you think to turn this API to:
func (importObject *ImportObject) Extend(incomingImportObject ImportObject) error;It will help to slowly deprecate the Imports API in the future if we need to.
| } | ||
|
|
||
| var extendResult = cWasmerImportObjectExtend(importObject.inner, | ||
| (*cWasmerImportT)(unsafe.Pointer(&cImports[0])), |
There was a problem hiding this comment.
We must check that importFunctionNth is greater than 0 before reading &cImports[0].
| return &ImportObjectError{message} | ||
| } | ||
|
|
||
| // ImportedFunctionError is an actual error. The `Error` function |
There was a problem hiding this comment.
- ImportedFunctionError
+ ImportObjectError| @@ -192,6 +192,38 @@ func (module *Module) InstantiateWithImports(imports *Imports) (Instance, error) | |||
| ) | |||
| } | |||
|
|
|||
| // ImportInstantiate creates a new instance of a WebAssembly module with an | |||
There was a problem hiding this comment.
- ImportInstantiate
+ InstantiateWithImportObject| ;; Copied from https://github.com/CraneStation/wasmtime/blob/master/docs/WASI-tutorial.md and then modified | ||
| ;; Licensed under Apache 2.0; see https://github.com/CraneStation/wasmtime/blob/master/LICENSE | ||
| (module | ||
| (import "wasi_unstable" "fd_write" (func $fd_write (param i32 i32 i32 i32) (result i32))) |
There was a problem hiding this comment.
It must be wasi_snapshot_prevew1 now.
|
The test prints |
Very much a work in progress. Probably will require updating more of the existing code toward
ImportObjectand away from existing imports, though I'm not sure.This PR is not in a state where it can be merged and won't be until we ship WASI support in the C API. Before doing so we want to verify, by implementing it in a language extension, that the updates to the C API are sufficient.