summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2023-08-01 13:23:02 (GMT)
committerKitware Robot <kwrobot@kitware.com>2023-08-01 13:23:36 (GMT)
commit56defe52904dede45146680369ce64bb477555f1 (patch)
tree790f7176e2c2a7e6478a34c4432c9d3361df4134
parenta27e4d23c2ff9c97069c176137c31c085b7eff56 (diff)
parent1177d5c127598b0fb62b8d5f00a907541cf6beb9 (diff)
downloadCMake-56defe52904dede45146680369ce64bb477555f1.zip
CMake-56defe52904dede45146680369ce64bb477555f1.tar.gz
CMake-56defe52904dede45146680369ce64bb477555f1.tar.bz2
Merge topic 'ci-hip'
1177d5c127 ci: Add HIP job based on Debian image Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8675
-rw-r--r--.gitlab-ci.yml10
-rw-r--r--.gitlab/ci/configure_debian12_hip_radeon.cmake3
-rw-r--r--.gitlab/ci/env_debian12_hip_radeon.sh9
-rw-r--r--.gitlab/os-linux.yml7
4 files changed, 29 insertions, 0 deletions
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: