diff options
author | Brad King <brad.king@kitware.com> | 2021-09-13 17:31:28 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2021-09-16 19:33:47 (GMT) |
commit | a71f0fc9c7762a06d0bfdd64d0d490919e12357a (patch) | |
tree | 89468eda1f91241b97d97aa60aad833152aea6e8 /Tests | |
parent | b125e9809a1a3f3e28fc1682c8a33c3a928f79b5 (diff) | |
download | CMake-a71f0fc9c7762a06d0bfdd64d0d490919e12357a.zip CMake-a71f0fc9c7762a06d0bfdd64d0d490919e12357a.tar.gz CMake-a71f0fc9c7762a06d0bfdd64d0d490919e12357a.tar.bz2 |
HIP: Remove ROMClang compiler id and use Clang directly
Since commit bd844387df (ROCMClang: Add the ROCm toolkit derived clang
compiler to CMake, 2020-08-28, v3.21.0-rc1~66^2~6) and commit ff0d2858e1
(HIP: Extract clang compiler details from hipcc, 2020-10-21,
v3.21.0-rc1~66^2~5), the separate `ROCMClang` compiler id for `hipcc`
has caused a few problems:
* The compiler id changed from behavior of CMake 3.20 and below,
breaking projects that already built with `hipcc` treated as `Clang`.
* The implementation of `target_compile_features` was incomplete for
the `ROCMClang` identity.
* Only `hipcc` was identified as `ROCMClang`, so after it is unwrapped
to the underlying `clang++`, future runs of new CMake versions on
an existing build tree would not repeat this.
* Clang should be usable as a HIP compiler without the `hipcc` wrapper.
Remove the `ROMClang` compiler identity, and revise HIP language support
to work directly with a Clang compiler.
Reject direct `hipcc` usage as a HIP compiler. For now it cannot be
supported because it interferes with flags CMake needs to pass to Clang.
Fixes: #22536, #22460, #22593
Diffstat (limited to 'Tests')
-rw-r--r-- | Tests/HIP/WithDefs/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Tests/HIP/WithDefs/CMakeLists.txt b/Tests/HIP/WithDefs/CMakeLists.txt index e2db182..270f957 100644 --- a/Tests/HIP/WithDefs/CMakeLists.txt +++ b/Tests/HIP/WithDefs/CMakeLists.txt @@ -19,7 +19,7 @@ target_compile_options(HIPOnlyWithDefs PRIVATE --offload-arch=gfx900 -DFLAG_COMPILE_LANG_$<COMPILE_LANGUAGE> - $<$<HIP_COMPILER_ID:ROCMClang>:-DFLAG_LANG_IS_HIP=$<COMPILE_LANGUAGE:HIP>> # Host-only defines are possible only on NVCC. + $<$<HIP_COMPILER_ID:Clang>:-DFLAG_LANG_IS_HIP=$<COMPILE_LANGUAGE:HIP>> # Host-only defines are possible only on NVCC. ) target_compile_definitions(HIPOnlyWithDefs |