From fee444922c566ef85da8bb5f30dba2bbd46ecbd6 Mon Sep 17 00:00:00 2001
From: David Garcia Orozco <david.garcia.orozco@intel.com>
Date: Tue, 28 Jan 2025 07:59:12 -0700
Subject: [PATCH] [SYCL][Matrix][E2E] Remove `REQUIRES: build-and-run-mode`
 from Matrix tests (#16787)

As of #16725 tests that do not build for `spir64` do not need to be
marked as exceptions for split build/run with `REQUIRES:
build-and-run-mode`, instead we can mark them as `REQUIRES:
target-<nvidia/amd>`.

This patch replaces the `REQUIRES: build-and-run-mode` directives in
Matrix tests with `REQUIRES: target-amd` or `REQUIRES: target-nvidia`.
---
 sycl/test-e2e/Matrix/joint_matrix_hip_gfx90a.cpp       | 2 +-
 sycl/test-e2e/Matrix/joint_matrix_hip_half_gfx90a.cpp  | 2 +-
 sycl/test-e2e/Matrix/joint_matrix_tensorcores_sm70.cpp | 3 +--
 sycl/test-e2e/Matrix/runtime_query_hip_gfx90a.cpp      | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/sycl/test-e2e/Matrix/joint_matrix_hip_gfx90a.cpp b/sycl/test-e2e/Matrix/joint_matrix_hip_gfx90a.cpp
index fbcf2c70558f4..5db815ca081fb 100644
--- a/sycl/test-e2e/Matrix/joint_matrix_hip_gfx90a.cpp
+++ b/sycl/test-e2e/Matrix/joint_matrix_hip_gfx90a.cpp
@@ -9,8 +9,8 @@
 // RUN: %clangxx -fsycl -fsycl-targets=amd_gpu_gfx90a %s -o %t.out
 // RUN: %{run} %t.out
 
+// REQUIRES: target-amd
 // REQUIRES: arch-amd_gpu_gfx90a
-// REQUIRES: build-and-run-mode
 
 #include "joint_matrix_hip_apply.hpp"
 #include "joint_matrix_hip_copy.hpp"
diff --git a/sycl/test-e2e/Matrix/joint_matrix_hip_half_gfx90a.cpp b/sycl/test-e2e/Matrix/joint_matrix_hip_half_gfx90a.cpp
index 7c8d576ba39d0..8870e36a497fa 100644
--- a/sycl/test-e2e/Matrix/joint_matrix_hip_half_gfx90a.cpp
+++ b/sycl/test-e2e/Matrix/joint_matrix_hip_half_gfx90a.cpp
@@ -9,9 +9,9 @@
 // RUN: %clangxx -fsycl -fsycl-targets=amd_gpu_gfx90a %s -o %t.out
 // RUN: %{run} %t.out
 
+// REQUIRES: target-amd
 // REQUIRES: arch-amd_gpu_gfx90a
 // REQUIRES: aspect-fp16
-// REQUIRES: build-and-run-mode
 
 #include "joint_matrix_hip_apply.hpp"
 #include "joint_matrix_hip_copy.hpp"
diff --git a/sycl/test-e2e/Matrix/joint_matrix_tensorcores_sm70.cpp b/sycl/test-e2e/Matrix/joint_matrix_tensorcores_sm70.cpp
index dc084b7c23c0e..bfa1156bc0e6b 100644
--- a/sycl/test-e2e/Matrix/joint_matrix_tensorcores_sm70.cpp
+++ b/sycl/test-e2e/Matrix/joint_matrix_tensorcores_sm70.cpp
@@ -6,8 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-// REQUIRES: cuda
-// REQUIRES: build-and-run-mode
+// REQUIRES: target-nvidia
 // RUN: %{build} -Xsycl-target-backend --cuda-gpu-arch=sm_70 -o %t.out
 // RUN: %{run} %t.out
 //
diff --git a/sycl/test-e2e/Matrix/runtime_query_hip_gfx90a.cpp b/sycl/test-e2e/Matrix/runtime_query_hip_gfx90a.cpp
index a7bdd0c056db1..a47a3ef725b73 100644
--- a/sycl/test-e2e/Matrix/runtime_query_hip_gfx90a.cpp
+++ b/sycl/test-e2e/Matrix/runtime_query_hip_gfx90a.cpp
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
+// REQUIRES: target-amd
 // REQUIRES: arch-amd_gpu_gfx90a
-// REQUIRES: build-and-run-mode
 // RUN: %clangxx -fsycl -fsycl-targets=amdgcn-amd-amdhsa -Xsycl-target-backend=amdgcn-amd-amdhsa --offload-arch=gfx90a %s -o %t.out
 // RUN: %{run} %t.out