[offload] Move test gpu arch checks into plugins-nextgen

Author: mgorny

offload/CMakeLists.txt

@@ -370,8 +370,8 @@ set(LIBOMPTARGET_LLVM_LIBRARY_INTDIR "${LIBOMPTARGET_INTDIR}" CACHE STRING
   "Path to folder where intermediate libraries will be output")
 
 # Build offloading plugins and device RTLs if they are available.
-add_subdirectory(plugins-nextgen)
 add_subdirectory(DeviceRTL)
+add_subdirectory(plugins-nextgen)
 add_subdirectory(tools)
 
 # Build target agnostic offloading library.

offload/plugins-nextgen/amdgpu/CMakeLists.txt

@@ -20,7 +20,10 @@ endif()
 # Configure testing for the AMDGPU plugin. We will build tests if we could a
 # functional AMD GPU on the system, or if manually specifies by the user.
 option(LIBOMPTARGET_FORCE_AMDGPU_TESTS "Build AMDGPU libomptarget tests" OFF)
-if (LIBOMPTARGET_FOUND_AMDGPU_GPU OR LIBOMPTARGET_FORCE_AMDGPU_TESTS)
+if ((LIBOMPTARGET_FOUND_AMDGPU_GPU
+     AND "${LIBOMPTARGET_AMDGPU_DETECTED_ARCH_LIST}"
+         IN_LIST LIBOMPTARGET_EXPANDED_DEVICE_ARCHITECTURES)
+    OR LIBOMPTARGET_FORCE_AMDGPU_TESTS)
   # Report to the parent scope that we are building a plugin for amdgpu
   set(LIBOMPTARGET_SYSTEM_TARGETS
       "${LIBOMPTARGET_SYSTEM_TARGETS} amdgcn-amd-amdhsa" PARENT_SCOPE)

offload/plugins-nextgen/cuda/CMakeLists.txt

@@ -16,7 +16,10 @@ endif()
 # Configure testing for the CUDA plugin. We will build tests if we could a
 # functional NVIDIA GPU on the system, or if manually specifies by the user.
 option(LIBOMPTARGET_FORCE_NVIDIA_TESTS "Build NVIDIA libomptarget tests" OFF)
-if (LIBOMPTARGET_FOUND_NVIDIA_GPU OR LIBOMPTARGET_FORCE_NVIDIA_TESTS)
+if ((LIBOMPTARGET_FOUND_NVIDIA_GPU
+     AND "${LIBOMPTARGET_DEP_CUDA_ARCH}"
+         IN_LIST LIBOMPTARGET_EXPANDED_DEVICE_ARCHITECTURES)
+    OR LIBOMPTARGET_FORCE_NVIDIA_TESTS)
   message(STATUS "Enable tests using CUDA plugin")
   set(LIBOMPTARGET_SYSTEM_TARGETS
       "${LIBOMPTARGET_SYSTEM_TARGETS} nvptx64-nvidia-cuda nvptx64-nvidia-cuda-LTO" PARENT_SCOPE)

offload/test/CMakeLists.txt

@@ -37,20 +37,6 @@ string(REGEX MATCHALL "([^\ ]+\ |[^\ ]+$)" SYSTEM_TARGETS "${LIBOMPTARGET_SYSTEM
 foreach(CURRENT_TARGET IN LISTS SYSTEM_TARGETS)
   string(STRIP "${CURRENT_TARGET}" CURRENT_TARGET)
 
-  if(CURRENT_TARGET MATCHES "^amdgcn" AND
-     NOT "${LIBOMPTARGET_AMDGPU_DETECTED_ARCH_LIST}"
-         IN_LIST LIBOMPTARGET_EXPANDED_DEVICE_ARCHITECTURES)
-    message(WARNING "Detected AMDGPU arch ${LIBOMPTARGET_AMDGPU_DETECTED_ARCH_LIST} "
-                    "not in built arch list, ${CURRENT_TARGET} tests will be skipped")
-    continue()
-  elseif(CURRENT_TARGET MATCHES "^nvptx" AND
-     NOT "${LIBOMPTARGET_DEP_CUDA_ARCH}"
-         IN_LIST LIBOMPTARGET_EXPANDED_DEVICE_ARCHITECTURES)
-    message(WARNING "Detected NVPTX arch ${LIBOMPTARGET_DEP_CUDA_ARCH} "
-                    "not in built arch list, ${CURRENT_TARGET} tests will be skipped")
-    continue()
-  endif()
-
   add_offload_testsuite(check-libomptarget-${CURRENT_TARGET}
     "Running libomptarget tests"
     ${CMAKE_CURRENT_BINARY_DIR}/${CURRENT_TARGET}