Update to latest TinyGo and Rust (#2368)

Signed-off-by: Anuraag Agrawal <anuraaga@gmail.com>

Author: anuraaga

.github/workflows/examples.yaml

@@ -17,7 +17,7 @@ on:
 
 env:
  EMSDK_VERSION: "3.1.40"
- TINYGO_VERSION: "0.33.0"
+ TINYGO_VERSION: "0.35.0"
  ZIG_VERSION: "0.11.0"
 
 concurrency:
@@ -80,7 +80,7 @@ jobs:
  uses: dtolnay/rust-toolchain@stable
  with:
  toolchain: stable
- targets: wasm32-unknown-unknown, wasm32-wasi
+ targets: wasm32-unknown-unknown, wasm32-wasip1
 
  - name: Build TinyGo examples
  run: make build.examples.tinygo

.github/workflows/integration.yaml

@@ -19,7 +19,7 @@ defaults:
 
 env: # Update this prior to requiring a higher minor version in go.mod
  GO_VERSION: "1.23"
- TINYGO_VERSION: "0.33.0"
+ TINYGO_VERSION: "0.35.0"
  ZIG_VERSION: "0.11.0"
  BINARYEN_VERSION: "116"
  STDLIB_TESTS: "internal/integration_test/stdlibs"

Makefile

@@ -36,14 +36,24 @@ build.examples.as:
 build.examples.zig: examples/allocation/zig/testdata/greet.wasm imports/wasi_snapshot_preview1/example/testdata/zig/cat.wasm imports/wasi_snapshot_preview1/testdata/zig/wasi.wasm
 @cd internal/testing/dwarftestdata/testdata/zig; zig build; mv zig-out/*/main.wasm ./ # Need DWARF custom sections.
 
-tinygo_sources := examples/basic/testdata/add.go examples/allocation/tinygo/testdata/greet.go examples/cli/testdata/cli.go imports/wasi_snapshot_preview1/example/testdata/tinygo/cat.go imports/wasi_snapshot_preview1/testdata/tinygo/wasi.go cmd/wazero/testdata/cat/cat.go
-.PHONY: build.examples.tinygo
-build.examples.tinygo: $(tinygo_sources)
+tinygo_reactor_sources_reactor := examples/basic/testdata/add.go examples/allocation/tinygo/testdata/greet.go
+.PHONY: build.examples.tinygo_reactor
+build.examples.tinygo_reactor: $(tinygo_sources_reactor)
+@for f in $^; do \
+ tinygo build -o $$(echo $$f | sed -e 's/\.go/\.wasm/') -scheduler=none --no-debug --target=wasip1 -buildmode=c-shared $$f; \
+done
+
+tinygo_sources_clis := examples/cli/testdata/cli.go imports/wasi_snapshot_preview1/example/testdata/tinygo/cat.go imports/wasi_snapshot_preview1/testdata/tinygo/wasi.go cmd/wazero/testdata/cat/cat.go
+.PHONY: build.examples.tinygo_clis
+build.examples.tinygo_clis: $(tinygo_sources_clis)
 @for f in $^; do \
- tinygo build -o $$(echo $$f | sed -e 's/\.go/\.wasm/') -scheduler=none --no-debug --target=wasi $$f; \
+ tinygo build -o $$(echo $$f | sed -e 's/\.go/\.wasm/') -scheduler=none --no-debug --target=wasip1 $$f; \
 done
 @mv cmd/wazero/testdata/cat/cat.wasm cmd/wazero/testdata/cat/cat-tinygo.wasm
 
+.PHONY: build.examples.tinygo
+build.examples.tinygo: build.examples.tinygo_reactor build.examples.tinygo_clis
+
 # We use zig to build C as it is easy to install and embeds a copy of zig-cc.
 # Note: Don't use "-Oz" as that breaks our wasi sock example.
 c_sources := imports/wasi_snapshot_preview1/example/testdata/zig-cc/cat.c imports/wasi_snapshot_preview1/testdata/zig-cc/wasi.c internal/testing/dwarftestdata/testdata/zig-cc/main.c
@@ -80,21 +90,21 @@ build.examples.emscripten: $(emscripten_sources)
 done
 
 %/greet.wasm : cargo_target := wasm32-unknown-unknown
-%/cat.wasm : cargo_target := wasm32-wasi
-%/wasi.wasm : cargo_target := wasm32-wasi
+%/cat.wasm : cargo_target := wasm32-wasip1
+%/wasi.wasm : cargo_target := wasm32-wasip1
 
 .PHONY: build.examples.rust
 build.examples.rust: examples/allocation/rust/testdata/greet.wasm imports/wasi_snapshot_preview1/example/testdata/cargo-wasi/cat.wasm imports/wasi_snapshot_preview1/testdata/cargo-wasi/wasi.wasm internal/testing/dwarftestdata/testdata/rust/main.wasm.xz
 
 # Normally, we build release because it is smaller. Testing dwarf requires the debug build.
 internal/testing/dwarftestdata/testdata/rust/main.wasm.xz:
-cd $(@D) && cargo wasi build
-mv $(@D)/target/wasm32-wasi/debug/main.wasm $(@D)
+cd $(@D) && cargo build --target wasm32-wasip1
+mv $(@D)/target/wasm32-wasip1/debug/main.wasm $(@D)
 cd $(@D) && xz -k -f ./main.wasm # Rust's DWARF section is huge, so compress it.
 
-# Builds rust using cargo normally, or cargo-wasi.
+# Builds rust using cargo normally
 %.wasm: %.rs
-@(cd $(@D); cargo $(if $(findstring wasi,$(cargo_target)),wasi build,build --target $(cargo_target)) --release)
+@(cd $(@D); cargo build --target $(cargo_target) --release)
 @mv $(@D)/target/$(cargo_target)/release/$(@F) $(@D)
 
 spectest_base_dir := internal/integration_test/spectest

cmd/wazero/testdata/cat/cat-tinygo.wasm

@@ -337,9 +337,9 @@ func TestRun(t *testing.T) {
 <== (opened_fd=4,errno=ESUCCESS)
 ==> wasi_snapshot_preview1.fd_filestat_get(fd=4)
 <== (filestat={filetype=REGULAR_FILE,size=5,mtim=%d},errno=ESUCCESS)
-==> wasi_snapshot_preview1.fd_read(fd=4,iovs=64744,iovs_len=1)
+==> wasi_snapshot_preview1.fd_read(fd=4,iovs=64664,iovs_len=1)
 <== (nread=5,errno=ESUCCESS)
-==> wasi_snapshot_preview1.fd_read(fd=4,iovs=64744,iovs_len=1)
+==> wasi_snapshot_preview1.fd_read(fd=4,iovs=64664,iovs_len=1)
 <== (nread=0,errno=ESUCCESS)
 ==> wasi_snapshot_preview1.fd_close(fd=4)
 <== errno=ESUCCESS

cmd/wazero/wazero_test.go

@@ -39,7 +39,7 @@ func Example() {
 
 // Instantiate the guest Wasm into the same runtime. It exports the `add`
 // function, implemented in WebAssembly.
-mod, err := r.Instantiate(ctx, addWasm)
+mod, err := r.InstantiateWithConfig(ctx, addWasm, wazero.NewModuleConfig().WithStartFunctions("_initialize"))
 if err != nil {
 log.Panicln(err)
 }

example_test.go

@@ -1,7 +1,11 @@
 ## TinyGo allocation example
 
 This example shows how to pass strings in and out of a Wasm function defined
-in TinyGo, built with `tinygo build -o greet.wasm -scheduler=none -target=wasi greet.go`
+in TinyGo, built with 
+
+```bash
+(cd testdata; tinygo build -scheduler=none -target=wasip1 -buildmode=c-shared -o greet.wasm greet.go)
+```
 
 ```bash
 $ go run greet.go wazero

examples/allocation/rust/testdata/greet.wasm

@@ -44,7 +44,7 @@ func main() {
 
 // Instantiate a WebAssembly module that imports the "log" function defined
 // in "env" and exports "memory" and functions we'll use in this example.
-mod, err := r.Instantiate(ctx, greetWasm)
+mod, err := r.InstantiateWithConfig(ctx, greetWasm, wazero.NewModuleConfig().WithStartFunctions("_initialize"))
 if err != nil {
 log.Panicln(err)
 }

examples/allocation/tinygo/README.md

@@ -38,7 +38,7 @@ func greeting(name string) string {
 // _greet is a WebAssembly export that accepts a string pointer (linear memory
 // offset) and calls greet.
 //
-//export greet
+//go:wasmexport greet
 func _greet(ptr, size uint32) {
 name := ptrToString(ptr, size)
 greet(name)
@@ -50,7 +50,7 @@ func _greet(ptr, size uint32) {
 // Note: This uses a uint64 instead of two result values for compatibility with
 // WebAssembly 1.0.
 //
-//export greeting
+//go:wasmexport greeting
 func _greeting(ptr, size uint32) (ptrSize uint64) {
 name := ptrToString(ptr, size)
 g := greeting(name)