Fix reading/writing optimised SVFG from/to file; allow building optim…

…ised SVFG with SVFGBuilder
Johanmyst · Jun 18, 2024 · 3fb7a5e · 3fb7a5e
1 parent af24636
commit 3fb7a5e
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 5 deletions.
diff --git a/svf/include/Graphs/SVFGOPT.h b/svf/include/Graphs/SVFGOPT.h
@@ -81,9 +81,18 @@ class SVFGOPT : public SVFG
         keepContextSelfCycle = true;
     }
 
+    /// Optimised SVFGs aren't written to file; reads the full SVFG and optimises it
+    void readAndOptSVFG(const std::string &filename);
+
+    /// Shouldn't write optimised SVFG to file; writes the built SVFG to file before optimisation
+    void buildAndWriteSVFG(const std::string &filename);
+
 protected:
     void buildSVFG() override;
 
+    /// Separate function to optimise the SVFG to avoid duplicate code
+    void optimiseSVFG();
+
     /// Connect SVFG nodes between caller and callee for indirect call sites
     //@{
     inline void connectAParamAndFParam(const PAGNode* cs_arg, const PAGNode* fun_arg, const CallICFGNode*, CallSiteID csId, SVFGEdgeSetTy& edges) override

diff --git a/svf/include/MSSA/SVFGBuilder.h b/svf/include/MSSA/SVFGBuilder.h
@@ -49,7 +49,8 @@ class SVFGBuilder
     typedef SVFG::SVFGEdgeSetTy SVFGEdgeSet;
 
     /// Constructor
-    explicit SVFGBuilder(bool _SVFGWithIndCall = false): svfg(nullptr), SVFGWithIndCall(_SVFGWithIndCall) {}
+    explicit SVFGBuilder(bool _SVFGWithIndCall = false, bool _OptimiseSVFG = false)
+        : svfg(nullptr), SVFGWithIndCall(_SVFGWithIndCall), OptimiseSVFG(_OptimiseSVFG) {}
 
     /// Destructor
     virtual ~SVFGBuilder() = default;
@@ -91,6 +92,8 @@ class SVFGBuilder
     std::unique_ptr<SVFG> svfg;
     /// SVFG with precomputed indirect call edges
     bool SVFGWithIndCall;
+    /// Build optimised version of SVFG
+    bool OptimiseSVFG;
 };
 
 } // End namespace SVF

diff --git a/svf/lib/Graphs/SVFGOPT.cpp b/svf/lib/Graphs/SVFGOPT.cpp
@@ -43,11 +43,30 @@ static std::string KeepAllSelfCycle = "all";
 static std::string KeepContextSelfCycle = "context";
 static std::string KeepNoneSelfCycle = "none";
 
+/// Optimised SVFGs aren't written to file; reads the full SVFG and optimises it
+void SVFGOPT::readAndOptSVFG(const std::string &filename)
+{
+    SVFG::readFile(filename);
+    optimiseSVFG();
+}
+
+/// Shouldn't write optimised SVFG to file; writes the built SVFG to file before optimisation
+void SVFGOPT::buildAndWriteSVFG(const std::string &filename)
+{
+    SVFG::buildSVFG();
+    SVFG::writeToFile(filename);
+    optimiseSVFG();
+}
 
 void SVFGOPT::buildSVFG()
 {
     SVFG::buildSVFG();
+    optimiseSVFG();
+}
 
+/// Separate function to optimise the SVFG to avoid duplicate code
+void SVFGOPT::optimiseSVFG()
+{
     if(Options::DumpVFG())
         dump("SVFG_before_opt");
 
@@ -60,8 +79,8 @@ void SVFGOPT::buildSVFG()
 
     handleIntraValueFlow();
     stat->sfvgOptEnd();
-
 }
+
 /*!
  *
  */

diff --git a/svf/lib/MSSA/SVFGBuilder.cpp b/svf/lib/MSSA/SVFGBuilder.cpp
@@ -40,15 +40,18 @@ using namespace SVFUtil;
 
 SVFG* SVFGBuilder::buildPTROnlySVFG(BVDataPTAImpl* pta)
 {
-    if(Options::OPTSVFG())
+    if(Options::OPTSVFG() || this->OptimiseSVFG)
         return build(pta, VFG::PTRONLYSVFG_OPT);
     else
         return build(pta, VFG::PTRONLYSVFG);
 }
 
 SVFG* SVFGBuilder::buildFullSVFG(BVDataPTAImpl* pta)
 {
-    return build(pta, VFG::FULLSVFG);
+    if(Options::OPTSVFG() || this->OptimiseSVFG)
+        return build(pta, VFG::FULLSVFG_OPT);
+    else
+        return build(pta, VFG::FULLSVFG);
 }
 
 

diff --git a/svf/lib/MemoryModel/PointerAnalysis.cpp b/svf/lib/MemoryModel/PointerAnalysis.cpp
@@ -72,7 +72,7 @@ PointerAnalysis::PointerAnalysis(SVFIR* p, PTATY ty, bool alias_check) :
     OnTheFlyIterBudgetForStat = Options::StatBudget();
     print_stat = Options::PStat();
     ptaImplTy = BaseImpl;
-    alias_validation = (alias_check && Options::EnableAliasCheck());
+    alias_validation = (alias_check || Options::EnableAliasCheck());
 }
 
 /*!