summaryrefslogtreecommitdiff
path: root/test/lit/basic
diff options
context:
space:
mode:
Diffstat (limited to 'test/lit/basic')
-rw-r--r--test/lit/basic/atomics.wast8
-rw-r--r--test/lit/basic/atomics64.wast8
-rw-r--r--test/lit/basic/memory-shared.wast8
-rw-r--r--test/lit/basic/multi-memories-atomics64.wast24
-rw-r--r--test/lit/basic/nonspec-bulk-memory.wast137
-rw-r--r--test/lit/basic/unreachable-instr-type.wast8
6 files changed, 28 insertions, 165 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)