Skip to content

Commit 0f0b699

Browse files
authored
[SYCL][E2E] Fix some tests in multi-device mode (#13510)
The atomic tests can be run by multiple SYCL devices, in which case the compiler needs to be told which device the `--cuda-gpu-arch` parameter applies to. This is done in the same vein as other occurrences of this parameter. The bfloat16 tests fail on some CPU devices due to a known issue with opaque pointers.
1 parent 335ade2 commit 0f0b699

File tree

5 files changed

+7
-2
lines changed

5 files changed

+7
-2
lines changed

sycl/test-e2e/BFloat16/bfloat16_builtins.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414

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

1921
int main() {

sycl/test-e2e/BFloat16/bfloat16_builtins_cuda_generic.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212

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

1719
int main() {

sycl/test-e2e/BFloat16/bfloat16_type.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
// UNSUPPORTED: accelerator
88

99
// FIXME: enable opaque pointers support on CPU.
10+
// XFAIL: cpu
1011

1112
//==----------- bfloat16_type.cpp - SYCL bfloat16 type test ----------------==//
1213
//

sycl/test-e2e/syclcompat/atomic/atomic_class.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
// UNSUPPORTED: hip || (windows && level_zero)
3434

35-
// RUN: %clangxx -std=c++20 -fsycl -fsycl-targets=%{sycl_triple} %if any-device-is-cuda %{ -Xsycl-target-backend --cuda-gpu-arch=sm_70 %} %s -o %t.out
35+
// RUN: %clangxx -std=c++20 -fsycl -fsycl-targets=%{sycl_triple} %if any-device-is-cuda %{ -Xsycl-target-backend=nvptx64-nvidia-cuda --cuda-gpu-arch=sm_70 %} %s -o %t.out
3636
// RUN: %{run} %t.out
3737

3838
#include <sycl/detail/core.hpp>

sycl/test-e2e/syclcompat/atomic/atomic_memory_acq_rel.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
// UNSUPPORTED: hip
3434

35-
// RUN: %clangxx -fsycl -fsycl-targets=%{sycl_triple} %if any-device-is-cuda %{ -Xsycl-target-backend --cuda-gpu-arch=sm_70 %} %s -o %t.out
35+
// RUN: %clangxx -fsycl -fsycl-targets=%{sycl_triple} %if any-device-is-cuda %{ -Xsycl-target-backend=nvptx64-nvidia-cuda --cuda-gpu-arch=sm_70 %} %s -o %t.out
3636
// RUN: %{run} %t.out
3737

3838
#include <iostream>

0 commit comments

Comments
 (0)