Update tests after merge conflict

Author: denis-kabanov

SYCL/AtomicRef/and.h

@@ -190,7 +190,10 @@ template <access::address_space space> void and_test_all() {
   queue q;
 
 #ifdef ATOMIC64
-  if (!q.get_device().has(aspect::atomic64)) {
+  if (q.get_device().get_platform().get_backend() == backend::ext_oneapi_hip ||
+      !q.get_device().has(aspect::atomic64)) {
+    // Also temporarily skip the test if backend = HIP because
+    // device.has(aspect::atomic64) is not implemented on it
     std::cout << "Skipping test\n";
     return;
   }

SYCL/AtomicRef/compare_exchange.h

@@ -210,7 +210,10 @@ template <access::address_space space> void compare_exchange_test_all() {
 
   constexpr int N = 32;
 #ifdef ATOMIC64
-  if (!q.get_device().has(aspect::atomic64)) {
+  if (q.get_device().get_platform().get_backend() == backend::ext_oneapi_hip ||
+      !q.get_device().has(aspect::atomic64)) {
+    // Also temporarily skip the test if backend = HIP because
+    // device.has(aspect::atomic64) is not implemented on it
     std::cout << "Skipping test\n";
     return;
   }

SYCL/AtomicRef/exchange.h

@@ -193,7 +193,10 @@ template <access::address_space space> void exchange_test_all() {
 
   constexpr int N = 32;
 #ifdef ATOMIC64
-  if (!q.get_device().has(aspect::atomic64)) {
+  if (q.get_device().get_platform().get_backend() == backend::ext_oneapi_hip ||
+      !q.get_device().has(aspect::atomic64)) {
+    // Also temporarily skip the test if backend = HIP because
+    // device.has(aspect::atomic64) is not implemented on it
     std::cout << "Skipping test\n";
     return;
   }

SYCL/AtomicRef/or.h

@@ -190,7 +190,10 @@ template <access::address_space space> void or_test_all() {
 
   constexpr int N = 32;
 #ifdef ATOMIC64
-  if (!q.get_device().has(aspect::atomic64)) {
+  if (q.get_device().get_platform().get_backend() == backend::ext_oneapi_hip ||
+      !q.get_device().has(aspect::atomic64)) {
+    // Also temporarily skip the test if backend = HIP because
+    // device.has(aspect::atomic64) is not implemented on it
     std::cout << "Skipping test\n";
     return;
   }

SYCL/AtomicRef/xor.h

@@ -191,7 +191,10 @@ template <access::address_space space> void xor_test_all() {
 
   constexpr int N = 32;
 #ifdef ATOMIC64
-  if (!q.get_device().has(aspect::atomic64)) {
+  if (q.get_device().get_platform().get_backend() == backend::ext_oneapi_hip ||
+      !q.get_device().has(aspect::atomic64)) {
+    // Also temporarily skip the test if backend = HIP because
+    // device.has(aspect::atomic64) is not implemented on it
     std::cout << "Skipping test\n";
     return;
   }