summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAshley Nelson <nashley@google.com>2023-08-21 19:29:10 -0700
committerGitHub <noreply@github.com>2023-08-21 19:29:10 -0700
commitafca5f51a46750927ac9263297d24b224915e558 (patch)
treeb8ac65ee40ca41668d111bb8545a7797b165671a /src
parent905e2fc25208c0bce3f78ac4ac3315219194e768 (diff)
downloadbinaryen-afca5f51a46750927ac9263297d24b224915e558.tar.gz
binaryen-afca5f51a46750927ac9263297d24b224915e558.tar.bz2
binaryen-afca5f51a46750927ac9263297d24b224915e558.zip
Rename multimemory flag (#5890)
Renaming the multimemory flag in Binaryen to match its naming in LLVM.
Diffstat (limited to 'src')
-rw-r--r--src/binaryen-c.cpp4
-rw-r--r--src/binaryen-c.h2
-rw-r--r--src/ir/memory-utils.cpp2
-rw-r--r--src/ir/memory-utils.h4
-rw-r--r--src/js/binaryen.js-post.js2
-rw-r--r--src/passes/MemoryPacking.cpp2
-rw-r--r--src/passes/MultiMemoryLowering.cpp6
-rw-r--r--src/tools/tool-options.h2
-rw-r--r--src/tools/wasm-split/instrumenter.cpp4
-rw-r--r--src/wasm-binary.h2
-rw-r--r--src/wasm-features.h10
-rw-r--r--src/wasm/wasm-binary.cpp8
-rw-r--r--src/wasm/wasm-validator.cpp4
-rw-r--r--src/wasm/wasm.cpp2
14 files changed, 27 insertions, 27 deletions
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
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-10 17:02:23 +0000