update pass pipeline. Rename Stringref -> Strings feature internally

Author: MaxGraey

src/compiler.ts

@@ -326,7 +326,7 @@ export class Options {
   setFeature(feature: Feature, on: bool = true): void {
     if (on) {
       // Enabling Stringref also enables GC
-      if (feature & Feature.Stringref) feature |= Feature.GC;
+      if (feature & Feature.Strings) feature |= Feature.GC;
       // Enabling GC also enables Reference Types
       if (feature & Feature.GC) feature |= Feature.ReferenceTypes;
       // Enabling Relaxed SIMD also enables SIMD
@@ -336,7 +336,7 @@ export class Options {
       // Disabling Reference Types also disables GC
       if (feature & Feature.ReferenceTypes) feature |= Feature.GC;
       // Disabling GC also disables Stringref
-      if (feature & Feature.GC) feature |= Feature.Stringref;
+      if (feature & Feature.GC) feature |= Feature.Strings;
       // Disabling SIMD also disables Relaxed SIMD
       if (feature & Feature.Simd) feature |= Feature.RelaxedSimd;
       this.features &= ~feature;
@@ -515,7 +515,7 @@ export class Compiler extends DiagnosticEmitter {
     if (options.hasFeature(Feature.Memory64)) featureFlags |= FeatureFlags.Memory64;
     if (options.hasFeature(Feature.RelaxedSimd)) featureFlags |= FeatureFlags.RelaxedSIMD;
     if (options.hasFeature(Feature.ExtendedConst)) featureFlags |= FeatureFlags.ExtendedConst;
-    if (options.hasFeature(Feature.Stringref)) featureFlags |= FeatureFlags.Stringref;
+    if (options.hasFeature(Feature.Strings)) featureFlags |= FeatureFlags.Strings;
     module.setFeatures(featureFlags);
 
     // set up the main start function

src/index-wasm.ts

@@ -201,7 +201,7 @@ export const FEATURE_RELAXED_SIMD = Feature.RelaxedSimd;
 /** Extended const expressions. */
 export const FEATURE_EXTENDED_CONST = Feature.ExtendedConst;
 /** String references. */
-export const FEATURE_STRINGREF = Feature.Stringref;
+export const FEATURE_STRINGREF = Feature.Strings;
 /** All features. */
 export const FEATURES_ALL = Feature.All;
 /** Default features. */

src/module.ts

@@ -210,7 +210,7 @@ export const enum FeatureFlags {
   Memory64 = 2048 /* _BinaryenFeatureMemory64 */,
   RelaxedSIMD = 4096 /* _BinaryenFeatureRelaxedSIMD */,
   ExtendedConst = 8192 /* _BinaryenFeatureExtendedConst */,
-  Stringref = 16384 /* _BinaryenFeatureStrings */,
+  Strings = 16384 /* _BinaryenFeatureStrings */,
   MultiMemory = 32768 /* _BinaryenFeatureMultiMemory */,
   StackSwitching = 65536 /* _BinaryenFeatureStackSwitching */,
   SharedEverything = 131072 /* _BinaryenFeatureSharedEverything */,
@@ -2689,6 +2689,12 @@ export class Module {
         passes.push("gufa-optimizing");
         passes.push("dae-optimizing");
       }
+      if (this.getFeatures() & FeatureFlags.MultiValue) {
+        // Optimize tuples before local opts (as splitting tuples can help local
+        // opts), but also not too early, as we want to be after
+        // optimize-instructions at least (which can remove tuple-related things).
+        passes.push("tuple-optimization");
+      }
       if (optimizeLevel >= 3) {
         passes.push("simplify-locals-nostructure");
         passes.push("flatten");
@@ -2822,6 +2828,12 @@ export class Module {
         passes.push("merge-blocks");
         passes.push("vacuum");
 
+        if (this.getFeatures() & FeatureFlags.Strings) {
+          // Gather strings to globals right before reorder-globals, which will then
+          // sort them properly.
+          passes.push("string-gathering");
+        }
+
         passes.push("simplify-globals-optimizing");
         passes.push("reorder-globals");
         passes.push("remove-unused-brs");

src/program.ts

@@ -390,9 +390,9 @@ export namespace OperatorKind {
       case Token.GreaterThan_GreaterThan_Equals: return OperatorKind.BitwiseShr;
       case Token.GreaterThan_GreaterThan_GreaterThan:
       case Token.GreaterThan_GreaterThan_GreaterThan_Equals: return OperatorKind.BitwiseShrU;
-      case Token.Equals_Equals: 
+      case Token.Equals_Equals:
       case Token.Equals_Equals_Equals: return OperatorKind.Eq;
-      case Token.Exclamation_Equals: 
+      case Token.Exclamation_Equals:
       case Token.Exclamation_Equals_Equals: return OperatorKind.Ne;
       case Token.GreaterThan: return OperatorKind.Gt;
       case Token.GreaterThan_Equals: return OperatorKind.Ge;
@@ -436,7 +436,7 @@ export class Program extends DiagnosticEmitter {
     diagnostics: DiagnosticMessage[] | null = null
   ) {
     super(diagnostics);
-    this.module = Module.create(options.stackSize > 0, options.sizeTypeRef);    
+    this.module = Module.create(options.stackSize > 0, options.sizeTypeRef);
     this.parser = new Parser(this.diagnostics, this.sources);
     this.resolver = new Resolver(this);
     let nativeFile = new File(this, Source.native);
@@ -1085,7 +1085,7 @@ export class Program extends DiagnosticEmitter {
     this.registerConstantInteger(CommonNames.ASC_FEATURE_EXTENDED_CONST, Type.bool,
       i64_new(options.hasFeature(Feature.ExtendedConst) ? 1 : 0, 0));
     this.registerConstantInteger(CommonNames.ASC_FEATURE_STRINGREF, Type.bool,
-      i64_new(options.hasFeature(Feature.Stringref) ? 1 : 0, 0));
+      i64_new(options.hasFeature(Feature.Strings) ? 1 : 0, 0));
 
     // remember deferred elements
     let queuedImports = new Array<QueuedImport>();
@@ -1300,7 +1300,7 @@ export class Program extends DiagnosticEmitter {
         this.registerWrapperClass(Type.array, CommonNames.RefArray);
         this.registerWrapperClass(Type.i31, CommonNames.RefI31);
       }
-      if (options.hasFeature(Feature.Stringref)) {
+      if (options.hasFeature(Feature.Strings)) {
         this.registerWrapperClass(Type.string, CommonNames.RefString);
       }
     }
@@ -1974,7 +1974,7 @@ export class Program extends DiagnosticEmitter {
       case TypeKind.StringviewWTF16:
       case TypeKind.StringviewIter: {
         return this.checkFeatureEnabled(Feature.ReferenceTypes, reportNode)
-            && this.checkFeatureEnabled(Feature.Stringref, reportNode);
+            && this.checkFeatureEnabled(Feature.Strings, reportNode);
       }
     }
     let classReference = type.getClass();

std/assembly/shared/feature.ts

@@ -33,7 +33,7 @@ export const enum Feature {
   /** Extended const expressions. */
   ExtendedConst = 1 << 13, // see: https://github.com/WebAssembly/extended-const
   /** Reference typed strings. */
-  Stringref = 1 << 14, // see: https://github.com/WebAssembly/stringref
+  Strings = 1 << 14, // see: https://github.com/WebAssembly/stringref
   /** All features. */
   All = (1 << 15) - 1
 }
@@ -55,7 +55,7 @@ export function featureToString(feature: Feature): string {
     case Feature.Memory64: return "memory64";
     case Feature.RelaxedSimd: return "relaxed-simd";
     case Feature.ExtendedConst: return "extended-const";
-    case Feature.Stringref: return "stringref";
+    case Feature.Strings: return "stringref";
   }
   assert(false);
   return "";