svf-lib 1.0.704 → 1.0.708

package/SVF-linux/include/Graphs/SVFGStat.h

@@ -108,52 +108,52 @@ public:
 
     void dirVFEdgeStart()
     {
-        connectDirSVFGEdgeTimeStart = CLOCK_IN_MS();
+        connectDirSVFGEdgeTimeStart = PTAStat::getClk(true);
     }
 
     void dirVFEdgeEnd()
     {
-        connectDirSVFGEdgeTimeEnd = CLOCK_IN_MS();
+        connectDirSVFGEdgeTimeEnd = PTAStat::getClk(true);
     }
 
     void indVFEdgeStart()
     {
-        connectIndSVFGEdgeTimeStart = CLOCK_IN_MS();
+        connectIndSVFGEdgeTimeStart = PTAStat::getClk(true);
     }
 
     void indVFEdgeEnd()
     {
-        connectIndSVFGEdgeTimeEnd = CLOCK_IN_MS();
+        connectIndSVFGEdgeTimeEnd = PTAStat::getClk(true);
     }
 
     void TLVFNodeStart()
     {
-        addTopLevelNodeTimeStart = CLOCK_IN_MS();
+        addTopLevelNodeTimeStart = PTAStat::getClk(true);
     }
 
     void TLVFNodeEnd()
     {
-        addTopLevelNodeTimeEnd = CLOCK_IN_MS();
+        addTopLevelNodeTimeEnd = PTAStat::getClk(true);
     }
 
     void ATVFNodeStart()
     {
-        addAddrTakenNodeTimeStart = CLOCK_IN_MS();
+        addAddrTakenNodeTimeStart = PTAStat::getClk(true);
     }
 
     void ATVFNodeEnd()
     {
-        addAddrTakenNodeTimeEnd = CLOCK_IN_MS();
+        addAddrTakenNodeTimeEnd = PTAStat::getClk(true);
     }
 
     void sfvgOptStart()
     {
-        svfgOptTimeStart = CLOCK_IN_MS();
+        svfgOptTimeStart = PTAStat::getClk(true);
     }
 
     void sfvgOptEnd()
     {
-        svfgOptTimeEnd = CLOCK_IN_MS();
+        svfgOptTimeEnd = PTAStat::getClk(true);
     }
 
 private:

package/SVF-linux/include/MemoryModel/PTAStat.h

@@ -122,16 +122,22 @@ public:
 
     typedef Map<const char*,double> TIMEStatMap;
 
+    enum ClockType
+    {
+        Wall,
+        CPU,
+    };
+
     PTAStat(PointerAnalysis* p);
     virtual ~PTAStat() {}
 
     virtual inline void startClk()
     {
-        startTime = CLOCK_IN_MS();
+        startTime = getClk(true);
     }
     virtual inline void endClk()
     {
-        endTime = CLOCK_IN_MS();
+        endTime = getClk(true);
     }
     /// When mark is true, real clock is always returned. When mark is false, it is
     /// only returned when Options::MarkedClocksOnly is not set.

package/SVF-linux/include/Util/Options.h

@@ -5,6 +5,7 @@
 
 #include <sstream>
 #include "FastCluster/fastcluster.h"
+#include "MemoryModel/PTAStat.h"
 #include "MemoryModel/PointerAnalysisImpl.h"
 #include "Util/NodeIDAllocator.h"
 #include "MSSA/MemSSA.h"
@@ -19,6 +20,8 @@ class Options
 public:
     Options(void) = delete;
 
+    static const llvm::cl::opt<enum PTAStat::ClockType> ClockType;
+
     /// If set, only return the clock when getClk is called as getClk(true).
     /// Retrieving the clock is slow but it should be fine for a few calls.
     /// This is good for benchmarking when we don't need to know how long processLoad

package/SVF-linux/include/WPA/WPASolver.h

@@ -82,8 +82,7 @@ protected:
     inline void setGraph(GraphType g)
     {
         _graph = g;
-        if(!scc)
-            scc = new SCC(_graph);
+        scc = new SCC(_graph);
     }
     //@}
 

package/SVF-osx/include/Graphs/SVFGStat.h

@@ -108,52 +108,52 @@ public:
 
     void dirVFEdgeStart()
     {
-        connectDirSVFGEdgeTimeStart = CLOCK_IN_MS();
+        connectDirSVFGEdgeTimeStart = PTAStat::getClk(true);
     }
 
     void dirVFEdgeEnd()
     {
-        connectDirSVFGEdgeTimeEnd = CLOCK_IN_MS();
+        connectDirSVFGEdgeTimeEnd = PTAStat::getClk(true);
     }
 
     void indVFEdgeStart()
     {
-        connectIndSVFGEdgeTimeStart = CLOCK_IN_MS();
+        connectIndSVFGEdgeTimeStart = PTAStat::getClk(true);
     }
 
     void indVFEdgeEnd()
     {
-        connectIndSVFGEdgeTimeEnd = CLOCK_IN_MS();
+        connectIndSVFGEdgeTimeEnd = PTAStat::getClk(true);
     }
 
     void TLVFNodeStart()
     {
-        addTopLevelNodeTimeStart = CLOCK_IN_MS();
+        addTopLevelNodeTimeStart = PTAStat::getClk(true);
     }
 
     void TLVFNodeEnd()
     {
-        addTopLevelNodeTimeEnd = CLOCK_IN_MS();
+        addTopLevelNodeTimeEnd = PTAStat::getClk(true);
     }
 
     void ATVFNodeStart()
     {
-        addAddrTakenNodeTimeStart = CLOCK_IN_MS();
+        addAddrTakenNodeTimeStart = PTAStat::getClk(true);
     }
 
     void ATVFNodeEnd()
     {
-        addAddrTakenNodeTimeEnd = CLOCK_IN_MS();
+        addAddrTakenNodeTimeEnd = PTAStat::getClk(true);
     }
 
     void sfvgOptStart()
     {
-        svfgOptTimeStart = CLOCK_IN_MS();
+        svfgOptTimeStart = PTAStat::getClk(true);
     }
 
     void sfvgOptEnd()
     {
-        svfgOptTimeEnd = CLOCK_IN_MS();
+        svfgOptTimeEnd = PTAStat::getClk(true);
     }
 
 private:

package/SVF-osx/include/MemoryModel/PTAStat.h

@@ -122,16 +122,22 @@ public:
 
     typedef Map<const char*,double> TIMEStatMap;
 
+    enum ClockType
+    {
+        Wall,
+        CPU,
+    };
+
     PTAStat(PointerAnalysis* p);
     virtual ~PTAStat() {}
 
     virtual inline void startClk()
     {
-        startTime = CLOCK_IN_MS();
+        startTime = getClk(true);
     }
     virtual inline void endClk()
     {
-        endTime = CLOCK_IN_MS();
+        endTime = getClk(true);
     }
     /// When mark is true, real clock is always returned. When mark is false, it is
     /// only returned when Options::MarkedClocksOnly is not set.

package/SVF-osx/include/Util/Options.h

@@ -5,6 +5,7 @@
 
 #include <sstream>
 #include "FastCluster/fastcluster.h"
+#include "MemoryModel/PTAStat.h"
 #include "MemoryModel/PointerAnalysisImpl.h"
 #include "Util/NodeIDAllocator.h"
 #include "MSSA/MemSSA.h"
@@ -19,6 +20,8 @@ class Options
 public:
     Options(void) = delete;
 
+    static const llvm::cl::opt<enum PTAStat::ClockType> ClockType;
+
     /// If set, only return the clock when getClk is called as getClk(true).
     /// Retrieving the clock is slow but it should be fine for a few calls.
     /// This is good for benchmarking when we don't need to know how long processLoad

package/SVF-osx/include/WPA/WPASolver.h

@@ -82,8 +82,7 @@ protected:
     inline void setGraph(GraphType g)
     {
         _graph = g;
-        if(!scc)
-            scc = new SCC(_graph);
+        scc = new SCC(_graph);
     }
     //@}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-lib",
-  "version": "1.0.704",
+  "version": "1.0.708",
   "description": "SVF's npm support",
   "main": "index.js",
   "scripts": {