Skip to content

Commit

Permalink
[SYCL][E2E] Remove REQUIRES: build-and-run-mode from syclcompat a…
Browse files Browse the repository at this point in the history
…nd `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`
  • Loading branch information
ayylol authored Jan 28, 2025
1 parent 8324bb2 commit e856440
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 7 deletions.
1 change: 0 additions & 1 deletion sycl/test-e2e/Adapters/cuda_queue_priority.cpp
Original file line number Diff line number Diff line change
@@ -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
//
Expand Down
1 change: 0 additions & 1 deletion sycl/test-e2e/Adapters/dll-detach-order.cpp
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 0 additions & 1 deletion sycl/test-e2e/syclcompat/kernel/kernel_win.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// REQUIRES: windows
// REQUIRES: build-and-run-mode

// DEFINE: %{sharedflag} = %if cl_options %{/clang:-shared%} %else %{-shared%}

Expand Down
5 changes: 3 additions & 2 deletions sycl/test-e2e/syclcompat/launch/launch_properties.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
@@ -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>
Expand Down

0 comments on commit e856440

Please sign in to comment.