Develop (#7)

* added new microbenchmarks covering three set of rules of data-sharing attributes * added two more benchmarks for static data members: in or not inside a construct * added two new benchmarks for dynamic storage duration * added benchmarks for locally declared static, threadprivate for variable within a construct * added two more benchmarks to cover rules controlling the number of associated loops * added benchmarks using collapse() and ordered() * added two benchmarks to cover taskloop construct * improved target tests: add teams+distribute * added a counter example into static-local-orig-yes.c * added a benchmark for multiple loops associated with SIMD * added a benchmark for target + map for array sections derived from pointers * added two benchmarks to cover implicitly determined rules for task generating constructs * added benchmarks with orphaned task using pass-by-reference * added copyprivate, copyin benchmarks * added benchmarks using nowait, taskwait. * added benchmarks using atomic, taskgroup, ordered. * changed version number and GCC note * added warning for compilers not supporting OpenMP 4.5 * reduced recursion level to avoid seg fault * Mention contributions from Rice University * sanity check: support c++ code compilations using both gcc and Intel compilers * categorize single and master examples as N1, extended to include single thread execution * parallel+if() * target teams with data races * ordered(2) example refined * omp for+linear requires OpenMP 4.5 * refined taskwait examples, list OpenMP 4.5 benchmarks * added assertion for one task-depend test * avoid printf() in parallel tasks * Renamed all 116 micro-benchmarks to DRBxxx-name where xxx is the 3-digit benchmark number. * Moved all polybench header files into directory polybench. Adapted polyhedral benchmarks to refer to those headerfiles. * Suggest GCC 7.x for robust OpenMP 4.5 support * replaced new with nnew so c++ compilers can be used * Updated README.md with adapted micro-benchmark file names that have the with prefix 'DRD<ID>-' in the filename now. * Updated test-harness.sh for new features: (1) cpp support (2) timeout with -s option (3) store id, compile-return-code and runtime-return-code in csv file * fixed hidden data race in dead code (utilities/polybench.c) * revised the taskwait missing program to avoid seg fault * changed int to long int to work with large integer like 2e9 (DRB065) * Fixed description for two wrong dependence relations (thanks to Franke Ye from GaTech for spotting them).
LLNL · Jun 5, 2018 · 44be1a2 · 44be1a2
1 parent 2493459
commit 44be1a2
Show file tree

Hide file tree

Showing 124 changed files with 3,119 additions and 140 deletions.
diff --git a/README.md b/README.md
diff --git a/check-data-races.sh b/check-data-races.sh
@@ -46,6 +46,7 @@
 
 OPTION=$1
 TESTS=$(grep -l main micro-benchmarks/*.c)
+CPPTESTS=$(grep -l main micro-benchmarks/*.cpp)
 POLYFLAG="micro-benchmarks/utilities/polybench.c -I micro-benchmarks -I micro-benchmarks/utilities -DPOLYBENCH_NO_FLUSH_CACHE -DPOLYBENCH_TIME -D_POSIX_C_SOURCE=200112L"
 
 if [[ -z "$OPTION" || "$OPTION" == "--help" ]]; then
@@ -55,6 +56,7 @@ if [[ -z "$OPTION" || "$OPTION" == "--help" ]]; then
     echo "--help     : this option"
     echo "--small    : compile and test all benchmarks using small parameters with Helgrind, ThreadSanitizer, Archer, Intel inspector."
     echo "--run      : compile and run all benchmarks with gcc (no evaluation)"
+    echo "--run-intel: compile and run all benchmarks with Intel compilers (no evaluation)"
     echo "--helgrind : compile and test all benchmarks with Helgrind"
     echo "--tsan     : compile and test all benchmarks with clang ThreadSanitizer"
     echo "--archer   : compile and test all benchmarks with Archer"
@@ -80,9 +82,43 @@ if [[ "$OPTION" == "--run" ]]; then
         ./a.out  > /dev/null
     done
     rm -f ./a.out
+# test for cpp files
+    for test in $CPPTESTS; do
+        echo "------------------------------------------"
+        echo "RUNNING: $test"
+        CFLAGS="-g -Wall -fopenmp"
+        if grep -q 'PolyBench' "$test"; then CFLAGS+=" $POLYFLAG"; fi
+        g++ $CFLAGS "$test" -lm
+        ./a.out  > /dev/null
+    done
+    rm -f ./a.out
+    exit
+fi
+
+if [[ "$OPTION" == "--run-intel" ]]; then
+    for test in $TESTS; do
+        echo "------------------------------------------"
+        echo "RUNNING: $test"
+        CFLAGS="-g -Wall -std=c99 -fopenmp"
+        if grep -q 'PolyBench' "$test"; then CFLAGS+=" $POLYFLAG"; fi
+        icc $CFLAGS "$test" -lm
+        ./a.out  > /dev/null
+    done
+    rm -f ./a.out
+# test for cpp files
+    for test in $CPPTESTS; do
+        echo "------------------------------------------"
+        echo "RUNNING: $test"
+        CFLAGS="-g -Wall -fopenmp"
+        if grep -q 'PolyBench' "$test"; then CFLAGS+=" $POLYFLAG"; fi
+        icpc $CFLAGS "$test" -lm
+        ./a.out  > /dev/null
+    done
+    rm -f ./a.out
     exit
 fi
 
+
 if [[ "$OPTION" == "--helgrind" ]]; then
     scripts/test-harness.sh -x helgrind
 fi

diff --git a/micro-benchmarks/antidep1-orig-yes.c → micro-benchmarks/DRB001-antidep1-orig-yes.c b/micro-benchmarks/antidep1-orig-yes.c → micro-benchmarks/DRB001-antidep1-orig-yes.c
diff --git a/micro-benchmarks/antidep1-var-yes.c → micro-benchmarks/DRB002-antidep1-var-yes.c b/micro-benchmarks/antidep1-var-yes.c → micro-benchmarks/DRB002-antidep1-var-yes.c
diff --git a/micro-benchmarks/antidep2-orig-yes.c → micro-benchmarks/DRB003-antidep2-orig-yes.c b/micro-benchmarks/antidep2-orig-yes.c → micro-benchmarks/DRB003-antidep2-orig-yes.c
diff --git a/micro-benchmarks/antidep2-var-yes.c → micro-benchmarks/DRB004-antidep2-var-yes.c b/micro-benchmarks/antidep2-var-yes.c → micro-benchmarks/DRB004-antidep2-var-yes.c
diff --git a/micro-benchmarks/indirectaccess1-orig-yes.c → ...chmarks/DRB005-indirectaccess1-orig-yes.c b/micro-benchmarks/indirectaccess1-orig-yes.c → ...chmarks/DRB005-indirectaccess1-orig-yes.c
diff --git a/micro-benchmarks/indirectaccess2-orig-yes.c → ...chmarks/DRB006-indirectaccess2-orig-yes.c b/micro-benchmarks/indirectaccess2-orig-yes.c → ...chmarks/DRB006-indirectaccess2-orig-yes.c
diff --git a/micro-benchmarks/indirectaccess3-orig-yes.c → ...chmarks/DRB007-indirectaccess3-orig-yes.c b/micro-benchmarks/indirectaccess3-orig-yes.c → ...chmarks/DRB007-indirectaccess3-orig-yes.c
diff --git a/micro-benchmarks/indirectaccess4-orig-yes.c → ...chmarks/DRB008-indirectaccess4-orig-yes.c b/micro-benchmarks/indirectaccess4-orig-yes.c → ...chmarks/DRB008-indirectaccess4-orig-yes.c
diff --git a/...-benchmarks/lastprivatemissing-orig-yes.c → ...arks/DRB009-lastprivatemissing-orig-yes.c b/...-benchmarks/lastprivatemissing-orig-yes.c → ...arks/DRB009-lastprivatemissing-orig-yes.c
diff --git a/...o-benchmarks/lastprivatemissing-var-yes.c → ...marks/DRB010-lastprivatemissing-var-yes.c b/...o-benchmarks/lastprivatemissing-var-yes.c → ...marks/DRB010-lastprivatemissing-var-yes.c
diff --git a/micro-benchmarks/minusminus-orig-yes.c → ...o-benchmarks/DRB011-minusminus-orig-yes.c b/micro-benchmarks/minusminus-orig-yes.c → ...o-benchmarks/DRB011-minusminus-orig-yes.c
diff --git a/micro-benchmarks/minusminus-var-yes.c → micro-benchmarks/DRB012-minusminus-var-yes.c b/micro-benchmarks/minusminus-var-yes.c → micro-benchmarks/DRB012-minusminus-var-yes.c
diff --git a/micro-benchmarks/nowait-orig-yes.c → micro-benchmarks/DRB013-nowait-orig-yes.c b/micro-benchmarks/nowait-orig-yes.c → micro-benchmarks/DRB013-nowait-orig-yes.c
@@ -60,7 +60,7 @@ int main()
 {
   int i,error;
   int len = 1000;
-  int a[1000], b=5;
+  int a[len], b=5;
 
   for (i=0; i<len; i++)
     a[i]= i;

diff --git a/micro-benchmarks/outofbounds-orig-yes.c → ...-benchmarks/DRB014-outofbounds-orig-yes.c b/micro-benchmarks/outofbounds-orig-yes.c → ...-benchmarks/DRB014-outofbounds-orig-yes.c
diff --git a/micro-benchmarks/outofbounds-var-yes.c → ...o-benchmarks/DRB015-outofbounds-var-yes.c b/micro-benchmarks/outofbounds-var-yes.c → ...o-benchmarks/DRB015-outofbounds-var-yes.c
diff --git a/micro-benchmarks/outputdep-orig-yes.c → micro-benchmarks/DRB016-outputdep-orig-yes.c b/micro-benchmarks/outputdep-orig-yes.c → micro-benchmarks/DRB016-outputdep-orig-yes.c
diff --git a/micro-benchmarks/outputdep-var-yes.c → micro-benchmarks/DRB017-outputdep-var-yes.c b/micro-benchmarks/outputdep-var-yes.c → micro-benchmarks/DRB017-outputdep-var-yes.c
diff --git a/micro-benchmarks/plusplus-orig-yes.c → micro-benchmarks/DRB018-plusplus-orig-yes.c b/micro-benchmarks/plusplus-orig-yes.c → micro-benchmarks/DRB018-plusplus-orig-yes.c
diff --git a/micro-benchmarks/plusplus-var-yes.c → micro-benchmarks/DRB019-plusplus-var-yes.c b/micro-benchmarks/plusplus-var-yes.c → micro-benchmarks/DRB019-plusplus-var-yes.c
diff --git a/micro-benchmarks/privatemissing-var-yes.c → ...enchmarks/DRB020-privatemissing-var-yes.c b/micro-benchmarks/privatemissing-var-yes.c → ...enchmarks/DRB020-privatemissing-var-yes.c
diff --git a/micro-benchmarks/reductionmissing-orig-yes.c → ...hmarks/DRB021-reductionmissing-orig-yes.c b/micro-benchmarks/reductionmissing-orig-yes.c → ...hmarks/DRB021-reductionmissing-orig-yes.c
diff --git a/micro-benchmarks/reductionmissing-var-yes.c → ...chmarks/DRB022-reductionmissing-var-yes.c b/micro-benchmarks/reductionmissing-var-yes.c → ...chmarks/DRB022-reductionmissing-var-yes.c
diff --git a/micro-benchmarks/sections1-orig-yes.c → micro-benchmarks/DRB023-sections1-orig-yes.c b/micro-benchmarks/sections1-orig-yes.c → micro-benchmarks/DRB023-sections1-orig-yes.c
diff --git a/micro-benchmarks/simdtruedep-orig-yes.c → ...-benchmarks/DRB024-simdtruedep-orig-yes.c b/micro-benchmarks/simdtruedep-orig-yes.c → ...-benchmarks/DRB024-simdtruedep-orig-yes.c
diff --git a/micro-benchmarks/simdtruedep-var-yes.c → ...o-benchmarks/DRB025-simdtruedep-var-yes.c b/micro-benchmarks/simdtruedep-var-yes.c → ...o-benchmarks/DRB025-simdtruedep-var-yes.c
diff --git a/...o-benchmarks/targetparallelfor-orig-yes.c → ...marks/DRB026-targetparallelfor-orig-yes.c b/...o-benchmarks/targetparallelfor-orig-yes.c → ...marks/DRB026-targetparallelfor-orig-yes.c
@@ -58,7 +58,7 @@ int main(int argc, char* argv[])
   for (i=0; i<len; i++)
     a[i]= i;
 
-#pragma omp target
+#pragma omp target map(a[0:len])
 #pragma omp parallel for
   for (i=0;i< len -1 ;i++)
     a[i]=a[i+1]+1;

diff --git a/...o-benchmarks/taskdependmissing-orig-yes.c → ...marks/DRB027-taskdependmissing-orig-yes.c b/...o-benchmarks/taskdependmissing-orig-yes.c → ...marks/DRB027-taskdependmissing-orig-yes.c
@@ -57,9 +57,9 @@ int main()
 #pragma omp parallel
 #pragma omp single
   {
-#pragma omp task shared(i) 
+#pragma omp task
     i = 1;    
-#pragma omp task shared(i)
+#pragma omp task
     i = 2;    
   }
 

diff --git a/micro-benchmarks/privatemissing-orig-yes.c → ...nchmarks/DRB028-privatemissing-orig-yes.c b/micro-benchmarks/privatemissing-orig-yes.c → ...nchmarks/DRB028-privatemissing-orig-yes.c
diff --git a/micro-benchmarks/truedep1-orig-yes.c → micro-benchmarks/DRB029-truedep1-orig-yes.c b/micro-benchmarks/truedep1-orig-yes.c → micro-benchmarks/DRB029-truedep1-orig-yes.c
diff --git a/micro-benchmarks/truedep1-var-yes.c → micro-benchmarks/DRB030-truedep1-var-yes.c b/micro-benchmarks/truedep1-var-yes.c → micro-benchmarks/DRB030-truedep1-var-yes.c
diff --git a/...nchmarks/truedepfirstdimension-orig-yes.c → ...s/DRB031-truedepfirstdimension-orig-yes.c b/...nchmarks/truedepfirstdimension-orig-yes.c → ...s/DRB031-truedepfirstdimension-orig-yes.c
diff --git a/...enchmarks/truedepfirstdimension-var-yes.c → ...ks/DRB032-truedepfirstdimension-var-yes.c b/...enchmarks/truedepfirstdimension-var-yes.c → ...ks/DRB032-truedepfirstdimension-var-yes.c
diff --git a/micro-benchmarks/truedeplinear-orig-yes.c → ...enchmarks/DRB033-truedeplinear-orig-yes.c b/micro-benchmarks/truedeplinear-orig-yes.c → ...enchmarks/DRB033-truedeplinear-orig-yes.c
diff --git a/micro-benchmarks/truedeplinear-var-yes.c → ...benchmarks/DRB034-truedeplinear-var-yes.c b/micro-benchmarks/truedeplinear-var-yes.c → ...benchmarks/DRB034-truedeplinear-var-yes.c
diff --git a/micro-benchmarks/truedepscalar-orig-yes.c → ...enchmarks/DRB035-truedepscalar-orig-yes.c b/micro-benchmarks/truedepscalar-orig-yes.c → ...enchmarks/DRB035-truedepscalar-orig-yes.c
diff --git a/micro-benchmarks/truedepscalar-var-yes.c → ...benchmarks/DRB036-truedepscalar-var-yes.c b/micro-benchmarks/truedepscalar-var-yes.c → ...benchmarks/DRB036-truedepscalar-var-yes.c
diff --git a/...chmarks/truedepseconddimension-orig-yes.c → .../DRB037-truedepseconddimension-orig-yes.c b/...chmarks/truedepseconddimension-orig-yes.c → .../DRB037-truedepseconddimension-orig-yes.c
diff --git a/...nchmarks/truedepseconddimension-var-yes.c → ...s/DRB038-truedepseconddimension-var-yes.c b/...nchmarks/truedepseconddimension-var-yes.c → ...s/DRB038-truedepseconddimension-var-yes.c
diff --git a/...enchmarks/truedepsingleelement-orig-yes.c → ...ks/DRB039-truedepsingleelement-orig-yes.c b/...enchmarks/truedepsingleelement-orig-yes.c → ...ks/DRB039-truedepsingleelement-orig-yes.c
diff --git a/...benchmarks/truedepsingleelement-var-yes.c → ...rks/DRB040-truedepsingleelement-var-yes.c b/...benchmarks/truedepsingleelement-var-yes.c → ...rks/DRB040-truedepsingleelement-var-yes.c
diff --git a/micro-benchmarks/3mm-parallel-no.c → micro-benchmarks/DRB041-3mm-parallel-no.c b/micro-benchmarks/3mm-parallel-no.c → micro-benchmarks/DRB041-3mm-parallel-no.c
@@ -11,10 +11,10 @@
 #include <string.h>
 #include <math.h>
 /* Include polybench common header. */
-#include <polybench.h>
+#include "polybench/polybench.h"
 /* Include benchmark-specific header. */
 /* Default data type is double, default size is 4000. */
-#include "3mm.h"
+#include "polybench/3mm.h"
 /* Array initialization. */
 
 static void init_array(int ni,int nj,int nk,int nl,int nm,double A[128 + 0][128 + 0],double B[128 + 0][128 + 0],double C[128 + 0][128 + 0],double D[128 + 0][128 + 0])

diff --git a/micro-benchmarks/3mm-tile-no.c → micro-benchmarks/DRB042-3mm-tile-no.c b/micro-benchmarks/3mm-tile-no.c → micro-benchmarks/DRB042-3mm-tile-no.c
@@ -11,10 +11,10 @@
 #include <string.h>
 #include <math.h>
 /* Include polybench common header. */
-#include <polybench.h>
+#include "polybench/polybench.h"
 /* Include benchmark-specific header. */
 /* Default data type is double, default size is 4000. */
-#include "3mm.h"
+#include "polybench/3mm.h"
 /* Array initialization. */
 
 static void init_array(int ni,int nj,int nk,int nl,int nm,double A[128 + 0][128 + 0],double B[128 + 0][128 + 0],double C[128 + 0][128 + 0],double D[128 + 0][128 + 0])

diff --git a/micro-benchmarks/adi-parallel-no.c → micro-benchmarks/DRB043-adi-parallel-no.c b/micro-benchmarks/adi-parallel-no.c → micro-benchmarks/DRB043-adi-parallel-no.c
@@ -12,10 +12,10 @@
 #include <string.h>
 #include <math.h>
 /* Include polybench common header. */
-#include <polybench.h>
+#include "polybench/polybench.h"
 /* Include benchmark-specific header. */
 /* Default data type is double, default size is 10x1024x1024. */
-#include "adi.h"
+#include "polybench/adi.h"
 /* Array initialization. */
 
 static void init_array(int n,double X[500 + 0][500 + 0],double A[500 + 0][500 + 0],double B[500 + 0][500 + 0])

diff --git a/micro-benchmarks/adi-tile-no.c → micro-benchmarks/DRB044-adi-tile-no.c b/micro-benchmarks/adi-tile-no.c → micro-benchmarks/DRB044-adi-tile-no.c
@@ -11,10 +11,10 @@
 #include <string.h>
 #include <math.h>
 /* Include polybench common header. */
-#include <polybench.h>
+#include "polybench/polybench.h"
 /* Include benchmark-specific header. */
 /* Default data type is double, default size is 10x1024x1024. */
-#include "adi.h"
+#include "polybench/adi.h"
 /* Array initialization. */
 
 static void init_array(int n,double X[500 + 0][500 + 0],double A[500 + 0][500 + 0],double B[500 + 0][500 + 0])

diff --git a/micro-benchmarks/doall1-orig-no.c → micro-benchmarks/DRB045-doall1-orig-no.c b/micro-benchmarks/doall1-orig-no.c → micro-benchmarks/DRB045-doall1-orig-no.c
diff --git a/micro-benchmarks/DRB046-doall2-orig-no.c b/micro-benchmarks/DRB046-doall2-orig-no.c
@@ -0,0 +1,64 @@
+/*
+Copyright (c) 2017, Lawrence Livermore National Security, LLC.
+Produced at the Lawrence Livermore National Laboratory
+Written by Chunhua Liao, Pei-Hung Lin, Joshua Asplund,
+Markus Schordan, and Ian Karlin
+(email: liao6@llnl.gov, lin32@llnl.gov, asplund1@llnl.gov,
+schordan1@llnl.gov, karlin1@llnl.gov)
+LLNL-CODE-732144
+All rights reserved.
+
+This file is part of DataRaceBench. For details, see
+https://github.com/LLNL/dataracebench. Please also see the LICENSE file
+for our additional BSD notice.
+
+Redistribution and use in source and binary forms, with
+or without modification, are permitted provided that the following
+conditions are met:
+
+* Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the disclaimer below.
+
+* Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the disclaimer (as noted below)
+  in the documentation and/or other materials provided with the
+  distribution.
+
+* Neither the name of the LLNS/LLNL nor the names of its contributors
+  may be used to endorse or promote products derived from this
+  software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL LAWRENCE LIVERMORE NATIONAL
+SECURITY, LLC, THE U.S. DEPARTMENT OF ENERGY OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+/* 
+Two-dimensional array computation:
+Only one loop is associated with the omp for construct. 
+The inner loop's loop iteration variable needs an explicit private() clause, 
+otherwise it will be shared by default. 
+*/
+
+int a[100][100];
+int main()
+{
+  int i,j;
+#pragma omp parallel for private(j)
+  for (i=0;i<100;i++)
+    for (j=0;j<100;j++)
+      a[i][j]=a[i][j]+1;
+  return 0;
+}
+
diff --git a/micro-benchmarks/doallchar-orig-no.c → micro-benchmarks/DRB047-doallchar-orig-no.c b/micro-benchmarks/doallchar-orig-no.c → micro-benchmarks/DRB047-doallchar-orig-no.c
diff --git a/micro-benchmarks/firstprivate-orig-no.c → ...-benchmarks/DRB048-firstprivate-orig-no.c b/micro-benchmarks/firstprivate-orig-no.c → ...-benchmarks/DRB048-firstprivate-orig-no.c
diff --git a/micro-benchmarks/fprintf-orig-no.c → micro-benchmarks/DRB049-fprintf-orig-no.c b/micro-benchmarks/fprintf-orig-no.c → micro-benchmarks/DRB049-fprintf-orig-no.c
diff --git a/micro-benchmarks/functionparameter-orig-no.c → ...hmarks/DRB050-functionparameter-orig-no.c b/micro-benchmarks/functionparameter-orig-no.c → ...hmarks/DRB050-functionparameter-orig-no.c
diff --git a/micro-benchmarks/getthreadnum-orig-no.c → ...-benchmarks/DRB051-getthreadnum-orig-no.c b/micro-benchmarks/getthreadnum-orig-no.c → ...-benchmarks/DRB051-getthreadnum-orig-no.c
diff --git a/...chmarks/indirectaccesssharebase-orig-no.c → .../DRB052-indirectaccesssharebase-orig-no.c b/...chmarks/indirectaccesssharebase-orig-no.c → .../DRB052-indirectaccesssharebase-orig-no.c
diff --git a/micro-benchmarks/inneronly1-orig-no.c → micro-benchmarks/DRB053-inneronly1-orig-no.c b/micro-benchmarks/inneronly1-orig-no.c → micro-benchmarks/DRB053-inneronly1-orig-no.c
diff --git a/micro-benchmarks/inneronly2-orig-no.c → micro-benchmarks/DRB054-inneronly2-orig-no.c b/micro-benchmarks/inneronly2-orig-no.c → micro-benchmarks/DRB054-inneronly2-orig-no.c
diff --git a/micro-benchmarks/jacobi2d-parallel-no.c → ...-benchmarks/DRB055-jacobi2d-parallel-no.c b/micro-benchmarks/jacobi2d-parallel-no.c → ...-benchmarks/DRB055-jacobi2d-parallel-no.c
@@ -11,10 +11,10 @@
 #include <string.h>
 #include <math.h>
 /* Include polybench common header. */
-#include <polybench.h>
+#include "polybench/polybench.h"
 /* Include benchmark-specific header. */
 /* Default data type is double, default size is 20x1000. */
-#include "jacobi-2d-imper.h"
+#include "polybench/jacobi-2d-imper.h"
 /* Array initialization. */
 
 static void init_array(int n,double A[500 + 0][500 + 0],double B[500 + 0][500 + 0])

diff --git a/micro-benchmarks/jacobi2d-tile-no.c → micro-benchmarks/DRB056-jacobi2d-tile-no.c b/micro-benchmarks/jacobi2d-tile-no.c → micro-benchmarks/DRB056-jacobi2d-tile-no.c
@@ -11,10 +11,10 @@
 #include <string.h>
 #include <math.h>
 /* Include polybench common header. */
-#include <polybench.h>
+#include "polybench/polybench.h"
 /* Include benchmark-specific header. */
 /* Default data type is double, default size is 20x1000. */
-#include "jacobi-2d-imper.h"
+#include "polybench/jacobi-2d-imper.h"
 /* Array initialization. */
 
 static void init_array(int n,double A[500 + 0][500 + 0],double B[500 + 0][500 + 0])

diff --git a/micro-benchmarks/jacobiinitialize-orig-no.c → ...chmarks/DRB057-jacobiinitialize-orig-no.c b/micro-benchmarks/jacobiinitialize-orig-no.c → ...chmarks/DRB057-jacobiinitialize-orig-no.c
diff --git a/micro-benchmarks/jacobikernel-orig-no.c → ...-benchmarks/DRB058-jacobikernel-orig-no.c b/micro-benchmarks/jacobikernel-orig-no.c → ...-benchmarks/DRB058-jacobikernel-orig-no.c
diff --git a/micro-benchmarks/lastprivate-orig-no.c → ...o-benchmarks/DRB059-lastprivate-orig-no.c b/micro-benchmarks/lastprivate-orig-no.c → ...o-benchmarks/DRB059-lastprivate-orig-no.c
diff --git a/micro-benchmarks/matrixmultiply-orig-no.c → ...enchmarks/DRB060-matrixmultiply-orig-no.c b/micro-benchmarks/matrixmultiply-orig-no.c → ...enchmarks/DRB060-matrixmultiply-orig-no.c
diff --git a/micro-benchmarks/matrixvector1-orig-no.c → ...benchmarks/DRB061-matrixvector1-orig-no.c b/micro-benchmarks/matrixvector1-orig-no.c → ...benchmarks/DRB061-matrixvector1-orig-no.c
diff --git a/micro-benchmarks/matrixvector2-orig-no.c → ...benchmarks/DRB062-matrixvector2-orig-no.c b/micro-benchmarks/matrixvector2-orig-no.c → ...benchmarks/DRB062-matrixvector2-orig-no.c
diff --git a/micro-benchmarks/outeronly1-orig-no.c → micro-benchmarks/DRB063-outeronly1-orig-no.c b/micro-benchmarks/outeronly1-orig-no.c → micro-benchmarks/DRB063-outeronly1-orig-no.c
diff --git a/micro-benchmarks/outeronly2-orig-no.c → micro-benchmarks/DRB064-outeronly2-orig-no.c b/micro-benchmarks/outeronly2-orig-no.c → micro-benchmarks/DRB064-outeronly2-orig-no.c
@@ -47,7 +47,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
 /* 
 Only the outmost loop can be parallelized. 
   
-The inner loop has loop carried anti data dependence.
+The inner loop has loop carried true data dependence.
 However, the loop is not parallelized so no race condition.
 */
 int n=100, m=100;

diff --git a/micro-benchmarks/pireduction-orig-no.c → ...o-benchmarks/DRB065-pireduction-orig-no.c b/micro-benchmarks/pireduction-orig-no.c → ...o-benchmarks/DRB065-pireduction-orig-no.c
@@ -54,7 +54,7 @@ Classic PI calculation using reduction
 int main(int argc, char** argv)
 {
   double pi = 0.0;
-  int i;
+  long int i;
   double x, interval_width;
   interval_width = 1.0/(double)num_steps;
 

diff --git a/micro-benchmarks/pointernoaliasing-orig-no.c → ...hmarks/DRB066-pointernoaliasing-orig-no.c b/micro-benchmarks/pointernoaliasing-orig-no.c → ...hmarks/DRB066-pointernoaliasing-orig-no.c
diff --git a/micro-benchmarks/restrictpointer1-orig-no.c → ...chmarks/DRB067-restrictpointer1-orig-no.c b/micro-benchmarks/restrictpointer1-orig-no.c → ...chmarks/DRB067-restrictpointer1-orig-no.c
diff --git a/micro-benchmarks/restrictpointer2-orig-no.c → ...chmarks/DRB068-restrictpointer2-orig-no.c b/micro-benchmarks/restrictpointer2-orig-no.c → ...chmarks/DRB068-restrictpointer2-orig-no.c
diff --git a/micro-benchmarks/sectionslock1-orig-no.c → ...benchmarks/DRB069-sectionslock1-orig-no.c b/micro-benchmarks/sectionslock1-orig-no.c → ...benchmarks/DRB069-sectionslock1-orig-no.c
diff --git a/micro-benchmarks/simd1-orig-no.c → micro-benchmarks/DRB070-simd1-orig-no.c b/micro-benchmarks/simd1-orig-no.c → micro-benchmarks/DRB070-simd1-orig-no.c
diff --git a/micro-benchmarks/targetparallelfor-orig-no.c → ...hmarks/DRB071-targetparallelfor-orig-no.c b/micro-benchmarks/targetparallelfor-orig-no.c → ...hmarks/DRB071-targetparallelfor-orig-no.c
@@ -45,21 +45,20 @@ THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 /*
-use of omp target
+use of omp target: len is not mapped. It should be firstprivate within target.
 */
 int main(int argc, char* argv[])
 {
   int i;
   int len = 1000;
-
-  int a[1000];
+  int a[len];
 
   for (i=0; i<len; i++)
     a[i]= i;
 
-#pragma omp target
+#pragma omp target map(a[0:len])
 #pragma omp parallel for
-  for (i=0;i< len -1 ;i++)
+  for (i=0;i< len;i++)
     a[i]=a[i]+1;
 
   return 0;

diff --git a/micro-benchmarks/taskdep1-orig-no.c → micro-benchmarks/DRB072-taskdep1-orig-no.c b/micro-benchmarks/taskdep1-orig-no.c → micro-benchmarks/DRB072-taskdep1-orig-no.c
diff --git a/micro-benchmarks/doall2-orig-yes.c → micro-benchmarks/DRB073-doall2-orig-yes.c b/micro-benchmarks/doall2-orig-yes.c → micro-benchmarks/DRB073-doall2-orig-yes.c
@@ -43,13 +43,13 @@ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
 IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 THE POSSIBILITY OF SUCH DAMAGE.
 */
-
+#include <stdio.h>
 /*
 Two-dimensional array computation using loops: missing private(j).
 References to j in the loop cause data races.
 Data race pairs (we allow multiple ones to preserve the pattern):
   Write_set = {j@61:10, j@61:20}
-  Read_set = {j@62:20, j@62:12, j62@:14, j61@:20}
+  Read_set = {j@62:20, j@62:12, j61@:14, j61@:20}
   Any pair from Write_set vs. Write_set  and Write_set vs. Read_set is a data race pair.
 */
 int a[100][100];

diff --git a/micro-benchmarks/flush-orig-yes.c → micro-benchmarks/DRB074-flush-orig-yes.c b/micro-benchmarks/flush-orig-yes.c → micro-benchmarks/DRB074-flush-orig-yes.c
diff --git a/micro-benchmarks/getthreadnum-orig-yes.c → ...benchmarks/DRB075-getthreadnum-orig-yes.c b/micro-benchmarks/getthreadnum-orig-yes.c → ...benchmarks/DRB075-getthreadnum-orig-yes.c
diff --git a/micro-benchmarks/flush-orig-no.c → micro-benchmarks/DRB076-flush-orig-no.c b/micro-benchmarks/flush-orig-no.c → micro-benchmarks/DRB076-flush-orig-no.c
diff --git a/micro-benchmarks/single-orig-no.c → micro-benchmarks/DRB077-single-orig-no.c b/micro-benchmarks/single-orig-no.c → micro-benchmarks/DRB077-single-orig-no.c
diff --git a/micro-benchmarks/taskdep2-orig-no.c → micro-benchmarks/DRB078-taskdep2-orig-no.c b/micro-benchmarks/taskdep2-orig-no.c → micro-benchmarks/DRB078-taskdep2-orig-no.c
@@ -49,14 +49,18 @@ Two tasks with depend clause to ensure execution order, no data races.
 i is shared for two tasks based on implicit data-sharing attribute rules.
 */
 #include <assert.h> 
+#include <unistd.h>
 int main()
 {
   int i=0;
 #pragma omp parallel
 #pragma omp single
   {
 #pragma omp task depend (out:i)
-    i = 1;    
+    {
+      sleep(3);
+      i = 1;    
+    }
 #pragma omp task depend (out:i)
     i = 2;    
   }

diff --git a/micro-benchmarks/taskdep3-orig-no.c → micro-benchmarks/DRB079-taskdep3-orig-no.c b/micro-benchmarks/taskdep3-orig-no.c → micro-benchmarks/DRB079-taskdep3-orig-no.c
@@ -48,19 +48,25 @@ THE POSSIBILITY OF SUCH DAMAGE.
 tasks with depend clauses to ensure execution order, no data races.
 */
 #include <stdio.h> 
+#include <assert.h> 
+#include <unistd.h>
 int main()
 {
-  int i=0;
+  int i=0, j, k;
 #pragma omp parallel
 #pragma omp single
   {
 #pragma omp task depend (out:i)
-    i = 1;    
+    {
+      sleep(3);
+      i = 1;    
+    }
 #pragma omp task depend (in:i)
-    printf ("x=%d\n", i);
+    j =i; 
 #pragma omp task depend (in:i)
-    printf ("x=%d\n", i);
+    k =i; 
   }
-
+  printf ("j=%d k=%d\n", j, k);
+  assert (j==1 && k==1);
   return 0;
 }