Merge Pull Request trilinos#7384 from etphipp/Trilinos/sacado_hier_perf

Automatically Merged using Trilinos Pull Request AutoTester PR Title: Sacado: Rework hieararchical performance tests PR Author: etphipp
tcad-charon · May 20, 2020 · 1aaaa05 · 1aaaa05
2 parents a91acd0 + 5d606fe
commit 1aaaa05
Show file tree

Hide file tree

Showing 31 changed files with 5,497 additions and 25 deletions.
diff --git a/packages/sacado/src/Sacado_Fad_ViewStorage.hpp b/packages/sacado/src/Sacado_Fad_ViewStorage.hpp
@@ -56,6 +56,14 @@ namespace Sacado {
 
   namespace Fad {
 
+#ifndef SACADO_FAD_DERIV_LOOP
+#if defined(SACADO_VIEW_CUDA_HIERARCHICAL_DFAD) && !defined(SACADO_DISABLE_CUDA_IN_KOKKOS) && defined(__CUDA_ARCH__)
+#define SACADO_FAD_DERIV_LOOP(I,SZ) for (int I=threadIdx.x; I<SZ; I+=blockDim.x)
+#else
+#define SACADO_FAD_DERIV_LOOP(I,SZ) for (int I=0; I<SZ; ++I)
+#endif
+#endif
+
     /*!
      * \brief Derivative array storage class that is a view into a contiguous
      * memory allocation.  It does not provide proper value semantics and
@@ -110,10 +118,12 @@ namespace Sacado {
         if (this != &x) {
           *val_ = *x.val_;
           if (stride_one)
-            for (int i=0; i<sz_.value; ++i)
+            //for (int i=0; i<sz_.value; ++i)
+            SACADO_FAD_DERIV_LOOP(i,sz_.value)
               dx_[i] = x.dx_[i];
           else
-            for (int i=0; i<sz_.value; ++i)
+            //for (int i=0; i<sz_.value; ++i)
+            SACADO_FAD_DERIV_LOOP(i,sz_.value)
               dx_[i*stride_.value] = x.dx_[i*x.stride_.value];
         }
         return *this;

diff --git a/packages/sacado/src/new_design/Sacado_Fad_Exp_ViewStorage.hpp b/packages/sacado/src/new_design/Sacado_Fad_Exp_ViewStorage.hpp
@@ -42,6 +42,14 @@ namespace Sacado {
   namespace Fad {
   namespace Exp {
 
+#ifndef SACADO_FAD_DERIV_LOOP
+#if defined(SACADO_VIEW_CUDA_HIERARCHICAL_DFAD) && !defined(SACADO_DISABLE_CUDA_IN_KOKKOS) && defined(__CUDA_ARCH__)
+#define SACADO_FAD_DERIV_LOOP(I,SZ) for (int I=threadIdx.x; I<SZ; I+=blockDim.x)
+#else
+#define SACADO_FAD_DERIV_LOOP(I,SZ) for (int I=0; I<SZ; ++I)
+#endif
+#endif
+
     // Class representing a pointer to ViewFad so that &ViewFad is supported
     template <typename T, unsigned sl, unsigned ss, typename U>
     class ViewFadPtr;
@@ -118,10 +126,12 @@ namespace Sacado {
                 reinterpret_cast<const volatile char&>(x)))) {
           *val_ = *x.val_;
           if (stride_one)
-            for (int i=0; i<sz_.value; ++i)
+            //for (int i=0; i<sz_.value; ++i)
+            SACADO_FAD_DERIV_LOOP(i,sz_.value)
               dx_[i] = x.dx_[i];
           else
-            for (int i=0; i<sz_.value; ++i)
+            //for (int i=0; i<sz_.value; ++i)
+            SACADO_FAD_DERIV_LOOP(i,sz_.value)
               dx_[i*stride_.value] = x.dx_[i*x.stride_.value];
         }
         return *this;

diff --git a/packages/sacado/test/performance/CMakeLists.txt b/packages/sacado/test/performance/CMakeLists.txt
@@ -76,29 +76,34 @@ ENDIF()
 
 IF (Sacado_ENABLE_TeuchosCore AND Sacado_ENABLE_KokkosCore)
 
-  TRIBITS_ADD_EXECUTABLE(
-    fad_kokkos_view
-    SOURCES fad_kokkos_view.cpp
-    COMM serial mpi
-    )
-
-  # These tests do not compile with gcc 4.7.x because it doesn't properly
-  # support lambdas.  See github issue #854
-  IF(NOT ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.8")))
-    TRIBITS_ADD_EXECUTABLE(
-      fad_kokkos_hierarchical
-      SOURCES fad_kokkos_hierarchical.cpp
-      COMM serial mpi
-      )
-
-#    TRIBITS_ADD_EXECUTABLE(
-#      fad_kokkos_mat_vec_perf
-#      SOURCES fad_kokkos_mat_vec_perf.cpp
-#      COMM serial mpi
-#      )
-  ENDIF()
+  # Disable these tests as they have been replaced by mat_vec, advection* below
+
+  # TRIBITS_ADD_EXECUTABLE(
+  #   fad_kokkos_view
+  #   SOURCES fad_kokkos_view.cpp
+  #   COMM serial mpi
+  #   )
+
+  # # These tests do not compile with gcc 4.7.x because it doesn't properly
+  # # support lambdas.  See github issue #854
+  # IF(NOT ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.8")))
+  #   TRIBITS_ADD_EXECUTABLE(
+  #     fad_kokkos_hierarchical
+  #     SOURCES fad_kokkos_hierarchical.cpp
+  #     COMM serial mpi
+  #     )
+
+  #  TRIBITS_ADD_EXECUTABLE(
+  #    fad_kokkos_mat_vec_perf
+  #    SOURCES fad_kokkos_mat_vec_perf.cpp
+  #    COMM serial mpi
+  #    )
+  # ENDIF()
 
 ENDIF()
 
 ADD_SUBDIRECTORY(fenl_assembly)
 ADD_SUBDIRECTORY(fenl_assembly_view)
+ADD_SUBDIRECTORY(mat_vec)
+ADD_SUBDIRECTORY(advection)
+ADD_SUBDIRECTORY(advection_const_basis)
diff --git a/packages/sacado/test/performance/advection/CMakeLists.txt b/packages/sacado/test/performance/advection/CMakeLists.txt
@@ -0,0 +1,22 @@
+ASSERT_DEFINED(PACKAGE_SOURCE_DIR CMAKE_CURRENT_SOURCE_DIR)
+
+INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR})
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+
+IF (Sacado_ENABLE_KokkosCore AND Sacado_ENABLE_TeuchosCore)
+
+  IF(NOT ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.8")))
+
+    TRIBITS_ADD_EXECUTABLE(
+      FadAdvectionHierarchicalTest
+      SOURCES common.hpp
+              advection.hpp advection.cpp
+              advection_hierarchical.hpp advection_hierarchical.cpp
+              advection_hierarchical_dfad.hpp advection_hierarchical_dfad.cpp
+              driver.cpp
+      COMM serial mpi
+      )
+
+  ENDIF()
+
+ENDIF()