svf-tools 1.0.577 → 1.0.578

package/lib/CFL/CFLAlias.cpp

@@ -28,30 +28,18 @@
  */
 
 #include "CFL/CFLAlias.h"
-#include "Util/SVFBasicTypes.h"
 
 using namespace SVF;
 using namespace cppUtil;
 using namespace SVFUtil;
 
-u32_t CFLAlias::numOfProcessedAddr = 0;
-u32_t CFLAlias::numOfProcessedCopy = 0;
-u32_t CFLAlias::numOfProcessedGep = 0;
-u32_t CFLAlias::numOfProcessedLoad = 0;
-u32_t CFLAlias::numOfProcessedStore = 0;
-u32_t CFLAlias::numOfSfrs = 0;
-u32_t CFLAlias::numOfFieldExpand = 0;
-
-u32_t CFLAlias::numOfSCCDetection = 0;
-double CFLAlias::timeOfSCCDetection = 0;
-double CFLAlias::timeOfSCCMerges = 0;
-double CFLAlias::timeOfCollapse = 0;
-
-u32_t CFLAlias::AveragePointsToSetSize = 0;
-u32_t CFLAlias::MaxPointsToSetSize = 0;
-double CFLAlias::timeOfProcessCopyGep = 0;
-double CFLAlias::timeOfProcessLoadStore = 0;
-double CFLAlias::timeOfUpdateCallGraph = 0;
+u32_t CFLBase::AveragePointsToSetSize = 0;
+u32_t CFLBase::MaxPointsToSetSize = 0;
+double CFLBase::timeOfProcessCopyGep = 0;
+double CFLBase::timeOfProcessLoadStore = 0;
+double CFLBase::timeOfUpdateCallGraph = 0;
+double CFLBase::timeOfSolving = 0;
+double CFLBase::numOfSumEdges=0;
 
 /*!
  * On the fly call graph construction
@@ -193,9 +181,6 @@ void CFLAlias::heapAllocatorViaIndCall(CallSite cs)
  */
 bool CFLAlias::updateCallGraph(const CallSiteToFunPtrMap& callsites)
 {
-
-    // double cgUpdateStart = stat->getClk();
-
     CallEdgeMap newEdges;
     onTheFlyCallGraphSolve(callsites,newEdges);
     for(CallEdgeMap::iterator it = newEdges.begin(), eit = newEdges.end(); it!=eit; ++it )
@@ -203,65 +188,88 @@ bool CFLAlias::updateCallGraph(const CallSiteToFunPtrMap& callsites)
         CallSite cs = SVFUtil::getLLVMCallSite(it->first->getCallSite());
         for(FunctionSet::iterator cit = it->second.begin(), ecit = it->second.end(); cit!=ecit; ++cit)
         {
-            std::cout << cs.arg_size();
             connectCaller2CalleeParams(cs,*cit);
         }
     }
 
-    // double cgUpdateEnd = stat->getClk();
-    //timeOfUpdateCallGraph += (cgUpdateEnd - cgUpdateStart) / TIMEINTERVAL;
-
     return (!solver->isWorklistEmpty());
 }
 
-void CFLAlias::analyze()
+void CFLAlias::initialize()
 {
     stat = new CFLStat(this);
+
+    // Build CFL Grammar
     GrammarBuilder grammarBuilder = GrammarBuilder(Options::GrammarFilename);
-    CFGNormalizer normalizer = CFGNormalizer();
+    GrammarBase *grammarBase = grammarBuilder.build();
+
+
+    // Build CFL Graph
     AliasCFLGraphBuilder cflGraphBuilder = AliasCFLGraphBuilder();
-    CFLGramGraphChecker cflChecker = CFLGramGraphChecker();
-    if (Options::CFLGraph.empty())
+    if (Options::CFLGraph.empty()) // built from svfir
     {
         PointerAnalysis::initialize();
-        GrammarBase *grammarBase = grammarBuilder.build();
         ConstraintGraph *consCG = new ConstraintGraph(svfir);
         if (Options::PEGTransfer)
-        {
             graph = cflGraphBuilder.buildBiPEGgraph(consCG, grammarBase->getStartKind(), grammarBase, svfir);
-        }
         else
-        {
             graph = cflGraphBuilder.buildBigraph(consCG, grammarBase->getStartKind(), grammarBase);
-        }
-
-        cflChecker.check(grammarBase, &cflGraphBuilder, graph);
-        grammar = normalizer.normalize(grammarBase);
-        cflChecker.check(grammar, &cflGraphBuilder, graph);
         delete consCG;
-        delete grammarBase;
     }
     else
-    {
-        GrammarBase *grammarBase = grammarBuilder.build();
         graph = cflGraphBuilder.buildFromDot(Options::CFLGraph, grammarBase);
-        cflChecker.check(grammarBase, &cflGraphBuilder, graph);
-        grammar = normalizer.normalize(grammarBase);
-        cflChecker.check(grammar, &cflGraphBuilder, graph);
-        delete grammarBase;
-    }
+
+    // Check CFL Graph and Grammar are accordance with grammar
+    CFLGramGraphChecker cflChecker = CFLGramGraphChecker();
+    cflChecker.check(grammarBase, &cflGraphBuilder, graph);
+
+    // Normalize grammar
+    CFGNormalizer normalizer = CFGNormalizer();
+    grammar = normalizer.normalize(grammarBase);
+
     solver = new CFLSolver(graph, grammar);
-    solver->solve();
-    while (updateCallGraph(svfir->getIndirectCallsites()))
-        solver->solve();
+    delete grammarBase;
+}
+
+void CFLAlias::finalize()
+{
     if(Options::PrintCFL == true)
     {
-        svfir->dump("IR");
+        if (Options::CFLGraph.empty())
+            svfir->dump("IR");
         grammar->dump("Grammar");
         graph->dump("CFLGraph");
     }
     if (Options::CFLGraph.empty())
-    {
         PointerAnalysis::finalize();
+}
+
+void CFLAlias::analyze()
+{
+    initialize();
+
+    // Start solving
+    double start = stat->getClk(true);
+
+    solver->solve();
+    if (Options::CFLGraph.empty())
+    {
+        while (updateCallGraph(svfir->getIndirectCallsites()))
+            solver->solve();
+    } // Only cflgraph built from bc could reanlyze by update call graph
+
+    double end = stat->getClk(true);
+    timeOfSolving += (end - start) / TIMEINTERVAL;
+
+    finalize();
+}
+
+void CFLAlias::countSumEdges()
+{
+    numOfSumEdges = 0;
+    for(auto it = getCFLGraph()->getCFLEdges().begin(); it != getCFLGraph()->getCFLEdges().end(); it++ )
+    {
+        if ((*it)->getEdgeKind() == grammar->getStartKind())
+            numOfSumEdges++;
     }
 }

package/lib/CFL/CFLStat.cpp

@@ -44,11 +44,8 @@ const char* CFLStat::CollapseTime = "CollapseTime";
 /*!
  * Constructor
  */
-CFLStat::CFLStat(CFLAlias* p): PTAStat(p),pta(p)
+CFLStat::CFLStat(CFLBase* p): PTAStat(p),pta(p)
 {
-    _NumOfNullPtr = 0;
-    _NumOfConstantPtr= 0;
-    _NumOfBlackholePtr = 0;
     startClk();
 }
 
@@ -57,11 +54,10 @@ CFLStat::CFLStat(CFLAlias* p): PTAStat(p),pta(p)
  */
 void  CFLStat::collectCFLInfo(CFLGraph* CFLGraph)
 {
-    _NumOfCycles = 0;
-    _NumOfPWCCycles = 0;
-    _NumOfNodesInCycles = 0;
-    NodeSet repNodes;
-    repNodes.clear();
+    PTNumStatMap["NumOfNodes"] = CFLGraph->getTotalNodeNum();
+    PTNumStatMap["NumOfEdges"] = CFLGraph->getCFLEdges().size();
+
+    PTAStat::printStat("CFLGraph Stats");
 }
 
 
@@ -219,19 +215,15 @@ void CFLStat::statNullPtr()
  */
 void CFLStat::performStat()
 {
-
-    assert(SVFUtil::isa<CFLAlias>(pta) && "not an CFLAlias pass!! what else??");
+    assert((SVFUtil::isa<CFLAlias>(pta)||SVFUtil::isa<CFLVF>(pta)) && "not an CFLAlias pass!! what else??");
     endClk();
-    // SVFIR* pag = pta->getPAG();
+
     CFLGraph* CFLGraph = pta->getCFLGraph();
-    // collect cfl graph infor
     collectCFLInfo(CFLGraph);
-    // delete CFLGraph;
-    // collect constraint graph cycles
-    // collectCycleInfo(consCG);
-
-    // stat null ptr number
-    statNullPtr();
+    pta->countSumEdges();
+    timeStatMap["AnalysisTime"] = pta->timeOfSolving;
+    PTNumStatMap["SumEdges"] = pta->numOfSumEdges;
+    PTAStat::printStat("CFL-reachability analysis Stats");
 
     u32_t totalPointers = 0;
     u32_t totalTopLevPointers = 0;

package/lib/CFL/CFLVF.cpp

@@ -28,62 +28,67 @@
  */
 
 #include "CFL/CFLVF.h"
-#include "Util/SVFBasicTypes.h"
-#include "WPA/Andersen.h"
 
 using namespace SVF;
 using namespace cppUtil;
 using namespace SVFUtil;
 
-
-
-void CFLVF::analyze()
+void CFLVF::initialize()
 {
+    // Build CFL Grammar and Normalize
     GrammarBuilder grammarBuilder = GrammarBuilder(Options::GrammarFilename);
-    CFGNormalizer normalizer = CFGNormalizer();
+    GrammarBase *grammarBase = grammarBuilder.build();
+
+    // Build CFL Graph
     VFCFLGraphBuilder cflGraphBuilder = VFCFLGraphBuilder();
-    CFLGramGraphChecker cflChecker = CFLGramGraphChecker();
-    if (Options::CFLGraph.empty())
+    if (Options::CFLGraph.empty()) // built from svfir
     {
         PointerAnalysis::initialize();
-        GrammarBase *grammarBase = grammarBuilder.build();
         AndersenWaveDiff* ander = AndersenWaveDiff::createAndersenWaveDiff(pag);
         svfg =  memSSA.buildFullSVFG(ander);
-        ConstraintGraph *consCG = new ConstraintGraph(svfir);
-        if (Options::PEGTransfer)
-        {
-            graph = cflGraphBuilder.buildBiPEGgraph(consCG, grammarBase->getStartKind(), grammarBase, svfir);
-        }
-        else
-        {
-            graph = cflGraphBuilder.buildBigraph(svfg, grammarBase->getStartKind(), grammarBase);
-        }
-
-        cflChecker.check(grammarBase, &cflGraphBuilder, graph);
-        grammar = normalizer.normalize(grammarBase);
-        cflChecker.check(grammar, &cflGraphBuilder, graph);
-        delete consCG;
-        delete grammarBase;
+        graph = cflGraphBuilder.buildBigraph(svfg, grammarBase->getStartKind(), grammarBase);
     }
     else
-    {
-        GrammarBase *grammarBase = grammarBuilder.build();
         graph = cflGraphBuilder.buildFromDot(Options::CFLGraph, grammarBase);
-        cflChecker.check(grammarBase, &cflGraphBuilder, graph);
-        grammar = normalizer.normalize(grammarBase);
-        cflChecker.check(grammar, &cflGraphBuilder, graph);
-        delete grammarBase;
-    }
+
+    // Check CFL Graph and Grammar are accordance with grammar
+    CFLGramGraphChecker cflChecker = CFLGramGraphChecker();
+    cflChecker.check(grammarBase, &cflGraphBuilder, graph);
+
+    // Normalize grammar
+    CFGNormalizer normalizer = CFGNormalizer();
+    grammar = normalizer.normalize(grammarBase);
+
     solver = new CFLSolver(graph, grammar);
-    solver->solve();
+    delete grammarBase;
+}
+
+void CFLVF::finalize()
+{
     if(Options::PrintCFL == true)
     {
-        svfir->dump("IR");
+        if (Options::CFLGraph.empty())
+            svfir->dump("IR");
         grammar->dump("Grammar");
         graph->dump("CFLGraph");
     }
-    if (Options::CFLGraph.empty())
+}
+
+void CFLVF::analyze()
+{
+    initialize();
+
+    solver->solve();
+
+    finalize();
+}
+
+void CFLVF::countSumEdges()
+{
+    numOfSumEdges = 0;
+    for(auto it = getCFLGraph()->getCFLEdges().begin(); it != getCFLGraph()->getCFLEdges().end(); it++ )
     {
-        PointerAnalysis::finalize();
+        if ((*it)->getEdgeKind() == grammar->getStartKind())
+            numOfSumEdges++;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.577",
+  "version": "1.0.578",
   "description": "* <b>[TypeClone](https://github.com/SVF-tools/SVF/wiki/TypeClone) published in our [ECOOP paper](https://yuleisui.github.io/publications/ecoop20.pdf) is now available in SVF </b> * <b>SVF now uses a single script for its build. Just type [`source ./build.sh`](https://github.com/SVF-tools/SVF/blob/master/build.sh) in your terminal, that's it!</b> * <b>SVF now supports LLVM-10.0.0! </b> * <b>We thank [bsauce](https://github.com/bsauce) for writing a user manual of SVF ([link1](https://www.jianshu.com/p/068a08ec749c) and [link2](https://www.jianshu.com/p/777c30d4240e)) in Chinese </b> * <b>SVF now supports LLVM-9.0.0 (Thank [Byoungyoung Lee](https://github.com/SVF-tools/SVF/issues/142) for his help!). </b> * <b>SVF now supports a set of [field-sensitive pointer analyses](https://yuleisui.github.io/publications/sas2019a.pdf). </b> * <b>[Use SVF as an external lib](https://github.com/SVF-tools/SVF/wiki/Using-SVF-as-a-lib-in-your-own-tool) for your own project (Contributed by [Hongxu Chen](https://github.com/HongxuChen)). </b> * <b>SVF now supports LLVM-7.0.0. </b> * <b>SVF now supports Docker. [Try SVF in Docker](https://github.com/SVF-tools/SVF/wiki/Try-SVF-in-Docker)! </b> * <b>SVF now supports [LLVM-6.0.0](https://github.com/svf-tools/SVF/pull/38) (Contributed by [Jack Anthony](https://github.com/jackanth)). </b> * <b>SVF now supports [LLVM-4.0.0](https://github.com/svf-tools/SVF/pull/23) (Contributed by Jared Carlson. Thank [Jared](https://github.com/jcarlson23) and [Will](https://github.com/dtzWill) for their in-depth [discussions](https://github.com/svf-tools/SVF/pull/18) about updating SVF!) </b> * <b>SVF now supports analysis for C++ programs.</b> <br />",
   "main": "index.js",
   "scripts": {

package/tools/CFL/cfl.cpp

@@ -28,11 +28,9 @@
 
 
 #include "SVF-FE/LLVMUtil.h"
-#include "Util/Options.h"
+#include "SVF-FE/SVFIRBuilder.h"
 #include "CFL/CFLAlias.h"
 #include "CFL/CFLVF.h"
-#include "SVF-FE/SVFIRBuilder.h"
-#include "CFL/CFGNormalizer.h"
 
 using namespace llvm;
 using namespace SVF;
@@ -57,35 +55,24 @@ int main(int argc, char ** argv)
     {
         LLVMModuleSet::getLLVMModuleSet()->preProcessBCs(moduleNameVec);
     }
+
+    SVFIR* svfir = nullptr;
     if (Options::CFLGraph.empty())
     {
         SVFModule* svfModule = LLVMModuleSet::getLLVMModuleSet()->buildSVFModule(moduleNameVec);
         svfModule->buildSymbolTableInfo();
-
-        /// Build Program Assignment Graph (SVFIR)
         SVFIRBuilder builder;
-        SVFIR* svfir = builder.build(svfModule);
-        if (Options::CFLSVFG)
-        {
-            CFLVF* cflvf = new CFLVF(svfir);
-            cflvf->analyze();
-            delete cflvf;
-        }
-        else
-        {
-            CFLAlias* cflaa = new CFLAlias(svfir);
-            cflaa->analyze();
-            delete cflaa;
-        }
-    }
+        svfir = builder.build(svfModule);
+    }  // if no dot form CFLGraph is specified, we use svfir from .bc.
+
+    BVDataPTAImpl* cfl;
+    if (Options::CFLSVFG)
+        cfl = new CFLVF(svfir);
     else
-    {
-        SVFIR* svfir = nullptr;
-        CFLAlias* cflaa = new CFLAlias(svfir);
-        cflaa->analyze();
-        delete cflaa;
-    }
+        cfl = new CFLAlias(svfir); // if no svfg is specified, we use CFLAlias as the default one.
+    cfl->analyze();
 
+    delete cfl;
     SVFIR::releaseSVFIR();
     SVF::LLVMModuleSet::releaseLLVMModuleSet();