diff options
33 files changed, 63 insertions, 63 deletions
diff --git a/scripts/fuzz_opt.py b/scripts/fuzz_opt.py index b468755ff..7f9dd91d0 100755 --- a/scripts/fuzz_opt.py +++ b/scripts/fuzz_opt.py @@ -306,7 +306,7 @@ INITIAL_CONTENTS_IGNORE = [ 'fib2_emptylocspan_dwarf.wasm', 'fannkuch3_dwarf.wasm', 'multi_unit_abbrev_noprint.wasm', - # TODO fuzzer support for multi-memories + # TODO fuzzer support for multimemory 'multi-memories-atomics64.wast', 'multi-memories-basics.wast', 'multi-memories-simd.wast', @@ -918,7 +918,7 @@ class CompareVMs(TestCaseHandler): compare(before[vm], after[vm], 'CompareVMs between before and after: ' + vm.name) def can_run_on_feature_opts(self, feature_opts): - return all_disallowed(['simd', 'multivalue', 'multi-memories']) + return all_disallowed(['simd', 'multivalue', 'multimemory']) # Check for determinism - the same command must have the same output. @@ -1062,7 +1062,7 @@ class Wasm2JS(TestCaseHandler): # specifically for growth here if INITIAL_CONTENTS: return False - return all_disallowed(['exception-handling', 'simd', 'threads', 'bulk-memory', 'nontrapping-float-to-int', 'tail-call', 'sign-ext', 'reference-types', 'multivalue', 'gc', 'multi-memories']) + return all_disallowed(['exception-handling', 'simd', 'threads', 'bulk-memory', 'nontrapping-float-to-int', 'tail-call', 'sign-ext', 'reference-types', 'multivalue', 'gc', 'multimemory']) class Asyncify(TestCaseHandler): @@ -1132,7 +1132,7 @@ class Asyncify(TestCaseHandler): compare(before, after_asyncify, 'Asyncify (before/after_asyncify)') def can_run_on_feature_opts(self, feature_opts): - return all_disallowed(['exception-handling', 'simd', 'tail-call', 'reference-types', 'multivalue', 'gc', 'multi-memories']) + return all_disallowed(['exception-handling', 'simd', 'tail-call', 'reference-types', 'multivalue', 'gc', 'multimemory']) # given a wasm and a list of exports we want to keep, remove all other exports. diff --git a/src/binaryen-c.cpp b/src/binaryen-c.cpp index 0b7adf92a..59b01032d 100644 --- a/src/binaryen-c.cpp +++ b/src/binaryen-c.cpp @@ -487,8 +487,8 @@ BinaryenFeatures BinaryenFeatureExtendedConst(void) { BinaryenFeatures BinaryenFeatureStrings(void) { return static_cast<BinaryenFeatures>(FeatureSet::Strings); } -BinaryenFeatures BinaryenFeatureMultiMemories(void) { - return static_cast<BinaryenFeatures>(FeatureSet::MultiMemories); +BinaryenFeatures BinaryenFeatureMultiMemory(void) { + return static_cast<BinaryenFeatures>(FeatureSet::MultiMemory); } BinaryenFeatures BinaryenFeatureAll(void) { return static_cast<BinaryenFeatures>(FeatureSet::All); diff --git a/src/binaryen-c.h b/src/binaryen-c.h index 75acc20b0..2288eb5ca 100644 --- a/src/binaryen-c.h +++ b/src/binaryen-c.h @@ -230,7 +230,7 @@ BINARYEN_API BinaryenFeatures BinaryenFeatureMemory64(void); BINARYEN_API BinaryenFeatures BinaryenFeatureRelaxedSIMD(void); BINARYEN_API BinaryenFeatures BinaryenFeatureExtendedConst(void); BINARYEN_API BinaryenFeatures BinaryenFeatureStrings(void); -BINARYEN_API BinaryenFeatures BinaryenFeatureMultiMemories(void); +BINARYEN_API BinaryenFeatures BinaryenFeatureMultiMemory(void); BINARYEN_API BinaryenFeatures BinaryenFeatureAll(void); // Modules diff --git a/src/ir/memory-utils.cpp b/src/ir/memory-utils.cpp index 1530e7c11..5c9dde235 100644 --- a/src/ir/memory-utils.cpp +++ b/src/ir/memory-utils.cpp @@ -20,7 +20,7 @@ namespace wasm::MemoryUtils { bool flatten(Module& wasm) { - // Flatten does not currently have support for multi-memories + // Flatten does not currently have support for multimemory if (wasm.memories.size() > 1) { return false; } diff --git a/src/ir/memory-utils.h b/src/ir/memory-utils.h index f31c55a7d..7c19720ce 100644 --- a/src/ir/memory-utils.h +++ b/src/ir/memory-utils.h @@ -30,7 +30,7 @@ namespace wasm::MemoryUtils { // Flattens memory into a single data segment, or no segment. If there is // a segment, it starts at 0. // Returns true if successful (e.g. relocatable segments cannot be flattened). -// Does not yet support multi-memories +// Does not yet support multimemory bool flatten(Module& wasm); // Ensures that a memory exists (of minimal size). @@ -44,7 +44,7 @@ inline void ensureExists(Module* wasm) { // Try to merge segments until they fit into web limitations. // Return true if successful. -// Does not yet support multi-memories +// Does not yet support multimemory inline bool ensureLimitedSegments(Module& module) { if (module.memories.size() > 1) { return false; diff --git a/src/js/binaryen.js-post.js b/src/js/binaryen.js-post.js index 1cbecfaff..d57d5955e 100644 --- a/src/js/binaryen.js-post.js +++ b/src/js/binaryen.js-post.js @@ -167,7 +167,7 @@ function initializeConstants() { 'RelaxedSIMD', 'ExtendedConst', 'Strings', - 'MultiMemories', + 'MultiMemory', 'All' ].forEach(name => { Module['Features'][name] = Module['_BinaryenFeature' + name](); diff --git a/src/passes/MemoryPacking.cpp b/src/passes/MemoryPacking.cpp index e0ce6294b..79e7b83a9 100644 --- a/src/passes/MemoryPacking.cpp +++ b/src/passes/MemoryPacking.cpp @@ -126,7 +126,7 @@ struct MemoryPacking : public Pass { }; void MemoryPacking::run(Module* module) { - // Does not have multi-memories support + // Does not have multimemory support if (!canOptimize(module->memories, module->dataSegments)) { return; } diff --git a/src/passes/MultiMemoryLowering.cpp b/src/passes/MultiMemoryLowering.cpp index 2b3aedb2c..0367afa98 100644 --- a/src/passes/MultiMemoryLowering.cpp +++ b/src/passes/MultiMemoryLowering.cpp @@ -18,9 +18,9 @@ // Condensing a module with multiple memories into a module with a single memory // for browsers that don’t support multiple memories. // -// This pass also disables multi-memories so that the target features section in +// This pass also disables multimemory so that the target features section in // the emitted module does not report the use of MultiMemories. Disabling the -// multi-memories feature also prevents later passes from adding additional +// multimemory feature also prevents later passes from adding additional // memories. // // The offset computation in function maybeMakeBoundsCheck is not precise @@ -378,7 +378,7 @@ struct MultiMemoryLowering : public Pass { }; void run(Module* module) override { - module->features.disable(FeatureSet::MultiMemories); + module->features.disable(FeatureSet::MultiMemory); // If there are no memories or 1 memory, skip this pass if (module->memories.size() <= 1) { diff --git a/src/tools/tool-options.h b/src/tools/tool-options.h index a6e57a76e..6f3b4968c 100644 --- a/src/tools/tool-options.h +++ b/src/tools/tool-options.h @@ -93,7 +93,7 @@ struct ToolOptions : public Options { .addFeature(FeatureSet::RelaxedSIMD, "relaxed SIMD") .addFeature(FeatureSet::ExtendedConst, "extended const expressions") .addFeature(FeatureSet::Strings, "strings") - .addFeature(FeatureSet::MultiMemories, "multi-memories") + .addFeature(FeatureSet::MultiMemory, "multimemory") .add("--enable-typed-function-references", "", "Deprecated compatibility flag", diff --git a/src/tools/wasm-split/instrumenter.cpp b/src/tools/wasm-split/instrumenter.cpp index a2d6340f0..38ebd271a 100644 --- a/src/tools/wasm-split/instrumenter.cpp +++ b/src/tools/wasm-split/instrumenter.cpp @@ -73,9 +73,9 @@ void Instrumenter::addSecondaryMemory(size_t numFuncs) { // Don't need secondary memory return; } - if (!wasm->features.hasMultiMemories()) { + if (!wasm->features.hasMultiMemory()) { Fatal() - << "error: --in-secondary-memory requires multi-memories to be enabled"; + << "error: --in-secondary-memory requires multimemory to be enabled"; } secondaryMemory = diff --git a/src/wasm-binary.h b/src/wasm-binary.h index 06d988c6a..bbe6cc89a 100644 --- a/src/wasm-binary.h +++ b/src/wasm-binary.h @@ -502,7 +502,7 @@ extern const char* Memory64Feature; extern const char* RelaxedSIMDFeature; extern const char* ExtendedConstFeature; extern const char* StringsFeature; -extern const char* MultiMemoriesFeature; +extern const char* MultiMemoryFeature; enum Subsection { NameModule = 0, diff --git a/src/wasm-features.h b/src/wasm-features.h index 881868901..197b6eb36 100644 --- a/src/wasm-features.h +++ b/src/wasm-features.h @@ -45,7 +45,7 @@ struct FeatureSet { RelaxedSIMD = 1 << 13, ExtendedConst = 1 << 14, Strings = 1 << 15, - MultiMemories = 1 << 16, + MultiMemory = 1 << 16, MVP = None, // Keep in sync with llvm default features: // https://github.com/llvm/llvm-project/blob/c7576cb89d6c95f03968076e902d3adfd1996577/clang/lib/Basic/Targets/WebAssembly.cpp#L150-L153 @@ -91,8 +91,8 @@ struct FeatureSet { return "extended-const"; case Strings: return "strings"; - case MultiMemories: - return "multi-memories"; + case MultiMemory: + return "multimemory"; default: WASM_UNREACHABLE("unexpected feature"); } @@ -137,7 +137,7 @@ struct FeatureSet { bool hasRelaxedSIMD() const { return (features & RelaxedSIMD) != 0; } bool hasExtendedConst() const { return (features & ExtendedConst) != 0; } bool hasStrings() const { return (features & Strings) != 0; } - bool hasMultiMemories() const { return (features & MultiMemories) != 0; } + bool hasMultiMemory() const { return (features & MultiMemory) != 0; } bool hasAll() const { return (features & AllPossible) != 0; } void set(FeatureSet f, bool v = true) { @@ -159,7 +159,7 @@ struct FeatureSet { void setRelaxedSIMD(bool v = true) { set(RelaxedSIMD, v); } void setExtendedConst(bool v = true) { set(ExtendedConst, v); } void setStrings(bool v = true) { set(Strings, v); } - void setMultiMemories(bool v = true) { set(MultiMemories, v); } + void setMultiMemory(bool v = true) { set(MultiMemory, v); } void setMVP() { features = MVP; } void setAll() { // Do not set GCNNLocals, which forces the user to opt in to that feature diff --git a/src/wasm/wasm-binary.cpp b/src/wasm/wasm-binary.cpp index 684afe80c..556f52157 100644 --- a/src/wasm/wasm-binary.cpp +++ b/src/wasm/wasm-binary.cpp @@ -1252,8 +1252,8 @@ void WasmBinaryWriter::writeFeaturesSection() { return BinaryConsts::CustomSections::ExtendedConstFeature; case FeatureSet::Strings: return BinaryConsts::CustomSections::StringsFeature; - case FeatureSet::MultiMemories: - return BinaryConsts::CustomSections::MultiMemoriesFeature; + case FeatureSet::MultiMemory: + return BinaryConsts::CustomSections::MultiMemoryFeature; default: WASM_UNREACHABLE("unexpected feature flag"); } @@ -3685,8 +3685,8 @@ void WasmBinaryReader::readFeatures(size_t payloadLen) { feature = FeatureSet::ExtendedConst; } else if (name == BinaryConsts::CustomSections::StringsFeature) { feature = FeatureSet::Strings; - } else if (name == BinaryConsts::CustomSections::MultiMemoriesFeature) { - feature = FeatureSet::MultiMemories; + } else if (name == BinaryConsts::CustomSections::MultiMemoryFeature) { + feature = FeatureSet::MultiMemory; } else { // Silently ignore unknown features (this may be and old binaryen running // on a new wasm). diff --git a/src/wasm/wasm-validator.cpp b/src/wasm/wasm-validator.cpp index b48ec632e..2039fb987 100644 --- a/src/wasm/wasm-validator.cpp +++ b/src/wasm/wasm-validator.cpp @@ -3485,9 +3485,9 @@ static void validateGlobals(Module& module, ValidationInfo& info) { static void validateMemories(Module& module, ValidationInfo& info) { if (module.memories.size() > 1) { info.shouldBeTrue( - module.features.hasMultiMemories(), + module.features.hasMultiMemory(), "memory", - "multiple memories require multi-memories [--enable-multi-memories]"); + "multiple memories require multimemory [--enable-multimemory]"); } for (auto& memory : module.memories) { if (memory->hasMax()) { diff --git a/src/wasm/wasm.cpp b/src/wasm/wasm.cpp index 188cd2d6f..d7bc106e4 100644 --- a/src/wasm/wasm.cpp +++ b/src/wasm/wasm.cpp @@ -50,7 +50,7 @@ const char* Memory64Feature = "memory64"; const char* RelaxedSIMDFeature = "relaxed-simd"; const char* ExtendedConstFeature = "extended-const"; const char* StringsFeature = "strings"; -const char* MultiMemoriesFeature = "multi-memories"; +const char* MultiMemoryFeature = "multimemory"; } // namespace CustomSections } // namespace BinaryConsts 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()) |