From e8564403232c13b3716aa68190084880f2a98a6c Mon Sep 17 00:00:00 2001
From: David Garcia Orozco <david.garcia.orozco@intel.com>
Date: Tue, 28 Jan 2025 16:37:29 -0700
Subject: [PATCH] [SYCL][E2E] Remove `REQUIRES: build-and-run-mode` from
 `syclcompat` and `Adapters` tests (#16795)

As of #16725 tests can properly react to features that affect
compilation on build-only mode (i.e., libraries or OS), additionally we
can also mark if a test should only be built for a specific triple using
the `target-*` features.

This pr removes `REQUIRES: build-and-run-mode` from syclcompat and
Adapters tests, and either lets the test be marked as unsupported due to
requiring a missing build feature (`windows` or `cuda_dev_kit`), or the
test is marked as unsupported for `spir` by requiring `target-nvidia`
---
 sycl/test-e2e/Adapters/cuda_queue_priority.cpp               | 1 -
 sycl/test-e2e/Adapters/dll-detach-order.cpp                  | 1 -
 sycl/test-e2e/syclcompat/kernel/kernel_win.cpp               | 1 -
 sycl/test-e2e/syclcompat/launch/launch_properties.cpp        | 5 +++--
 .../syclcompat/memory/local_memory_ptr_to_integer.cpp        | 3 +--
 5 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/sycl/test-e2e/Adapters/cuda_queue_priority.cpp b/sycl/test-e2e/Adapters/cuda_queue_priority.cpp
index 008637b91f3e2..031dc252c578f 100644
--- a/sycl/test-e2e/Adapters/cuda_queue_priority.cpp
+++ b/sycl/test-e2e/Adapters/cuda_queue_priority.cpp
@@ -1,5 +1,4 @@
 // REQUIRES: gpu, cuda, cuda_dev_kit
-// REQUIRES: build-and-run-mode
 // RUN: %{build} %cuda_options -o %t.out
 // RUN: %{run} %t.out
 //
diff --git a/sycl/test-e2e/Adapters/dll-detach-order.cpp b/sycl/test-e2e/Adapters/dll-detach-order.cpp
index 72d014eb066bb..c1cf32816a240 100644
--- a/sycl/test-e2e/Adapters/dll-detach-order.cpp
+++ b/sycl/test-e2e/Adapters/dll-detach-order.cpp
@@ -1,5 +1,4 @@
 // REQUIRES: windows
-// REQUIRES: build-and-run-mode
 // RUN: env SYCL_UR_TRACE=-1 sycl-ls | FileCheck %s
 
 // ensure that the adapters are detached AFTER urLoaderTearDown is done
diff --git a/sycl/test-e2e/syclcompat/kernel/kernel_win.cpp b/sycl/test-e2e/syclcompat/kernel/kernel_win.cpp
index 85ecf5687ca63..53ce174a8b7c0 100644
--- a/sycl/test-e2e/syclcompat/kernel/kernel_win.cpp
+++ b/sycl/test-e2e/syclcompat/kernel/kernel_win.cpp
@@ -1,5 +1,4 @@
 // REQUIRES: windows
-// REQUIRES: build-and-run-mode
 
 // DEFINE: %{sharedflag} = %if cl_options %{/clang:-shared%} %else %{-shared%}
 
diff --git a/sycl/test-e2e/syclcompat/launch/launch_properties.cpp b/sycl/test-e2e/syclcompat/launch/launch_properties.cpp
index 5d07ad256b328..19176388b33e8 100644
--- a/sycl/test-e2e/syclcompat/launch/launch_properties.cpp
+++ b/sycl/test-e2e/syclcompat/launch/launch_properties.cpp
@@ -22,8 +22,9 @@
  *     sycl/test-e2e/ClusterLaunch/cluster_launch_parallel_for.cpp
  **************************************************************************/
 
-// REQUIRES: aspect-ext_oneapi_cuda_cluster_group
-// REQUIRES: build-and-run-mode
+// REQUIRES: target-nvidia, aspect-ext_oneapi_cuda_cluster_group
+// XFAIL: *
+// XFAIL-TRACKER: https://github.com/intel/llvm/issues/16794
 // RUN: %{build} -Xsycl-target-backend=nvptx64-nvidia-cuda --cuda-gpu-arch=sm_90 -o %t.out
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/syclcompat/memory/local_memory_ptr_to_integer.cpp b/sycl/test-e2e/syclcompat/memory/local_memory_ptr_to_integer.cpp
index edd9e63a3752a..9d22804309a2c 100644
--- a/sycl/test-e2e/syclcompat/memory/local_memory_ptr_to_integer.cpp
+++ b/sycl/test-e2e/syclcompat/memory/local_memory_ptr_to_integer.cpp
@@ -1,5 +1,4 @@
-// REQUIRES: cuda
-// REQUIRES: build-and-run-mode
+// REQUIRES: target-nvidia
 // RUN:  %{build} -Xsycl-target-backend --cuda-gpu-arch=sm_75 -o %t.out
 // RUN:  %{run} %t.out
 #include <sycl/detail/core.hpp>