Undo -DNDEBUG flag for debug rocm builds & adjust axom spack package …

…recipe accordingly, and undo NDEBUG requirement for mesh_tester hip policy
LLNL · Feb 5, 2025 · 716bde3 · 716bde3
1 parent 35b5e4b
commit 716bde3
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 35 deletions.
diff --git a/host-configs/[email protected]_hip.cmake b/host-configs/[email protected]_hip.cmake
@@ -41,7 +41,7 @@ set(CMAKE_Fortran_FLAGS "-ef" CACHE STRING "")
 
 set(ENABLE_FORTRAN ON CACHE BOOL "")
 
-set(CMAKE_CXX_FLAGS_DEBUG "-O1 -g -DNDEBUG" CACHE STRING "")
+set(CMAKE_CXX_FLAGS_DEBUG "-O1 -g" CACHE STRING "")
 
 #------------------------------------------------------------------------------
 # MPI

diff --git a/host-configs/[email protected]_hip.cmake b/host-configs/[email protected]_hip.cmake
@@ -41,8 +41,6 @@ set(CMAKE_Fortran_FLAGS "-Mfreeform" CACHE STRING "")
 
 set(ENABLE_FORTRAN ON CACHE BOOL "")
 
-set(CMAKE_CXX_FLAGS_DEBUG "-O1 -g -DNDEBUG" CACHE STRING "")
-
 #------------------------------------------------------------------------------
 # MPI
 #------------------------------------------------------------------------------

diff --git a/host-configs/[email protected]_hip.cmake b/host-configs/[email protected]_hip.cmake
@@ -41,8 +41,6 @@ set(CMAKE_Fortran_FLAGS "-Mfreeform" CACHE STRING "")
 
 set(ENABLE_FORTRAN ON CACHE BOOL "")
 
-set(CMAKE_CXX_FLAGS_DEBUG "-O1 -g -DNDEBUG" CACHE STRING "")
-
 #------------------------------------------------------------------------------
 # MPI
 #------------------------------------------------------------------------------

diff --git a/host-configs/[email protected]_hip.cmake b/host-configs/[email protected]_hip.cmake
@@ -14,6 +14,9 @@ set(CMAKE_INSTALL_RPATH "/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_10_29_13_
 
 set(CMAKE_BUILD_TYPE "Release" CACHE STRING "")
 
+set(CMAKE_CXX_FLAGS_DEBUG "-O1 -g" CACHE STRING "")
+
+
 #------------------------------------------------------------------------------
 # Compilers
 #------------------------------------------------------------------------------
@@ -41,8 +44,6 @@ set(CMAKE_Fortran_FLAGS "-ef" CACHE STRING "")
 
 set(ENABLE_FORTRAN ON CACHE BOOL "")
 
-set(CMAKE_CXX_FLAGS_DEBUG "-O1 -g -DNDEBUG" CACHE STRING "")
-
 #------------------------------------------------------------------------------
 # MPI
 #------------------------------------------------------------------------------

diff --git a/host-configs/[email protected]_hip.cmake b/host-configs/[email protected]_hip.cmake
@@ -41,8 +41,6 @@ set(CMAKE_Fortran_FLAGS "-Mfreeform" CACHE STRING "")
 
 set(ENABLE_FORTRAN ON CACHE BOOL "")
 
-set(CMAKE_CXX_FLAGS_DEBUG "-O1 -g -DNDEBUG" CACHE STRING "")
-
 #------------------------------------------------------------------------------
 # MPI
 #------------------------------------------------------------------------------

diff --git a/host-configs/[email protected]_hip.cmake b/host-configs/[email protected]_hip.cmake
@@ -41,8 +41,6 @@ set(CMAKE_Fortran_FLAGS "-Mfreeform" CACHE STRING "")
 
 set(ENABLE_FORTRAN ON CACHE BOOL "")
 
-set(CMAKE_CXX_FLAGS_DEBUG "-O1 -g -DNDEBUG" CACHE STRING "")
-
 #------------------------------------------------------------------------------
 # MPI
 #------------------------------------------------------------------------------

diff --git a/scripts/spack/packages/axom/package.py b/scripts/spack/packages/axom/package.py
@@ -288,9 +288,9 @@ def initconfig_compiler_entries(self):
         if "+cpp14" in spec and spec.satisfies("@:0.6.1"):
             entries.append(cmake_cache_string("BLT_CXX_STD", "c++14", ""))
 
-        # Add optimization flag workaround for Debug builds with cray compiler or newer HIP
-        if "+rocm" in spec:
-            entries.append(cmake_cache_string("CMAKE_CXX_FLAGS_DEBUG", "-O1 -g -DNDEBUG"))
+        # Add optimization flag workaround for builds with cray compiler
+        if spec.satisfies("%cce"):
+            entries.append(cmake_cache_string("CMAKE_CXX_FLAGS_DEBUG", "-O1 -g"))
 
         return entries
 

diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
@@ -83,20 +83,7 @@ if(AXOM_ENABLE_QUEST)
         set (_policies "raja_seq")
         blt_list_append(TO _policies ELEMENTS "raja_omp" IF AXOM_ENABLE_OPENMP)
         blt_list_append(TO _policies ELEMENTS "raja_cuda" IF AXOM_ENABLE_CUDA)
-
-        # Test with HIP policy for select optimization flags.
-        # Check for Debug flags that have been overwritten.
-        if(AXOM_ENABLE_HIP)
-            if((CMAKE_BUILD_TYPE MATCHES "(Release|RelWithDebInfo)") OR
-              (CMAKE_BUILD_TYPE MATCHES "Debug" AND
-              CMAKE_CXX_FLAGS_DEBUG MATCHES "\-O1 \-g \-DNDEBUG"))
-                list(APPEND _policies "raja_hip")
-            else()
-              message(STATUS
-                "HIP policy for mesh_tester executable is not being tested"
-              )
-            endif()
-        endif()
+        blt_list_append(TO _policies ELEMENTS "raja_hip" IF AXOM_ENABLE_HIP)
 
         foreach(_method ${_methods})
             foreach(_policy ${_policies})

diff --git a/src/tools/mesh_tester.cpp b/src/tools/mesh_tester.cpp
@@ -51,7 +51,7 @@ using seq_exec = axom::SEQ_EXEC;
     using cuda_exec = seq_exec;
   #endif
 
-  #if defined(AXOM_USE_HIP) && defined(AXOM_USE_UMPIRE) && defined(NDEBUG)
+  #if defined(AXOM_USE_HIP) && defined(AXOM_USE_UMPIRE)
     constexpr int HIP_BLOCK_SIZE = 256;
     using hip_exec = axom::HIP_EXEC<HIP_BLOCK_SIZE>;
   #else
@@ -139,7 +139,7 @@ const std::map<std::string, RuntimePolicy> Input::s_validPolicies({
     #ifdef AXOM_USE_CUDA
   , {"raja_cuda", raja_cuda}
     #endif
-    #if defined(AXOM_USE_HIP) && defined(NDEBUG)
+    #if defined(AXOM_USE_HIP)
   , {"raja_hip", raja_hip}
     #endif
   #endif
@@ -181,7 +181,7 @@ void Input::parse(int argc, char** argv, axom::CLI::App& app)
   #ifdef AXOM_USE_CUDA
   pol_sstr << "\nSet to 'raja_cuda' or 3 to use the RAJA CUDA policy.";
   #endif
-  #if defined(AXOM_USE_HIP) && defined(NDEBUG)
+  #if defined(AXOM_USE_HIP)
   pol_sstr << "\nSet to 'raja_hip' or 4 to use the RAJA HIP policy.";
   #endif
 #endif
@@ -705,7 +705,7 @@ int main(int argc, char** argv)
                                                 params.intersectionThreshold);
         break;
   #endif
-  #if defined(AXOM_USE_HIP) && defined(NDEBUG)
+  #if defined(AXOM_USE_HIP)
       case raja_hip:
         collisions =
           naiveIntersectionAlgorithm<hip_exec>(surface_mesh,
@@ -762,7 +762,7 @@ int main(int argc, char** argv)
           params.intersectionThreshold);
         break;
   #endif
-  #if defined(AXOM_USE_HIP) && defined(NDEBUG)
+  #if defined(AXOM_USE_HIP)
       case raja_hip:
         quest::findTriMeshIntersectionsBVH<hip_exec, double>(
           surface_mesh,
@@ -823,7 +823,7 @@ int main(int argc, char** argv)
           params.intersectionThreshold);
         break;
   #endif
-  #if defined(AXOM_USE_HIP) && defined(AXOM_USE_UMPIRE) && defined(NDEBUG)
+  #if defined(AXOM_USE_HIP) && defined(AXOM_USE_UMPIRE)
       case raja_hip:
         quest::findTriMeshIntersectionsImplicitGrid<hip_exec, double>(
           surface_mesh,
@@ -882,7 +882,7 @@ int main(int argc, char** argv)
           params.intersectionThreshold);
         break;
   #endif
-  #if defined(AXOM_USE_HIP) && defined(AXOM_USE_UMPIRE) && defined(NDEBUG)
+  #if defined(AXOM_USE_HIP) && defined(AXOM_USE_UMPIRE)
       case raja_hip:
         quest::findTriMeshIntersectionsUniformGrid<hip_exec, double>(
           surface_mesh,