Skip to content

Commit 8324bb2

Browse files
ayylolayylol
authored
[SYCL][E2E] Add InlineAsm/lit.local.cfg to clean up REQUIRES/UNSUPPORTED (#16311)
All test in this folder use `REQUIRES: gpu,linux` and `UNSUPPORTED: cuda, hip`. So using a lit.local.cfg file makes sense here.
1 parent f7fc46d commit 8324bb2

36 files changed

+54
-113
lines changed

‎sycl/test-e2e/InlineAsm/Negative/asm_bad_opcode.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
// UNSUPPORTED: cuda || hip
2-
// REQUIRES: gpu,linux,sg-16
1+
// REQUIRES: sg-16
32
// RUN: %{build} -o %t.out
43
// RUN: %{run} %t.out
54

6-
#include "../include/asmhelper.h"
5+
#include "include/asmhelper.h"
76
#include <sycl/detail/core.hpp>
87

98
struct KernelFunctor {

‎sycl/test-e2e/InlineAsm/Negative/asm_bad_operand_syntax.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
// UNSUPPORTED: cuda || hip
2-
// REQUIRES: gpu,linux,sg-16
1+
// REQUIRES: sg-16
32
// RUN: %{build} -o %t.out
43
// RUN: %{run} %t.out
54

6-
#include "../include/asmhelper.h"
5+
#include "include/asmhelper.h"
76
#include <sycl/detail/core.hpp>
87

98
struct KernelFunctor {

‎sycl/test-e2e/InlineAsm/Negative/asm_duplicate_label.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
// UNSUPPORTED: cuda || hip
2-
// REQUIRES: gpu,linux,sg-16
1+
// REQUIRES: sg-16
32
// RUN: %{build} -o %t.out
43
// RUN: %{run} %t.out
54

6-
#include "../include/asmhelper.h"
5+
#include "include/asmhelper.h"
76
#include <sycl/detail/core.hpp>
87

98
struct KernelFunctor {

‎sycl/test-e2e/InlineAsm/Negative/asm_illegal_exec_size.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
// UNSUPPORTED: cuda || hip
2-
// REQUIRES: gpu,linux,sg-16
1+
// REQUIRES: sg-16
32
// RUN: %{build} -o %t.out
43
// RUN: %{run} %t.out
54

6-
#include "../include/asmhelper.h"
5+
#include "include/asmhelper.h"
76
#include <sycl/detail/core.hpp>
87

98
struct KernelFunctor {

‎sycl/test-e2e/InlineAsm/Negative/asm_missing_label.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
// UNSUPPORTED: cuda || hip
2-
// REQUIRES: gpu,linux,sg-16
1+
// REQUIRES: sg-16
32
// RUN: %{build} -o %t.out
43
// RUN: %{run} %t.out
54

6-
#include "../include/asmhelper.h"
5+
#include "include/asmhelper.h"
76
#include <sycl/detail/core.hpp>
87

98
struct KernelFunctor {

‎sycl/test-e2e/InlineAsm/Negative/asm_missing_region.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
// UNSUPPORTED: cuda || hip
2-
// REQUIRES: gpu,linux,sg-16
1+
// REQUIRES: sg-16
32
// RUN: %{build} -o %t.out
43
// RUN: %{run} %t.out
54

6-
#include "../include/asmhelper.h"
5+
#include "include/asmhelper.h"
76
#include <sycl/detail/core.hpp>
87

98
struct KernelFunctor {

‎sycl/test-e2e/InlineAsm/Negative/asm_simple.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
// UNSUPPORTED: cuda || hip
2-
// REQUIRES: gpu,linux,sg-16
1+
// REQUIRES: sg-16
32
// RUN: %{build} -o %t.out
43
// RUN: %{run} %t.out
54

6-
#include "../include/asmhelper.h"
5+
#include "include/asmhelper.h"
76
#include <sycl/detail/core.hpp>
87

98
struct KernelFunctor {

‎sycl/test-e2e/InlineAsm/Negative/asm_undefined_decl.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
// UNSUPPORTED: cuda || hip
2-
// REQUIRES: gpu,linux,sg-16
1+
// REQUIRES: sg-16
32
// RUN: %{build} -o %t.out
43
// RUN: %{run} %t.out
54

6-
#include "../include/asmhelper.h"
5+
#include "include/asmhelper.h"
76
#include <sycl/detail/core.hpp>
87

98
struct KernelFunctor {

‎sycl/test-e2e/InlineAsm/Negative/asm_undefined_pred.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
// UNSUPPORTED: cuda || hip
2-
// REQUIRES: gpu,linux,sg-16
1+
// REQUIRES: sg-16
32
// RUN: %{build} -o %t.out
43
// RUN: %{run} %t.out
54

6-
#include "../include/asmhelper.h"
5+
#include "include/asmhelper.h"
76
#include <sycl/detail/core.hpp>
87

98
struct KernelFunctor {

‎sycl/test-e2e/InlineAsm/Negative/asm_wrong_declare.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
// UNSUPPORTED: cuda || hip
2-
// REQUIRES: gpu,linux,sg-16
1+
// REQUIRES: sg-16
32
// RUN: %{build} -o %t.out
43
// RUN: %{run} %t.out
54

6-
#include "../include/asmhelper.h"
5+
#include "include/asmhelper.h"
76
#include <sycl/detail/core.hpp>
87

98
struct KernelFunctor {

‎sycl/test-e2e/InlineAsm/asm_16_empty.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// UNSUPPORTED: cuda
2-
// REQUIRES: gpu,linux,sg-16
1+
// REQUIRES: sg-16
32
// RUN: %{build} -o %t.out
43
// RUN: %{run} %t.out
54

‎sycl/test-e2e/InlineAsm/asm_16_matrix_mult.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// UNSUPPORTED: cuda, hip
2-
// REQUIRES: gpu,linux,sg-16
1+
// REQUIRES: sg-16
32
// RUN: %{build} -o %t.out
43
// RUN: %{run} %t.out
54

‎sycl/test-e2e/InlineAsm/asm_16_no_input_int.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// UNSUPPORTED: cuda, hip
2-
// REQUIRES: gpu,linux,sg-16
1+
// REQUIRES: sg-16
32
// RUN: %{build} -o %t.out
43
// RUN: %{run} %t.out
54

‎sycl/test-e2e/InlineAsm/asm_16_no_opts.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// UNSUPPORTED: cuda, hip
2-
// REQUIRES: gpu,linux,sg-16
1+
// REQUIRES: sg-16
32
// RUN: %{build} -o %t.out
43
// RUN: %{run} %t.out
54

‎sycl/test-e2e/InlineAsm/asm_8_empty.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// UNSUPPORTED: cuda
2-
// REQUIRES: gpu,linux,sg-8
1+
// REQUIRES: sg-8
32
// RUN: %{build} -o %t.out
43
// RUN: %{run} %t.out
54

‎sycl/test-e2e/InlineAsm/asm_8_no_input_int.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// UNSUPPORTED: cuda, hip
2-
// REQUIRES: gpu,linux,sg-8
1+
// REQUIRES: sg-8
32
// RUN: %{build} -o %t.out
43
// RUN: %{run} %t.out
54

‎sycl/test-e2e/InlineAsm/asm_arbitrary_ops_order.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// UNSUPPORTED: cuda, hip
2-
// REQUIRES: gpu,linux,sg-16
1+
// REQUIRES: sg-16
32
// RUN: %{build} -o %t.out
43
// RUN: %{run} %t.out
54

‎sycl/test-e2e/InlineAsm/asm_decl_in_scope.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// UNSUPPORTED: cuda, hip
2-
// REQUIRES: gpu,linux,sg-16
1+
// REQUIRES: sg-16
32
// RUN: %{build} -o %t.out
43
// RUN: %{run} %t.out
54

‎sycl/test-e2e/InlineAsm/asm_float_add.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// UNSUPPORTED: cuda, hip
2-
// REQUIRES: gpu,linux,sg-16
1+
// REQUIRES: sg-16
32
// RUN: %{build} -o %t.out
43
// RUN: %{run} %t.out
54

‎sycl/test-e2e/InlineAsm/asm_float_imm_arg.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// UNSUPPORTED: cuda, hip
2-
// REQUIRES: gpu,linux,sg-16
1+
// REQUIRES: sg-16
32
// RUN: %{build} -o %t.out
43
// RUN: %{run} %t.out
54

‎sycl/test-e2e/InlineAsm/asm_float_neg.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// UNSUPPORTED: cuda, hip
2-
// REQUIRES: gpu,linux,sg-16
1+
// REQUIRES: sg-16
32
// RUN: %{build} -o %t.out
43
// RUN: %{run} %t.out
54

‎sycl/test-e2e/InlineAsm/asm_if.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// UNSUPPORTED: cuda, hip
2-
// REQUIRES: gpu,linux,sg-16
1+
// REQUIRES: sg-16
32
// RUN: %{build} -o %t.out
43
// RUN: %{run} %t.out
54

‎sycl/test-e2e/InlineAsm/asm_imm_arg.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// UNSUPPORTED: cuda, hip
2-
// REQUIRES: gpu,linux,sg-16
1+
// REQUIRES: sg-16
32
// RUN: %{build} -o %t.out
43
// RUN: %{run} %t.out
54

‎sycl/test-e2e/InlineAsm/asm_loop.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// UNSUPPORTED: cuda, hip
2-
// REQUIRES: gpu,linux,sg-16
1+
// REQUIRES: sg-16
32
// RUN: %{build} -o %t.out
43
// RUN: %{run} %t.out
54

‎sycl/test-e2e/InlineAsm/asm_mul.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// UNSUPPORTED: cuda, hip
2-
// REQUIRES: gpu,linux,sg-16
1+
// REQUIRES: sg-16
32
// RUN: %{build} -o %t.out
43
// RUN: %{run} %t.out
54

‎sycl/test-e2e/InlineAsm/asm_multiple_instructions.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// UNSUPPORTED: cuda || hip
2-
// REQUIRES: gpu,linux,sg-16
1+
// REQUIRES: sg-16
32
// RUN: %{build} -DTO_PASS -o %t.out.pass
43
// RUN: %{run} %t.out.pass
54
// RUN: %{build} -o %t.out

‎sycl/test-e2e/InlineAsm/asm_no_operands.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// UNSUPPORTED: cuda, hip
2-
// REQUIRES: gpu,linux,sg-16
1+
// REQUIRES: sg-16
32
// RUN: %{build} -o %t.out
43
// RUN: %{run} %t.out
54

‎sycl/test-e2e/InlineAsm/asm_no_output.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// UNSUPPORTED: cuda || hip
2-
// REQUIRES: gpu,linux,sg-16
1+
// REQUIRES: sg-16
32
// RUN: %{build} -o %t.out
43
// RUN: %{run} %t.out
54

‎sycl/test-e2e/InlineAsm/asm_plus_mod.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// UNSUPPORTED: cuda || hip
2-
// REQUIRES: gpu,linux,sg-16
1+
// REQUIRES: sg-16
32
// RUN: %{build} -o %t.out
43
// RUN: %{run} %t.out
54

‎sycl/test-e2e/InlineAsm/asm_switch.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// UNSUPPORTED: cuda || hip
2-
// REQUIRES: gpu,linux,sg-16
1+
// REQUIRES: sg-16
32
// RUN: %{build} -o %t.out
43
// RUN: %{run} %t.out
54

‎sycl/test-e2e/InlineAsm/letter_example.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// UNSUPPORTED: cuda, hip
2-
// REQUIRES: gpu,linux,sg-16,aspect-usm_shared_allocations
1+
// REQUIRES: sg-16,aspect-usm_shared_allocations
32
// RUN: %{build} -o %t.out
43
// RUN: %{run} %t.out
54

‎sycl/test-e2e/InlineAsm/lit.local.cfg

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
config.required_features += ['gpu', 'linux', 'target-spir']
2+
3+
config.substitutions.append(("%helper-includes", "-I {}".format(os.path.dirname(os.path.abspath(__file__)))))
4+
original_clangxx=""
5+
for substitution in config.substitutions:
6+
if substitution[0] == "%clangxx":
7+
original_clangxx=substitution[1]
8+
config.substitutions.insert(0,
9+
("%clangxx", original_clangxx + ' %helper-includes '))

‎sycl/test-e2e/InlineAsm/malloc_shared_32.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// UNSUPPORTED: cuda, hip
2-
// REQUIRES: gpu,linux,sg-32,aspect-usm_shared_allocations
1+
// REQUIRES: sg-32,aspect-usm_shared_allocations
32
// RUN: %{build} -o %t.out
43
// RUN: %{run} %t.out
54

‎sycl/test-e2e/InlineAsm/malloc_shared_in_out_dif.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// UNSUPPORTED: cuda, hip
2-
// REQUIRES: gpu,linux,sg-16,aspect-usm_shared_allocations
1+
// REQUIRES: sg-16,aspect-usm_shared_allocations
32
// RUN: %{build} -o %t.out
43
// RUN: %{run} %t.out
54

‎sycl/test-e2e/InlineAsm/malloc_shared_no_input.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// UNSUPPORTED: cuda, hip
2-
// REQUIRES: gpu,linux,sg-16,aspect-usm_shared_allocations
1+
// REQUIRES: sg-16,aspect-usm_shared_allocations
32
// RUN: %{build} -o %t.out
43
// RUN: %{run} %t.out
54

‎sycl/test/e2e_test_requirements/no-unsupported-without-info.cpp

Lines changed: 1 addition & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
// tests to match the required format and in that case you should just update
5555
// (i.e. reduce) the number and the list below.
5656
//
57-
// NUMBER-OF-UNSUPPORTED-WITHOUT-INFO: 409
57+
// NUMBER-OF-UNSUPPORTED-WITHOUT-INFO: 375
5858
//
5959
// List of improperly UNSUPPORTED tests.
6060
// Remove the CHECK once the test has been properly UNSUPPORTED.
@@ -233,40 +233,6 @@
233233
// CHECK-NEXT: HierPar/hier_par_wgscope.cpp
234234
// CHECK-NEXT: HostInteropTask/host-task-failure.cpp
235235
// CHECK-NEXT: HostInteropTask/interop-task.cpp
236-
// CHECK-NEXT: InlineAsm/Negative/asm_bad_opcode.cpp
237-
// CHECK-NEXT: InlineAsm/Negative/asm_bad_operand_syntax.cpp
238-
// CHECK-NEXT: InlineAsm/Negative/asm_duplicate_label.cpp
239-
// CHECK-NEXT: InlineAsm/Negative/asm_illegal_exec_size.cpp
240-
// CHECK-NEXT: InlineAsm/Negative/asm_missing_label.cpp
241-
// CHECK-NEXT: InlineAsm/Negative/asm_missing_region.cpp
242-
// CHECK-NEXT: InlineAsm/Negative/asm_simple.cpp
243-
// CHECK-NEXT: InlineAsm/Negative/asm_undefined_decl.cpp
244-
// CHECK-NEXT: InlineAsm/Negative/asm_undefined_pred.cpp
245-
// CHECK-NEXT: InlineAsm/Negative/asm_wrong_declare.cpp
246-
// CHECK-NEXT: InlineAsm/asm_16_empty.cpp
247-
// CHECK-NEXT: InlineAsm/asm_16_matrix_mult.cpp
248-
// CHECK-NEXT: InlineAsm/asm_16_no_input_int.cpp
249-
// CHECK-NEXT: InlineAsm/asm_16_no_opts.cpp
250-
// CHECK-NEXT: InlineAsm/asm_8_empty.cpp
251-
// CHECK-NEXT: InlineAsm/asm_8_no_input_int.cpp
252-
// CHECK-NEXT: InlineAsm/asm_arbitrary_ops_order.cpp
253-
// CHECK-NEXT: InlineAsm/asm_decl_in_scope.cpp
254-
// CHECK-NEXT: InlineAsm/asm_float_add.cpp
255-
// CHECK-NEXT: InlineAsm/asm_float_imm_arg.cpp
256-
// CHECK-NEXT: InlineAsm/asm_float_neg.cpp
257-
// CHECK-NEXT: InlineAsm/asm_if.cpp
258-
// CHECK-NEXT: InlineAsm/asm_imm_arg.cpp
259-
// CHECK-NEXT: InlineAsm/asm_loop.cpp
260-
// CHECK-NEXT: InlineAsm/asm_mul.cpp
261-
// CHECK-NEXT: InlineAsm/asm_multiple_instructions.cpp
262-
// CHECK-NEXT: InlineAsm/asm_no_operands.cpp
263-
// CHECK-NEXT: InlineAsm/asm_no_output.cpp
264-
// CHECK-NEXT: InlineAsm/asm_plus_mod.cpp
265-
// CHECK-NEXT: InlineAsm/asm_switch.cpp
266-
// CHECK-NEXT: InlineAsm/letter_example.cpp
267-
// CHECK-NEXT: InlineAsm/malloc_shared_32.cpp
268-
// CHECK-NEXT: InlineAsm/malloc_shared_in_out_dif.cpp
269-
// CHECK-NEXT: InlineAsm/malloc_shared_no_input.cpp
270236
// CHECK-NEXT: InvokeSimd/Feature/ImplicitSubgroup/SPMD_invoke_ESIMD_external.cpp
271237
// CHECK-NEXT: InvokeSimd/Feature/ImplicitSubgroup/popcnt.cpp
272238
// CHECK-NEXT: InvokeSimd/Feature/popcnt.cpp

0 commit comments

Comments
 (0)