Fixing merge conflict

Author: Hugh Delaney

.github/CODEOWNERS

@@ -1,9 +1,8 @@
-* @vladimirlaz @romanovvlad @bader
+* @pvchupin
 
 # Use runtime team as the umbrella for most of the tests
 /SYCL/ @intel/llvm-reviewers-runtime
 
-
 # SYCL sub-directory matchers are grouped by code owner first, followed by
 # alphabetical order within the group. Please, keep this ordering.
 

.github/workflows/clang-format.yml

@@ -20,6 +20,7 @@ jobs:
     - name: Run clang-format for the patch
       shell: bash {0}
       run: |
+        git config --global --add safe.directory /__w/llvm-test-suite/llvm-test-suite
         git clang-format ${GITHUB_SHA}^1
         git diff > ./clang-format.patch
 

SYCL/AtomicRef/add.cpp

@@ -1,7 +1,7 @@
 // See https://github.com/intel/llvm-test-suite/issues/867 for detailed status
 // UNSUPPORTED: hip
 
-// RUN: %clangxx -fsycl -fsycl-unnamed-lambda -fsycl-device-code-split=per_kernel -fsycl-targets=%sycl_triple %s -o %t.out -Xsycl-target-backend=nvptx64-nvidia-cuda --cuda-gpu-arch=sm_70
+// RUN: %clangxx -fsycl -fsycl-unnamed-lambda -fsycl-device-code-split=per_kernel -fsycl-targets=%sycl_triple %s -o %t.out
 // RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out

SYCL/AtomicRef/add.h

@@ -287,10 +287,6 @@ template <access::address_space space, typename T, typename Difference = T,
 void add_test_scopes(queue q, size_t N) {
   std::vector<memory_scope> scopes =
       q.get_device().get_info<info::device::atomic_memory_scope_capabilities>();
-  if (std::find(scopes.begin(), scopes.end(), memory_scope::system) !=
-      scopes.end()) {
-    add_test<space, T, Difference, order, memory_scope::system>(q, N);
-  }
   if (std::find(scopes.begin(), scopes.end(), memory_scope::work_group) !=
       scopes.end()) {
     add_test<space, T, Difference, order, memory_scope::work_group>(q, N);

SYCL/AtomicRef/add_generic.cpp

@@ -1,11 +1,11 @@
-// RUN: %clangxx -fsycl -fsycl-unnamed-lambda -fsycl-targets=%sycl_triple %s -o %t.out -Xsycl-target-backend=nvptx64-nvidia-cuda --cuda-gpu-arch=sm_70
+// RUN: %clangxx -fsycl -fsycl-unnamed-lambda -fsycl-targets=%sycl_triple %s -o %t.out
 // RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // 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"
 

SYCL/AtomicRef/add_generic_local.cpp

@@ -1,12 +1,12 @@
-// RUN: %clangxx -fsycl -fsycl-unnamed-lambda -fsycl-targets=%sycl_triple %s -o %t.out -Xsycl-target-backend=nvptx64-nvidia-cuda --cuda-gpu-arch=sm_70
+// RUN: %clangxx -fsycl -fsycl-unnamed-lambda -fsycl-targets=%sycl_triple %s -o %t.out
 // RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // 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
 

SYCL/AtomicRef/add_generic_local_native_fp.cpp

@@ -1,13 +1,13 @@
-// RUN: %clangxx -fsycl -fsycl-unnamed-lambda -fsycl-targets=%sycl_triple %s -o %t.out -Xsycl-target-backend=nvptx64-nvidia-cuda --cuda-gpu-arch=sm_70
+// RUN: %clangxx -fsycl -fsycl-unnamed-lambda -fsycl-targets=%sycl_triple %s -o %t.out
 // RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // 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

SYCL/AtomicRef/add_generic_native_fp.cpp

@@ -1,12 +1,12 @@
-// RUN: %clangxx -fsycl -fsycl-unnamed-lambda -fsycl-targets=%sycl_triple %s -o %t.out -Xsycl-target-backend=nvptx64-nvidia-cuda --cuda-gpu-arch=sm_70
+// RUN: %clangxx -fsycl -fsycl-unnamed-lambda -fsycl-targets=%sycl_triple %s -o %t.out
 // RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // 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

SYCL/AtomicRef/add_local.cpp

@@ -1,12 +1,12 @@
-// RUN: %clangxx -fsycl -fsycl-unnamed-lambda -fsycl-targets=%sycl_triple %s -o %t.out -Xsycl-target-backend=nvptx64-nvidia-cuda --cuda-gpu-arch=sm_70
+// RUN: %clangxx -fsycl -fsycl-unnamed-lambda -fsycl-targets=%sycl_triple %s -o %t.out
 // RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// Barrier is not supported on host. HIP and ACC  do not support floating
-// point atomics.
-// XFAIL: host, hip, acc
+// Barrier is not supported on host. HIP does not support floating point
+// atomics.
+// XFAIL: host, hip
 
 #include "add.h"
 

SYCL/AtomicRef/add_local_native_fp.cpp

@@ -1,4 +1,4 @@
-// RUN: %clangxx -fsycl -fsycl-unnamed-lambda -fsycl-targets=%sycl_triple %s -o %t.out -Xsycl-target-backend=nvptx64-nvidia-cuda --cuda-gpu-arch=sm_70
+// RUN: %clangxx -fsycl -fsycl-unnamed-lambda -fsycl-targets=%sycl_triple %s -o %t.out
 // RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out