svf-tools 1.0.561 → 1.0.564

package/SVF-doxygen/html/html/svf-ex_8cpp_source.html

@@ -122,7 +122,7 @@ $(function() {
 <div class="ttc" id="namespaceSVF_1_1LLVMUtil_html_accdd44093d6d145dc92edeaaff3f5732"><div class="ttname"><a href="namespaceSVF_1_1LLVMUtil.html#accdd44093d6d145dc92edeaaff3f5732">SVF::LLVMUtil::processArguments</a></div><div class="ttdeci">void processArguments(int argc, char **argv, int &amp;arg_num, char **arg_value, std::vector&lt; std::string &gt; &amp;moduleNameVec)</div><div class="ttdoc">Parse argument for multi-module analysis. </div><div class="ttdef"><b>Definition:</b> <a href="LLVMUtil_8cpp_source.html#l00436">LLVMUtil.cpp:436</a></div></div>
 <div class="ttc" id="classSVF_1_1PointsTo_html"><div class="ttname"><a href="classSVF_1_1PointsTo.html">SVF::PointsTo</a></div><div class="ttdef"><b>Definition:</b> <a href="PointsTo_8h_source.html#l00028">PointsTo.h:28</a></div></div>
 <div class="ttc" id="classSVF_1_1SVFIR_html"><div class="ttname"><a href="classSVF_1_1SVFIR.html">SVF::SVFIR</a></div><div class="ttdef"><b>Definition:</b> <a href="SVFIR_8h_source.html#l00043">SVFIR.h:43</a></div></div>
-<div class="ttc" id="classSVF_1_1SVFModule_html_aa03ab5272652290f30870c6e2d053d98"><div class="ttname"><a href="classSVF_1_1SVFModule.html#aa03ab5272652290f30870c6e2d053d98">SVF::SVFModule::buildSymbolTableInfo</a></div><div class="ttdeci">void buildSymbolTableInfo()</div><div class="ttdef"><b>Definition:</b> <a href="SVFModule_8cpp_source.html#l00030">SVFModule.cpp:30</a></div></div>
+<div class="ttc" id="classSVF_1_1SVFModule_html_aa03ab5272652290f30870c6e2d053d98"><div class="ttname"><a href="classSVF_1_1SVFModule.html#aa03ab5272652290f30870c6e2d053d98">SVF::SVFModule::buildSymbolTableInfo</a></div><div class="ttdeci">void buildSymbolTableInfo()</div><div class="ttdef"><b>Definition:</b> <a href="SVFModule_8cpp_source.html#l00031">SVFModule.cpp:31</a></div></div>
 <div class="ttc" id="classSVF_1_1SVFIR_html_aa1943d53e75aef9b014953143c6894da"><div class="ttname"><a href="classSVF_1_1SVFIR.html#aa1943d53e75aef9b014953143c6894da">SVF::SVFIR::getICFG</a></div><div class="ttdeci">ICFG * getICFG()</div><div class="ttdoc">Return ICFG. </div><div class="ttdef"><b>Definition:</b> <a href="SVFIR_8h_source.html#l00132">SVFIR.h:132</a></div></div>
 <div class="ttc" id="svf-ex_8cpp_html_af45b449c07f1c975eea45d40d1cc37f6"><div class="ttname"><a href="svf-ex_8cpp.html#af45b449c07f1c975eea45d40d1cc37f6">traverseOnICFG</a></div><div class="ttdeci">void traverseOnICFG(ICFG *icfg, const Instruction *inst)</div><div class="ttdef"><b>Definition:</b> <a href="svf-ex_8cpp_source.html#l00080">svf-ex.cpp:80</a></div></div>
 <div class="ttc" id="cJSON_8h_html_ad4c68ea99a26b0a98ad9a79982960458"><div class="ttname"><a href="cJSON_8h.html#ad4c68ea99a26b0a98ad9a79982960458">string</a></div><div class="ttdeci">const char *const string</div><div class="ttdef"><b>Definition:</b> <a href="cJSON_8h_source.html#l00172">cJSON.h:172</a></div></div>

package/SVF-doxygen/html/html/wpa_8cpp.html

@@ -154,7 +154,7 @@ Functions</h2></td></tr>
 <div class="fragment"><div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;{</div><div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;</div><div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;    <span class="keywordtype">int</span> arg_num = 0;</div><div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;    <span class="keywordtype">char</span> **arg_value = <span class="keyword">new</span> <span class="keywordtype">char</span>*[argc];</div><div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;    std::vector&lt;std::string&gt; moduleNameVec;</div><div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;    <a class="code" href="namespaceSVF_1_1LLVMUtil.html#accdd44093d6d145dc92edeaaff3f5732">LLVMUtil::processArguments</a>(argc, argv, arg_num, arg_value, moduleNameVec);</div><div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;    cl::ParseCommandLineOptions(arg_num, arg_value,</div><div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;                                <span class="stringliteral">&quot;Whole Program Points-to Analysis\n&quot;</span>);</div><div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;</div><div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;    <span class="keywordflow">if</span> (Options::WriteAnder == <span class="stringliteral">&quot;ir_annotator&quot;</span>)</div><div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;    {</div><div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;        LLVMModuleSet::getLLVMModuleSet()-&gt;preProcessBCs(moduleNameVec);</div><div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;    }</div><div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;</div><div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;    <a class="code" href="classSVF_1_1SVFModule.html">SVFModule</a>* svfModule = LLVMModuleSet::getLLVMModuleSet()-&gt;buildSVFModule(moduleNameVec);</div><div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;    svfModule-&gt;<a class="code" href="classSVF_1_1SVFModule.html#aa03ab5272652290f30870c6e2d053d98">buildSymbolTableInfo</a>();</div><div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;</div><div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;    <a class="code" href="classSVF_1_1WPAPass.html">WPAPass</a> *wpa = <span class="keyword">new</span> <a class="code" href="classSVF_1_1WPAPass.html">WPAPass</a>();</div><div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;    wpa-&gt;<a class="code" href="classSVF_1_1WPAPass.html#a394dcd976c1ef08d9cadcba8f5d07c75">runOnModule</a>(svfModule);</div><div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;</div><div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;    <span class="keywordflow">return</span> 0;</div><div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;}</div><div class="ttc" id="classSVF_1_1SVFModule_html"><div class="ttname"><a href="classSVF_1_1SVFModule.html">SVF::SVFModule</a></div><div class="ttdef"><b>Definition:</b> <a href="SVFModule_8h_source.html#l00041">SVFModule.h:41</a></div></div>
 <div class="ttc" id="classSVF_1_1WPAPass_html"><div class="ttname"><a href="classSVF_1_1WPAPass.html">SVF::WPAPass</a></div><div class="ttdef"><b>Definition:</b> <a href="WPAPass_8h_source.html#l00054">WPAPass.h:54</a></div></div>
 <div class="ttc" id="namespaceSVF_1_1LLVMUtil_html_accdd44093d6d145dc92edeaaff3f5732"><div class="ttname"><a href="namespaceSVF_1_1LLVMUtil.html#accdd44093d6d145dc92edeaaff3f5732">SVF::LLVMUtil::processArguments</a></div><div class="ttdeci">void processArguments(int argc, char **argv, int &amp;arg_num, char **arg_value, std::vector&lt; std::string &gt; &amp;moduleNameVec)</div><div class="ttdoc">Parse argument for multi-module analysis. </div><div class="ttdef"><b>Definition:</b> <a href="LLVMUtil_8cpp_source.html#l00436">LLVMUtil.cpp:436</a></div></div>
-<div class="ttc" id="classSVF_1_1SVFModule_html_aa03ab5272652290f30870c6e2d053d98"><div class="ttname"><a href="classSVF_1_1SVFModule.html#aa03ab5272652290f30870c6e2d053d98">SVF::SVFModule::buildSymbolTableInfo</a></div><div class="ttdeci">void buildSymbolTableInfo()</div><div class="ttdef"><b>Definition:</b> <a href="SVFModule_8cpp_source.html#l00030">SVFModule.cpp:30</a></div></div>
+<div class="ttc" id="classSVF_1_1SVFModule_html_aa03ab5272652290f30870c6e2d053d98"><div class="ttname"><a href="classSVF_1_1SVFModule.html#aa03ab5272652290f30870c6e2d053d98">SVF::SVFModule::buildSymbolTableInfo</a></div><div class="ttdeci">void buildSymbolTableInfo()</div><div class="ttdef"><b>Definition:</b> <a href="SVFModule_8cpp_source.html#l00031">SVFModule.cpp:31</a></div></div>
 <div class="ttc" id="classSVF_1_1WPAPass_html_a394dcd976c1ef08d9cadcba8f5d07c75"><div class="ttname"><a href="classSVF_1_1WPAPass.html#a394dcd976c1ef08d9cadcba8f5d07c75">SVF::WPAPass::runOnModule</a></div><div class="ttdeci">virtual void runOnModule(SVFModule *svfModule)</div><div class="ttdoc">Run pointer analysis on SVFModule. </div><div class="ttdef"><b>Definition:</b> <a href="WPAPass_8cpp_source.html#l00070">WPAPass.cpp:70</a></div></div>
 </div><!-- fragment -->
 </div>

package/SVF-doxygen/html/html/wpa_8cpp_source.html

@@ -76,7 +76,7 @@ $(function() {
 <div class="ttc" id="Options_8h_html"><div class="ttname"><a href="Options_8h.html">Options.h</a></div></div>
 <div class="ttc" id="namespaceSVF_html"><div class="ttname"><a href="namespaceSVF.html">SVF</a></div><div class="ttdoc">for isBitcode </div><div class="ttdef"><b>Definition:</b> <a href="CFGNormalizer_8h_source.html#l00035">CFGNormalizer.h:35</a></div></div>
 <div class="ttc" id="namespaceSVF_1_1LLVMUtil_html_accdd44093d6d145dc92edeaaff3f5732"><div class="ttname"><a href="namespaceSVF_1_1LLVMUtil.html#accdd44093d6d145dc92edeaaff3f5732">SVF::LLVMUtil::processArguments</a></div><div class="ttdeci">void processArguments(int argc, char **argv, int &amp;arg_num, char **arg_value, std::vector&lt; std::string &gt; &amp;moduleNameVec)</div><div class="ttdoc">Parse argument for multi-module analysis. </div><div class="ttdef"><b>Definition:</b> <a href="LLVMUtil_8cpp_source.html#l00436">LLVMUtil.cpp:436</a></div></div>
-<div class="ttc" id="classSVF_1_1SVFModule_html_aa03ab5272652290f30870c6e2d053d98"><div class="ttname"><a href="classSVF_1_1SVFModule.html#aa03ab5272652290f30870c6e2d053d98">SVF::SVFModule::buildSymbolTableInfo</a></div><div class="ttdeci">void buildSymbolTableInfo()</div><div class="ttdef"><b>Definition:</b> <a href="SVFModule_8cpp_source.html#l00030">SVFModule.cpp:30</a></div></div>
+<div class="ttc" id="classSVF_1_1SVFModule_html_aa03ab5272652290f30870c6e2d053d98"><div class="ttname"><a href="classSVF_1_1SVFModule.html#aa03ab5272652290f30870c6e2d053d98">SVF::SVFModule::buildSymbolTableInfo</a></div><div class="ttdeci">void buildSymbolTableInfo()</div><div class="ttdef"><b>Definition:</b> <a href="SVFModule_8cpp_source.html#l00031">SVFModule.cpp:31</a></div></div>
 <div class="ttc" id="classSVF_1_1WPAPass_html_a394dcd976c1ef08d9cadcba8f5d07c75"><div class="ttname"><a href="classSVF_1_1WPAPass.html#a394dcd976c1ef08d9cadcba8f5d07c75">SVF::WPAPass::runOnModule</a></div><div class="ttdeci">virtual void runOnModule(SVFModule *svfModule)</div><div class="ttdoc">Run pointer analysis on SVFModule. </div><div class="ttdef"><b>Definition:</b> <a href="WPAPass_8cpp_source.html#l00070">WPAPass.cpp:70</a></div></div>
 <div class="ttc" id="LLVMUtil_8h_html"><div class="ttname"><a href="LLVMUtil_8h.html">LLVMUtil.h</a></div></div>
 </div><!-- fragment --></div><!-- contents -->

package/include/DDA/DDAVFSolver.h

@@ -422,11 +422,11 @@ protected:
     {
         DPIm dpm(oldDpm);
         dpm.setLocVar(edge->getSrcNode(),ptr);
-        DOTIMESTAT(double start = DDAStat::getClk());
+        DOTIMESTAT(double start = DDAStat::getClk(true));
         /// handle context-/path- sensitivity
         if(handleBKCondition(dpm,edge)==false)
         {
-            DOTIMESTAT(ddaStat->_TotalTimeOfBKCondition += DDAStat::getClk() - start);
+            DOTIMESTAT(ddaStat->_TotalTimeOfBKCondition += DDAStat::getClk(true) - start);
             DBOUT(DDDA, SVFUtil::outs() << "\t!!! infeasible path svfgNode: " << edge->getDstID() << " --| " << edge->getSrcID() << "\n");
             DOSTAT(ddaStat->_NumOfInfeasiblePath++);
             return;
@@ -562,9 +562,9 @@ protected:
     {
         if (unionDDAPts(dpm, pts))
         {
-            DOSTAT(double start = DDAStat::getClk());
+            DOSTAT(double start = DDAStat::getClk(true));
             reCompute(dpm);
-            DOSTAT(ddaStat->_AnaTimeCyclePerQuery += DDAStat::getClk() - start);
+            DOSTAT(ddaStat->_AnaTimeCyclePerQuery += DDAStat::getClk(true) - start);
         }
     }
     virtual inline const CPtSet& getCachedTLPointsTo(const DPIm& dpm)

package/include/Util/PTAStat.h

@@ -48,95 +48,16 @@ class PointerAnalysis;
 class PTAStat: public SVFStat
 {
 public:
-    static const char* TotalAnalysisTime; ///< Total analysis time
-    static const char* SCCDetectionTime; ///< Total SCC detection time
-    static const char* SCCMergeTime; ///< Total SCC merge time
-
-    static const char* ProcessLoadStoreTime;///< time of processing loads and stores
-    static const char* ProcessCopyGepTime;	///< time of processing copys and geps
-    static const char* UpdateCallGraphTime;	///< time of updating call graph
-
-    static const char* TotalNumOfPointers;	///< Total SVFIR value node
-    static const char* TotalNumOfObjects;	///< Total SVFIR object node
-    static const char* TotalNumOfFieldObjects;	///< Total SVFIR field object node
-    static const char* MaxStructSize;	///< Max struct size
-    static const char* TotalNumOfEdges;	///< Total SVFIR edge number
-
-    static const char* NumOfAddrs;		///< SVFIR addr edge
-    static const char* NumOfLoads;		///< SVFIR load edge
-    static const char* NumOfStores;		///< SVFIR store edge
-    static const char* NumOfCopys;		///< SVFIR copy edge
-    static const char* NumOfGeps;		///< SVFIR gep edge
-    static const char* NumOfCalls;		///< SVFIR call edge
-    static const char* NumOfReturns;	///< SVFIR return edge
-
-    static const char* NumOfProcessedAddrs;		///< SVFIR processed addr edge
-    static const char* NumOfProcessedLoads;		///< SVFIR processed load edge
-    static const char* NumOfProcessedStores;	///< SVFIR processed store edge
-    static const char* NumOfProcessedCopys;		///< SVFIR processed copy edge
-    static const char* NumOfProcessedGeps;		///< SVFIR processed gep edge
-
-    static const char* NumOfSfr;                ///< num of field representatives
-    static const char* NumOfFieldExpand;
-
-    static const char* NumOfFunctionObjs;	///< Function numbers
-    static const char* NumOfGlobalObjs;	///< SVFIR global object node
-    static const char* NumOfHeapObjs;	///< SVFIR heap object node
-    static const char* NumOfStackObjs;	///< SVFIR stack object node
-
-    static const char* NumOfObjsHasVarStruct;	///< SVFIR object node has var struct (maybe nested with array)
-    static const char* NumOfObjsHasVarArray;	///< SVFIR object node has var array (maybe nested with struct)
-    static const char* NumOfObjsHasConstStruct;	///< SVFIR object node has const struct (maybe nested with array)
-    static const char* NumOfObjsHasConstArray;	///< SVFIR object node has const array (maybe nested with struct)
-    static const char* NumOfNonPtrObjs;	///< SVFIR object node which is non pointer type object (do not have pts)
-    static const char* NumOfConstantObjs;	///< SVFIR object node which is purely constant
-
-    static const char* NumberOfFieldInsensitiveObj;
-    static const char* NumberOfFieldSensitiveObj;
-
-    static const char* NumOfPointers;	///< SVFIR value node, each of them maps to a llvm value
-    static const char* NumOfGepFieldPointers;	///< SVFIR gep value node (field value, dynamically created dummy node)
-
-    static const char* NumOfMemObjects;	///< SVFIR object node, each of them maps to a llvm value
-    static const char* NumOfGepFieldObjects;	///< SVFIR gep object node (field obj, dynamically created dummy node)
-
-    static const char* AveragePointsToSetSize;		///< Average points-to size of all variables
-    static const char* AverageTopLevPointsToSetSize; ///< Average points-to size of top-level variables
-    static const char* MaxPointsToSetSize;			///< Max points-to size
-
-    static const char* NumOfIterations;	///< Number of iterations during resolution
-
-    static const char* NumOfIndirectCallSites;	///< Number of indirect callsites
-    static const char* NumOfIndirectEdgeSolved;	///< Number of indirect calledge resolved
-
-    static const char* NumOfSCCDetection; ///< Number of scc detection performed
-    static const char* NumOfCycles;   ///< Number of scc cycles detected
-    static const char* NumOfPWCCycles;   ///< Number of scc cycles detected
-    static const char* NumOfNodesInCycles; ///< Number of nodes in cycles detected
-    static const char* MaxNumOfNodesInSCC;	///< max Number of nodes in one scc
-
-    static const char* NumOfNullPointer;	///< Number of pointers points-to null
-
     PTAStat(PointerAnalysis* p);
     virtual ~PTAStat() {}
 
-    NUMStatMap PTNumStatMap;
     NodeBS localVarInRecursion;
 
-    double startTime;
-    double endTime;
-
     void performStat() override;
 
-    virtual void printStat(std::string str = "") override;
-
     void callgraphStat() override;
 private:
-    void bitcastInstStat();
-    void branchStat();
-
     PointerAnalysis* pta;
-    std::string moduleName;
 };
 
 } // End namespace SVF

package/include/Util/SVFStat.h

@@ -71,6 +71,7 @@ public:
     static double getClk(bool mark = false);
 
     NUMStatMap generalNumMap;
+    NUMStatMap PTNumStatMap;
     TIMEStatMap timeStatMap;
 
     double startTime;
@@ -78,7 +79,7 @@ public:
 
     virtual void performStat() = 0;
 
-    virtual void printStat(std::string str = "") = 0;
+    virtual void printStat(std::string str = "");
 
     virtual void performStatPerQuery(NodeID) {}
 
@@ -86,8 +87,12 @@ public:
 
     virtual void callgraphStat() {}
 
-private:
+    static double timeOfBuildingLLVMModule;
+    static double timeOfBuildingSymbolTable;
+    static double timeOfBuildingSVFIR;
 
+private:
+    void branchStat();
     std::string moduleName;
 }; // End class SVFStat
 

package/lib/MTA/LockAnalysis.cpp

@@ -591,12 +591,12 @@ bool LockAnalysis::isProtectedByCommonLock(const Instruction *i1, const Instruct
 {
     numOfTotalQueries++;
     bool commonlock = false;
-    DOTIMESTAT(double queryStart = PTAStat::getClk());
+    DOTIMESTAT(double queryStart = PTAStat::getClk(true));
     if (isInsideIntraLock(i1) && isInsideIntraLock(i2))
         commonlock = isProtectedByCommonCILock(i1,i2) ;
     else
         commonlock = isProtectedByCommonCxtLock(i1,i2);
-    DOTIMESTAT(double queryEnd = PTAStat::getClk());
+    DOTIMESTAT(double queryEnd = PTAStat::getClk(true));
     DOTIMESTAT(lockQueriesTime += (queryEnd - queryStart) / TIMEINTERVAL);
     return commonlock;
 }
@@ -667,7 +667,7 @@ bool LockAnalysis::isProtectedByCommonCxtLock(const Instruction *i1, const Instr
  */
 bool LockAnalysis::isInSameSpan(const Instruction *i1, const Instruction *i2)
 {
-    DOTIMESTAT(double queryStart = PTAStat::getClk());
+    DOTIMESTAT(double queryStart = PTAStat::getClk(true));
 
     bool sameSpan = false;
     if (isInsideIntraLock(i1) && isInsideIntraLock(i2))
@@ -675,7 +675,7 @@ bool LockAnalysis::isInSameSpan(const Instruction *i1, const Instruction *i2)
     else
         sameSpan = isInSameCSSpan(i1, i2);
 
-    DOTIMESTAT(double queryEnd = PTAStat::getClk());
+    DOTIMESTAT(double queryEnd = PTAStat::getClk(true));
     DOTIMESTAT(lockQueriesTime += (queryEnd - queryStart) / TIMEINTERVAL);
     return sameSpan;
 }

package/lib/MTA/MHP.cpp

@@ -627,9 +627,9 @@ bool MHP::mayHappenInParallel(const Instruction* i1, const Instruction* i2)
 {
     numOfTotalQueries++;
 
-    DOTIMESTAT(double queryStart = PTAStat::getClk());
+    DOTIMESTAT(double queryStart = PTAStat::getClk(true));
     bool mhp=mayHappenInParallelCache(i1,i2);
-    DOTIMESTAT(double queryEnd = PTAStat::getClk());
+    DOTIMESTAT(double queryEnd = PTAStat::getClk(true));
     DOTIMESTAT(interleavingQueriesTime += (queryEnd - queryStart) / TIMEINTERVAL);
 
     return mhp;

package/lib/SVF-FE/LLVMModule.cpp

@@ -83,6 +83,8 @@ SVFModule* LLVMModuleSet::buildSVFModule(Module &mod)
 
 SVFModule* LLVMModuleSet::buildSVFModule(const std::vector<std::string> &moduleNameVec)
 {
+    double startTime = SVFStat::getClk(true);
+
     assert(llvmModuleSet && "LLVM Module set needs to be created!");
 
     loadModules(moduleNameVec);
@@ -94,6 +96,9 @@ SVFModule* LLVMModuleSet::buildSVFModule(const std::vector<std::string> &moduleN
 
     build();
 
+    double endTime = SVFStat::getClk(true);
+    SVFStat::timeOfBuildingLLVMModule = (endTime - startTime)/TIMEINTERVAL;
+
     return svfModule;
 }
 

package/lib/SVF-FE/SVFIRBuilder.cpp

@@ -49,6 +49,7 @@ using namespace LLVMUtil;
  */
 SVFIR* SVFIRBuilder::build(SVFModule* svfModule)
 {
+    double startTime = SVFStat::getClk(true);
 
     // We read SVFIR from a user-defined txt instead of parsing SVFIR from LLVM IR
     if (SVFModule::pagReadFromTXT())
@@ -141,6 +142,10 @@ SVFIR* SVFIRBuilder::build(SVFModule* svfModule)
         LLVMLoopAnalysis loopAnalysis;
         loopAnalysis.build(pag->getICFG());
     }
+
+    double endTime = SVFStat::getClk(true);
+    SVFStat::timeOfBuildingSVFIR = (endTime - startTime)/TIMEINTERVAL;
+
     return pag;
 }
 
@@ -1281,6 +1286,27 @@ void SVFIRBuilder::handleExtCall(CallSite cs, const SVFFunction *callee)
                         else
                             writeWrnMsg("We need two valid NodeIDs and an offset to add a Gep edge");
                     }
+                    else if (op.getOperator() == "BinaryOPStmt")
+                    {
+                        if (op.getOperands().size() == 4)
+                            addBinaryOPEdge(op.getOperands()[0], op.getOperands()[1], op.getOperands()[2], op.getOperands()[3]);
+                        else
+                            writeWrnMsg("We need four valid NodeIDs to add a BinaryOP edge");
+                    }
+                    else if (op.getOperator() == "UnaryOPStmt")
+                    {
+                        if (op.getOperands().size() == 3)
+                            addUnaryOPEdge(op.getOperands()[0], op.getOperands()[1], op.getOperands()[2]);
+                        else
+                            writeWrnMsg("We need three valid NodeIDs to add a UnaryOP edge");
+                    }
+                    else if (op.getOperator() == "CmpStmt")
+                    {
+                        if (op.getOperands().size() == 4)
+                            addCmpEdge(op.getOperands()[0], op.getOperands()[1], op.getOperands()[2], op.getOperands()[3]);
+                        else
+                            writeWrnMsg("We need four valid NodeIDs to add a CmpStmt edge");
+                    }
                     else if (op.getOperator() == "memset_like")
                     {
                         // this is for memset(void *str, int c, size_t n)

package/lib/Util/ExtAPI.cpp

@@ -266,6 +266,48 @@ s32_t ExtAPI::getNodeIDType(std::string s)
         return -2;
     else if(argStr == "Obj")
         return -3;
+    else if(argStr == "Add")
+        return BinaryOperator::Add;
+    else if(argStr == "Sub")
+        return BinaryOperator::Sub;
+    else if(argStr == "Mul")
+        return BinaryOperator::Mul;
+    else if(argStr == "SDiv")
+        return BinaryOperator::SDiv;
+    else if(argStr == "SRem")
+        return BinaryOperator::SRem;
+    else if(argStr == "Xor")
+        return BinaryOperator::Xor;
+    else if(argStr == "And")
+        return BinaryOperator::And;
+    else if(argStr == "Or")
+        return BinaryOperator::Or;
+    else if(argStr == "AShr")
+        return BinaryOperator::AShr;
+    else if(argStr == "Shl")
+        return BinaryOperator::Shl;
+    else if(argStr == "ICMP_EQ")
+        return CmpInst::ICMP_EQ;
+    else if(argStr == "ICMP_NE")
+        return CmpInst::ICMP_NE;
+    else if(argStr == "ICMP_UGT")
+        return CmpInst::ICMP_UGT;
+    else if(argStr == "ICMP_SGT")
+        return CmpInst::ICMP_SGT;
+    else if(argStr == "ICMP_UGE")
+        return CmpInst::ICMP_UGE;
+    else if(argStr == "ICMP_SGE")
+        return CmpInst::ICMP_SGE;
+    else if(argStr == "ICMP_ULT")
+        return CmpInst::ICMP_ULT;
+    else if(argStr == "ICMP_SLT")
+        return CmpInst::ICMP_SLT;
+    else if(argStr == "ICMP_ULE")
+        return CmpInst::ICMP_ULE;
+    else if(argStr == "ICMP_SLE")
+        return CmpInst::ICMP_SLE;
+    else if(argStr == "FNeg")
+        return UnaryOperator::FNeg;
     else // offset
     {
         u32_t i=0;