Skip to content

[HIP] Add an --offload-arch option to hip-tpl.py #678

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

Open
jmmartinez wants to merge 3 commits into
base: main
Choose a base branch
from
Open

[HIP] Add an --offload-arch option to hip-tpl.py #678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
95e2fa3
[HIP] Add an --offload-arch option to hip-tpl.py
jmmartinez Dec 12, 2025
4761daf
[HIP] Enable SPIRV backend when testing HIP
jmmartinez Dec 15, 2025
1669a41
[Review] Turn --offload-arch into a list
jmmartinez Dec 16, 2025
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 zorg/buildbot/builders/annotated/hip-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ cmake -G Ninja \
-DCMAKE_C_COMPILER_LAUNCHER=ccache \
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-DCMAKE_VERBOSE_MAKEFILE=1 \
-DLLVM_TARGETS_TO_BUILD="AMDGPU;X86" \
-DLLVM_TARGETS_TO_BUILD="AMDGPU;X86;SPIRV" \
-DLLVM_ENABLE_PROJECTS="clang;lld;clang-tools-extra" \
-DLLVM_ENABLE_RUNTIMES="compiler-rt;libcxx;libcxxabi;libunwind" \
-DCLANG_DEFAULT_LINKER=lld \
Expand Down
23 changes: 21 additions & 2 deletions zorg/buildbot/builders/annotated/hip-tpl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,35 @@

import argparse
import os
import re
import subprocess
import sys
import traceback
import util
import tempfile
from contextlib import contextmanager

def amdgpu_target(target):
if re.match("^(gfx[0-9a-f]+|amdgcnspirv)$", target):
return target
raise ValueError

def main(argv):
parser = argparse.ArgumentParser(prog=os.path.basename(__file__))
parser.add_argument("--offload-arch", action='append', type=amdgpu_target,
help="Offload architectures to be forwarded to AMDGPU_ARCHS "
"during the test suite configuration. This option can appear multiple times. "
"e.g. '--offload-arch gfx90a --offload-arch gfx1010 --offload-arch amdgcnspirv'")

parsed_args = parser.parse_args(sys.argv[1:])

if parsed_args.offload_arch is None:
DEFAULT_OFFLOAD_ARCH = "gfx90a"
offload_arch_cmake_arg = DEFAULT_OFFLOAD_ARCH
else:
offload_arch = set(parsed_args.offload_arch)
offload_arch_cmake_arg = ";".join(sorted(offload_arch))

source_dir = os.path.join("..", "llvm-project")
test_suite_source_dir = os.path.join("/opt/botworker/llvm", "llvm-test-suite")
test_suite_build_dir = "TS-build"
Expand Down Expand Up @@ -63,8 +83,7 @@ def main(argv):

test_suite_cmake_args = ["-GNinja", "-B", test_suite_build_dir, "-S", "."]
test_suite_cmake_args.append("-DTEST_SUITE_EXTERNALS_DIR=/opt/botworker/llvm/External")
# XXX: Use some utility to determine arch?
test_suite_cmake_args.append("-DAMDGPU_ARCHS=gfx90a")
test_suite_cmake_args.append(f"-DAMDGPU_ARCHS={offload_arch_cmake_arg}")
test_suite_cmake_args.append("-DTEST_SUITE_SUBDIRS=External")
# Giving only this flag enables to pull the default Kokkos version.
test_suite_cmake_args.append("-DEXTERNAL_HIP_TESTS_KOKKOS=ON")
Expand Down