Skip to content
This repository was archived by the owner on Mar 28, 2023. It is now read-only.

Commit ad77010

Browse files
committed
fixed sub_generic tests and XFAILS for native fp tests
1 parent 9a23a34 commit ad77010

18 files changed

+53
-76
lines changed

SYCL/AtomicRef/add_generic_local_native_fp.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -148,11 +148,9 @@
148148
// RUN: %ACC_RUN_PLACEHOLDER %t.out
149149

150150
// CUDA and HIP backends have had no support for the generic address space yet.
151-
// Host does not support barrier.
152-
// XFAIL: cuda || hip || host
153-
154-
// hip, level zero and opencl do not support native floating point atomics
155-
// XFAIL: hip, level_zero, opencl
151+
// Host does not support barrier. HIP does not support native floating point
152+
// atomics
153+
// XFAIL: cuda, hip, host
156154

157155
#define SYCL_USE_NATIVE_FP_ATOMICS
158156
#define FP_TESTS_ONLY

SYCL/AtomicRef/add_generic_native_fp.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -147,11 +147,9 @@
147147
// RUN: %CPU_RUN_PLACEHOLDER %t.out
148148
// RUN: %ACC_RUN_PLACEHOLDER %t.out
149149

150-
// CUDA and HIP backends have had no support for the generic address space yet
151-
// XFAIL: cuda || hip
152-
153-
// hip, level zero and opencl do not support native floating point atomics
154-
// XFAIL: hip, level_zero, opencl
150+
// CUDA and HIP backends have had no support for the generic address space yet.
151+
// HIP does not support native floating point atomics
152+
// XFAIL: cuda, hip
155153

156154
#define SYCL_USE_NATIVE_FP_ATOMICS
157155
#define FP_TESTS_ONLY

SYCL/AtomicRef/add_local_native_fp.cpp

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -147,12 +147,9 @@
147147
// RUN: %CPU_RUN_PLACEHOLDER %t.out
148148
// RUN: %ACC_RUN_PLACEHOLDER %t.out
149149

150-
// Barrier is not supported on host. HIP and OpenCL do not support floating
151-
// point atomics.
152-
// XFAIL: host, hip, opencl
153-
154-
// hip, level zero and opencl do not support native floating point atomics
155-
// XFAIL: hip, level_zero, opencl
150+
// Barrier is not supported on host. HIP does not support floating point
151+
// atomics.
152+
// XFAIL: host, hip
156153

157154
#define SYCL_USE_NATIVE_FP_ATOMICS
158155
#define FP_TESTS_ONLY

SYCL/AtomicRef/add_native_fp.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,8 @@
147147
// RUN: %CPU_RUN_PLACEHOLDER %t.out
148148
// RUN: %ACC_RUN_PLACEHOLDER %t.out
149149

150-
// hip, level zero and opencl do not support native floating point atomics
151-
// XFAIL: hip, level_zero, opencl
150+
// hip does not support native floating point atomics
151+
// XFAIL: hip
152152

153153
#define SYCL_USE_NATIVE_FP_ATOMICS
154154
#define FP_TESTS_ONLY

SYCL/AtomicRef/max_generic_local_native_fp.cpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -148,11 +148,8 @@
148148
// RUN: %ACC_RUN_PLACEHOLDER %t.out
149149

150150
// CUDA and HIP backends have had no support for the generic address space yet.
151-
// Host does not support barrier.
152-
// XFAIL: cuda || hip || host
153-
154-
// hip, level zero and opencl do not support native floating point atomics
155-
// XFAIL: hip, level_zero, opencl
151+
// Host does not support barrier. HIP dees not support native floating point atomics
152+
// XFAIL: cuda, hip, host
156153

157154
#define SYCL_USE_NATIVE_FP_ATOMICS
158155
#define FP_TESTS_ONLY

SYCL/AtomicRef/max_generic_native_fp.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -147,11 +147,9 @@
147147
// RUN: %CPU_RUN_PLACEHOLDER %t.out
148148
// RUN: %ACC_RUN_PLACEHOLDER %t.out
149149

150-
// CUDA and HIP backends have had no support for the generic address space yet
151-
// XFAIL: cuda || hip
152-
153-
// hip, level zero and opencl do not support native floating point atomics
154-
// XFAIL: hip, level_zero, opencl
150+
// CUDA and HIP backends have had no support for the generic address space yet.
151+
// HIP does not support native floating point atomics
152+
// XFAIL: cuda, hip
155153

156154
#define SYCL_USE_NATIVE_FP_ATOMICS
157155
#define FP_TESTS_ONLY

SYCL/AtomicRef/max_local_native_fp.cpp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -147,12 +147,8 @@
147147
// RUN: %CPU_RUN_PLACEHOLDER %t.out
148148
// RUN: %ACC_RUN_PLACEHOLDER %t.out
149149

150-
// Barrier is not supported on host. HIP and OpenCL do not support floating
151-
// point atomics.
152-
// XFAIL: host, hip, opencl
153-
154-
// hip, level zero and opencl do not support native floating point atomics
155-
// XFAIL: hip, level_zero, opencl
150+
// Barrier is not supported on host. HIP does not support native floating point atomics
151+
// XFAIL: host, hip
156152

157153
#define SYCL_USE_NATIVE_FP_ATOMICS
158154
#define FP_TESTS_ONLY

SYCL/AtomicRef/max_native_fp.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,8 @@
147147
// RUN: %CPU_RUN_PLACEHOLDER %t.out
148148
// RUN: %ACC_RUN_PLACEHOLDER %t.out
149149

150-
// hip, level zero and opencl do not support native floating point atomics
151-
// XFAIL: hip, level_zero, opencl
150+
// HIP does not support native floating point atomics
151+
// XFAIL: hip
152152

153153
#define SYCL_USE_NATIVE_FP_ATOMICS
154154
#define FP_TESTS_ONLY

SYCL/AtomicRef/min_generic_local_native_fp.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -148,11 +148,9 @@
148148
// RUN: %ACC_RUN_PLACEHOLDER %t.out
149149

150150
// CUDA and HIP backends have had no support for the generic address space yet.
151-
// Host does not support barrier.
152-
// XFAIL: cuda || hip || host
153-
154-
// hip, level zero and opencl do not support native floating point atomics
155-
// XFAIL: hip, level_zero, opencl
151+
// Host does not support barrier. HIP does not support native floating point
152+
// atomics
153+
// XFAIL: cuda, hip, host
156154

157155
#define SYCL_USE_NATIVE_FP_ATOMICS
158156
#define FP_TESTS_ONLY

SYCL/AtomicRef/min_generic_native_fp.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -147,11 +147,9 @@
147147
// RUN: %CPU_RUN_PLACEHOLDER %t.out
148148
// RUN: %ACC_RUN_PLACEHOLDER %t.out
149149

150-
// CUDA and HIP backends have had no support for the generic address space yet
151-
// XFAIL: cuda || hip
152-
153-
// hip, level zero and opencl do not support native floating point atomics
154-
// XFAIL: hip, level_zero, opencl
150+
// CUDA and HIP backends have had no support for the generic address space yet.
151+
// HIP does not support native floating point atomics
152+
// XFAIL: cuda, hip
155153

156154
#define SYCL_USE_NATIVE_FP_ATOMICS
157155
#define FP_TESTS_ONLY

SYCL/AtomicRef/min_local_native_fp.cpp

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -147,12 +147,9 @@
147147
// RUN: %CPU_RUN_PLACEHOLDER %t.out
148148
// RUN: %ACC_RUN_PLACEHOLDER %t.out
149149

150-
// Barrier is not supported on host. HIP and OpenCL do not support floating
151-
// point atomics.
152-
// XFAIL: host, hip, opencl
153-
154-
// hip, level zero and opencl do not support native floating point atomics
155-
// XFAIL: hip, level_zero, opencl
150+
// Barrier is not supported on host. HIP does not support native floating point
151+
// atomics
152+
// XFAIL: host, hip
156153

157154
#define SYCL_USE_NATIVE_FP_ATOMICS
158155
#define FP_TESTS_ONLY

SYCL/AtomicRef/min_native_fp.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,8 @@
147147
// RUN: %CPU_RUN_PLACEHOLDER %t.out
148148
// RUN: %ACC_RUN_PLACEHOLDER %t.out
149149

150-
// hip, level zero and opencl do not support native floating point atomics
151-
// XFAIL: hip, level_zero, opencl
150+
// HIP does not support native floating point atomics
151+
// XFAIL: hip
152152

153153
#define SYCL_USE_NATIVE_FP_ATOMICS
154154
#define FP_TESTS_ONLY

SYCL/AtomicRef/sub_generic.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,4 +150,6 @@
150150
// CUDA and HIP backends have had no support for the generic address space yet
151151
// XFAIL: cuda || hip
152152

153-
int main() { sub_test_all<access::address_space::global_space>(); }
153+
#include "sub.h"
154+
155+
int main() { sub_test_all<access::address_space::generic_space>(); }

SYCL/AtomicRef/sub_generic_local.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,5 +152,6 @@
152152
// XFAIL: cuda || hip || host
153153

154154
#define TEST_GENERIC_IN_LOCAL 1
155+
#include "sub.h"
155156

156-
int main() { sub_test_all<access::address_space::global_space>(); }
157+
int main() { sub_test_all<access::address_space::generic_space>(); }

SYCL/AtomicRef/sub_generic_local_native_fp.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -148,14 +148,14 @@
148148
// RUN: %ACC_RUN_PLACEHOLDER %t.out
149149

150150
// CUDA and HIP backends have had no support for the generic address space yet.
151-
// Host does not support barrier.
152-
// XFAIL: cuda || hip || host
153-
154-
// hip, level zero and opencl do not support native floating point atomics
155-
// XFAIL: hip, level_zero, opencl
151+
// Host does not support barrier. HIP does not support native floating point
152+
// atomics
153+
// XFAIL: cuda, hip, host
156154

157155
#define SYCL_USE_NATIVE_FP_ATOMICS
158156
#define FP_TESTS_ONLY
159157
#define TEST_GENERIC_IN_LOCAL 1
160158

161-
int main() { sub_test_all<access::address_space::global_space>(); }
159+
#include "sub.h"
160+
161+
int main() { sub_test_all<access::address_space::generic_space>(); }

SYCL/AtomicRef/sub_generic_native_fp.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -147,13 +147,13 @@
147147
// RUN: %CPU_RUN_PLACEHOLDER %t.out
148148
// RUN: %ACC_RUN_PLACEHOLDER %t.out
149149

150-
// CUDA and HIP backends have had no support for the generic address space yet
151-
// XFAIL: cuda || hip
152-
153-
// hip, level zero and opencl do not support native floating point atomics
154-
// XFAIL: hip, level_zero, opencl
150+
// CUDA and HIP backends have had no support for the generic address space yet.
151+
// HIP does not support native floating point atomics
152+
// XFAIL: cuda, hip
155153

156154
#define SYCL_USE_NATIVE_FP_ATOMICS
157155
#define FP_TESTS_ONLY
158156

159-
int main() { sub_test_all<access::address_space::global_space>(); }
157+
#include "sub.h"
158+
159+
int main() { sub_test_all<access::address_space::generic_space>(); }

SYCL/AtomicRef/sub_local_native_fp.cpp

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -147,12 +147,9 @@
147147
// RUN: %CPU_RUN_PLACEHOLDER %t.out
148148
// RUN: %ACC_RUN_PLACEHOLDER %t.out
149149

150-
// Barrier is not supported on host. HIP and OpenCL do not support floating
151-
// point atomics.
152-
// XFAIL: host, hip, opencl
153-
154-
// hip, level zero and opencl do not support native floating point atomics
155-
// XFAIL: hip, level_zero, opencl
150+
// Barrier is not supported on host. HIP does not support native floating point
151+
// atomics
152+
// XFAIL: host, hip
156153

157154
#define SYCL_USE_NATIVE_FP_ATOMICS
158155
#define FP_TESTS_ONLY

SYCL/AtomicRef/sub_native_fp.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,8 @@
147147
// RUN: %CPU_RUN_PLACEHOLDER %t.out
148148
// RUN: %ACC_RUN_PLACEHOLDER %t.out
149149

150-
// hip, level zero and opencl do not support native floating point atomics
151-
// XFAIL: hip, level_zero, opencl
150+
// HIP does not support native floating point atomics
151+
// XFAIL: hip
152152

153153
#define SYCL_USE_NATIVE_FP_ATOMICS
154154
#define FP_TESTS_ONLY

0 commit comments

Comments
 (0)