[SYCL][E2E] Add InlineAsm/lit.local.cfg to clean up REQUIRES/`UNS…

…UPPORTED` (#16311) All test in this folder use `REQUIRES: gpu,linux` and `UNSUPPORTED: cuda, hip`. So using a lit.local.cfg file makes sense here.
intel · Jan 28, 2025 · 8324bb2 · 8324bb2
1 parent f7fc46d
commit 8324bb2
Show file tree

Hide file tree

Showing 36 changed files with 54 additions and 113 deletions.
diff --git a/sycl/test-e2e/InlineAsm/Negative/asm_bad_opcode.cpp b/sycl/test-e2e/InlineAsm/Negative/asm_bad_opcode.cpp
@@ -1,9 +1,8 @@
-// UNSUPPORTED: cuda || hip
-// REQUIRES: gpu,linux,sg-16
+// REQUIRES: sg-16
 // 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/Negative/asm_bad_operand_syntax.cpp
@@ -1,9 +1,8 @@
-// UNSUPPORTED: cuda || hip
-// REQUIRES: gpu,linux,sg-16
+// REQUIRES: sg-16
 // 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/Negative/asm_duplicate_label.cpp
@@ -1,9 +1,8 @@
-// UNSUPPORTED: cuda || hip
-// REQUIRES: gpu,linux,sg-16
+// REQUIRES: sg-16
 // 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/Negative/asm_illegal_exec_size.cpp
@@ -1,9 +1,8 @@
-// UNSUPPORTED: cuda || hip
-// REQUIRES: gpu,linux,sg-16
+// REQUIRES: sg-16
 // 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/Negative/asm_missing_label.cpp
@@ -1,9 +1,8 @@
-// UNSUPPORTED: cuda || hip
-// REQUIRES: gpu,linux,sg-16
+// REQUIRES: sg-16
 // 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/Negative/asm_missing_region.cpp
@@ -1,9 +1,8 @@
-// UNSUPPORTED: cuda || hip
-// REQUIRES: gpu,linux,sg-16
+// REQUIRES: sg-16
 // 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/Negative/asm_simple.cpp
@@ -1,9 +1,8 @@
-// UNSUPPORTED: cuda || hip
-// REQUIRES: gpu,linux,sg-16
+// REQUIRES: sg-16
 // 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/Negative/asm_undefined_decl.cpp
@@ -1,9 +1,8 @@
-// UNSUPPORTED: cuda || hip
-// REQUIRES: gpu,linux,sg-16
+// REQUIRES: sg-16
 // 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/Negative/asm_undefined_pred.cpp
@@ -1,9 +1,8 @@
-// UNSUPPORTED: cuda || hip
-// REQUIRES: gpu,linux,sg-16
+// REQUIRES: sg-16
 // 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/Negative/asm_wrong_declare.cpp
@@ -1,9 +1,8 @@
-// UNSUPPORTED: cuda || hip
-// REQUIRES: gpu,linux,sg-16
+// REQUIRES: sg-16
 // 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_empty.cpp b/sycl/test-e2e/InlineAsm/asm_16_empty.cpp
@@ -1,5 +1,4 @@
-// UNSUPPORTED: cuda
-// 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
@@ -1,5 +1,4 @@
-// UNSUPPORTED: cuda, hip
-// 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
@@ -1,5 +1,4 @@
-// UNSUPPORTED: cuda, hip
-// 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
@@ -1,5 +1,4 @@
-// UNSUPPORTED: cuda, hip
-// 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
@@ -1,5 +1,4 @@
-// UNSUPPORTED: cuda
-// 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
@@ -1,5 +1,4 @@
-// UNSUPPORTED: cuda, hip
-// 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
@@ -1,5 +1,4 @@
-// UNSUPPORTED: cuda, hip
-// 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
@@ -1,5 +1,4 @@
-// UNSUPPORTED: cuda, hip
-// 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
@@ -1,5 +1,4 @@
-// UNSUPPORTED: cuda, hip
-// 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
@@ -1,5 +1,4 @@
-// UNSUPPORTED: cuda, hip
-// 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
@@ -1,5 +1,4 @@
-// UNSUPPORTED: cuda, hip
-// 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
@@ -1,5 +1,4 @@
-// UNSUPPORTED: cuda, hip
-// 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
@@ -1,5 +1,4 @@
-// UNSUPPORTED: cuda, hip
-// 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
@@ -1,5 +1,4 @@
-// UNSUPPORTED: cuda, hip
-// 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
@@ -1,5 +1,4 @@
-// UNSUPPORTED: cuda, hip
-// 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
@@ -1,5 +1,4 @@
-// UNSUPPORTED: cuda || hip
-// 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
@@ -1,5 +1,4 @@
-// UNSUPPORTED: cuda, hip
-// 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
@@ -1,5 +1,4 @@
-// UNSUPPORTED: cuda || hip
-// 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
@@ -1,5 +1,4 @@
-// UNSUPPORTED: cuda || hip
-// 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
@@ -1,5 +1,4 @@
-// UNSUPPORTED: cuda || hip
-// 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
@@ -1,5 +1,4 @@
-// UNSUPPORTED: cuda, hip
-// 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
@@ -0,0 +1,9 @@
+config.required_features += ['gpu', 'linux', 'target-spir']
+
+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 '))
diff --git a/sycl/test-e2e/InlineAsm/malloc_shared_32.cpp b/sycl/test-e2e/InlineAsm/malloc_shared_32.cpp
@@ -1,5 +1,4 @@
-// UNSUPPORTED: cuda, hip
-// 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
@@ -1,5 +1,4 @@
-// UNSUPPORTED: cuda, hip
-// 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
@@ -1,5 +1,4 @@
-// UNSUPPORTED: cuda, hip
-// 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_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