ROCm · anujshuk-amd · Jan 31, 2025 · Jan 31, 2025 · Jan 31, 2025 · Jan 31, 2025
diff --git a/.gitmodules b/.gitmodules
@@ -9,7 +9,7 @@
 	url = https://github.com/jrmadsen/Caliper.git
 [submodule "external/gotcha"]
 	path = external/gotcha
-	url = https://github.com/jrmadsen/GOTCHA.git
+	url = https://github.com/ROCm/GOTCHA.git
 [submodule "external/llvm-ompt"]
 	path = external/llvm-ompt
 	url = https://github.com/NERSC/LLVM-openmp.git

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # timemory
 
+## Version 4.0.1rc0
+
+> Date: Tue Dec 3, 2025
+
+### Bug Fixes
+
+- Fixed hard-coded thread limit in `operation::set_storage`
+  - Changed from `max_threads = 4096` to use `TIMEMORY_MAX_THREADS`
+  - Prevents segfaults when Linux thread IDs exceed 4096
+
 ## Version 3.2.4
 
 > Date: Mon Jul 19 17:22:28 2021 -0500

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-4.0.0rc0
+4.0.1rc0
diff --git a/cmake/Modules/ConfigBinutils.cmake b/cmake/Modules/ConfigBinutils.cmake
@@ -74,17 +74,15 @@ include(ExternalProject)
 externalproject_add(
     binutils-external
     PREFIX ${PROJECT_BINARY_DIR}/external/binutils
-    URL
-        ${TIMEMORY_BINUTILS_DOWNLOAD_URL}
-        http://ftpmirror.gnu.org/gnu/binutils/binutils-2.40.tar.gz
-        http://mirrors.kernel.org/sourceware/binutils/releases/binutils-2.40.tar.gz
+    URL ${TIMEMORY_BINUTILS_DOWNLOAD_URL}
+        http://ftpmirror.gnu.org/gnu/binutils/binutils-2.42.tar.gz
+        http://mirrors.kernel.org/sourceware/binutils/releases/binutils-2.42.tar.gz
     BUILD_IN_SOURCE 1
     CONFIGURE_COMMAND
         ${CMAKE_COMMAND} -E env CC=${CMAKE_C_COMPILER} CFLAGS=-fPIC\ -O3
         CXX=${CMAKE_CXX_COMPILER} CXXFLAGS=-fPIC\ -O3 <SOURCE_DIR>/configure
         --prefix=${TPL_STAGING_PREFIX} ${_binutils_CONFIG_FLAGS}
-    BUILD_COMMAND ${MAKE_COMMAND} all-libiberty all-bfd all-opcodes all-libelf
-                  all-libsframe
+    BUILD_COMMAND ${MAKE_COMMAND} all-libiberty all-bfd all-opcodes all-libsframe
     INSTALL_COMMAND ""
     BUILD_BYPRODUCTS "${_TIMEMORY_BINUTILS_BUILD_BYPRODUCTS}")
 
@@ -94,7 +92,7 @@ add_custom_command(
     COMMAND ${CMAKE_COMMAND} ARGS -E make_directory ${TPL_STAGING_PREFIX}/lib
     COMMAND
         install ARGS -C
-        ${PROJECT_BINARY_DIR}/external/binutils/src/binutils-external/bfd/libbfd.a
+        ${PROJECT_BINARY_DIR}/external/binutils/src/binutils-external/bfd/.libs/libbfd.a
         ${PROJECT_BINARY_DIR}/external/binutils/src/binutils-external/opcodes/libopcodes.a
         ${PROJECT_BINARY_DIR}/external/binutils/src/binutils-external/libiberty/libiberty.a
         ${PROJECT_BINARY_DIR}/external/binutils/src/binutils-external/libsframe/.libs/libsframe.a

diff --git a/cmake/Modules/ConfigLibunwind.cmake b/cmake/Modules/ConfigLibunwind.cmake
@@ -79,7 +79,7 @@ function(timemory_libunwind_configure)
 endfunction()
 
 function(timemory_libunwind_build)
-    message(STATUS "[timemory] Building libunwind...")
+    message(STATUS "[timemory] Building libunwind.......")
     timemory_libunwind_execute_process(${MAKE_EXE})
 
     # remove installation if new build
@@ -149,7 +149,8 @@ if(TIMEMORY_INSTALL_HEADERS)
     endforeach()
 endif()
 
-file(GLOB libunwind_libs "${PROJECT_BINARY_DIR}/external/libunwind/install/${CMAKE_INSTALL_LIBDIR}/*")
+file(GLOB libunwind_libs
+     "${PROJECT_BINARY_DIR}/external/libunwind/install/${CMAKE_INSTALL_LIBDIR}/*")
 
 foreach(_LIB ${libunwind_libs})
     if(IS_DIRECTORY ${_LIB})
@@ -158,6 +159,19 @@ foreach(_LIB ${libunwind_libs})
 
     if("${_LIB}" MATCHES "\\.so($|\\.)")
         execute_process(COMMAND ${CMAKE_STRIP} ${_LIB})
+        find_program(CHRPATH_EXECUTABLE chrpath)
+        find_program(PATCHELF_EXECUTABLE patchelf)
+
+        if(CHRPATH_EXECUTABLE)
+            execute_process(COMMAND ${CHRPATH_EXECUTABLE} -r "$ORIGIN" ${_LIB})
+        elseif(PATCHELF_EXECUTABLE)
+            execute_process(COMMAND ${PATCHELF_EXECUTABLE} --set-rpath "$ORIGIN" ${_LIB})
+        else()
+            message(
+                AUTHOR_WARNING
+                    "[timemory] Neither chrpath nor patchelf found. Skipping rpath modification for libunwind."
+                )
+        endif()
     endif()
 
     install(
@@ -171,12 +185,15 @@ install(
     DESTINATION ${CMAKE_INSTALL_LIBDIR}/timemory/libunwind/pkgconfig
     OPTIONAL)
 
+# Add include directories with BEFORE to ensure they come first in include search path
+# This ensures GNU libunwind headers are found before LLVM libunwind headers
 target_include_directories(
-    timemory-libunwind SYSTEM
+    timemory-libunwind BEFORE
     INTERFACE $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/external/libunwind/install/include>
               $<INSTALL_INTERFACE:include/timemory/libunwind>)
 target_link_directories(
-    timemory-libunwind INTERFACE
+    timemory-libunwind
+    INTERFACE
     $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/external/libunwind/install/${CMAKE_INSTALL_LIBDIR}>
     $<INSTALL_INTERFACE:${CMAKE_INSTALL_LIBDIR}/timemory/libunwind>)
 target_link_libraries(

diff --git a/cmake/Modules/Packages.cmake b/cmake/Modules/Packages.cmake
@@ -569,7 +569,7 @@ if(TIMEMORY_BUILD_YAML)
     timemory_checkout_git_submodule(
         RELATIVE_PATH external/yaml-cpp
         WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-        REPO_URL https://github.com/jrmadsen/yaml-cpp.git
+        REPO_URL https://github.com/jbeder/yaml-cpp.git
         REPO_BRANCH master)
 
     add_library(timemory-yaml-cpp STATIC)
@@ -1138,8 +1138,8 @@ elseif(TIMEMORY_USE_LIBUNWIND AND TIMEMORY_BUILD_LIBUNWIND)
         RECURSIVE
         RELATIVE_PATH external/libunwind
         WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-        REPO_URL https://github.com/jrmadsen/libunwind.git
-        REPO_BRANCH master)
+        REPO_URL https://github.com/libunwind/libunwind.git
+        REPO_BRANCH v1.8-stable)
 
     include(ConfigLibunwind)
 else()

diff --git a/external/gotcha b/external/gotcha
diff --git a/source/timemory/backends/papi.cpp b/source/timemory/backends/papi.cpp
@@ -39,6 +39,7 @@
 
 #include <regex>
 #include <string>
+#include <unordered_set>
 #include <utility>
 #include <vector>
 
@@ -277,8 +278,8 @@ get_event_code(string_view_cref_t event_code_str)
     int event_code = -1;
     int retval     = PAPI_event_name_to_code(event_code_str.data(), &event_code);
     working()      = check(retval, TIMEMORY_JOIN(' ', "Warning!! Failure converting",
-                                            event_code_str, "to enum value")
-                                  .c_str());
+                                                 event_code_str, "to enum value")
+                                       .c_str());
     return (retval == PAPI_OK) ? event_code : PAPI_NOT_INITED;
 #else
     consume_parameters(event_code_str);
@@ -401,7 +402,7 @@ add_events(int event_set, string_t* events, int number)
 
 TIMEMORY_BACKENDS_INLINE
 hwcounter_info_t
-available_events_info()
+available_events_info(const std::unordered_set<std::string>& excluded_components)
 {
     hwcounter_info_t evts{};
 
@@ -528,6 +529,10 @@ available_events_info()
                 continue;
 #    endif
 
+            // Skip excluded components
+            if(excluded_components.count(component->name) > 0)
+                continue;
+
             // show this component has not found any events yet
             // int num_cmp_events = 0;
 

diff --git a/source/timemory/backends/papi.hpp b/source/timemory/backends/papi.hpp
@@ -254,7 +254,7 @@ check(int retval, string_view_cref_t mesg, bool quiet = false)
 #if defined(TIMEMORY_USE_PAPI)
         auto*  error_str = PAPI_strerror(retval);
         auto&& _msg      = TIMEMORY_JOIN(' ', "[timemory][papi]", mesg, ":: PAPI_error",
-                                    retval, ":", error_str);
+                                         retval, ":", error_str);
         if(settings::papi_fail_on_error())
         {
             TIMEMORY_EXCEPTION(_msg);
@@ -1023,7 +1023,7 @@ overflow(int evt_set, string_view_cref_t evt_name, int threshold, int flags,
 //--------------------------------------------------------------------------------------//
 
 hwcounter_info_t
-available_events_info();
+available_events_info(const std::unordered_set<std::string>& excluded_components = {});
 
 //--------------------------------------------------------------------------------------//
 

diff --git a/source/timemory/components/ompt/context.hpp b/source/timemory/components/ompt/context.hpp
@@ -41,9 +41,20 @@ namespace openmp
 {
 struct labeled_argument
 {
+    template <typename Type>
+    std::string get_type_name(const Type& arg)
+    {
+        const char*                            name = typeid(arg).name();
+        int                                    status;
+        std::unique_ptr<char, void (*)(void*)> demangledName(
+            abi::__cxa_demangle(name, nullptr, nullptr, &status), std::free);
+        return status == 0 ? demangledName.get() : name;
+    }
+
     template <typename Tp>
     labeled_argument(std::string_view _lbl, Tp&& _val)
     : label{ _lbl }
+    , type{ get_type_name(_val) }
     , value{ timemory::join::join("", std::forward<Tp>(_val)) }
     {}
 
@@ -55,6 +66,7 @@ struct labeled_argument
     }
 
     std::string_view label = {};
+    std::string      type  = {};
     std::string      value = {};
 };
 

diff --git a/source/timemory/operations/types.hpp b/source/timemory/operations/types.hpp
@@ -813,7 +813,7 @@ template <typename T>
 struct set_storage
 {
     friend struct get_storage<T>;
-    static constexpr size_t max_threads = 4096;
+    static constexpr size_t max_threads = TIMEMORY_MAX_THREADS;
     using type                          = T;
     using storage_array_t               = std::array<storage<type>*, max_threads>;
 

diff --git a/source/timemory/tpls/cereal/cereal/types/tuple.hpp b/source/timemory/tpls/cereal/cereal/types/tuple.hpp
@@ -101,7 +101,7 @@ struct serialize
     template <class Archive, class... Types>
     inline static void apply(Archive& ar, std::tuple<Types...>& tuple)
     {
-        serialize<Height - 1>::template apply(ar, tuple);
+        serialize<Height - 1>::template apply<>(ar, tuple);
         ar(TIMEMORY_CEREAL_NVP_(tuple_element_name<Height - 1>::c_str(),
                                 std::get<Height - 1>(tuple)));
     }
@@ -123,7 +123,7 @@ template <class Archive, class... Types>
 inline void
 TIMEMORY_CEREAL_SERIALIZE_FUNCTION_NAME(Archive& ar, std::tuple<Types...>& tuple)
 {
-    tuple_detail::serialize<std::tuple_size<std::tuple<Types...>>::value>::template apply(
+    tuple_detail::serialize<std::tuple_size<std::tuple<Types...>>::value>::template apply<>(
         ar, tuple);
 }
 }  // namespace cereal

diff --git a/source/timemory/utility/argparse.cpp b/source/timemory/utility/argparse.cpp
@@ -289,7 +289,7 @@ argument_parser::enable_help()
 TIMEMORY_UTILITY_INLINE
 // clang-format on
 argument_parser::argument&
-argument_parser::enable_help(const std::string& _extra, const std::string& _epilogue,
+argument_parser::enable_help(const std::string _extra, const std::string _epilogue,
                              int _exit_code)
 {
     m_help_enabled = true;
@@ -414,7 +414,7 @@ argument_parser::enable_version(
 TIMEMORY_UTILITY_INLINE
 // clang-format on
 void
-argument_parser::print_help(const std::string& _extra, const std::string& _epilogue)
+argument_parser::print_help(const std::string _extra, const std::string _epilogue)
 {
     end_group();
 
@@ -985,9 +985,7 @@ argument_parser::parse(const std::vector<std::string>& _args, int verbose_level)
     // execute the argument-specific actions
     for(auto& itr : m_arg_map)
     {
-        if(exists(itr.first))
-            itr.second->execute_actions(*this);
-        else if(itr.second->m_default)
+        if(exists(itr.first) || itr.second->m_default)
             itr.second->execute_actions(*this);
     }
 

diff --git a/source/timemory/utility/argparse.hpp b/source/timemory/utility/argparse.hpp
@@ -718,7 +718,6 @@ struct argument_parser
         bool is_separator() const;
 
         friend struct argument_parser;
-        bool                       m_is_default     = false;
         int                        m_position       = Position::IgnoreArgument;
         int                        m_count          = Count::ANY;
         int                        m_min_count      = Count::ANY;
@@ -875,7 +874,7 @@ struct argument_parser
     //
     //----------------------------------------------------------------------------------//
     //
-    void print_help(const std::string& _extra = {}, const std::string& _epilogue = {});
+    void print_help(const std::string _extra = {}, const std::string _epilogue = {});
     //
     //----------------------------------------------------------------------------------//
     //
@@ -982,7 +981,7 @@ struct argument_parser
 
     /// \fn argument& enable_help()
     /// \brief Add a help command
-    argument& enable_help(const std::string& _extra, const std::string& _epilogue = {},
+    argument& enable_help(const std::string _extra, const std::string _epilogue = {},
                           int _exit_code = EXIT_SUCCESS);
 
     /// \fn argument& enable_version(

diff --git a/source/timemory/utility/filepath.cpp b/source/timemory/utility/filepath.cpp
@@ -42,14 +42,14 @@
 #    include <shlwapi.h>
 #endif
 
+#include <algorithm>
 #include <cerrno>
 #include <cstdio>
 #include <cstring>
 #include <fstream>
 #include <iostream>
 #include <sstream>
 #include <string>
-#include <algorithm>
 
 namespace tim
 {