Skip to content

Commit cea6895

Browse files
authored
[SYCL][E2E] Fix check_e2e tests (#16314)
Improve regexp. Currently it filteres out strings like: REQUIRES: sg-16 So these tests are left untracked.
1 parent e412dd0 commit cea6895

File tree

4 files changed

+41
-5
lines changed

4 files changed

+41
-5
lines changed

sycl/test-e2e/OptionalKernelFeatures/fp64-conv-emu-1.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
// REQUIRES: arch-intel_gpu_dg2_g10 || arch-intel_gpu_dg2_g11 || arch-intel_gpu_dg2_g12 || arch-intel_gpu_pvc || arch-intel_gpu_mtl_h || arch-intel_gpu_mtl_u
1616
//
1717
// UNSUPPORTED: cuda, hip
18-
// UNSUPPORTED-REASON: FP64 emulation is an Intel specific feature.
18+
// UNSUPPORTED-INTENDED: FP64 emulation is an Intel specific feature.
1919

2020
// RUN: %clangxx -fsycl -fsycl-targets=intel_gpu_dg2_g10,intel_gpu_dg2_g11,intel_gpu_dg2_g12,intel_gpu_pvc,intel_gpu_mtl_h,intel_gpu_mtl_u -fsycl-fp64-conv-emu %O0 %s -o %t.out
2121
// RUN: %{run} %t.out

sycl/test-e2e/OptionalKernelFeatures/fp64-conv-emu-2.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
// REQUIRES: arch-intel_gpu_dg2_g10 || arch-intel_gpu_dg2_g11 || arch-intel_gpu_dg2_g12 || arch-intel_gpu_pvc || arch-intel_gpu_mtl_h || arch-intel_gpu_mtl_u
1919
//
2020
// UNSUPPORTED: cuda, hip
21-
// UNSUPPORTED-REASON: FP64 emulation is an Intel specific feature.
21+
// UNSUPPORTED-INTENDED: FP64 emulation is an Intel specific feature.
2222

2323
// RUN: %clangxx -fsycl -fsycl-targets=intel_gpu_dg2_g10,intel_gpu_dg2_g11,intel_gpu_dg2_g12,intel_gpu_pvc,intel_gpu_mtl_h,intel_gpu_mtl_u -fsycl-fp64-conv-emu %O0 %s -o %t.out
2424
// RUN: %{run} %t.out

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

+38-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
// RUN: grep -rI "UNSUPPORTED:" %S/../../test-e2e \
3333
// RUN: -A 1 --include=*.cpp --no-group-separator | \
3434
// RUN: grep -v "UNSUPPORTED:" | \
35-
// RUN: grep -Pv "UNSUPPORTED-TRACKER:\s+(?:https://github.com/[\w\d-]+/[\w\d-]+/issues/[\d]+)|(?:[\w]+-[\d]+)|(?:UNSUPPORTED-INTENDED:\s*.+)" > %t
35+
// RUN: grep -Pv "(?:UNSUPPORTED-TRACKER:\s+(?:(?:https:\/\/github.com\/[\w\d-]+\/[\w\d-]+\/issues\/[\d]+)|(?:[\w]+-[\d]+)))|(?:UNSUPPORTED-INTENDED:\s*.+)" > %t
3636
// RUN: cat %t | wc -l | FileCheck %s --check-prefix NUMBER-OF-UNSUPPORTED-WITHOUT-INFO
3737
// RUN: cat %t | sed 's/\.cpp.*/.cpp/' | sort | FileCheck %s
3838
//
@@ -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: 379
57+
// NUMBER-OF-UNSUPPORTED-WITHOUT-INFO: 415
5858
//
5959
// List of improperly UNSUPPORTED tests.
6060
// Remove the CHECK once the test has been properly UNSUPPORTED.
@@ -234,6 +234,40 @@
234234
// CHECK-NEXT: HierPar/hier_par_wgscope.cpp
235235
// CHECK-NEXT: HostInteropTask/host-task-failure.cpp
236236
// CHECK-NEXT: HostInteropTask/interop-task.cpp
237+
// CHECK-NEXT: InlineAsm/Negative/asm_bad_opcode.cpp
238+
// CHECK-NEXT: InlineAsm/Negative/asm_bad_operand_syntax.cpp
239+
// CHECK-NEXT: InlineAsm/Negative/asm_duplicate_label.cpp
240+
// CHECK-NEXT: InlineAsm/Negative/asm_illegal_exec_size.cpp
241+
// CHECK-NEXT: InlineAsm/Negative/asm_missing_label.cpp
242+
// CHECK-NEXT: InlineAsm/Negative/asm_missing_region.cpp
243+
// CHECK-NEXT: InlineAsm/Negative/asm_simple.cpp
244+
// CHECK-NEXT: InlineAsm/Negative/asm_undefined_decl.cpp
245+
// CHECK-NEXT: InlineAsm/Negative/asm_undefined_pred.cpp
246+
// CHECK-NEXT: InlineAsm/Negative/asm_wrong_declare.cpp
247+
// CHECK-NEXT: InlineAsm/asm_16_empty.cpp
248+
// CHECK-NEXT: InlineAsm/asm_16_matrix_mult.cpp
249+
// CHECK-NEXT: InlineAsm/asm_16_no_input_int.cpp
250+
// CHECK-NEXT: InlineAsm/asm_16_no_opts.cpp
251+
// CHECK-NEXT: InlineAsm/asm_8_empty.cpp
252+
// CHECK-NEXT: InlineAsm/asm_8_no_input_int.cpp
253+
// CHECK-NEXT: InlineAsm/asm_arbitrary_ops_order.cpp
254+
// CHECK-NEXT: InlineAsm/asm_decl_in_scope.cpp
255+
// CHECK-NEXT: InlineAsm/asm_float_add.cpp
256+
// CHECK-NEXT: InlineAsm/asm_float_imm_arg.cpp
257+
// CHECK-NEXT: InlineAsm/asm_float_neg.cpp
258+
// CHECK-NEXT: InlineAsm/asm_if.cpp
259+
// CHECK-NEXT: InlineAsm/asm_imm_arg.cpp
260+
// CHECK-NEXT: InlineAsm/asm_loop.cpp
261+
// CHECK-NEXT: InlineAsm/asm_mul.cpp
262+
// CHECK-NEXT: InlineAsm/asm_multiple_instructions.cpp
263+
// CHECK-NEXT: InlineAsm/asm_no_operands.cpp
264+
// CHECK-NEXT: InlineAsm/asm_no_output.cpp
265+
// CHECK-NEXT: InlineAsm/asm_plus_mod.cpp
266+
// CHECK-NEXT: InlineAsm/asm_switch.cpp
267+
// CHECK-NEXT: InlineAsm/letter_example.cpp
268+
// CHECK-NEXT: InlineAsm/malloc_shared_32.cpp
269+
// CHECK-NEXT: InlineAsm/malloc_shared_in_out_dif.cpp
270+
// CHECK-NEXT: InlineAsm/malloc_shared_no_input.cpp
237271
// CHECK-NEXT: InvokeSimd/Feature/ImplicitSubgroup/SPMD_invoke_ESIMD_external.cpp
238272
// CHECK-NEXT: InvokeSimd/Feature/ImplicitSubgroup/popcnt.cpp
239273
// CHECK-NEXT: InvokeSimd/Feature/popcnt.cpp
@@ -298,6 +332,7 @@
298332
// CHECK-NEXT: NewOffloadDriver/aot-gpu.cpp
299333
// CHECK-NEXT: NewOffloadDriver/spirv_device_obj_smoke.cpp
300334
// CHECK-NEXT: NonUniformGroups/ballot_group.cpp
335+
// CHECK-NEXT: NonUniformGroups/fixed_size_group.cpp
301336
// CHECK-NEXT: NonUniformGroups/opportunistic_group.cpp
302337
// CHECK-NEXT: NonUniformGroups/tangle_group.cpp
303338
// CHECK-NEXT: NonUniformGroups/tangle_group_algorithms.cpp
@@ -356,6 +391,7 @@
356391
// CHECK-NEXT: Regression/invalid_reqd_wg_size_correct_exception.cpp
357392
// CHECK-NEXT: Regression/kernel_bundle_ignore_sycl_external.cpp
358393
// CHECK-NEXT: Regression/kernel_bundle_ignore_sycl_external.cpp
394+
// CHECK-NEXT: Regression/no-split-reqd-wg-size-2.cpp
359395
// CHECK-NEXT: Regression/no-split-reqd-wg-size.cpp
360396
// CHECK-NEXT: Regression/reduction_resource_leak_usm.cpp
361397
// CHECK-NEXT: Regression/static-buffer-dtor.cpp

sycl/test/e2e_test_requirements/no-xfail-without-tracker.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
// RUN: grep -rI "XFAIL:" %S/../../test-e2e \
3030
// RUN: -A 1 --include=*.cpp --no-group-separator | \
3131
// RUN: grep -v "XFAIL:" | \
32-
// RUN: grep -Pv "XFAIL-TRACKER:\s+(?:https://github.com/[\w\d-]+/[\w\d-]+/issues/[\d]+)|(?:[\w]+-[\d]+)" > %t
32+
// RUN: grep -Pv "(?:XFAIL-TRACKER:\s+(?:(?:https:\/\/github.com\/[\w\d-]+\/[\w\d-]+\/issues\/[\d]+)|(?:[\w]+-[\d]+)))" > %t
3333
// RUN: cat %t | wc -l | FileCheck %s --check-prefix NUMBER-OF-XFAIL-WITHOUT-TRACKER
3434
// RUN: cat %t | sed 's/\.cpp.*/.cpp/' | sort | FileCheck %s
3535
//

0 commit comments

Comments
 (0)