Skip to content

[SYCL][E2E] Add InlineAsm/lit.local.cfg to clean up REQUIRES/UNSUPPORTED #16311

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aelovikov-intel merged 9 commits into from
Jan 28, 2025
Merged

[SYCL][E2E] Add InlineAsm/lit.local.cfg to clean up REQUIRES/UNSUPPORTED #16311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a518866
Use lit.local.cfg to mark cuda and hip as unsupported
ayylol Dec 9, 2024
8d5f517
Add REQUIRES: gpu,linux to lit.local.cfg
ayylol Dec 9, 2024
e91210e
Merge branch 'sycl' into inlineasm-litlocal
ayylol Jan 20, 2025
745d9b5
Merge branch 'sycl' into inlineasm-litlocal
ayylol Jan 22, 2025
d83a37d
Add `InlineAsm/IntelGPU` test directory
ayylol Jan 22, 2025
be87b96
Merge branch 'sycl' into inlineasm-litlocal
ayylol Jan 27, 2025
dccac19
Use target features instead of backend features
ayylol Jan 27, 2025
7dec039
remove IntelGPU folder, and add target-spir to lit.local.cfg
ayylol Jan 27, 2025
904d02f
update unsupported tracking test
ayylol Jan 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions sycl/test-e2e/InlineAsm/Negative/asm_bad_opcode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
// UNSUPPORTED: cuda || hip
// REQUIRES: gpu,linux,sg-16
// REQUIRES: sg-16
Copy link
Contributor

@cperkinsintel cperkinsintel Dec 13, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what is sg-16 ?

Copy link
Contributor

@cperkinsintel cperkinsintel Dec 13, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also, will this be impacted by #16314 ?

Copy link
Contributor Author

@ayylol ayylol Dec 13, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what is sg-16 ?

Subgroup size 16, the test uses sycl::reqd_sub_group_size(16)

also, will this be impacted by #16314 ?

Nikita did mention that here #16314 (comment)

// RUN: %{build} -o %t.out
// RUN: %{run} %t.out

#include "../include/asmhelper.h"
#include "include/asmhelper.h"
#include <sycl/detail/core.hpp>

struct KernelFunctor {
Expand Down
5 changes: 2 additions & 3 deletions sycl/test-e2e/InlineAsm/Negative/asm_bad_operand_syntax.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
5 changes: 2 additions & 3 deletions sycl/test-e2e/InlineAsm/Negative/asm_duplicate_label.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
5 changes: 2 additions & 3 deletions sycl/test-e2e/InlineAsm/Negative/asm_illegal_exec_size.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
5 changes: 2 additions & 3 deletions sycl/test-e2e/InlineAsm/Negative/asm_missing_label.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
5 changes: 2 additions & 3 deletions sycl/test-e2e/InlineAsm/Negative/asm_missing_region.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
5 changes: 2 additions & 3 deletions sycl/test-e2e/InlineAsm/Negative/asm_simple.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
5 changes: 2 additions & 3 deletions sycl/test-e2e/InlineAsm/Negative/asm_undefined_decl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
5 changes: 2 additions & 3 deletions sycl/test-e2e/InlineAsm/Negative/asm_undefined_pred.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
5 changes: 2 additions & 3 deletions sycl/test-e2e/InlineAsm/Negative/asm_wrong_declare.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
3 changes: 1 addition & 2 deletions sycl/test-e2e/InlineAsm/asm_16_empty.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// UNSUPPORTED: cuda
// REQUIRES: gpu,linux,sg-16
// REQUIRES: sg-16
// RUN: %{build} -o %t.out
// RUN: %{run} %t.out

Expand Down
3 changes: 1 addition & 2 deletions sycl/test-e2e/InlineAsm/asm_16_matrix_mult.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// UNSUPPORTED: cuda, hip
// REQUIRES: gpu,linux,sg-16
// REQUIRES: sg-16
// RUN: %{build} -o %t.out
// RUN: %{run} %t.out

Expand Down
3 changes: 1 addition & 2 deletions sycl/test-e2e/InlineAsm/asm_16_no_input_int.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// UNSUPPORTED: cuda, hip
// REQUIRES: gpu,linux,sg-16
// REQUIRES: sg-16
// RUN: %{build} -o %t.out
// RUN: %{run} %t.out

Expand Down
3 changes: 1 addition & 2 deletions sycl/test-e2e/InlineAsm/asm_16_no_opts.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// UNSUPPORTED: cuda, hip
// REQUIRES: gpu,linux,sg-16
// REQUIRES: sg-16
// RUN: %{build} -o %t.out
// RUN: %{run} %t.out

Expand Down
3 changes: 1 addition & 2 deletions sycl/test-e2e/InlineAsm/asm_8_empty.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// UNSUPPORTED: cuda
// REQUIRES: gpu,linux,sg-8
// REQUIRES: sg-8
// RUN: %{build} -o %t.out
// RUN: %{run} %t.out

Expand Down
3 changes: 1 addition & 2 deletions sycl/test-e2e/InlineAsm/asm_8_no_input_int.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// UNSUPPORTED: cuda, hip
// REQUIRES: gpu,linux,sg-8
// REQUIRES: sg-8
// RUN: %{build} -o %t.out
// RUN: %{run} %t.out

Expand Down
3 changes: 1 addition & 2 deletions sycl/test-e2e/InlineAsm/asm_arbitrary_ops_order.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// UNSUPPORTED: cuda, hip
// REQUIRES: gpu,linux,sg-16
// REQUIRES: sg-16
// RUN: %{build} -o %t.out
// RUN: %{run} %t.out

Expand Down
3 changes: 1 addition & 2 deletions sycl/test-e2e/InlineAsm/asm_decl_in_scope.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// UNSUPPORTED: cuda, hip
// REQUIRES: gpu,linux,sg-16
// REQUIRES: sg-16
// RUN: %{build} -o %t.out
// RUN: %{run} %t.out

Expand Down
3 changes: 1 addition & 2 deletions sycl/test-e2e/InlineAsm/asm_float_add.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// UNSUPPORTED: cuda, hip
// REQUIRES: gpu,linux,sg-16
// REQUIRES: sg-16
// RUN: %{build} -o %t.out
// RUN: %{run} %t.out

Expand Down
3 changes: 1 addition & 2 deletions sycl/test-e2e/InlineAsm/asm_float_imm_arg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// UNSUPPORTED: cuda, hip
// REQUIRES: gpu,linux,sg-16
// REQUIRES: sg-16
// RUN: %{build} -o %t.out
// RUN: %{run} %t.out

Expand Down
3 changes: 1 addition & 2 deletions sycl/test-e2e/InlineAsm/asm_float_neg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// UNSUPPORTED: cuda, hip
// REQUIRES: gpu,linux,sg-16
// REQUIRES: sg-16
// RUN: %{build} -o %t.out
// RUN: %{run} %t.out

Expand Down
3 changes: 1 addition & 2 deletions sycl/test-e2e/InlineAsm/asm_if.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// UNSUPPORTED: cuda, hip
// REQUIRES: gpu,linux,sg-16
// REQUIRES: sg-16
// RUN: %{build} -o %t.out
// RUN: %{run} %t.out

Expand Down
3 changes: 1 addition & 2 deletions sycl/test-e2e/InlineAsm/asm_imm_arg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// UNSUPPORTED: cuda, hip
// REQUIRES: gpu,linux,sg-16
// REQUIRES: sg-16
// RUN: %{build} -o %t.out
// RUN: %{run} %t.out

Expand Down
3 changes: 1 addition & 2 deletions sycl/test-e2e/InlineAsm/asm_loop.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// UNSUPPORTED: cuda, hip
// REQUIRES: gpu,linux,sg-16
// REQUIRES: sg-16
// RUN: %{build} -o %t.out
// RUN: %{run} %t.out

Expand Down
3 changes: 1 addition & 2 deletions sycl/test-e2e/InlineAsm/asm_mul.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// UNSUPPORTED: cuda, hip
// REQUIRES: gpu,linux,sg-16
// REQUIRES: sg-16
// RUN: %{build} -o %t.out
// RUN: %{run} %t.out

Expand Down
3 changes: 1 addition & 2 deletions sycl/test-e2e/InlineAsm/asm_multiple_instructions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 1 addition & 2 deletions sycl/test-e2e/InlineAsm/asm_no_operands.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// UNSUPPORTED: cuda, hip
// REQUIRES: gpu,linux,sg-16
// REQUIRES: sg-16
// RUN: %{build} -o %t.out
// RUN: %{run} %t.out

Expand Down
3 changes: 1 addition & 2 deletions sycl/test-e2e/InlineAsm/asm_no_output.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// UNSUPPORTED: cuda || hip
// REQUIRES: gpu,linux,sg-16
// REQUIRES: sg-16
// RUN: %{build} -o %t.out
// RUN: %{run} %t.out

Expand Down
3 changes: 1 addition & 2 deletions sycl/test-e2e/InlineAsm/asm_plus_mod.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// UNSUPPORTED: cuda || hip
// REQUIRES: gpu,linux,sg-16
// REQUIRES: sg-16
// RUN: %{build} -o %t.out
// RUN: %{run} %t.out

Expand Down
3 changes: 1 addition & 2 deletions sycl/test-e2e/InlineAsm/asm_switch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// UNSUPPORTED: cuda || hip
// REQUIRES: gpu,linux,sg-16
// REQUIRES: sg-16
// RUN: %{build} -o %t.out
// RUN: %{run} %t.out

Expand Down
3 changes: 1 addition & 2 deletions sycl/test-e2e/InlineAsm/letter_example.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
9 changes: 9 additions & 0 deletions sycl/test-e2e/InlineAsm/lit.local.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 '))
3 changes: 1 addition & 2 deletions sycl/test-e2e/InlineAsm/malloc_shared_32.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
3 changes: 1 addition & 2 deletions sycl/test-e2e/InlineAsm/malloc_shared_in_out_dif.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
3 changes: 1 addition & 2 deletions sycl/test-e2e/InlineAsm/malloc_shared_no_input.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
36 changes: 1 addition & 35 deletions sycl/test/e2e_test_requirements/no-unsupported-without-info.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down