[SYCL] Use the sycl:: namespace instead of cl::sycl:: one (intel#749)

* [SYCL] Use the sycl:: namespace instead of cl::sycl:: one

Moving from SYCL 1.2.1 to SYCL 2020 should change two things:

 - The cl::sycl namespace should be sycl:: instead and come in via sycl/sycl.hpp
 - sycl::access::target should be sycl::target because the former is deprecated

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

* [SYCL][NFC] Fix formatting issues

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

Author: Pavel Samolysov

SYCL/Basic/accessor/accessor.cpp

@@ -32,13 +32,19 @@ struct IdxID3 {
 
 template <typename T>
 <<<<<<< HEAD
+<<<<<<< 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))
+=======
+using AccAlias =
+    sycl::accessor<T, 1, sycl::access::mode::write, sycl::target::device>;
+
+>>>>>>> cc8ee1e0c ([SYCL] Use the sycl:: namespace instead of cl::sycl:: one (#749))
 template <typename T> struct InheritedAccessor : public AccAlias<T> {
 
   using AccAlias<T>::AccAlias;
@@ -435,11 +441,15 @@ int main() {
         sycl::queue queue;
         queue.submit([&](sycl::handler &cgh) {
           sycl::accessor<int, 0, sycl::access::mode::read_write,
+<<<<<<< HEAD
 <<<<<<< HEAD
                          sycl::target::device>
 =======
                          sycl::access::target::device>
 >>>>>>> 2058d1246 ([SYCL] Rename deprecated access::target::global_buffer (#647))
+=======
+                         sycl::target::device>
+>>>>>>> cc8ee1e0c ([SYCL] Use the sycl:: namespace instead of cl::sycl:: one (#749))
               B(b, cgh);
           cgh.single_task<class acc_with_zero_dim>([=]() {
             auto B2 = B;
@@ -471,6 +481,7 @@ int main() {
     sycl::queue queue;
     queue.submit([&](sycl::handler &cgh) {
       sycl::accessor<int, 0, sycl::access::mode::read_write,
+<<<<<<< HEAD
 <<<<<<< HEAD
                      sycl::target::device>
           acc1(buf1, cgh);
@@ -481,13 +492,20 @@ int main() {
                      sycl::target::device>
 =======
                      sycl::access::target::device>
+=======
+                     sycl::target::device>
+>>>>>>> cc8ee1e0c ([SYCL] Use the sycl:: namespace instead of cl::sycl:: one (#749))
           acc1(buf1, cgh);
       sycl::accessor<int, 1, sycl::access::mode::read_write,
-                     sycl::access::target::device>
+                     sycl::target::device>
           acc2(buf2, cgh);
       sycl::accessor<int, 1, sycl::access::mode::read_write,
+<<<<<<< HEAD
                      sycl::access::target::device>
 >>>>>>> 2058d1246 ([SYCL] Rename deprecated access::target::global_buffer (#647))
+=======
+                     sycl::target::device>
+>>>>>>> cc8ee1e0c ([SYCL] Use the sycl:: namespace instead of cl::sycl:: one (#749))
           acc3(buf3, cgh, sycl::range<1>(1));
       cgh.single_task<class acc_alloc_buf>([=]() {
         acc1 *= 2;
@@ -521,11 +539,15 @@ int main() {
         sycl::queue queue;
         queue.submit([&](sycl::handler &cgh) {
           sycl::accessor<int, 1, sycl::access::mode::write,
+<<<<<<< HEAD
 <<<<<<< HEAD
                          sycl::target::device>
 =======
                          sycl::access::target::device>
 >>>>>>> 2058d1246 ([SYCL] Rename deprecated access::target::global_buffer (#647))
+=======
+                         sycl::target::device>
+>>>>>>> cc8ee1e0c ([SYCL] Use the sycl:: namespace instead of cl::sycl:: one (#749))
               D(d, cgh);
           sycl::accessor<int, 1, sycl::access::mode::read,
                          sycl::target::constant_buffer>
@@ -554,12 +576,16 @@ int main() {
         sycl::buffer<int, 1> d(&data, sycl::range<1>(1));
         sycl::buffer<int, 1> c(&cnst, sycl::range<1>(1));
 
+<<<<<<< HEAD
 <<<<<<< 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::accessor<int, 1, sycl::access::mode::write, sycl::target::device,
+>>>>>>> cc8ee1e0c ([SYCL] Use the sycl:: namespace instead of cl::sycl:: one (#749))
                        sycl::access::placeholder::true_t>
             D(d);
         sycl::accessor<int, 1, sycl::access::mode::read,
@@ -597,11 +623,15 @@ int main() {
         sycl::queue queue;
         queue.submit([&](sycl::handler &cgh) {
           sycl::accessor<int, 1, sycl::access::mode::write,
+<<<<<<< HEAD
 <<<<<<< HEAD
                          sycl::target::device>
 =======
                          sycl::access::target::device>
 >>>>>>> 2058d1246 ([SYCL] Rename deprecated access::target::global_buffer (#647))
+=======
+                         sycl::target::device>
+>>>>>>> cc8ee1e0c ([SYCL] Use the sycl:: namespace instead of cl::sycl:: one (#749))
               AccA(A, cgh);
           sycl::accessor<int, 1, sycl::access::mode::read,
                          sycl::target::constant_buffer>
@@ -636,11 +666,15 @@ int main() {
         sycl::queue queue;
         queue.submit([&](sycl::handler &cgh) {
           sycl::accessor<int, 1, sycl::access::mode::read_write,
+<<<<<<< HEAD
 <<<<<<< HEAD
                          sycl::target::device>
 =======
                          sycl::access::target::device>
 >>>>>>> 2058d1246 ([SYCL] Rename deprecated access::target::global_buffer (#647))
+=======
+                         sycl::target::device>
+>>>>>>> cc8ee1e0c ([SYCL] Use the sycl:: namespace instead of cl::sycl:: one (#749))
               B(b, cgh);
           auto B1 = b1.template get_access<sycl::access::mode::read_write>(cgh);