switch from Cilk to OpenMP. Fix #if that control programming model se…

…lection.
dyninst · Nov 13, 2017 · f27790a · f27790a
1 parent 9d64ee6
commit f27790a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/cmake/Modules/FindCilk.cmake b/cmake/Modules/FindCilk.cmake
@@ -7,8 +7,8 @@
 #  CILK_DEFINITIONS - Compiler switches required for using cilk
 #
 
-#set(CILK_DEFINITIONS -fopenmp)
-set(CILK_DEFINITIONS -fcilkplus)
+set(CILK_DEFINITIONS -fopenmp)
+#set(CILK_DEFINITIONS -fcilkplus)
 
 
 #find_library (CILK_LIBRARIES

diff --git a/parseAPI/src/Parser.C b/parseAPI/src/Parser.C
@@ -58,7 +58,8 @@
 #include <boost/timer/timer.hpp>
 #include <fstream>
 
-#define USE_CILK 1
+#define USE_CILK 0
+#define USE_OPENMP 1
 
 using namespace std;
 using namespace Dyninst;
@@ -620,7 +621,7 @@ Parser::ProcessFrames
       }
     }
   }
-#elsif USE_CILK
+#elif USE_CILK
   {
     int nthreads = __cilkrts_get_nworkers(); 
     for (;;) {
@@ -805,7 +806,7 @@ void Parser::cleanup_frames()  {
       delete pf;
     }
   }
-#elsif USE_CILK
+#elif USE_CILK
   cilk_for(unsigned i=0; i < frames.size(); ++i) {
     ParseFrame *pf = frames[i];
     if (pf) {