[llvm] [Offload][AMDGPU] Make compiler-rt libs visible (PR #209849)

[Kewen Meng via llvm-commits]

https://github.com/Kewen12 updated https://github.com/llvm/llvm-project/pull/209849

>From ab0969fdce996b7f1053fd61d9db67e598baa192 Mon Sep 17 00:00:00 2001
From: Kewen Meng <kewen.meng at amd.com>
Date: Wed, 15 Jul 2026 13:09:24 -0500
Subject: [PATCH 1/2] [Offload][AMDGPU] Make compiler-rt libs visible

---
 offload/test/lit.cfg | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/offload/test/lit.cfg b/offload/test/lit.cfg
index 9dc4e73e4f4c0..d724c4637beed 100644
--- a/offload/test/lit.cfg
+++ b/offload/test/lit.cfg
@@ -258,8 +258,18 @@ def get_target_library_dir():
             return legacy_dir
     return library_dir
 
+def get_compiler_rt_library_dirs():
+    target = remove_suffix_if_present(config.libomptarget_current_target)
+    dirs = glob.glob(os.path.join(config.llvm_library_dir, "clang", "*", "lib",
+                                  target))
+    if target == amdgpu_target:
+        dirs += glob.glob(os.path.join(config.llvm_library_dir, "clang", "*",
+                                       "lib", legacy_amdgpu_target))
+    return dirs
+
 if "gpu" in config.available_features and "intelgpu" not in config.available_features:
-    config.test_flags += " -Xoffload-linker -L" + get_target_library_dir()
+    for library_dir in [get_target_library_dir()] + get_compiler_rt_library_dirs():
+        config.test_flags += " -Xoffload-linker -L" + library_dir
 
 def add_libraries(source):
     if "gpu" not in config.available_features:

>From 9bc1abfcad61e841ee90ff4abfe9d822db068a46 Mon Sep 17 00:00:00 2001
From: Kewen Meng <kewen.meng at amd.com>
Date: Wed, 15 Jul 2026 17:47:34 -0500
Subject: [PATCH 2/2] Add fixme

---
 offload/test/lit.cfg | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/offload/test/lit.cfg b/offload/test/lit.cfg
index d724c4637beed..9a217f675724a 100644
--- a/offload/test/lit.cfg
+++ b/offload/test/lit.cfg
@@ -252,6 +252,8 @@ def get_target_library_dir():
     # The AMDGPU offload triple was renamed amdgcn-amd-amdhsa ->
     # amdgpu-amd-amdhsa. Fall back to the legacy directory when the runtime was
     # built under the old triple name.
+    # FIXME: Drop this once --offload-arch and bundled AMDGPU offload images
+    # consistently use amdgpu-amd-amdhsa.
     if target == amdgpu_target and not os.path.isdir(library_dir):
         legacy_dir = os.path.join(config.llvm_library_dir, legacy_amdgpu_target)
         if os.path.isdir(legacy_dir):
@@ -263,6 +265,8 @@ def get_compiler_rt_library_dirs():
     dirs = glob.glob(os.path.join(config.llvm_library_dir, "clang", "*", "lib",
                                   target))
     if target == amdgpu_target:
+        # FIXME: Drop this once --offload-arch and bundled AMDGPU offload images
+        # consistently use amdgpu-amd-amdhsa.
         dirs += glob.glob(os.path.join(config.llvm_library_dir, "clang", "*",
                                        "lib", legacy_amdgpu_target))
     return dirs