[llvm-commits] CVS: llvm/lib/CodeGen/MachineFunction.cpp

Reid Spencer reid at x10sys.com
Mon Jun 5 08:45:11 PDT 2006



Changes in directory llvm/lib/CodeGen:

MachineFunction.cpp updated: 1.92 -> 1.93
---
Log message:

For PR798: http://llvm.cs.uiuc.edu/PR798 :
Add support for Graphviz. Patch contributed by Anton Korobeynikov.


---
Diffs of the changes:  (+65 -14)

 MachineFunction.cpp |   79 ++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 65 insertions(+), 14 deletions(-)


Index: llvm/lib/CodeGen/MachineFunction.cpp
diff -u llvm/lib/CodeGen/MachineFunction.cpp:1.92 llvm/lib/CodeGen/MachineFunction.cpp:1.93
--- llvm/lib/CodeGen/MachineFunction.cpp:1.92	Tue May 16 00:55:30 2006
+++ llvm/lib/CodeGen/MachineFunction.cpp	Mon Jun  5 10:44:46 2006
@@ -27,6 +27,8 @@
 #include "llvm/Instructions.h"
 #include "llvm/Support/LeakDetector.h"
 #include "llvm/Support/GraphWriter.h"
+#include "llvm/System/Path.h"
+#include "llvm/System/Program.h"
 #include "llvm/Config/config.h"
 #include <fstream>
 #include <iostream>
@@ -218,7 +220,13 @@
 void MachineFunction::viewCFG() const
 {
 #ifndef NDEBUG
-  std::string Filename = "/tmp/cfg." + getFunction()->getName() + ".dot";
+  char pathsuff[9];
+
+  sprintf(pathsuff, "%06u", unsigned(rand()));
+
+  sys::Path TempDir = sys::Path::GetTemporaryDirectory();
+  sys::Path Filename = TempDir;
+  Filename.appendComponent("mf" + getFunction()->getName() + "." + pathsuff + ".dot");
   std::cerr << "Writing '" << Filename << "'... ";
   std::ofstream F(Filename.c_str());
 
@@ -231,34 +239,77 @@
   F.close();
   std::cerr << "\n";
 
-#ifdef HAVE_GRAPHVIZ
+#if HAVE_GRAPHVIZ
+  sys::Path Graphviz(LLVM_PATH_GRAPHVIZ);
+  std::vector<const char*> args;
+  args.push_back(Graphviz.c_str());
+  args.push_back(Filename.c_str());
+  args.push_back(0);
+  
   std::cerr << "Running 'Graphviz' program... " << std::flush;
-  if (system((LLVM_PATH_GRAPHVIZ " " + Filename).c_str())) {
+  if (sys::Program::ExecuteAndWait(Graphviz, &args[0])) {
     std::cerr << "Error viewing graph: 'Graphviz' not in path?\n";
   } else {
-    system(("rm " + Filename).c_str());
+    Filename.eraseFromDisk();
     return;
   }
-#endif  // HAVE_GRAPHVIZ
-
-#ifdef HAVE_GV
+#elif (HAVE_GV && HAVE_DOT)
+  sys::Path PSFilename = TempDir;
+  PSFilename.appendComponent(std::string("mf.tempgraph") + "." + pathsuff + ".ps");
+
+  sys::Path dot(LLVM_PATH_DOT);
+  std::vector<const char*> args;
+  args.push_back(dot.c_str());
+  args.push_back("-Tps");
+  args.push_back("-Nfontname=Courier");
+  args.push_back("-Gsize=7.5,10");
+  args.push_back(Filename.c_str());
+  args.push_back("-o");
+  args.push_back(PSFilename.c_str());
+  args.push_back(0);
+  
   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";
+  if (sys::Program::ExecuteAndWait(dot, &args[0])) {
+    std::cerr << "Error viewing graph: 'dot' not in path?\n";
   } else {
     std::cerr << "\n";
-    system("gv /tmp/cfg.tempgraph.ps");
+
+    sys::Path gv(LLVM_PATH_GV);
+    args.clear();
+    args.push_back(gv.c_str());
+    args.push_back(PSFilename.c_str());
+    args.push_back(0);
+    
+    sys::Program::ExecuteAndWait(gv, &args[0]);
   }
-  system(("rm " + Filename + " /tmp/cfg.tempgraph.ps").c_str());
+  Filename.eraseFromDisk();
+  PSFilename.eraseFromDisk();
   return;
-#endif  // HAVE_GV
+#elif HAVE_DOTTY
+  sys::Path dotty(LLVM_PATH_DOTTY);
+  std::vector<const char*> args;
+  args.push_back(dotty.c_str());
+  args.push_back(Filename.c_str());
+  args.push_back(0);
+  
+  std::cerr << "Running 'dotty' program... " << std::flush;
+  if (sys::Program::ExecuteAndWait(dotty, &args[0])) {
+    std::cerr << "Error viewing graph: 'dotty' not in path?\n";
+  } else {
+#ifndef __MINGW32__ // Dotty spawns another app and doesn't wait until it returns
+    Filename.eraseFromDisk();
+#endif
+    return;
+  }
+#endif
+
 #endif  // NDEBUG
   std::cerr << "MachineFunction::viewCFG is only available in debug builds on "
             << "systems with Graphviz or gv!\n";
 
 #ifndef NDEBUG
-  system(("rm " + Filename).c_str());
+  Filename.eraseFromDisk();
+  TempDir.eraseFromDisk(true);
 #endif
 }
 






More information about the llvm-commits mailing list