Enhance the TD pass to build composite graphs when we have indirect call

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

diff --git a/lib/Analysis/CFGPrinter.cpp b/lib/Analysis/CFGPrinter.cpp
index 4d6819d4fa4d67c16cc22a57fab7ab6307e882bd..c19bbad55c61161e647d84cd554d5fc504640a65 100644 (file)
--- a/lib/Analysis/CFGPrinter.cpp
+++ b/lib/Analysis/CFGPrinter.cpp
@@ -17,14 +17,16 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "Support/GraphWriter.h"
-#include "llvm/Pass.h"
 #include "llvm/Function.h"
-#include "llvm/iTerminators.h"
+#include "llvm/Instructions.h"
+#include "llvm/Pass.h"
+#include "llvm/Analysis/CFGPrinter.h"
 #include "llvm/Assembly/Writer.h"
 #include "llvm/Support/CFG.h"
+#include "llvm/Support/GraphWriter.h"
 #include <sstream>
 #include <fstream>
+using namespace llvm;
 
 /// CFGOnly flag - This is used to control whether or not the CFG graph printer
 /// prints out the contents of basic blocks or not.  This is acceptable because
@@ -32,6 +34,7 @@
 ///
 static bool CFGOnly = false;
 
+namespace llvm {
 template<>
 struct DOTGraphTraits<const Function*> : public DefaultDOTGraphTraits {
   static std::string getGraphName(const Function *F) {
@@ -40,7 +43,8 @@ struct DOTGraphTraits<const Function*> : public DefaultDOTGraphTraits {
 
   static std::string getNodeLabel(const BasicBlock *Node,
                                   const Function *Graph) {
-    if (CFGOnly && !Node->getName().empty()) return Node->getName() + ":";
+    if (CFGOnly && !Node->getName().empty())
+      return Node->getName() + ":";
 
     std::ostringstream Out;
     if (CFGOnly) {
@@ -48,6 +52,11 @@ struct DOTGraphTraits<const Function*> : public DefaultDOTGraphTraits {
       return Out.str();
     }
 
+    if (Node->getName().empty()) {
+      WriteAsOperand(Out, Node, false, true);
+      Out << ":";
+    }
+
     Out << *Node;
     std::string OutStr = Out.str();
     if (OutStr[0] == '\n') OutStr.erase(OutStr.begin());
@@ -66,10 +75,6 @@ struct DOTGraphTraits<const Function*> : public DefaultDOTGraphTraits {
     return OutStr;
   }
 
-  static std::string getNodeAttributes(const BasicBlock *N) {
-    return "fontname=Courier";
-  }
-  
   static std::string getEdgeSourceLabel(const BasicBlock *Node,
                                         succ_const_iterator I) {
     // Label source of conditional branches with "T" or "F"
@@ -79,6 +84,7 @@ struct DOTGraphTraits<const Function*> : public DefaultDOTGraphTraits {
     return "";
   }
 };
+}
 
 namespace {
   struct CFGPrinter : public FunctionPass {
@@ -95,7 +101,7 @@ namespace {
       return false;
     }
 
-    void print(std::ostream &OS) const {}
+    void print(std::ostream &OS, const Module* = 0) const {}
     
     virtual void getAnalysisUsage(AnalysisUsage &AU) const {
       AU.setPreservesAll();
@@ -104,10 +110,26 @@ namespace {
 
   RegisterAnalysis<CFGPrinter> P1("print-cfg",
                                   "Print CFG of function to 'dot' file");
-};
-
 
+  struct CFGOnlyPrinter : public CFGPrinter {
+    virtual bool runOnFunction(Function &F) {
+      bool OldCFGOnly = CFGOnly;
+      CFGOnly = true;
+      CFGPrinter::runOnFunction(F);
+      CFGOnly = OldCFGOnly;
+      return false;
+    }
+    void print(std::ostream &OS, const Module* = 0) const {}
+    
+    virtual void getAnalysisUsage(AnalysisUsage &AU) const {
+      AU.setPreservesAll();
+    }
+  };
 
+  RegisterAnalysis<CFGOnlyPrinter>
+  P2("print-cfg-only",
+     "Print CFG of function to 'dot' file (with no function bodies)");
+}
 
 /// viewCFG - This function is meant for use from the debugger.  You can just
 /// say 'call F->viewCFG()' and a ghostview window should pop up from the
@@ -129,7 +151,8 @@ void Function::viewCFG() const {
   std::cerr << "\n";
 
   std::cerr << "Running 'dot' program... " << std::flush;
-  if (system(("dot -Tps " + Filename + " > /tmp/cfg.tempgraph.ps").c_str())) {
+  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";
@@ -148,3 +171,12 @@ void Function::viewCFGOnly() const {
   viewCFG();
   CFGOnly = false;
 }
+
+FunctionPass *llvm::createCFGPrinterPass () {
+  return new CFGPrinter();
+}
+
+FunctionPass *llvm::createCFGOnlyPrinterPass () {
+  return new CFGOnlyPrinter();
+}
+