Add feature flag for wide arithmetic

Author: stevenfontanella

src/binaryen-c.cpp

@@ -508,6 +508,9 @@ BinaryenFeatures BinaryenFeatureMultibyte(void) {
 BinaryenFeatures BinaryenFeatureCustomPageSizes(void) {
   return static_cast<BinaryenFeatures>(FeatureSet::CustomPageSizes);
 }
+BinaryenFeatures BinaryenFeatureWideArithmetic(void) {
+  return static_cast<BinaryenFeatures>(FeatureSet::WideArithmetic);
+}
 BinaryenFeatures BinaryenFeatureAll(void) {
   return static_cast<BinaryenFeatures>(FeatureSet::All);
 }

src/binaryen-c.h

@@ -246,6 +246,7 @@ BINARYEN_API BinaryenFeatures BinaryenFeatureCallIndirectOverlong(void);
 BINARYEN_API BinaryenFeatures BinaryenFeatureRelaxedAtomics(void);
 BINARYEN_API BinaryenFeatures BinaryenFeatureMultibyte(void);
 BINARYEN_API BinaryenFeatures BinaryenFeatureCustomPageSizes(void);
+BINARYEN_API BinaryenFeatures BinaryenFeatureWideArithmetic(void);
 BINARYEN_API BinaryenFeatures BinaryenFeatureAll(void);
 
 // Modules

src/js/binaryen.js-post.js

@@ -194,6 +194,7 @@ function initializeConstants() {
     'CallIndirectOverlong',
     'RelaxedAtomics',
     'CustomPageSizes',
+    'WideArithmetic',
     'All'
   ].forEach(name => {
     Module['Features'][name] = Module['_BinaryenFeature' + name]();

src/tools/tool-options.h

@@ -112,6 +112,7 @@ struct ToolOptions : public Options {
       .addFeature(FeatureSet::RelaxedAtomics,
                   "acquire/release atomic memory operations")
       .addFeature(FeatureSet::CustomPageSizes, "custom page sizes")
+      .addFeature(FeatureSet::WideArithmetic, "wide arithmetic")
       .add("--enable-typed-function-references",
            "",
            "Deprecated compatibility flag",

src/wasm-binary.h

@@ -474,6 +474,7 @@ extern const char* CustomDescriptorsFeature;
 extern const char* RelaxedAtomicsFeature;
 extern const char* MultibyteFeature;
 extern const char* CustomPageSizesFeature;
+extern const char* WideArithmeticFeature;
 
 enum Subsection {
   NameModule = 0,

src/wasm-features.h

@@ -58,11 +58,12 @@ struct FeatureSet {
     RelaxedAtomics = 1 << 22,
     CustomPageSizes = 1 << 23,
     Multibyte = 1 << 24,
+    WideArithmetic = 1 << 25,
     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 << 25) - 1,
+    All = (1 << 26) - 1,
   };
 
   static std::string toString(Feature f) {
@@ -117,6 +118,8 @@ struct FeatureSet {
         return "custom-page-sizes";
       case Multibyte:
         return "multibyte";
+      case WideArithmetic:
+        return "wide-arithmetic";
       case MVP:
       case Default:
       case All:
@@ -180,6 +183,7 @@ struct FeatureSet {
   bool hasRelaxedAtomics() const { return (features & RelaxedAtomics) != 0; }
   bool hasCustomPageSizes() const { return (features & CustomPageSizes) != 0; }
   bool hasMultibyte() const { return (features & Multibyte) != 0; }
+  bool hasWideArithmetic() const { return (features & WideArithmetic) != 0; }
   bool hasAll() const { return (features & All) != 0; }
 
   void set(FeatureSet f, bool v = true) {
@@ -208,6 +212,7 @@ struct FeatureSet {
   void setCustomDescriptors(bool v = true) { set(CustomDescriptors, v); }
   void setRelaxedAtomics(bool v = true) { set(RelaxedAtomics, v); }
   void setMultibyte(bool v = true) { set(Multibyte, v); }
+  void setWideArithmetic(bool v = true) { set(WideArithmetic, v); }
   void setMVP() { features = MVP; }
   void setAll() { features = All; }
 

src/wasm/wasm-binary.cpp

@@ -1486,6 +1486,8 @@ void WasmBinaryWriter::writeFeaturesSection() {
         return BinaryConsts::CustomSections::RelaxedAtomicsFeature;
       case FeatureSet::CustomPageSizes:
         return BinaryConsts::CustomSections::CustomPageSizesFeature;
+      case FeatureSet::WideArithmetic:
+        return BinaryConsts::CustomSections::WideArithmeticFeature;
       case FeatureSet::None:
       case FeatureSet::Default:
       case FeatureSet::All:
@@ -5446,6 +5448,8 @@ void WasmBinaryReader::readFeatures(size_t sectionPos, size_t payloadLen) {
       feature = FeatureSet::RelaxedAtomics;
     } else if (name == BinaryConsts::CustomSections::CustomPageSizesFeature) {
       feature = FeatureSet::CustomPageSizes;
+    } else if (name == BinaryConsts::CustomSections::WideArithmeticFeature) {
+      feature = FeatureSet::WideArithmetic;
     } else {
       // Silently ignore unknown features (this may be and old binaryen running
       // on a new wasm).

src/wasm/wasm.cpp

@@ -79,6 +79,7 @@ const char* CustomDescriptorsFeature = "custom-descriptors";
 const char* RelaxedAtomicsFeature = "relaxed-atomics";
 const char* MultibyteFeature = "multibyte";
 const char* CustomPageSizesFeature = "custom-page-sizes";
+const char* WideArithmeticFeature = "wide-arithmetic";
 
 } // namespace BinaryConsts::CustomSections
 

test/binaryen.js/kitchen-sink.js

@@ -102,6 +102,7 @@ function test_features() {
   console.log("Features.MultiMemory: " + binaryen.Features.MultiMemory);
   console.log("Features.RelaxedAtomics: " + binaryen.Features.RelaxedAtomics);
   console.log("Features.CustomPageSizes: " + binaryen.Features.CustomPageSizes);
+  console.log("Features.WideArithmetic: " + binaryen.Features.WideArithmetic);
   console.log("Features.All: " + binaryen.Features.All);
 }
 

test/binaryen.js/kitchen-sink.js.txt

@@ -35,7 +35,8 @@ Features.Strings: 16384
 Features.MultiMemory: 32768
 Features.RelaxedAtomics: 4194304
 Features.CustomPageSizes: 8388608
-Features.All: 33554431
+Features.WideArithmetic: 33554432
+Features.All: 67108863
 InvalidId: 0
 BlockId: 1
 IfId: 2