add race checker

svf-llvm/tools/SABER/saber.cpp

@@ -39,24 +39,6 @@
 using namespace llvm;
 using namespace SVF;
 
-static Option<bool> LEAKCHECKER(
-    "leak",
-    "Memory Leak Detection",
-    false
-);
-
-static Option<bool> FILECHECKER(
-    "fileck",
-    "File Open/Close Detection",
-    false
-);
-
-static Option<bool> DFREECHECKER(
-    "dfree",
-    "Double Free Detection",
-    false
-);
-
 int main(int argc, char ** argv)
 {
 
@@ -77,11 +59,11 @@ int main(int argc, char ** argv)
 
     std::unique_ptr<LeakChecker> saber;
 
-    if(LEAKCHECKER())
+    if(Options::MemoryLeakCheck())
         saber = std::make_unique<LeakChecker>();
-    else if(FILECHECKER())
+    else if(Options::FileCheck())
         saber = std::make_unique<FileChecker>();
-    else if(DFREECHECKER())
+    else if(Options::DFreeCheck())
         saber = std::make_unique<DoubleFreeChecker>();
     else
         saber = std::make_unique<LeakChecker>();  // if no checker is specified, we use leak checker as the default one.

svf/include/Util/Options.h

@@ -267,8 +267,16 @@ class Options
     static const Option<u32_t> Timeout;
     /// bug info output file, Default: output.db
     static const Option<std::string> OutputName;
-    /// open buffer overflow checker, Default: false
+    /// buffer overflow checker, Default: false
     static const Option<bool> BufferOverflowCheck;
+    /// memory leak check, Default: false
+    static const Option<bool> MemoryLeakCheck;
+    /// file open close checker, Default: false
+    static const Option<bool> FileCheck;
+    /// double free checker, Default: false
+    static const Option<bool> DFreeCheck;
+    /// data race checker, Default: false
+    static const Option<bool> RaceCheck;
     /// if the access index of gepstmt is unknown, skip it, Default: false
     static const Option<bool> GepUnknownIdx;
     static const Option<bool> RunUncallFuncs;

svf/lib/MTA/MTA.cpp

@@ -64,8 +64,8 @@
     mhp = computeMHP(pag->getModule());
     lsa = computeLocksets(mhp->getTCT());
 
-
-
+    if(Options::RaceCheck())
+        detect(pag->getModule());
     /*
     if (Options::AndersenAnno()) {
         pta = mhp->getTCT()->getPTA();
@@ -157,9 +157,9 @@
 }
 
 ///*!
-// * Check   (1) write-write race
-// * 		 (2) write-read race
-// * 		 (3) read-read race
+// * Check   (1) write-read race
+// * 		 (2) write-write race (optional)
+// * 		 (3) read-read race (optional)
 // * when two memory access may-happen in parallel and are not protected by the same lock
 // * (excluding global constraints because they are initialized before running the main function)
 // */
@@ -168,9 +168,10 @@
 
     DBOUT(DGENERAL, outs() << pasMsg("Starting Race Detection\n"));
 
-    LoadSet loads;
-    StoreSet stores;
+    Set<const LoadStmt*> loads;
+    Set<const StoreStmt*> stores;
     SVFIR* pag = SVFIR::getPAG();
+    PointerAnalysis* pta = AndersenWaveDiff::createAndersenWaveDiff(pag);
 
     Set<const SVFInstruction*> needcheckinst;
     // Add symbols for all of the functions and the instructions in them.
@@ -181,37 +182,33 @@
         {
             for (const SVFInstruction* svfInst : svfbb->getInstructionList())
             {
-
                 for(const SVFStmt* stmt : pag->getSVFStmtList(pag->getICFG()->getICFGNode(svfInst)))
                 {
-                    if (SVFUtil::isa<LoadStmt>(stmt))
+                    if (const LoadStmt* l = SVFUtil::dyn_cast<LoadStmt>(stmt))
                     {
-                        loads.insert(svfInst);
+                        loads.insert(l);
                     }
-                    else if (SVFUtil::isa<StoreStmt>(stmt))
+                    else if (const StoreStmt* s = SVFUtil::dyn_cast<StoreStmt>(stmt))
                     {
-                        stores.insert(svfInst);
+                        stores.insert(s);
                     }
                 }
             }
         }
     }
 
-    for (LoadSet::const_iterator lit = loads.begin(), elit = loads.end(); lit != elit; ++lit)
+    for (Set<const LoadStmt*>::const_iterator lit = loads.begin(), elit = loads.end(); lit != elit; ++lit)
     {
-        const SVFInstruction* load = *lit;
-        bool loadneedcheck = false;
-        for (StoreSet::const_iterator sit = stores.begin(), esit = stores.end(); sit != esit; ++sit)
+        const LoadStmt* load = *lit;
+        for (Set<const StoreStmt*>::const_iterator sit = stores.begin(), esit = stores.end(); sit != esit; ++sit)
         {
-            const SVFInstruction* store = *sit;
-
-            loadneedcheck = true;
-            needcheckinst.insert(store);
+            const StoreStmt* store = *sit;
+            if(load->getInst()==nullptr || store->getInst()==nullptr)
+                continue;
+            if(mhp->mayHappenInParallelInst(load->getInst(),store->getInst()) && pta->alias(load->getRHSVarID(),store->getLHSVarID()))
+                if(lsa->isProtectedByCommonLock(load->getInst(),store->getInst()) == false)
+                    outs() << SVFUtil::bugMsg1("race pair(") << " store: " << store->toString() << ", load: " << load->toString() << SVFUtil::bugMsg1(")") << "\n";
         }
-        if (loadneedcheck)
-            needcheckinst.insert(load);
     }
-
-    outs() << "HP needcheck: " << needcheckinst.size() << "\n";
 }
 

svf/lib/Util/Options.cpp

@@ -847,6 +847,14 @@ const Option<std::string> Options::OutputName(
     "output","output db file","output.db");
 const Option<bool> Options::BufferOverflowCheck(
     "overflow","Buffer Overflow Detection",false);
+const Option<bool> Options::MemoryLeakCheck(
+    "leak", "Memory Leak Detection",false);
+const Option<bool> Options::FileCheck(
+    "fileck", "File Open/Close Detection",false);
+const Option<bool> Options::DFreeCheck(
+    "dfree", "Double Free Detection",false);
+const Option<bool> Options::RaceCheck(
+    "race", "Data race Detection",false);
 const Option<bool> Options::GepUnknownIdx(
     "gep-unknown-idx","Skip Gep Unknown Index",false);
 const Option<bool> Options::RunUncallFuncs(