Skip to content

[rocprofiler-systems] Replace get_env and set_env from timemory inside rocprofiler-systems #6203

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
dgaliffiAMD merged 9 commits into from
Jun 2, 2026
Merged

[rocprofiler-systems] Replace get_env and set_env from timemory inside rocprofiler-systems #6203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ea9063a
Replace get_env and set_env from timemory inside rocprofiler-systems
mradosav-amd May 18, 2026
b8dc665
refactor environment to be mockable and unit testable
mradosav-amd May 19, 2026
db9ad77
fix ci
mradosav-amd May 19, 2026
a726483
fix python extension undefined symbol and clang-format violation
mradosav-amd May 19, 2026
ef6cd91
increase test coverage
mradosav-amd May 27, 2026
c89cd15
improve readability
mradosav-amd May 27, 2026
9fcea32
Applied suggestions from code review
mradosav-amd Jun 1, 2026
e54928e
Applied suggestions from code review 2
mradosav-amd Jun 1, 2026
f9e4282
Add suggestions from code review
mradosav-amd Jun 2, 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
5 changes: 2 additions & 3 deletions projects/rocprofiler-systems/source/bin/common/tool_runner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,8 +330,7 @@ tool_runner::get_initial_environment()
if(!libexec_path.empty()) data.env.set(env::SCRIPT_PATH, libexec_path);

update_verbose_from_env();
const bool verbose = (data.out.verbose > 0);
if(auto llvm_dir = rocprofsys::common::discover_llvm_libdir_for_ompt(verbose);
if(auto llvm_dir = rocprofsys::common::discover_llvm_libdir_for_ompt();
!llvm_dir.empty())
{
data.env.set("LD_LIBRARY_PATH", llvm_dir, update_mode::APPEND);
Expand Down Expand Up @@ -394,7 +393,7 @@ tool_runner::prepare_environment()
rocprofsys::argparse::add_ld_library_path(data);
}

rocprofsys::argparse::add_torch_library_path(data, data.out.verbose > 0);
rocprofsys::argparse::add_torch_library_path(data);
rocprofsys::common::consolidate_env_entries(data.env.current);
}

Expand Down
3 changes: 1 addition & 2 deletions projects/rocprofiler-systems/source/bin/rocprof-sys-causal/impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,7 @@ get_initial_environment()
update_env(_env, "ROCPROFSYS_LAUNCHER", "rocprof-sys-causal");

// Ensure libomptarget.so can be found by the target (OpenMP/HIP apps)
if(auto llvm_dir =
rocprofsys::common::discover_llvm_libdir_for_ompt(get_verbose() > 0);
if(auto llvm_dir = rocprofsys::common::discover_llvm_libdir_for_ompt();
!llvm_dir.empty())
{
update_env(_env, "LD_LIBRARY_PATH", llvm_dir, /*append=*/true);
Expand Down
1 change: 1 addition & 0 deletions projects/rocprofiler-systems/source/bin/rocprof-sys-instrument/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ target_link_libraries(
rocprofiler-systems::rocprofiler-systems-compile-options
rocprofiler-systems::rocprofiler-systems-compile-definitions
rocprofiler-systems::rocprofiler-systems-sanitizer
rocprofiler-systems::rocprofiler-systems-common-library
timemory::timemory-headers
timemory::timemory-extensions
timemory::timemory-core
Expand Down
5 changes: 5 additions & 0 deletions projects/rocprofiler-systems/source/lib/common/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,11 @@ target_compile_definitions(
INTERFACE $<BUILD_INTERFACE:ROCPROFSYS_INTERNAL_BUILD=1>
)

target_link_libraries(
rocprofiler-systems-common-library
INTERFACE $<BUILD_INTERFACE:rocprofiler-systems::rocprofiler-systems-logger>
)

if(ROCPROFSYS_BUILD_TESTING)
add_subdirectory(tests)
endif()
28 changes: 17 additions & 11 deletions projects/rocprofiler-systems/source/lib/common/defines.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,17 +118,23 @@

#define ROCPROFSYS_ATTRIBUTE(...) __attribute__((__VA_ARGS__))
#define ROCPROFSYS_VISIBILITY(MODE) ROCPROFSYS_ATTRIBUTE(visibility(MODE))
#define ROCPROFSYS_PUBLIC_API ROCPROFSYS_VISIBILITY("default")
#define ROCPROFSYS_HIDDEN_API ROCPROFSYS_VISIBILITY("hidden")
#define ROCPROFSYS_INTERNAL_API ROCPROFSYS_VISIBILITY("internal")
#define ROCPROFSYS_INLINE ROCPROFSYS_ATTRIBUTE(always_inline) inline
#define ROCPROFSYS_NOINLINE ROCPROFSYS_ATTRIBUTE(noinline)
#define ROCPROFSYS_HOT ROCPROFSYS_ATTRIBUTE(hot)
#define ROCPROFSYS_COLD ROCPROFSYS_ATTRIBUTE(cold)
#define ROCPROFSYS_CONST ROCPROFSYS_ATTRIBUTE(const)
#define ROCPROFSYS_PURE ROCPROFSYS_ATTRIBUTE(pure)
#define ROCPROFSYS_WEAK ROCPROFSYS_ATTRIBUTE(weak)
#define ROCPROFSYS_PACKED ROCPROFSYS_ATTRIBUTE(__packed__)
#if !defined(ROCPROFSYS_PUBLIC_API)
# define ROCPROFSYS_PUBLIC_API ROCPROFSYS_VISIBILITY("default")
#endif
#if !defined(ROCPROFSYS_HIDDEN_API)
# define ROCPROFSYS_HIDDEN_API ROCPROFSYS_VISIBILITY("hidden")
#endif
#if !defined(ROCPROFSYS_INTERNAL_API)
# define ROCPROFSYS_INTERNAL_API ROCPROFSYS_VISIBILITY("internal")
#endif
#define ROCPROFSYS_INLINE ROCPROFSYS_ATTRIBUTE(always_inline) inline
#define ROCPROFSYS_NOINLINE ROCPROFSYS_ATTRIBUTE(noinline)
#define ROCPROFSYS_HOT ROCPROFSYS_ATTRIBUTE(hot)
#define ROCPROFSYS_COLD ROCPROFSYS_ATTRIBUTE(cold)
#define ROCPROFSYS_CONST ROCPROFSYS_ATTRIBUTE(const)
#define ROCPROFSYS_PURE ROCPROFSYS_ATTRIBUTE(pure)
#define ROCPROFSYS_WEAK ROCPROFSYS_ATTRIBUTE(weak)
#define ROCPROFSYS_PACKED ROCPROFSYS_ATTRIBUTE(__packed__)
#define ROCPROFSYS_PACKED_ALIGN(VAL) \
ROCPROFSYS_PACKED ROCPROFSYS_ATTRIBUTE(__aligned__(VAL))
#define ROCPROFSYS_LIKELY(...) __builtin_expect((__VA_ARGS__), 1)
Expand Down
Loading
Loading