Skip to content

[hotswap] Fixes to use projects/hotswap libhsa_hotswap.so and resolve header paths #7629

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
harsh-amd merged 10 commits into from
Jun 26, 2026
Merged

[hotswap] Fixes to use projects/hotswap libhsa_hotswap.so and resolve header paths #7629

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
271b1d3
hotswap: re-key HSA_TOOLS_LIB allowlist to libhsa-hotswap.so
nirmie Jun 22, 2026
130a49e
hotswap: include amd_comgr.h via its namespaced subdir
nirmie Jun 22, 2026
8fa66e4
hotswap: install libhsa-hotswap.so and link hsa-runtime64
nirmie Jun 22, 2026
e6b00f2
hotswap: derive code-object ISA via amd_comgr_get_data_isa_name
nirmie Jun 23, 2026
3727e5e
hotswap: pass explicit source/target ISA into RetargetCodeObject
nirmie Jun 23, 2026
a13f50e
hotswap: add unit test for code-object ISA parse + rewrite
nirmie Jun 23, 2026
56ed59c
hotswap: fix OnUnload use-after-free via immortal singletons
nirmie Jun 25, 2026
940c9aa
hotswap: add opt-in HSA_HOTSWAP_VERBOSE diagnostic logging
nirmie Jun 25, 2026
c9d7ede
hotswap: simplify OnUnload to table-restore only (drop immortal singl…
nirmie Jun 25, 2026
1df10c2
Merge branch 'develop' into users/nirmie/hotswap-hsa-fixes
nirmie Jun 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion projects/clr/rocclr/device/hotswap.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ namespace amd {
namespace hotswap {

// On when this tool is loaded via HSA_TOOLS_LIB (name must match ROCR LoadTools).
inline constexpr const char* kHotswapToolLib = "libamd_comgr_hotswap_tool.so";
inline constexpr const char* kHotswapToolLib = "libhsa-hotswap.so";

inline bool Enabled() {
const char* tools_lib = std::getenv("HSA_TOOLS_LIB");
Expand Down
13 changes: 12 additions & 1 deletion projects/hotswap/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
cmake_minimum_required(VERSION 3.16)
project(hotswap LANGUAGES CXX)

include(GNUInstallDirs)

set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

Expand All @@ -10,6 +12,7 @@ set(HSA_RUNTIME_INC "${CMAKE_CURRENT_SOURCE_DIR}/../rocr-runtime/runtime/hsa-run

# COMGR is required — provides amd_comgr_hotswap_rewrite.
find_package(amd_comgr CONFIG REQUIRED)
find_package(hsa-runtime64 CONFIG REQUIRED)

find_path(HSA_INCLUDE_DIR hsa.h PATHS ${HSA_RUNTIME_INC} NO_DEFAULT_PATH REQUIRED)

Expand All @@ -36,10 +39,18 @@ target_include_directories(hsa-hotswap PRIVATE
${HSA_RUNTIME_INC}/..
)

target_link_libraries(hsa-hotswap PRIVATE amd_comgr)
target_link_libraries(hsa-hotswap PRIVATE
amd_comgr
hsa-runtime64::hsa-runtime64
Comment thread
nirmie marked this conversation as resolved.
)
set_target_properties(hsa-hotswap PROPERTIES
POSITION_INDEPENDENT_CODE ON)

install(TARGETS hsa-hotswap
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})

# Test executable
add_executable(hotswap_test tests/hotswap_test.cpp hotswap.cpp)
target_include_directories(hotswap_test PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
Expand Down
2 changes: 1 addition & 1 deletion projects/hotswap/hotswap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
//===----------------------------------------------------------------------===//

#include "hotswap.hpp"
#include <amd_comgr.h>
#include "amd_comgr/amd_comgr.h"
#include <cstdio>
#include <cstdlib>
#include <cstring>
Expand Down
4 changes: 2 additions & 2 deletions projects/rocr-runtime/runtime/hsa-runtime/core/runtime/runtime.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2793,12 +2793,12 @@ void Runtime::LoadTools() {
getpid(), rocp_reg_status, rocprofiler_register_error_string(rocp_reg_status));
}

// rocprofiler-register (v3) provides tracing only; the comgr hotswap tool must
// rocprofiler-register (v3) provides tracing only; the hotswap tool must
// intercept and modify HSA calls (it wraps hsa_code_object_reader_create_from_memory),
// which requires the v1 HSA_TOOLS_LIB path. Allow v1 registration specifically for
// that first-party tool so it loads via HSA_TOOLS_LIB alone, without re-enabling v1
// for other tools. General v1 behavior is otherwise unchanged.
static constexpr const char* kHotswapToolLib = "libamd_comgr_hotswap_tool.so";
static constexpr const char* kHotswapToolLib = "libhsa-hotswap.so";
bool allow_v1_registration =
flag().tools_lib_names().find(kHotswapToolLib) != std::string::npos;
if (os::IsEnvVarSet("HSA_TOOLS_ROCPROFILER_V1_TOOLS")) {
Expand Down
Loading