Merge pull request #326 from LLNL/task/squash_warnings

rhornung67 · web-flow · commit 84f8df3fe174 · 2023-04-25T10:01:08.000-07:00
Task/squash warnings
diff --git a/src/algorithm/SCAN-OMPTarget.cpp b/src/algorithm/SCAN-OMPTarget.cpp
@@ -25,7 +25,9 @@ namespace algorithm
   //
   // Define threads per team for target execution
   //
+#if _OPENMP >= 201811 && defined(RAJA_PERFSUITE_ENABLE_OPENMP5_SCAN)
   const size_t threads_per_team = 256;
+#endif
 
 
 void SCAN::runOpenMPTargetVariant(VariantID vid, size_t RAJAPERF_UNUSED_ARG(tune_idx))
diff --git a/src/apps/CONVECTION3DPA-OMPTarget.cpp b/src/apps/CONVECTION3DPA-OMPTarget.cpp
@@ -19,17 +19,14 @@
 namespace rajaperf {
 namespace apps {
 
-void CONVECTION3DPA::runOpenMPTargetVariant(VariantID vid, size_t RAJAPERF_UNUSED_ARG(tune_idx)) {
-  const Index_type run_reps = getRunReps();
+void CONVECTION3DPA::runOpenMPTargetVariant(VariantID vid, size_t RAJAPERF_UNUSED_ARG(tune_idx)) 
+{
+  if ( vid == Base_OpenMPTarget ) {
 
-  switch (vid) {
+  } else if ( vid == RAJA_OpenMPTarget ) {
 
-  default: {
-
-    getCout() << "\n CONVECTION3DPA : Unknown OpenMPTarget variant id = " << vid
-              << std::endl;
-    break;
-  }
+  } else {
+     getCout() << "\n CONVECTION3DPA : Unknown OpenMPTarget variant id = " << vid << std::endl;
   }
 }
 
diff --git a/src/apps/DIFFUSION3DPA-OMPTarget.cpp b/src/apps/DIFFUSION3DPA-OMPTarget.cpp
@@ -19,17 +19,14 @@
 namespace rajaperf {
 namespace apps {
 
-void DIFFUSION3DPA::runOpenMPTargetVariant(VariantID vid, size_t RAJAPERF_UNUSED_ARG(tune_idx)) {
-  const Index_type run_reps = getRunReps();
+void DIFFUSION3DPA::runOpenMPTargetVariant(VariantID vid, size_t RAJAPERF_UNUSED_ARG(tune_idx))
+{
+  if ( vid == Base_OpenMPTarget ) {
 
-  switch (vid) {
+  } else if ( vid == RAJA_OpenMPTarget ) {
 
-  default: {
-
-    getCout() << "\n DIFFUSION3DPA : Unknown OpenMPTarget variant id = " << vid
-              << std::endl;
-    break;
-  }
+  } else {
+     getCout() << "\n DIFFUSION3DPA : Unknown OpenMPTarget variant id = " << vid << std::endl;
   }
 }
 
diff --git a/src/apps/ENERGY-Seq.cpp b/src/apps/ENERGY-Seq.cpp
@@ -26,6 +26,7 @@ void ENERGY::runSeqVariant(VariantID vid, size_t RAJAPERF_UNUSED_ARG(tune_idx))
 
   ENERGY_DATA_SETUP;
 
+#if defined(RUN_RAJA_SEQ)
   auto energy_lam1 = [=](Index_type i) {
                        ENERGY_BODY1;
                      };
@@ -44,6 +45,7 @@ void ENERGY::runSeqVariant(VariantID vid, size_t RAJAPERF_UNUSED_ARG(tune_idx))
   auto energy_lam6 = [=](Index_type i) {
                        ENERGY_BODY6;
                      };
+#endif
 
   switch ( vid ) {
 
diff --git a/src/apps/FIR-Seq.cpp b/src/apps/FIR-Seq.cpp
@@ -32,9 +32,11 @@ void FIR::runSeqVariant(VariantID vid, size_t RAJAPERF_UNUSED_ARG(tune_idx))
   Real_type coeff[FIR_COEFFLEN];
   std::copy(std::begin(coeff_array), std::end(coeff_array), std::begin(coeff));
 
+#if defined(RUN_RAJA_SEQ)
   auto fir_lam = [=](Index_type i) {
                    FIR_BODY;
                  };
+#endif
 
   switch ( vid ) {
 
diff --git a/src/apps/HALOEXCHANGE_FUSED-OMPTarget.cpp b/src/apps/HALOEXCHANGE_FUSED-OMPTarget.cpp
@@ -22,9 +22,9 @@ namespace apps
 {
 
   //
-  // Define threads per team for target execution
+  // Define threads per team for target execution (unused)
   //
-  const size_t threads_per_team = 256;
+//const size_t threads_per_team = 256;
 
 #define HALOEXCHANGE_FUSED_MANUAL_FUSER_SETUP_OMP_TARGET \
   void** pack_ptrs; \
diff --git a/src/apps/LTIMES_NOVIEW-Seq.cpp b/src/apps/LTIMES_NOVIEW-Seq.cpp
@@ -24,10 +24,12 @@ void LTIMES_NOVIEW::runSeqVariant(VariantID vid, size_t RAJAPERF_UNUSED_ARG(tune
 
   LTIMES_NOVIEW_DATA_SETUP;
 
+#if defined(RUN_RAJA_SEQ)
   auto ltimesnoview_lam = [=](Index_type d, Index_type z,
                               Index_type g, Index_type m) {
                                 LTIMES_NOVIEW_BODY;
                           };
+#endif
 
   switch ( vid ) {
 
diff --git a/src/apps/MASS3DPA-OMPTarget.cpp b/src/apps/MASS3DPA-OMPTarget.cpp
@@ -19,17 +19,14 @@
 namespace rajaperf {
 namespace apps {
 
+void MASS3DPA::runOpenMPTargetVariant(VariantID vid, size_t RAJAPERF_UNUSED_ARG(tune_idx))
+{
+  if ( vid == Base_OpenMPTarget ) {
 
-void MASS3DPA::runOpenMPTargetVariant(VariantID vid, size_t RAJAPERF_UNUSED_ARG(tune_idx)) {
-  const Index_type run_reps = getRunReps();
+  } else if ( vid == RAJA_OpenMPTarget ) {
 
-  switch (vid) {
-
-  default: {
-
-    getCout() << "\n MASS3DPA : Unknown OpenMPTarget variant id = " << vid << std::endl;
-    break;
-  }
+  } else {
+     getCout() << "\n MASS3DPA : Unknown OpenMPTarget variant id = " << vid << std::endl;
   }
 }
 
diff --git a/src/apps/PRESSURE-Seq.cpp b/src/apps/PRESSURE-Seq.cpp
@@ -26,12 +26,14 @@ void PRESSURE::runSeqVariant(VariantID vid, size_t RAJAPERF_UNUSED_ARG(tune_idx)
 
   PRESSURE_DATA_SETUP;
 
+#if defined(RUN_RAJA_SEQ)
   auto pressure_lam1 = [=](Index_type i) {
                          PRESSURE_BODY1;
                        };
   auto pressure_lam2 = [=](Index_type i) {
                          PRESSURE_BODY2;
                        };
+#endif
 
   switch ( vid ) {
 
diff --git a/src/apps/VOL3D-Seq.cpp b/src/apps/VOL3D-Seq.cpp
@@ -28,9 +28,11 @@ void VOL3D::runSeqVariant(VariantID vid, size_t RAJAPERF_UNUSED_ARG(tune_idx))
 
   VOL3D_DATA_SETUP;
 
+#if defined(RUN_RAJA_SEQ)
   auto vol3d_lam = [=](Index_type i) {
                      VOL3D_BODY;
                    };
+#endif
 
   switch ( vid ) {
 
diff --git a/src/basic/DAXPY-Seq.cpp b/src/basic/DAXPY-Seq.cpp
@@ -26,9 +26,11 @@ void DAXPY::runSeqVariant(VariantID vid, size_t RAJAPERF_UNUSED_ARG(tune_idx))
 
   DAXPY_DATA_SETUP;
 
+#if defined(RUN_RAJA_SEQ)
   auto daxpy_lam = [=](Index_type i) {
                      DAXPY_BODY;
                    };
+#endif
 
   switch ( vid ) {
 
diff --git a/src/basic/DAXPY_ATOMIC-Seq.cpp b/src/basic/DAXPY_ATOMIC-Seq.cpp
@@ -68,7 +68,7 @@ void DAXPY_ATOMIC::runSeqVariant(VariantID vid, size_t RAJAPERF_UNUSED_ARG(tune_
       startTimer();
       for (RepIndex_type irep = 0; irep < run_reps; ++irep) {
 
-        RAJA::forall<RAJA::simd_exec>(
+        RAJA::forall<RAJA::loop_exec>(
           RAJA::RangeSegment(ibegin, iend),
           [=](Index_type i) {
             DAXPY_ATOMIC_RAJA_BODY(RAJA::seq_atomic);
diff --git a/src/basic/IF_QUAD-Seq.cpp b/src/basic/IF_QUAD-Seq.cpp
@@ -26,9 +26,11 @@ void IF_QUAD::runSeqVariant(VariantID vid, size_t RAJAPERF_UNUSED_ARG(tune_idx))
 
   IF_QUAD_DATA_SETUP;
 
+#if defined(RUN_RAJA_SEQ)
   auto ifquad_lam = [=](Index_type i) {
                       IF_QUAD_BODY;
                     };
+#endif
 
   switch ( vid ) {
 
diff --git a/src/basic/INIT3-Seq.cpp b/src/basic/INIT3-Seq.cpp
@@ -26,9 +26,11 @@ void INIT3::runSeqVariant(VariantID vid, size_t RAJAPERF_UNUSED_ARG(tune_idx))
 
   INIT3_DATA_SETUP;
 
+#if defined(RUN_RAJA_SEQ)
   auto init3_lam = [=](Index_type i) {
                      INIT3_BODY;
                    };
+#endif
 
   switch ( vid ) {
 
diff --git a/src/basic/MAT_MAT_SHARED-OMPTarget.cpp b/src/basic/MAT_MAT_SHARED-OMPTarget.cpp
@@ -19,19 +19,16 @@
 namespace rajaperf {
 namespace basic {
 
+void MAT_MAT_SHARED::runOpenMPTargetVariant(VariantID vid, size_t RAJAPERF_UNUSED_ARG(tune_idx)) 
+{
+  if ( vid == Base_OpenMPTarget ) {
 
-  void MAT_MAT_SHARED::runOpenMPTargetVariant(VariantID vid, size_t RAJAPERF_UNUSED_ARG(tune_idx)) {
-    const Index_type run_reps = getRunReps();
+  } else if ( vid == RAJA_OpenMPTarget ) {
 
-    switch (vid) {
-
-    default: {
-
-      getCout() << "\n MAT_MAT_SHARED : Unknown OpenMPTarget variant id = " << vid << std::endl;
-      break;
-    }
-    }
+  } else {
+     getCout() << "\n MAT_MAT_SHARED : Unknown OpenMPTarget variant id = " << vid << std::endl;
   }
+}
 
 } // end namespace basic
 } // end namespace rajaperf
diff --git a/src/basic/MULADDSUB-Seq.cpp b/src/basic/MULADDSUB-Seq.cpp
@@ -26,9 +26,11 @@ void MULADDSUB::runSeqVariant(VariantID vid, size_t RAJAPERF_UNUSED_ARG(tune_idx
 
   MULADDSUB_DATA_SETUP;
 
+#if defined(RUN_RAJA_SEQ)
   auto mas_lam = [=](Index_type i) {
                    MULADDSUB_BODY;
                  };
+#endif
 
   switch ( vid ) {
 
diff --git a/src/basic/NESTED_INIT-Seq.cpp b/src/basic/NESTED_INIT-Seq.cpp
@@ -24,9 +24,11 @@ void NESTED_INIT::runSeqVariant(VariantID vid, size_t RAJAPERF_UNUSED_ARG(tune_i
 
   NESTED_INIT_DATA_SETUP;
 
+#if defined(RUN_RAJA_SEQ)
   auto nestedinit_lam = [=](Index_type i, Index_type j, Index_type k) {
                           NESTED_INIT_BODY;
                         };
+#endif
 
   switch ( vid ) {
 
diff --git a/src/lcals/DIFF_PREDICT-Seq.cpp b/src/lcals/DIFF_PREDICT-Seq.cpp
@@ -26,9 +26,11 @@ void DIFF_PREDICT::runSeqVariant(VariantID vid, size_t RAJAPERF_UNUSED_ARG(tune_
 
   DIFF_PREDICT_DATA_SETUP;
 
+#if defined(RUN_RAJA_SEQ)
   auto diffpredict_lam = [=](Index_type i) {
                            DIFF_PREDICT_BODY;
                          };
+#endif
 
   switch ( vid ) {
 
diff --git a/src/lcals/EOS-Seq.cpp b/src/lcals/EOS-Seq.cpp
@@ -26,9 +26,11 @@ void EOS::runSeqVariant(VariantID vid, size_t RAJAPERF_UNUSED_ARG(tune_idx))
 
   EOS_DATA_SETUP;
 
+#if defined(RUN_RAJA_SEQ)
   auto eos_lam = [=](Index_type i) {
                    EOS_BODY;
                  };
+#endif
 
   switch ( vid ) {
 
diff --git a/src/lcals/FIRST_DIFF-Seq.cpp b/src/lcals/FIRST_DIFF-Seq.cpp
@@ -26,9 +26,11 @@ void FIRST_DIFF::runSeqVariant(VariantID vid, size_t RAJAPERF_UNUSED_ARG(tune_id
 
   FIRST_DIFF_DATA_SETUP;
 
+#if defined(RUN_RAJA_SEQ)
   auto firstdiff_lam = [=](Index_type i) {
                          FIRST_DIFF_BODY;
                        };
+#endif
 
   switch ( vid ) {
 
diff --git a/src/lcals/FIRST_SUM-Seq.cpp b/src/lcals/FIRST_SUM-Seq.cpp
@@ -26,9 +26,11 @@ void FIRST_SUM::runSeqVariant(VariantID vid, size_t RAJAPERF_UNUSED_ARG(tune_idx
 
   FIRST_SUM_DATA_SETUP;
 
+#if defined(RUN_RAJA_SEQ)
   auto firstsum_lam = [=](Index_type i) {
                         FIRST_SUM_BODY;
                       };
+#endif
 
   switch ( vid ) {
 
diff --git a/src/lcals/GEN_LIN_RECUR-Seq.cpp b/src/lcals/GEN_LIN_RECUR-Seq.cpp
@@ -24,12 +24,14 @@ void GEN_LIN_RECUR::runSeqVariant(VariantID vid, size_t RAJAPERF_UNUSED_ARG(tune
 
   GEN_LIN_RECUR_DATA_SETUP;
 
+#if defined(RUN_RAJA_SEQ)
   auto genlinrecur_lam1 = [=](Index_type k) {
                             GEN_LIN_RECUR_BODY1;
                           };
   auto genlinrecur_lam2 = [=](Index_type i) {
                             GEN_LIN_RECUR_BODY2;
                           };
+#endif
 
   switch ( vid ) {
 
diff --git a/src/lcals/HYDRO_1D-Seq.cpp b/src/lcals/HYDRO_1D-Seq.cpp
@@ -26,9 +26,11 @@ void HYDRO_1D::runSeqVariant(VariantID vid, size_t RAJAPERF_UNUSED_ARG(tune_idx)
 
   HYDRO_1D_DATA_SETUP;
 
+#if defined(RUN_RAJA_SEQ)
   auto hydro1d_lam = [=](Index_type i) {
                        HYDRO_1D_BODY;
                      };
+#endif
 
   switch ( vid ) {
 
diff --git a/src/lcals/HYDRO_2D-Seq.cpp b/src/lcals/HYDRO_2D-Seq.cpp
@@ -27,6 +27,9 @@ void HYDRO_2D::runSeqVariant(VariantID vid, size_t RAJAPERF_UNUSED_ARG(tune_idx)
   const Index_type jend = m_jn - 1;
 
   HYDRO_2D_DATA_SETUP;
+#if !defined(RUN_RAJA_SEQ)
+  RAJA_UNUSED_VAR(kn);   // prevents a compiler warning in the OpenMP target offload build case
+#endif
 
   switch ( vid ) {
 
diff --git a/src/lcals/INT_PREDICT-Seq.cpp b/src/lcals/INT_PREDICT-Seq.cpp
@@ -26,9 +26,11 @@ void INT_PREDICT::runSeqVariant(VariantID vid, size_t RAJAPERF_UNUSED_ARG(tune_i
 
   INT_PREDICT_DATA_SETUP;
 
+#if defined(RUN_RAJA_SEQ)
   auto intpredict_lam = [=](Index_type i) {
                           INT_PREDICT_BODY;
                         };
+#endif
 
   switch ( vid ) {
 
diff --git a/src/lcals/PLANCKIAN-Seq.cpp b/src/lcals/PLANCKIAN-Seq.cpp
@@ -27,9 +27,11 @@ void PLANCKIAN::runSeqVariant(VariantID vid, size_t RAJAPERF_UNUSED_ARG(tune_idx
 
   PLANCKIAN_DATA_SETUP;
 
+#if defined(RUN_RAJA_SEQ)
   auto planckian_lam = [=](Index_type i) {
                          PLANCKIAN_BODY;
                        };
+#endif
 
   switch ( vid ) {
 
diff --git a/src/lcals/TRIDIAG_ELIM-Seq.cpp b/src/lcals/TRIDIAG_ELIM-Seq.cpp
@@ -26,9 +26,11 @@ void TRIDIAG_ELIM::runSeqVariant(VariantID vid, size_t RAJAPERF_UNUSED_ARG(tune_
 
   TRIDIAG_ELIM_DATA_SETUP;
 
+#if defined(RUN_RAJA_SEQ)
   auto tridiag_elim_lam = [=](Index_type i) {
                             TRIDIAG_ELIM_BODY;
                           };
+#endif
 
   switch ( vid ) {
 
diff --git a/src/stream/ADD-Seq.cpp b/src/stream/ADD-Seq.cpp
@@ -26,9 +26,11 @@ void ADD::runSeqVariant(VariantID vid, size_t RAJAPERF_UNUSED_ARG(tune_idx))
 
   ADD_DATA_SETUP;
 
+#if defined(RUN_RAJA_SEQ)
   auto add_lam = [=](Index_type i) {
                    ADD_BODY;
                  };
+#endif
 
   switch ( vid ) {
 
diff --git a/src/stream/COPY-Seq.cpp b/src/stream/COPY-Seq.cpp
diff --git a/src/stream/MUL-Seq.cpp b/src/stream/MUL-Seq.cpp
diff --git a/src/stream/TRIAD-Seq.cpp b/src/stream/TRIAD-Seq.cpp
