diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/binaryen.js/kitchen-sink.js | 2 | ||||
-rw-r--r-- | test/binaryen.js/kitchen-sink.js.txt | 2 | ||||
-rw-r--r-- | test/lit/help/wasm-as.test | 4 | ||||
-rw-r--r-- | test/lit/help/wasm-ctor-eval.test | 4 | ||||
-rw-r--r-- | test/lit/help/wasm-dis.test | 4 | ||||
-rw-r--r-- | test/lit/help/wasm-emscripten-finalize.test | 4 | ||||
-rw-r--r-- | test/lit/help/wasm-merge.test | 4 | ||||
-rw-r--r-- | test/lit/help/wasm-metadce.test | 4 | ||||
-rw-r--r-- | test/lit/help/wasm-opt.test | 4 | ||||
-rw-r--r-- | test/lit/help/wasm-reduce.test | 4 | ||||
-rw-r--r-- | test/lit/help/wasm-split.test | 4 | ||||
-rw-r--r-- | test/lit/help/wasm2js.test | 4 | ||||
-rw-r--r-- | test/lit/passes/asyncify-wasm64_pass-arg=in-secondary-memory.wast | 2 | ||||
-rw-r--r-- | test/lit/passes/asyncify_pass-arg=in-secondary-memory.wast | 4 | ||||
-rw-r--r-- | test/lit/passes/multi-memory-lowering.wast | 4 | ||||
-rw-r--r-- | test/lit/wasm-split/instrument-in-secondary-memory.wast | 6 | ||||
-rw-r--r-- | test/passes/strip-target-features_roundtrip_print-features_all-features.txt | 2 | ||||
-rw-r--r-- | test/unit/test_features.py | 2 |
18 files changed, 32 insertions, 32 deletions
diff --git a/test/binaryen.js/kitchen-sink.js b/test/binaryen.js/kitchen-sink.js index f62ed5a2a..a9e3a4eae 100644 --- a/test/binaryen.js/kitchen-sink.js +++ b/test/binaryen.js/kitchen-sink.js @@ -99,7 +99,7 @@ function test_features() { console.log("Features.RelaxedSIMD: " + binaryen.Features.RelaxedSIMD); console.log("Features.ExtendedConst: " + binaryen.Features.ExtendedConst); console.log("Features.Strings: " + binaryen.Features.Strings); - console.log("Features.MultiMemories: " + binaryen.Features.MultiMemories); + console.log("Features.MultiMemory: " + binaryen.Features.MultiMemory); console.log("Features.All: " + binaryen.Features.All); } diff --git a/test/binaryen.js/kitchen-sink.js.txt b/test/binaryen.js/kitchen-sink.js.txt index 089faaa3e..3b4f40ff6 100644 --- a/test/binaryen.js/kitchen-sink.js.txt +++ b/test/binaryen.js/kitchen-sink.js.txt @@ -32,7 +32,7 @@ Features.Memory64: 2048 Features.RelaxedSIMD: 8192 Features.ExtendedConst: 16384 Features.Strings: 32768 -Features.MultiMemories: 65536 +Features.MultiMemory: 65536 Features.All: 126975 InvalidId: 0 BlockId: 1 diff --git a/test/lit/help/wasm-as.test b/test/lit/help/wasm-as.test index 97f11a7d6..0fbbe77be 100644 --- a/test/lit/help/wasm-as.test +++ b/test/lit/help/wasm-as.test @@ -104,9 +104,9 @@ ;; CHECK-NEXT: ;; CHECK-NEXT: --disable-strings Disable strings ;; CHECK-NEXT: -;; CHECK-NEXT: --enable-multi-memories Enable multi-memories +;; CHECK-NEXT: --enable-multimemory Enable multimemory ;; CHECK-NEXT: -;; CHECK-NEXT: --disable-multi-memories Disable multi-memories +;; CHECK-NEXT: --disable-multimemory Disable multimemory ;; CHECK-NEXT: ;; CHECK-NEXT: --enable-typed-function-references Deprecated compatibility flag ;; CHECK-NEXT: diff --git a/test/lit/help/wasm-ctor-eval.test b/test/lit/help/wasm-ctor-eval.test index 2d27f619a..7d3b3082a 100644 --- a/test/lit/help/wasm-ctor-eval.test +++ b/test/lit/help/wasm-ctor-eval.test @@ -111,9 +111,9 @@ ;; CHECK-NEXT: ;; CHECK-NEXT: --disable-strings Disable strings ;; CHECK-NEXT: -;; CHECK-NEXT: --enable-multi-memories Enable multi-memories +;; CHECK-NEXT: --enable-multimemory Enable multimemory ;; CHECK-NEXT: -;; CHECK-NEXT: --disable-multi-memories Disable multi-memories +;; CHECK-NEXT: --disable-multimemory Disable multimemory ;; CHECK-NEXT: ;; CHECK-NEXT: --enable-typed-function-references Deprecated compatibility flag ;; CHECK-NEXT: diff --git a/test/lit/help/wasm-dis.test b/test/lit/help/wasm-dis.test index 0d5cd8dc2..82e8ec829 100644 --- a/test/lit/help/wasm-dis.test +++ b/test/lit/help/wasm-dis.test @@ -97,9 +97,9 @@ ;; CHECK-NEXT: ;; CHECK-NEXT: --disable-strings Disable strings ;; CHECK-NEXT: -;; CHECK-NEXT: --enable-multi-memories Enable multi-memories +;; CHECK-NEXT: --enable-multimemory Enable multimemory ;; CHECK-NEXT: -;; CHECK-NEXT: --disable-multi-memories Disable multi-memories +;; CHECK-NEXT: --disable-multimemory Disable multimemory ;; CHECK-NEXT: ;; CHECK-NEXT: --enable-typed-function-references Deprecated compatibility flag ;; CHECK-NEXT: diff --git a/test/lit/help/wasm-emscripten-finalize.test b/test/lit/help/wasm-emscripten-finalize.test index 8ce4d94f0..641323c74 100644 --- a/test/lit/help/wasm-emscripten-finalize.test +++ b/test/lit/help/wasm-emscripten-finalize.test @@ -144,9 +144,9 @@ ;; CHECK-NEXT: ;; CHECK-NEXT: --disable-strings Disable strings ;; CHECK-NEXT: -;; CHECK-NEXT: --enable-multi-memories Enable multi-memories +;; CHECK-NEXT: --enable-multimemory Enable multimemory ;; CHECK-NEXT: -;; CHECK-NEXT: --disable-multi-memories Disable multi-memories +;; CHECK-NEXT: --disable-multimemory Disable multimemory ;; CHECK-NEXT: ;; CHECK-NEXT: --enable-typed-function-references Deprecated compatibility flag ;; CHECK-NEXT: diff --git a/test/lit/help/wasm-merge.test b/test/lit/help/wasm-merge.test index 541f37d5a..867275a3c 100644 --- a/test/lit/help/wasm-merge.test +++ b/test/lit/help/wasm-merge.test @@ -115,9 +115,9 @@ ;; CHECK-NEXT: ;; CHECK-NEXT: --disable-strings Disable strings ;; CHECK-NEXT: -;; CHECK-NEXT: --enable-multi-memories Enable multi-memories +;; CHECK-NEXT: --enable-multimemory Enable multimemory ;; CHECK-NEXT: -;; CHECK-NEXT: --disable-multi-memories Disable multi-memories +;; CHECK-NEXT: --disable-multimemory Disable multimemory ;; CHECK-NEXT: ;; CHECK-NEXT: --enable-typed-function-references Deprecated compatibility flag ;; CHECK-NEXT: diff --git a/test/lit/help/wasm-metadce.test b/test/lit/help/wasm-metadce.test index 5a2f22c01..655a791a9 100644 --- a/test/lit/help/wasm-metadce.test +++ b/test/lit/help/wasm-metadce.test @@ -145,9 +145,9 @@ ;; CHECK-NEXT: ;; CHECK-NEXT: --disable-strings Disable strings ;; CHECK-NEXT: -;; CHECK-NEXT: --enable-multi-memories Enable multi-memories +;; CHECK-NEXT: --enable-multimemory Enable multimemory ;; CHECK-NEXT: -;; CHECK-NEXT: --disable-multi-memories Disable multi-memories +;; CHECK-NEXT: --disable-multimemory Disable multimemory ;; CHECK-NEXT: ;; CHECK-NEXT: --enable-typed-function-references Deprecated compatibility flag ;; CHECK-NEXT: diff --git a/test/lit/help/wasm-opt.test b/test/lit/help/wasm-opt.test index 1aa794d3d..7c56aa1ab 100644 --- a/test/lit/help/wasm-opt.test +++ b/test/lit/help/wasm-opt.test @@ -670,9 +670,9 @@ ;; CHECK-NEXT: ;; CHECK-NEXT: --disable-strings Disable strings ;; CHECK-NEXT: -;; CHECK-NEXT: --enable-multi-memories Enable multi-memories +;; CHECK-NEXT: --enable-multimemory Enable multimemory ;; CHECK-NEXT: -;; CHECK-NEXT: --disable-multi-memories Disable multi-memories +;; CHECK-NEXT: --disable-multimemory Disable multimemory ;; CHECK-NEXT: ;; CHECK-NEXT: --enable-typed-function-references Deprecated compatibility flag ;; CHECK-NEXT: diff --git a/test/lit/help/wasm-reduce.test b/test/lit/help/wasm-reduce.test index 5fb79bf88..53405fb4b 100644 --- a/test/lit/help/wasm-reduce.test +++ b/test/lit/help/wasm-reduce.test @@ -133,9 +133,9 @@ ;; CHECK-NEXT: ;; CHECK-NEXT: --disable-strings Disable strings ;; CHECK-NEXT: -;; CHECK-NEXT: --enable-multi-memories Enable multi-memories +;; CHECK-NEXT: --enable-multimemory Enable multimemory ;; CHECK-NEXT: -;; CHECK-NEXT: --disable-multi-memories Disable multi-memories +;; CHECK-NEXT: --disable-multimemory Disable multimemory ;; CHECK-NEXT: ;; CHECK-NEXT: --enable-typed-function-references Deprecated compatibility flag ;; CHECK-NEXT: diff --git a/test/lit/help/wasm-split.test b/test/lit/help/wasm-split.test index 8b017d43d..2ca4c2ad0 100644 --- a/test/lit/help/wasm-split.test +++ b/test/lit/help/wasm-split.test @@ -213,9 +213,9 @@ ;; CHECK-NEXT: ;; CHECK-NEXT: --disable-strings Disable strings ;; CHECK-NEXT: -;; CHECK-NEXT: --enable-multi-memories Enable multi-memories +;; CHECK-NEXT: --enable-multimemory Enable multimemory ;; CHECK-NEXT: -;; CHECK-NEXT: --disable-multi-memories Disable multi-memories +;; CHECK-NEXT: --disable-multimemory Disable multimemory ;; CHECK-NEXT: ;; CHECK-NEXT: --enable-typed-function-references Deprecated compatibility flag ;; CHECK-NEXT: diff --git a/test/lit/help/wasm2js.test b/test/lit/help/wasm2js.test index 32dda7f4c..2e52d6ce5 100644 --- a/test/lit/help/wasm2js.test +++ b/test/lit/help/wasm2js.test @@ -629,9 +629,9 @@ ;; CHECK-NEXT: ;; CHECK-NEXT: --disable-strings Disable strings ;; CHECK-NEXT: -;; CHECK-NEXT: --enable-multi-memories Enable multi-memories +;; CHECK-NEXT: --enable-multimemory Enable multimemory ;; CHECK-NEXT: -;; CHECK-NEXT: --disable-multi-memories Disable multi-memories +;; CHECK-NEXT: --disable-multimemory Disable multimemory ;; CHECK-NEXT: ;; CHECK-NEXT: --enable-typed-function-references Deprecated compatibility flag ;; CHECK-NEXT: diff --git a/test/lit/passes/asyncify-wasm64_pass-arg=in-secondary-memory.wast b/test/lit/passes/asyncify-wasm64_pass-arg=in-secondary-memory.wast index 7342365cb..f41edf675 100644 --- a/test/lit/passes/asyncify-wasm64_pass-arg=in-secondary-memory.wast +++ b/test/lit/passes/asyncify-wasm64_pass-arg=in-secondary-memory.wast @@ -1,6 +1,6 @@ ;; NOTE: Assertions have been generated by update_lit_checks.py --all-items and should not be edited. -;; RUN: wasm-opt --enable-memory64 --enable-multi-memories --asyncify --pass-arg=asyncify-in-secondary-memory %s -S -o - | filecheck %s +;; RUN: wasm-opt --enable-memory64 --enable-multimemory --asyncify --pass-arg=asyncify-in-secondary-memory %s -S -o - | filecheck %s (module (memory i64 1 2) diff --git a/test/lit/passes/asyncify_pass-arg=in-secondary-memory.wast b/test/lit/passes/asyncify_pass-arg=in-secondary-memory.wast index 961c6d72c..f18292bef 100644 --- a/test/lit/passes/asyncify_pass-arg=in-secondary-memory.wast +++ b/test/lit/passes/asyncify_pass-arg=in-secondary-memory.wast @@ -1,7 +1,7 @@ ;; NOTE: Assertions have been generated by update_lit_checks.py --all-items and should not be edited. -;; RUN: wasm-opt --enable-multi-memories --asyncify --pass-arg=asyncify-in-secondary-memory %s -S -o - | filecheck %s -;; RUN: wasm-opt --enable-multi-memories --asyncify --pass-arg=asyncify-in-secondary-memory --pass-arg=asyncify-secondary-memory-size@3 %s -S -o - | filecheck %s --check-prefix SIZE +;; RUN: wasm-opt --enable-multimemory --asyncify --pass-arg=asyncify-in-secondary-memory %s -S -o - | filecheck %s +;; RUN: wasm-opt --enable-multimemory --asyncify --pass-arg=asyncify-in-secondary-memory --pass-arg=asyncify-secondary-memory-size@3 %s -S -o - | filecheck %s --check-prefix SIZE (module (memory 1 2) diff --git a/test/lit/passes/multi-memory-lowering.wast b/test/lit/passes/multi-memory-lowering.wast index 3cc0f28a8..0becf4c33 100644 --- a/test/lit/passes/multi-memory-lowering.wast +++ b/test/lit/passes/multi-memory-lowering.wast @@ -1,6 +1,6 @@ ;; NOTE: Assertions have been generated by update_lit_checks.py --all-items and should not be edited. -;; RUN: wasm-opt %s --enable-multi-memories --multi-memory-lowering --enable-bulk-memory --enable-extended-const --enable-simd --enable-threads -S -o - | filecheck %s -;; RUN: wasm-opt %s --enable-multi-memories --multi-memory-lowering-with-bounds-checks --enable-bulk-memory --enable-extended-const --enable-simd --enable-threads -S -o - | filecheck %s --check-prefix BOUNDS +;; RUN: wasm-opt %s --enable-multimemory --multi-memory-lowering --enable-bulk-memory --enable-extended-const --enable-simd --enable-threads -S -o - | filecheck %s +;; RUN: wasm-opt %s --enable-multimemory --multi-memory-lowering-with-bounds-checks --enable-bulk-memory --enable-extended-const --enable-simd --enable-threads -S -o - | filecheck %s --check-prefix BOUNDS (module (memory $memory1 1) diff --git a/test/lit/wasm-split/instrument-in-secondary-memory.wast b/test/lit/wasm-split/instrument-in-secondary-memory.wast index bac67f717..d68e4c1d6 100644 --- a/test/lit/wasm-split/instrument-in-secondary-memory.wast +++ b/test/lit/wasm-split/instrument-in-secondary-memory.wast @@ -1,8 +1,8 @@ -;; RUN: wasm-split %s --instrument --in-secondary-memory --enable-threads --enable-multi-memories -S -o - | filecheck %s +;; RUN: wasm-split %s --instrument --in-secondary-memory --enable-threads --enable-multimemory -S -o - | filecheck %s ;; Check that the output round trips and validates as well -;; RUN: wasm-split %s --instrument --in-secondary-memory --enable-threads --enable-multi-memories -g -o %t.wasm -;; RUN: wasm-opt --enable-threads --enable-multi-memories %t.wasm -S -o - +;; RUN: wasm-split %s --instrument --in-secondary-memory --enable-threads --enable-multimemory -g -o %t.wasm +;; RUN: wasm-opt --enable-threads --enable-multimemory %t.wasm -S -o - (module (import "env" "foo" (func $foo)) diff --git a/test/passes/strip-target-features_roundtrip_print-features_all-features.txt b/test/passes/strip-target-features_roundtrip_print-features_all-features.txt index 29555b427..71f292c09 100644 --- a/test/passes/strip-target-features_roundtrip_print-features_all-features.txt +++ b/test/passes/strip-target-features_roundtrip_print-features_all-features.txt @@ -13,7 +13,7 @@ --enable-relaxed-simd --enable-extended-const --enable-strings ---enable-multi-memories +--enable-multimemory (module (type $none_=>_v128_externref (func (result v128 externref))) (func $foo (type $none_=>_v128_externref) (result v128 externref) diff --git a/test/unit/test_features.py b/test/unit/test_features.py index d40eaf580..75e87b7d5 100644 --- a/test/unit/test_features.py +++ b/test/unit/test_features.py @@ -395,5 +395,5 @@ class TargetFeaturesSectionTest(utils.BinaryenTestCase): '--enable-relaxed-simd', '--enable-extended-const', '--enable-strings', - '--enable-multi-memories', + '--enable-multimemory', ], p2.stdout.splitlines()) |