[EH] Add --experimental-new-eh option to wasm-opt (#6270)

This adds `--experimental-new-eh` option to `wasm-opt`. The difference
between this and `--translate-to-new-eh` is, `--translate-to-new-eh`
just runs `TranslateToNewEH` pass, while `--experimental-new-eh`
attaches `TranslateToNewEH` pass at the end of the whole optimization
pipeline. So if no other passes or optimization options (`-On`) are
specified, it is equivalent to `--translate-to-new-eh`. If other
optimization passes are specified, it runs them and at the end run the
translator to ensure the new EH instructions are emitted. The reason we
are doing this this way is that the optimization pipeline as a whole
does not support the new EH instruction yet, but we would like to
provide an option to emit a reasonably OK code with the new EH
instructions.

This also means when the optimization level > 3, it will also run
the StackIR + local2stack optimization after the translation.

Not sure how to test the output of this option, given that there is not
much point in testing the default optimization passes, and it is also
not clear how to print the stack IR if the stack ir generation and
optimization runs as a part of the pipeline and not the explicit command
line options.

This is created in favor of #6267, which added the option to
`optimization-options.h`. It had a problem of running the translator
multiple times when `-On` was given multiple times in the command line,
which I learned was rather a common usage. This adds the option directly
to `wasm-opt.cpp`, which avoids the problem. With this, it is still
possible to create and optimize Stack IR unnecessarily, but that feels a
better alternative.

1 files changed, 37 insertions, 2 deletions

diff --git a/src/tools/wasm-opt.cpp b/src/tools/wasm-opt.cpp
index 5bbca1ea6..0b0ea2cd4 100644
--- a/src/tools/wasm-opt.cpp
+++ b/src/tools/wasm-opt.cpp
@@ -92,6 +92,7 @@ int main(int argc, const char* argv[]) {
   std::string inputSourceMapFilename;
   std::string outputSourceMapFilename;
   std::string outputSourceMapUrl;
+  bool experimentalNewEH = false;
 
   const std::string WasmOptOption = "wasm-opt options";
 
@@ -240,7 +241,18 @@ int main(int argc, const char* argv[]) {
                     Options::Arguments::One,
                     [](Options* o, const std::string& argument) {
                       o->extra["infile"] = argument;
-                    });
+                    })
+    .add("--experimental-new-eh",
+         "",
+         "After running all requested transformations / optimizations, "
+         "translate the instruction to use the new EH instructions at the end. "
+         "Depending on the optimization level specified, this may do some more "
+         "post-translation optimizations.",
+         WasmOptOption,
+         Options::Arguments::Zero,
+         [&experimentalNewEH](Options*, const std::string&) {
+           experimentalNewEH = true;
+         });
   options.parse(argc, argv);
 
   Module wasm;
@@ -360,8 +372,11 @@ int main(int argc, const char* argv[]) {
     std::cout << "[extra-fuzz-command first output:]\n" << firstOutput << '\n';
   }
 
+  bool translateToNewEH =
+    wasm.features.hasExceptionHandling() && experimentalNewEH;
+
   if (!options.runningPasses()) {
-    if (!options.quiet) {
+    if (!options.quiet && !translateToNewEH) {
       std::cerr << "warning: no passes specified, not doing any work\n";
     }
   } else {
@@ -398,6 +413,26 @@ int main(int argc, const char* argv[]) {
     }
   }
 
+  if (translateToNewEH) {
+    BYN_TRACE("translating to new EH instructions...\n");
+    PassRunner runner(&wasm, options.passOptions);
+    runner.add("translate-to-new-eh");
+    // Perform Stack IR optimizations here, at the very end of the
+    // optimization pipeline.
+    if (options.passOptions.optimizeLevel >= 2 ||
+        options.passOptions.shrinkLevel >= 1) {
+      runner.addIfNoDWARFIssues("generate-stack-ir");
+      runner.addIfNoDWARFIssues("optimize-stack-ir");
+    }
+    runner.run();
+    if (options.passOptions.validate) {
+      bool valid = WasmValidator().validate(wasm, options.passOptions);
+      if (!valid) {
+        exitOnInvalidWasm("error after opts");
+      }
+    }
+  }
+
   if (fuzzExecAfter) {
     results.check(wasm);
   }