diff options
Diffstat (limited to 'test/passes')
24 files changed, 48 insertions, 52 deletions
diff --git a/test/passes/fuzz-exec_all-features.txt b/test/passes/fuzz-exec_all-features.txt index 6a0ee8585..22ea5f06a 100644 --- a/test/passes/fuzz-exec_all-features.txt +++ b/test/passes/fuzz-exec_all-features.txt @@ -75,7 +75,7 @@ (type $2 (func (param i32 i32))) (type $3 (func)) (import "fuzzing-support" "log-i32" (func $fimport$0 (type $1) (param i32))) - (memory $0 (shared 1 1)) + (memory $0 1 1 shared) (export "unaligned_load" (func $unaligned_load)) (export "unaligned_load_offset" (func $unaligned_load_offset)) (export "aligned_for_size" (func $aligned_for_size)) @@ -148,7 +148,7 @@ [fuzz-exec] note result: unsigned_2_bytes => 65535 (module (type $0 (func (result i32))) - (memory $0 (shared 1 1)) + (memory $0 1 1 shared) (data $0 (i32.const 0) "\ff\ff") (export "unsigned_2_bytes" (func $unsigned_2_bytes)) (func $unsigned_2_bytes (type $0) (result i32) @@ -167,7 +167,7 @@ (type $0 (func (param i32))) (type $1 (func)) (import "fuzzing-support" "log-i32" (func $fimport$0 (type $0) (param i32))) - (memory $0 (shared 1 1)) + (memory $0 1 1 shared) (export "rmw-reads-modifies-and-writes" (func $rmw-reads-modifies-and-writes)) (func $rmw-reads-modifies-and-writes (type $1) (drop @@ -192,7 +192,7 @@ (type $0 (func (param i32))) (type $1 (func)) (import "fuzzing-support" "log-i32" (func $fimport$0 (type $0) (param i32))) - (memory $0 (shared 1 1)) + (memory $0 1 1 shared) (export "rmw-reads-modifies-and-writes-asymmetrical" (func $rmw-reads-modifies-and-writes-asymmetrical)) (func $rmw-reads-modifies-and-writes-asymmetrical (type $1) (drop diff --git a/test/passes/fuzz-exec_all-features.wast b/test/passes/fuzz-exec_all-features.wast index 2c9d95d16..bab6afb79 100644 --- a/test/passes/fuzz-exec_all-features.wast +++ b/test/passes/fuzz-exec_all-features.wast @@ -32,7 +32,7 @@ ) (module (import "fuzzing-support" "log-i32" (func $fimport$0 (param i32))) - (memory $0 (shared 1 1)) + (memory $0 1 1 shared) (func $unaligned_load (export "unaligned_load") (result i32) (i32.atomic.load (i32.const 1) ;; unaligned ptr @@ -78,7 +78,7 @@ ) ) (module - (memory $0 (shared 1 1)) + (memory $0 1 1 shared) (data (i32.const 0) "\ff\ff") (func $unsigned_2_bytes (export "unsigned_2_bytes") (result i32) (i32.atomic.rmw16.xor_u ;; should be unsigned @@ -89,7 +89,7 @@ ) (module (import "fuzzing-support" "log-i32" (func $fimport$0 (param i32))) - (memory $0 (shared 1 1)) + (memory $0 1 1 shared) (func $rmw-reads-modifies-and-writes (export "rmw-reads-modifies-and-writes") (drop (i64.atomic.rmw16.and_u offset=4 @@ -106,7 +106,7 @@ ) (module (import "fuzzing-support" "log-i32" (func $fimport$0 (param i32))) - (memory $0 (shared 1 1)) + (memory $0 1 1 shared) (func $rmw-reads-modifies-and-writes-asymmetrical (export "rmw-reads-modifies-and-writes-asymmetrical") (drop (i32.atomic.rmw8.sub_u diff --git a/test/passes/pick-load-signs_all-features.txt b/test/passes/pick-load-signs_all-features.txt index 9b73de23e..4bb3c1c98 100644 --- a/test/passes/pick-load-signs_all-features.txt +++ b/test/passes/pick-load-signs_all-features.txt @@ -1,6 +1,6 @@ (module (type $0 (func (result i32))) - (memory $0 (shared 16 16)) + (memory $0 16 16) (func $atomics-are-always-unsigned (type $0) (result i32) (local $0 i32) (drop diff --git a/test/passes/pick-load-signs_all-features.wast b/test/passes/pick-load-signs_all-features.wast index 20a77eae4..4b7e11f10 100644 --- a/test/passes/pick-load-signs_all-features.wast +++ b/test/passes/pick-load-signs_all-features.wast @@ -1,5 +1,5 @@ (module - (memory $0 (shared 16 16)) + (memory $0 16 16) (func $atomics-are-always-unsigned (result i32) (local $0 i32) (drop diff --git a/test/passes/precompute_all-features.txt b/test/passes/precompute_all-features.txt index e5cdbb209..affa32531 100644 --- a/test/passes/precompute_all-features.txt +++ b/test/passes/precompute_all-features.txt @@ -8,7 +8,7 @@ (type $6 (func (result externref))) (global $global i32 (i32.const 1)) (global $global-mut (mut i32) (i32.const 2)) - (memory $0 512 512) + (memory $0 6 65536) (data $0 (i32.const 0) "hello!") (elem declare func $dummy) (func $x (type $0) (param $x i32) diff --git a/test/passes/precompute_all-features.wast b/test/passes/precompute_all-features.wast index cef6d4cc8..450001533 100644 --- a/test/passes/precompute_all-features.wast +++ b/test/passes/precompute_all-features.wast @@ -1,7 +1,5 @@ (module - (memory 512 512 - (data "hello!") - ) + (memory (data "hello!") 512 512) (type $0 (func (param i32))) (global $global i32 (i32.const 1)) (global $global-mut (mut i32) (i32.const 2)) diff --git a/test/passes/remove-memory.txt b/test/passes/remove-memory.txt index ee65d237e..ddfdde493 100644 --- a/test/passes/remove-memory.txt +++ b/test/passes/remove-memory.txt @@ -1,3 +1,3 @@ (module - (memory $0 1024 1024) + (memory $mem 1024 1024) ) diff --git a/test/passes/remove-memory.wast b/test/passes/remove-memory.wast index bbb999007..26b4949a8 100644 --- a/test/passes/remove-memory.wast +++ b/test/passes/remove-memory.wast @@ -1,6 +1,5 @@ (module - (memory 1024 1024 - (segment 10 "123") - (segment 20 "149") - ) + (memory $mem 1024 1024) + (data (memory $mem) (i32.const 10) "123") + (data (memory $mem) (i32.const 20) "149") ) diff --git a/test/passes/remove-unused-names_merge-blocks_all-features.txt b/test/passes/remove-unused-names_merge-blocks_all-features.txt index e10a8707c..ac7647507 100644 --- a/test/passes/remove-unused-names_merge-blocks_all-features.txt +++ b/test/passes/remove-unused-names_merge-blocks_all-features.txt @@ -5,7 +5,7 @@ (type $ii (func (param i32 i32))) (type $iii (func (param i32 i32 i32))) (type $5 (func (result f64))) - (memory $0 (shared 256 256)) + (memory $0 256 256 shared) (table $0 1 1 funcref) (elem $0 (i32.const 0) $call-i) (func $call-i (type $i) (param $0 i32) diff --git a/test/passes/remove-unused-names_merge-blocks_all-features.wast b/test/passes/remove-unused-names_merge-blocks_all-features.wast index 3ec2768e0..1063e2463 100644 --- a/test/passes/remove-unused-names_merge-blocks_all-features.wast +++ b/test/passes/remove-unused-names_merge-blocks_all-features.wast @@ -1,5 +1,5 @@ (module - (memory (shared 256 256)) + (memory 256 256 shared) (type $i (func (param i32))) (type $ii (func (param i32 i32))) (type $iii (func (param i32 i32 i32))) diff --git a/test/passes/remove-unused-nonfunction-module-elements_all-features.txt b/test/passes/remove-unused-nonfunction-module-elements_all-features.txt index d19fcc514..b54087b81 100644 --- a/test/passes/remove-unused-nonfunction-module-elements_all-features.txt +++ b/test/passes/remove-unused-nonfunction-module-elements_all-features.txt @@ -132,7 +132,7 @@ ) (module (type $0 (func)) - (memory $0 (shared 23 256)) + (memory $0 23 256 shared) (export "user" (func $user)) (func $user (type $0) (i32.store @@ -143,7 +143,7 @@ ) (module (type $0 (func (result i32))) - (memory $0 (shared 23 256)) + (memory $0 23 256 shared) (export "user" (func $user)) (func $user (type $0) (result i32) (i32.atomic.rmw.add @@ -154,7 +154,7 @@ ) (module (type $0 (func (result i32))) - (memory $0 (shared 23 256)) + (memory $0 23 256 shared) (export "user" (func $user)) (func $user (type $0) (result i32) (i32.atomic.rmw8.cmpxchg_u @@ -166,7 +166,7 @@ ) (module (type $0 (func)) - (memory $0 (shared 23 256)) + (memory $0 23 256 shared) (export "user" (func $user)) (func $user (type $0) (local $0 i32) @@ -182,7 +182,7 @@ ) (module (type $0 (func (result i32))) - (memory $0 (shared 23 256)) + (memory $0 23 256 shared) (export "user" (func $user)) (func $user (type $0) (result i32) (memory.atomic.notify diff --git a/test/passes/remove-unused-nonfunction-module-elements_all-features.wast b/test/passes/remove-unused-nonfunction-module-elements_all-features.wast index 057088798..942a20ee7 100644 --- a/test/passes/remove-unused-nonfunction-module-elements_all-features.wast +++ b/test/passes/remove-unused-nonfunction-module-elements_all-features.wast @@ -101,28 +101,28 @@ ) ) (module ;; more use checks - (memory $0 (shared 23 256)) + (memory $0 23 256 shared) (export "user" $user) (func $user (i32.store (i32.const 0) (i32.const 0)) ) ) (module ;; more use checks - (memory $0 (shared 23 256)) + (memory $0 23 256 shared) (export "user" $user) (func $user (result i32) (i32.atomic.rmw.add (i32.const 0) (i32.const 0)) ) ) (module ;; more use checks - (memory $0 (shared 23 256)) + (memory $0 23 256 shared) (export "user" $user) (func $user (result i32) (i32.atomic.rmw8.cmpxchg_u (i32.const 0) (i32.const 0) (i32.const 0)) ) ) (module ;; more use checks - (memory $0 (shared 23 256)) + (memory $0 23 256 shared) (export "user" $user) (func $user (local $0 i32) @@ -137,7 +137,7 @@ ) ) (module ;; more use checks - (memory $0 (shared 23 256)) + (memory $0 23 256 shared) (export "user" $user) (func $user (result i32) (memory.atomic.notify (i32.const 0) (i32.const 0)) diff --git a/test/passes/safe-heap_enable-threads_enable-simd.txt b/test/passes/safe-heap_enable-threads_enable-simd.txt index 3d00dc96d..c1f811007 100644 --- a/test/passes/safe-heap_enable-threads_enable-simd.txt +++ b/test/passes/safe-heap_enable-threads_enable-simd.txt @@ -14,7 +14,7 @@ (import "env" "emscripten_get_sbrk_ptr" (func $emscripten_get_sbrk_ptr (result i32))) (import "env" "segfault" (func $segfault)) (import "env" "alignfault" (func $alignfault)) - (memory $0 (shared 100 100)) + (memory $0 100 100 shared) (func $loads (drop (call $SAFE_HEAP_LOAD_i32_4_4 @@ -5441,7 +5441,7 @@ (import "env" "segfault" (func $segfault)) (import "env" "alignfault" (func $alignfault)) (import "env" "emscripten_get_sbrk_ptr" (func $emscripten_get_sbrk_ptr (result i32))) - (memory $0 (shared 100 100)) + (memory $0 100 100 shared) (func $actions (drop (call $SAFE_HEAP_LOAD_i32_4_4 diff --git a/test/passes/safe-heap_enable-threads_enable-simd.wast b/test/passes/safe-heap_enable-threads_enable-simd.wast index b1cd1f050..a973230a5 100644 --- a/test/passes/safe-heap_enable-threads_enable-simd.wast +++ b/test/passes/safe-heap_enable-threads_enable-simd.wast @@ -1,5 +1,5 @@ (module - (memory (shared 100 100)) + (memory 100 100 shared) (func $loads (drop (i32.load (i32.const 1))) (drop (i32.atomic.load (i32.const 1))) @@ -47,7 +47,7 @@ (type $FUNCSIG$v (func)) (import "env" "segfault" (func $segfault)) (import "env" "alignfault" (func $alignfault)) - (memory $0 (shared 100 100)) + (memory $0 100 100 shared) (func $actions (drop (i32.load (i32.const 1))) (i32.store (i32.const 1) (i32.const 100)) diff --git a/test/passes/safe-heap_enable-threads_enable-simd64.txt b/test/passes/safe-heap_enable-threads_enable-simd64.txt index 0e282f0ce..49319377e 100644 --- a/test/passes/safe-heap_enable-threads_enable-simd64.txt +++ b/test/passes/safe-heap_enable-threads_enable-simd64.txt @@ -14,7 +14,7 @@ (import "env" "emscripten_get_sbrk_ptr" (func $emscripten_get_sbrk_ptr (result i64))) (import "env" "segfault" (func $segfault)) (import "env" "alignfault" (func $alignfault)) - (memory $0 (shared i64 100 100)) + (memory $0 i64 100 100 shared) (func $loads (drop (call $SAFE_HEAP_LOAD_i32_4_4 @@ -5627,7 +5627,7 @@ (import "env" "emscripten_get_sbrk_ptr" (func $foo (result i64))) (import "env" "segfault" (func $segfault)) (import "env" "alignfault" (func $alignfault)) - (memory $0 (shared i64 100 100)) + (memory $0 i64 100 100 shared) (func $actions (drop (call $SAFE_HEAP_LOAD_i32_4_4 diff --git a/test/passes/safe-heap_enable-threads_enable-simd64.wast b/test/passes/safe-heap_enable-threads_enable-simd64.wast index d34c5772b..dc70a037b 100644 --- a/test/passes/safe-heap_enable-threads_enable-simd64.wast +++ b/test/passes/safe-heap_enable-threads_enable-simd64.wast @@ -1,5 +1,5 @@ (module - (memory (shared i64 100 100)) + (memory i64 100 100 shared) (func $loads (drop (i32.load (i64.const 1))) (drop (i32.atomic.load (i64.const 1))) @@ -48,7 +48,7 @@ (import "env" "emscripten_get_sbrk_ptr" (func $foo (result i64))) (import "env" "segfault" (func $segfault)) (import "env" "alignfault" (func $alignfault)) - (memory $0 (shared i64 100 100)) + (memory $0 i64 100 100 shared) (func $actions (drop (i32.load (i64.const 1))) (i32.store (i64.const 1) (i32.const 100)) diff --git a/test/passes/safe-heap_low-memory-unused_enable-threads_enable-simd.txt b/test/passes/safe-heap_low-memory-unused_enable-threads_enable-simd.txt index 26c459536..53b048331 100644 --- a/test/passes/safe-heap_low-memory-unused_enable-threads_enable-simd.txt +++ b/test/passes/safe-heap_low-memory-unused_enable-threads_enable-simd.txt @@ -14,7 +14,7 @@ (import "env" "emscripten_get_sbrk_ptr" (func $emscripten_get_sbrk_ptr (result i32))) (import "env" "segfault" (func $segfault)) (import "env" "alignfault" (func $alignfault)) - (memory $0 (shared 100 100)) + (memory $0 100 100 shared) (func $loads (drop (call $SAFE_HEAP_LOAD_i32_4_4 @@ -5441,7 +5441,7 @@ (import "env" "emscripten_get_sbrk_ptr" (func $foo (result i32))) (import "env" "segfault" (func $segfault)) (import "env" "alignfault" (func $alignfault)) - (memory $0 (shared 100 100)) + (memory $0 100 100 shared) (func $actions (drop (call $SAFE_HEAP_LOAD_i32_4_4 diff --git a/test/passes/safe-heap_low-memory-unused_enable-threads_enable-simd.wast b/test/passes/safe-heap_low-memory-unused_enable-threads_enable-simd.wast index bad9fb8d4..6b0adf3e3 100644 --- a/test/passes/safe-heap_low-memory-unused_enable-threads_enable-simd.wast +++ b/test/passes/safe-heap_low-memory-unused_enable-threads_enable-simd.wast @@ -1,5 +1,5 @@ (module - (memory (shared 100 100)) + (memory 100 100 shared) (func $loads (drop (i32.load (i32.const 1))) (drop (i32.atomic.load (i32.const 1))) @@ -48,7 +48,7 @@ (import "env" "emscripten_get_sbrk_ptr" (func $foo (result i32))) (import "env" "segfault" (func $segfault)) (import "env" "alignfault" (func $alignfault)) - (memory $0 (shared 100 100)) + (memory $0 100 100 shared) (func $actions (drop (i32.load (i32.const 1))) (i32.store (i32.const 1) (i32.const 100)) diff --git a/test/passes/simplify-locals_all-features.txt b/test/passes/simplify-locals_all-features.txt index 5e5478ddf..4225a7033 100644 --- a/test/passes/simplify-locals_all-features.txt +++ b/test/passes/simplify-locals_all-features.txt @@ -1136,7 +1136,7 @@ (import "fuzzing-support" "log2" (func $fimport$1 (type $4) (param i32))) (import "fuzzing-support" "log3" (func $fimport$2 (type $5) (param f32))) (global $global$0 (mut i32) (i32.const 10)) - (memory $0 (shared 256 256)) + (memory $0 256 256 shared) (func $nonatomics (type $FUNCSIG$i) (result i32) (local $x i32) (nop) @@ -1884,7 +1884,7 @@ ) (module (type $0 (func (result i32))) - (memory $0 (shared 1 1)) + (memory $0 1 1 shared) (data $0 "data") (export "foo" (func $foo)) (func $foo (type $0) (result i32) diff --git a/test/passes/simplify-locals_all-features.wast b/test/passes/simplify-locals_all-features.wast index a2868b45d..f46f9fd71 100644 --- a/test/passes/simplify-locals_all-features.wast +++ b/test/passes/simplify-locals_all-features.wast @@ -1087,7 +1087,7 @@ ) ) (module - (memory (shared 256 256)) + (memory 256 256 shared) (type $FUNCSIG$v (func)) (type $FUNCSIG$i (func (result i32))) (type $FUNCSIG$iiiii (func (param i32 i32 i32 i32) (result i32))) @@ -1673,7 +1673,7 @@ ) ;; data.drop has global side effects (module - (memory $0 (shared 1 1)) + (memory $0 1 1 shared) (data "data") (func $foo (export "foo") (result i32) (local $0 i32) diff --git a/test/passes/simplify-locals_all-features_disable-exception-handling.txt b/test/passes/simplify-locals_all-features_disable-exception-handling.txt index 6e5e38716..6ee89372d 100644 --- a/test/passes/simplify-locals_all-features_disable-exception-handling.txt +++ b/test/passes/simplify-locals_all-features_disable-exception-handling.txt @@ -1130,7 +1130,7 @@ (import "fuzzing-support" "log2" (func $fimport$1 (type $4) (param i32))) (import "fuzzing-support" "log3" (func $fimport$2 (type $5) (param f32))) (global $global$0 (mut i32) (i32.const 10)) - (memory $0 (shared 256 256)) + (memory $0 256 256 shared) (func $nonatomics (type $FUNCSIG$i) (result i32) (local $x i32) (nop) diff --git a/test/passes/simplify-locals_all-features_disable-exception-handling.wast b/test/passes/simplify-locals_all-features_disable-exception-handling.wast index 25b452511..1f308723a 100644 --- a/test/passes/simplify-locals_all-features_disable-exception-handling.wast +++ b/test/passes/simplify-locals_all-features_disable-exception-handling.wast @@ -1087,7 +1087,7 @@ ) ) (module - (memory (shared 256 256)) + (memory 256 256 shared) (type $FUNCSIG$v (func)) (type $FUNCSIG$i (func (result i32))) (type $FUNCSIG$iiiii (func (param i32 i32 i32 i32) (result i32))) diff --git a/test/passes/ssa_fuzz-exec_enable-threads.txt b/test/passes/ssa_fuzz-exec_enable-threads.txt index 6334b35a7..f9d49d5bb 100644 --- a/test/passes/ssa_fuzz-exec_enable-threads.txt +++ b/test/passes/ssa_fuzz-exec_enable-threads.txt @@ -2,7 +2,7 @@ [fuzz-exec] note result: func_0 => 16384 (module (type $0 (func (result i32))) - (memory $0 (shared 1 1)) + (memory $0 1 1 shared) (table $0 0 0 funcref) (export "func_0" (func $0)) (func $0 (result i32) diff --git a/test/passes/ssa_fuzz-exec_enable-threads.wast b/test/passes/ssa_fuzz-exec_enable-threads.wast index 1ad1e2a6f..5917a3eb3 100644 --- a/test/passes/ssa_fuzz-exec_enable-threads.wast +++ b/test/passes/ssa_fuzz-exec_enable-threads.wast @@ -2,7 +2,7 @@ (type $0 (func (result i32))) (type $1 (func)) (table 0 0 funcref) - (memory $0 (shared 1 1)) + (memory $0 1 1 shared) (export "func_0" (func $0)) (func $0 (; 0 ;) (type $0) (result i32) (local $var$0 i32) @@ -109,4 +109,3 @@ ) ) ) - |