Skip to content

Commit

Permalink
[SYCL][E2E] Change UNSUPPORTED to XFAIL in two SubGroup tests (#15780)
Browse files Browse the repository at this point in the history
The failures related to these two tests were masked due to using
unsupported rather than xfail.

This patch also removes the check for OpenCL version before querying
`sub_group_independent_forward_progress`, as it masks the failure on the
fpga emulator device.
  • Loading branch information
ayylol authored Oct 21, 2024
1 parent 0c7e1cb commit 455e9bf
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 25 deletions.
12 changes: 6 additions & 6 deletions sycl/test-e2e/SubGroup/attributes.cpp
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// UNSUPPORTED: accelerator
// TODO: FPGAs currently report supported subgroups as {4,8,16,32,64}, causing
// this test to fail
// UNSUPPORTED: cuda || hip
// TODO: Device subgroup sizes reports {32}, but when we try to use it with a
// kernel attribute and check it, we get a subgroup size of 0.
// TODO: Despite using a supported required subgroup size compile_sub_group_size
// reports as 0 on fpga emu, cuda and hip
// XFAIL: accelerator
// XFAIL-TRACKER: URT-697
// XFAIL: cuda || hip
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/14357

// RUN: %{build} -fsycl-device-code-split=per_kernel -o %t.out
// RUN: %{run} %t.out
Expand Down
23 changes: 4 additions & 19 deletions sycl/test-e2e/SubGroup/info.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// UNSUPPORTED: accelerator
// TODO: FPGAs currently report supported subgroups as {4,8,16,32,64}, causing
// this test to fail. Additionally, the kernel max_sub_group_size checks
// crash on FPGAs
// TODO: fpga emu crashes when querying sub_group_independent_forward_progress
// XFAIL: accelerator
// XFAIL-TRACKER: URT-697
// RUN: %{build} -o %t.out
// RUN: %{run} %t.out

Expand All @@ -20,21 +19,7 @@ using namespace sycl;
int main() {
queue Queue;
device Device = Queue.get_device();

bool old_opencl = false;
if (Device.get_backend() == sycl::backend::opencl) {
// Extract the numerical version from the version string, OpenCL version
// string have the format "OpenCL <major>.<minor> <vendor specific data>".
std::string ver = Device.get_info<info::device::version>().substr(7, 3);
old_opencl = (ver < "2.1");
}

/* Check info::device parameters. */
if (!old_opencl) {
// Independent forward progress is missing on OpenCL backend prior to
// version 2.1
Device.get_info<info::device::sub_group_independent_forward_progress>();
}
Device.get_info<info::device::sub_group_independent_forward_progress>();
Device.get_info<info::device::max_num_sub_groups>();

try {
Expand Down

0 comments on commit 455e9bf

Please sign in to comment.