do not map timers

Author: Jeff Hammond

Cxx11/nstream-openmp-target.cc

@@ -129,7 +129,7 @@ int main(int argc, char * argv[])
   }
 
   // DEVICE
-  OMP_TARGET( data map(tofrom: A[0:length], B[0:length], C[0:length]) map(from:nstream_time) )
+  OMP_TARGET( data map(tofrom: A[0:length], B[0:length], C[0:length]) )
   {
     for (auto iter = 0; iter<=iterations; iter++) {
 

Cxx11/transpose-openmp-target.cc

@@ -111,29 +111,29 @@ int main(int argc, char * argv[])
   OMP_PARALLEL()
   {
     OMP_FOR()
-    for (auto i=0;i<order; i++) {
+    for (int i=0;i<order; i++) {
       PRAGMA_SIMD
-      for (auto j=0;j<order;j++) {
+      for (int j=0;j<order;j++) {
         A[i*order+j] = static_cast<double>(i*order+j);
         B[i*order+j] = 0.0;
       }
     }
   }
 
   // DEVICE
-  OMP_TARGET( data map(tofrom: A[0:order*order], B[0:order*order]) map(from:trans_time) )
+  OMP_TARGET( data map(tofrom: A[0:order*order], B[0:order*order]) )
   {
-    for (auto iter = 0; iter<=iterations; iter++) {
+    for (int iter = 0; iter<=iterations; iter++) {
 
       if (iter==1) trans_time = omp_get_wtime();
 
       // transpose the  matrix
       if (tile_size < order) {
         OMP_TARGET( teams distribute parallel for simd collapse(2) )
-        for (auto it=0; it<order; it+=tile_size) {
-          for (auto jt=0; jt<order; jt+=tile_size) {
-            for (auto i=it; i<std::min(order,it+tile_size); i++) {
-              for (auto j=jt; j<std::min(order,jt+tile_size); j++) {
+        for (int it=0; it<order; it+=tile_size) {
+          for (int jt=0; jt<order; jt+=tile_size) {
+            for (int i=it; i<std::min(order,it+tile_size); i++) {
+              for (int j=jt; j<std::min(order,jt+tile_size); j++) {
                 B[i*order+j] += A[j*order+i];
                 A[j*order+i] += 1.0;
               }
@@ -142,8 +142,8 @@ int main(int argc, char * argv[])
         }
       } else {
         OMP_TARGET( teams distribute parallel for simd collapse(2) schedule(static,1) )
-        for (auto i=0;i<order; i++) {
-          for (auto j=0;j<order;j++) {
+        for (int i=0;i<order; i++) {
+          for (int j=0;j<order;j++) {
             B[i*order+j] += A[j*order+i];
             A[j*order+i] += 1.0;
           }
@@ -160,8 +160,8 @@ int main(int argc, char * argv[])
   const auto addit = (iterations+1.) * (iterations/2.);
   auto abserr = 0.0;
   OMP_PARALLEL_FOR_REDUCE( +:abserr )
-  for (auto j=0; j<order; j++) {
-    for (auto i=0; i<order; i++) {
+  for (int j=0; j<order; j++) {
+    for (int i=0; i<order; i++) {
       const int ij = i*order+j;
       const int ji = j*order+i;
       const double reference = static_cast<double>(ij)*(1.+iterations)+addit;

FORTRAN/dgemm-openmp-target.f90

@@ -149,8 +149,7 @@ program main
   enddo
   !$omp end parallel do
 
-  !$omp target data map(to: A,B) map(tofrom: C) map(from:dgemm_time) &
-  !$omp& map(to:iterations,order)
+  !$omp target data map(to: A,B) map(tofrom: C) map(to:order)
 
   t0 = 0
 

FORTRAN/nstream-openmp-target.f90

@@ -163,8 +163,7 @@ program main
   enddo
   !$omp end parallel do simd
 
-  !$omp target data map(tofrom: A) map(to: B,C) map(from:nstream_time) &
-  !$omp& map(to:iterations,length)
+  !$omp target data map(tofrom: A) map(to: B,C) map(to:length)
 
   do k=0,iterations
 

FORTRAN/stencil-openmp-target.f90

@@ -320,8 +320,7 @@ program main
 #endif
   !$omp end parallel
 
-  !$omp target data map(to:W, A) map(tofrom: B) map(from:stencil_time) &
-  !$omp& map(to:iterations,n)
+  !$omp target data map(to:W, A) map(tofrom: B) map(to:n)
 
   t0 = 0
 

FORTRAN/transpose-openmp-target.f90

@@ -143,7 +143,7 @@ program main
   enddo
   !$omp end parallel do simd
 
-  !$omp target data map(to: A) map(tofrom: B) map(from:trans_time)
+  !$omp target data map(to: A) map(tofrom: B)
 
   t0 = 0