Support setting pass main argument again with --pass-arg

WebAssembly · Jun 29, 2024 · e6334a3 · e6334a3
1 parent 01a3165
commit e6334a3
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 2 deletions.
diff --git a/src/pass.h b/src/pass.h
@@ -46,6 +46,7 @@ struct PassRegistry {
  registerTestPass(const char* name, const char* description, Creator create);
  std::unique_ptr<Pass> createPass(std::string name);
  std::vector<std::string> getRegisteredNames();
+ bool containsPass(const std::string& name);
  std::string getPassDescription(std::string name);
  bool isPassHidden(std::string name);
 

diff --git a/src/passes/pass.cpp b/src/passes/pass.cpp
@@ -73,6 +73,16 @@ std::vector<std::string> PassRegistry::getRegisteredNames() {
  return ret;
 }
 
+bool PassRegistry::containsPass(const std::string& name) {
+ for (auto& [passName, _] : passInfos) {
+ if (passName == name) {
+ return true;
+ }
+ }
+
+ return false;
+}
+
 std::string PassRegistry::getPassDescription(std::string name) {
  assert(passInfos.find(name) != passInfos.end());
  return passInfos[name].description;

diff --git a/src/tools/optimization-options.h b/src/tools/optimization-options.h
@@ -328,6 +328,27 @@ struct OptimizationOptions : public ToolOptions {
  }
  }
 
+ void addPassArg(const std::string& key, const std::string& value) override {
+ for (auto iPass = passes.rbegin(); iPass != passes.rend(); iPass++) {
+ if (iPass->name != key) {
+ continue;
+ }
+
+ if (iPass->argument.has_value()) {
+ Fatal() << iPass->name << " already set to " << *(iPass->argument);
+ }
+
+ iPass->argument = value;
+ return;
+ }
+
+ if (!PassRegistry::get()->containsPass(key)) {
+ return ToolOptions::addPassArg(key, value);
+ }
+
+ Fatal() << "can't set " << key << ": pass not enabled";
+ }
+
  bool runningDefaultOptimizationPasses() {
  for (auto& pass : passes) {
  if (pass.name == DEFAULT_OPT_PASSES) {

diff --git a/src/tools/tool-options.h b/src/tools/tool-options.h
@@ -139,7 +139,8 @@ struct ToolOptions : public Options {
  key = argument.substr(0, colon);
  value = argument.substr(colon + 1);
  }
- passOptions.arguments[key] = value;
+
+ addPassArg(key, value);
  })
  .add(
  "--closed-world",
@@ -213,6 +214,12 @@ struct ToolOptions : public Options {
  module.features.disable(disabledFeatures);
  }
 
+ virtual void addPassArg(const std::string& key, const std::string& value) {
+ passOptions.arguments[key] = value;
+ }
+
+ virtual ~ToolOptions() = default;
+
 private:
  FeatureSet enabledFeatures = FeatureSet::Default;
  FeatureSet disabledFeatures = FeatureSet::None;

diff --git a/test/lit/passes/extract-function.wast b/test/lit/passes/extract-function.wast
@@ -1,6 +1,8 @@
 ;; NOTE: Assertions have been generated by update_lit_checks.py --all-items and should not be edited.
 ;; RUN: foreach %s %t wasm-opt --extract-function=foo -S -o - | filecheck %s
+;; RUN: foreach %s %t wasm-opt --extract-function --pass-arg=extract-function@foo -S -o - | filecheck %s
 ;; RUN: foreach %s %t wasm-opt --extract-function-index=0 -S -o - | filecheck %s
+;; RUN: foreach %s %t wasm-opt --extract-function-index --pass-arg=extract-function-index@0 -S -o - | filecheck %s
 
 (module
  ;; CHECK: (type $0 (func))

diff --git a/test/passes/set-globals.passes b/test/passes/set-globals.passes
@@ -1 +1 @@
-set-globals=foo=1337,bar=42
+set-globals_pass-arg=set-globals@foo=1337,bar=42