From a518866fc4db6d12aa4960755aad45285d2ad2ea Mon Sep 17 00:00:00 2001
From: "Garcia Orozco, David" <david.garcia.orozco@intel.com>
Date: Mon, 9 Dec 2024 11:44:21 -0800
Subject: [PATCH 1/6] Use lit.local.cfg to mark cuda and hip as unsupported

---
 sycl/test-e2e/InlineAsm/Negative/asm_bad_opcode.cpp         | 1 -
 sycl/test-e2e/InlineAsm/Negative/asm_bad_operand_syntax.cpp | 1 -
 sycl/test-e2e/InlineAsm/Negative/asm_duplicate_label.cpp    | 1 -
 sycl/test-e2e/InlineAsm/Negative/asm_illegal_exec_size.cpp  | 1 -
 sycl/test-e2e/InlineAsm/Negative/asm_missing_label.cpp      | 1 -
 sycl/test-e2e/InlineAsm/Negative/asm_missing_region.cpp     | 1 -
 sycl/test-e2e/InlineAsm/Negative/asm_simple.cpp             | 1 -
 sycl/test-e2e/InlineAsm/Negative/asm_undefined_decl.cpp     | 1 -
 sycl/test-e2e/InlineAsm/Negative/asm_undefined_pred.cpp     | 1 -
 sycl/test-e2e/InlineAsm/Negative/asm_wrong_declare.cpp      | 1 -
 sycl/test-e2e/InlineAsm/asm_16_empty.cpp                    | 1 -
 sycl/test-e2e/InlineAsm/asm_16_matrix_mult.cpp              | 1 -
 sycl/test-e2e/InlineAsm/asm_16_no_input_int.cpp             | 1 -
 sycl/test-e2e/InlineAsm/asm_16_no_opts.cpp                  | 1 -
 sycl/test-e2e/InlineAsm/asm_8_empty.cpp                     | 1 -
 sycl/test-e2e/InlineAsm/asm_8_no_input_int.cpp              | 1 -
 sycl/test-e2e/InlineAsm/asm_arbitrary_ops_order.cpp         | 1 -
 sycl/test-e2e/InlineAsm/asm_decl_in_scope.cpp               | 1 -
 sycl/test-e2e/InlineAsm/asm_float_add.cpp                   | 1 -
 sycl/test-e2e/InlineAsm/asm_float_imm_arg.cpp               | 1 -
 sycl/test-e2e/InlineAsm/asm_float_neg.cpp                   | 1 -
 sycl/test-e2e/InlineAsm/asm_if.cpp                          | 1 -
 sycl/test-e2e/InlineAsm/asm_imm_arg.cpp                     | 1 -
 sycl/test-e2e/InlineAsm/asm_loop.cpp                        | 1 -
 sycl/test-e2e/InlineAsm/asm_mul.cpp                         | 1 -
 sycl/test-e2e/InlineAsm/asm_multiple_instructions.cpp       | 1 -
 sycl/test-e2e/InlineAsm/asm_no_operands.cpp                 | 1 -
 sycl/test-e2e/InlineAsm/asm_no_output.cpp                   | 1 -
 sycl/test-e2e/InlineAsm/asm_plus_mod.cpp                    | 1 -
 sycl/test-e2e/InlineAsm/asm_switch.cpp                      | 1 -
 sycl/test-e2e/InlineAsm/letter_example.cpp                  | 1 -
 sycl/test-e2e/InlineAsm/lit.local.cfg                       | 1 +
 sycl/test-e2e/InlineAsm/malloc_shared_32.cpp                | 1 -
 sycl/test-e2e/InlineAsm/malloc_shared_in_out_dif.cpp        | 1 -
 sycl/test-e2e/InlineAsm/malloc_shared_no_input.cpp          | 1 -
 35 files changed, 1 insertion(+), 34 deletions(-)
 create mode 100644 sycl/test-e2e/InlineAsm/lit.local.cfg

diff --git a/sycl/test-e2e/InlineAsm/Negative/asm_bad_opcode.cpp b/sycl/test-e2e/InlineAsm/Negative/asm_bad_opcode.cpp
index 49d6f9ae9331a..c88d533bb05f6 100644
--- a/sycl/test-e2e/InlineAsm/Negative/asm_bad_opcode.cpp
+++ b/sycl/test-e2e/InlineAsm/Negative/asm_bad_opcode.cpp
@@ -1,4 +1,3 @@
-// UNSUPPORTED: cuda || hip
 // REQUIRES: gpu,linux,sg-16
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/InlineAsm/Negative/asm_bad_operand_syntax.cpp b/sycl/test-e2e/InlineAsm/Negative/asm_bad_operand_syntax.cpp
index 168b339c403b6..b79719d42ded3 100644
--- a/sycl/test-e2e/InlineAsm/Negative/asm_bad_operand_syntax.cpp
+++ b/sycl/test-e2e/InlineAsm/Negative/asm_bad_operand_syntax.cpp
@@ -1,4 +1,3 @@
-// UNSUPPORTED: cuda || hip
 // REQUIRES: gpu,linux,sg-16
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/InlineAsm/Negative/asm_duplicate_label.cpp b/sycl/test-e2e/InlineAsm/Negative/asm_duplicate_label.cpp
index 5b996fcc983f1..1d80b2bd57041 100644
--- a/sycl/test-e2e/InlineAsm/Negative/asm_duplicate_label.cpp
+++ b/sycl/test-e2e/InlineAsm/Negative/asm_duplicate_label.cpp
@@ -1,4 +1,3 @@
-// UNSUPPORTED: cuda || hip
 // REQUIRES: gpu,linux,sg-16
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/InlineAsm/Negative/asm_illegal_exec_size.cpp b/sycl/test-e2e/InlineAsm/Negative/asm_illegal_exec_size.cpp
index cd531c921b040..b19232bb78a3b 100644
--- a/sycl/test-e2e/InlineAsm/Negative/asm_illegal_exec_size.cpp
+++ b/sycl/test-e2e/InlineAsm/Negative/asm_illegal_exec_size.cpp
@@ -1,4 +1,3 @@
-// UNSUPPORTED: cuda || hip
 // REQUIRES: gpu,linux,sg-16
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/InlineAsm/Negative/asm_missing_label.cpp b/sycl/test-e2e/InlineAsm/Negative/asm_missing_label.cpp
index b29d76aa5aec0..1e7ce0a9864b2 100644
--- a/sycl/test-e2e/InlineAsm/Negative/asm_missing_label.cpp
+++ b/sycl/test-e2e/InlineAsm/Negative/asm_missing_label.cpp
@@ -1,4 +1,3 @@
-// UNSUPPORTED: cuda || hip
 // REQUIRES: gpu,linux,sg-16
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/InlineAsm/Negative/asm_missing_region.cpp b/sycl/test-e2e/InlineAsm/Negative/asm_missing_region.cpp
index 409692cc0f831..4b05922461476 100644
--- a/sycl/test-e2e/InlineAsm/Negative/asm_missing_region.cpp
+++ b/sycl/test-e2e/InlineAsm/Negative/asm_missing_region.cpp
@@ -1,4 +1,3 @@
-// UNSUPPORTED: cuda || hip
 // REQUIRES: gpu,linux,sg-16
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/InlineAsm/Negative/asm_simple.cpp b/sycl/test-e2e/InlineAsm/Negative/asm_simple.cpp
index 325ee710ba873..305f4a03038b1 100644
--- a/sycl/test-e2e/InlineAsm/Negative/asm_simple.cpp
+++ b/sycl/test-e2e/InlineAsm/Negative/asm_simple.cpp
@@ -1,4 +1,3 @@
-// UNSUPPORTED: cuda || hip
 // REQUIRES: gpu,linux,sg-16
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/InlineAsm/Negative/asm_undefined_decl.cpp b/sycl/test-e2e/InlineAsm/Negative/asm_undefined_decl.cpp
index 2674681931156..715063f7d337b 100644
--- a/sycl/test-e2e/InlineAsm/Negative/asm_undefined_decl.cpp
+++ b/sycl/test-e2e/InlineAsm/Negative/asm_undefined_decl.cpp
@@ -1,4 +1,3 @@
-// UNSUPPORTED: cuda || hip
 // REQUIRES: gpu,linux,sg-16
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/InlineAsm/Negative/asm_undefined_pred.cpp b/sycl/test-e2e/InlineAsm/Negative/asm_undefined_pred.cpp
index d9bba38ef6936..3b1069c399d63 100644
--- a/sycl/test-e2e/InlineAsm/Negative/asm_undefined_pred.cpp
+++ b/sycl/test-e2e/InlineAsm/Negative/asm_undefined_pred.cpp
@@ -1,4 +1,3 @@
-// UNSUPPORTED: cuda || hip
 // REQUIRES: gpu,linux,sg-16
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/InlineAsm/Negative/asm_wrong_declare.cpp b/sycl/test-e2e/InlineAsm/Negative/asm_wrong_declare.cpp
index 43e98db43c34e..6873ac1d7cff1 100644
--- a/sycl/test-e2e/InlineAsm/Negative/asm_wrong_declare.cpp
+++ b/sycl/test-e2e/InlineAsm/Negative/asm_wrong_declare.cpp
@@ -1,4 +1,3 @@
-// UNSUPPORTED: cuda || hip
 // REQUIRES: gpu,linux,sg-16
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/InlineAsm/asm_16_empty.cpp b/sycl/test-e2e/InlineAsm/asm_16_empty.cpp
index a1d2ec9220763..904d44ab9c8b1 100644
--- a/sycl/test-e2e/InlineAsm/asm_16_empty.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_16_empty.cpp
@@ -1,4 +1,3 @@
-// UNSUPPORTED: cuda || hip_nvidia
 // REQUIRES: gpu,linux,sg-16
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/InlineAsm/asm_16_matrix_mult.cpp b/sycl/test-e2e/InlineAsm/asm_16_matrix_mult.cpp
index f92912919c786..4369644879c2c 100644
--- a/sycl/test-e2e/InlineAsm/asm_16_matrix_mult.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_16_matrix_mult.cpp
@@ -1,4 +1,3 @@
-// UNSUPPORTED: cuda, hip
 // REQUIRES: gpu,linux,sg-16
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/InlineAsm/asm_16_no_input_int.cpp b/sycl/test-e2e/InlineAsm/asm_16_no_input_int.cpp
index f92912919c786..4369644879c2c 100644
--- a/sycl/test-e2e/InlineAsm/asm_16_no_input_int.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_16_no_input_int.cpp
@@ -1,4 +1,3 @@
-// UNSUPPORTED: cuda, hip
 // REQUIRES: gpu,linux,sg-16
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/InlineAsm/asm_16_no_opts.cpp b/sycl/test-e2e/InlineAsm/asm_16_no_opts.cpp
index 07286b34b8d4d..7b9d7f1e04645 100644
--- a/sycl/test-e2e/InlineAsm/asm_16_no_opts.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_16_no_opts.cpp
@@ -1,4 +1,3 @@
-// UNSUPPORTED: cuda, hip
 // REQUIRES: gpu,linux,sg-16
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/InlineAsm/asm_8_empty.cpp b/sycl/test-e2e/InlineAsm/asm_8_empty.cpp
index 4a690b3088b51..3bed464c76bc2 100644
--- a/sycl/test-e2e/InlineAsm/asm_8_empty.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_8_empty.cpp
@@ -1,4 +1,3 @@
-// UNSUPPORTED: cuda || hip_nvidia
 // REQUIRES: gpu,linux,sg-8
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/InlineAsm/asm_8_no_input_int.cpp b/sycl/test-e2e/InlineAsm/asm_8_no_input_int.cpp
index 82dc6245a6770..89f4645a085b2 100644
--- a/sycl/test-e2e/InlineAsm/asm_8_no_input_int.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_8_no_input_int.cpp
@@ -1,4 +1,3 @@
-// UNSUPPORTED: cuda, hip
 // REQUIRES: gpu,linux,sg-8
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/InlineAsm/asm_arbitrary_ops_order.cpp b/sycl/test-e2e/InlineAsm/asm_arbitrary_ops_order.cpp
index 9097a40131bbb..86de0f0658a5a 100644
--- a/sycl/test-e2e/InlineAsm/asm_arbitrary_ops_order.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_arbitrary_ops_order.cpp
@@ -1,4 +1,3 @@
-// UNSUPPORTED: cuda, hip
 // REQUIRES: gpu,linux,sg-16
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/InlineAsm/asm_decl_in_scope.cpp b/sycl/test-e2e/InlineAsm/asm_decl_in_scope.cpp
index a6a754289e533..ab6737ebd67ed 100644
--- a/sycl/test-e2e/InlineAsm/asm_decl_in_scope.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_decl_in_scope.cpp
@@ -1,4 +1,3 @@
-// UNSUPPORTED: cuda, hip
 // REQUIRES: gpu,linux,sg-16
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/InlineAsm/asm_float_add.cpp b/sycl/test-e2e/InlineAsm/asm_float_add.cpp
index f1d4d681b8edc..74afe81515200 100644
--- a/sycl/test-e2e/InlineAsm/asm_float_add.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_float_add.cpp
@@ -1,4 +1,3 @@
-// UNSUPPORTED: cuda, hip
 // REQUIRES: gpu,linux,sg-16
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/InlineAsm/asm_float_imm_arg.cpp b/sycl/test-e2e/InlineAsm/asm_float_imm_arg.cpp
index b10aec8e47278..e54fd5c0af171 100644
--- a/sycl/test-e2e/InlineAsm/asm_float_imm_arg.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_float_imm_arg.cpp
@@ -1,4 +1,3 @@
-// UNSUPPORTED: cuda, hip
 // REQUIRES: gpu,linux,sg-16
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/InlineAsm/asm_float_neg.cpp b/sycl/test-e2e/InlineAsm/asm_float_neg.cpp
index 307a853fa407f..500709b25985d 100644
--- a/sycl/test-e2e/InlineAsm/asm_float_neg.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_float_neg.cpp
@@ -1,4 +1,3 @@
-// UNSUPPORTED: cuda, hip
 // REQUIRES: gpu,linux,sg-16
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/InlineAsm/asm_if.cpp b/sycl/test-e2e/InlineAsm/asm_if.cpp
index 54a679a0509ea..37fb5231b2d4a 100644
--- a/sycl/test-e2e/InlineAsm/asm_if.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_if.cpp
@@ -1,4 +1,3 @@
-// UNSUPPORTED: cuda, hip
 // REQUIRES: gpu,linux,sg-16
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/InlineAsm/asm_imm_arg.cpp b/sycl/test-e2e/InlineAsm/asm_imm_arg.cpp
index 2506938a1bef8..a7b93d6c89a8e 100644
--- a/sycl/test-e2e/InlineAsm/asm_imm_arg.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_imm_arg.cpp
@@ -1,4 +1,3 @@
-// UNSUPPORTED: cuda, hip
 // REQUIRES: gpu,linux,sg-16
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/InlineAsm/asm_loop.cpp b/sycl/test-e2e/InlineAsm/asm_loop.cpp
index eccc02ae1cab7..99c00943047a8 100644
--- a/sycl/test-e2e/InlineAsm/asm_loop.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_loop.cpp
@@ -1,4 +1,3 @@
-// UNSUPPORTED: cuda, hip
 // REQUIRES: gpu,linux,sg-16
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/InlineAsm/asm_mul.cpp b/sycl/test-e2e/InlineAsm/asm_mul.cpp
index df759b75d2a05..9d418939bc94a 100644
--- a/sycl/test-e2e/InlineAsm/asm_mul.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_mul.cpp
@@ -1,4 +1,3 @@
-// UNSUPPORTED: cuda, hip
 // REQUIRES: gpu,linux,sg-16
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/InlineAsm/asm_multiple_instructions.cpp b/sycl/test-e2e/InlineAsm/asm_multiple_instructions.cpp
index 1e0140611389f..2a0cfe5351c01 100644
--- a/sycl/test-e2e/InlineAsm/asm_multiple_instructions.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_multiple_instructions.cpp
@@ -1,4 +1,3 @@
-// UNSUPPORTED: cuda || hip
 // REQUIRES: gpu,linux,sg-16
 // RUN: %{build} -DTO_PASS -o %t.out.pass
 // RUN: %{run} %t.out.pass
diff --git a/sycl/test-e2e/InlineAsm/asm_no_operands.cpp b/sycl/test-e2e/InlineAsm/asm_no_operands.cpp
index bf9df8ca40ae2..6b93819fcbf3b 100644
--- a/sycl/test-e2e/InlineAsm/asm_no_operands.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_no_operands.cpp
@@ -1,4 +1,3 @@
-// UNSUPPORTED: cuda, hip
 // REQUIRES: gpu,linux,sg-16
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/InlineAsm/asm_no_output.cpp b/sycl/test-e2e/InlineAsm/asm_no_output.cpp
index 3a130f1e4b819..0ddf5d084eca4 100644
--- a/sycl/test-e2e/InlineAsm/asm_no_output.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_no_output.cpp
@@ -1,4 +1,3 @@
-// UNSUPPORTED: cuda || hip
 // REQUIRES: gpu,linux,sg-16
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/InlineAsm/asm_plus_mod.cpp b/sycl/test-e2e/InlineAsm/asm_plus_mod.cpp
index 077446cf72859..f9d80d139983d 100644
--- a/sycl/test-e2e/InlineAsm/asm_plus_mod.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_plus_mod.cpp
@@ -1,4 +1,3 @@
-// UNSUPPORTED: cuda || hip
 // REQUIRES: gpu,linux,sg-16
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/InlineAsm/asm_switch.cpp b/sycl/test-e2e/InlineAsm/asm_switch.cpp
index 4f96a55b554d2..65b8265f63cba 100644
--- a/sycl/test-e2e/InlineAsm/asm_switch.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_switch.cpp
@@ -1,4 +1,3 @@
-// UNSUPPORTED: cuda || hip
 // REQUIRES: gpu,linux,sg-16
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/InlineAsm/letter_example.cpp b/sycl/test-e2e/InlineAsm/letter_example.cpp
index 50e5ff784446e..80394804dfc6d 100644
--- a/sycl/test-e2e/InlineAsm/letter_example.cpp
+++ b/sycl/test-e2e/InlineAsm/letter_example.cpp
@@ -1,4 +1,3 @@
-// UNSUPPORTED: cuda, hip
 // REQUIRES: gpu,linux,sg-16,aspect-usm_shared_allocations
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/InlineAsm/lit.local.cfg b/sycl/test-e2e/InlineAsm/lit.local.cfg
new file mode 100644
index 0000000000000..89cbba66c6409
--- /dev/null
+++ b/sycl/test-e2e/InlineAsm/lit.local.cfg
@@ -0,0 +1 @@
+config.unsupported_features += ['cuda', 'hip']
diff --git a/sycl/test-e2e/InlineAsm/malloc_shared_32.cpp b/sycl/test-e2e/InlineAsm/malloc_shared_32.cpp
index 5271683548e72..d0550685ee1a4 100644
--- a/sycl/test-e2e/InlineAsm/malloc_shared_32.cpp
+++ b/sycl/test-e2e/InlineAsm/malloc_shared_32.cpp
@@ -1,4 +1,3 @@
-// UNSUPPORTED: cuda, hip
 // REQUIRES: gpu,linux,sg-32,aspect-usm_shared_allocations
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/InlineAsm/malloc_shared_in_out_dif.cpp b/sycl/test-e2e/InlineAsm/malloc_shared_in_out_dif.cpp
index 4751b94b6fd77..53e24508da9b3 100644
--- a/sycl/test-e2e/InlineAsm/malloc_shared_in_out_dif.cpp
+++ b/sycl/test-e2e/InlineAsm/malloc_shared_in_out_dif.cpp
@@ -1,4 +1,3 @@
-// UNSUPPORTED: cuda, hip
 // REQUIRES: gpu,linux,sg-16,aspect-usm_shared_allocations
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/InlineAsm/malloc_shared_no_input.cpp b/sycl/test-e2e/InlineAsm/malloc_shared_no_input.cpp
index 41d5181f37092..ee6af2a94bef8 100644
--- a/sycl/test-e2e/InlineAsm/malloc_shared_no_input.cpp
+++ b/sycl/test-e2e/InlineAsm/malloc_shared_no_input.cpp
@@ -1,4 +1,3 @@
-// UNSUPPORTED: cuda, hip
 // REQUIRES: gpu,linux,sg-16,aspect-usm_shared_allocations
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out

From 8d5f5170407db91ff9b090d81a1f27710e809c8e Mon Sep 17 00:00:00 2001
From: "Garcia Orozco, David" <david.garcia.orozco@intel.com>
Date: Mon, 9 Dec 2024 11:51:56 -0800
Subject: [PATCH 2/6] Add REQUIRES: gpu,linux to lit.local.cfg

---
 sycl/test-e2e/InlineAsm/Negative/asm_bad_opcode.cpp         | 2 +-
 sycl/test-e2e/InlineAsm/Negative/asm_bad_operand_syntax.cpp | 2 +-
 sycl/test-e2e/InlineAsm/Negative/asm_duplicate_label.cpp    | 2 +-
 sycl/test-e2e/InlineAsm/Negative/asm_illegal_exec_size.cpp  | 2 +-
 sycl/test-e2e/InlineAsm/Negative/asm_missing_label.cpp      | 2 +-
 sycl/test-e2e/InlineAsm/Negative/asm_missing_region.cpp     | 2 +-
 sycl/test-e2e/InlineAsm/Negative/asm_simple.cpp             | 2 +-
 sycl/test-e2e/InlineAsm/Negative/asm_undefined_decl.cpp     | 2 +-
 sycl/test-e2e/InlineAsm/Negative/asm_undefined_pred.cpp     | 2 +-
 sycl/test-e2e/InlineAsm/Negative/asm_wrong_declare.cpp      | 2 +-
 sycl/test-e2e/InlineAsm/asm_16_empty.cpp                    | 2 +-
 sycl/test-e2e/InlineAsm/asm_16_matrix_mult.cpp              | 2 +-
 sycl/test-e2e/InlineAsm/asm_16_no_input_int.cpp             | 2 +-
 sycl/test-e2e/InlineAsm/asm_16_no_opts.cpp                  | 2 +-
 sycl/test-e2e/InlineAsm/asm_8_empty.cpp                     | 2 +-
 sycl/test-e2e/InlineAsm/asm_8_no_input_int.cpp              | 2 +-
 sycl/test-e2e/InlineAsm/asm_arbitrary_ops_order.cpp         | 2 +-
 sycl/test-e2e/InlineAsm/asm_decl_in_scope.cpp               | 2 +-
 sycl/test-e2e/InlineAsm/asm_float_add.cpp                   | 2 +-
 sycl/test-e2e/InlineAsm/asm_float_imm_arg.cpp               | 2 +-
 sycl/test-e2e/InlineAsm/asm_float_neg.cpp                   | 2 +-
 sycl/test-e2e/InlineAsm/asm_if.cpp                          | 2 +-
 sycl/test-e2e/InlineAsm/asm_imm_arg.cpp                     | 2 +-
 sycl/test-e2e/InlineAsm/asm_loop.cpp                        | 2 +-
 sycl/test-e2e/InlineAsm/asm_mul.cpp                         | 2 +-
 sycl/test-e2e/InlineAsm/asm_multiple_instructions.cpp       | 2 +-
 sycl/test-e2e/InlineAsm/asm_no_operands.cpp                 | 2 +-
 sycl/test-e2e/InlineAsm/asm_no_output.cpp                   | 2 +-
 sycl/test-e2e/InlineAsm/asm_plus_mod.cpp                    | 2 +-
 sycl/test-e2e/InlineAsm/asm_switch.cpp                      | 2 +-
 sycl/test-e2e/InlineAsm/letter_example.cpp                  | 2 +-
 sycl/test-e2e/InlineAsm/lit.local.cfg                       | 1 +
 sycl/test-e2e/InlineAsm/malloc_shared_32.cpp                | 2 +-
 sycl/test-e2e/InlineAsm/malloc_shared_in_out_dif.cpp        | 2 +-
 sycl/test-e2e/InlineAsm/malloc_shared_no_input.cpp          | 2 +-
 35 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/sycl/test-e2e/InlineAsm/Negative/asm_bad_opcode.cpp b/sycl/test-e2e/InlineAsm/Negative/asm_bad_opcode.cpp
index c88d533bb05f6..76c3bd855fd64 100644
--- a/sycl/test-e2e/InlineAsm/Negative/asm_bad_opcode.cpp
+++ b/sycl/test-e2e/InlineAsm/Negative/asm_bad_opcode.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: gpu,linux,sg-16
+// REQUIRES: sg-16
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/InlineAsm/Negative/asm_bad_operand_syntax.cpp b/sycl/test-e2e/InlineAsm/Negative/asm_bad_operand_syntax.cpp
index b79719d42ded3..e4c9c95af2a2f 100644
--- a/sycl/test-e2e/InlineAsm/Negative/asm_bad_operand_syntax.cpp
+++ b/sycl/test-e2e/InlineAsm/Negative/asm_bad_operand_syntax.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: gpu,linux,sg-16
+// REQUIRES: sg-16
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/InlineAsm/Negative/asm_duplicate_label.cpp b/sycl/test-e2e/InlineAsm/Negative/asm_duplicate_label.cpp
index 1d80b2bd57041..42c948f2e8ca5 100644
--- a/sycl/test-e2e/InlineAsm/Negative/asm_duplicate_label.cpp
+++ b/sycl/test-e2e/InlineAsm/Negative/asm_duplicate_label.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: gpu,linux,sg-16
+// REQUIRES: sg-16
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/InlineAsm/Negative/asm_illegal_exec_size.cpp b/sycl/test-e2e/InlineAsm/Negative/asm_illegal_exec_size.cpp
index b19232bb78a3b..2e26b62942589 100644
--- a/sycl/test-e2e/InlineAsm/Negative/asm_illegal_exec_size.cpp
+++ b/sycl/test-e2e/InlineAsm/Negative/asm_illegal_exec_size.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: gpu,linux,sg-16
+// REQUIRES: sg-16
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/InlineAsm/Negative/asm_missing_label.cpp b/sycl/test-e2e/InlineAsm/Negative/asm_missing_label.cpp
index 1e7ce0a9864b2..03eed77b28667 100644
--- a/sycl/test-e2e/InlineAsm/Negative/asm_missing_label.cpp
+++ b/sycl/test-e2e/InlineAsm/Negative/asm_missing_label.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: gpu,linux,sg-16
+// REQUIRES: sg-16
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/InlineAsm/Negative/asm_missing_region.cpp b/sycl/test-e2e/InlineAsm/Negative/asm_missing_region.cpp
index 4b05922461476..f98bad121e21c 100644
--- a/sycl/test-e2e/InlineAsm/Negative/asm_missing_region.cpp
+++ b/sycl/test-e2e/InlineAsm/Negative/asm_missing_region.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: gpu,linux,sg-16
+// REQUIRES: sg-16
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/InlineAsm/Negative/asm_simple.cpp b/sycl/test-e2e/InlineAsm/Negative/asm_simple.cpp
index 305f4a03038b1..4484e5518106a 100644
--- a/sycl/test-e2e/InlineAsm/Negative/asm_simple.cpp
+++ b/sycl/test-e2e/InlineAsm/Negative/asm_simple.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: gpu,linux,sg-16
+// REQUIRES: sg-16
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/InlineAsm/Negative/asm_undefined_decl.cpp b/sycl/test-e2e/InlineAsm/Negative/asm_undefined_decl.cpp
index 715063f7d337b..9f971a492c95c 100644
--- a/sycl/test-e2e/InlineAsm/Negative/asm_undefined_decl.cpp
+++ b/sycl/test-e2e/InlineAsm/Negative/asm_undefined_decl.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: gpu,linux,sg-16
+// REQUIRES: sg-16
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/InlineAsm/Negative/asm_undefined_pred.cpp b/sycl/test-e2e/InlineAsm/Negative/asm_undefined_pred.cpp
index 3b1069c399d63..52ce72ecdb3de 100644
--- a/sycl/test-e2e/InlineAsm/Negative/asm_undefined_pred.cpp
+++ b/sycl/test-e2e/InlineAsm/Negative/asm_undefined_pred.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: gpu,linux,sg-16
+// REQUIRES: sg-16
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/InlineAsm/Negative/asm_wrong_declare.cpp b/sycl/test-e2e/InlineAsm/Negative/asm_wrong_declare.cpp
index 6873ac1d7cff1..ee5c124c26ce1 100644
--- a/sycl/test-e2e/InlineAsm/Negative/asm_wrong_declare.cpp
+++ b/sycl/test-e2e/InlineAsm/Negative/asm_wrong_declare.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: gpu,linux,sg-16
+// REQUIRES: sg-16
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/InlineAsm/asm_16_empty.cpp b/sycl/test-e2e/InlineAsm/asm_16_empty.cpp
index 904d44ab9c8b1..bffcc44e25d3a 100644
--- a/sycl/test-e2e/InlineAsm/asm_16_empty.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_16_empty.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: gpu,linux,sg-16
+// REQUIRES: sg-16
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/InlineAsm/asm_16_matrix_mult.cpp b/sycl/test-e2e/InlineAsm/asm_16_matrix_mult.cpp
index 4369644879c2c..88f8a384023df 100644
--- a/sycl/test-e2e/InlineAsm/asm_16_matrix_mult.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_16_matrix_mult.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: gpu,linux,sg-16
+// REQUIRES: sg-16
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/InlineAsm/asm_16_no_input_int.cpp b/sycl/test-e2e/InlineAsm/asm_16_no_input_int.cpp
index 4369644879c2c..88f8a384023df 100644
--- a/sycl/test-e2e/InlineAsm/asm_16_no_input_int.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_16_no_input_int.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: gpu,linux,sg-16
+// REQUIRES: sg-16
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/InlineAsm/asm_16_no_opts.cpp b/sycl/test-e2e/InlineAsm/asm_16_no_opts.cpp
index 7b9d7f1e04645..7a37b60edea73 100644
--- a/sycl/test-e2e/InlineAsm/asm_16_no_opts.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_16_no_opts.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: gpu,linux,sg-16
+// REQUIRES: sg-16
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/InlineAsm/asm_8_empty.cpp b/sycl/test-e2e/InlineAsm/asm_8_empty.cpp
index 3bed464c76bc2..f784205bc6029 100644
--- a/sycl/test-e2e/InlineAsm/asm_8_empty.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_8_empty.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: gpu,linux,sg-8
+// REQUIRES: sg-8
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/InlineAsm/asm_8_no_input_int.cpp b/sycl/test-e2e/InlineAsm/asm_8_no_input_int.cpp
index 89f4645a085b2..7fba71b894bdb 100644
--- a/sycl/test-e2e/InlineAsm/asm_8_no_input_int.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_8_no_input_int.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: gpu,linux,sg-8
+// REQUIRES: sg-8
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/InlineAsm/asm_arbitrary_ops_order.cpp b/sycl/test-e2e/InlineAsm/asm_arbitrary_ops_order.cpp
index 86de0f0658a5a..fcf5d5f3fcab2 100644
--- a/sycl/test-e2e/InlineAsm/asm_arbitrary_ops_order.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_arbitrary_ops_order.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: gpu,linux,sg-16
+// REQUIRES: sg-16
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/InlineAsm/asm_decl_in_scope.cpp b/sycl/test-e2e/InlineAsm/asm_decl_in_scope.cpp
index ab6737ebd67ed..676d09382a6b6 100644
--- a/sycl/test-e2e/InlineAsm/asm_decl_in_scope.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_decl_in_scope.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: gpu,linux,sg-16
+// REQUIRES: sg-16
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/InlineAsm/asm_float_add.cpp b/sycl/test-e2e/InlineAsm/asm_float_add.cpp
index 74afe81515200..5b96b287232b9 100644
--- a/sycl/test-e2e/InlineAsm/asm_float_add.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_float_add.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: gpu,linux,sg-16
+// REQUIRES: sg-16
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/InlineAsm/asm_float_imm_arg.cpp b/sycl/test-e2e/InlineAsm/asm_float_imm_arg.cpp
index e54fd5c0af171..fa5f1378e7896 100644
--- a/sycl/test-e2e/InlineAsm/asm_float_imm_arg.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_float_imm_arg.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: gpu,linux,sg-16
+// REQUIRES: sg-16
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/InlineAsm/asm_float_neg.cpp b/sycl/test-e2e/InlineAsm/asm_float_neg.cpp
index 500709b25985d..c9a249c24f12f 100644
--- a/sycl/test-e2e/InlineAsm/asm_float_neg.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_float_neg.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: gpu,linux,sg-16
+// REQUIRES: sg-16
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/InlineAsm/asm_if.cpp b/sycl/test-e2e/InlineAsm/asm_if.cpp
index 37fb5231b2d4a..9225390cb9d50 100644
--- a/sycl/test-e2e/InlineAsm/asm_if.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_if.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: gpu,linux,sg-16
+// REQUIRES: sg-16
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/InlineAsm/asm_imm_arg.cpp b/sycl/test-e2e/InlineAsm/asm_imm_arg.cpp
index a7b93d6c89a8e..a3e46e0ddae44 100644
--- a/sycl/test-e2e/InlineAsm/asm_imm_arg.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_imm_arg.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: gpu,linux,sg-16
+// REQUIRES: sg-16
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/InlineAsm/asm_loop.cpp b/sycl/test-e2e/InlineAsm/asm_loop.cpp
index 99c00943047a8..94b2400bfa611 100644
--- a/sycl/test-e2e/InlineAsm/asm_loop.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_loop.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: gpu,linux,sg-16
+// REQUIRES: sg-16
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/InlineAsm/asm_mul.cpp b/sycl/test-e2e/InlineAsm/asm_mul.cpp
index 9d418939bc94a..22b5b9abbf12d 100644
--- a/sycl/test-e2e/InlineAsm/asm_mul.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_mul.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: gpu,linux,sg-16
+// REQUIRES: sg-16
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/InlineAsm/asm_multiple_instructions.cpp b/sycl/test-e2e/InlineAsm/asm_multiple_instructions.cpp
index 2a0cfe5351c01..06d314425bb1b 100644
--- a/sycl/test-e2e/InlineAsm/asm_multiple_instructions.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_multiple_instructions.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: gpu,linux,sg-16
+// REQUIRES: sg-16
 // RUN: %{build} -DTO_PASS -o %t.out.pass
 // RUN: %{run} %t.out.pass
 // RUN: %{build} -o %t.out
diff --git a/sycl/test-e2e/InlineAsm/asm_no_operands.cpp b/sycl/test-e2e/InlineAsm/asm_no_operands.cpp
index 6b93819fcbf3b..fd68892b6b7ed 100644
--- a/sycl/test-e2e/InlineAsm/asm_no_operands.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_no_operands.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: gpu,linux,sg-16
+// REQUIRES: sg-16
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/InlineAsm/asm_no_output.cpp b/sycl/test-e2e/InlineAsm/asm_no_output.cpp
index 0ddf5d084eca4..08153e72a9a77 100644
--- a/sycl/test-e2e/InlineAsm/asm_no_output.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_no_output.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: gpu,linux,sg-16
+// REQUIRES: sg-16
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/InlineAsm/asm_plus_mod.cpp b/sycl/test-e2e/InlineAsm/asm_plus_mod.cpp
index f9d80d139983d..df20dcbf2bc91 100644
--- a/sycl/test-e2e/InlineAsm/asm_plus_mod.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_plus_mod.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: gpu,linux,sg-16
+// REQUIRES: sg-16
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/InlineAsm/asm_switch.cpp b/sycl/test-e2e/InlineAsm/asm_switch.cpp
index 65b8265f63cba..ce94e912206f4 100644
--- a/sycl/test-e2e/InlineAsm/asm_switch.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_switch.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: gpu,linux,sg-16
+// REQUIRES: sg-16
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/InlineAsm/letter_example.cpp b/sycl/test-e2e/InlineAsm/letter_example.cpp
index 80394804dfc6d..780e33d77e803 100644
--- a/sycl/test-e2e/InlineAsm/letter_example.cpp
+++ b/sycl/test-e2e/InlineAsm/letter_example.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: gpu,linux,sg-16,aspect-usm_shared_allocations
+// REQUIRES: sg-16,aspect-usm_shared_allocations
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/InlineAsm/lit.local.cfg b/sycl/test-e2e/InlineAsm/lit.local.cfg
index 89cbba66c6409..a926c3e912f2a 100644
--- a/sycl/test-e2e/InlineAsm/lit.local.cfg
+++ b/sycl/test-e2e/InlineAsm/lit.local.cfg
@@ -1 +1,2 @@
 config.unsupported_features += ['cuda', 'hip']
+config.required_features += ['gpu', 'linux']
diff --git a/sycl/test-e2e/InlineAsm/malloc_shared_32.cpp b/sycl/test-e2e/InlineAsm/malloc_shared_32.cpp
index d0550685ee1a4..db96f418927dd 100644
--- a/sycl/test-e2e/InlineAsm/malloc_shared_32.cpp
+++ b/sycl/test-e2e/InlineAsm/malloc_shared_32.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: gpu,linux,sg-32,aspect-usm_shared_allocations
+// REQUIRES: sg-32,aspect-usm_shared_allocations
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/InlineAsm/malloc_shared_in_out_dif.cpp b/sycl/test-e2e/InlineAsm/malloc_shared_in_out_dif.cpp
index 53e24508da9b3..ac1419569f8fa 100644
--- a/sycl/test-e2e/InlineAsm/malloc_shared_in_out_dif.cpp
+++ b/sycl/test-e2e/InlineAsm/malloc_shared_in_out_dif.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: gpu,linux,sg-16,aspect-usm_shared_allocations
+// REQUIRES: sg-16,aspect-usm_shared_allocations
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/InlineAsm/malloc_shared_no_input.cpp b/sycl/test-e2e/InlineAsm/malloc_shared_no_input.cpp
index ee6af2a94bef8..2b617e1acdbd8 100644
--- a/sycl/test-e2e/InlineAsm/malloc_shared_no_input.cpp
+++ b/sycl/test-e2e/InlineAsm/malloc_shared_no_input.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: gpu,linux,sg-16,aspect-usm_shared_allocations
+// REQUIRES: sg-16,aspect-usm_shared_allocations
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 

From d83a37d5b8c0d0d5ec9ba280ab5d4654048955f9 Mon Sep 17 00:00:00 2001
From: "Garcia Orozco, David" <david.garcia.orozco@intel.com>
Date: Wed, 22 Jan 2025 13:47:59 -0800
Subject: [PATCH 3/6] Add `InlineAsm/IntelGPU` test directory

---
 .../InlineAsm/{ => IntelGPU}/Negative/asm_bad_opcode.cpp | 2 +-
 .../{ => IntelGPU}/Negative/asm_bad_operand_syntax.cpp   | 2 +-
 .../{ => IntelGPU}/Negative/asm_duplicate_label.cpp      | 2 +-
 .../{ => IntelGPU}/Negative/asm_illegal_exec_size.cpp    | 2 +-
 .../{ => IntelGPU}/Negative/asm_missing_label.cpp        | 2 +-
 .../{ => IntelGPU}/Negative/asm_missing_region.cpp       | 2 +-
 .../InlineAsm/{ => IntelGPU}/Negative/asm_simple.cpp     | 2 +-
 .../{ => IntelGPU}/Negative/asm_undefined_decl.cpp       | 2 +-
 .../{ => IntelGPU}/Negative/asm_undefined_pred.cpp       | 2 +-
 .../{ => IntelGPU}/Negative/asm_wrong_declare.cpp        | 2 +-
 .../InlineAsm/{ => IntelGPU}/asm_16_matrix_mult.cpp      | 0
 .../InlineAsm/{ => IntelGPU}/asm_16_no_input_int.cpp     | 0
 .../test-e2e/InlineAsm/{ => IntelGPU}/asm_16_no_opts.cpp | 0
 .../InlineAsm/{ => IntelGPU}/asm_8_no_input_int.cpp      | 0
 .../InlineAsm/{ => IntelGPU}/asm_arbitrary_ops_order.cpp | 0
 .../InlineAsm/{ => IntelGPU}/asm_decl_in_scope.cpp       | 0
 sycl/test-e2e/InlineAsm/{ => IntelGPU}/asm_float_add.cpp | 0
 .../InlineAsm/{ => IntelGPU}/asm_float_imm_arg.cpp       | 0
 sycl/test-e2e/InlineAsm/{ => IntelGPU}/asm_float_neg.cpp | 0
 sycl/test-e2e/InlineAsm/{ => IntelGPU}/asm_if.cpp        | 0
 sycl/test-e2e/InlineAsm/{ => IntelGPU}/asm_imm_arg.cpp   | 0
 sycl/test-e2e/InlineAsm/{ => IntelGPU}/asm_loop.cpp      | 0
 sycl/test-e2e/InlineAsm/{ => IntelGPU}/asm_mul.cpp       | 0
 .../{ => IntelGPU}/asm_multiple_instructions.cpp         | 0
 .../InlineAsm/{ => IntelGPU}/asm_no_operands.cpp         | 0
 sycl/test-e2e/InlineAsm/{ => IntelGPU}/asm_no_output.cpp | 0
 sycl/test-e2e/InlineAsm/{ => IntelGPU}/asm_plus_mod.cpp  | 0
 sycl/test-e2e/InlineAsm/{ => IntelGPU}/asm_switch.cpp    | 0
 .../test-e2e/InlineAsm/{ => IntelGPU}/letter_example.cpp | 0
 sycl/test-e2e/InlineAsm/IntelGPU/lit.local.cfg           | 1 +
 .../InlineAsm/{ => IntelGPU}/malloc_shared_32.cpp        | 0
 .../{ => IntelGPU}/malloc_shared_in_out_dif.cpp          | 0
 .../InlineAsm/{ => IntelGPU}/malloc_shared_no_input.cpp  | 0
 sycl/test-e2e/InlineAsm/asm_16_empty.cpp                 | 1 +
 sycl/test-e2e/InlineAsm/asm_8_empty.cpp                  | 1 +
 sycl/test-e2e/InlineAsm/lit.local.cfg                    | 9 ++++++++-
 36 files changed, 21 insertions(+), 11 deletions(-)
 rename sycl/test-e2e/InlineAsm/{ => IntelGPU}/Negative/asm_bad_opcode.cpp (95%)
 rename sycl/test-e2e/InlineAsm/{ => IntelGPU}/Negative/asm_bad_operand_syntax.cpp (95%)
 rename sycl/test-e2e/InlineAsm/{ => IntelGPU}/Negative/asm_duplicate_label.cpp (95%)
 rename sycl/test-e2e/InlineAsm/{ => IntelGPU}/Negative/asm_illegal_exec_size.cpp (95%)
 rename sycl/test-e2e/InlineAsm/{ => IntelGPU}/Negative/asm_missing_label.cpp (95%)
 rename sycl/test-e2e/InlineAsm/{ => IntelGPU}/Negative/asm_missing_region.cpp (95%)
 rename sycl/test-e2e/InlineAsm/{ => IntelGPU}/Negative/asm_simple.cpp (95%)
 rename sycl/test-e2e/InlineAsm/{ => IntelGPU}/Negative/asm_undefined_decl.cpp (95%)
 rename sycl/test-e2e/InlineAsm/{ => IntelGPU}/Negative/asm_undefined_pred.cpp (95%)
 rename sycl/test-e2e/InlineAsm/{ => IntelGPU}/Negative/asm_wrong_declare.cpp (95%)
 rename sycl/test-e2e/InlineAsm/{ => IntelGPU}/asm_16_matrix_mult.cpp (100%)
 rename sycl/test-e2e/InlineAsm/{ => IntelGPU}/asm_16_no_input_int.cpp (100%)
 rename sycl/test-e2e/InlineAsm/{ => IntelGPU}/asm_16_no_opts.cpp (100%)
 rename sycl/test-e2e/InlineAsm/{ => IntelGPU}/asm_8_no_input_int.cpp (100%)
 rename sycl/test-e2e/InlineAsm/{ => IntelGPU}/asm_arbitrary_ops_order.cpp (100%)
 rename sycl/test-e2e/InlineAsm/{ => IntelGPU}/asm_decl_in_scope.cpp (100%)
 rename sycl/test-e2e/InlineAsm/{ => IntelGPU}/asm_float_add.cpp (100%)
 rename sycl/test-e2e/InlineAsm/{ => IntelGPU}/asm_float_imm_arg.cpp (100%)
 rename sycl/test-e2e/InlineAsm/{ => IntelGPU}/asm_float_neg.cpp (100%)
 rename sycl/test-e2e/InlineAsm/{ => IntelGPU}/asm_if.cpp (100%)
 rename sycl/test-e2e/InlineAsm/{ => IntelGPU}/asm_imm_arg.cpp (100%)
 rename sycl/test-e2e/InlineAsm/{ => IntelGPU}/asm_loop.cpp (100%)
 rename sycl/test-e2e/InlineAsm/{ => IntelGPU}/asm_mul.cpp (100%)
 rename sycl/test-e2e/InlineAsm/{ => IntelGPU}/asm_multiple_instructions.cpp (100%)
 rename sycl/test-e2e/InlineAsm/{ => IntelGPU}/asm_no_operands.cpp (100%)
 rename sycl/test-e2e/InlineAsm/{ => IntelGPU}/asm_no_output.cpp (100%)
 rename sycl/test-e2e/InlineAsm/{ => IntelGPU}/asm_plus_mod.cpp (100%)
 rename sycl/test-e2e/InlineAsm/{ => IntelGPU}/asm_switch.cpp (100%)
 rename sycl/test-e2e/InlineAsm/{ => IntelGPU}/letter_example.cpp (100%)
 create mode 100644 sycl/test-e2e/InlineAsm/IntelGPU/lit.local.cfg
 rename sycl/test-e2e/InlineAsm/{ => IntelGPU}/malloc_shared_32.cpp (100%)
 rename sycl/test-e2e/InlineAsm/{ => IntelGPU}/malloc_shared_in_out_dif.cpp (100%)
 rename sycl/test-e2e/InlineAsm/{ => IntelGPU}/malloc_shared_no_input.cpp (100%)

diff --git a/sycl/test-e2e/InlineAsm/Negative/asm_bad_opcode.cpp b/sycl/test-e2e/InlineAsm/IntelGPU/Negative/asm_bad_opcode.cpp
similarity index 95%
rename from sycl/test-e2e/InlineAsm/Negative/asm_bad_opcode.cpp
rename to sycl/test-e2e/InlineAsm/IntelGPU/Negative/asm_bad_opcode.cpp
index 76c3bd855fd64..346cb2cf956a8 100644
--- a/sycl/test-e2e/InlineAsm/Negative/asm_bad_opcode.cpp
+++ b/sycl/test-e2e/InlineAsm/IntelGPU/Negative/asm_bad_opcode.cpp
@@ -2,7 +2,7 @@
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
-#include "../include/asmhelper.h"
+#include "include/asmhelper.h"
 #include <sycl/detail/core.hpp>
 
 struct KernelFunctor {
diff --git a/sycl/test-e2e/InlineAsm/Negative/asm_bad_operand_syntax.cpp b/sycl/test-e2e/InlineAsm/IntelGPU/Negative/asm_bad_operand_syntax.cpp
similarity index 95%
rename from sycl/test-e2e/InlineAsm/Negative/asm_bad_operand_syntax.cpp
rename to sycl/test-e2e/InlineAsm/IntelGPU/Negative/asm_bad_operand_syntax.cpp
index e4c9c95af2a2f..b02dde8cca5b0 100644
--- a/sycl/test-e2e/InlineAsm/Negative/asm_bad_operand_syntax.cpp
+++ b/sycl/test-e2e/InlineAsm/IntelGPU/Negative/asm_bad_operand_syntax.cpp
@@ -2,7 +2,7 @@
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
-#include "../include/asmhelper.h"
+#include "include/asmhelper.h"
 #include <sycl/detail/core.hpp>
 
 struct KernelFunctor {
diff --git a/sycl/test-e2e/InlineAsm/Negative/asm_duplicate_label.cpp b/sycl/test-e2e/InlineAsm/IntelGPU/Negative/asm_duplicate_label.cpp
similarity index 95%
rename from sycl/test-e2e/InlineAsm/Negative/asm_duplicate_label.cpp
rename to sycl/test-e2e/InlineAsm/IntelGPU/Negative/asm_duplicate_label.cpp
index 42c948f2e8ca5..aa0a20f3c54de 100644
--- a/sycl/test-e2e/InlineAsm/Negative/asm_duplicate_label.cpp
+++ b/sycl/test-e2e/InlineAsm/IntelGPU/Negative/asm_duplicate_label.cpp
@@ -2,7 +2,7 @@
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
-#include "../include/asmhelper.h"
+#include "include/asmhelper.h"
 #include <sycl/detail/core.hpp>
 
 struct KernelFunctor {
diff --git a/sycl/test-e2e/InlineAsm/Negative/asm_illegal_exec_size.cpp b/sycl/test-e2e/InlineAsm/IntelGPU/Negative/asm_illegal_exec_size.cpp
similarity index 95%
rename from sycl/test-e2e/InlineAsm/Negative/asm_illegal_exec_size.cpp
rename to sycl/test-e2e/InlineAsm/IntelGPU/Negative/asm_illegal_exec_size.cpp
index 2e26b62942589..1394f711cdeb2 100644
--- a/sycl/test-e2e/InlineAsm/Negative/asm_illegal_exec_size.cpp
+++ b/sycl/test-e2e/InlineAsm/IntelGPU/Negative/asm_illegal_exec_size.cpp
@@ -2,7 +2,7 @@
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
-#include "../include/asmhelper.h"
+#include "include/asmhelper.h"
 #include <sycl/detail/core.hpp>
 
 struct KernelFunctor {
diff --git a/sycl/test-e2e/InlineAsm/Negative/asm_missing_label.cpp b/sycl/test-e2e/InlineAsm/IntelGPU/Negative/asm_missing_label.cpp
similarity index 95%
rename from sycl/test-e2e/InlineAsm/Negative/asm_missing_label.cpp
rename to sycl/test-e2e/InlineAsm/IntelGPU/Negative/asm_missing_label.cpp
index 03eed77b28667..2e47f95737128 100644
--- a/sycl/test-e2e/InlineAsm/Negative/asm_missing_label.cpp
+++ b/sycl/test-e2e/InlineAsm/IntelGPU/Negative/asm_missing_label.cpp
@@ -2,7 +2,7 @@
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
-#include "../include/asmhelper.h"
+#include "include/asmhelper.h"
 #include <sycl/detail/core.hpp>
 
 struct KernelFunctor {
diff --git a/sycl/test-e2e/InlineAsm/Negative/asm_missing_region.cpp b/sycl/test-e2e/InlineAsm/IntelGPU/Negative/asm_missing_region.cpp
similarity index 95%
rename from sycl/test-e2e/InlineAsm/Negative/asm_missing_region.cpp
rename to sycl/test-e2e/InlineAsm/IntelGPU/Negative/asm_missing_region.cpp
index f98bad121e21c..78dc02d12a589 100644
--- a/sycl/test-e2e/InlineAsm/Negative/asm_missing_region.cpp
+++ b/sycl/test-e2e/InlineAsm/IntelGPU/Negative/asm_missing_region.cpp
@@ -2,7 +2,7 @@
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
-#include "../include/asmhelper.h"
+#include "include/asmhelper.h"
 #include <sycl/detail/core.hpp>
 
 struct KernelFunctor {
diff --git a/sycl/test-e2e/InlineAsm/Negative/asm_simple.cpp b/sycl/test-e2e/InlineAsm/IntelGPU/Negative/asm_simple.cpp
similarity index 95%
rename from sycl/test-e2e/InlineAsm/Negative/asm_simple.cpp
rename to sycl/test-e2e/InlineAsm/IntelGPU/Negative/asm_simple.cpp
index 4484e5518106a..e71569125c1ed 100644
--- a/sycl/test-e2e/InlineAsm/Negative/asm_simple.cpp
+++ b/sycl/test-e2e/InlineAsm/IntelGPU/Negative/asm_simple.cpp
@@ -2,7 +2,7 @@
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
-#include "../include/asmhelper.h"
+#include "include/asmhelper.h"
 #include <sycl/detail/core.hpp>
 
 struct KernelFunctor {
diff --git a/sycl/test-e2e/InlineAsm/Negative/asm_undefined_decl.cpp b/sycl/test-e2e/InlineAsm/IntelGPU/Negative/asm_undefined_decl.cpp
similarity index 95%
rename from sycl/test-e2e/InlineAsm/Negative/asm_undefined_decl.cpp
rename to sycl/test-e2e/InlineAsm/IntelGPU/Negative/asm_undefined_decl.cpp
index 9f971a492c95c..696f63a8fa6de 100644
--- a/sycl/test-e2e/InlineAsm/Negative/asm_undefined_decl.cpp
+++ b/sycl/test-e2e/InlineAsm/IntelGPU/Negative/asm_undefined_decl.cpp
@@ -2,7 +2,7 @@
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
-#include "../include/asmhelper.h"
+#include "include/asmhelper.h"
 #include <sycl/detail/core.hpp>
 
 struct KernelFunctor {
diff --git a/sycl/test-e2e/InlineAsm/Negative/asm_undefined_pred.cpp b/sycl/test-e2e/InlineAsm/IntelGPU/Negative/asm_undefined_pred.cpp
similarity index 95%
rename from sycl/test-e2e/InlineAsm/Negative/asm_undefined_pred.cpp
rename to sycl/test-e2e/InlineAsm/IntelGPU/Negative/asm_undefined_pred.cpp
index 52ce72ecdb3de..d69d96175d380 100644
--- a/sycl/test-e2e/InlineAsm/Negative/asm_undefined_pred.cpp
+++ b/sycl/test-e2e/InlineAsm/IntelGPU/Negative/asm_undefined_pred.cpp
@@ -2,7 +2,7 @@
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
-#include "../include/asmhelper.h"
+#include "include/asmhelper.h"
 #include <sycl/detail/core.hpp>
 
 struct KernelFunctor {
diff --git a/sycl/test-e2e/InlineAsm/Negative/asm_wrong_declare.cpp b/sycl/test-e2e/InlineAsm/IntelGPU/Negative/asm_wrong_declare.cpp
similarity index 95%
rename from sycl/test-e2e/InlineAsm/Negative/asm_wrong_declare.cpp
rename to sycl/test-e2e/InlineAsm/IntelGPU/Negative/asm_wrong_declare.cpp
index ee5c124c26ce1..cc68e80982d6d 100644
--- a/sycl/test-e2e/InlineAsm/Negative/asm_wrong_declare.cpp
+++ b/sycl/test-e2e/InlineAsm/IntelGPU/Negative/asm_wrong_declare.cpp
@@ -2,7 +2,7 @@
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
-#include "../include/asmhelper.h"
+#include "include/asmhelper.h"
 #include <sycl/detail/core.hpp>
 
 struct KernelFunctor {
diff --git a/sycl/test-e2e/InlineAsm/asm_16_matrix_mult.cpp b/sycl/test-e2e/InlineAsm/IntelGPU/asm_16_matrix_mult.cpp
similarity index 100%
rename from sycl/test-e2e/InlineAsm/asm_16_matrix_mult.cpp
rename to sycl/test-e2e/InlineAsm/IntelGPU/asm_16_matrix_mult.cpp
diff --git a/sycl/test-e2e/InlineAsm/asm_16_no_input_int.cpp b/sycl/test-e2e/InlineAsm/IntelGPU/asm_16_no_input_int.cpp
similarity index 100%
rename from sycl/test-e2e/InlineAsm/asm_16_no_input_int.cpp
rename to sycl/test-e2e/InlineAsm/IntelGPU/asm_16_no_input_int.cpp
diff --git a/sycl/test-e2e/InlineAsm/asm_16_no_opts.cpp b/sycl/test-e2e/InlineAsm/IntelGPU/asm_16_no_opts.cpp
similarity index 100%
rename from sycl/test-e2e/InlineAsm/asm_16_no_opts.cpp
rename to sycl/test-e2e/InlineAsm/IntelGPU/asm_16_no_opts.cpp
diff --git a/sycl/test-e2e/InlineAsm/asm_8_no_input_int.cpp b/sycl/test-e2e/InlineAsm/IntelGPU/asm_8_no_input_int.cpp
similarity index 100%
rename from sycl/test-e2e/InlineAsm/asm_8_no_input_int.cpp
rename to sycl/test-e2e/InlineAsm/IntelGPU/asm_8_no_input_int.cpp
diff --git a/sycl/test-e2e/InlineAsm/asm_arbitrary_ops_order.cpp b/sycl/test-e2e/InlineAsm/IntelGPU/asm_arbitrary_ops_order.cpp
similarity index 100%
rename from sycl/test-e2e/InlineAsm/asm_arbitrary_ops_order.cpp
rename to sycl/test-e2e/InlineAsm/IntelGPU/asm_arbitrary_ops_order.cpp
diff --git a/sycl/test-e2e/InlineAsm/asm_decl_in_scope.cpp b/sycl/test-e2e/InlineAsm/IntelGPU/asm_decl_in_scope.cpp
similarity index 100%
rename from sycl/test-e2e/InlineAsm/asm_decl_in_scope.cpp
rename to sycl/test-e2e/InlineAsm/IntelGPU/asm_decl_in_scope.cpp
diff --git a/sycl/test-e2e/InlineAsm/asm_float_add.cpp b/sycl/test-e2e/InlineAsm/IntelGPU/asm_float_add.cpp
similarity index 100%
rename from sycl/test-e2e/InlineAsm/asm_float_add.cpp
rename to sycl/test-e2e/InlineAsm/IntelGPU/asm_float_add.cpp
diff --git a/sycl/test-e2e/InlineAsm/asm_float_imm_arg.cpp b/sycl/test-e2e/InlineAsm/IntelGPU/asm_float_imm_arg.cpp
similarity index 100%
rename from sycl/test-e2e/InlineAsm/asm_float_imm_arg.cpp
rename to sycl/test-e2e/InlineAsm/IntelGPU/asm_float_imm_arg.cpp
diff --git a/sycl/test-e2e/InlineAsm/asm_float_neg.cpp b/sycl/test-e2e/InlineAsm/IntelGPU/asm_float_neg.cpp
similarity index 100%
rename from sycl/test-e2e/InlineAsm/asm_float_neg.cpp
rename to sycl/test-e2e/InlineAsm/IntelGPU/asm_float_neg.cpp
diff --git a/sycl/test-e2e/InlineAsm/asm_if.cpp b/sycl/test-e2e/InlineAsm/IntelGPU/asm_if.cpp
similarity index 100%
rename from sycl/test-e2e/InlineAsm/asm_if.cpp
rename to sycl/test-e2e/InlineAsm/IntelGPU/asm_if.cpp
diff --git a/sycl/test-e2e/InlineAsm/asm_imm_arg.cpp b/sycl/test-e2e/InlineAsm/IntelGPU/asm_imm_arg.cpp
similarity index 100%
rename from sycl/test-e2e/InlineAsm/asm_imm_arg.cpp
rename to sycl/test-e2e/InlineAsm/IntelGPU/asm_imm_arg.cpp
diff --git a/sycl/test-e2e/InlineAsm/asm_loop.cpp b/sycl/test-e2e/InlineAsm/IntelGPU/asm_loop.cpp
similarity index 100%
rename from sycl/test-e2e/InlineAsm/asm_loop.cpp
rename to sycl/test-e2e/InlineAsm/IntelGPU/asm_loop.cpp
diff --git a/sycl/test-e2e/InlineAsm/asm_mul.cpp b/sycl/test-e2e/InlineAsm/IntelGPU/asm_mul.cpp
similarity index 100%
rename from sycl/test-e2e/InlineAsm/asm_mul.cpp
rename to sycl/test-e2e/InlineAsm/IntelGPU/asm_mul.cpp
diff --git a/sycl/test-e2e/InlineAsm/asm_multiple_instructions.cpp b/sycl/test-e2e/InlineAsm/IntelGPU/asm_multiple_instructions.cpp
similarity index 100%
rename from sycl/test-e2e/InlineAsm/asm_multiple_instructions.cpp
rename to sycl/test-e2e/InlineAsm/IntelGPU/asm_multiple_instructions.cpp
diff --git a/sycl/test-e2e/InlineAsm/asm_no_operands.cpp b/sycl/test-e2e/InlineAsm/IntelGPU/asm_no_operands.cpp
similarity index 100%
rename from sycl/test-e2e/InlineAsm/asm_no_operands.cpp
rename to sycl/test-e2e/InlineAsm/IntelGPU/asm_no_operands.cpp
diff --git a/sycl/test-e2e/InlineAsm/asm_no_output.cpp b/sycl/test-e2e/InlineAsm/IntelGPU/asm_no_output.cpp
similarity index 100%
rename from sycl/test-e2e/InlineAsm/asm_no_output.cpp
rename to sycl/test-e2e/InlineAsm/IntelGPU/asm_no_output.cpp
diff --git a/sycl/test-e2e/InlineAsm/asm_plus_mod.cpp b/sycl/test-e2e/InlineAsm/IntelGPU/asm_plus_mod.cpp
similarity index 100%
rename from sycl/test-e2e/InlineAsm/asm_plus_mod.cpp
rename to sycl/test-e2e/InlineAsm/IntelGPU/asm_plus_mod.cpp
diff --git a/sycl/test-e2e/InlineAsm/asm_switch.cpp b/sycl/test-e2e/InlineAsm/IntelGPU/asm_switch.cpp
similarity index 100%
rename from sycl/test-e2e/InlineAsm/asm_switch.cpp
rename to sycl/test-e2e/InlineAsm/IntelGPU/asm_switch.cpp
diff --git a/sycl/test-e2e/InlineAsm/letter_example.cpp b/sycl/test-e2e/InlineAsm/IntelGPU/letter_example.cpp
similarity index 100%
rename from sycl/test-e2e/InlineAsm/letter_example.cpp
rename to sycl/test-e2e/InlineAsm/IntelGPU/letter_example.cpp
diff --git a/sycl/test-e2e/InlineAsm/IntelGPU/lit.local.cfg b/sycl/test-e2e/InlineAsm/IntelGPU/lit.local.cfg
new file mode 100644
index 0000000000000..d8d772df82e84
--- /dev/null
+++ b/sycl/test-e2e/InlineAsm/IntelGPU/lit.local.cfg
@@ -0,0 +1 @@
+config.required_features += ['opencl || level_zero']
diff --git a/sycl/test-e2e/InlineAsm/malloc_shared_32.cpp b/sycl/test-e2e/InlineAsm/IntelGPU/malloc_shared_32.cpp
similarity index 100%
rename from sycl/test-e2e/InlineAsm/malloc_shared_32.cpp
rename to sycl/test-e2e/InlineAsm/IntelGPU/malloc_shared_32.cpp
diff --git a/sycl/test-e2e/InlineAsm/malloc_shared_in_out_dif.cpp b/sycl/test-e2e/InlineAsm/IntelGPU/malloc_shared_in_out_dif.cpp
similarity index 100%
rename from sycl/test-e2e/InlineAsm/malloc_shared_in_out_dif.cpp
rename to sycl/test-e2e/InlineAsm/IntelGPU/malloc_shared_in_out_dif.cpp
diff --git a/sycl/test-e2e/InlineAsm/malloc_shared_no_input.cpp b/sycl/test-e2e/InlineAsm/IntelGPU/malloc_shared_no_input.cpp
similarity index 100%
rename from sycl/test-e2e/InlineAsm/malloc_shared_no_input.cpp
rename to sycl/test-e2e/InlineAsm/IntelGPU/malloc_shared_no_input.cpp
diff --git a/sycl/test-e2e/InlineAsm/asm_16_empty.cpp b/sycl/test-e2e/InlineAsm/asm_16_empty.cpp
index bffcc44e25d3a..1f747f22cdb57 100644
--- a/sycl/test-e2e/InlineAsm/asm_16_empty.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_16_empty.cpp
@@ -1,3 +1,4 @@
+// UNSUPPORTED: cuda
 // REQUIRES: sg-16
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/InlineAsm/asm_8_empty.cpp b/sycl/test-e2e/InlineAsm/asm_8_empty.cpp
index f784205bc6029..3fe0ac28f0849 100644
--- a/sycl/test-e2e/InlineAsm/asm_8_empty.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_8_empty.cpp
@@ -1,3 +1,4 @@
+// UNSUPPORTED: cuda
 // REQUIRES: sg-8
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/InlineAsm/lit.local.cfg b/sycl/test-e2e/InlineAsm/lit.local.cfg
index a926c3e912f2a..3b14b97afeee9 100644
--- a/sycl/test-e2e/InlineAsm/lit.local.cfg
+++ b/sycl/test-e2e/InlineAsm/lit.local.cfg
@@ -1,2 +1,9 @@
-config.unsupported_features += ['cuda', 'hip']
 config.required_features += ['gpu', 'linux']
+
+config.substitutions.append(("%helper-includes", "-I {}".format(os.path.dirname(os.path.abspath(__file__)))))
+original_clangxx=""
+for substitution in config.substitutions:
+  if substitution[0] == "%clangxx":
+    original_clangxx=substitution[1]
+config.substitutions.insert(0,
+  ("%clangxx", original_clangxx + ' %helper-includes '))

From dccac19b948a18593093fea0a2a03d4fda795c31 Mon Sep 17 00:00:00 2001
From: "Garcia Orozco, David" <david.garcia.orozco@intel.com>
Date: Mon, 27 Jan 2025 10:09:58 -0800
Subject: [PATCH 4/6] Use target features instead of backend features

---
 sycl/test-e2e/InlineAsm/IntelGPU/lit.local.cfg | 2 +-
 sycl/test-e2e/InlineAsm/asm_16_empty.cpp       | 2 +-
 sycl/test-e2e/InlineAsm/asm_8_empty.cpp        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sycl/test-e2e/InlineAsm/IntelGPU/lit.local.cfg b/sycl/test-e2e/InlineAsm/IntelGPU/lit.local.cfg
index d8d772df82e84..2e3c33e2f1b12 100644
--- a/sycl/test-e2e/InlineAsm/IntelGPU/lit.local.cfg
+++ b/sycl/test-e2e/InlineAsm/IntelGPU/lit.local.cfg
@@ -1 +1 @@
-config.required_features += ['opencl || level_zero']
+config.required_features += ['target-spir']
diff --git a/sycl/test-e2e/InlineAsm/asm_16_empty.cpp b/sycl/test-e2e/InlineAsm/asm_16_empty.cpp
index 1f747f22cdb57..c1a6ac85f0837 100644
--- a/sycl/test-e2e/InlineAsm/asm_16_empty.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_16_empty.cpp
@@ -1,4 +1,4 @@
-// UNSUPPORTED: cuda
+// UNSUPPORTED: target-nvidia
 // REQUIRES: sg-16
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/InlineAsm/asm_8_empty.cpp b/sycl/test-e2e/InlineAsm/asm_8_empty.cpp
index 3fe0ac28f0849..449c775956399 100644
--- a/sycl/test-e2e/InlineAsm/asm_8_empty.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_8_empty.cpp
@@ -1,4 +1,4 @@
-// UNSUPPORTED: cuda
+// UNSUPPORTED: target-nvidia
 // REQUIRES: sg-8
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out

From 7dec03995872a7b9c81b71777d1214b84b73843b Mon Sep 17 00:00:00 2001
From: "Garcia Orozco, David" <david.garcia.orozco@intel.com>
Date: Mon, 27 Jan 2025 10:21:05 -0800
Subject: [PATCH 5/6] remove IntelGPU folder, and add target-spir to
 lit.local.cfg

---
 sycl/test-e2e/InlineAsm/IntelGPU/lit.local.cfg                  | 1 -
 .../InlineAsm/{IntelGPU => }/Negative/asm_bad_opcode.cpp        | 0
 .../{IntelGPU => }/Negative/asm_bad_operand_syntax.cpp          | 0
 .../InlineAsm/{IntelGPU => }/Negative/asm_duplicate_label.cpp   | 0
 .../InlineAsm/{IntelGPU => }/Negative/asm_illegal_exec_size.cpp | 0
 .../InlineAsm/{IntelGPU => }/Negative/asm_missing_label.cpp     | 0
 .../InlineAsm/{IntelGPU => }/Negative/asm_missing_region.cpp    | 0
 sycl/test-e2e/InlineAsm/{IntelGPU => }/Negative/asm_simple.cpp  | 0
 .../InlineAsm/{IntelGPU => }/Negative/asm_undefined_decl.cpp    | 0
 .../InlineAsm/{IntelGPU => }/Negative/asm_undefined_pred.cpp    | 0
 .../InlineAsm/{IntelGPU => }/Negative/asm_wrong_declare.cpp     | 0
 sycl/test-e2e/InlineAsm/asm_16_empty.cpp                        | 1 -
 sycl/test-e2e/InlineAsm/{IntelGPU => }/asm_16_matrix_mult.cpp   | 0
 sycl/test-e2e/InlineAsm/{IntelGPU => }/asm_16_no_input_int.cpp  | 0
 sycl/test-e2e/InlineAsm/{IntelGPU => }/asm_16_no_opts.cpp       | 0
 sycl/test-e2e/InlineAsm/asm_8_empty.cpp                         | 1 -
 sycl/test-e2e/InlineAsm/{IntelGPU => }/asm_8_no_input_int.cpp   | 0
 .../InlineAsm/{IntelGPU => }/asm_arbitrary_ops_order.cpp        | 0
 sycl/test-e2e/InlineAsm/{IntelGPU => }/asm_decl_in_scope.cpp    | 0
 sycl/test-e2e/InlineAsm/{IntelGPU => }/asm_float_add.cpp        | 0
 sycl/test-e2e/InlineAsm/{IntelGPU => }/asm_float_imm_arg.cpp    | 0
 sycl/test-e2e/InlineAsm/{IntelGPU => }/asm_float_neg.cpp        | 0
 sycl/test-e2e/InlineAsm/{IntelGPU => }/asm_if.cpp               | 0
 sycl/test-e2e/InlineAsm/{IntelGPU => }/asm_imm_arg.cpp          | 0
 sycl/test-e2e/InlineAsm/{IntelGPU => }/asm_loop.cpp             | 0
 sycl/test-e2e/InlineAsm/{IntelGPU => }/asm_mul.cpp              | 0
 .../InlineAsm/{IntelGPU => }/asm_multiple_instructions.cpp      | 0
 sycl/test-e2e/InlineAsm/{IntelGPU => }/asm_no_operands.cpp      | 0
 sycl/test-e2e/InlineAsm/{IntelGPU => }/asm_no_output.cpp        | 0
 sycl/test-e2e/InlineAsm/{IntelGPU => }/asm_plus_mod.cpp         | 0
 sycl/test-e2e/InlineAsm/{IntelGPU => }/asm_switch.cpp           | 0
 sycl/test-e2e/InlineAsm/{IntelGPU => }/letter_example.cpp       | 0
 sycl/test-e2e/InlineAsm/lit.local.cfg                           | 2 +-
 sycl/test-e2e/InlineAsm/{IntelGPU => }/malloc_shared_32.cpp     | 0
 .../InlineAsm/{IntelGPU => }/malloc_shared_in_out_dif.cpp       | 0
 .../InlineAsm/{IntelGPU => }/malloc_shared_no_input.cpp         | 0
 36 files changed, 1 insertion(+), 4 deletions(-)
 delete mode 100644 sycl/test-e2e/InlineAsm/IntelGPU/lit.local.cfg
 rename sycl/test-e2e/InlineAsm/{IntelGPU => }/Negative/asm_bad_opcode.cpp (100%)
 rename sycl/test-e2e/InlineAsm/{IntelGPU => }/Negative/asm_bad_operand_syntax.cpp (100%)
 rename sycl/test-e2e/InlineAsm/{IntelGPU => }/Negative/asm_duplicate_label.cpp (100%)
 rename sycl/test-e2e/InlineAsm/{IntelGPU => }/Negative/asm_illegal_exec_size.cpp (100%)
 rename sycl/test-e2e/InlineAsm/{IntelGPU => }/Negative/asm_missing_label.cpp (100%)
 rename sycl/test-e2e/InlineAsm/{IntelGPU => }/Negative/asm_missing_region.cpp (100%)
 rename sycl/test-e2e/InlineAsm/{IntelGPU => }/Negative/asm_simple.cpp (100%)
 rename sycl/test-e2e/InlineAsm/{IntelGPU => }/Negative/asm_undefined_decl.cpp (100%)
 rename sycl/test-e2e/InlineAsm/{IntelGPU => }/Negative/asm_undefined_pred.cpp (100%)
 rename sycl/test-e2e/InlineAsm/{IntelGPU => }/Negative/asm_wrong_declare.cpp (100%)
 rename sycl/test-e2e/InlineAsm/{IntelGPU => }/asm_16_matrix_mult.cpp (100%)
 rename sycl/test-e2e/InlineAsm/{IntelGPU => }/asm_16_no_input_int.cpp (100%)
 rename sycl/test-e2e/InlineAsm/{IntelGPU => }/asm_16_no_opts.cpp (100%)
 rename sycl/test-e2e/InlineAsm/{IntelGPU => }/asm_8_no_input_int.cpp (100%)
 rename sycl/test-e2e/InlineAsm/{IntelGPU => }/asm_arbitrary_ops_order.cpp (100%)
 rename sycl/test-e2e/InlineAsm/{IntelGPU => }/asm_decl_in_scope.cpp (100%)
 rename sycl/test-e2e/InlineAsm/{IntelGPU => }/asm_float_add.cpp (100%)
 rename sycl/test-e2e/InlineAsm/{IntelGPU => }/asm_float_imm_arg.cpp (100%)
 rename sycl/test-e2e/InlineAsm/{IntelGPU => }/asm_float_neg.cpp (100%)
 rename sycl/test-e2e/InlineAsm/{IntelGPU => }/asm_if.cpp (100%)
 rename sycl/test-e2e/InlineAsm/{IntelGPU => }/asm_imm_arg.cpp (100%)
 rename sycl/test-e2e/InlineAsm/{IntelGPU => }/asm_loop.cpp (100%)
 rename sycl/test-e2e/InlineAsm/{IntelGPU => }/asm_mul.cpp (100%)
 rename sycl/test-e2e/InlineAsm/{IntelGPU => }/asm_multiple_instructions.cpp (100%)
 rename sycl/test-e2e/InlineAsm/{IntelGPU => }/asm_no_operands.cpp (100%)
 rename sycl/test-e2e/InlineAsm/{IntelGPU => }/asm_no_output.cpp (100%)
 rename sycl/test-e2e/InlineAsm/{IntelGPU => }/asm_plus_mod.cpp (100%)
 rename sycl/test-e2e/InlineAsm/{IntelGPU => }/asm_switch.cpp (100%)
 rename sycl/test-e2e/InlineAsm/{IntelGPU => }/letter_example.cpp (100%)
 rename sycl/test-e2e/InlineAsm/{IntelGPU => }/malloc_shared_32.cpp (100%)
 rename sycl/test-e2e/InlineAsm/{IntelGPU => }/malloc_shared_in_out_dif.cpp (100%)
 rename sycl/test-e2e/InlineAsm/{IntelGPU => }/malloc_shared_no_input.cpp (100%)

diff --git a/sycl/test-e2e/InlineAsm/IntelGPU/lit.local.cfg b/sycl/test-e2e/InlineAsm/IntelGPU/lit.local.cfg
deleted file mode 100644
index 2e3c33e2f1b12..0000000000000
--- a/sycl/test-e2e/InlineAsm/IntelGPU/lit.local.cfg
+++ /dev/null
@@ -1 +0,0 @@
-config.required_features += ['target-spir']
diff --git a/sycl/test-e2e/InlineAsm/IntelGPU/Negative/asm_bad_opcode.cpp b/sycl/test-e2e/InlineAsm/Negative/asm_bad_opcode.cpp
similarity index 100%
rename from sycl/test-e2e/InlineAsm/IntelGPU/Negative/asm_bad_opcode.cpp
rename to sycl/test-e2e/InlineAsm/Negative/asm_bad_opcode.cpp
diff --git a/sycl/test-e2e/InlineAsm/IntelGPU/Negative/asm_bad_operand_syntax.cpp b/sycl/test-e2e/InlineAsm/Negative/asm_bad_operand_syntax.cpp
similarity index 100%
rename from sycl/test-e2e/InlineAsm/IntelGPU/Negative/asm_bad_operand_syntax.cpp
rename to sycl/test-e2e/InlineAsm/Negative/asm_bad_operand_syntax.cpp
diff --git a/sycl/test-e2e/InlineAsm/IntelGPU/Negative/asm_duplicate_label.cpp b/sycl/test-e2e/InlineAsm/Negative/asm_duplicate_label.cpp
similarity index 100%
rename from sycl/test-e2e/InlineAsm/IntelGPU/Negative/asm_duplicate_label.cpp
rename to sycl/test-e2e/InlineAsm/Negative/asm_duplicate_label.cpp
diff --git a/sycl/test-e2e/InlineAsm/IntelGPU/Negative/asm_illegal_exec_size.cpp b/sycl/test-e2e/InlineAsm/Negative/asm_illegal_exec_size.cpp
similarity index 100%
rename from sycl/test-e2e/InlineAsm/IntelGPU/Negative/asm_illegal_exec_size.cpp
rename to sycl/test-e2e/InlineAsm/Negative/asm_illegal_exec_size.cpp
diff --git a/sycl/test-e2e/InlineAsm/IntelGPU/Negative/asm_missing_label.cpp b/sycl/test-e2e/InlineAsm/Negative/asm_missing_label.cpp
similarity index 100%
rename from sycl/test-e2e/InlineAsm/IntelGPU/Negative/asm_missing_label.cpp
rename to sycl/test-e2e/InlineAsm/Negative/asm_missing_label.cpp
diff --git a/sycl/test-e2e/InlineAsm/IntelGPU/Negative/asm_missing_region.cpp b/sycl/test-e2e/InlineAsm/Negative/asm_missing_region.cpp
similarity index 100%
rename from sycl/test-e2e/InlineAsm/IntelGPU/Negative/asm_missing_region.cpp
rename to sycl/test-e2e/InlineAsm/Negative/asm_missing_region.cpp
diff --git a/sycl/test-e2e/InlineAsm/IntelGPU/Negative/asm_simple.cpp b/sycl/test-e2e/InlineAsm/Negative/asm_simple.cpp
similarity index 100%
rename from sycl/test-e2e/InlineAsm/IntelGPU/Negative/asm_simple.cpp
rename to sycl/test-e2e/InlineAsm/Negative/asm_simple.cpp
diff --git a/sycl/test-e2e/InlineAsm/IntelGPU/Negative/asm_undefined_decl.cpp b/sycl/test-e2e/InlineAsm/Negative/asm_undefined_decl.cpp
similarity index 100%
rename from sycl/test-e2e/InlineAsm/IntelGPU/Negative/asm_undefined_decl.cpp
rename to sycl/test-e2e/InlineAsm/Negative/asm_undefined_decl.cpp
diff --git a/sycl/test-e2e/InlineAsm/IntelGPU/Negative/asm_undefined_pred.cpp b/sycl/test-e2e/InlineAsm/Negative/asm_undefined_pred.cpp
similarity index 100%
rename from sycl/test-e2e/InlineAsm/IntelGPU/Negative/asm_undefined_pred.cpp
rename to sycl/test-e2e/InlineAsm/Negative/asm_undefined_pred.cpp
diff --git a/sycl/test-e2e/InlineAsm/IntelGPU/Negative/asm_wrong_declare.cpp b/sycl/test-e2e/InlineAsm/Negative/asm_wrong_declare.cpp
similarity index 100%
rename from sycl/test-e2e/InlineAsm/IntelGPU/Negative/asm_wrong_declare.cpp
rename to sycl/test-e2e/InlineAsm/Negative/asm_wrong_declare.cpp
diff --git a/sycl/test-e2e/InlineAsm/asm_16_empty.cpp b/sycl/test-e2e/InlineAsm/asm_16_empty.cpp
index c1a6ac85f0837..bffcc44e25d3a 100644
--- a/sycl/test-e2e/InlineAsm/asm_16_empty.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_16_empty.cpp
@@ -1,4 +1,3 @@
-// UNSUPPORTED: target-nvidia
 // REQUIRES: sg-16
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/InlineAsm/IntelGPU/asm_16_matrix_mult.cpp b/sycl/test-e2e/InlineAsm/asm_16_matrix_mult.cpp
similarity index 100%
rename from sycl/test-e2e/InlineAsm/IntelGPU/asm_16_matrix_mult.cpp
rename to sycl/test-e2e/InlineAsm/asm_16_matrix_mult.cpp
diff --git a/sycl/test-e2e/InlineAsm/IntelGPU/asm_16_no_input_int.cpp b/sycl/test-e2e/InlineAsm/asm_16_no_input_int.cpp
similarity index 100%
rename from sycl/test-e2e/InlineAsm/IntelGPU/asm_16_no_input_int.cpp
rename to sycl/test-e2e/InlineAsm/asm_16_no_input_int.cpp
diff --git a/sycl/test-e2e/InlineAsm/IntelGPU/asm_16_no_opts.cpp b/sycl/test-e2e/InlineAsm/asm_16_no_opts.cpp
similarity index 100%
rename from sycl/test-e2e/InlineAsm/IntelGPU/asm_16_no_opts.cpp
rename to sycl/test-e2e/InlineAsm/asm_16_no_opts.cpp
diff --git a/sycl/test-e2e/InlineAsm/asm_8_empty.cpp b/sycl/test-e2e/InlineAsm/asm_8_empty.cpp
index 449c775956399..f784205bc6029 100644
--- a/sycl/test-e2e/InlineAsm/asm_8_empty.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_8_empty.cpp
@@ -1,4 +1,3 @@
-// UNSUPPORTED: target-nvidia
 // REQUIRES: sg-8
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/InlineAsm/IntelGPU/asm_8_no_input_int.cpp b/sycl/test-e2e/InlineAsm/asm_8_no_input_int.cpp
similarity index 100%
rename from sycl/test-e2e/InlineAsm/IntelGPU/asm_8_no_input_int.cpp
rename to sycl/test-e2e/InlineAsm/asm_8_no_input_int.cpp
diff --git a/sycl/test-e2e/InlineAsm/IntelGPU/asm_arbitrary_ops_order.cpp b/sycl/test-e2e/InlineAsm/asm_arbitrary_ops_order.cpp
similarity index 100%
rename from sycl/test-e2e/InlineAsm/IntelGPU/asm_arbitrary_ops_order.cpp
rename to sycl/test-e2e/InlineAsm/asm_arbitrary_ops_order.cpp
diff --git a/sycl/test-e2e/InlineAsm/IntelGPU/asm_decl_in_scope.cpp b/sycl/test-e2e/InlineAsm/asm_decl_in_scope.cpp
similarity index 100%
rename from sycl/test-e2e/InlineAsm/IntelGPU/asm_decl_in_scope.cpp
rename to sycl/test-e2e/InlineAsm/asm_decl_in_scope.cpp
diff --git a/sycl/test-e2e/InlineAsm/IntelGPU/asm_float_add.cpp b/sycl/test-e2e/InlineAsm/asm_float_add.cpp
similarity index 100%
rename from sycl/test-e2e/InlineAsm/IntelGPU/asm_float_add.cpp
rename to sycl/test-e2e/InlineAsm/asm_float_add.cpp
diff --git a/sycl/test-e2e/InlineAsm/IntelGPU/asm_float_imm_arg.cpp b/sycl/test-e2e/InlineAsm/asm_float_imm_arg.cpp
similarity index 100%
rename from sycl/test-e2e/InlineAsm/IntelGPU/asm_float_imm_arg.cpp
rename to sycl/test-e2e/InlineAsm/asm_float_imm_arg.cpp
diff --git a/sycl/test-e2e/InlineAsm/IntelGPU/asm_float_neg.cpp b/sycl/test-e2e/InlineAsm/asm_float_neg.cpp
similarity index 100%
rename from sycl/test-e2e/InlineAsm/IntelGPU/asm_float_neg.cpp
rename to sycl/test-e2e/InlineAsm/asm_float_neg.cpp
diff --git a/sycl/test-e2e/InlineAsm/IntelGPU/asm_if.cpp b/sycl/test-e2e/InlineAsm/asm_if.cpp
similarity index 100%
rename from sycl/test-e2e/InlineAsm/IntelGPU/asm_if.cpp
rename to sycl/test-e2e/InlineAsm/asm_if.cpp
diff --git a/sycl/test-e2e/InlineAsm/IntelGPU/asm_imm_arg.cpp b/sycl/test-e2e/InlineAsm/asm_imm_arg.cpp
similarity index 100%
rename from sycl/test-e2e/InlineAsm/IntelGPU/asm_imm_arg.cpp
rename to sycl/test-e2e/InlineAsm/asm_imm_arg.cpp
diff --git a/sycl/test-e2e/InlineAsm/IntelGPU/asm_loop.cpp b/sycl/test-e2e/InlineAsm/asm_loop.cpp
similarity index 100%
rename from sycl/test-e2e/InlineAsm/IntelGPU/asm_loop.cpp
rename to sycl/test-e2e/InlineAsm/asm_loop.cpp
diff --git a/sycl/test-e2e/InlineAsm/IntelGPU/asm_mul.cpp b/sycl/test-e2e/InlineAsm/asm_mul.cpp
similarity index 100%
rename from sycl/test-e2e/InlineAsm/IntelGPU/asm_mul.cpp
rename to sycl/test-e2e/InlineAsm/asm_mul.cpp
diff --git a/sycl/test-e2e/InlineAsm/IntelGPU/asm_multiple_instructions.cpp b/sycl/test-e2e/InlineAsm/asm_multiple_instructions.cpp
similarity index 100%
rename from sycl/test-e2e/InlineAsm/IntelGPU/asm_multiple_instructions.cpp
rename to sycl/test-e2e/InlineAsm/asm_multiple_instructions.cpp
diff --git a/sycl/test-e2e/InlineAsm/IntelGPU/asm_no_operands.cpp b/sycl/test-e2e/InlineAsm/asm_no_operands.cpp
similarity index 100%
rename from sycl/test-e2e/InlineAsm/IntelGPU/asm_no_operands.cpp
rename to sycl/test-e2e/InlineAsm/asm_no_operands.cpp
diff --git a/sycl/test-e2e/InlineAsm/IntelGPU/asm_no_output.cpp b/sycl/test-e2e/InlineAsm/asm_no_output.cpp
similarity index 100%
rename from sycl/test-e2e/InlineAsm/IntelGPU/asm_no_output.cpp
rename to sycl/test-e2e/InlineAsm/asm_no_output.cpp
diff --git a/sycl/test-e2e/InlineAsm/IntelGPU/asm_plus_mod.cpp b/sycl/test-e2e/InlineAsm/asm_plus_mod.cpp
similarity index 100%
rename from sycl/test-e2e/InlineAsm/IntelGPU/asm_plus_mod.cpp
rename to sycl/test-e2e/InlineAsm/asm_plus_mod.cpp
diff --git a/sycl/test-e2e/InlineAsm/IntelGPU/asm_switch.cpp b/sycl/test-e2e/InlineAsm/asm_switch.cpp
similarity index 100%
rename from sycl/test-e2e/InlineAsm/IntelGPU/asm_switch.cpp
rename to sycl/test-e2e/InlineAsm/asm_switch.cpp
diff --git a/sycl/test-e2e/InlineAsm/IntelGPU/letter_example.cpp b/sycl/test-e2e/InlineAsm/letter_example.cpp
similarity index 100%
rename from sycl/test-e2e/InlineAsm/IntelGPU/letter_example.cpp
rename to sycl/test-e2e/InlineAsm/letter_example.cpp
diff --git a/sycl/test-e2e/InlineAsm/lit.local.cfg b/sycl/test-e2e/InlineAsm/lit.local.cfg
index 3b14b97afeee9..854d405afa90d 100644
--- a/sycl/test-e2e/InlineAsm/lit.local.cfg
+++ b/sycl/test-e2e/InlineAsm/lit.local.cfg
@@ -1,4 +1,4 @@
-config.required_features += ['gpu', 'linux']
+config.required_features += ['gpu', 'linux', 'target-spir']
 
 config.substitutions.append(("%helper-includes", "-I {}".format(os.path.dirname(os.path.abspath(__file__)))))
 original_clangxx=""
diff --git a/sycl/test-e2e/InlineAsm/IntelGPU/malloc_shared_32.cpp b/sycl/test-e2e/InlineAsm/malloc_shared_32.cpp
similarity index 100%
rename from sycl/test-e2e/InlineAsm/IntelGPU/malloc_shared_32.cpp
rename to sycl/test-e2e/InlineAsm/malloc_shared_32.cpp
diff --git a/sycl/test-e2e/InlineAsm/IntelGPU/malloc_shared_in_out_dif.cpp b/sycl/test-e2e/InlineAsm/malloc_shared_in_out_dif.cpp
similarity index 100%
rename from sycl/test-e2e/InlineAsm/IntelGPU/malloc_shared_in_out_dif.cpp
rename to sycl/test-e2e/InlineAsm/malloc_shared_in_out_dif.cpp
diff --git a/sycl/test-e2e/InlineAsm/IntelGPU/malloc_shared_no_input.cpp b/sycl/test-e2e/InlineAsm/malloc_shared_no_input.cpp
similarity index 100%
rename from sycl/test-e2e/InlineAsm/IntelGPU/malloc_shared_no_input.cpp
rename to sycl/test-e2e/InlineAsm/malloc_shared_no_input.cpp

From 904d02f719075527ae266018c1da5b6aaed230c5 Mon Sep 17 00:00:00 2001
From: "Garcia Orozco, David" <david.garcia.orozco@intel.com>
Date: Tue, 28 Jan 2025 06:41:35 -0800
Subject: [PATCH 6/6] update unsupported tracking test

---
 .../no-unsupported-without-info.cpp           | 36 +------------------
 1 file changed, 1 insertion(+), 35 deletions(-)

diff --git a/sycl/test/e2e_test_requirements/no-unsupported-without-info.cpp b/sycl/test/e2e_test_requirements/no-unsupported-without-info.cpp
index be4b7933c7813..f95323d179fb0 100644
--- a/sycl/test/e2e_test_requirements/no-unsupported-without-info.cpp
+++ b/sycl/test/e2e_test_requirements/no-unsupported-without-info.cpp
@@ -54,7 +54,7 @@
 // tests to match the required format and in that case you should just update
 // (i.e. reduce) the number and the list below.
 //
-// NUMBER-OF-UNSUPPORTED-WITHOUT-INFO: 409
+// NUMBER-OF-UNSUPPORTED-WITHOUT-INFO: 375
 //
 // List of improperly UNSUPPORTED tests.
 // Remove the CHECK once the test has been properly UNSUPPORTED.
@@ -233,40 +233,6 @@
 // CHECK-NEXT: HierPar/hier_par_wgscope.cpp
 // CHECK-NEXT: HostInteropTask/host-task-failure.cpp
 // CHECK-NEXT: HostInteropTask/interop-task.cpp
-// CHECK-NEXT: InlineAsm/Negative/asm_bad_opcode.cpp
-// CHECK-NEXT: InlineAsm/Negative/asm_bad_operand_syntax.cpp
-// CHECK-NEXT: InlineAsm/Negative/asm_duplicate_label.cpp
-// CHECK-NEXT: InlineAsm/Negative/asm_illegal_exec_size.cpp
-// CHECK-NEXT: InlineAsm/Negative/asm_missing_label.cpp
-// CHECK-NEXT: InlineAsm/Negative/asm_missing_region.cpp
-// CHECK-NEXT: InlineAsm/Negative/asm_simple.cpp
-// CHECK-NEXT: InlineAsm/Negative/asm_undefined_decl.cpp
-// CHECK-NEXT: InlineAsm/Negative/asm_undefined_pred.cpp
-// CHECK-NEXT: InlineAsm/Negative/asm_wrong_declare.cpp
-// CHECK-NEXT: InlineAsm/asm_16_empty.cpp
-// CHECK-NEXT: InlineAsm/asm_16_matrix_mult.cpp
-// CHECK-NEXT: InlineAsm/asm_16_no_input_int.cpp
-// CHECK-NEXT: InlineAsm/asm_16_no_opts.cpp
-// CHECK-NEXT: InlineAsm/asm_8_empty.cpp
-// CHECK-NEXT: InlineAsm/asm_8_no_input_int.cpp
-// CHECK-NEXT: InlineAsm/asm_arbitrary_ops_order.cpp
-// CHECK-NEXT: InlineAsm/asm_decl_in_scope.cpp
-// CHECK-NEXT: InlineAsm/asm_float_add.cpp
-// CHECK-NEXT: InlineAsm/asm_float_imm_arg.cpp
-// CHECK-NEXT: InlineAsm/asm_float_neg.cpp
-// CHECK-NEXT: InlineAsm/asm_if.cpp
-// CHECK-NEXT: InlineAsm/asm_imm_arg.cpp
-// CHECK-NEXT: InlineAsm/asm_loop.cpp
-// CHECK-NEXT: InlineAsm/asm_mul.cpp
-// CHECK-NEXT: InlineAsm/asm_multiple_instructions.cpp
-// CHECK-NEXT: InlineAsm/asm_no_operands.cpp
-// CHECK-NEXT: InlineAsm/asm_no_output.cpp
-// CHECK-NEXT: InlineAsm/asm_plus_mod.cpp
-// CHECK-NEXT: InlineAsm/asm_switch.cpp
-// CHECK-NEXT: InlineAsm/letter_example.cpp
-// CHECK-NEXT: InlineAsm/malloc_shared_32.cpp
-// CHECK-NEXT: InlineAsm/malloc_shared_in_out_dif.cpp
-// CHECK-NEXT: InlineAsm/malloc_shared_no_input.cpp
 // CHECK-NEXT: InvokeSimd/Feature/ImplicitSubgroup/SPMD_invoke_ESIMD_external.cpp
 // CHECK-NEXT: InvokeSimd/Feature/ImplicitSubgroup/popcnt.cpp
 // CHECK-NEXT: InvokeSimd/Feature/popcnt.cpp