Skip to content

[rocprofiler-systems] - add suffix to libomptarget find_library #7334

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
estewart08 merged 15 commits into from
Jul 9, 2026
Merged

[rocprofiler-systems] - add suffix to libomptarget find_library #7334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
74ee081
[rocprofiler-systems] - add suffix to libomptarget find_library
estewart08 Jun 16, 2026
d71d284
[rocprofiler-systems] - Add llvm host triple to pytest config.py
estewart08 Jun 17, 2026
9f72ebe
[rocprofiler-systems] - Add ROCPROFSYS_ROCM_LLVM_HOST_TRIPLE usage to…
estewart08 Jun 17, 2026
fa4a7e2
[rocprofiler-systems] - Format line break in environment.hpp
estewart08 Jun 17, 2026
ade19df
[rocprofiler-systems] - Address PR comments
estewart08 Jun 22, 2026
bf126de
[rocprofiler-systems] - guard llvm_host_triple path usage in environm…
estewart08 Jun 23, 2026
d21d2ba
[rocprofiler-systems] - python formatting in config.py
estewart08 Jun 23, 2026
b39cf5f
[rocprofiler-systems] - format spaces in in environment.hpp
estewart08 Jun 24, 2026
a120d98
[rocprofiler-systems] - Add result variable to --print-target-triple
estewart08 Jun 26, 2026
013ced7
[rocprofiler-systems] - Address comments in PR
estewart08 Jun 30, 2026
68819c9
[rocprofiler-tests] - Update get_llvm_lib_paths to cached_property
estewart08 Jul 1, 2026
f54185b
Merge branch 'develop' into amd/dev/estewart/rocprofiler-systems-libo…
sputhala-amd Jul 7, 2026
0f2770b
[rocprofiler-systems] - fix exit code variable for llvm host triple
estewart08 Jul 8, 2026
dd55d99
Merge branch 'develop' into amd/dev/estewart/rocprofiler-systems-libo…
estewart08 Jul 8, 2026
3c51dbf
Merge branch 'develop' into amd/dev/estewart/rocprofiler-systems-libo…
estewart08 Jul 8, 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
25 changes: 24 additions & 1 deletion projects/rocprofiler-systems/examples/openmp/target/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,31 @@ set(_LLVM_LIB_HINTS
"/opt/rocm/lib/llvm/lib"
)

# Determine LLVM host triple as libomptarget might be installed there.
execute_process(
COMMAND "${OMP_TARGET_COMPILER}" --print-target-triple
OUTPUT_VARIABLE LLVM_HOST_TRIPLE
OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_QUIET
RESULT_VARIABLE _llvm_host_triple_rc
)
Comment thread
estewart08 marked this conversation as resolved.
Resolved

if(NOT _llvm_host_triple_rc EQUAL 0)
set(LLVM_HOST_TRIPLE "")
rocprofiler_systems_message(
FATAL_ERROR
"'${OMP_TARGET_COMPILER} --print-target-triple' failed (exit code ${_llvm_host_triple_rc})"
"This toolchain may be broken."
)
endif()

# Find libomptarget
find_library(LIBOMPTARGET_SO NAMES omptarget HINTS ${_LLVM_LIB_HINTS})
find_library(
LIBOMPTARGET_SO
NAMES omptarget
HINTS ${_LLVM_LIB_HINTS}
PATH_SUFFIXES ${LLVM_HOST_TRIPLE}
)

if(NOT LIBOMPTARGET_SO)
message(FATAL_ERROR "Could not find libomptarget in any of:\n ${_LLVM_LIB_HINTS}")
Expand Down
36 changes: 36 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 @@ -14,6 +14,42 @@ add_library(
ALIAS rocprofiler-systems-common-library
)

# Query clang for host target triple for defines.h
# This is useful when LLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON and
# the openmp libraries are installed one level deeper in lib/<host-target-triple>.
find_program(
amdclang_EXECUTABLE
NAMES amdclang
HINTS ${ROCmVersion_DIR} ${ROCM_PATH}
ENV ROCM_PATH
/opt/rocm
PATH_SUFFIXES bin llvm/bin lib/llvm/bin
)
Comment thread
estewart08 marked this conversation as resolved.
Resolved
mark_as_advanced(amdclang_EXECUTABLE)
set(LLVM_HOST_TRIPLE "")
if(amdclang_EXECUTABLE)
execute_process(
COMMAND "${amdclang_EXECUTABLE}" --print-target-triple
OUTPUT_VARIABLE LLVM_HOST_TRIPLE
OUTPUT_STRIP_TRAILING_WHITESPACE
RESULT_VARIABLE _llvm_host_triple_result
)
if(NOT _llvm_host_triple_result EQUAL 0)
set(LLVM_HOST_TRIPLE "")
rocprofiler_systems_message(
FATAL_ERROR
"'${amdclang_EXECUTABLE} --print-target-triple' failed (exit code ${_llvm_host_triple_result})"
"This toolchain may be broken."
)
Comment thread
estewart08 marked this conversation as resolved.
Resolved
endif()
else()
rocprofiler_systems_message(
WARNING
"Could not find amdclang to determine the LLVM host triple; "
"libomptarget discovery for LLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON may not work."
)
endif()

configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/defines.h.in
${CMAKE_CURRENT_BINARY_DIR}/defines.h
Expand Down
2 changes: 2 additions & 0 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 @@ -47,6 +47,8 @@
#define ROCPROFSYS_ROCM_VERSION_MINOR @ROCPROFSYS_ROCM_VERSION_MINOR@
#define ROCPROFSYS_ROCM_VERSION_PATCH @ROCPROFSYS_ROCM_VERSION_PATCH@

#define ROCPROFSYS_ROCM_LLVM_HOST_TRIPLE "@LLVM_HOST_TRIPLE@"
Comment thread
estewart08 marked this conversation as resolved.
Resolved

// these can be set via defining the variable in CMake, e.g.:
// cmake -D ROCPROFSYS_CACHELINE_SIZE=N /path/to/source
// if not defined when configuring cmake, these values fall back to
Expand Down
10 changes: 9 additions & 1 deletion projects/rocprofiler-systems/source/lib/common/environment.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ discover_llvm_libdir_for_ompt()
const auto rocm_dir = strip(get_env<std::string>("ROCM_PATH", "/opt/rocm"));
const auto rocmv_dir = strip(get_env<std::string>("ROCmVersion_DIR", ""));

const constexpr auto number_of_candidates = 6;
const constexpr auto number_of_candidates = 8;

std::vector<std::string> candidates;
candidates.reserve(number_of_candidates);
Expand All @@ -439,6 +439,14 @@ discover_llvm_libdir_for_ompt()
}
push_unique(rocm_dir + "/llvm/lib");
push_unique(rocm_dir + "/lib/llvm/lib");

const auto llvm_host_triple = strip(std::string{ ROCPROFSYS_ROCM_LLVM_HOST_TRIPLE });
Comment thread
estewart08 marked this conversation as resolved.
Resolved
if(!llvm_host_triple.empty())
{
push_unique(rocm_dir + "/lib/llvm/lib/" + llvm_host_triple);
push_unique("/opt/rocm/lib/llvm/lib/" + llvm_host_triple);
}

push_unique("/opt/rocm/llvm/lib");
push_unique("/opt/rocm/lib/llvm/lib");

Expand Down
36 changes: 34 additions & 2 deletions projects/rocprofiler-systems/tests/pytest/rocprofsys/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

from __future__ import annotations
from dataclasses import dataclass, field
from functools import cached_property
import getpass
import os
from pathlib import Path
Expand Down Expand Up @@ -76,7 +77,8 @@ def capabilities(self) -> SystemCapabilities:
self._capabilities = SystemCapabilities.from_config(self)
return self._capabilities

def get_llvm_lib_paths(self) -> list[Path]:
@cached_property
def llvm_lib_paths(self) -> list[Path]:
"""Get list of found ROCm LLVM lib paths.

Returns:
Expand All @@ -89,6 +91,36 @@ def get_llvm_lib_paths(self) -> list[Path]:
self.rocm_path / "llvm" / "lib",
self.rocm_path / "lib" / "llvm" / "lib",
]
# Determine the per-target runtime subdir used when
# LLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON
clang_candidates = [
self.rocm_path / "bin" / "amdclang",
self.rocm_path / "llvm" / "bin" / "amdclang",
self.rocm_path / "lib" / "llvm" / "bin" / "amdclang",
]
clang_path = next((c for c in clang_candidates if c.exists()), None)
if clang_path is None:
which_clang = shutil.which("amdclang")
if which_clang:
clang_path = Path(which_clang)
if clang_path is not None:
try:
host_triple = subprocess.run(
[str(clang_path), "--print-target-triple"],
capture_output=True,
text=True,
timeout=10,
check=True,
).stdout.strip()
except (subprocess.SubprocessError, OSError) as exc:
raise RuntimeError(
f"'{clang_path} --print-target-triple' failed; "
"this suggests a broken toolchain."
) from exc
if host_triple:
candidates.append(
self.rocm_path / "lib" / "llvm" / "lib" / host_triple
)
for candidate in candidates:
if candidate.exists():
found_paths.append(candidate)
Expand All @@ -113,7 +145,7 @@ def get_library_path(self) -> str:
paths.append(existing)

# Add ROCm LLVM lib as fallback
for llvm_path in self.get_llvm_lib_paths():
for llvm_path in self.llvm_lib_paths:
paths.append(str(llvm_path))

return ":".join(paths)
Expand Down
Loading