Replace existing pass

Author: stevenfontanella

src/passes/CMakeLists.txt

@@ -91,7 +91,6 @@ set(passes_SOURCES
   Precompute.cpp
   Print.cpp
   PrintBoundary.cpp
-  PrintCallGraph.cpp
   PrintFeatures.cpp
   PrintFunctionMap.cpp
   RoundTrip.cpp

src/passes/GlobalEffects.cpp

@@ -372,7 +372,7 @@ struct DiscardGlobalEffects : public Pass {
   }
 };
 
-struct GenerateCallGraph : public Pass {
+struct PrintCallGraph : public Pass {
   bool modifiesBinaryenIR() override { return false; }
 
   void run(Module* module) override {
@@ -385,7 +385,7 @@ struct GenerateCallGraph : public Pass {
     printCallGraph(callGraph, std::cout);
   }
 
-  private:
+private:
   std::string nodeToString(const CallGraphNode& node) {
     return std::visit(
       overloaded{[](Function* func) { return func->name.toString(); },
@@ -443,23 +443,20 @@ struct GenerateCallGraph : public Pass {
     }
     for (const auto& [callerName, callees] : sortedGraph) {
       for (const auto& [calleeName, style] : callees) {
-        o << "  \"" << callerName << "\" -> \"" << calleeName << "\""
-                  << style << ";\n";
+        o << "  \"" << callerName << "\" -> \"" << calleeName << "\"" << style
+          << ";\n";
       }
     }
     o << "}\n";
   }
-
 };
 
 } // namespace
 
+Pass* createPrintCallGraphPass() { return new PrintCallGraph(); }
+
 Pass* createGenerateGlobalEffectsPass() { return new GenerateGlobalEffects(); }
 
 Pass* createDiscardGlobalEffectsPass() { return new DiscardGlobalEffects(); }
 
-Pass* createGenerateCallGraphPass() { return new GenerateCallGraph(); }
-
-Pass* createPrintCallGraphPass() { return new GenerateCallGraph(); }
-
 } // namespace wasm

src/passes/PrintCallGraph.cpp

@@ -189,8 +189,6 @@ void PassRegistry::registerPasses() {
   registerPass("generate-global-effects",
                "generate global effect info (helps later passes)",
                createGenerateGlobalEffectsPass);
-  registerPass(
-    "generate-call-graph", "print call graph", createGenerateCallGraphPass);
   registerPass(
     "global-refining", "refine the types of globals", createGlobalRefiningPass);
   registerPass(

src/passes/pass.cpp

@@ -59,7 +59,6 @@ Pass* createFunctionMetricsPass();
 Pass* createGenerateDynCallsPass();
 Pass* createGenerateI64DynCallsPass();
 Pass* createGenerateGlobalEffectsPass();
-Pass* createGenerateCallGraphPass();
 Pass* createGlobalRefiningPass();
 Pass* createGlobalStructInferencePass();
 Pass* createGlobalStructInferenceDescCastPass();

src/passes/passes.h

@@ -163,8 +163,6 @@
 ;; CHECK-NEXT:
 ;; CHECK-NEXT:   --func-metrics                                reports function metrics
 ;; CHECK-NEXT:
-;; CHECK-NEXT:   --generate-call-graph                         print call graph
-;; CHECK-NEXT:
 ;; CHECK-NEXT:   --generate-dyncalls                           generate dynCall functions used
 ;; CHECK-NEXT:                                                 by emscripten ABI
 ;; CHECK-NEXT:

test/lit/help/wasm-metadce.test

@@ -199,8 +199,6 @@
 ;; CHECK-NEXT:
 ;; CHECK-NEXT:   --func-metrics                                reports function metrics
 ;; CHECK-NEXT:
-;; CHECK-NEXT:   --generate-call-graph                         print call graph
-;; CHECK-NEXT:
 ;; CHECK-NEXT:   --generate-dyncalls                           generate dynCall functions used
 ;; CHECK-NEXT:                                                 by emscripten ABI
 ;; CHECK-NEXT:

test/lit/help/wasm-opt.test

@@ -127,8 +127,6 @@
 ;; CHECK-NEXT:
 ;; CHECK-NEXT:   --func-metrics                                reports function metrics
 ;; CHECK-NEXT:
-;; CHECK-NEXT:   --generate-call-graph                         print call graph
-;; CHECK-NEXT:
 ;; CHECK-NEXT:   --generate-dyncalls                           generate dynCall functions used
 ;; CHECK-NEXT:                                                 by emscripten ABI
 ;; CHECK-NEXT:

test/lit/help/wasm2js.test

@@ -1,5 +1,5 @@
-;; RUN: foreach %s %t wasm-opt --generate-call-graph | filecheck %s
-;; RUN: foreach %s %t wasm-opt --generate-call-graph --closed-world | filecheck %s --check-prefix CLOSED
+;; RUN: foreach %s %t wasm-opt --print-call-graph | filecheck %s
+;; RUN: foreach %s %t wasm-opt --print-call-graph --closed-world | filecheck %s --check-prefix CLOSED
 
 (module
   (type $sig (func))