Address review comments

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

Author: Sergey Kanaev

SYCL/AOT/multiple-devices.cpp

@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-// REQUIRES: opencl-aot, ocloc, aoc, cpu, gpu, accelerator
+// REQUIRES: opencl-aot, ocloc, aoc, cpu, gpu, accelerator, llvm-link, llvm-spirv
 // UNSUPPORTED: cuda
 // CUDA is not compatible with SPIR.
 
@@ -18,7 +18,7 @@
 // RUN: %GPU_RUN_PLACEHOLDER %t_all.out
 // RUN: %ACC_RUN_PLACEHOLDER %t_all.out
 
-// FIXME: Change the behaviour when proper automaton for assert support is
+// FIXME: Change the behavior when proper automaton for assert support is
 // introduced
 // Produce object file, spirv, device images to combine these differently
 // at link-time, thus testing various AOT-compiled images configurations
@@ -27,10 +27,10 @@
 // AOT-compile device binary images
 // Neither of AOT tools can compile several files, hence, here is this
 // workaround
-// RUN: %LLVM_SPIRV -r %sycl_libs_dir/libsycl-fallback-cassert.spv -o=%T/fallback-cassert.bc
-// RUN: %LLVM_SPIRV -r %t.spv -o=%t.bc
-// RUN: %LLVM_LINK %t.bc %T/fallback-cassert.bc -o=%t2.bc
-// RUN: %LLVM_SPIRV %t2.bc -o=%t.spv
+// RUN: %llvm_spirv -r %sycl_libs_dir/libsycl-fallback-cassert.spv -o=%T/fallback-cassert.bc
+// RUN: %llvm_spirv -r %t.spv -o=%t.bc
+// RUN: %llvm_link %t.bc %T/fallback-cassert.bc -o=%t2.bc
+// RUN: %llvm_spirv %t2.bc -o=%t.spv
 // RUN: opencl-aot %t.spv -o=%t_cpu.ir --device=cpu
 // RUN: ocloc -file %t.spv -spirv_input -output %t_gen.out -output_no_suffix -device cfl
 // RUN: aoc %t.spv -o %t_fpga.aocx -sycl -dep-files=%t.d

SYCL/lit.cfg.py

@@ -284,14 +284,16 @@
 llvm_spirv_path = find_executable("llvm-spirv")
 if llvm_spirv_path:
   lit_config.note("Found llvm-spirv")
-  config.substitutions.append( ('%LLVM_SPIRV', os.path.realpath(llvm_spirv_path)) )
+  config.available_features.add('llvm-spirv')
+  config.substitutions.append( ('%llvm_spirv', os.path.realpath(llvm_spirv_path)) )
 else:
   lit_config.warning("Can't find llvm-spirv")
 
 llvm_link_path = find_executable("llvm-link")
 if llvm_link_path:
   lit_config.note("Found llvm-link")
-  config.substitutions.append( ('%LLVM_LINK', os.path.realpath(llvm_link_path)) )
+  config.available_features.add('llvm-link')
+  config.substitutions.append( ('%llvm_link', os.path.realpath(llvm_link_path)) )
 else:
   lit_config.warning("Can't find llvm-link")