Skip to content

Commit

Permalink
[SYCL] Add XFAIL trackers for E2E tests and remove hip_nvidia XFAILs …
Browse files Browse the repository at this point in the history
…entirely (#16307)

This is a cleanup of several tests marked as XFAIL on certain platforms.
It is a follow up of #16287 and it
follows the same principles in handling of XFAILs.
  • Loading branch information
lbushi25 authored Dec 10, 2024
1 parent f2c7869 commit 6a9de65
Show file tree
Hide file tree
Showing 11 changed files with 7 additions and 33 deletions.
3 changes: 0 additions & 3 deletions sycl/test-e2e/Basic/aspects.cpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
// RUN: %{build} -o %t.out -DSYCL_DISABLE_IMAGE_ASPECT_WARNING
// RUN: %{run-unfiltered-devices} %t.out
//
// Hip is missing some of the parameters tested here so it fails with NVIDIA
// XFAIL: hip_nvidia

//==--------------- aspects.cpp - SYCL device test ------------------------==//
//
Expand Down
4 changes: 0 additions & 4 deletions sycl/test-e2e/Basic/device_event.cpp
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
// RUN: %{build} -o %t.run
// RUN: %{run} %t.run
//
// Returns error "Barrier is not supported on the host device
// yet." with Nvidia.
// XFAIL: hip_nvidia

//==--------device_event.cpp - SYCL class device_event test ----------------==//
//
Expand Down
5 changes: 1 addition & 4 deletions sycl/test-e2e/Basic/diagnostics/handler.cpp
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
// RUN: %{build} -o %t.out
// RUN: %{run} %t.out | FileCheck %s
//
// Appears to fail on HIP Nvidia because 'no device of requested type available'
// when constructing a queue with an exception_list.
// XFAIL: hip_nvidia

//==------------------- handler.cpp ----------------------------------------==//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
Expand Down
3 changes: 0 additions & 3 deletions sycl/test-e2e/Basic/partition_supported.cpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
// RUN: %{build} -o %t.out
// RUN: %{run} %t.out
//
// Nvidia should not allow sub_devices but does not throw corresponding error.
// XFAIL: hip_nvidia
/* Check that:
1) if partition_equally is supported, then we check that the correct
invalid errc is returned if more than max_compute_units are requested
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
// Debug option -g is not passed to device code compiler when CL-style driver
// is used and /DEBUG options is passed.
// XFAIL: cl_options
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/16309

#include "kernel-bundle-merge-options.hpp"

Expand Down
3 changes: 2 additions & 1 deletion sycl/test-e2e/Printf/int.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
// UNSUPPORTED: hip_amd
// FIXME: The 'short' type gets overflown with sporadic values on CUDA.
// XFAIL: cuda
//
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/14734

// RUN: %{build} -o %t.out
// RUN: %{run} %t.out | FileCheck %s
// FIXME: Remove dedicated constant address space testing once generic AS
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/Printf/mixed-address-space.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
//
// UNSUPPORTED: hip_amd
// XFAIL: cuda && windows
//
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/14733
// FIXME: Drop the test once generic AS support is considered stable and the
// dedicated constant AS overload of printf is removed from the library.
//
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/Printf/percent-symbol.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//
// UNSUPPORTED: hip_amd
// XFAIL: cuda && windows
//
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/14733
// RUN: %{build} -o %t.out
// RUN: %{run} %t.out | FileCheck %s
// FIXME: Remove dedicated constant address space testing once generic AS
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

// RUN: %{build} -o %t.out
// RUN: env SYCL_UR_TRACE=2 %{run} %t.out %if !windows %{2>&1 | FileCheck %s %}
//
// XFAIL: hip_nvidia

#include <sycl/detail/core.hpp>

Expand Down
3 changes: 0 additions & 3 deletions sycl/test-e2e/Regression/multiple-targets.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@
//
// RUN: %clangxx -fsycl -fsycl-targets=spir64,%{sycl_triple} -fsycl-device-code-split=per_kernel -o %t4.out %s
// RUN: %{run} %t4.out
//
// XFAIL: hip_nvidia
//

#include <sycl/detail/core.hpp>

Expand Down
12 changes: 1 addition & 11 deletions sycl/test/e2e_test_requirements/no-xfail-without-tracker.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -51,22 +51,17 @@
// 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-XFAIL-WITHOUT-TRACKER: 41
// NUMBER-OF-XFAIL-WITHOUT-TRACKER: 31
//
// List of improperly XFAIL-ed tests.
// Remove the CHECK once the test has been properly XFAIL-ed.
//
// CHECK: AddressSanitizer/nullpointer/private_nullptr.cpp
// CHECK-NEXT: Basic/aspects.cpp
// CHECK-NEXT: Basic/device_event.cpp
// CHECK-NEXT: Basic/diagnostics/handler.cpp
// CHECK-NEXT: Basic/max_linear_work_group_size_props.cpp
// CHECK-NEXT: Basic/max_work_group_size_props.cpp
// CHECK-NEXT: Basic/partition_supported.cpp
// CHECK-NEXT: DeviceLib/assert-windows.cpp
// CHECK-NEXT: ESIMD/hardware_dispatch.cpp
// CHECK-NEXT: InlineAsm/asm_multiple_instructions.cpp
// CHECK-NEXT: KernelAndProgram/kernel-bundle-merge-options.cpp
// CHECK-NEXT: Matrix/SG32/joint_matrix_annotated_ptr.cpp
// CHECK-NEXT: Matrix/SG32/joint_matrix_bfloat16_colmajorA_colmajorB.cpp
// CHECK-NEXT: Matrix/SG32/joint_matrix_bfloat16_packedB.cpp
Expand All @@ -85,15 +80,10 @@
// CHECK-NEXT: NewOffloadDriver/sycl-external-with-optional-features.cpp
// CHECK-NEXT: OptionalKernelFeatures/throw-exception-for-out-of-registers-on-kernel-launch.cpp
// CHECK-NEXT: PerformanceTests/Reduction/reduce_over_sub_group.cpp
// CHECK-NEXT: Printf/int.cpp
// CHECK-NEXT: Printf/mixed-address-space.cpp
// CHECK-NEXT: Printf/percent-symbol.cpp
// CHECK-NEXT: Reduction/reduction_big_data.cpp
// CHECK-NEXT: Reduction/reduction_nd_reducer_skip.cpp
// CHECK-NEXT: Reduction/reduction_reducer_op_eq.cpp
// CHECK-NEXT: Regression/build_log.cpp
// CHECK-NEXT: Regression/complex_global_object.cpp
// CHECK-NEXT: Regression/context_is_destroyed_after_exception.cpp
// CHECK-NEXT: Regression/kernel_bundle_ignore_sycl_external.cpp
// CHECK-NEXT: Regression/multiple-targets.cpp
// CHECK-NEXT: Regression/reduction_resource_leak_dw.cpp

0 comments on commit 6a9de65

Please sign in to comment.