Not supporting device linking in regression tests

Author: Meinersbur

flang-rt/CMakeLists.txt

@@ -23,7 +23,6 @@ set(FLANG_RT_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
 set(FLANG_RT_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}")
 set(FLANG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../flang")
 
-
 # CMake 3.24 is the first version of CMake that directly recognizes Flang.
 # LLVM's requirement is only CMake 3.20, teach CMake 3.20-3.23 how to use Flang.
 if (CMAKE_VERSION VERSION_LESS "3.24")

flang-rt/test/Driver/ctofortran.f90

@@ -1,8 +1,9 @@
 ! UNSUPPORTED: system-windows
+! UNSUPPORTED: offload-cuda
 
 ! RUN: split-file %s %t
 ! RUN: %clang -I"%include/flang" -c %t/cfile.c -o %t/cfile.o
-! RUN: %flang -L"%libdir" %deplibs %t/ffile.f90 %t/cfile.o -o %t/ctofortran
+! RUN: %flang -L"%libdir" %t/ffile.f90 %t/cfile.o -o %t/ctofortran
 ! RUN: env LD_LIBRARY_PATH="$LD_LIBRARY_PATH:%libdir" %t/ctofortran | FileCheck %s
 
 !--- ffile.f90

flang-rt/test/Driver/exec.f90

@@ -1,7 +1,9 @@
 ! REQUIRES: flang-rt
+! UNSUPPORTED: offload-cuda
+
 ! Verify that flang can correctly build executables.
 
-! RUN: %flang -L"%libdir" %s %deplibs -o %t
+! RUN: %flang -L"%libdir" %s -o %t
 ! RUN: env LD_LIBRARY_PATH="$LD_LIBRARY_PATH:%libdir" %t | FileCheck %s
 
 ! CHECK: Hello, World!

flang-rt/test/Runtime/no-cpp-dep.c

@@ -4,9 +4,10 @@ library. It tries to link this simple file against libflang_rt.a with
 a C compiler.
 
 UNSUPPORTED: system-windows
+UNSUPPORTED: offload-cuda
 
 RUN: %if system-aix %{ export OBJECT_MODE=64 %}
-RUN: %cc -std=c99 %s -I%include -L"%libdir" -lflang_rt -lm %deplibs \
+RUN: %cc -std=c99 %s -I%include -L"%libdir" -lflang_rt -lm \
 RUN: %if system-aix %{-lpthread %}
 RUN: rm a.out
 */

flang-rt/test/lit.cfg.py

@@ -97,8 +97,6 @@ def shjoin(args, sep=" "):
 # Library path of libflang_rt.a (for lib search path when using non-Flang driver for linking)
 config.substitutions.append(("%libdir", config.flang_rt_output_resource_lib_dir))
 
-# Additional library depedendencies the that Flang driver does not add itself.
-deplibs = []
+# For CUDA offloading, additional steps (device linking) and libraries (cudart) are needed.
 if config.flang_rt_experimental_offload_support == "CUDA":
-    deplibs.append("-lcudart")
-config.substitutions.append(("%deplibs", shjoin(deplibs)))
+    config.available_features.add("offload-cuda")

flang/test/lit.cfg.py

@@ -163,7 +163,9 @@
         ToolSubst("%not_todo_abort_cmd", command=FindTool("not"), unresolved="fatal")
     )
 
+if config.flang_include_runtime:
     config.available_features.add("flang-rt")
+
 # Add all the tools and their substitutions (if applicable). Use the search paths provided for
 # finding the tools.
 if config.flang_standalone_build: