Ascent build system based on LLVM clang

ORNL · Dec 6, 2023 · 11ebb48 · 11ebb48
1 parent 44bdb87
commit 11ebb48
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 18 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -29,6 +29,7 @@ option(RESOLVE_USE_HIP  "Use HIP language and ROCm library" OFF)
 option(RESOLVE_USE_GPU  "Use GPU device for computations" OFF)
 mark_as_advanced(FORCE RESOLVE_USE_GPU)
 
+option(RESOLVE_USE_ASAN "Use LLVM address sanitizer" OFF)
 option(RESOLVE_USE_DOXYGEN "Use Doxygen to generate Re::Solve documentation" ON)
 set(RESOLVE_CTEST_OUTPUT_DIR ${PROJECT_BINARY_DIR} CACHE PATH "Directory where CTest outputs are saved")
 
@@ -134,6 +135,10 @@ else()
   message(STATUS "Not using HIP")
 endif(RESOLVE_USE_HIP)
 
+if (RESOLVE_USE_ASAN)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fno-omit-frame-pointer")
+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address")
+endif()
 
 # The binary dir is already a global include directory
 configure_file(

diff --git a/CMakePresets.json b/CMakePresets.json
@@ -26,9 +26,7 @@
             "installDir": "${sourceDir}/install",
             "generator": "Unix Makefiles",
             "cacheVariables": {
-                "RESOLVE_USE_HIP": "ON",
-                "RESOLVE_USE_CUDA": "OFF",
-                "RESOLVE_USE_GPU": "ON"
+                "RESOLVE_USE_HIP": "ON"
             }
         },
         {
@@ -39,16 +37,31 @@
             "installDir": "${sourceDir}/install",
             "generator": "Unix Makefiles"
         },
-	    {
+	{
             "name": "ascent",
             "inherits": "cuda",
             "displayName": "Ascent Build",
             "description": "Custom changes specific for Ascent",
             "cacheVariables": {
-                  "CMAKE_C_COMPILER": "$env{OLCF_GCC_ROOT}/bin/gcc",
-                  "CMAKE_CXX_COMPILER": "$env{OLCF_GCC_ROOT}/bin/g++",
-		  "CMAKE_CUDA_ARCHITECTURES": "70"
-	          }
+                "CMAKE_C_COMPILER": "$env{OLCF_GCC_ROOT}/bin/gcc",
+                "CMAKE_CXX_COMPILER": "$env{OLCF_GCC_ROOT}/bin/g++",
+		"CMAKE_CUDA_ARCHITECTURES": "70"
+	    }
+        },
+	{
+            "name": "ascent-clang",
+            "inherits": "cuda",
+            "displayName": "Ascent Build with Clang",
+            "description": "Custom changes specific for Ascent with Clang",
+            "cacheVariables": {
+                "CMAKE_C_COMPILER": "$env{OLCF_LLVM_ROOT}/bin/clang",
+                "CMAKE_CXX_COMPILER": "$env{OLCF_LLVM_ROOT}/bin/clang++",
+                "CMAKE_CUDA_COMPILER": "nvcc",
+                "CMAKE_CUDA_HOST_COMPILER": "$env{OLCF_LLVM_ROOT}/bin/clang++",
+                "CMAKE_CUDA_FLAGS": "-allow-unsupported-compiler",
+                "RESOLVE_USE_ASAN": "OFF",
+		"CMAKE_CUDA_ARCHITECTURES": "70"
+	    }
         },
         {
             "name": "deception",
@@ -72,16 +85,16 @@
             }
         },
         {
-              "name": "crusher",
-	      "inherits": "rocm",
-              "displayName": "Crusher Build",
-              "description": "Custom changes specific for Crusher",
-	      "cacheVariables": {
-                  "CMAKE_HIP_ARCHITECTURES": "gfx90a",
-                  "CMAKE_BUILD_TYPE": "Debug",
-		  "CMAKE_C_COMPILER": "/opt/rocm-5.6.0/llvm/bin/clang",
-                  "CMAKE_CXX_COMPILER": "/opt/rocm-5.6.0/llvm/bin/clang++"
-	          }  
+            "name": "crusher",
+	    "inherits": "rocm",
+            "displayName": "Crusher Build",
+            "description": "Custom changes specific for Crusher",
+	    "cacheVariables": {
+                "CMAKE_HIP_ARCHITECTURES": "gfx90a",
+                "CMAKE_BUILD_TYPE": "Debug",
+	        "CMAKE_C_COMPILER": "/opt/rocm-5.6.0/llvm/bin/clang",
+                "CMAKE_CXX_COMPILER": "/opt/rocm-5.6.0/llvm/bin/clang++"
+	    }  
 	}
     ]
 }
diff --git a/buildsystem/ascent-clang-env.sh b/buildsystem/ascent-clang-env.sh
@@ -0,0 +1,7 @@
+# Load compiler...
+module load llvm/12.0.0
+# Load deps directly
+module load cuda/11.4.2
+module load cmake/3.22.2
+module load suite-sparse/5.10.1
+# Load spack deps
diff --git a/buildsystem/build.sh b/buildsystem/build.sh
@@ -150,6 +150,9 @@ case $MY_CLUSTER in
   dl*|deception|*fat*)
     export MY_CLUSTER=deception
     ;;
+  ascent-clang*)
+    export MY_CLUSTER=ascent-clang
+    ;;
   ascent*)
     export MY_CLUSTER=ascent
     ;;