add stackless poll and yield tests (#80)

...and fix a bug with the former.

This also refactors some existing tests to reduce duplication.

Signed-off-by: Joel Dice <joel.dice@fermyon.com>

Author: dicej

Cargo.lock

@@ -300,24 +300,24 @@ system-interface = { version = "0.27.1", features = ["cap_std_impls"] }
 io-lifetimes = { version = "2.0.3", default-features = false }
 io-extras = "0.18.1"
 rustix = "0.38.43"
-# TODO: switch back to upstream release:
-wit-bindgen = { git = "https://github.com/dicej/wit-bindgen", branch = "spec-sync", default-features = false }
-wit-bindgen-rt = { git = "https://github.com/dicej/wit-bindgen", branch = "spec-sync", default-features = false }
-wit-bindgen-rust-macro = { git = "https://github.com/dicej/wit-bindgen", branch = "spec-sync", default-features = false }
+# TODO: switch back to release:
+wit-bindgen = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "3df706cf", default-features = false }
+wit-bindgen-rt = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "3df706cf", default-features = false }
+wit-bindgen-rust-macro = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "3df706cf", default-features = false }
 
 # wasm-tools family:
-# TODO: switch back to upstream release:
-wasmparser = { git = "https://github.com/dicej/wasm-tools", branch = "callback-sig-update", default-features = false, features = ['simd'] }
-wat = { git = "https://github.com/dicej/wasm-tools", branch = "callback-sig-update" }
-wast = { git = "https://github.com/dicej/wasm-tools", branch = "callback-sig-update" }
-wasmprinter = { git = "https://github.com/dicej/wasm-tools", branch = "callback-sig-update" }
-wasm-encoder = { git = "https://github.com/dicej/wasm-tools", branch = "callback-sig-update" }
-wasm-smith = { git = "https://github.com/dicej/wasm-tools", branch = "callback-sig-update" }
-wasm-mutate = { git = "https://github.com/dicej/wasm-tools", branch = "callback-sig-update" }
-wit-parser = { git = "https://github.com/dicej/wasm-tools", branch = "callback-sig-update" }
-wit-component = { git = "https://github.com/dicej/wasm-tools", branch = "callback-sig-update" }
-wasm-wave = { git = "https://github.com/dicej/wasm-tools", branch = "callback-sig-update" }
-wasm-compose = { git = "https://github.com/dicej/wasm-tools", branch = "callback-sig-update" }
+# TODO: switch back to release:
+wasmparser = { git = "https://github.com/bytecodealliance/wasm-tools", rev = "43556041", default-features = false, features = ['simd'] }
+wat = { git = "https://github.com/bytecodealliance/wasm-tools", rev = "43556041" }
+wast = { git = "https://github.com/bytecodealliance/wasm-tools", rev = "43556041" }
+wasmprinter = { git = "https://github.com/bytecodealliance/wasm-tools", rev = "43556041" }
+wasm-encoder = { git = "https://github.com/bytecodealliance/wasm-tools", rev = "43556041" }
+wasm-smith = { git = "https://github.com/bytecodealliance/wasm-tools", rev = "43556041" }
+wasm-mutate = { git = "https://github.com/bytecodealliance/wasm-tools", rev = "43556041" }
+wit-parser = { git = "https://github.com/bytecodealliance/wasm-tools", rev = "43556041" }
+wit-component = { git = "https://github.com/bytecodealliance/wasm-tools", rev = "43556041" }
+wasm-wave = { git = "https://github.com/bytecodealliance/wasm-tools", rev = "43556041" }
+wasm-compose = { git = "https://github.com/bytecodealliance/wasm-tools", rev = "43556041" }
 
 # Non-Bytecode Alliance maintained dependencies:
 # --------------------------
@@ -572,16 +572,17 @@ inherits = "release"
 codegen-units = 1
 lto = true
 
+# TODO: remove this once we've switched to a wasm-tools release:
 [patch.crates-io]
-wasmparser = { git = "https://github.com/dicej/wasm-tools", branch = "callback-sig-update" }
-wat = { git = "https://github.com/dicej/wasm-tools", branch = "callback-sig-update" }
-wast = { git = "https://github.com/dicej/wasm-tools", branch = "callback-sig-update" }
-wasmprinter = { git = "https://github.com/dicej/wasm-tools", branch = "callback-sig-update" }
-wasm-encoder = { git = "https://github.com/dicej/wasm-tools", branch = "callback-sig-update" }
-wasm-smith = { git = "https://github.com/dicej/wasm-tools", branch = "callback-sig-update" }
-wasm-mutate = { git = "https://github.com/dicej/wasm-tools", branch = "callback-sig-update" }
-wit-parser = { git = "https://github.com/dicej/wasm-tools", branch = "callback-sig-update" }
-wit-component = { git = "https://github.com/dicej/wasm-tools", branch = "callback-sig-update" }
-wasm-wave = { git = "https://github.com/dicej/wasm-tools", branch = "callback-sig-update" }
-wasm-compose = { git = "https://github.com/dicej/wasm-tools", branch = "callback-sig-update" }
-wasm-metadata = { git = "https://github.com/dicej/wasm-tools", branch = "callback-sig-update" }
+wasmparser = { git = "https://github.com/bytecodealliance/wasm-tools", rev = "43556041" }
+wat = { git = "https://github.com/bytecodealliance/wasm-tools", rev = "43556041" }
+wast = { git = "https://github.com/bytecodealliance/wasm-tools", rev = "43556041" }
+wasmprinter = { git = "https://github.com/bytecodealliance/wasm-tools", rev = "43556041" }
+wasm-encoder = { git = "https://github.com/bytecodealliance/wasm-tools", rev = "43556041" }
+wasm-smith = { git = "https://github.com/bytecodealliance/wasm-tools", rev = "43556041" }
+wasm-mutate = { git = "https://github.com/bytecodealliance/wasm-tools", rev = "43556041" }
+wit-parser = { git = "https://github.com/bytecodealliance/wasm-tools", rev = "43556041" }
+wit-component = { git = "https://github.com/bytecodealliance/wasm-tools", rev = "43556041" }
+wasm-wave = { git = "https://github.com/bytecodealliance/wasm-tools", rev = "43556041" }
+wasm-compose = { git = "https://github.com/bytecodealliance/wasm-tools", rev = "43556041" }
+wasm-metadata = { git = "https://github.com/bytecodealliance/wasm-tools", rev = "43556041" }

Cargo.toml

@@ -646,7 +646,8 @@ impl<'a, 'data> Translator<'a, 'data> {
                             core_func_index += 1;
                             LocalInitializer::ResourceRep(resource, ty)
                         }
-                        wasmparser::CanonicalFunction::ThreadSpawn { .. }
+                        wasmparser::CanonicalFunction::ThreadSpawnRef { .. }
+                        | wasmparser::CanonicalFunction::ThreadSpawnIndirect { .. }
                         | wasmparser::CanonicalFunction::ThreadAvailableParallelism => {
                             bail!("unsupported intrinsic")
                         }

crates/environ/src/component/translate.rs

@@ -15,8 +15,13 @@ use component_async_tests::util::{compose, init_logger, test_run};
 use component_async_tests::{transmit, Ctx};
 
 #[tokio::test]
-pub async fn async_poll() -> Result<()> {
-    test_run(&fs::read(test_programs_artifacts::ASYNC_POLL_COMPONENT).await?).await
+pub async fn async_poll_synchronous() -> Result<()> {
+    test_run(&fs::read(test_programs_artifacts::ASYNC_POLL_SYNCHRONOUS_COMPONENT).await?).await
+}
+
+#[tokio::test]
+pub async fn async_poll_stackless() -> Result<()> {
+    test_run(&fs::read(test_programs_artifacts::ASYNC_POLL_STACKLESS_COMPONENT).await?).await
 }
 
 #[tokio::test]

crates/misc/component-async-tests/tests/scenario/transmit.rs

@@ -3,16 +3,25 @@ use tokio::fs;
 
 use component_async_tests::util::{compose, test_run};
 
-// No-op function; we only test this by composing it in `async_yield_caller`
+// No-op function; we only test this by composing it in
+// `async_yield_callee_synchronous` and `async_yield_callee_stackful`
 #[allow(
     dead_code,
     reason = "here only to make the `assert_test_exists` macro happy"
 )]
-pub fn async_yield_callee() {}
+pub fn async_yield_caller() {}
 
 #[tokio::test]
-pub async fn async_yield_caller() -> Result<()> {
+pub async fn async_yield_callee_synchronous() -> Result<()> {
     let caller = &fs::read(test_programs_artifacts::ASYNC_YIELD_CALLER_COMPONENT).await?;
-    let callee = &fs::read(test_programs_artifacts::ASYNC_YIELD_CALLEE_COMPONENT).await?;
+    let callee =
+        &fs::read(test_programs_artifacts::ASYNC_YIELD_CALLEE_SYNCHRONOUS_COMPONENT).await?;
+    test_run(&compose(caller, callee).await?).await
+}
+
+#[tokio::test]
+pub async fn async_yield_callee_stackless() -> Result<()> {
+    let caller = &fs::read(test_programs_artifacts::ASYNC_YIELD_CALLER_COMPONENT).await?;
+    let callee = &fs::read(test_programs_artifacts::ASYNC_YIELD_CALLEE_STACKLESS_COMPONENT).await?;
     test_run(&compose(caller, callee).await?).await
 }

crates/misc/component-async-tests/tests/scenario/yield_.rs

@@ -31,6 +31,10 @@ use scenario::round_trip_many::{
     async_round_trip_many_synchronous, async_round_trip_many_wait,
 };
 use scenario::streams::async_closed_streams;
-use scenario::transmit::{async_poll, async_transmit_callee, async_transmit_caller};
+use scenario::transmit::{
+    async_poll_stackless, async_poll_synchronous, async_transmit_callee, async_transmit_caller,
+};
 use scenario::unit_stream::{async_unit_stream_callee, async_unit_stream_caller};
-use scenario::yield_::{async_yield_callee, async_yield_caller};
+use scenario::yield_::{
+    async_yield_callee_stackless, async_yield_callee_synchronous, async_yield_caller,
+};