From ee3344f87c90cfbbea9e2606f5aec5c61969ac36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tadej=20Ciglari=C4=8D?= <tadej.ciglaric@codeplay.com>
Date: Fri, 18 Mar 2022 13:06:34 +0000
Subject: [PATCH 1/3] enable generic atomic tests for cuda backend

---
 SYCL/AtomicRef/add_generic.cpp                    | 4 ++--
 SYCL/AtomicRef/add_generic_local.cpp              | 4 ++--
 SYCL/AtomicRef/add_generic_local_native_fp.cpp    | 4 ++--
 SYCL/AtomicRef/add_generic_native_fp.cpp          | 4 ++--
 SYCL/AtomicRef/and_generic.cpp                    | 4 ++--
 SYCL/AtomicRef/and_generic_local.cpp              | 4 ++--
 SYCL/AtomicRef/assignment_atomic64_generic.cpp    | 4 ++--
 SYCL/AtomicRef/assignment_generic.cpp             | 4 ++--
 SYCL/AtomicRef/compare_exchange_generic.cpp       | 4 ++--
 SYCL/AtomicRef/compare_exchange_generic_local.cpp | 4 ++--
 SYCL/AtomicRef/exchange_generic.cpp               | 4 ++--
 SYCL/AtomicRef/exchange_generic_local.cpp         | 4 ++--
 SYCL/AtomicRef/load_generic.cpp                   | 4 ++--
 SYCL/AtomicRef/load_generic_local.cpp             | 4 ++--
 SYCL/AtomicRef/max_generic.cpp                    | 4 ++--
 SYCL/AtomicRef/max_generic_local.cpp              | 4 ++--
 SYCL/AtomicRef/max_generic_local_native_fp.cpp    | 4 ++--
 SYCL/AtomicRef/max_generic_native_fp.cpp          | 4 ++--
 SYCL/AtomicRef/min_generic.cpp                    | 4 ++--
 SYCL/AtomicRef/min_generic_local.cpp              | 4 ++--
 SYCL/AtomicRef/min_generic_local_native_fp.cpp    | 4 ++--
 SYCL/AtomicRef/min_generic_native_fp.cpp          | 4 ++--
 SYCL/AtomicRef/or_generic.cpp                     | 4 ++--
 SYCL/AtomicRef/or_generic_local.cpp               | 4 ++--
 SYCL/AtomicRef/store_generic.cpp                  | 4 ++--
 SYCL/AtomicRef/store_generic_local.cpp            | 4 ++--
 SYCL/AtomicRef/sub_generic.cpp                    | 4 ++--
 SYCL/AtomicRef/sub_generic_local.cpp              | 4 ++--
 SYCL/AtomicRef/sub_generic_local_native_fp.cpp    | 4 ++--
 SYCL/AtomicRef/sub_generic_native_fp.cpp          | 4 ++--
 SYCL/AtomicRef/xor_generic.cpp                    | 4 ++--
 SYCL/AtomicRef/xor_generic_local.cpp              | 4 ++--
 32 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/SYCL/AtomicRef/add_generic.cpp b/SYCL/AtomicRef/add_generic.cpp
index dce63af028..ffa0c6da21 100644
--- a/SYCL/AtomicRef/add_generic.cpp
+++ b/SYCL/AtomicRef/add_generic.cpp
@@ -4,8 +4,8 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// CUDA and HIP backends have had no support for the generic address space yet
-// XFAIL: cuda || hip
+// HIP backend has no support for the generic address space yet
+// XFAIL: hip
 
 #include "add.h"
 
diff --git a/SYCL/AtomicRef/add_generic_local.cpp b/SYCL/AtomicRef/add_generic_local.cpp
index a9943d32e2..7968dd99dc 100644
--- a/SYCL/AtomicRef/add_generic_local.cpp
+++ b/SYCL/AtomicRef/add_generic_local.cpp
@@ -4,9 +4,9 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// CUDA and HIP backends have had no support for the generic address space yet.
+// HIP backend has no support for the generic address space yet.
 // Host does not support barrier.
-// XFAIL: cuda || hip || host
+// XFAIL: hip || host
 
 #define TEST_GENERIC_IN_LOCAL 1
 
diff --git a/SYCL/AtomicRef/add_generic_local_native_fp.cpp b/SYCL/AtomicRef/add_generic_local_native_fp.cpp
index 549370260b..8cf96d8e24 100644
--- a/SYCL/AtomicRef/add_generic_local_native_fp.cpp
+++ b/SYCL/AtomicRef/add_generic_local_native_fp.cpp
@@ -4,10 +4,10 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// CUDA and HIP backends have had no support for the generic address space yet.
+// HIP backend has no support for the generic address space yet.
 // Host does not support barrier. HIP does not support native floating point
 // atomics
-// XFAIL: cuda, hip, host
+// XFAIL: hip, host
 
 #define SYCL_USE_NATIVE_FP_ATOMICS
 #define FP_TESTS_ONLY
diff --git a/SYCL/AtomicRef/add_generic_native_fp.cpp b/SYCL/AtomicRef/add_generic_native_fp.cpp
index a8ed84426c..de8ad60b31 100644
--- a/SYCL/AtomicRef/add_generic_native_fp.cpp
+++ b/SYCL/AtomicRef/add_generic_native_fp.cpp
@@ -4,9 +4,9 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// CUDA and HIP backends have had no support for the generic address space yet.
+// HIP backend has had no support for the generic address space yet.
 // HIP does not support native floating point atomics
-// XFAIL: cuda, hip
+// XFAIL: hip
 
 #define SYCL_USE_NATIVE_FP_ATOMICS
 #define FP_TESTS_ONLY
diff --git a/SYCL/AtomicRef/and_generic.cpp b/SYCL/AtomicRef/and_generic.cpp
index 982bd6db1f..7b87902041 100644
--- a/SYCL/AtomicRef/and_generic.cpp
+++ b/SYCL/AtomicRef/and_generic.cpp
@@ -4,8 +4,8 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// CUDA and HIP backends have had no support for the generic address space yet
-// XFAIL: cuda || hip
+// HIP backend has had no support for the generic address space yet
+// XFAIL: hip
 
 #include "and.h"
 
diff --git a/SYCL/AtomicRef/and_generic_local.cpp b/SYCL/AtomicRef/and_generic_local.cpp
index 9f64d4cb8f..c4779cb2d4 100644
--- a/SYCL/AtomicRef/and_generic_local.cpp
+++ b/SYCL/AtomicRef/and_generic_local.cpp
@@ -4,9 +4,9 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// CUDA and HIP backends have had no support for the generic address space yet.
+// HIP backend has no support for the generic address space yet.
 // Host does not support barrier.
-// XFAIL: cuda || hip || host
+// XFAIL: hip || host
 
 #define TEST_GENERIC_IN_LOCAL 1
 
diff --git a/SYCL/AtomicRef/assignment_atomic64_generic.cpp b/SYCL/AtomicRef/assignment_atomic64_generic.cpp
index 6bd23254aa..56ff667aa4 100644
--- a/SYCL/AtomicRef/assignment_atomic64_generic.cpp
+++ b/SYCL/AtomicRef/assignment_atomic64_generic.cpp
@@ -4,8 +4,8 @@
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// CUDA backend has had no support for the generic address space yet
-// XFAIL: cuda || hip
+// HIP backend has no support for the generic address space yet
+// XFAIL: hip
 
 #include "assignment.h"
 #include <iostream>
diff --git a/SYCL/AtomicRef/assignment_generic.cpp b/SYCL/AtomicRef/assignment_generic.cpp
index f82436f827..06f7f12356 100644
--- a/SYCL/AtomicRef/assignment_generic.cpp
+++ b/SYCL/AtomicRef/assignment_generic.cpp
@@ -4,8 +4,8 @@
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// CUDA backend has had no support for the generic address space yet
-// XFAIL: cuda || hip
+// HIP backend has no support for the generic address space yet
+// XFAIL: hip
 
 #include "assignment.h"
 #include <iostream>
diff --git a/SYCL/AtomicRef/compare_exchange_generic.cpp b/SYCL/AtomicRef/compare_exchange_generic.cpp
index f2f41f5715..816fbfbc19 100644
--- a/SYCL/AtomicRef/compare_exchange_generic.cpp
+++ b/SYCL/AtomicRef/compare_exchange_generic.cpp
@@ -4,8 +4,8 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// CUDA and HIP backends have had no support for the generic address space yet
-// XFAIL: cuda || hip
+// HIP backend has no support for the generic address space yet
+// XFAIL: hip
 
 #include "compare_exchange.h"
 
diff --git a/SYCL/AtomicRef/compare_exchange_generic_local.cpp b/SYCL/AtomicRef/compare_exchange_generic_local.cpp
index 5039e71291..a00515efe4 100644
--- a/SYCL/AtomicRef/compare_exchange_generic_local.cpp
+++ b/SYCL/AtomicRef/compare_exchange_generic_local.cpp
@@ -4,9 +4,9 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// CUDA and HIP backends have had no support for the generic address space yet.
+// HIP backend has no support for the generic address space yet.
 // Host does not support barrier.
-// XFAIL: cuda || hip || host
+// XFAIL: hip || host
 
 #define TEST_GENERIC_IN_LOCAL 1
 
diff --git a/SYCL/AtomicRef/exchange_generic.cpp b/SYCL/AtomicRef/exchange_generic.cpp
index bb645b0cf3..38dbb2def0 100644
--- a/SYCL/AtomicRef/exchange_generic.cpp
+++ b/SYCL/AtomicRef/exchange_generic.cpp
@@ -4,8 +4,8 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// CUDA and HIP backends have had no support for the generic address space yet
-// XFAIL: cuda || hip
+// HIP backend has no support for the generic address space yet
+// XFAIL: hip
 
 #include "exchange.h"
 
diff --git a/SYCL/AtomicRef/exchange_generic_local.cpp b/SYCL/AtomicRef/exchange_generic_local.cpp
index 45fdd36198..b00b736c9a 100644
--- a/SYCL/AtomicRef/exchange_generic_local.cpp
+++ b/SYCL/AtomicRef/exchange_generic_local.cpp
@@ -4,9 +4,9 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// CUDA and HIP backends have had no support for the generic address space yet.
+// HIP backend has no support for the generic address space yet.
 // Host does not support barrier.
-// XFAIL: cuda || hip || host
+// XFAIL: hip || host
 
 #define TEST_GENERIC_IN_LOCAL 1
 
diff --git a/SYCL/AtomicRef/load_generic.cpp b/SYCL/AtomicRef/load_generic.cpp
index 512099f7f3..65c935f6a2 100644
--- a/SYCL/AtomicRef/load_generic.cpp
+++ b/SYCL/AtomicRef/load_generic.cpp
@@ -4,8 +4,8 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// CUDA and HIP backends have had no support for the generic address space yet
-// XFAIL: cuda || hip
+// HIP backend has no support for the generic address space yet
+// XFAIL: hip
 
 #include "load.h"
 
diff --git a/SYCL/AtomicRef/load_generic_local.cpp b/SYCL/AtomicRef/load_generic_local.cpp
index 51d67d1be9..95f663a876 100755
--- a/SYCL/AtomicRef/load_generic_local.cpp
+++ b/SYCL/AtomicRef/load_generic_local.cpp
@@ -4,9 +4,9 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// CUDA backend has had no support for the generic address space yet. Barrier is
+// HIP backend has no support for the generic address space yet. Barrier is
 // not supported on host.
-// XFAIL: cuda, hip, host
+// XFAIL: hip, host
 
 #define TEST_GENERIC_IN_LOCAL 1
 
diff --git a/SYCL/AtomicRef/max_generic.cpp b/SYCL/AtomicRef/max_generic.cpp
index 1d3460a167..c12eefc5cb 100644
--- a/SYCL/AtomicRef/max_generic.cpp
+++ b/SYCL/AtomicRef/max_generic.cpp
@@ -4,8 +4,8 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// CUDA and HIP backends have had no support for the generic address space yet
-// XFAIL: cuda || hip
+// HIP backend has no support for the generic address space yet
+// XFAIL: hip
 
 #include "max.h"
 
diff --git a/SYCL/AtomicRef/max_generic_local.cpp b/SYCL/AtomicRef/max_generic_local.cpp
index ed5d11c3b1..3f7c6987b5 100644
--- a/SYCL/AtomicRef/max_generic_local.cpp
+++ b/SYCL/AtomicRef/max_generic_local.cpp
@@ -4,9 +4,9 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// CUDA and HIP backends have had no support for the generic address space yet.
+// HIP backend has no support for the generic address space yet.
 // Host does not support barrier.
-// XFAIL: cuda || hip || host
+// XFAIL: hip || host
 
 #define TEST_GENERIC_IN_LOCAL 1
 
diff --git a/SYCL/AtomicRef/max_generic_local_native_fp.cpp b/SYCL/AtomicRef/max_generic_local_native_fp.cpp
index f7af2e7cb4..37464f22ff 100644
--- a/SYCL/AtomicRef/max_generic_local_native_fp.cpp
+++ b/SYCL/AtomicRef/max_generic_local_native_fp.cpp
@@ -4,10 +4,10 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// CUDA and HIP backends have had no support for the generic address space yet.
+// HIP backend has no support for the generic address space yet.
 // Host does not support barrier. HIP dees not support native floating point
 // atomics
-// XFAIL: cuda, hip, host
+// XFAIL: hip, host
 
 #define SYCL_USE_NATIVE_FP_ATOMICS
 #define FP_TESTS_ONLY
diff --git a/SYCL/AtomicRef/max_generic_native_fp.cpp b/SYCL/AtomicRef/max_generic_native_fp.cpp
index f3c9328829..d9b5738696 100644
--- a/SYCL/AtomicRef/max_generic_native_fp.cpp
+++ b/SYCL/AtomicRef/max_generic_native_fp.cpp
@@ -4,9 +4,9 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// CUDA and HIP backends have had no support for the generic address space yet.
+// HIP backend has no support for the generic address space yet.
 // HIP does not support native floating point atomics
-// XFAIL: cuda, hip
+// XFAIL: hip
 
 #define SYCL_USE_NATIVE_FP_ATOMICS
 #define FP_TESTS_ONLY
diff --git a/SYCL/AtomicRef/min_generic.cpp b/SYCL/AtomicRef/min_generic.cpp
index a8b40f8898..7d348fddee 100644
--- a/SYCL/AtomicRef/min_generic.cpp
+++ b/SYCL/AtomicRef/min_generic.cpp
@@ -4,8 +4,8 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// CUDA and HIP backends have had no support for the generic address space yet
-// XFAIL: cuda || hip
+// HIP backend has no support for the generic address space yet
+// XFAIL: hip
 
 #include "min.h"
 
diff --git a/SYCL/AtomicRef/min_generic_local.cpp b/SYCL/AtomicRef/min_generic_local.cpp
index 7e28487d71..a9c311c230 100644
--- a/SYCL/AtomicRef/min_generic_local.cpp
+++ b/SYCL/AtomicRef/min_generic_local.cpp
@@ -4,9 +4,9 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// CUDA and HIP backends have had no support for the generic address space yet.
+// HIP backend has no support for the generic address space yet.
 // Host does not support barrier.
-// XFAIL: cuda || hip || host
+// XFAIL: hip || host
 
 #define TEST_GENERIC_IN_LOCAL 1
 
diff --git a/SYCL/AtomicRef/min_generic_local_native_fp.cpp b/SYCL/AtomicRef/min_generic_local_native_fp.cpp
index 0c76f83414..05030f883d 100644
--- a/SYCL/AtomicRef/min_generic_local_native_fp.cpp
+++ b/SYCL/AtomicRef/min_generic_local_native_fp.cpp
@@ -4,10 +4,10 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// CUDA and HIP backends have had no support for the generic address space yet.
+// HIP backend has no support for the generic address space yet.
 // Host does not support barrier. HIP does not support native floating point
 // atomics
-// XFAIL: cuda, hip, host
+// XFAIL: hip, host
 
 #define SYCL_USE_NATIVE_FP_ATOMICS
 #define FP_TESTS_ONLY
diff --git a/SYCL/AtomicRef/min_generic_native_fp.cpp b/SYCL/AtomicRef/min_generic_native_fp.cpp
index 5046d4b194..031f4e6c0b 100644
--- a/SYCL/AtomicRef/min_generic_native_fp.cpp
+++ b/SYCL/AtomicRef/min_generic_native_fp.cpp
@@ -4,9 +4,9 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// CUDA and HIP backends have had no support for the generic address space yet.
+// HIP backend has no support for the generic address space yet.
 // HIP does not support native floating point atomics
-// XFAIL: cuda, hip
+// XFAIL: hip
 
 #define SYCL_USE_NATIVE_FP_ATOMICS
 #define FP_TESTS_ONLY
diff --git a/SYCL/AtomicRef/or_generic.cpp b/SYCL/AtomicRef/or_generic.cpp
index 6d6e56882f..a381f6699f 100644
--- a/SYCL/AtomicRef/or_generic.cpp
+++ b/SYCL/AtomicRef/or_generic.cpp
@@ -4,8 +4,8 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// CUDA and HIP backends have had no support for the generic address space yet
-// XFAIL: cuda || hip
+// HIP backend has no support for the generic address space yet
+// XFAIL: hip
 
 #include "or.h"
 
diff --git a/SYCL/AtomicRef/or_generic_local.cpp b/SYCL/AtomicRef/or_generic_local.cpp
index b1aa209f02..6c23b0d610 100644
--- a/SYCL/AtomicRef/or_generic_local.cpp
+++ b/SYCL/AtomicRef/or_generic_local.cpp
@@ -4,9 +4,9 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// CUDA and HIP backends have had no support for the generic address space yet.
+// HIP backend has no support for the generic address space yet.
 // Host does not support barrier.
-// XFAIL: cuda || hip || host
+// XFAIL: hip || host
 
 #define TEST_GENERIC_IN_LOCAL 1
 
diff --git a/SYCL/AtomicRef/store_generic.cpp b/SYCL/AtomicRef/store_generic.cpp
index 9de6471a1f..4abb107215 100644
--- a/SYCL/AtomicRef/store_generic.cpp
+++ b/SYCL/AtomicRef/store_generic.cpp
@@ -4,8 +4,8 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// CUDA and HIP backends have no support for the generic address space yet
-// XFAIL: cuda, hip
+// HIP backend has no support for the generic address space yet
+// XFAIL: hip
 
 #include "store.h"
 
diff --git a/SYCL/AtomicRef/store_generic_local.cpp b/SYCL/AtomicRef/store_generic_local.cpp
index 1ae3f63ef6..de0f32e641 100755
--- a/SYCL/AtomicRef/store_generic_local.cpp
+++ b/SYCL/AtomicRef/store_generic_local.cpp
@@ -4,9 +4,9 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// CUDA and HIP backends have no support for the generic address space yet.
+// HIP backend has no support for the generic address space yet.
 // Barrier is not supported on host.
-// XFAIL: cuda, hip, host
+// XFAIL: hip, host
 
 #define TEST_GENERIC_IN_LOCAL 1
 
diff --git a/SYCL/AtomicRef/sub_generic.cpp b/SYCL/AtomicRef/sub_generic.cpp
index 0bc127d3ab..0c1b027f3d 100644
--- a/SYCL/AtomicRef/sub_generic.cpp
+++ b/SYCL/AtomicRef/sub_generic.cpp
@@ -4,8 +4,8 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// CUDA and HIP backends have had no support for the generic address space yet
-// XFAIL: cuda || hip
+// HIP backend has no support for the generic address space yet
+// XFAIL: hip
 
 #include "sub.h"
 
diff --git a/SYCL/AtomicRef/sub_generic_local.cpp b/SYCL/AtomicRef/sub_generic_local.cpp
index dc4de7dc8e..9e20f12d89 100644
--- a/SYCL/AtomicRef/sub_generic_local.cpp
+++ b/SYCL/AtomicRef/sub_generic_local.cpp
@@ -4,9 +4,9 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// CUDA and HIP backends have had no support for the generic address space yet.
+// HIP backend has no support for the generic address space yet.
 // Host does not support barrier.
-// XFAIL: cuda || hip || host
+// XFAIL: hip || host
 
 #define TEST_GENERIC_IN_LOCAL 1
 #include "sub.h"
diff --git a/SYCL/AtomicRef/sub_generic_local_native_fp.cpp b/SYCL/AtomicRef/sub_generic_local_native_fp.cpp
index e1b0c96923..3578c50c5b 100644
--- a/SYCL/AtomicRef/sub_generic_local_native_fp.cpp
+++ b/SYCL/AtomicRef/sub_generic_local_native_fp.cpp
@@ -4,10 +4,10 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// CUDA and HIP backends have had no support for the generic address space yet.
+// HIP backend has no support for the generic address space yet.
 // Host does not support barrier. HIP does not support native floating point
 // atomics
-// XFAIL: cuda, hip, host
+// XFAIL: hip, host
 
 #define SYCL_USE_NATIVE_FP_ATOMICS
 #define FP_TESTS_ONLY
diff --git a/SYCL/AtomicRef/sub_generic_native_fp.cpp b/SYCL/AtomicRef/sub_generic_native_fp.cpp
index 77dfb724cf..bd1d1632df 100644
--- a/SYCL/AtomicRef/sub_generic_native_fp.cpp
+++ b/SYCL/AtomicRef/sub_generic_native_fp.cpp
@@ -4,9 +4,9 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// CUDA and HIP backends have had no support for the generic address space yet.
+// HIP backend has no support for the generic address space yet.
 // HIP does not support native floating point atomics
-// XFAIL: cuda, hip
+// XFAIL: hip
 
 #define SYCL_USE_NATIVE_FP_ATOMICS
 #define FP_TESTS_ONLY
diff --git a/SYCL/AtomicRef/xor_generic.cpp b/SYCL/AtomicRef/xor_generic.cpp
index 690467caac..d951b18c37 100644
--- a/SYCL/AtomicRef/xor_generic.cpp
+++ b/SYCL/AtomicRef/xor_generic.cpp
@@ -4,8 +4,8 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// CUDA and HIP backends have had no support for the generic address space yet
-// XFAIL: cuda || hip
+// HIP backend has no support for the generic address space yet
+// XFAIL: hip
 
 #include "xor.h"
 
diff --git a/SYCL/AtomicRef/xor_generic_local.cpp b/SYCL/AtomicRef/xor_generic_local.cpp
index c8aa81e884..1b42877c59 100644
--- a/SYCL/AtomicRef/xor_generic_local.cpp
+++ b/SYCL/AtomicRef/xor_generic_local.cpp
@@ -4,9 +4,9 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// CUDA and HIP backends have had no support for the generic address space yet.
+// HIP backend has no support for the generic address space yet.
 // Host does not support barrier.
-// XFAIL: cuda || hip || host
+// XFAIL: hip || host
 
 #define TEST_GENERIC_IN_LOCAL 1
 

From 2e527a17bbbb4974b3eae20302940eee2ff1a53f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tadej=20Ciglari=C4=8D?= <tadej.ciglaric@codeplay.com>
Date: Tue, 22 Mar 2022 09:38:09 +0000
Subject: [PATCH 2/3] remove XFAIL from some HIP tests

---
 SYCL/AtomicRef/assignment_atomic64.cpp | 3 ---
 SYCL/Basic/aspects.cpp                 | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/SYCL/AtomicRef/assignment_atomic64.cpp b/SYCL/AtomicRef/assignment_atomic64.cpp
index b88eced151..3bf4e4551d 100644
--- a/SYCL/AtomicRef/assignment_atomic64.cpp
+++ b/SYCL/AtomicRef/assignment_atomic64.cpp
@@ -4,9 +4,6 @@
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// XFAIL: hip
-// Expected failure because hip does not have atomic64 check implementation
-
 #include "assignment.h"
 #include <iostream>
 using namespace sycl;
diff --git a/SYCL/Basic/aspects.cpp b/SYCL/Basic/aspects.cpp
index cc7b9a879f..2792a77814 100644
--- a/SYCL/Basic/aspects.cpp
+++ b/SYCL/Basic/aspects.cpp
@@ -4,9 +4,6 @@
 // Hip is missing some of the parameters tested here so it fails with NVIDIA
 // XFAIL: hip_nvidia
 
-// XFAIL: hip
-// Expected failure because hip does not have atomic64 check implementation
-
 //==--------------- aspects.cpp - SYCL device test ------------------------==//
 //
 // Returns the various aspects of a device  and platform.

From 316ebfe7d65c869b4f08b590842fe46ddcca9896 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tadej=20Ciglari=C4=8D?= <tadej.ciglaric@codeplay.com>
Date: Tue, 22 Mar 2022 13:38:23 +0000
Subject: [PATCH 3/3] Revert "remove XFAIL from some HIP tests"

This reverts commit 2e527a17bbbb4974b3eae20302940eee2ff1a53f.
---
 SYCL/AtomicRef/assignment_atomic64.cpp | 3 +++
 SYCL/Basic/aspects.cpp                 | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/SYCL/AtomicRef/assignment_atomic64.cpp b/SYCL/AtomicRef/assignment_atomic64.cpp
index 3bf4e4551d..b88eced151 100644
--- a/SYCL/AtomicRef/assignment_atomic64.cpp
+++ b/SYCL/AtomicRef/assignment_atomic64.cpp
@@ -4,6 +4,9 @@
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
+// XFAIL: hip
+// Expected failure because hip does not have atomic64 check implementation
+
 #include "assignment.h"
 #include <iostream>
 using namespace sycl;
diff --git a/SYCL/Basic/aspects.cpp b/SYCL/Basic/aspects.cpp
index 2792a77814..cc7b9a879f 100644
--- a/SYCL/Basic/aspects.cpp
+++ b/SYCL/Basic/aspects.cpp
@@ -4,6 +4,9 @@
 // Hip is missing some of the parameters tested here so it fails with NVIDIA
 // XFAIL: hip_nvidia
 
+// XFAIL: hip
+// Expected failure because hip does not have atomic64 check implementation
+
 //==--------------- aspects.cpp - SYCL device test ------------------------==//
 //
 // Returns the various aspects of a device  and platform.