[SYCL][E2E] Update SPIR-V target requirement from SYCLBIN tests (#19227)

The SYCLBIN tests were only enabled for SPIR-V targets due to a bug in
PTX builds with the new offload driver
(#18432). Since this is believed to
have been fixed, the requirements can be updated.

---------

Signed-off-by: Larsen, Steffen <[email protected]>

Author: steffenlarsen

sycl/test-e2e/SYCLBIN/basic_executable.cpp

@@ -11,12 +11,11 @@
 // -- Basic test for compiling and loading a SYCLBIN kernel_bundle in executable
 // -- state.
 
-// Due to the regression in https://github.com/intel/llvm/issues/18432 it will
-// fail to build the SYCLBIN with nvptx targets. Once this is fixed,
-// %{sycl_target_opts} should be added to the SYCLBIN generation run-line.
-// REQUIRES: target-spir
+// SYCLBIN currently only properly detects SPIR-V binaries.
+// XFAIL: !target-spir
+// XFAIL-TRACKER: CMPLRLLVM-68811
 
-// RUN: %clangxx --offload-new-driver -fsyclbin=executable %S/Inputs/basic_kernel.cpp -o %t.syclbin
+// RUN: %clangxx --offload-new-driver -fsyclbin=executable %{sycl_target_opts} %S/Inputs/basic_kernel.cpp -o %t.syclbin
 // RUN: %{build} -o %t.out
 // RUN: %{l0_leak_check} %{run} %t.out %t.syclbin
 

sycl/test-e2e/SYCLBIN/basic_input.cpp

@@ -11,12 +11,11 @@
 // -- Basic test for compiling and loading a SYCLBIN kernel_bundle in input
 // -- state.
 
-// Due to the regression in https://github.com/intel/llvm/issues/18432 it will
-// fail to build the SYCLBIN with nvptx targets. Once this is fixed,
-// %{sycl_target_opts} should be added to the SYCLBIN generation run-line.
-// REQUIRES: target-spir
+// SYCLBIN currently only properly detects SPIR-V binaries.
+// XFAIL: !target-spir
+// XFAIL-TRACKER: CMPLRLLVM-68811
 
-// RUN: %clangxx --offload-new-driver -fsyclbin=input %S/Inputs/basic_kernel.cpp -o %t.syclbin
+// RUN: %clangxx --offload-new-driver -fsyclbin=input %{sycl_target_opts} %S/Inputs/basic_kernel.cpp -o %t.syclbin
 // RUN: %{build} -o %t.out
 // RUN: %{l0_leak_check} %{run} %t.out %t.syclbin
 

sycl/test-e2e/SYCLBIN/basic_object.cpp

@@ -11,12 +11,11 @@
 // -- Basic test for compiling and loading a SYCLBIN kernel_bundle in object
 // -- state.
 
-// Due to the regression in https://github.com/intel/llvm/issues/18432 it will
-// fail to build the SYCLBIN with nvptx targets. Once this is fixed,
-// %{sycl_target_opts} should be added to the SYCLBIN generation run-line.
-// REQUIRES: target-spir
+// SYCLBIN currently only properly detects SPIR-V binaries.
+// XFAIL: !target-spir
+// XFAIL-TRACKER: CMPLRLLVM-68811
 
-// RUN: %clangxx --offload-new-driver -fsyclbin=object %S/Inputs/basic_kernel.cpp -o %t.syclbin
+// RUN: %clangxx --offload-new-driver -fsyclbin=object %{sycl_target_opts} %S/Inputs/basic_kernel.cpp -o %t.syclbin
 // RUN: %{build} -o %t.out
 // RUN: %{l0_leak_check} %{run} %t.out %t.syclbin
 

sycl/test-e2e/SYCLBIN/link_input.cpp

@@ -10,9 +10,10 @@
 
 // -- Test for linking two SYCLBIN kernel_bundle.
 
-// Due to the regression in https://github.com/intel/llvm/issues/18432 it will
-// fail to build the SYCLBIN with nvptx targets. Once this is fixed,
-// %{sycl_target_opts} should be added to the SYCLBIN generation run-line.
+// ptxas currently fails to compile images with unresolved symbols. Disable for
+// other targets than SPIR-V until this has been resolved. (CMPLRLLVM-68810)
+// Note: %{sycl_target_opts} should be added to the SYCLBIN compilation lines
+// once fixed.
 // REQUIRES: target-spir
 
 // RUN: %clangxx --offload-new-driver -fsyclbin=input -fsycl-allow-device-image-dependencies %S/Inputs/exporting_function.cpp -o %t.export.syclbin

sycl/test-e2e/SYCLBIN/link_object.cpp

@@ -10,9 +10,10 @@
 
 // -- Test for linking two SYCLBIN kernel_bundle.
 
-// Due to the regression in https://github.com/intel/llvm/issues/18432 it will
-// fail to build the SYCLBIN with nvptx targets. Once this is fixed,
-// %{sycl_target_opts} should be added to the SYCLBIN generation run-line.
+// ptxas currently fails to compile images with unresolved symbols. Disable for
+// other targets than SPIR-V until this has been resolved. (CMPLRLLVM-68810)
+// Note: %{sycl_target_opts} should be added to the SYCLBIN compilation lines
+// once fixed.
 // REQUIRES: target-spir
 
 // RUN: %clangxx --offload-new-driver -fsyclbin=object -fsycl-allow-device-image-dependencies %S/Inputs/exporting_function.cpp -o %t.export.syclbin

sycl/test-e2e/SYCLBIN/link_rtc_input.cpp

@@ -15,11 +15,6 @@
 // -- Test for linking where one kernel is runtime-compiled and one is compiled
 // -- to SYCLBIN.
 
-// Due to the regression in https://github.com/intel/llvm/issues/18432 it will
-// fail to build the SYCLBIN with nvptx targets. Once this is fixed,
-// %{sycl_target_opts} should be added to the SYCLBIN generation run-line.
-// REQUIRES: target-spir
-
 // RUN: %clangxx --offload-new-driver -fsyclbin=input -fsycl-allow-device-image-dependencies %S/Inputs/exporting_function.cpp -o %t.syclbin
 // RUN: %{build} -o %t.out
 // RUN: %{l0_leak_check} %{run}  %t.out %t.syclbin

sycl/test-e2e/SYCLBIN/link_rtc_object.cpp

@@ -15,11 +15,6 @@
 // -- Test for linking where one kernel is runtime-compiled and one is compiled
 // -- to SYCLBIN.
 
-// Due to the regression in https://github.com/intel/llvm/issues/18432 it will
-// fail to build the SYCLBIN with nvptx targets. Once this is fixed,
-// %{sycl_target_opts} should be added to the SYCLBIN generation run-line.
-// REQUIRES: target-spir
-
 // RUN: %clangxx --offload-new-driver -fsyclbin=object -fsycl-allow-device-image-dependencies %S/Inputs/exporting_function.cpp -o %t.syclbin
 // RUN: %{build} -o %t.out
 // RUN: %{l0_leak_check} %{run}  %t.out %t.syclbin

sycl/test-e2e/SYCLBIN/optional_kernel_features_executable.cpp

@@ -11,12 +11,11 @@
 // -- Test for compiling and loading a kernel bundle with a SYCLBIN containing
 //    the use of optional kernel features.
 
-// Due to the regression in https://github.com/intel/llvm/issues/18432 it will
-// fail to build the SYCLBIN with nvptx targets. Once this is fixed,
-// %{sycl_target_opts} should be added to the SYCLBIN generation run-line.
-// REQUIRES: target-spir
+// SYCLBIN currently only properly detects SPIR-V binaries.
+// XFAIL: !target-spir
+// XFAIL-TRACKER: CMPLRLLVM-68811
 
-// RUN: %clangxx --offload-new-driver -fsyclbin=executable %S/Inputs/optional_kernel_features.cpp -o %t.syclbin
+// RUN: %clangxx --offload-new-driver -fsyclbin=executable %{sycl_target_opts} %S/Inputs/optional_kernel_features.cpp -o %t.syclbin
 // RUN: %{build} -o %t.out
 // RUN: %{l0_leak_check} %{run} %t.out %t.syclbin
 

sycl/test-e2e/SYCLBIN/optional_kernel_features_input.cpp

@@ -11,12 +11,11 @@
 // -- Test for compiling and loading a kernel bundle with a SYCLBIN containing
 //    the use of optional kernel features.
 
-// Due to the regression in https://github.com/intel/llvm/issues/18432 it will
-// fail to build the SYCLBIN with nvptx targets. Once this is fixed,
-// %{sycl_target_opts} should be added to the SYCLBIN generation run-line.
-// REQUIRES: target-spir
+// SYCLBIN currently only properly detects SPIR-V binaries.
+// XFAIL: !target-spir
+// XFAIL-TRACKER: CMPLRLLVM-68811
 
-// RUN: %clangxx --offload-new-driver -fsyclbin=input %S/Inputs/optional_kernel_features.cpp -o %t.syclbin
+// RUN: %clangxx --offload-new-driver -fsyclbin=input %{sycl_target_opts} %S/Inputs/optional_kernel_features.cpp -o %t.syclbin
 // RUN: %{build} -o %t.out
 // RUN: %{l0_leak_check} %{run} %t.out %t.syclbin
 

sycl/test-e2e/SYCLBIN/optional_kernel_features_object.cpp

@@ -12,12 +12,11 @@
 // -- Test for compiling and loading a kernel bundle with a SYCLBIN containing
 //    the use of optional kernel features.
 
-// Due to the regression in https://github.com/intel/llvm/issues/18432 it will
-// fail to build the SYCLBIN with nvptx targets. Once this is fixed,
-// %{sycl_target_opts} should be added to the SYCLBIN generation run-line.
-// REQUIRES: target-spir
+// SYCLBIN currently only properly detects SPIR-V binaries.
+// XFAIL: !target-spir
+// XFAIL-TRACKER: CMPLRLLVM-68811
 
-// RUN: %clangxx --offload-new-driver -fsyclbin=object %S/Inputs/optional_kernel_features.cpp -o %t.syclbin
+// RUN: %clangxx --offload-new-driver -fsyclbin=object %{sycl_target_opts} %S/Inputs/optional_kernel_features.cpp -o %t.syclbin
 // RUN: %{build} -o %t.out
 // RUN: %{l0_leak_check} %{run} %t.out %t.syclbin