diff options
Diffstat (limited to 'test/lit')
22 files changed, 69 insertions, 208 deletions
diff --git a/test/lit/basic/atomics.wast b/test/lit/basic/atomics.wast index ef98afe4e..e73d6b611 100644 --- a/test/lit/basic/atomics.wast +++ b/test/lit/basic/atomics.wast @@ -14,10 +14,10 @@ ;; CHECK-BIN: (type $0 (func)) ;; CHECK-BIN-NODEBUG: (type $0 (func)) (type $0 (func)) - ;; CHECK-TEXT: (memory $0 (shared 23 256)) - ;; CHECK-BIN: (memory $0 (shared 23 256)) - ;; CHECK-BIN-NODEBUG: (memory $0 (shared 23 256)) - (memory $0 (shared 23 256)) + ;; CHECK-TEXT: (memory $0 23 256 shared) + ;; CHECK-BIN: (memory $0 23 256 shared) + ;; CHECK-BIN-NODEBUG: (memory $0 23 256 shared) + (memory $0 23 256 shared) ;; CHECK-TEXT: (func $atomic-loadstore (type $0) ;; CHECK-TEXT-NEXT: (local $0 i32) diff --git a/test/lit/basic/atomics64.wast b/test/lit/basic/atomics64.wast index b30b1ce6e..255ecc033 100644 --- a/test/lit/basic/atomics64.wast +++ b/test/lit/basic/atomics64.wast @@ -14,10 +14,10 @@ ;; CHECK-BIN: (type $0 (func)) ;; CHECK-BIN-NODEBUG: (type $0 (func)) (type $0 (func)) - ;; CHECK-TEXT: (memory $0 (shared i64 23 256)) - ;; CHECK-BIN: (memory $0 (shared i64 23 256)) - ;; CHECK-BIN-NODEBUG: (memory $0 (shared i64 23 256)) - (memory $0 (shared i64 23 256)) + ;; CHECK-TEXT: (memory $0 i64 23 256 shared) + ;; CHECK-BIN: (memory $0 i64 23 256 shared) + ;; CHECK-BIN-NODEBUG: (memory $0 i64 23 256 shared) + (memory $0 i64 23 256 shared) ;; CHECK-TEXT: (func $atomic-loadstore (type $0) ;; CHECK-TEXT-NEXT: (local $0 i64) diff --git a/test/lit/basic/memory-shared.wast b/test/lit/basic/memory-shared.wast index bc2f8bacc..fe15c20e7 100644 --- a/test/lit/basic/memory-shared.wast +++ b/test/lit/basic/memory-shared.wast @@ -10,8 +10,8 @@ ;; RUN: cat %t.bin.nodebug.wast | filecheck %s --check-prefix=CHECK-BIN-NODEBUG (module - ;; CHECK-TEXT: (memory $0 (shared 23 256)) - ;; CHECK-BIN: (memory $0 (shared 23 256)) - ;; CHECK-BIN-NODEBUG: (memory $0 (shared 23 256)) - (memory $0 (shared 23 256)) + ;; CHECK-TEXT: (memory $0 23 256 shared) + ;; CHECK-BIN: (memory $0 23 256 shared) + ;; CHECK-BIN-NODEBUG: (memory $0 23 256 shared) + (memory $0 23 256 shared) ) diff --git a/test/lit/basic/multi-memories-atomics64.wast b/test/lit/basic/multi-memories-atomics64.wast index 79afddb3b..0795d10ad 100644 --- a/test/lit/basic/multi-memories-atomics64.wast +++ b/test/lit/basic/multi-memories-atomics64.wast @@ -14,15 +14,15 @@ ;; CHECK-BIN: (type $0 (func)) ;; CHECK-BIN-NODEBUG: (type $0 (func)) (type $0 (func)) - ;; CHECK-TEXT: (memory $appMemory (shared i64 23 256)) - ;; CHECK-BIN: (memory $appMemory (shared i64 23 256)) - (memory $appMemory (shared i64 23 256)) - ;; CHECK-TEXT: (memory $dataMemory (shared i64 23 256)) - ;; CHECK-BIN: (memory $dataMemory (shared i64 23 256)) - (memory $dataMemory (shared i64 23 256)) - ;; CHECK-TEXT: (memory $instrumentMemory (shared i64 23 256)) - ;; CHECK-BIN: (memory $instrumentMemory (shared i64 23 256)) - (memory $instrumentMemory (shared i64 23 256)) + ;; CHECK-TEXT: (memory $appMemory i64 23 256 shared) + ;; CHECK-BIN: (memory $appMemory i64 23 256 shared) + (memory $appMemory i64 23 256 shared) + ;; CHECK-TEXT: (memory $dataMemory i64 23 256 shared) + ;; CHECK-BIN: (memory $dataMemory i64 23 256 shared) + (memory $dataMemory i64 23 256 shared) + ;; CHECK-TEXT: (memory $instrumentMemory i64 23 256 shared) + ;; CHECK-BIN: (memory $instrumentMemory i64 23 256 shared) + (memory $instrumentMemory i64 23 256 shared) ;; CHECK-TEXT: (func $atomic-loadstore (type $0) ;; CHECK-TEXT-NEXT: (local $0 i64) @@ -1064,11 +1064,11 @@ (atomic.fence) ) ) -;; CHECK-BIN-NODEBUG: (memory $0 (shared i64 23 256)) +;; CHECK-BIN-NODEBUG: (memory $0 i64 23 256 shared) -;; CHECK-BIN-NODEBUG: (memory $1 (shared i64 23 256)) +;; CHECK-BIN-NODEBUG: (memory $1 i64 23 256 shared) -;; CHECK-BIN-NODEBUG: (memory $2 (shared i64 23 256)) +;; CHECK-BIN-NODEBUG: (memory $2 i64 23 256 shared) ;; CHECK-BIN-NODEBUG: (func $0 (type $0) ;; CHECK-BIN-NODEBUG-NEXT: (local $0 i64) diff --git a/test/lit/basic/nonspec-bulk-memory.wast b/test/lit/basic/nonspec-bulk-memory.wast deleted file mode 100644 index 980598f5d..000000000 --- a/test/lit/basic/nonspec-bulk-memory.wast +++ /dev/null @@ -1,137 +0,0 @@ -;; NOTE: Assertions have been generated by update_lit_checks.py --all-items and should not be edited. - -;; RUN: wasm-opt %s -all -o %t.text.wast -g -S -;; RUN: wasm-as %s -all -g -o %t.wasm -;; RUN: wasm-dis %t.wasm -all -o %t.bin.wast -;; RUN: wasm-as %s -all -o %t.nodebug.wasm -;; RUN: wasm-dis %t.nodebug.wasm -all -o %t.bin.nodebug.wast -;; RUN: cat %t.text.wast | filecheck %s --check-prefix=CHECK-TEXT -;; RUN: cat %t.bin.wast | filecheck %s --check-prefix=CHECK-BIN -;; RUN: cat %t.bin.nodebug.wast | filecheck %s --check-prefix=CHECK-BIN-NODEBUG - -(module - (memory 1024 1024 - (segment 0 "hello, world") - ) - - ;; CHECK-TEXT: (type $0 (func)) - - ;; CHECK-TEXT: (memory $0 1024 1024) - - ;; CHECK-TEXT: (data $0 (i32.const 0) "hello, world") - - ;; CHECK-TEXT: (func $memory.init (type $0) - ;; CHECK-TEXT-NEXT: (memory.init $0 - ;; CHECK-TEXT-NEXT: (i32.const 512) - ;; CHECK-TEXT-NEXT: (i32.const 0) - ;; CHECK-TEXT-NEXT: (i32.const 12) - ;; CHECK-TEXT-NEXT: ) - ;; CHECK-TEXT-NEXT: ) - ;; CHECK-BIN: (type $0 (func)) - - ;; CHECK-BIN: (memory $0 1024 1024) - - ;; CHECK-BIN: (data $0 (i32.const 0) "hello, world") - - ;; CHECK-BIN: (func $memory.init (type $0) - ;; CHECK-BIN-NEXT: (memory.init $0 - ;; CHECK-BIN-NEXT: (i32.const 512) - ;; CHECK-BIN-NEXT: (i32.const 0) - ;; CHECK-BIN-NEXT: (i32.const 12) - ;; CHECK-BIN-NEXT: ) - ;; CHECK-BIN-NEXT: ) - (func $memory.init - (memory.init 0 - (i32.const 512) - (i32.const 0) - (i32.const 12) - ) - ) - - ;; CHECK-TEXT: (func $data.drop (type $0) - ;; CHECK-TEXT-NEXT: (data.drop $0) - ;; CHECK-TEXT-NEXT: ) - ;; CHECK-BIN: (func $data.drop (type $0) - ;; CHECK-BIN-NEXT: (data.drop $0) - ;; CHECK-BIN-NEXT: ) - (func $data.drop - (data.drop 0) - ) - - ;; CHECK-TEXT: (func $memory.copy (type $0) - ;; CHECK-TEXT-NEXT: (memory.copy - ;; CHECK-TEXT-NEXT: (i32.const 512) - ;; CHECK-TEXT-NEXT: (i32.const 0) - ;; CHECK-TEXT-NEXT: (i32.const 12) - ;; CHECK-TEXT-NEXT: ) - ;; CHECK-TEXT-NEXT: ) - ;; CHECK-BIN: (func $memory.copy (type $0) - ;; CHECK-BIN-NEXT: (memory.copy - ;; CHECK-BIN-NEXT: (i32.const 512) - ;; CHECK-BIN-NEXT: (i32.const 0) - ;; CHECK-BIN-NEXT: (i32.const 12) - ;; CHECK-BIN-NEXT: ) - ;; CHECK-BIN-NEXT: ) - (func $memory.copy - (memory.copy - (i32.const 512) - (i32.const 0) - (i32.const 12) - ) - ) - - ;; CHECK-TEXT: (func $memory.fill (type $0) - ;; CHECK-TEXT-NEXT: (memory.fill - ;; CHECK-TEXT-NEXT: (i32.const 0) - ;; CHECK-TEXT-NEXT: (i32.const 42) - ;; CHECK-TEXT-NEXT: (i32.const 1024) - ;; CHECK-TEXT-NEXT: ) - ;; CHECK-TEXT-NEXT: ) - ;; CHECK-BIN: (func $memory.fill (type $0) - ;; CHECK-BIN-NEXT: (memory.fill - ;; CHECK-BIN-NEXT: (i32.const 0) - ;; CHECK-BIN-NEXT: (i32.const 42) - ;; CHECK-BIN-NEXT: (i32.const 1024) - ;; CHECK-BIN-NEXT: ) - ;; CHECK-BIN-NEXT: ) - (func $memory.fill - (memory.fill - (i32.const 0) - (i32.const 42) - (i32.const 1024) - ) - ) -) -;; CHECK-BIN-NODEBUG: (type $0 (func)) - -;; CHECK-BIN-NODEBUG: (memory $0 1024 1024) - -;; CHECK-BIN-NODEBUG: (data $0 (i32.const 0) "hello, world") - -;; CHECK-BIN-NODEBUG: (func $0 (type $0) -;; CHECK-BIN-NODEBUG-NEXT: (memory.init $0 -;; CHECK-BIN-NODEBUG-NEXT: (i32.const 512) -;; CHECK-BIN-NODEBUG-NEXT: (i32.const 0) -;; CHECK-BIN-NODEBUG-NEXT: (i32.const 12) -;; CHECK-BIN-NODEBUG-NEXT: ) -;; CHECK-BIN-NODEBUG-NEXT: ) - -;; CHECK-BIN-NODEBUG: (func $1 (type $0) -;; CHECK-BIN-NODEBUG-NEXT: (data.drop $0) -;; CHECK-BIN-NODEBUG-NEXT: ) - -;; CHECK-BIN-NODEBUG: (func $2 (type $0) -;; CHECK-BIN-NODEBUG-NEXT: (memory.copy -;; CHECK-BIN-NODEBUG-NEXT: (i32.const 512) -;; CHECK-BIN-NODEBUG-NEXT: (i32.const 0) -;; CHECK-BIN-NODEBUG-NEXT: (i32.const 12) -;; CHECK-BIN-NODEBUG-NEXT: ) -;; CHECK-BIN-NODEBUG-NEXT: ) - -;; CHECK-BIN-NODEBUG: (func $3 (type $0) -;; CHECK-BIN-NODEBUG-NEXT: (memory.fill -;; CHECK-BIN-NODEBUG-NEXT: (i32.const 0) -;; CHECK-BIN-NODEBUG-NEXT: (i32.const 42) -;; CHECK-BIN-NODEBUG-NEXT: (i32.const 1024) -;; CHECK-BIN-NODEBUG-NEXT: ) -;; CHECK-BIN-NODEBUG-NEXT: ) diff --git a/test/lit/basic/unreachable-instr-type.wast b/test/lit/basic/unreachable-instr-type.wast index ff6df8bac..494678a32 100644 --- a/test/lit/basic/unreachable-instr-type.wast +++ b/test/lit/basic/unreachable-instr-type.wast @@ -10,11 +10,11 @@ ;; RUN: cat %t.bin.nodebug.wast | filecheck %s --check-prefix=CHECK-BIN-NODEBUG (module - (memory (shared 1 1)) + (memory 1 1 shared) ;; CHECK-TEXT: (type $0 (func)) - ;; CHECK-TEXT: (memory $0 (shared 1 1)) + ;; CHECK-TEXT: (memory $0 1 1 shared) ;; CHECK-TEXT: (func $test (type $0) ;; CHECK-TEXT-NEXT: (i32.load @@ -41,7 +41,7 @@ ;; CHECK-TEXT-NEXT: ) ;; CHECK-BIN: (type $0 (func)) - ;; CHECK-BIN: (memory $0 (shared 1 1)) + ;; CHECK-BIN: (memory $0 1 1 shared) ;; CHECK-BIN: (func $test (type $0) ;; CHECK-BIN-NEXT: (unreachable) @@ -74,7 +74,7 @@ ) ;; CHECK-BIN-NODEBUG: (type $0 (func)) -;; CHECK-BIN-NODEBUG: (memory $0 (shared 1 1)) +;; CHECK-BIN-NODEBUG: (memory $0 1 1 shared) ;; CHECK-BIN-NODEBUG: (func $0 (type $0) ;; CHECK-BIN-NODEBUG-NEXT: (unreachable) diff --git a/test/lit/ctor-eval/array_new_data.wast b/test/lit/ctor-eval/array_new_data.wast index a185c171f..90551862d 100644 --- a/test/lit/ctor-eval/array_new_data.wast +++ b/test/lit/ctor-eval/array_new_data.wast @@ -7,8 +7,8 @@ ;; CHECK: (type $[i8] (array i8)) (type $[i8] (array i8)) - ;; CHECK: (memory $0 (shared 16 17)) - (memory $0 (shared 16 17)) + ;; CHECK: (memory $0 16 17 shared) + (memory $0 16 17 shared) ;; CHECK: (data $0 (i32.const 40) "") (data $0 (i32.const 40) "") ;; CHECK: (data $1 (i32.const 0) "") diff --git a/test/lit/ctor-eval/v128.wast b/test/lit/ctor-eval/v128.wast index 009ef57f2..71a380623 100644 --- a/test/lit/ctor-eval/v128.wast +++ b/test/lit/ctor-eval/v128.wast @@ -6,8 +6,8 @@ ;; CHECK: (type $1 (func (result v128))) - ;; CHECK: (memory $0 (shared 16 17)) - (memory $0 (shared 16 17)) + ;; CHECK: (memory $0 16 17 shared) + (memory $0 16 17 shared) (export "v128" (func $v128)) ;; CHECK: (data $0 (i32.const 23) "\e0\ff\c0N\8e\00\00\fe\01\00\12\81\85\fd\ff\90") diff --git a/test/lit/passes/code-folding_enable-threads.wast b/test/lit/passes/code-folding_enable-threads.wast index 15b83f71b..487fbd3ac 100644 --- a/test/lit/passes/code-folding_enable-threads.wast +++ b/test/lit/passes/code-folding_enable-threads.wast @@ -262,8 +262,8 @@ (module ;; CHECK: (type $0 (func (result i32))) - ;; CHECK: (memory $0 (shared 1 1)) - (memory $0 (shared 1 1)) + ;; CHECK: (memory $0 1 1 shared) + (memory $0 1 1 shared) ;; CHECK: (export "func_2224" (func $0)) (export "func_2224" (func $0)) ;; CHECK: (func $0 (result i32) @@ -420,4 +420,3 @@ ) ) ) - diff --git a/test/lit/passes/flatten_dfo_O3_enable-threads.wast b/test/lit/passes/flatten_dfo_O3_enable-threads.wast index 55bf54dc9..ccb029060 100644 --- a/test/lit/passes/flatten_dfo_O3_enable-threads.wast +++ b/test/lit/passes/flatten_dfo_O3_enable-threads.wast @@ -14,8 +14,8 @@ ;; CHECK: (type $4 (func (result i32))) - ;; CHECK: (memory $0 (shared 1 1)) - (memory $0 (shared 1 1)) + ;; CHECK: (memory $0 1 1 shared) + (memory $0 1 1 shared) ;; CHECK: (export "one" (func $one)) ;; CHECK: (export "two" (func $two)) @@ -264,4 +264,3 @@ ) ) ) - diff --git a/test/lit/passes/flatten_simplify-locals-nonesting_souperify-single-use_enable-threads.wast b/test/lit/passes/flatten_simplify-locals-nonesting_souperify-single-use_enable-threads.wast index 0bcc36de2..ea693d502 100644 --- a/test/lit/passes/flatten_simplify-locals-nonesting_souperify-single-use_enable-threads.wast +++ b/test/lit/passes/flatten_simplify-locals-nonesting_souperify-single-use_enable-threads.wast @@ -30,8 +30,8 @@ ;; CHECK: (type $12 (func (param i32 i32 i32 i32 i32) (result i32))) - ;; CHECK: (memory $0 (shared 1 1)) - (memory $0 (shared 1 1)) + ;; CHECK: (memory $0 1 1 shared) + (memory $0 1 1 shared) ;; Figure 1a from the Souper paper https://arxiv.org/pdf/1711.04422.pdf ;; CHECK: (export "replaced-print-internal" (func $replaced-print-internal)) diff --git a/test/lit/passes/flatten_simplify-locals-nonesting_souperify_enable-threads.wast b/test/lit/passes/flatten_simplify-locals-nonesting_souperify_enable-threads.wast index 61430d653..e8d423058 100644 --- a/test/lit/passes/flatten_simplify-locals-nonesting_souperify_enable-threads.wast +++ b/test/lit/passes/flatten_simplify-locals-nonesting_souperify_enable-threads.wast @@ -30,8 +30,8 @@ ;; CHECK: (type $12 (func (param i32 i32 i32 i32 i32) (result i32))) - ;; CHECK: (memory $0 (shared 1 1)) - (memory $0 (shared 1 1)) + ;; CHECK: (memory $0 1 1 shared) + (memory $0 1 1 shared) ;; Figure 1a from the Souper paper https://arxiv.org/pdf/1711.04422.pdf ;; CHECK: (export "replaced-print-internal" (func $replaced-print-internal)) diff --git a/test/lit/passes/inlining-optimizing_enable-threads.wast b/test/lit/passes/inlining-optimizing_enable-threads.wast index 60385b11a..631fc1fa5 100644 --- a/test/lit/passes/inlining-optimizing_enable-threads.wast +++ b/test/lit/passes/inlining-optimizing_enable-threads.wast @@ -153,8 +153,8 @@ (module ;; CHECK: (type $0 (func (result i64))) - ;; CHECK: (memory $0 (shared 1 1)) - (memory $0 (shared 1 1)) + ;; CHECK: (memory $0 1 1 shared) + (memory $0 1 1 shared) (func $0 (result i32) (i32.atomic.store16 (i32.const 0) diff --git a/test/lit/passes/memory-packing_all-features.wast b/test/lit/passes/memory-packing_all-features.wast index dfcf5ce53..1f0886d66 100644 --- a/test/lit/passes/memory-packing_all-features.wast +++ b/test/lit/passes/memory-packing_all-features.wast @@ -2279,8 +2279,8 @@ ;; the wrong segments in the presence of unreferenced segments. ;; CHECK: (type $0 (func)) - ;; CHECK: (memory $0 (shared 1 1)) - (memory $0 (shared 1 1)) + ;; CHECK: (memory $0 1 1 shared) + (memory $0 1 1 shared) (data (i32.const 0) "") (data "foo") ;; CHECK: (data $1 "foo") @@ -2394,8 +2394,8 @@ (type $array (array (mut i32))) ;; CHECK: (type $1 (func (param (ref $array) i32 i32 i32))) - ;; CHECK: (memory $0 (shared 16 17)) - (memory $0 (shared 16 17)) + ;; CHECK: (memory $0 16 17 shared) + (memory $0 16 17 shared) ;; CHECK: (data $0 "") (data $0 "") ;; CHECK: (func $0 (type $1) (param $0 (ref $array)) (param $1 i32) (param $2 i32) (param $3 i32) diff --git a/test/lit/passes/merge-similar-functions_types.wast b/test/lit/passes/merge-similar-functions_types.wast index 717777ab7..980f10cd9 100644 --- a/test/lit/passes/merge-similar-functions_types.wast +++ b/test/lit/passes/merge-similar-functions_types.wast @@ -120,8 +120,8 @@ ;; CHECK: (global $global$0 (mut i32) (i32.const 10)) (global $global$0 (mut i32) (i32.const 10)) - ;; CHECK: (memory $0 (shared 16 17)) - (memory $0 (shared 16 17)) + ;; CHECK: (memory $0 16 17 shared) + (memory $0 16 17 shared) ;; CHECK: (elem declare func $2 $3) diff --git a/test/lit/passes/optimize-instructions-atomics.wast b/test/lit/passes/optimize-instructions-atomics.wast index 29037186d..e59c6a4e7 100644 --- a/test/lit/passes/optimize-instructions-atomics.wast +++ b/test/lit/passes/optimize-instructions-atomics.wast @@ -2,8 +2,8 @@ ;; RUN: wasm-opt %s --optimize-instructions --enable-threads -S -o - | filecheck %s (module - ;; CHECK: (import "env" "memory" (memory $0 (shared 256 256))) - (import "env" "memory" (memory $0 (shared 256 256))) + ;; CHECK: (import "env" "memory" (memory $0 256 256 shared)) + (import "env" "memory" (memory $0 256 256 shared)) ;; CHECK: (func $x ;; CHECK-NEXT: (drop diff --git a/test/lit/passes/remove-unused-module-elements_all-features.wast b/test/lit/passes/remove-unused-module-elements_all-features.wast index 15a843064..f287df88f 100644 --- a/test/lit/passes/remove-unused-module-elements_all-features.wast +++ b/test/lit/passes/remove-unused-module-elements_all-features.wast @@ -260,8 +260,8 @@ (module ;; more use checks ;; CHECK: (type $0 (func)) - ;; CHECK: (memory $0 (shared 23 256)) - (memory $0 (shared 23 256)) + ;; CHECK: (memory $0 23 256 shared) + (memory $0 23 256 shared) (export "user" $user) ;; CHECK: (export "user" (func $user)) @@ -278,8 +278,8 @@ (module ;; more use checks ;; CHECK: (type $0 (func (result i32))) - ;; CHECK: (memory $0 (shared 23 256)) - (memory $0 (shared 23 256)) + ;; CHECK: (memory $0 23 256 shared) + (memory $0 23 256 shared) (export "user" $user) ;; CHECK: (export "user" (func $user)) @@ -296,8 +296,8 @@ (module ;; more use checks ;; CHECK: (type $0 (func (result i32))) - ;; CHECK: (memory $0 (shared 23 256)) - (memory $0 (shared 23 256)) + ;; CHECK: (memory $0 23 256 shared) + (memory $0 23 256 shared) (export "user" $user) ;; CHECK: (export "user" (func $user)) @@ -315,8 +315,8 @@ (module ;; more use checks ;; CHECK: (type $0 (func)) - ;; CHECK: (memory $0 (shared 23 256)) - (memory $0 (shared 23 256)) + ;; CHECK: (memory $0 23 256 shared) + (memory $0 23 256 shared) (export "user" $user) ;; CHECK: (export "user" (func $user)) @@ -346,8 +346,8 @@ (module ;; more use checks ;; CHECK: (type $0 (func (result i32))) - ;; CHECK: (memory $0 (shared 23 256)) - (memory $0 (shared 23 256)) + ;; CHECK: (memory $0 23 256 shared) + (memory $0 23 256 shared) (export "user" $user) ;; CHECK: (export "user" (func $user)) @@ -362,7 +362,7 @@ ) ) (module ;; atomic.fence and data.drop do not use a memory, so should not keep the memory alive. - (memory $0 (shared 1 1)) + (memory $0 1 1 shared) (data "") (export "fake-user" $user) ;; CHECK: (type $0 (func)) diff --git a/test/lit/validation/shared-memory.wast b/test/lit/validation/shared-memory.wast index 03128756c..346195949 100644 --- a/test/lit/validation/shared-memory.wast +++ b/test/lit/validation/shared-memory.wast @@ -4,8 +4,8 @@ ;; RUN: wasm-opt %s --enable-threads -o - -S | filecheck %s --check-prefix ATOMICS ;; NO-ATOMICS: shared memory requires threads [--enable-threads] -;; ATOMICS: (memory $0 (shared 10 20)) +;; ATOMICS: (memory $0 10 20 shared) (module - (memory (shared 10 20)) + (memory 10 20 shared) ) diff --git a/test/lit/wasm-split/instrument-in-secondary-memory-custom-names.wast b/test/lit/wasm-split/instrument-in-secondary-memory-custom-names.wast index 9035a0b8b..a211e5d8a 100644 --- a/test/lit/wasm-split/instrument-in-secondary-memory-custom-names.wast +++ b/test/lit/wasm-split/instrument-in-secondary-memory-custom-names.wast @@ -17,7 +17,7 @@ ) ;; Check that a memory import has been added for secondary memory -;; CHECK: (import "custom_env" "custom_name" (memory $custom_name (shared 1 1))) +;; CHECK: (import "custom_env" "custom_name" (memory $custom_name 1 1 shared)) ;; And the profiling function exported ;; CHECK: (export "__write_profile" (func $__write_profile)) diff --git a/test/lit/wasm-split/instrument-in-secondary-memory.wast b/test/lit/wasm-split/instrument-in-secondary-memory.wast index d68e4c1d6..26ac0ad18 100644 --- a/test/lit/wasm-split/instrument-in-secondary-memory.wast +++ b/test/lit/wasm-split/instrument-in-secondary-memory.wast @@ -17,7 +17,7 @@ ) ;; Check that a memory import has been added for secondary memory -;; CHECK: (import "env" "profile-data" (memory $profile-data (shared 1 1))) +;; CHECK: (import "env" "profile-data" (memory $profile-data 1 1 shared)) ;; And the profiling function exported ;; CHECK: (export "__write_profile" (func $__write_profile)) diff --git a/test/lit/wasm-split/profile-guided.wast b/test/lit/wasm-split/profile-guided.wast index 8270204a2..6828c19fc 100644 --- a/test/lit/wasm-split/profile-guided.wast +++ b/test/lit/wasm-split/profile-guided.wast @@ -69,7 +69,7 @@ ;; NONE: Splitting out functions: bar, bar_callee, deep_foo_callee, foo, foo_callee, shared_callee, uncalled (module - (memory $mem (shared 1 1)) + (memory $mem 1 1 shared) (export "memory" (memory $mem)) (export "foo" (func $foo)) (export "bar" (func $bar)) diff --git a/test/lit/wat-kitchen-sink.wast b/test/lit/wat-kitchen-sink.wast index 479a8412d..05aedd519 100644 --- a/test/lit/wat-kitchen-sink.wast +++ b/test/lit/wat-kitchen-sink.wast @@ -216,7 +216,7 @@ ;; CHECK: (import "" "mem" (memory $mimport$0 0)) - ;; CHECK: (import "mod" "imported-m" (memory $m-imported (shared 1 2))) + ;; CHECK: (import "mod" "imported-m" (memory $m-imported 1 2 shared)) (import "mod" "imported-m" (memory $m-imported 1 2 shared)) ;; imported tables @@ -271,10 +271,10 @@ (global $i32 i32 i32.const 42) ;; memories - ;; CHECK: (memory $mem (shared 1 1)) + ;; CHECK: (memory $mem 1 1 shared) (memory $mem 1 1 shared) (memory 0 1 shared) - ;; CHECK: (memory $1 (shared 0 1)) + ;; CHECK: (memory $1 0 1 shared) ;; CHECK: (memory $mem-i32 0 1) (memory $mem-i32 i32 0 1) |