Updates to build system

- Add "Info" custom build type which turns down the debug level - Add option to compile with thread-local task handle storage (currently off by default)
Otter-Taskification · Apr 29, 2024 · 54a0a6d · 54a0a6d
1 parent 304f8d9
commit 54a0a6d
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 9 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -25,6 +25,10 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_Fortran_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/lib/fmod)
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/ar)
 
+# Custom Info build type is the same as Debug, but uses a different logging level
+set(CMAKE_C_FLAGS_INFO "${CMAKE_C_FLAGS_DEBUG}")
+set(CMAKE_CXX_FLAGS_INFO "${CMAKE_CXX_FLAGS_DEBUG}")
+
 # Absolutely required
 find_package(OTF2)
 message(VERBOSE "OTF2_ROOT: ${OTF2_ROOT}")
@@ -45,6 +49,14 @@ configure_file(
     ${PROJECT_BINARY_DIR}/include/public/config.h # write to build tree
 )
 
+add_library(Otter::debug_level IMPORTED INTERFACE)
+target_compile_definitions(Otter::debug_level INTERFACE
+    $<IF:$<CONFIG:Debug>, DEBUG_LEVEL=3,
+    $<IF:$<CONFIG:Info>, DEBUG_LEVEL=2,
+    $<IF:$<CONFIG:Release>, DEBUG_LEVEL=1,
+    $<IF:$<CONFIG:RelWithDebInfo>, DEBUG_LEVEL=1, DEBUG_LEVEL=0>>>>
+)
+
 add_subdirectory(src/types)
 add_subdirectory(src/otter-trace)
 add_subdirectory(src/otter-task-graph)

diff --git a/CMakePresets.json b/CMakePresets.json
@@ -18,6 +18,15 @@
                 "build-release"
             ]
         },
+        {
+            "name": "clang-info",
+            "displayName": "Clang (info)",
+            "inherits": [
+                "common",
+                "compiler-clang",
+                "build-info"
+            ]
+        },
         {
             "name": "clang-debug",
             "displayName": "Clang (debug)",
@@ -46,6 +55,15 @@
                 "build-release"
             ]
         },
+        {
+            "name": "gcc-info",
+            "displayName": "GCC (info)",
+            "inherits": [
+                "common",
+                "compiler-gcc",
+                "build-info"
+            ]
+        },
         {
             "name": "gcc-debug",
             "displayName": "GCC (debug)",
@@ -71,6 +89,10 @@
             "name": "clang-release",
             "configurePreset": "clang-release"
         },
+        {
+            "name": "clang-info",
+            "configurePreset": "clang-info"
+        },
         {
             "name": "clang-debug",
             "configurePreset": "clang-debug"
@@ -83,6 +105,10 @@
             "name": "gcc-release",
             "configurePreset": "gcc-release"
         },
+        {
+            "name": "gcc-info",
+            "configurePreset": "gcc-info"
+        },
         {
             "name": "gcc-debug",
             "configurePreset": "gcc-debug"

diff --git a/cmake/CMakePresetBases.json b/cmake/CMakePresetBases.json
@@ -12,7 +12,9 @@
             "generator": "Unix Makefiles",
             "binaryDir": "${sourceDir}/build/${presetName}",
             "cacheVariables": {
-                "CMAKE_Fortran_FLAGS": "-ffree-line-length-512"
+                "CMAKE_Fortran_FLAGS": "-ffree-line-length-512",
+                "CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
+                "WITH_THREAD_LOCAL_TASK_HANDLE": "ON"
             }
         },
         {
@@ -54,6 +56,13 @@
                 "CMAKE_BUILD_TYPE": "Release"
             }
         },
+        {
+            "name": "build-info",
+            "hidden": true,
+            "environment": {
+                "CMAKE_BUILD_TYPE": "Info"
+            }
+        },
         {
             "name": "build-debug",
             "hidden": true,

diff --git a/src/otter-task-graph/CMakeLists.txt b/src/otter-task-graph/CMakeLists.txt
@@ -14,12 +14,11 @@ target_include_directories(otter-task-graph
 )
 
 target_link_libraries(otter-task-graph
+    PRIVATE Otter::debug_level
     PRIVATE otter-trace otter-dtype
     INTERFACE OTF2::otf2 pthread # add to the link interface for consumers of otter-task-graph
 )
 
-target_compile_definitions(otter-task-graph PRIVATE DEBUG_LEVEL=$<IF:$<CONFIG:Debug>,3,0>)
-
 foreach(_HEADER IN ITEMS otter-task-graph-user.h otter-task-graph.h otter-task-graph-stub.h)
     list(APPEND OTTER_TASK_GRAPH_PUBLIC_HEADERS "${PROJECT_SOURCE_DIR}/include/api/otter-task-graph/${_HEADER}")
 endforeach()

diff --git a/src/otter-trace/CMakeLists.txt b/src/otter-trace/CMakeLists.txt
@@ -24,11 +24,10 @@ target_include_directories(otter-trace
 )
 
 target_link_libraries(otter-trace
+    PRIVATE Otter::debug_level
     PUBLIC OTF2::otf2 # some otter-trace public headers include OTF2
 )
 
-target_compile_definitions(otter-trace PRIVATE DEBUG_LEVEL=$<IF:$<CONFIG:Debug>,3,0>)
-
 set_property(TARGET otter-trace PROPERTY POSITION_INDEPENDENT_CODE ON)
 
 install(TARGETS otter-trace

diff --git a/src/types/CMakeLists.txt b/src/types/CMakeLists.txt
@@ -13,10 +13,7 @@ target_include_directories(otter-dtype
     PRIVATE ${PROJECT_SOURCE_DIR}/include # for all other includes
 )
 
-target_compile_definitions(otter-dtype
-    PRIVATE
-    DEBUG_LEVEL=$<IF:$<CONFIG:Verbose>,3,0>
-)
+target_link_libraries(otter-dtype PRIVATE Otter::debug_level)
 
 set_property(TARGET otter-dtype PROPERTY POSITION_INDEPENDENT_CODE ON)