[SYCL] Rename deprecated access::target::global_buffer (intel#647)

The sycl::access::target::global_buffer enumeration is deprecated in SYCL 2020,
the target::device one should be used instead.

Signed-off-by: Pavel Samolysov <[email protected]>

Author: Pavel Samolysov

SYCL/Basic/accessor/accessor.cpp

@@ -31,9 +31,14 @@ struct IdxID3 {
 };
 
 template <typename T>
+<<<<<<< HEAD
 using AccAlias =
     sycl::accessor<T, 1, sycl::access::mode::write, sycl::target::device>;
 
+=======
+using AccAlias = cl::sycl::accessor<T, 1, cl::sycl::access::mode::write,
+                                    cl::sycl::access::target::device>;
+>>>>>>> 2058d1246 ([SYCL] Rename deprecated access::target::global_buffer (#647))
 template <typename T> struct InheritedAccessor : public AccAlias<T> {
 
   using AccAlias<T>::AccAlias;
@@ -430,7 +435,11 @@ int main() {
         sycl::queue queue;
         queue.submit([&](sycl::handler &cgh) {
           sycl::accessor<int, 0, sycl::access::mode::read_write,
+<<<<<<< HEAD
                          sycl::target::device>
+=======
+                         sycl::access::target::device>
+>>>>>>> 2058d1246 ([SYCL] Rename deprecated access::target::global_buffer (#647))
               B(b, cgh);
           cgh.single_task<class acc_with_zero_dim>([=]() {
             auto B2 = B;
@@ -462,13 +471,23 @@ int main() {
     sycl::queue queue;
     queue.submit([&](sycl::handler &cgh) {
       sycl::accessor<int, 0, sycl::access::mode::read_write,
+<<<<<<< HEAD
                      sycl::target::device>
           acc1(buf1, cgh);
       sycl::accessor<int, 1, sycl::access::mode::read_write,
                      sycl::target::device>
           acc2(buf2, cgh);
       sycl::accessor<int, 1, sycl::access::mode::read_write,
                      sycl::target::device>
+=======
+                     sycl::access::target::device>
+          acc1(buf1, cgh);
+      sycl::accessor<int, 1, sycl::access::mode::read_write,
+                     sycl::access::target::device>
+          acc2(buf2, cgh);
+      sycl::accessor<int, 1, sycl::access::mode::read_write,
+                     sycl::access::target::device>
+>>>>>>> 2058d1246 ([SYCL] Rename deprecated access::target::global_buffer (#647))
           acc3(buf3, cgh, sycl::range<1>(1));
       cgh.single_task<class acc_alloc_buf>([=]() {
         acc1 *= 2;
@@ -502,7 +521,11 @@ int main() {
         sycl::queue queue;
         queue.submit([&](sycl::handler &cgh) {
           sycl::accessor<int, 1, sycl::access::mode::write,
+<<<<<<< HEAD
                          sycl::target::device>
+=======
+                         sycl::access::target::device>
+>>>>>>> 2058d1246 ([SYCL] Rename deprecated access::target::global_buffer (#647))
               D(d, cgh);
           sycl::accessor<int, 1, sycl::access::mode::read,
                          sycl::target::constant_buffer>
@@ -531,7 +554,12 @@ int main() {
         sycl::buffer<int, 1> d(&data, sycl::range<1>(1));
         sycl::buffer<int, 1> c(&cnst, sycl::range<1>(1));
 
+<<<<<<< HEAD
         sycl::accessor<int, 1, sycl::access::mode::write, sycl::target::device,
+=======
+        sycl::accessor<int, 1, sycl::access::mode::write,
+                       sycl::access::target::device,
+>>>>>>> 2058d1246 ([SYCL] Rename deprecated access::target::global_buffer (#647))
                        sycl::access::placeholder::true_t>
             D(d);
         sycl::accessor<int, 1, sycl::access::mode::read,
@@ -569,7 +597,11 @@ int main() {
         sycl::queue queue;
         queue.submit([&](sycl::handler &cgh) {
           sycl::accessor<int, 1, sycl::access::mode::write,
+<<<<<<< HEAD
                          sycl::target::device>
+=======
+                         sycl::access::target::device>
+>>>>>>> 2058d1246 ([SYCL] Rename deprecated access::target::global_buffer (#647))
               AccA(A, cgh);
           sycl::accessor<int, 1, sycl::access::mode::read,
                          sycl::target::constant_buffer>
@@ -604,7 +636,11 @@ int main() {
         sycl::queue queue;
         queue.submit([&](sycl::handler &cgh) {
           sycl::accessor<int, 1, sycl::access::mode::read_write,
+<<<<<<< HEAD
                          sycl::target::device>
+=======
+                         sycl::access::target::device>
+>>>>>>> 2058d1246 ([SYCL] Rename deprecated access::target::global_buffer (#647))
               B(b, cgh);
           auto B1 = b1.template get_access<sycl::access::mode::read_write>(cgh);