commit 54a4aa57791b0d70045182cee4f1f5cb55a2a61c
author Brad King <brad.king@kitware.com> Thu Jun 01 13:49:06 2023 +0000
committer Kitware Robot <kwrobot@kitware.com> Thu Jun 01 09:49:15 2023 -0400
tree 7d4eadef304bfb6dbccf8dd5868a011171d781d6
parent aa3675d28186124a3175b89ed9bfd426c5d6b530
parent 45584508fa26a20981e2b3db08a11cc797f78727

Merge topic 'cuda-ipo-arch'

45584508fa CUDA/NVIDIA: fix LTO with explicit architectures

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Merge-request: !8508

Source/cmGeneratorTarget.cxx

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index f8455c8..2d71492 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -3504,7 +3504,7 @@
       if (architecture.virtual_) {
         flags += "compute_" + architecture.name;
 
-        if (architecture.real) {
+        if (ipoEnabled || architecture.real) {
           flags += ",";
         }
       }

Tests/CudaOnly/DeviceLTO/CMakeLists.txt

diff --git a/Tests/CudaOnly/DeviceLTO/CMakeLists.txt b/Tests/CudaOnly/DeviceLTO/CMakeLists.txt
index 653b35d..5653bdf 100644
--- a/Tests/CudaOnly/DeviceLTO/CMakeLists.txt
+++ b/Tests/CudaOnly/DeviceLTO/CMakeLists.txt
@@ -9,16 +9,23 @@
 add_library(CUDA_dlto STATIC file1.cu file2.cu file3.cu)
 add_executable(CudaOnlyDeviceLTO main.cu)
 
+set(archs_to_test "${CMAKE_CUDA_ARCHITECTURES_ALL}")
+if(CMAKE_CUDA_COMPILER_ID STREQUAL "NVIDIA")
+  # Also test with at least one virtual architecture.
+  list(POP_BACK CMAKE_CUDA_ARCHITECTURES_ALL_MAJOR latest_arch)
+  list(APPEND archs_to_test ${latest_arch}-virtual)
+endif()
+
 set_target_properties(CUDA_dlto
                       PROPERTIES
-                      CUDA_ARCHITECTURES "${CMAKE_CUDA_ARCHITECTURES_ALL}"
+                      CUDA_ARCHITECTURES "${archs_to_test}"
                       CUDA_SEPARABLE_COMPILATION ON
                       POSITION_INDEPENDENT_CODE ON)
 
 set_target_properties(CudaOnlyDeviceLTO
                       PROPERTIES
                       CUDA_SEPARABLE_COMPILATION ON
-                      CUDA_ARCHITECTURES "${CMAKE_CUDA_ARCHITECTURES_ALL}"
+                      CUDA_ARCHITECTURES "${archs_to_test}"
                       )
 
 target_link_libraries(CudaOnlyDeviceLTO PRIVATE CUDA_dlto)