[SYCL] Add OpenCL requirement to the tests using OpenCL API (#1242)

Some of the tests do not use OpenCL API directly, but rely on OpenCL interoperability API like sycl::program::build_with_source.

Signed-off-by: Sergey V Maslov <[email protected]>

Co-Authored-By: Rehana Begam <[email protected]>
                Alexey Bader <[email protected]>

Author: rbegam

sycl/test/basic_tests/buffer/buffer.cpp

@@ -1,3 +1,5 @@
+// REQUIRES: opencl
+
 // RUN: %clangxx %s -o %t1.out -lsycl
 // RUN: env SYCL_DEVICE_TYPE=HOST %t1.out
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t2.out

sycl/test/basic_tests/buffer/buffer_interop.cpp

@@ -1,10 +1,10 @@
+// REQUIRES: opencl
+
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -L %opencl_libs_dir -lOpenCL
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// REQUIRES: opencl
-
 //==------------------- buffer.cpp - SYCL buffer basic test ----------------==//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

sycl/test/basic_tests/buffer/subbuffer_interop.cpp

@@ -1,10 +1,10 @@
+// REQUIRES: opencl
+
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -L %opencl_libs_dir -lOpenCL
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// REQUIRES: opencl
-
 //==------------ subbuffer_interop.cpp - SYCL buffer basic test ------------==//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

sycl/test/basic_tests/event.cpp

@@ -1,3 +1,5 @@
+// REQUIRES: opencl
+
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -L %opencl_libs_dir -lOpenCL
 // RUN: env SYCL_DEVICE_TYPE=HOST %t.out
 //==--------------- event.cpp - SYCL event test ----------------------------==//

sycl/test/basic_tests/image_api.cpp

@@ -1,3 +1,5 @@
+// REQUIRES: opencl
+
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -I %sycl_source_dir %s -o %t1.out
 // RUN: %clangxx -I %sycl_source_dir %s -o %t3.out -lsycl
 // RUN: env SYCL_DEVICE_TYPE=HOST %t1.out

sycl/test/basic_tests/kernel_interop.cpp

@@ -1,10 +1,10 @@
+// REQUIRES: opencl
+
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -L %opencl_libs_dir -lOpenCL
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// REQUIRES: opencl
-
 //==--------------- kernel_interop.cpp - SYCL kernel ocl interop test ------==//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

sycl/test/basic_tests/sampler/sampler.cpp

@@ -1,3 +1,5 @@
+// REQUIRES: opencl
+
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -L %opencl_libs_dir -lOpenCL
 // RUN: env SYCL_DEVICE_TYPE=HOST %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out

sycl/test/basic_tests/set_arg_interop.cpp

@@ -1,11 +1,10 @@
+// REQUIRES: opencl
+
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -L %opencl_libs_dir -lOpenCL -O3
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// REQUIRES: opencl
-
-
 #include <CL/sycl.hpp>
 
 #include <cassert>

sycl/test/fpga_tests/fpga_queue.cpp

@@ -1,3 +1,5 @@
+// REQUIRES: opencl
+
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -L %opencl_libs_dir -lOpenCL
 // RUN: env SYCL_DEVICE_TYPE=HOST %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out

sycl/test/kernel-and-program/cache.cpp

@@ -1,3 +1,5 @@
+// REQUIRES: opencl
+
 // RUN: %clangxx -fsycl -I %sycl_source_dir %s -o %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 //==---------------- cache.cpp - SYCL kernel/program test ------------------==//

sycl/test/kernel-and-program/kernel-and-program.cpp

@@ -1,3 +1,5 @@
+// REQUIRES: opencl
+
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -L %opencl_libs_dir -lOpenCL
 // RUN: env SYCL_DEVICE_TYPE=HOST %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out

sycl/test/linear_id/opencl-interop.cpp

@@ -1,8 +1,9 @@
+// REQUIRES: opencl
+
 // RUN: %clangxx -fsycl %s -o %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
-// REQUIRES: opencl
 // UNSUPPORTED: cuda
 //==---------------- opencl-interop.cpp - SYCL linear id test --------------==//
 //

sycl/test/lit.cfg.py

@@ -67,6 +67,9 @@
 if 'OCL_ICD_FILENAMES' in os.environ:
     config.environment['OCL_ICD_FILENAMES'] = os.environ['OCL_ICD_FILENAMES']
 
+if 'SYCL_DEVICE_WHITE_LIST' in os.environ:
+    config.environment['SYCL_DEVICE_WHITE_LIST'] = os.environ['SYCL_DEVICE_WHITE_LIST']
+
 config.substitutions.append( ('%sycl_libs_dir',  config.sycl_libs_dir ) )
 config.substitutions.append( ('%sycl_include',  config.sycl_include ) )
 config.substitutions.append( ('%opencl_libs_dir',  config.opencl_libs_dir) )

sycl/test/ordered_queue/ordered_buffs.cpp

@@ -1,3 +1,5 @@
+// REQUIRES: opencl
+
 // RUN: %clangxx -fsycl %s -o %t.out -L %opencl_libs_dir -lOpenCL
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out

sycl/test/ordered_queue/ordered_dmemll.cpp

@@ -1,3 +1,5 @@
+// REQUIRES: opencl
+
 // RUN: %clangxx -fsycl %s -o %t1.out -L %opencl_libs_dir -lOpenCL
 // RUN: %CPU_RUN_PLACEHOLDER %t1.out
 // RUN: %GPU_RUN_PLACEHOLDER %t1.out

sycl/test/sub_group/common_ocl.cpp

@@ -1,3 +1,5 @@
+// REQUIRES: opencl
+
 // RUN: %clang_cc1 -x cl -cl-std=CL2.0 %S/sg.cl -triple spir64-unknown-unknown -emit-llvm-bc -o %T/kernel_ocl.bc -include opencl-c.h
 // RUN: llvm-spirv %T/kernel_ocl.bc -o %T/kernel_ocl.spv
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -L %opencl_libs_dir -lOpenCL