optimized icfg's vertex and edge properties

Author: pdschubert

include/phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h

@@ -73,18 +73,18 @@ class LLVMBasedICFG
   // The VertexProperties for our call-graph.
   struct VertexProperties {
     const llvm::Function *F = nullptr;
-    std::string FName;
     VertexProperties() = default;
     VertexProperties(const llvm::Function *F);
+    std::string getFunctionName() const;    
   };
 
   // The EdgeProperties for our call-graph.
   struct EdgeProperties {
     const llvm::Instruction *CS = nullptr;
-    std::string IR;
     size_t ID = 0;
     EdgeProperties() = default;
     EdgeProperties(const llvm::Instruction *I);
+    std::string getCallSiteAsString() const;
   };
 
   /// Specify the type of graph to be used.
@@ -160,6 +160,44 @@ class LLVMBasedICFG
   using LLVMBasedCFG::print; // tell the compiler we wish to have both prints
   void print(std::ostream &OS = std::cout) const override;
 
+    // provide a VertexPropertyWrite to tell boost how to write a vertex
+  class CallGraphVertexWriter {
+  public:
+    CallGraphVertexWriter(const bidigraph_t &CGraph) : CGraph(CGraph) {}
+    template <class VertexOrEdge>
+    void operator()(std::ostream &out, const VertexOrEdge &v) const {
+      out << "[label=\"" << CGraph[v].getFunctionName() << "\"]";
+    }
+
+  private:
+    const bidigraph_t &CGraph;
+  };
+
+  // a function to conveniently create the vertex writer
+  CallGraphVertexWriter
+  makeCallGraphVertexWriter(const bidigraph_t &CGraph) const {
+    return CallGraphVertexWriter(CGraph);
+  }
+
+  // provide a EdgePropertyWrite to tell boost how to write an edge
+  class CallGraphEdgeWriter {
+  public:
+    CallGraphEdgeWriter(const bidigraph_t &CGraph) : CGraph(CGraph) {}
+    template <class VertexOrEdge>
+    void operator()(std::ostream &out, const VertexOrEdge &v) const {
+      out << "[label=\"" << CGraph[v].getCallSiteAsString() << "\"]";
+    }
+
+  private:
+    const bidigraph_t &CGraph;
+  };
+
+  // a function to conveniently create the edge writer
+  CallGraphEdgeWriter
+  makeCallGraphEdgeWriter(const bidigraph_t &CGraph) const {
+    return CallGraphEdgeWriter(CGraph);
+  }
+
   void printAsDot(std::ostream &OS = std::cout) const;
 
   void printInternalPTGAsDot(const std::string &filename);

include/phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h

@@ -82,10 +82,10 @@ class LLVMTypeHierarchy
   /// The type for edge representative objects.
   typedef boost::graph_traits<bidigraph_t>::edge_descriptor edge_t;
   // Let us have some further handy typedefs.
-  typedef boost::graph_traits<bidigraph_t>::vertex_iterator vertex_iterator_t;
+  typedef boost::graph_traits<bidigraph_t>::vertex_iterator vertex_iterator;
   typedef boost::graph_traits<bidigraph_t>::out_edge_iterator
-      out_edge_iterator_t;
-  typedef boost::graph_traits<bidigraph_t>::in_edge_iterator in_edge_iterator_t;
+      out_edge_iterator;
+  typedef boost::graph_traits<bidigraph_t>::in_edge_iterator in_edge_iterator;
 
 private:
   bidigraph_t TypeGraph;

lib/PhasarLLVM/ControlFlow/LLVMBasedICFG.cpp

@@ -66,13 +66,18 @@ struct LLVMBasedICFG::dependency_visitor : boost::default_dfs_visitor {
 };
 
 LLVMBasedICFG::VertexProperties::VertexProperties(const llvm::Function *F)
-    : F(F), FName(F->getName().str()) {}
+    : F(F) {}
+
+std::string LLVMBasedICFG::VertexProperties::getFunctionName() const {
+  return F->getName().str();
+}
 
 LLVMBasedICFG::EdgeProperties::EdgeProperties(const llvm::Instruction *I)
-    : CS(I),
-      // WARNING: Huge cost
-      //, ir_code(llvmIRToString(i)),
-      IR(""), ID(stoull(getMetaDataID(I))) {}
+    : CS(I), ID(stoull(getMetaDataID(I))) {}
+
+std::string LLVMBasedICFG::EdgeProperties::getCallSiteAsString() const {
+  return llvmIRToString(CS);
+}
 
 LLVMBasedICFG::LLVMBasedICFG(ProjectIRDB &IRDB, CallGraphAnalysisType CGType,
                              const std::set<std::string> &EntryPoints,
@@ -502,19 +507,22 @@ bool LLVMBasedICFG::isPrimitiveFunction(const string &name) {
 }
 
 void LLVMBasedICFG::print(ostream &OS) const {
-  cout << "Call Graph:\n";
-  boost::print_graph(
-      CallGraph, boost::get(&LLVMBasedICFG::VertexProperties::FName, CallGraph),
-      OS);
+  OS << "Call Graph:\n";
+  vertex_iterator ui, ui_end;
+  for (boost::tie(ui, ui_end) = boost::vertices(CallGraph); ui != ui_end;
+       ++ui) {
+    OS << CallGraph[*ui].getFunctionName() << " --> ";
+    out_edge_iterator ei, ei_end;
+    for (boost::tie(ei, ei_end) = boost::out_edges(*ui, CallGraph);
+         ei != ei_end; ++ei)
+      OS << CallGraph[target(*ei, CallGraph)].getFunctionName() << " ";
+    OS << '\n';
+  }
 }
 
 void LLVMBasedICFG::printAsDot(std::ostream &OS) const {
-  boost::write_graphviz(
-      OS, CallGraph,
-      boost::make_label_writer(
-          boost::get(&LLVMBasedICFG::VertexProperties::FName, CallGraph)),
-      boost::make_label_writer(
-          boost::get(&LLVMBasedICFG::EdgeProperties::IR, CallGraph)));
+  boost::write_graphviz(OS, CallGraph, makeCallGraphVertexWriter(CallGraph),
+                        makeCallGraphEdgeWriter(CallGraph));
 }
 
 void LLVMBasedICFG::printInternalPTGAsDot(const string &filename) {
@@ -534,12 +542,12 @@ nlohmann::json LLVMBasedICFG::getAsJson() const {
   // iterate all graph vertices
   for (boost::tie(vi_v, vi_v_end) = boost::vertices(CallGraph);
        vi_v != vi_v_end; ++vi_v) {
-    J[PhasarConfig::JsonCallGraphID()][CallGraph[*vi_v].FName];
+    J[PhasarConfig::JsonCallGraphID()][CallGraph[*vi_v].getFunctionName()];
     // iterate all out edges of vertex vi_v
     for (boost::tie(ei, ei_end) = boost::out_edges(*vi_v, CallGraph);
          ei != ei_end; ++ei) {
-      J[PhasarConfig::JsonCallGraphID()][CallGraph[*vi_v].FName] +=
-          CallGraph[boost::target(*ei, CallGraph)].FName;
+      J[PhasarConfig::JsonCallGraphID()][CallGraph[*vi_v].getFunctionName()] +=
+          CallGraph[boost::target(*ei, CallGraph)].getFunctionName();
     }
   }
   return J;

lib/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.cpp

@@ -341,11 +341,11 @@ bool LLVMTypeHierarchy::empty() const { return size() == 0; }
 
 void LLVMTypeHierarchy::print(std::ostream &OS) const {
   OS << "Type Hierarchy:\n";
-  vertex_iterator_t ui, ui_end;
+  vertex_iterator ui, ui_end;
   for (boost::tie(ui, ui_end) = boost::vertices(TypeGraph); ui != ui_end;
        ++ui) {
     OS << TypeGraph[*ui].getTypeName() << " --> ";
-    out_edge_iterator_t ei, ei_end;
+    out_edge_iterator ei, ei_end;
     for (boost::tie(ei, ei_end) = boost::out_edges(*ui, TypeGraph);
          ei != ei_end; ++ei)
       OS << TypeGraph[target(*ei, TypeGraph)].getTypeName() << " ";
@@ -362,8 +362,8 @@ void LLVMTypeHierarchy::print(std::ostream &OS) const {
 
 nlohmann::json LLVMTypeHierarchy::getAsJson() const {
   nlohmann::json J;
-  vertex_iterator_t vi_v, vi_v_end;
-  out_edge_iterator_t ei, ei_end;
+  vertex_iterator vi_v, vi_v_end;
+  out_edge_iterator ei, ei_end;
   // iterate all graph vertices
   for (boost::tie(vi_v, vi_v_end) = boost::vertices(TypeGraph);
        vi_v != vi_v_end; ++vi_v) {