svf-tools 1.0.855 → 1.0.857

package/svf/include/MSSA/MemRegion.h

@@ -34,11 +34,11 @@
 #ifndef MEMORYREGION_H_
 #define MEMORYREGION_H_
 
-#include "SVFIR/SVFIR.h"
+#include "Graphs/ICFG.h"
 #include "Graphs/PTACallGraph.h"
-#include "Util/SCC.h"
+#include "Graphs/SCC.h"
+#include "SVFIR/SVFIR.h"
 #include "Util/WorkList.h"
-#include "Graphs/ICFG.h"
 
 #include <set>
 

package/svf/include/MTA/TCT.h

@@ -30,10 +30,10 @@
 #ifndef TCTNodeDetector_H_
 #define TCTNodeDetector_H_
 
-#include "Util/SCC.h"
-#include "Util/SVFUtil.h"
+#include "Graphs/SCC.h"
 #include "Graphs/ThreadCallGraph.h"
 #include "Util/CxtStmt.h"
+#include "Util/SVFUtil.h"
 #include <set>
 #include <vector>
 

package/svf/include/MemoryModel/PointerAnalysis.h

@@ -33,22 +33,21 @@
 #include <unistd.h>
 #include <signal.h>
 
-#include "SVFIR/SVFIR.h"
-#include "MemoryModel/ConditionalPT.h"
+#include "Graphs/CHG.h"
+#include "Graphs/PTACallGraph.h"
+#include "Graphs/SCC.h"
 #include "MemoryModel/AbstractPointsToDS.h"
+#include "MemoryModel/ConditionalPT.h"
 #include "MemoryModel/MutablePointsToDS.h"
 #include "MemoryModel/PersistentPointsToDS.h"
-#include "Graphs/PTACallGraph.h"
-#include "Graphs/CHG.h"
-#include "Util/SCC.h"
 #include "MemoryModel/PointsTo.h"
+#include "SVFIR/SVFIR.h"
 
 namespace SVF
 {
 
 class CommonCHGraph;
 
-class TypeSystem;
 class SVFModule;
 class ICFG;
 class PTAStat;
@@ -156,8 +155,6 @@ protected:
     ICFG* icfg;
     /// CHGraph
     CommonCHGraph *chgraph;
-    /// TypeSystem
-    TypeSystem *typeSystem;
 
 public:
     /// Get ICFG
@@ -433,12 +430,6 @@ public:
     virtual void resolveCPPIndCalls(const CallICFGNode* cs,
                                     const PointsTo& target,
                                     CallEdgeMap& newEdges);
-
-    /// get TypeSystem
-    const TypeSystem *getTypeSystem() const
-    {
-        return typeSystem;
-    }
 };
 
 } // End namespace SVF

package/svf/include/Util/SVFStat.h

@@ -70,6 +70,9 @@ public:
     /// Default call for getClk is unmarked, while MarkedClocksOnly is false by default.
     static double getClk(bool mark = false);
 
+    /// SVF's general statistics are only printed once even if you run multiple anayses
+    static bool printGeneralStats;
+
     NUMStatMap generalNumMap;
     NUMStatMap PTNumStatMap;
     TIMEStatMap timeStatMap;

package/svf/include/WPA/CSC.h

@@ -30,13 +30,13 @@
 #ifndef PROJECT_CSC_H
 #define PROJECT_CSC_H
 
-#include "Util/SCC.h"
-#include "SVFIR/SVFValue.h"    // for NodeBS
 #include "Graphs/ConsG.h"
+#include "Graphs/SCC.h"
+#include "SVFIR/SVFValue.h" // for NodeBS
 #include "Util/WorkList.h"
 #include <limits.h>
-#include <stack>
 #include <map>
+#include <stack>
 
 namespace SVF
 {

package/svf/lib/DDA/DDAStat.cpp

@@ -263,8 +263,8 @@ void DDAStat::performStat()
     PTNumStatMap["NumOfMustAA"] = _TotalNumOfMustAliases;
     PTNumStatMap["NumOfInfePath"] = _TotalNumOfInfeasiblePath;
     PTNumStatMap["NumOfStore"] = SVFIR::getPAG()->getPTASVFStmtSet(SVFStmt::Store).size();
-    PTNumStatMap["MemoryUsageVmrss"] = _vmrssUsageAfter - _vmrssUsageBefore;
-    PTNumStatMap["MemoryUsageVmsize"] = _vmsizeUsageAfter - _vmsizeUsageBefore;
+    timeStatMap["MemoryUsageVmrss"] = _vmrssUsageAfter - _vmrssUsageBefore;
+    timeStatMap["MemoryUsageVmsize"] = _vmsizeUsageAfter - _vmsizeUsageBefore;
 
     printStat();
 }

package/svf/lib/Graphs/SVFGStat.cpp

@@ -490,8 +490,7 @@ void SVFGStat::performSCCStat(SVFGEdgeSet insensitiveCalRetEdges)
     PTNumStatMap["InsenRetEdge"] = insensitiveRetEdge;
 
 
-    SVFUtil::outs() << "\n****SVFG SCC Stat****\n";
-    PTAStat::printStat();
+    PTAStat::printStat("SVFG SCC Stat");
 
     delete svfgSCC;
 
@@ -499,6 +498,5 @@ void SVFGStat::performSCCStat(SVFGEdgeSet insensitiveCalRetEdges)
 
 void SVFGStat::printStat(string str)
 {
-    SVFUtil::outs() << "\n****SVFG Statistics****\n";
-    PTAStat::printStat(str);
+    PTAStat::printStat("SVFG Statistics");
 }

package/svf/lib/MemoryModel/PointerAnalysis.cpp

@@ -68,7 +68,7 @@ const std::string PointerAnalysis::aliasTestFailNoAliasMangled  = "_Z20EXPECTEDF
  * Constructor
  */
 PointerAnalysis::PointerAnalysis(SVFIR* p, PTATY ty, bool alias_check) :
-    svfMod(nullptr),ptaTy(ty),stat(nullptr),ptaCallGraph(nullptr),callGraphSCC(nullptr),icfg(nullptr),chgraph(nullptr),typeSystem(nullptr)
+    svfMod(nullptr),ptaTy(ty),stat(nullptr),ptaCallGraph(nullptr),callGraphSCC(nullptr),icfg(nullptr),chgraph(nullptr)
 {
     pag = p;
     OnTheFlyIterBudgetForStat = Options::StatBudget();

package/svf/lib/Util/PTAStat.cpp

@@ -51,10 +51,11 @@ PTAStat::PTAStat(PointerAnalysis* p) : SVFStat(),
 
 void PTAStat::performStat()
 {
-    callgraphStat();
 
     SVFStat::performStat();
 
+    callgraphStat();
+
     SVFIR* pag = SVFIR::getPAG();
     for(SVFIR::iterator it = pag->begin(), eit = pag->end(); it!=eit; ++it)
     {
@@ -73,8 +74,8 @@ void PTAStat::performStat()
     u32_t vmsize = 0;
     SVFUtil::getMemoryUsageKB(&vmrss, &vmsize);
     setMemUsageAfter(vmrss, vmsize);
-    PTNumStatMap["MemoryUsageVmrss"] = _vmrssUsageAfter - _vmrssUsageBefore;
-    PTNumStatMap["MemoryUsageVmsize"] = _vmsizeUsageAfter - _vmsizeUsageBefore;
+    timeStatMap["MemoryUsageVmrss"] = _vmrssUsageAfter - _vmrssUsageBefore;
+    timeStatMap["MemoryUsageVmsize"] = _vmsizeUsageAfter - _vmsizeUsageBefore;
 }
 
 void PTAStat::callgraphStat()
@@ -128,7 +129,16 @@ void PTAStat::callgraphStat()
     PTNumStatMap["TotalEdge"] = totalEdge;
     PTNumStatMap["CalRetPairInCycle"] = edgeInCycle;
 
-    SVFStat::printStat("CallGraph Stats");
+    if(pta->getAnalysisTy() >= PointerAnalysis::PTATY::Andersen_BASE && pta->getAnalysisTy() <= PointerAnalysis::PTATY::Steensgaard_WPA)
+        SVFStat::printStat("CallGraph Stats (Andersen analysis)");
+    else if(pta->getAnalysisTy() >= PointerAnalysis::PTATY::FSDATAFLOW_WPA && pta->getAnalysisTy() <= PointerAnalysis::PTATY::FSCS_WPA)
+        SVFStat::printStat("CallGraph Stats (Flow-sensitive analysis)");
+    else if(pta->getAnalysisTy() >= PointerAnalysis::PTATY::CFLFICI_WPA && pta->getAnalysisTy() <= PointerAnalysis::PTATY::CFLFSCS_WPA)
+        SVFStat::printStat("CallGraph Stats (CFL-R analysis)");
+    else if(pta->getAnalysisTy() >= PointerAnalysis::PTATY::FieldS_DDA && pta->getAnalysisTy() <= PointerAnalysis::PTATY::Cxt_DDA)
+        SVFStat::printStat("CallGraph Stats (DDA analysis)");
+    else
+        SVFStat::printStat("CallGraph Stats");
 
     delete callgraphSCC;
 }

package/svf/lib/Util/SVFStat.cpp

@@ -36,7 +36,7 @@ using namespace std;
 double SVFStat::timeOfBuildingLLVMModule = 0;
 double SVFStat::timeOfBuildingSVFIR = 0;
 double SVFStat::timeOfBuildingSymbolTable = 0;
-
+bool SVFStat::printGeneralStats = true;
 
 SVFStat::SVFStat() : startTime(0), endTime(0)
 {
@@ -77,23 +77,28 @@ void SVFStat::printStat(string statname)
     SVFUtil::outs() << "################ (program : " << moduleName << ")###############\n";
     SVFUtil::outs().flags(std::ios::left);
     unsigned field_width = 20;
+
     for(NUMStatMap::iterator it = generalNumMap.begin(), eit = generalNumMap.end(); it!=eit; ++it)
     {
         // format out put with width 20 space
         std::cout << std::setw(field_width) << it->first << it->second << "\n";
     }
-    SVFUtil::outs() << "-------------------------------------------------------\n";
+
+    if(!timeStatMap.empty())
+        SVFUtil::outs() << "----------------Time and memory stats--------------------\n";
     for(TIMEStatMap::iterator it = timeStatMap.begin(), eit = timeStatMap.end(); it!=eit; ++it)
     {
         // format out put with width 20 space
         SVFUtil::outs() << std::setw(field_width) << it->first << it->second << "\n";
     }
+
+    if(!PTNumStatMap.empty())
+        SVFUtil::outs() << "----------------Numbers stats----------------------------\n";
     for(NUMStatMap::iterator it = PTNumStatMap.begin(), eit = PTNumStatMap.end(); it!=eit; ++it)
     {
         // format out put with width 20 space
         SVFUtil::outs() << std::setw(field_width) << it->first << it->second << "\n";
     }
-
     SVFUtil::outs() << "#######################################################" << std::endl;
     SVFUtil::outs().flush();
     generalNumMap.clear();
@@ -104,6 +109,10 @@ void SVFStat::printStat(string statname)
 void SVFStat::performStat()
 {
 
+    /// SVF's general statistics are only printed once even if you run multiple anayses
+    if(printGeneralStats == false)
+        return;
+
     SVFIR* pag = SVFIR::getPAG();
     u32_t numOfFunction = 0;
     u32_t numOfGlobal = 0;
@@ -199,6 +208,7 @@ void SVFStat::performStat()
 
     printStat("General Stats");
 
+    printGeneralStats = false;
 }
 
 

package/svf/lib/WPA/AndersenStat.cpp

@@ -181,8 +181,8 @@ void AndersenStat::constraintGraphStat()
 
 
     PTNumStatMap["NumOfCGNode"] = totalNodeNumber;
-    PTNumStatMap["TotalValidNode"] = cgNodeNumber;
-    PTNumStatMap["TotalValidObjNode"] = objNodeNumber;
+    PTNumStatMap["NumOfValidNode"] = cgNodeNumber;
+    PTNumStatMap["NumOfValidObjNode"] = objNodeNumber;
     PTNumStatMap["NumOfCGEdge"] = consCG->getLoadCGEdges().size() + consCG->getStoreCGEdges().size()
                                   + numOfCopys + numOfGeps;
     PTNumStatMap["NumOfAddrs"] =  consCG->getAddrCGEdges().size();
@@ -196,15 +196,13 @@ void AndersenStat::constraintGraphStat()
     PTNumStatMap["MaxOutLoadEdge"] = loadmaxOut;
     PTNumStatMap["MaxInStoreEdge"] = storemaxIn;
     PTNumStatMap["MaxOutStoreEdge"] = storemaxOut;
-    PTNumStatMap["AvgIn/OutStoreEdge"] = storeavgIn;
     PTNumStatMap["MaxInAddrEdge"] = addrmaxIn;
     PTNumStatMap["MaxOutAddrEdge"] = addrmaxOut;
+    timeStatMap["AvgIn/OutStoreEdge"] = storeavgIn;
     timeStatMap["AvgIn/OutCopyEdge"] = copyavgIn;
     timeStatMap["AvgIn/OutLoadEdge"] = loadavgIn;
     timeStatMap["AvgIn/OutAddrEdge"] = addravgIn;
     timeStatMap["AvgIn/OutEdge"] = avgIn;
-
-    PTAStat::printStat("Constraint Graph Stats");
 }
 /*!
  * Stat null pointers
@@ -352,9 +350,6 @@ void AndersenStat::performStat()
     PTNumStatMap["PointsToConstPtr"] = _NumOfConstantPtr;
     PTNumStatMap["PointsToBlkPtr"] = _NumOfBlackholePtr;
 
-    PTNumStatMap["MemoryUsageVmrss"] = _vmrssUsageAfter - _vmrssUsageBefore;
-    PTNumStatMap["MemoryUsageVmsize"] = _vmsizeUsageAfter - _vmsizeUsageBefore;
-
     PTAStat::printStat("Andersen Pointer Analysis Stats");
 }
 

package/svf/lib/WPA/FlowSensitiveStat.cpp

@@ -264,8 +264,7 @@ void FlowSensitiveStat::performStat()
     timeStatMap["AverageSCCSize"] = (fspta->numOfSCC == 0) ? 0 :
                                     ((double)fspta->numOfNodesInSCC / fspta->numOfSCC);
 
-    SVFUtil::outs() << "\n****Flow-Sensitive Pointer Analysis Statistics****\n";
-    PTAStat::printStat();
+    PTAStat::printStat("Flow-Sensitive Pointer Analysis Statistics");
 }
 
 void FlowSensitiveStat::statNullPtr()

package/svf/lib/WPA/VersionedFlowSensitiveStat.cpp

@@ -146,8 +146,7 @@ void VersionedFlowSensitiveStat::performStat()
     timeStatMap["AverageSCCSize"]   = (vfspta->numOfSCC == 0) ? 0 :
                                       ((double)vfspta->numOfNodesInSCC / vfspta->numOfSCC);
 
-    SVFUtil::outs() << "\n****Versioned Flow-Sensitive Pointer Analysis Statistics****\n";
-    PTAStat::printStat();
+    PTAStat::printStat("Versioned Flow-Sensitive Pointer Analysis Statistics");
 }
 
 void VersionedFlowSensitiveStat::versionStat(void)