A lightweight WebAssembly runtime that is fast, secure, and standards-compliant
Reorganize component model wast testing (#11818)
Alex Crichtonb242f5a68583
diff --git a/tests/misc_testsuite/component-model/async/async-builtins.wast b/tests/misc_testsuite/component-model/async/async-builtins.wastnew file mode 100644index 0000000000..ea1f7d6277--- /dev/null+++ b/tests/misc_testsuite/component-model/async/async-builtins.wast@@ -0,0 +1,42 @@+;;! component_model_async = true+;;! component_model_async_builtins = true++;; stream.cancel-read+(component+ (core module $m+ (import "" "stream.cancel-read" (func $stream-cancel-read (param i32) (result i32)))+ )+ (type $stream-type (stream u8))+ (core func $stream-cancel-read (canon stream.cancel-read $stream-type async))+ (core instance $i (instantiate $m (with "" (instance (export "stream.cancel-read" (func $stream-cancel-read))))))+)++;; stream.cancel-write+(component+ (core module $m+ (import "" "stream.cancel-write" (func $stream-cancel-write (param i32) (result i32)))+ )+ (type $stream-type (stream u8))+ (core func $stream-cancel-write (canon stream.cancel-write $stream-type async))+ (core instance $i (instantiate $m (with "" (instance (export "stream.cancel-write" (func $stream-cancel-write))))))+)++;; future.cancel-read+(component+ (core module $m+ (import "" "future.cancel-read" (func $future-cancel-read (param i32) (result i32)))+ )+ (type $future-type (future u8))+ (core func $future-cancel-read (canon future.cancel-read $future-type async))+ (core instance $i (instantiate $m (with "" (instance (export "future.cancel-read" (func $future-cancel-read))))))+)++;; future.cancel-write+(component+ (core module $m+ (import "" "future.cancel-write" (func $future-cancel-write (param i32) (result i32)))+ )+ (type $future-type (future u8))+ (core func $future-cancel-write (canon future.cancel-write $future-type async))+ (core instance $i (instantiate $m (with "" (instance (export "future.cancel-write" (func $future-cancel-write))))))+)diff --git a/tests/misc_testsuite/component-model-async/backpressure-deadlock.wast b/tests/misc_testsuite/component-model/async/backpressure-deadlock.wastsimilarity index 100%rename from tests/misc_testsuite/component-model-async/backpressure-deadlock.wastrename to tests/misc_testsuite/component-model/async/backpressure-deadlock.wastdiff --git a/tests/misc_testsuite/component-model-async/backpressure-overflow.wast b/tests/misc_testsuite/component-model/async/backpressure-overflow.wastsimilarity index 100%rename from tests/misc_testsuite/component-model-async/backpressure-overflow.wastrename to tests/misc_testsuite/component-model/async/backpressure-overflow.wastdiff --git a/tests/misc_testsuite/component-model-async/error-context.wast b/tests/misc_testsuite/component-model/async/error-context.wastsimilarity index 100%rename from tests/misc_testsuite/component-model-async/error-context.wastrename to tests/misc_testsuite/component-model/async/error-context.wastdiff --git a/tests/misc_testsuite/component-model-async/fused.wast b/tests/misc_testsuite/component-model/async/fused.wastsimilarity index 61%rename from tests/misc_testsuite/component-model-async/fused.wastrename to tests/misc_testsuite/component-model/async/fused.wastindex 00e8a8d9d3..c0a3f3ff86 100644--- a/tests/misc_testsuite/component-model-async/fused.wast+++ b/tests/misc_testsuite/component-model/async/fused.wast@@ -1,56 +1,8 @@;;! component_model_async = true-;;! component_model_async_stackful = true;;! reference_types = true;;! gc_types = true;;! multi_memory = true-;; async lower -> async lift without callback-(component- (component $lifter- (core module $m- (import "" "task.return" (func $task-return (param i32)))- (func (export "foo") (param i32) (call $task-return (local.get 0)))- )- (core func $task-return (canon task.return (result u32)))- (core instance $i (instantiate $m- (with "" (instance (export "task.return" (func $task-return))))- ))-- (func (export "foo") (param "p1" u32) (result u32)- (canon lift (core func $i "foo") async)- )- )-- (component $lowerer- (import "a" (func $foo (param "p1" u32) (result u32)))- (core module $libc (memory (export "memory") 1))- (core instance $libc (instantiate $libc))- (core func $foo (canon lower (func $foo) async (memory $libc "memory")))- (core module $m- (import "libc" "memory" (memory 1))- (import "" "foo" (func $foo (param i32 i32) (result i32)))- (func (export "run")- block- (call $foo (i32.const 42) (i32.const 1204))- (i32.eq (i32.load offset=0 (i32.const 1204)) (i32.const 42))- br_if 0- unreachable- end- )- )- (core instance $i (instantiate $m- (with "libc" (instance $libc))- (with "" (instance (export "foo" (func $foo))))- ))- (func (export "run") (canon lift (core func $i "run")))- )-- (instance $lifter (instantiate $lifter))- (instance $lowerer (instantiate $lowerer (with "a" (func $lifter "foo"))))- (func (export "run") (alias export $lowerer "run"))-)--(assert_return (invoke "run"));; async lower -> async lift with callback(component@@ -149,49 +101,6 @@(assert_return (invoke "run"))-;; sync lower -> async lift without callback-(component- (component $lifter- (core module $m- (import "" "task.return" (func $task-return (param i32)))- (func (export "foo") (param i32) (call $task-return (local.get 0)))- )- (core func $task-return (canon task.return (result u32)))- (core instance $i (instantiate $m- (with "" (instance (export "task.return" (func $task-return))))- ))-- (func (export "foo") (param "p1" u32) (result u32)- (canon lift (core func $i "foo") async)- )- )-- (component $lowerer- (import "a" (func $foo (param "p1" u32) (result u32)))- (core func $foo (canon lower (func $foo)))- (core module $m- (import "" "foo" (func $foo (param i32) (result i32)))- (func (export "run")- block- (i32.eq (call $foo (i32.const 42)) (i32.const 42))- br_if 0- unreachable- end- )- )- (core instance $i (instantiate $m- (with "" (instance (export "foo" (func $foo))))- ))- (func (export "run") (canon lift (core func $i "run")))- )-- (instance $lifter (instantiate $lifter))- (instance $lowerer (instantiate $lowerer (with "a" (func $lifter "foo"))))- (func (export "run") (alias export $lowerer "run"))-)--(assert_return (invoke "run"))-;; sync lower -> async lift with callback(component(component $lifterdiff --git a/tests/misc_testsuite/component-model-async/future-cancel-read-dropped.wast b/tests/misc_testsuite/component-model/async/future-cancel-read-dropped.wastsimilarity index 100%rename from tests/misc_testsuite/component-model-async/future-cancel-read-dropped.wastrename to tests/misc_testsuite/component-model/async/future-cancel-read-dropped.wastdiff --git a/tests/misc_testsuite/component-model-async/future-cancel-write-completed.wast b/tests/misc_testsuite/component-model/async/future-cancel-write-completed.wastsimilarity index 100%rename from tests/misc_testsuite/component-model-async/future-cancel-write-completed.wastrename to tests/misc_testsuite/component-model/async/future-cancel-write-completed.wastdiff --git a/tests/misc_testsuite/component-model-async/future-cancel-write-dropped.wast b/tests/misc_testsuite/component-model/async/future-cancel-write-dropped.wastsimilarity index 100%rename from tests/misc_testsuite/component-model-async/future-cancel-write-dropped.wastrename to tests/misc_testsuite/component-model/async/future-cancel-write-dropped.wastdiff --git a/tests/misc_testsuite/component-model-async/future-read.wast b/tests/misc_testsuite/component-model/async/future-read.wastsimilarity index 100%rename from tests/misc_testsuite/component-model-async/future-read.wastrename to tests/misc_testsuite/component-model/async/future-read.wastdiff --git a/tests/misc_testsuite/component-model-async/futures-must-write.wast b/tests/misc_testsuite/component-model/async/futures-must-write.wastsimilarity index 100%rename from tests/misc_testsuite/component-model-async/futures-must-write.wastrename to tests/misc_testsuite/component-model/async/futures-must-write.wastdiff --git a/tests/misc_testsuite/component-model-async/futures.wast b/tests/misc_testsuite/component-model/async/futures.wastsimilarity index 98%rename from tests/misc_testsuite/component-model-async/futures.wastrename to tests/misc_testsuite/component-model/async/futures.wastindex ec5c3457c7..810948bbcd 100644--- a/tests/misc_testsuite/component-model-async/futures.wast+++ b/tests/misc_testsuite/component-model/async/futures.wast@@ -56,7 +56,7 @@(import "" "future.cancel-read" (func $future-cancel-read (param i32) (result i32))))(type $future-type (future u8))- (core func $future-cancel-read (canon future.cancel-read $future-type async))+ (core func $future-cancel-read (canon future.cancel-read $future-type))(core instance $i (instantiate $m (with "" (instance (export "future.cancel-read" (func $future-cancel-read)))))))@@ -66,7 +66,7 @@(import "" "future.cancel-write" (func $future-cancel-write (param i32) (result i32))))(type $future-type (future u8))- (core func $future-cancel-write (canon future.cancel-write $future-type async))+ (core func $future-cancel-write (canon future.cancel-write $future-type))(core instance $i (instantiate $m (with "" (instance (export "future.cancel-write" (func $future-cancel-write)))))))diff --git a/tests/misc_testsuite/component-model-async/lift.wast b/tests/misc_testsuite/component-model/async/lift.wastsimilarity index 64%rename from tests/misc_testsuite/component-model-async/lift.wastrename to tests/misc_testsuite/component-model/async/lift.wastindex f1175b0e89..b91ab0d279 100644--- a/tests/misc_testsuite/component-model-async/lift.wast+++ b/tests/misc_testsuite/component-model/async/lift.wast@@ -1,18 +1,6 @@;;! component_model_async = true;;! component_model_async_stackful = true-;; async lift; no callback-(component- (core module $m- (func (export "foo") (param i32) unreachable)- )- (core instance $i (instantiate $m))-- (func (export "foo") (param "p1" u32) (result u32)- (canon lift (core func $i "foo") async)- )-)-;; async lift; with callback(component(core module $mdiff --git a/tests/misc_testsuite/component-model-async/lower.wast b/tests/misc_testsuite/component-model/async/lower.wastsimilarity index 100%rename from tests/misc_testsuite/component-model-async/lower.wastrename to tests/misc_testsuite/component-model/async/lower.wastdiff --git a/tests/misc_testsuite/component-model-async/partial-stream-copies.wast b/tests/misc_testsuite/component-model/async/partial-stream-copies.wastsimilarity index 100%rename from tests/misc_testsuite/component-model-async/partial-stream-copies.wastrename to tests/misc_testsuite/component-model/async/partial-stream-copies.wastdiff --git a/tests/misc_testsuite/component-model/async/stackful.wast b/tests/misc_testsuite/component-model/async/stackful.wastnew file mode 100644index 0000000000..c1e9250cfa--- /dev/null+++ b/tests/misc_testsuite/component-model/async/stackful.wast@@ -0,0 +1,139 @@+;;! component_model_async = true+;;! component_model_async_stackful = true+;;! reference_types = true+;;! gc_types = true+;;! multi_memory = true++;; async lift; no callback+(component+ (core module $m+ (func (export "foo") (param i32) unreachable)+ )+ (core instance $i (instantiate $m))++ (func (export "foo") (param "p1" u32) (result u32)+ (canon lift (core func $i "foo") async)+ )+)++;; async lower -> async lift without callback+(component+ (component $lifter+ (core module $m+ (import "" "task.return" (func $task-return (param i32)))+ (func (export "foo") (param i32) (call $task-return (local.get 0)))+ )+ (core func $task-return (canon task.return (result u32)))+ (core instance $i (instantiate $m+ (with "" (instance (export "task.return" (func $task-return))))+ ))++ (func (export "foo") (param "p1" u32) (result u32)+ (canon lift (core func $i "foo") async)+ )+ )++ (component $lowerer+ (import "a" (func $foo (param "p1" u32) (result u32)))+ (core module $libc (memory (export "memory") 1))+ (core instance $libc (instantiate $libc))+ (core func $foo (canon lower (func $foo) async (memory $libc "memory")))+ (core module $m+ (import "libc" "memory" (memory 1))+ (import "" "foo" (func $foo (param i32 i32) (result i32)))+ (func (export "run")+ block+ (call $foo (i32.const 42) (i32.const 1204))+ (i32.eq (i32.load offset=0 (i32.const 1204)) (i32.const 42))+ br_if 0+ unreachable+ end+ )+ )+ (core instance $i (instantiate $m+ (with "libc" (instance $libc))+ (with "" (instance (export "foo" (func $foo))))+ ))+ (func (export "run") (canon lift (core func $i "run")))+ )++ (instance $lifter (instantiate $lifter))+ (instance $lowerer (instantiate $lowerer (with "a" (func $lifter "foo"))))+ (func (export "run") (alias export $lowerer "run"))+)++(assert_return (invoke "run"))++;; sync lower -> async lift without callback+(component+ (component $lifter+ (core module $m+ (import "" "task.return" (func $task-return (param i32)))+ (func (export "foo") (param i32) (call $task-return (local.get 0)))+ )+ (core func $task-return (canon task.return (result u32)))+ (core instance $i (instantiate $m+ (with "" (instance (export "task.return" (func $task-return))))+ ))++ (func (export "foo") (param "p1" u32) (result u32)+ (canon lift (core func $i "foo") async)+ )+ )++ (component $lowerer+ (import "a" (func $foo (param "p1" u32) (result u32)))+ (core func $foo (canon lower (func $foo)))+ (core module $m+ (import "" "foo" (func $foo (param i32) (result i32)))+ (func (export "run")+ block+ (i32.eq (call $foo (i32.const 42)) (i32.const 42))+ br_if 0+ unreachable+ end+ )+ )+ (core instance $i (instantiate $m+ (with "" (instance (export "foo" (func $foo))))+ ))+ (func (export "run") (canon lift (core func $i "run")))+ )++ (instance $lifter (instantiate $lifter))+ (instance $lowerer (instantiate $lowerer (with "a" (func $lifter "foo"))))+ (func (export "run") (alias export $lowerer "run"))+)++(assert_return (invoke "run"))++;; waitable-set.wait+(component+ (core module $libc (memory (export "memory") 1))+ (core instance $libc (instantiate $libc))+ (core module $m+ (import "" "waitable-set.wait" (func $waitable-set-wait (param i32 i32) (result i32)))+ )+ (core func $waitable-set-wait (canon waitable-set.wait cancellable (memory $libc "memory")))+ (core instance $i (instantiate $m (with "" (instance (export "waitable-set.wait" (func $waitable-set-wait))))))+)++;; waitable-set.poll+(component+ (core module $libc (memory (export "memory") 1))+ (core instance $libc (instantiate $libc))+ (core module $m+ (import "" "waitable-set.poll" (func $waitable-set-poll (param i32 i32) (result i32)))+ )+ (core func $waitable-set-poll (canon waitable-set.poll cancellable (memory $libc "memory")))+ (core instance $i (instantiate $m (with "" (instance (export "waitable-set.poll" (func $waitable-set-poll))))))+)++;; yield+(component+ (core module $m+ (import "" "yield" (func $yield (result i32)))+ )+ (core func $yield (canon thread.yield cancellable))+ (core instance $i (instantiate $m (with "" (instance (export "yield" (func $yield))))))+)diff --git a/tests/misc_testsuite/component-model-async/streams.wast b/tests/misc_testsuite/component-model/async/streams.wastsimilarity index 97%rename from tests/misc_testsuite/component-model-async/streams.wastrename to tests/misc_testsuite/component-model/async/streams.wastindex fa0b2e02c0..87dcaec93d 100644--- a/tests/misc_testsuite/component-model-async/streams.wast+++ b/tests/misc_testsuite/component-model/async/streams.wast@@ -1,5 +1,4 @@;;! component_model_async = true-;;! component_model_async_builtins = true;; stream.new(component@@ -56,7 +55,7 @@(import "" "stream.cancel-read" (func $stream-cancel-read (param i32) (result i32))))(type $stream-type (stream u8))- (core func $stream-cancel-read (canon stream.cancel-read $stream-type async))+ (core func $stream-cancel-read (canon stream.cancel-read $stream-type))(core instance $i (instantiate $m (with "" (instance (export "stream.cancel-read" (func $stream-cancel-read)))))))@@ -66,7 +65,7 @@(import "" "stream.cancel-write" (func $stream-cancel-write (param i32) (result i32))))(type $stream-type (stream u8))- (core func $stream-cancel-write (canon stream.cancel-write $stream-type async))+ (core func $stream-cancel-write (canon stream.cancel-write $stream-type))(core instance $i (instantiate $m (with "" (instance (export "stream.cancel-write" (func $stream-cancel-write)))))))diff --git a/tests/misc_testsuite/component-model-async/subtask-wait.wast b/tests/misc_testsuite/component-model/async/subtask-wait.wastsimilarity index 100%rename from tests/misc_testsuite/component-model-async/subtask-wait.wastrename to tests/misc_testsuite/component-model/async/subtask-wait.wastdiff --git a/tests/misc_testsuite/component-model-async/sync-streams.wast b/tests/misc_testsuite/component-model/async/sync-streams.wastsimilarity index 100%rename from tests/misc_testsuite/component-model-async/sync-streams.wastrename to tests/misc_testsuite/component-model/async/sync-streams.wastdiff --git a/tests/misc_testsuite/component-model-async/task-builtins.wast b/tests/misc_testsuite/component-model/async/task-builtins.wastsimilarity index 90%rename from tests/misc_testsuite/component-model-async/task-builtins.wastrename to tests/misc_testsuite/component-model/async/task-builtins.wastindex fa8025fd8c..e2a22b023d 100644--- a/tests/misc_testsuite/component-model-async/task-builtins.wast+++ b/tests/misc_testsuite/component-model/async/task-builtins.wast@@ -1,5 +1,4 @@;;! component_model_async = true-;;! component_model_async_stackful = true;; backpressure.set(component@@ -44,7 +43,7 @@(core module $m(import "" "waitable-set.wait" (func $waitable-set-wait (param i32 i32) (result i32))))- (core func $waitable-set-wait (canon waitable-set.wait cancellable (memory $libc "memory")))+ (core func $waitable-set-wait (canon waitable-set.wait (memory $libc "memory")))(core instance $i (instantiate $m (with "" (instance (export "waitable-set.wait" (func $waitable-set-wait)))))))@@ -55,7 +54,7 @@(core module $m(import "" "waitable-set.poll" (func $waitable-set-poll (param i32 i32) (result i32))))- (core func $waitable-set-poll (canon waitable-set.poll cancellable (memory $libc "memory")))+ (core func $waitable-set-poll (canon waitable-set.poll (memory $libc "memory")))(core instance $i (instantiate $m (with "" (instance (export "waitable-set.poll" (func $waitable-set-poll)))))))@@ -64,7 +63,7 @@(core module $m(import "" "yield" (func $yield (result i32))))- (core func $yield (canon thread.yield cancellable))+ (core func $yield (canon thread.yield))(core instance $i (instantiate $m (with "" (instance (export "yield" (func $yield)))))))diff --git a/tests/misc_testsuite/component-model-async/trap-if-done.wast b/tests/misc_testsuite/component-model/async/trap-if-done.wastsimilarity index 100%rename from tests/misc_testsuite/component-model-async/trap-if-done.wastrename to tests/misc_testsuite/component-model/async/trap-if-done.wastdiff --git a/tests/misc_testsuite/component-model-async/trap-in-post-return.wast b/tests/misc_testsuite/component-model/async/trap-in-post-return.wastsimilarity index 100%rename from tests/misc_testsuite/component-model-async/trap-in-post-return.wastrename to tests/misc_testsuite/component-model/async/trap-in-post-return.wastdiff --git a/tests/misc_testsuite/component-model-async/wait-forever.wast b/tests/misc_testsuite/component-model/async/wait-forever.wastsimilarity index 100%rename from tests/misc_testsuite/component-model-async/wait-forever.wastrename to tests/misc_testsuite/component-model/async/wait-forever.wastdiff --git a/tests/misc_testsuite/component-model-async/wait-forever2.wast b/tests/misc_testsuite/component-model/async/wait-forever2.wastsimilarity index 100%rename from tests/misc_testsuite/component-model-async/wait-forever2.wastrename to tests/misc_testsuite/component-model/async/wait-forever2.wastdiff --git a/tests/misc_testsuite/component-model-gc/empty.wast b/tests/misc_testsuite/component-model/gc/empty.wastsimilarity index 100%rename from tests/misc_testsuite/component-model-gc/empty.wastrename to tests/misc_testsuite/component-model/gc/empty.wast