From 1177d5c127598b0fb62b8d5f00a907541cf6beb9 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 27 Jul 2023 13:25:09 -0400 Subject: ci: Add HIP job based on Debian image The Debian package for `hipcc` organizes the `hip-lang` cmake package differently from the official ROCm base images. Cover it separately. Issue: #24562 --- .gitlab-ci.yml | 10 ++++++++++ .gitlab/ci/configure_debian12_hip_radeon.cmake | 3 +++ .gitlab/ci/env_debian12_hip_radeon.sh | 9 +++++++++ .gitlab/os-linux.yml | 7 +++++++ 4 files changed, 29 insertions(+) create mode 100644 .gitlab/ci/configure_debian12_hip_radeon.cmake create mode 100644 .gitlab/ci/env_debian12_hip_radeon.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 864ee2e..fdfafaf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -195,6 +195,16 @@ t:debian12-makefiles-clang: variables: CMAKE_CI_JOB_NIGHTLY: "true" +t:debian12-hip-radeon: + extends: + - .debian12_hip_radeon + - .cmake_test_linux_release + - .linux_x86_64_tags_radeon + - .run_dependent + - .needs_centos6_x86_64 + variables: + CMAKE_CI_NO_MR: "true" + t:fedora38-ninja-clang: extends: - .fedora38_ninja_clang diff --git a/.gitlab/ci/configure_debian12_hip_radeon.cmake b/.gitlab/ci/configure_debian12_hip_radeon.cmake new file mode 100644 index 0000000..58036b0 --- /dev/null +++ b/.gitlab/ci/configure_debian12_hip_radeon.cmake @@ -0,0 +1,3 @@ +set(CMake_TEST_HIP "ON" CACHE BOOL "") + +include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/env_debian12_hip_radeon.sh b/.gitlab/ci/env_debian12_hip_radeon.sh new file mode 100644 index 0000000..793c985 --- /dev/null +++ b/.gitlab/ci/env_debian12_hip_radeon.sh @@ -0,0 +1,9 @@ +export HIPCXX=/usr/bin/clang++-15 +export HIPFLAGS='--rocm-path=/usr --rocm-device-lib-path=/usr/lib/x86_64-linux-gnu/amdgcn/bitcode' + +# FIXME(debian): Clang is supposed to automatically parse a HIP version file. +# The ROCm installer places it at '$prefix/bin/.hipVersion', but the package +# on Debian moves it to '$prefix/share/hip/version'. llvm-toolchain package +# version 15.0.7-4 has 'debian/patches/amdgpu/usr-search-paths.patch' for this, +# but Debian 12 currently provides version 15.0.6-4 without the patch. +export HIPFLAGS="$HIPFLAGS --hip-version=5.2" diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index def66de..9563d55 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -359,6 +359,13 @@ CMAKE_CONFIGURATION: hip5.5_radeon CMAKE_GENERATOR: "Ninja Multi-Config" +.debian12_hip_radeon: + extends: .debian12 + + variables: + CMAKE_CONFIGURATION: debian12_hip_radeon + CTEST_LABELS: "HIP" + ### C++ modules .gcc_cxx_modules_x86_64: -- cgit v0.12