Skip to content

Commit 6a93147

Browse files
authored
[SYCL][E2E] Remove XFAIL from tests; fix multi-device config (#14571)
Resolves #14562.
1 parent 7515da8 commit 6a93147

File tree

3 files changed

+4
-9
lines changed

3 files changed

+4
-9
lines changed

sycl/test-e2e/BFloat16/bfloat16_builtins.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,15 @@
55
// + below sm_80 always uses generic impls
66

77
// DEFINE: %{mathflags} = %if cl_options %{/clang:-fno-fast-math%} %else %{-fno-fast-math%}
8-
// RUN: %clangxx -fsycl -fsycl-targets=%{sycl_triple} %if any-device-is-cuda %{ -Xsycl-target-backend --cuda-gpu-arch=sm_80 %} %s -o %t.out %{mathflags}
8+
// RUN: %clangxx -fsycl -fsycl-targets=%{sycl_triple} %if any-device-is-cuda %{ -Xsycl-target-backend=nvptx64-nvidia-cuda --cuda-gpu-arch=sm_80 %} %s -o %t.out %{mathflags}
99
// RUN: %{run} %t.out
1010

1111
// Test "new" (ABI breaking) for all platforms ( sm_80/native if CUDA )
12-
// RUN: %if preview-breaking-changes-supported %{ %clangxx -fsycl -fpreview-breaking-changes -fsycl-targets=%{sycl_triple} %if any-device-is-cuda %{ -Xsycl-target-backend --cuda-gpu-arch=sm_80 %} %s -o %t2.out %{mathflags} %}
12+
// RUN: %if preview-breaking-changes-supported %{ %clangxx -fsycl -fpreview-breaking-changes -fsycl-targets=%{sycl_triple} %if any-device-is-cuda %{ -Xsycl-target-backend=nvptx64-nvidia-cuda --cuda-gpu-arch=sm_80 %} %s -o %t2.out %{mathflags} %}
1313
// RUN: %if preview-breaking-changes-supported %{ %{run} %t2.out %}
1414

1515
// Currently the feature isn't supported on FPGA.
1616
// UNSUPPORTED: accelerator
17-
// FIXME: enable opaque pointers support on CPU.
18-
// XFAIL: cpu
1917
#include "bfloat16_builtins.hpp"
2018

2119
int main() {

sycl/test-e2e/BFloat16/bfloat16_builtins_cuda_generic.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,11 @@
77
// DEFINE: %{mathflags} = %if cl_options %{/clang:-fno-fast-math%} %else %{-fno-fast-math%}
88

99
// If CUDA, test "new" again for sm_75/generic
10-
// RUN: %if any-device-is-cuda %{ %if preview-breaking-changes-supported %{ %clangxx -fsycl -fpreview-breaking-changes -fsycl-targets=%{sycl_triple} -Xsycl-target-backend --cuda-gpu-arch=sm_75 %s -o %t3.out %{mathflags} %} %}
10+
// RUN: %if any-device-is-cuda %{ %if preview-breaking-changes-supported %{ %clangxx -fsycl -fpreview-breaking-changes -fsycl-targets=%{sycl_triple} -Xsycl-target-backend=nvptx64-nvidia-cuda --cuda-gpu-arch=sm_75 %s -o %t3.out %{mathflags} %} %}
1111
// RUN: %if any-device-is-cuda %{ %if preview-breaking-changes-supported %{ %{run} %t3.out %} %}
1212

1313
// Currently the feature isn't supported on FPGA.
1414
// UNSUPPORTED: accelerator
15-
// FIXME: enable opaque pointers support on CPU.
16-
// XFAIL: cpu
1715
#include "bfloat16_builtins.hpp"
1816

1917
int main() {

sycl/test-e2e/BFloat16/bfloat16_type.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %if any-device-is-cuda %{ %{build} -DUSE_CUDA_SM80=1 -Xsycl-target-backend --cuda-gpu-arch=sm_80 -o %t.out %}
1+
// RUN: %if any-device-is-cuda %{ %{build} -DUSE_CUDA_SM80=1 -Xsycl-target-backend=nvptx64-nvidia-cuda --cuda-gpu-arch=sm_80 -o %t.out %}
22
// RUN: %if cuda %{ %{run} %t.out %}
33
// RUN: %{build} -o %t.out
44
// RUN: %{run} %t.out
@@ -7,7 +7,6 @@
77
// UNSUPPORTED: accelerator
88

99
// FIXME: enable opaque pointers support on CPU.
10-
// XFAIL: cpu
1110

1211
//==----------- bfloat16_type.cpp - SYCL bfloat16 type test ----------------==//
1312
//

0 commit comments

Comments
 (0)