Add -lcudart for CUDA mode

Author: Meinersbur

flang-rt/test/Driver/ctofortran.f90

@@ -1,7 +1,9 @@
 ! UNSUPPORTED: system-windows
+
 ! RUN: split-file %s %t
-! RUN: chmod +x %t/runtest.sh
-! RUN: %t/runtest.sh %t %t/ffile.f90 %t/cfile.c %flang %libdir | FileCheck %s
+! RUN: %clang -c %t/cfile.c -o %t/cfile.o
+! RUN: %flang -L"%libdir" %deplibs %t/ffile.f90 %t/cfile.o -o %t/ctofortran
+! RUN: env LD_LIBRARY_PATH="$LD_LIBRARY_PATH:%libdir" %t/ctofortran | FileCheck %s
 
 !--- ffile.f90
 program fmain
@@ -65,24 +67,3 @@ end subroutine foo
   foo(desc);
   return;
 }
-!--- runtest.sh
-#!/bin/bash
-TMPDIR=$1
-FFILE=$2
-CFILE=$3
-FLANG=$4
-LIBDIR=$5
-shift 5
-FLAGS="$*"
-BINDIR=`dirname $FLANG`
-CCOMP=$BINDIR/clang
-if [ -x $CCOMP ]
-then
-  export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LIBDIR
-  $CCOMP $FLAGS -c $CFILE -o $TMPDIR/cfile.o
-  $FLANG $FLAGS $FFILE $TMPDIR/cfile.o -o $TMPDIR/ctofortran -L"${LIBDIR}"
-  $TMPDIR/ctofortran # should print "PASS"
-else
-  # No clang compiler, just pass by default
-  echo "PASS"
-fi

flang-rt/test/Driver/exec.f90

@@ -1,6 +1,6 @@
 ! Verify that flang can correctly build executables.
 
-! RUN: %flang -L"%libdir" %s -o %t
+! RUN: %flang -L"%libdir" %s %deplibs -o %t
 ! RUN: env LD_LIBRARY_PATH="$LD_LIBRARY_PATH:%libdir" %t | FileCheck %s
 ! RUN: rm -f %t
 

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

@@ -5,13 +5,9 @@ a C compiler.
 
 UNSUPPORTED: system-windows
 
-FIXME: This currently fails with CUDA-enabled flang-rt because it needs
-       to link libcudart.
-
 RUN: %if system-aix %{ export OBJECT_MODE=64 %}
-RUN: %cc -std=c99 %s -I%include %libruntime -lm \
+RUN: %cc -std=c99 %s -I%include %libruntime -lm %deplibs \
 RUN: %if system-aix %{-lpthread %}
-RUN: rm a.out
 */
 
 #include "flang/Runtime/entry-names.h"

flang-rt/test/lit.cfg.py

@@ -1,10 +1,14 @@
 # -*- Python -*-
 
+import shlex
 import lit.util
 
 from lit.llvm import llvm_config
 from lit.llvm.subst import ToolSubst, FindTool
 
+def shjoin(args, sep=' '):
+    return sep.join([shlex.quote(arg) for arg in args])
+
 # Configuration file for the 'lit' test runner.
 
 # name: The name of this test suite.
@@ -67,22 +71,36 @@
         command=FindTool("flang"),
         extra_args=isysroot_flag,
         unresolved="fatal",
-    )
+    ),
+    ToolSubst(
+        "%clang",
+        command=FindTool("clang"),
+        extra_args=isysroot_flag,
+        unresolved="fatal",
+    ),
+    ToolSubst("%cc",
+        command=config.cc,
+        extra_args=isysroot_flag,
+        unresolved="fatal"
+    ),
 ]
+llvm_config.add_tool_substitutions(tools)
 
-tools.append(ToolSubst("%libdir", command=config.flangrt_build_lib_dir, unresolved="fatal"))
+# Let tests find LLVM's standard tools (FileCheck, split-file, not, ...)
+llvm_config.with_environment("PATH", config.llvm_tools_dir, append_path=True)
+
+# Library path of libflang_rt.a
+config.substitutions.append(("%libdir", config.flangrt_build_lib_dir))
 
 # Define some variables to help us test that the flang runtime doesn't depend on
 # the C++ runtime libraries. For this we need a C compiler.
 libruntime = os.path.join(config.flangrt_build_lib_dir, "libflang_rt.a")
 include = os.path.join(config.flang_source_dir, "include")
-tools.append(
-    ToolSubst("%cc", command=config.cc, extra_args=isysroot_flag, unresolved="fatal")
-)
-tools.append(ToolSubst("%libruntime", command=libruntime, unresolved="fatal"))
-tools.append(ToolSubst("%include", command=include, unresolved="fatal"))
-
-# Let tests find LLVM's standard tools (FileCheck, split-file, not, ...)
-llvm_config.with_environment("PATH", config.llvm_tools_dir, append_path=True)
+config.substitutions.append(("%libruntime", libruntime))
+config.substitutions.append(("%include", include))
 
-llvm_config.add_tool_substitutions(tools)
+# Additional library depedendencies the that flang driver does not add itself.
+deplibs = []
+if config.flangrt_experimental_offload_support == "CUDA":
+    deplibs.append('-lcudart')
+config.substitutions.append(("%deplibs", shjoin(deplibs)))

flang-rt/test/lit.site.cfg.py.in

@@ -7,6 +7,7 @@ config.flang_source_dir = "@FLANG_SOURCE_DIR@"
 config.flangrt_source_dir = "@FLANG_RT_SOURCE_DIR@"
 config.flangrt_binary_test_dir = os.path.dirname(__file__)
 config.flangrt_build_lib_dir = "@FLANG_RT_BUILD_LIB_DIR@"
+config.flangrt_experimental_offload_support = "@FLANG_RT_EXPERIMENTAL_OFFLOAD_SUPPORT@"
 config.cc = "@CMAKE_C_COMPILER@"
 config.osx_sysroot = path(r"@CMAKE_OSX_SYSROOT@")