svf-tools 1.0.289 → 1.0.293

package/lib/WPA/FlowSensitive.cpp

@@ -51,7 +51,27 @@ void FlowSensitive::initialize()
 
     stat = new FlowSensitiveStat(this);
 
+    // TODO: support clustered aux. Andersen's.
+    assert(!Options::ClusterAnder && "FlowSensitive::initialize: clustering auxiliary Andersen's unsupported.");
     ander = AndersenWaveDiff::createAndersenWaveDiff(getPAG());
+
+    // If cluster option is not set, it will give us a no-mapping points-to set.
+    assert(!(Options::ClusterFs && Options::PlainMappingFs)
+           && "FS::init: plain-mapping and cluster-fs are mutually exclusive.");
+    if (Options::ClusterFs)
+    {
+        cluster();
+        // Reset the points-to cache although empty so the new mapping could
+        // be applied to the inserted empty set.
+        getPtCache().reset();
+    }
+    else if (Options::PlainMappingFs)
+    {
+        plainMap();
+        // As above.
+        getPtCache().reset();
+    }
+
     // When evaluating ctir aliases, we want the whole SVFG.
     if(Options::OPTSVFG)
         svfg = Options::CTirAliasEval ? memSSA.buildFullSVFG(ander) : memSSA.buildPTROnlySVFG(ander);
@@ -130,6 +150,26 @@ void FlowSensitive::finalize()
         }
     }
 
+    // TODO: check -stat too.
+    if (Options::ClusterFs)
+    {
+        Map<std::string, std::string> stats;
+        const PTDataTy *ptd = getPTDataTy();
+        // TODO: should we use liveOnly?
+        Map<PointsTo, unsigned> allPts = ptd->getAllPts(true);
+        // TODO: parameterise final arg.
+        NodeIDAllocator::Clusterer::evaluate(*PointsTo::getCurrentBestNodeMapping(), allPts, stats, true);
+        NodeIDAllocator::Clusterer::printStats("post-main: best", stats);
+
+        // Do the same for the candidates. TODO: probably temporary for eval. purposes.
+        for (std::pair<hclust_fast_methods, std::vector<NodeID>> &candidate : candidateMappings)
+        {
+            // Can reuse stats, since we're always filling it with `evaluate`, it will always be overwritten.
+            NodeIDAllocator::Clusterer::evaluate(candidate.second, allPts, stats, true);
+            NodeIDAllocator::Clusterer::printStats("post-main: candidate " + SVFUtil::hclustMethodToString(candidate.first), stats);
+        }
+    }
+
     PointerAnalysis::finalize();
 }
 
@@ -750,6 +790,36 @@ bool FlowSensitive::propVarPtsAfterCGUpdated(NodeID var, const SVFGNode* src, co
     return false;
 }
 
+void FlowSensitive::cluster(void)
+{
+    std::vector<std::pair<unsigned, unsigned>> keys;
+    for (PAG::iterator pit = pag->begin(); pit != pag->end(); ++pit) keys.push_back(std::make_pair(pit->first, 1));
+
+    PointsTo::MappingPtr nodeMapping =
+        std::make_shared<std::vector<NodeID>>(NodeIDAllocator::Clusterer::cluster(ander, keys, candidateMappings, "aux-ander"));
+    PointsTo::MappingPtr reverseNodeMapping =
+        std::make_shared<std::vector<NodeID>>(NodeIDAllocator::Clusterer::getReverseNodeMapping(*nodeMapping));
+
+    PointsTo::setCurrentBestNodeMapping(nodeMapping, reverseNodeMapping);
+}
+
+void FlowSensitive::plainMap(void) const
+{
+    assert(Options::NodeAllocStrat == NodeIDAllocator::Strategy::DENSE
+           && "FS::cluster: plain mapping requires dense allocation strategy.");
+
+    const size_t numObjects = NodeIDAllocator::get()->getNumObjects();
+    PointsTo::MappingPtr plainMapping = std::make_shared<std::vector<NodeID>>(numObjects);
+    PointsTo::MappingPtr reversePlainMapping = std::make_shared<std::vector<NodeID>>(numObjects);
+    for (NodeID i = 0; i < plainMapping->size(); ++i)
+    {
+        plainMapping->at(i) = i;
+        reversePlainMapping->at(i) = i;
+    }
+
+    PointsTo::setCurrentBestNodeMapping(plainMapping, reversePlainMapping);
+}
+
 void FlowSensitive::printCTirAliasStats(void)
 {
     DCHGraph *dchg = SVFUtil::dyn_cast<DCHGraph>(chgraph);

package/lib/WPA/VersionedFlowSensitive.cpp

@@ -543,6 +543,26 @@ bool VersionedFlowSensitive::processStore(const StoreSVFGNode* store)
     return changed;
 }
 
+void VersionedFlowSensitive::cluster(void)
+{
+    std::vector<std::pair<unsigned, unsigned>> keys;
+    for (PAG::iterator pit = pag->begin(); pit != pag->end(); ++pit)
+    {
+        unsigned occ = 1;
+        unsigned v = pit->first;
+        if (Options::PredictPtOcc && pag->getObject(v) != nullptr) occ = stmtReliance[v].size() + 1;
+        assert(occ != 0);
+        keys.push_back(std::make_pair(v, occ));
+    }
+
+    PointsTo::MappingPtr nodeMapping =
+        std::make_shared<std::vector<NodeID>>(NodeIDAllocator::Clusterer::cluster(ander, keys, candidateMappings, "aux-ander"));
+    PointsTo::MappingPtr reverseNodeMapping =
+        std::make_shared<std::vector<NodeID>>(NodeIDAllocator::Clusterer::getReverseNodeMapping(*nodeMapping));
+
+    PointsTo::setCurrentBestNodeMapping(nodeMapping, reverseNodeMapping);
+}
+
 Version VersionedFlowSensitive::getVersion(const NodeID l, const NodeID o, VersionCache &cache, LocVersionMap &lvm)
 {
     if (cache.valid && l == cache.l)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.289",
+  "version": "1.0.293",
   "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": {