Add facility that allows LoopPass to re-insert a loop into

[oota-llvm.git] / lib / Analysis / CFGPrinter.cpp

diff --git a/lib/Analysis/CFGPrinter.cpp b/lib/Analysis/CFGPrinter.cpp
index 5a236f2bc3ee710c600f34fe6945de98daacfab3..a57a0685a7e7ae6863219194fd6db28786b0d225 100644 (file)
--- a/lib/Analysis/CFGPrinter.cpp
+++ b/lib/Analysis/CFGPrinter.cpp
@@ -23,8 +23,10 @@
 #include "llvm/Analysis/CFGPrinter.h"
 #include "llvm/Assembly/Writer.h"
 #include "llvm/Support/CFG.h"
+#include "llvm/Support/Compiler.h"
 #include "llvm/Support/GraphWriter.h"
 #include "llvm/Config/config.h"
+#include <iosfwd>
 #include <sstream>
 #include <fstream>
 using namespace llvm;
@@ -49,12 +51,12 @@ struct DOTGraphTraits<const Function*> : public DefaultDOTGraphTraits {
 
     std::ostringstream Out;
     if (CFGOnly) {
-      WriteAsOperand(Out, Node, false, true);
+      WriteAsOperand(Out, Node, false);
       return Out.str();
     }
 
     if (Node->getName().empty()) {
-      WriteAsOperand(Out, Node, false, true);
+      WriteAsOperand(Out, Node, false);
       Out << ":";
     }
 
@@ -88,17 +90,17 @@ struct DOTGraphTraits<const Function*> : public DefaultDOTGraphTraits {
 }
 
 namespace {
-  struct CFGPrinter : public FunctionPass {
+  struct VISIBILITY_HIDDEN CFGPrinter : public FunctionPass {
     virtual bool runOnFunction(Function &F) {
       std::string Filename = "cfg." + F.getName() + ".dot";
-      std::cerr << "Writing '" << Filename << "'...";
+      cerr << "Writing '" << Filename << "'...";
       std::ofstream File(Filename.c_str());
 
       if (File.good())
         WriteGraph(File, (const Function*)&F);
       else
-        std::cerr << "  error opening file for writing!";
-      std::cerr << "\n";
+        cerr << "  error opening file for writing!";
+      cerr << "\n";
       return false;
     }
 
@@ -109,10 +111,10 @@ namespace {
     }
   };
 
-  RegisterAnalysis<CFGPrinter> P1("print-cfg",
-                                  "Print CFG of function to 'dot' file");
+  RegisterPass<CFGPrinter> P1("print-cfg",
+                              "Print CFG of function to 'dot' file");
 
-  struct CFGOnlyPrinter : public CFGPrinter {
+  struct VISIBILITY_HIDDEN CFGOnlyPrinter : public CFGPrinter {
     virtual bool runOnFunction(Function &F) {
       bool OldCFGOnly = CFGOnly;
       CFGOnly = true;
@@ -127,7 +129,7 @@ namespace {
     }
   };
 
-  RegisterAnalysis<CFGOnlyPrinter>
+  RegisterPass<CFGOnlyPrinter>
   P2("print-cfg-only",
      "Print CFG of function to 'dot' file (with no function bodies)");
 }
@@ -138,49 +140,7 @@ namespace {
 /// being a 'dot' and 'gv' program in your path.
 ///
 void Function::viewCFG() const {
-#ifndef NDEBUG
-  std::string Filename = "/tmp/cfg." + getName() + ".dot";
-  std::cerr << "Writing '" << Filename << "'... ";
-  std::ofstream F(Filename.c_str());
-
-  if (!F.good()) {
-    std::cerr << "  error opening file for writing!\n";
-    return;
-  }
-
-  WriteGraph(F, this);
-  F.close();
-  std::cerr << "\n";
-
-#ifdef HAVE_GRAPHVIZ
-  std::cerr << "Running 'Graphviz' program... " << std::flush;
-  if (system((LLVM_PATH_GRAPHVIZ " " + Filename).c_str())) {
-    std::cerr << "Error viewing graph: 'Graphviz' not in path?\n";
-  } else {
-    system(("rm " + Filename).c_str());
-    return;
-  }
-#endif  // HAVE_GRAPHVIZ
-  
-#ifdef HAVE_GV
-  std::cerr << "Running 'dot' program... " << std::flush;
-  if (system(("dot -Tps -Nfontname=Courier -Gsize=7.5,10 " + Filename
-              + " > /tmp/cfg.tempgraph.ps").c_str())) {
-    std::cerr << "Error running dot: 'dot' not in path?\n";
-  } else {
-    std::cerr << "\n";
-    system("gv /tmp/cfg.tempgraph.ps");
-  }
-  system(("rm " + Filename + " /tmp/cfg.tempgraph.ps").c_str());
-  return;
-#endif  // HAVE_GV
-#endif  // NDEBUG
-  std::cerr << "Function::viewCFG is only available in debug builds on "
-            << "systems with Graphviz or gv!\n";
-
-#ifndef NDEBUG
-  system(("rm " + Filename).c_str());
-#endif
+  ViewGraph(this, "cfg" + getName());
 }
 
 /// viewCFGOnly - This function is meant for use from the debugger.  It works