[SYCL][CUDA] Run more LIT tests with CUDA

Make the backend used explicit in more LIT tests.
These tests failed on machines with only NVIDIA OpenCL available as it
is not supported.

Signed-off-by: Bjoern Knafla <[email protected]>

Author: bjoernknafla

sycl/test/basic_tests/diagnostics/device-check.cpp

@@ -1,17 +1,17 @@
-// RUN: %clangxx -fsycl %s -o %t.out
-// RUN: env SYCL_DEVICE_TYPE=cpu %t.out
-// RUN: env SYCL_DEVICE_TYPE=gpu %t.out
-// RUN: env SYCL_DEVICE_TYPE=acc %t.out
-// RUN: env SYCL_DEVICE_TYPE=host %t.out
-// RUN: env SYCL_DEVICE_TYPE=CPU %t.out
-// RUN: env SYCL_DEVICE_TYPE=GPU %t.out
-// RUN: env SYCL_DEVICE_TYPE=ACC %t.out
-// RUN: env SYCL_DEVICE_TYPE=HOST %t.out
-// RUN: env SYCL_DEVICE_TYPE=Cpu %t.out
-// RUN: env SYCL_DEVICE_TYPE=Gpu %t.out
-// RUN: env SYCL_DEVICE_TYPE=Acc %t.out
-// RUN: env SYCL_DEVICE_TYPE=Host %t.out
-// RUN: env SYCL_DEVICE_TYPE=XPU %t.out
+// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
+// RUN: env SYCL_BE=%sycl_be SYCL_DEVICE_TYPE=cpu %t.out
+// RUN: env SYCL_BE=%sycl_be SYCL_DEVICE_TYPE=gpu %t.out
+// RUN: env SYCL_BE=%sycl_be SYCL_DEVICE_TYPE=acc %t.out
+// RUN: env SYCL_BE=%sycl_be SYCL_DEVICE_TYPE=host %t.out
+// RUN: env SYCL_BE=%sycl_be SYCL_DEVICE_TYPE=CPU %t.out
+// RUN: env SYCL_BE=%sycl_be SYCL_DEVICE_TYPE=GPU %t.out
+// RUN: env SYCL_BE=%sycl_be SYCL_DEVICE_TYPE=ACC %t.out
+// RUN: env SYCL_BE=%sycl_be SYCL_DEVICE_TYPE=HOST %t.out
+// RUN: env SYCL_BE=%sycl_be SYCL_DEVICE_TYPE=Cpu %t.out
+// RUN: env SYCL_BE=%sycl_be SYCL_DEVICE_TYPE=Gpu %t.out
+// RUN: env SYCL_BE=%sycl_be SYCL_DEVICE_TYPE=Acc %t.out
+// RUN: env SYCL_BE=%sycl_be SYCL_DEVICE_TYPE=Host %t.out
+// RUN: env SYCL_BE=%sycl_be SYCL_DEVICE_TYPE=XPU %t.out
 
 //==------------------- device-check.cpp --------------------------==//
 // This is a diagnostic test which ensures that

sycl/test/basic_tests/diagnostics/handler.cpp

@@ -1,5 +1,8 @@
-// RUN: %clangxx -fsycl %s -o %t.out
-// RUN: %t.out | FileCheck %s
+// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
+// RUN: env SYCL_DEVICE_TYPE=HOST %t.out | FileCheck %s
+// RUN: %CPU_RUN_PLACEHOLDER %t.out %CPU_CHECK_PLACEHOLDER
+// RUN: %GPU_RUN_PLACEHOLDER %t.out %GPU_CHECK_PLACEHOLDER
+// RUN: %ACC_RUN_PLACEHOLDER %t.out %ACC_CHECK_PLACEHOLDER
 //==------------------- handler.cpp ----------------------------------------==//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

sycl/test/basic_tests/get_nonhost_devices.cpp

@@ -1,6 +1,6 @@
-// RUN: %clangxx -fsycl %s -o %t.out
-// RUN: %t.out
-
+// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
+// RUN: env SYCL_BE=%sycl_be %t.out
+//
 // Check that the host device is not included in devices returned by
 // get_devices() if a non-host device type is specified.
 

sycl/test/basic_tests/queue.cpp

@@ -1,6 +1,8 @@
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
 // RUN: env SYCL_DEVICE_TYPE=HOST %t.out
-// RUN: %t.out
+// RUN: %CPU_RUN_PLACEHOLDER %t.out
+// RUN: %GPU_RUN_PLACEHOLDER %t.out
+// RUN: %ACC_RUN_PLACEHOLDER %t.out
 //==--------------- queue.cpp - SYCL queue test ----------------------------==//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

sycl/test/lit.cfg.py

@@ -74,6 +74,7 @@
 
 backend=lit_config.params.get('SYCL_BE', "PI_OPENCL")
 lit_config.note("Backend: {BACKEND}".format(BACKEND=backend))
+config.substitutions.append( ('%sycl_be', backend) )
 
 get_device_count_by_type_path = os.path.join(config.llvm_tools_dir, "get_device_count_by_type")