Propagate the CUDA toolkit directory into the lit tests

Allows the tests to actually run... :D


[ROCm/clr commit: 9747578d09]

projects/clr/hipamd/hipify-clang/CMakeLists.txt

@@ -70,9 +70,12 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHIPIFY_CLANG_RES=\\\"${LLVM_LIBRARY_DI
 install(TARGETS hipify-clang DESTINATION bin)
 
 if (HIPIFY_CLANG_TESTS)
-    # tests
     find_package(PythonInterp 2.7 REQUIRED EXACT)
 
+    # Populates CUDA_TOOLKIT_ROOT_DIR, which is then applied to the lit config to give the
+    # value of --cuda-path for the test runs.
+    find_package(CUDA REQUIRED)
+
     set(BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
 
     configure_file(

projects/clr/hipamd/tests/hipify-clang/axpy.cu

@@ -1,4 +1,4 @@
-// RUN: hipify "%s" -o=%t --
+// RUN: hipify "%s" -o=%t -- %cuda_args
 
 #include <iostream>
 

projects/clr/hipamd/tests/hipify-clang/lit.cfg

@@ -46,3 +46,5 @@ if obj_root is not None:
 
 config.substitutions.append(("hipify", obj_root+"/hipify-clang"))
 
+# Clang args for CUDA...
+config.substitutions.append(("%cuda_args", "-x cuda --cuda-path=%s --cuda-gpu-arch=sm_30" % config.cuda_root))

projects/clr/hipamd/tests/hipify-clang/lit.site.cfg.in

@@ -2,6 +2,7 @@ import sys
 
 config.llvm_tools_dir = "@LLVM_TOOLS_BINARY_DIR@"
 config.obj_root = "@BINARY_DIR@"
+config.cuda_root = "@CUDA_TOOLKIT_ROOT_DIR@"
 
 # Support substitution of the tools and libs dirs with user parameters. This is
 # used when we can't determine the tool dir at configuration time.