summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/passes/LLVMMemoryCopyFillLowering.cpp4
-rw-r--r--src/passes/OptimizeInstructions.cpp4
-rw-r--r--src/tools/tool-options.h27
-rw-r--r--src/wasm-binary.h2
-rw-r--r--src/wasm-features.h19
-rw-r--r--src/wasm/wasm-binary.cpp10
-rw-r--r--src/wasm/wasm-validator.cpp12
-rw-r--r--src/wasm/wasm.cpp2
8 files changed, 61 insertions, 19 deletions
diff --git a/src/passes/LLVMMemoryCopyFillLowering.cpp b/src/passes/LLVMMemoryCopyFillLowering.cpp
index e5b940a5a..d2a7e5c48 100644
--- a/src/passes/LLVMMemoryCopyFillLowering.cpp
+++ b/src/passes/LLVMMemoryCopyFillLowering.cpp
@@ -49,7 +49,7 @@ struct LLVMMemoryCopyFillLowering
}
void run(Module* module) override {
- if (!module->features.hasBulkMemory()) {
+ if (!module->features.hasBulkMemoryOpt()) {
return;
}
if (module->features.hasMemory64() || module->features.hasMultiMemory()) {
@@ -108,7 +108,7 @@ struct LLVMMemoryCopyFillLowering
} else {
module->removeFunction(memFillFuncName);
}
- module->features.disable(FeatureSet::BulkMemory);
+ module->features.setBulkMemoryOpt(false);
}
void createMemoryCopyFunc(Module* module) {
diff --git a/src/passes/OptimizeInstructions.cpp b/src/passes/OptimizeInstructions.cpp
index 881b7ea1f..792cf6235 100644
--- a/src/passes/OptimizeInstructions.cpp
+++ b/src/passes/OptimizeInstructions.cpp
@@ -1275,7 +1275,7 @@ struct OptimizeInstructions
if (curr->type == Type::unreachable) {
return;
}
- assert(getModule()->features.hasBulkMemory());
+ assert(getModule()->features.hasBulkMemoryOpt());
if (auto* ret = optimizeMemoryCopy(curr)) {
return replaceCurrent(ret);
}
@@ -1285,7 +1285,7 @@ struct OptimizeInstructions
if (curr->type == Type::unreachable) {
return;
}
- assert(getModule()->features.hasBulkMemory());
+ assert(getModule()->features.hasBulkMemoryOpt());
if (auto* ret = optimizeMemoryFill(curr)) {
return replaceCurrent(ret);
}
diff --git a/src/tools/tool-options.h b/src/tools/tool-options.h
index f900d76ba..c7acf1d46 100644
--- a/src/tools/tool-options.h
+++ b/src/tools/tool-options.h
@@ -82,7 +82,16 @@ struct ToolOptions : public Options {
.addFeature(FeatureSet::MutableGlobals, "mutable globals")
.addFeature(FeatureSet::TruncSat, "nontrapping float-to-int operations")
.addFeature(FeatureSet::SIMD, "SIMD operations and types")
- .addFeature(FeatureSet::BulkMemory, "bulk memory operations")
+ .addFeature(FeatureSet::BulkMemory,
+ "bulk memory operations",
+ FeatureSet(FeatureSet::BulkMemoryOpt))
+ .addFeature(FeatureSet::BulkMemoryOpt,
+ "memory.copy and memory.fill",
+ FeatureSet::None,
+ FeatureSet(FeatureSet::BulkMemory))
+ .addFeature(FeatureSet::CallIndirectOverlong,
+ "LEB encoding of call-indirect (Ignored for compatibility as "
+ "it has no effect on Binaryen)")
.addFeature(FeatureSet::ExceptionHandling,
"exception handling operations")
.addFeature(FeatureSet::TailCall, "tail call operations")
@@ -200,16 +209,18 @@ struct ToolOptions : public Options {
}
ToolOptions& addFeature(FeatureSet::Feature feature,
- const std::string& description) {
+ const std::string& description,
+ FeatureSet impliedEnable = FeatureSet::None,
+ FeatureSet impliedDisable = FeatureSet::None) {
(*this)
.add(std::string("--enable-") + FeatureSet::toString(feature),
"",
std::string("Enable ") + description,
ToolOptionsCategory,
Arguments::Zero,
- [this, feature](Options*, const std::string&) {
- enabledFeatures.set(feature, true);
- disabledFeatures.set(feature, false);
+ [this, feature, impliedEnable](Options*, const std::string&) {
+ enabledFeatures.set(feature | impliedEnable, true);
+ disabledFeatures.set(feature | impliedEnable, false);
})
.add(std::string("--disable-") + FeatureSet::toString(feature),
@@ -217,9 +228,9 @@ struct ToolOptions : public Options {
std::string("Disable ") + description,
ToolOptionsCategory,
Arguments::Zero,
- [this, feature](Options*, const std::string&) {
- enabledFeatures.set(feature, false);
- disabledFeatures.set(feature, true);
+ [this, feature, impliedDisable](Options*, const std::string&) {
+ enabledFeatures.set(feature | impliedDisable, false);
+ disabledFeatures.set(feature | impliedDisable, true);
});
return *this;
}
diff --git a/src/wasm-binary.h b/src/wasm-binary.h
index 7c32e2169..163a62b1e 100644
--- a/src/wasm-binary.h
+++ b/src/wasm-binary.h
@@ -396,6 +396,8 @@ extern const char* MultiMemoryFeature;
extern const char* TypedContinuationsFeature;
extern const char* SharedEverythingFeature;
extern const char* FP16Feature;
+extern const char* BulkMemoryOptFeature;
+extern const char* CallIndirectOverlongFeature;
enum Subsection {
NameModule = 0,
diff --git a/src/wasm-features.h b/src/wasm-features.h
index 92b07b547..20eec56bb 100644
--- a/src/wasm-features.h
+++ b/src/wasm-features.h
@@ -27,6 +27,8 @@ namespace wasm {
struct FeatureSet {
enum Feature : uint32_t {
+ // These features are intended to those documented in tool-conventions:
+ // https://github.com/WebAssembly/tool-conventions/blob/main/Linking.md#target-features-section
None = 0,
Atomics = 1 << 0,
MutableGlobals = 1 << 1,
@@ -47,11 +49,16 @@ struct FeatureSet {
TypedContinuations = 1 << 16,
SharedEverything = 1 << 17,
FP16 = 1 << 18,
+ BulkMemoryOpt = 1 << 19, // Just the memory.copy and fill operations
+ // This features is a no-op for compatibility. Having it in this list means
+ // that we can automatically generate tool flags that set it, but otherwise
+ // it does nothing. Binaryen always accepts LEB call-indirect encodings.
+ CallIndirectOverlong = 1 << 20,
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
Default = SignExt | MutableGlobals,
- All = (1 << 19) - 1,
+ All = (1 << 21) - 1,
};
static std::string toString(Feature f) {
@@ -94,6 +101,10 @@ struct FeatureSet {
return "shared-everything";
case FP16:
return "fp16";
+ case BulkMemoryOpt:
+ return "bulk-memory-opt";
+ case CallIndirectOverlong:
+ return "call-indirect-overlong";
default:
WASM_UNREACHABLE("unexpected feature");
}
@@ -145,6 +156,11 @@ struct FeatureSet {
return (features & SharedEverything) != 0;
}
bool hasFP16() const { return (features & FP16) != 0; }
+ bool hasBulkMemoryOpt() const {
+ bool has = (features & BulkMemoryOpt) != 0;
+ assert(has || !hasBulkMemory());
+ return has;
+ }
bool hasAll() const { return (features & All) != 0; }
void set(FeatureSet f, bool v = true) {
@@ -169,6 +185,7 @@ struct FeatureSet {
void setTypedContinuations(bool v = true) { set(TypedContinuations, v); }
void setSharedEverything(bool v = true) { set(SharedEverything, v); }
void setFP16(bool v = true) { set(FP16, v); }
+ void setBulkMemoryOpt(bool v = true) { set(BulkMemoryOpt, v); }
void setMVP() { features = MVP; }
void setAll() { features = All; }
diff --git a/src/wasm/wasm-binary.cpp b/src/wasm/wasm-binary.cpp
index f710c8bc1..0c931f518 100644
--- a/src/wasm/wasm-binary.cpp
+++ b/src/wasm/wasm-binary.cpp
@@ -1354,6 +1354,10 @@ void WasmBinaryWriter::writeFeaturesSection() {
return BinaryConsts::CustomSections::SharedEverythingFeature;
case FeatureSet::FP16:
return BinaryConsts::CustomSections::FP16Feature;
+ case FeatureSet::BulkMemoryOpt:
+ return BinaryConsts::CustomSections::BulkMemoryOptFeature;
+ case FeatureSet::CallIndirectOverlong:
+ return BinaryConsts::CustomSections::CallIndirectOverlongFeature;
case FeatureSet::None:
case FeatureSet::Default:
case FeatureSet::All:
@@ -4790,6 +4794,12 @@ void WasmBinaryReader::readFeatures(size_t payloadLen) {
feature = FeatureSet::Atomics;
} else if (name == BinaryConsts::CustomSections::BulkMemoryFeature) {
feature = FeatureSet::BulkMemory;
+ if (used) {
+ // For backward compatibility, enable this dependent feature.
+ feature |= FeatureSet::BulkMemoryOpt;
+ }
+ } else if (name == BinaryConsts::CustomSections::BulkMemoryOptFeature) {
+ feature = FeatureSet::BulkMemoryOpt;
} else if (name == BinaryConsts::CustomSections::ExceptionHandlingFeature) {
feature = FeatureSet::ExceptionHandling;
} else if (name == BinaryConsts::CustomSections::MutableGlobalsFeature) {
diff --git a/src/wasm/wasm-validator.cpp b/src/wasm/wasm-validator.cpp
index e295d3931..242e07c43 100644
--- a/src/wasm/wasm-validator.cpp
+++ b/src/wasm/wasm-validator.cpp
@@ -1526,10 +1526,10 @@ void FunctionValidator::visitDataDrop(DataDrop* curr) {
}
void FunctionValidator::visitMemoryCopy(MemoryCopy* curr) {
- shouldBeTrue(
- getModule()->features.hasBulkMemory(),
- curr,
- "Bulk memory operations require bulk memory [--enable-bulk-memory]");
+ shouldBeTrue(getModule()->features.hasBulkMemoryOpt(),
+ curr,
+ "memory.copy operations require bulk memory operations "
+ "[--enable-bulk-memory-opt]");
shouldBeEqualOrFirstIsUnreachable(
curr->type, Type(Type::none), curr, "memory.copy must have type none");
auto* destMemory = getModule()->getMemoryOrNull(curr->destMemory);
@@ -1561,9 +1561,9 @@ void FunctionValidator::visitMemoryCopy(MemoryCopy* curr) {
void FunctionValidator::visitMemoryFill(MemoryFill* curr) {
auto* memory = getModule()->getMemoryOrNull(curr->memory);
shouldBeTrue(
- getModule()->features.hasBulkMemory(),
+ getModule()->features.hasBulkMemoryOpt(),
curr,
- "Bulk memory operations require bulk memory [--enable-bulk-memory]");
+ "memory.fill operations require bulk memory [--enable-bulk-memory-opt]");
shouldBeEqualOrFirstIsUnreachable(
curr->type, Type(Type::none), curr, "memory.fill must have type none");
shouldBeEqualOrFirstIsUnreachable(
diff --git a/src/wasm/wasm.cpp b/src/wasm/wasm.cpp
index f5806b184..3e04f29ec 100644
--- a/src/wasm/wasm.cpp
+++ b/src/wasm/wasm.cpp
@@ -57,6 +57,8 @@ const char* MultiMemoryFeature = "multimemory";
const char* TypedContinuationsFeature = "typed-continuations";
const char* SharedEverythingFeature = "shared-everything";
const char* FP16Feature = "fp16";
+const char* BulkMemoryOptFeature = "bulk-memory-opt";
+const char* CallIndirectOverlongFeature = "call-indirect-overlong";
} // namespace CustomSections
} // namespace BinaryConsts
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-04 21:56:10 +0000