Merge branch 'develop' into woptim/spack-update

and fix merge conflicts
LLNL · Oct 31, 2024 · 0c61dd7 · 0c61dd7
2 parents 89f1618 + ebe577b
commit 0c61dd7
Show file tree

Hide file tree

Showing 216 changed files with 932 additions and 422 deletions.
diff --git a/src/algorithm/ATOMIC-Cuda.cpp b/src/algorithm/ATOMIC-Cuda.cpp
@@ -111,7 +111,7 @@ void ATOMIC::runCudaVariantReplicateGlobal(VariantID vid)
     startTimer();
     for (RepIndex_type irep = 0; irep < run_reps; ++irep) {
 
-      RAJA::forall<RAJA::cuda_exec<block_size, true /*async*/>>(
+      RAJA::forall<RAJA::cuda_exec<block_size, true /*async*/>>( res,
         RAJA::RangeSegment(ibegin, iend), [=] __device__ (Index_type i) {
           ATOMIC_RAJA_BODY(RAJA::cuda_atomic, i, ATOMIC_VALUE);
       });

diff --git a/src/algorithm/ATOMIC-Hip.cpp b/src/algorithm/ATOMIC-Hip.cpp
@@ -111,7 +111,7 @@ void ATOMIC::runHipVariantReplicateGlobal(VariantID vid)
     startTimer();
     for (RepIndex_type irep = 0; irep < run_reps; ++irep) {
 
-      RAJA::forall<RAJA::hip_exec<block_size, true /*async*/>>(
+      RAJA::forall<RAJA::hip_exec<block_size, true /*async*/>>( res,
         RAJA::RangeSegment(ibegin, iend), [=] __device__ (Index_type i) {
           ATOMIC_RAJA_BODY(RAJA::hip_atomic, i, ATOMIC_VALUE);
       });

diff --git a/src/algorithm/ATOMIC-OMP.cpp b/src/algorithm/ATOMIC-OMP.cpp
@@ -71,10 +71,12 @@ void ATOMIC::runOpenMPVariantReplicate(VariantID vid)
 
     case RAJA_OpenMP : {
 
+      auto res{getHostResource()};
+
       startTimer();
       for (RepIndex_type irep = 0; irep < run_reps; ++irep) {
 
-        RAJA::forall<RAJA::omp_parallel_for_exec>(
+        RAJA::forall<RAJA::omp_parallel_for_exec>( res,
           RAJA::RangeSegment(ibegin, iend), [=](Index_type i) {
             ATOMIC_RAJA_BODY(RAJA::omp_atomic, i, ATOMIC_VALUE);
         });

diff --git a/src/algorithm/ATOMIC-OMPTarget.cpp b/src/algorithm/ATOMIC-OMPTarget.cpp
@@ -52,10 +52,12 @@ void ATOMIC::runOpenMPTargetVariantReplicate(VariantID vid)
 
   } else if ( vid == RAJA_OpenMPTarget ) {
 
+    auto res{getOmpTargetResource()};
+
     startTimer();
     for (RepIndex_type irep = 0; irep < run_reps; ++irep) {
 
-      RAJA::forall<RAJA::omp_target_parallel_for_exec<threads_per_team>>(
+      RAJA::forall<RAJA::omp_target_parallel_for_exec<threads_per_team>>( res,
         RAJA::RangeSegment(ibegin, iend), [=](Index_type i) {
           ATOMIC_RAJA_BODY(RAJA::omp_atomic, i, ATOMIC_VALUE);
       });

diff --git a/src/algorithm/ATOMIC-Seq.cpp b/src/algorithm/ATOMIC-Seq.cpp
@@ -66,10 +66,13 @@ void ATOMIC::runSeqVariantReplicate(VariantID vid)
 
     case RAJA_Seq : {
 
+      auto res{getHostResource()};
+
       startTimer();
       for (RepIndex_type irep = 0; irep < run_reps; ++irep) {
 
-        RAJA::forall<RAJA::seq_exec>( RAJA::RangeSegment(ibegin, iend),
+        RAJA::forall<RAJA::seq_exec>( res,
+          RAJA::RangeSegment(ibegin, iend),
           [=](Index_type i) {
             ATOMIC_RAJA_BODY(RAJA::seq_atomic, i, ATOMIC_VALUE);
         });

diff --git a/src/algorithm/HISTOGRAM-OMP.cpp b/src/algorithm/HISTOGRAM-OMP.cpp
@@ -86,12 +86,14 @@ void HISTOGRAM::runOpenMPVariant(VariantID vid, size_t RAJAPERF_UNUSED_ARG(tune_
 
     case RAJA_OpenMP : {
 
+      auto res{getHostResource()};
+
       startTimer();
       for (RepIndex_type irep = 0; irep < run_reps; ++irep) {
 
         HISTOGRAM_INIT_COUNTS_RAJA(RAJA::omp_multi_reduce);
 
-        RAJA::forall<RAJA::omp_parallel_for_exec>(
+        RAJA::forall<RAJA::omp_parallel_for_exec>( res,
           RAJA::RangeSegment(ibegin, iend), [=](Index_type i) {
             HISTOGRAM_BODY;
         });

diff --git a/src/algorithm/HISTOGRAM-Seq.cpp b/src/algorithm/HISTOGRAM-Seq.cpp
@@ -81,12 +81,15 @@ void HISTOGRAM::runSeqVariant(VariantID vid, size_t RAJAPERF_UNUSED_ARG(tune_idx
 
     case RAJA_Seq : {
 
+      auto res{getHostResource()};
+
       startTimer();
       for (RepIndex_type irep = 0; irep < run_reps; ++irep) {
 
         HISTOGRAM_INIT_COUNTS_RAJA(RAJA::seq_multi_reduce);
 
-        RAJA::forall<RAJA::seq_exec>( RAJA::RangeSegment(ibegin, iend),
+        RAJA::forall<RAJA::seq_exec>( res,
+          RAJA::RangeSegment(ibegin, iend),
           [=](Index_type i) {
             HISTOGRAM_BODY;
         });

diff --git a/src/algorithm/MEMCPY-OMP.cpp b/src/algorithm/MEMCPY-OMP.cpp
@@ -68,10 +68,12 @@ void MEMCPY::runOpenMPVariant(VariantID vid, size_t RAJAPERF_UNUSED_ARG(tune_idx
 
     case RAJA_OpenMP : {
 
+      auto res{getHostResource()};
+
       startTimer();
       for (RepIndex_type irep = 0; irep < run_reps; ++irep) {
 
-        RAJA::forall<RAJA::omp_parallel_for_exec>(
+        RAJA::forall<RAJA::omp_parallel_for_exec>( res,
           RAJA::RangeSegment(ibegin, iend),
           [=](Index_type i) {
             MEMCPY_BODY;

diff --git a/src/algorithm/MEMCPY-OMPTarget.cpp b/src/algorithm/MEMCPY-OMPTarget.cpp
@@ -52,10 +52,12 @@ void MEMCPY::runOpenMPTargetVariant(VariantID vid, size_t RAJAPERF_UNUSED_ARG(tu
 
   } else if ( vid == RAJA_OpenMPTarget ) {
 
+    auto res{getOmpTargetResource()};
+
     startTimer();
     for (RepIndex_type irep = 0; irep < run_reps; ++irep) {
 
-      RAJA::forall<RAJA::omp_target_parallel_for_exec<threads_per_team>>(
+      RAJA::forall<RAJA::omp_target_parallel_for_exec<threads_per_team>>( res,
         RAJA::RangeSegment(ibegin, iend),
         [=](Index_type i) {
           MEMCPY_BODY;

diff --git a/src/algorithm/MEMCPY-Seq.cpp b/src/algorithm/MEMCPY-Seq.cpp
@@ -44,7 +44,7 @@ void MEMCPY::runSeqVariantLibrary(VariantID vid)
 #if defined(RUN_RAJA_SEQ)
     case RAJA_Seq : {
 
-      camp::resources::Host res = camp::resources::Host::get_default();
+      auto res{getHostResource()}; 
 
       startTimer();
       for (RepIndex_type irep = 0; irep < run_reps; ++irep) {
@@ -113,10 +113,13 @@ void MEMCPY::runSeqVariantDefault(VariantID vid)
 
     case RAJA_Seq : {
 
+      auto res{getHostResource()}; 
+
       startTimer();
       for (RepIndex_type irep = 0; irep < run_reps; ++irep) {
 
-        RAJA::forall<RAJA::seq_exec>( RAJA::RangeSegment(ibegin, iend),
+        RAJA::forall<RAJA::seq_exec>( res,
+          RAJA::RangeSegment(ibegin, iend),
           [=](Index_type i) {
             MEMCPY_BODY;
         });

diff --git a/src/algorithm/MEMSET-OMP.cpp b/src/algorithm/MEMSET-OMP.cpp
@@ -68,10 +68,12 @@ void MEMSET::runOpenMPVariant(VariantID vid, size_t RAJAPERF_UNUSED_ARG(tune_idx
 
     case RAJA_OpenMP : {
 
+      auto res{getHostResource()};
+
       startTimer();
       for (RepIndex_type irep = 0; irep < run_reps; ++irep) {
 
-        RAJA::forall<RAJA::omp_parallel_for_exec>(
+        RAJA::forall<RAJA::omp_parallel_for_exec>( res,
           RAJA::RangeSegment(ibegin, iend),
           [=](Index_type i) {
             MEMSET_BODY;

diff --git a/src/algorithm/MEMSET-OMPTarget.cpp b/src/algorithm/MEMSET-OMPTarget.cpp
@@ -52,10 +52,12 @@ void MEMSET::runOpenMPTargetVariant(VariantID vid, size_t RAJAPERF_UNUSED_ARG(tu
 
   } else if ( vid == RAJA_OpenMPTarget ) {
 
+    auto res{getOmpTargetResource()};
+
     startTimer();
     for (RepIndex_type irep = 0; irep < run_reps; ++irep) {
 
-      RAJA::forall<RAJA::omp_target_parallel_for_exec<threads_per_team>>(
+      RAJA::forall<RAJA::omp_target_parallel_for_exec<threads_per_team>>( res,
         RAJA::RangeSegment(ibegin, iend),
         [=](Index_type i) {
           MEMSET_BODY;

diff --git a/src/algorithm/MEMSET-Seq.cpp b/src/algorithm/MEMSET-Seq.cpp
@@ -45,7 +45,7 @@ void MEMSET::runSeqVariantLibrary(VariantID vid)
 #if defined(RUN_RAJA_SEQ)
     case RAJA_Seq : {
 
-      camp::resources::Host res = camp::resources::Host::get_default();
+      auto res{getHostResource()};
 
       startTimer();
       for (RepIndex_type irep = 0; irep < run_reps; ++irep) {
@@ -113,11 +113,14 @@ void MEMSET::runSeqVariantDefault(VariantID vid)
     }
 
     case RAJA_Seq : {
+
+      auto res{getHostResource()};
 
       startTimer();
       for (RepIndex_type irep = 0; irep < run_reps; ++irep) {
 
-        RAJA::forall<RAJA::seq_exec>( RAJA::RangeSegment(ibegin, iend),
+        RAJA::forall<RAJA::seq_exec>( res,
+          RAJA::RangeSegment(ibegin, iend),
           [=](Index_type i) {
             MEMSET_BODY;
         });

diff --git a/src/algorithm/REDUCE_SUM-OMP.cpp b/src/algorithm/REDUCE_SUM-OMP.cpp
@@ -76,7 +76,7 @@ void REDUCE_SUM::runOpenMPVariant(VariantID vid, size_t tune_idx)
 
     case RAJA_OpenMP : {
 
-      RAJA::resources::Host res;
+      auto res{getHostResource()};
 
       if (tune_idx == 0) {
 
@@ -85,7 +85,7 @@ void REDUCE_SUM::runOpenMPVariant(VariantID vid, size_t tune_idx)
 
           RAJA::ReduceSum<RAJA::omp_reduce, Real_type> sum(m_sum_init);
 
-          RAJA::forall<RAJA::omp_parallel_for_exec>(res,
+          RAJA::forall<RAJA::omp_parallel_for_exec>( res,
             RAJA::RangeSegment(ibegin, iend),
             [=](Index_type i) {
               REDUCE_SUM_BODY;
@@ -103,7 +103,7 @@ void REDUCE_SUM::runOpenMPVariant(VariantID vid, size_t tune_idx)
 
           Real_type tsum = m_sum_init;
 
-          RAJA::forall<RAJA::omp_parallel_for_exec>(res,
+          RAJA::forall<RAJA::omp_parallel_for_exec>( res,
             RAJA::RangeSegment(ibegin, iend),
             RAJA::expt::Reduce<RAJA::operators::plus>(&tsum),
             [=] (Index_type i,

diff --git a/src/algorithm/REDUCE_SUM-OMPTarget.cpp b/src/algorithm/REDUCE_SUM-OMPTarget.cpp
@@ -56,12 +56,14 @@ void REDUCE_SUM::runOpenMPTargetVariant(VariantID vid, size_t RAJAPERF_UNUSED_AR
 
   } else if ( vid == RAJA_OpenMPTarget ) {
 
+    auto res{getOmpTargetResource()};
+
     startTimer();
     for (RepIndex_type irep = 0; irep < run_reps; ++irep) {
 
       Real_type tsum = m_sum_init;
 
-      RAJA::forall<RAJA::omp_target_parallel_for_exec<threads_per_team>>(
+      RAJA::forall<RAJA::omp_target_parallel_for_exec<threads_per_team>>( res,
         RAJA::RangeSegment(ibegin, iend),
         RAJA::expt::Reduce<RAJA::operators::plus>(&tsum),
         [=] (Index_type i,

diff --git a/src/algorithm/REDUCE_SUM-Seq.cpp b/src/algorithm/REDUCE_SUM-Seq.cpp
@@ -76,7 +76,7 @@ void REDUCE_SUM::runSeqVariant(VariantID vid, size_t tune_idx)
 
     case RAJA_Seq : {
 
-      RAJA::resources::Host res;
+      auto res{getHostResource()};
 
       if (tune_idx == 0) {
 
@@ -85,8 +85,9 @@ void REDUCE_SUM::runSeqVariant(VariantID vid, size_t tune_idx)
 
           RAJA::ReduceSum<RAJA::seq_reduce, Real_type> sum(m_sum_init);
 
-          RAJA::forall<RAJA::seq_exec>(res,
-            RAJA::RangeSegment(ibegin, iend), [=](Index_type i) {
+          RAJA::forall<RAJA::seq_exec>( res,
+            RAJA::RangeSegment(ibegin, iend),
+            [=](Index_type i) {
               REDUCE_SUM_BODY;
           });
 
@@ -102,7 +103,7 @@ void REDUCE_SUM::runSeqVariant(VariantID vid, size_t tune_idx)
 
           Real_type tsum = m_sum_init;
 
-          RAJA::forall<RAJA::seq_exec>(res,
+          RAJA::forall<RAJA::seq_exec>( res,
             RAJA::RangeSegment(ibegin, iend),
             RAJA::expt::Reduce<RAJA::operators::plus>(&tsum),
             [=] (Index_type i,

diff --git a/src/algorithm/SCAN-OMP.cpp b/src/algorithm/SCAN-OMP.cpp
@@ -163,10 +163,12 @@ void SCAN::runOpenMPVariant(VariantID vid, size_t RAJAPERF_UNUSED_ARG(tune_idx))
 
     case RAJA_OpenMP : {
 
+      auto res{getHostResource()};
+
       startTimer();
       for (RepIndex_type irep = 0; irep < run_reps; ++irep) {
 
-        RAJA::exclusive_scan<RAJA::omp_parallel_for_exec>(RAJA_SCAN_ARGS);
+        RAJA::exclusive_scan<RAJA::omp_parallel_for_exec>(res, RAJA_SCAN_ARGS);
 
       }
       stopTimer();

diff --git a/src/algorithm/SCAN-Seq.cpp b/src/algorithm/SCAN-Seq.cpp
@@ -66,10 +66,12 @@ void SCAN::runSeqVariant(VariantID vid, size_t RAJAPERF_UNUSED_ARG(tune_idx))
 
     case RAJA_Seq : {
 
+      auto res{getHostResource()};
+
       startTimer();
       for (RepIndex_type irep = 0; irep < run_reps; ++irep) {
 
-        RAJA::exclusive_scan<RAJA::seq_exec>(RAJA_SCAN_ARGS);
+        RAJA::exclusive_scan<RAJA::seq_exec>(res, RAJA_SCAN_ARGS);
 
       }
       stopTimer();

diff --git a/src/algorithm/SORT-OMP.cpp b/src/algorithm/SORT-OMP.cpp
@@ -32,10 +32,12 @@ void SORT::runOpenMPVariant(VariantID vid, size_t RAJAPERF_UNUSED_ARG(tune_idx))
 
     case RAJA_OpenMP : {
 
+      auto res{getHostResource()};
+
       startTimer();
       for (RepIndex_type irep = 0; irep < run_reps; ++irep) {
 
-        RAJA::sort<RAJA::omp_parallel_for_exec>(RAJA_SORT_ARGS);
+        RAJA::sort<RAJA::omp_parallel_for_exec>(res, RAJA_SORT_ARGS);
 
       }
       stopTimer();

diff --git a/src/algorithm/SORT-Seq.cpp b/src/algorithm/SORT-Seq.cpp
@@ -44,10 +44,12 @@ void SORT::runSeqVariant(VariantID vid, size_t RAJAPERF_UNUSED_ARG(tune_idx))
 #if defined(RUN_RAJA_SEQ)
     case RAJA_Seq : {
 
+      auto res{getHostResource()};
+
       startTimer();
       for (RepIndex_type irep = 0; irep < run_reps; ++irep) {
 
-        RAJA::sort<RAJA::seq_exec>(RAJA_SORT_ARGS);
+        RAJA::sort<RAJA::seq_exec>(res, RAJA_SORT_ARGS);
 
       }
       stopTimer();

diff --git a/src/algorithm/SORTPAIRS-OMP.cpp b/src/algorithm/SORTPAIRS-OMP.cpp
@@ -32,10 +32,12 @@ void SORTPAIRS::runOpenMPVariant(VariantID vid, size_t RAJAPERF_UNUSED_ARG(tune_
 
     case RAJA_OpenMP : {
 
+      auto res{getHostResource()};
+
       startTimer();
       for (RepIndex_type irep = 0; irep < run_reps; ++irep) {
 
-        RAJA::sort_pairs<RAJA::omp_parallel_for_exec>(RAJA_SORTPAIRS_ARGS);
+        RAJA::sort_pairs<RAJA::omp_parallel_for_exec>(res, RAJA_SORTPAIRS_ARGS);
 
       }
       stopTimer();

diff --git a/src/algorithm/SORTPAIRS-Seq.cpp b/src/algorithm/SORTPAIRS-Seq.cpp
@@ -64,10 +64,12 @@ void SORTPAIRS::runSeqVariant(VariantID vid, size_t RAJAPERF_UNUSED_ARG(tune_idx
 #if defined(RUN_RAJA_SEQ)
     case RAJA_Seq : {
 
+      auto res{getHostResource()};
+
       startTimer();
       for (RepIndex_type irep = 0; irep < run_reps; ++irep) {
 
-        RAJA::sort_pairs<RAJA::seq_exec>(RAJA_SORTPAIRS_ARGS);
+        RAJA::sort_pairs<RAJA::seq_exec>(res, RAJA_SORTPAIRS_ARGS);
 
       }
       stopTimer();

diff --git a/src/apps/CONVECTION3DPA-OMP.cpp b/src/apps/CONVECTION3DPA-OMP.cpp
@@ -131,6 +131,8 @@ void CONVECTION3DPA::runOpenMPVariant(VariantID vid, size_t RAJAPERF_UNUSED_ARG(
 
   case RAJA_OpenMP: {
 
+    auto res{getHostResource()};
+
     using launch_policy = RAJA::LaunchPolicy<RAJA::omp_launch_t>;
 
     using outer_x = RAJA::LoopPolicy<RAJA::omp_for_exec>;
@@ -145,7 +147,7 @@ void CONVECTION3DPA::runOpenMPVariant(VariantID vid, size_t RAJAPERF_UNUSED_ARG(
     for (RepIndex_type irep = 0; irep < run_reps; ++irep) {
 
       // Grid is empty as the host does not need a compute grid to be specified
-      RAJA::launch<launch_policy>(
+      RAJA::launch<launch_policy>( res,
           RAJA::LaunchParams(),
           [=] RAJA_HOST_DEVICE(RAJA::LaunchContext ctx) {
 

diff --git a/src/apps/CONVECTION3DPA-Seq.cpp b/src/apps/CONVECTION3DPA-Seq.cpp
@@ -129,6 +129,8 @@ void CONVECTION3DPA::runSeqVariant(VariantID vid, size_t RAJAPERF_UNUSED_ARG(tun
 #if defined(RUN_RAJA_SEQ)
   case RAJA_Seq: {
 
+    auto res{getHostResource()};
+
     using launch_policy = RAJA::LaunchPolicy<RAJA::seq_launch_t>;
 
     using outer_x = RAJA::LoopPolicy<RAJA::seq_exec>;
@@ -143,7 +145,7 @@ void CONVECTION3DPA::runSeqVariant(VariantID vid, size_t RAJAPERF_UNUSED_ARG(tun
     for (RepIndex_type irep = 0; irep < run_reps; ++irep) {
 
       // Grid is empty as the host does not need a compute grid to be specified
-      RAJA::launch<launch_policy>(
+      RAJA::launch<launch_policy>( res,
           RAJA::LaunchParams(),
           [=] RAJA_HOST_DEVICE(RAJA::LaunchContext ctx) {