fix(ci): make host-asan test jobs find and use the ASAN runtime

build_tools/github_actions/amdgpu_family_matrix.py

@@ -73,9 +73,15 @@ def load_external_runner_config() -> dict | None:
 
 
 def is_asan():
-    """Determines if this is an ASAN build using BUILD_VARIANT env var."""
-    BUILD_VARIANT = os.getenv("BUILD_VARIANT", "")
-    return BUILD_VARIANT == "asan"
+    """Determines if this is an ASAN-family build using BUILD_VARIANT env var.
+
+    Matches "asan", "host-asan" and their "-debug" forms, like the check in
+    fetch_test_configurations.py. An exact match on "asan" leaves host-asan test
+    jobs without the ASAN handling their callers apply -- most visibly the
+    LD_PRELOAD in test_hiptests.py, without which Catch2 cannot load the
+    instrumented binaries to enumerate tests.
+    """
+    return "asan" in os.getenv("BUILD_VARIANT", "")
 
 
 def select_weighted_label(labels_config: list[dict], context_name: str) -> str:

build_tools/github_actions/configure_asan_env.py

@@ -29,6 +29,7 @@
 
 import argparse
 import os
+import platform
 import subprocess
 import sys
 from pathlib import Path
@@ -58,7 +59,14 @@
     "HSA_XNACK": "1",
 }
 
-ASAN_RUNTIME_LIB = "libclang_rt.asan.so"
+# Which of these exists depends on LLVM_ENABLE_PER_TARGET_RUNTIME_DIR: ON
+# installs <resource-dir>/lib/<triple>/libclang_rt.asan.so, OFF installs
+# <resource-dir>/lib/linux/libclang_rt.asan-<arch>.so. TheRock has flipped
+# between the two (#8077), so try both rather than pinning one.
+ASAN_RUNTIME_LIBS = (
+    "libclang_rt.asan.so",
+    f"libclang_rt.asan-{platform.machine()}.so",
+)
 
 
 def _resolve_asan_runtime(
@@ -72,20 +80,23 @@ def _resolve_asan_runtime(
     if not os.access(clang, os.X_OK):
         return None, f"clang not found at {clang}, ASAN runtime path not resolved"
 
-    try:
-        result = subprocess.run(
-            [str(clang), f"-print-file-name={ASAN_RUNTIME_LIB}"],
-            capture_output=True,
-            text=True,
-            check=True,
-        )
-    except (subprocess.CalledProcessError, OSError) as e:
-        return None, f"could not query {clang} for the ASAN runtime: {e}"
-
-    runtime = Path(result.stdout.strip())
-    if not runtime.is_file():
-        return None, f"ASAN runtime not found at {runtime}"
-    return runtime.resolve(), None
+    for lib in ASAN_RUNTIME_LIBS:
+        try:
+            result = subprocess.run(
+                [str(clang), f"-print-file-name={lib}"],
+                capture_output=True,
+                text=True,
+                check=True,
+            )
+        except (subprocess.CalledProcessError, OSError) as e:
+            return None, f"could not query {clang} for the ASAN runtime: {e}"
+
+        # clang echoes the name back unchanged when it cannot locate the file.
+        runtime = Path(result.stdout.strip())
+        if runtime.is_file():
+            return runtime.resolve(), None
+
+    return None, f"ASAN runtime not found, tried {', '.join(ASAN_RUNTIME_LIBS)}"
 
 
 def _resolve_symbolizer(artifacts_dir: Path) -> tuple[Optional[Path], Optional[str]]:

build_tools/github_actions/tests/configure_asan_env_test.py

@@ -5,6 +5,7 @@
 """Unit tests for configure_asan_env.py"""
 
 import os
+import platform
 import stat
 import sys
 import tempfile
@@ -89,6 +90,35 @@ def test_missing_clang_warns_without_exporting_runtime(self):
             self.assertNotIn("ASAN_RUNTIME_PATH", env)
             self.assertTrue(any("clang not found" in w for w in warnings))
 
+    @requires_posix
+    def test_resolves_the_legacy_arch_suffixed_runtime(self):
+        """The name depends on LLVM_ENABLE_PER_TARGET_RUNTIME_DIR; both must work."""
+        arch_lib = f"libclang_rt.asan-{platform.machine()}.so"
+        with tempfile.TemporaryDirectory() as tmp:
+            artifacts = Path(tmp) / "build"
+            runtime_path = (
+                artifacts / "lib" / "llvm" / "lib" / "clang" / "24" / arch_lib
+            )
+            runtime_path.parent.mkdir(parents=True, exist_ok=True)
+            runtime_path.write_text("")
+            # Real clang echoes the requested name back when it cannot find it.
+            _make_executable(
+                artifacts / "llvm" / "bin" / "clang",
+                "#!/bin/sh\n"
+                f'case "$1" in\n'
+                f'  *={arch_lib}) echo "{runtime_path}" ;;\n'
+                f'  *) echo "${{1#*=}}" ;;\n'
+                f"esac\n",
+            )
+            _make_executable(
+                artifacts / "llvm" / "bin" / "llvm-symbolizer", "#!/bin/sh\n"
+            )
+
+            env, warnings = resolve_asan_env(artifacts)
+
+            self.assertEqual(warnings, [])
+            self.assertEqual(env["ASAN_RUNTIME_PATH"], str(runtime_path.resolve()))
+
     @requires_posix
     def test_missing_runtime_file_warns(self):
         with tempfile.TemporaryDirectory() as tmp: