Merge pull request #1751 from hdelan/deprecated-header

[NFC] Use sycl/sycl.hpp instead of CL/sycl.hpp

Author: kbenzie

test/conformance/device_code/cpy_and_mult.cpp

@@ -3,24 +3,24 @@
 // See LICENSE.TXT
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include <CL/sycl.hpp>
+#include <sycl/sycl.hpp>
 
 int main() {
     size_t array_size = 16;
-    cl::sycl::queue sycl_queue;
+    sycl::queue sycl_queue;
     std::vector<uint32_t> src(array_size, 1);
     std::vector<uint32_t> dst(array_size, 1);
     auto src_buff =
-        cl::sycl::buffer<uint32_t>(src.data(), cl::sycl::range<1>(array_size));
+        sycl::buffer<uint32_t>(src.data(), sycl::range<1>(array_size));
     auto dst_buff =
-        cl::sycl::buffer<uint32_t>(dst.data(), cl::sycl::range<1>(array_size));
+        sycl::buffer<uint32_t>(dst.data(), sycl::range<1>(array_size));
 
-    sycl_queue.submit([&](cl::sycl::handler &cgh) {
-        auto src_acc = src_buff.get_access<cl::sycl::access::mode::read>(cgh);
-        auto dst_acc = dst_buff.get_access<cl::sycl::access::mode::write>(cgh);
+    sycl_queue.submit([&](sycl::handler &cgh) {
+        auto src_acc = src_buff.get_access<sycl::access::mode::read>(cgh);
+        auto dst_acc = dst_buff.get_access<sycl::access::mode::write>(cgh);
         cgh.parallel_for<class cpy_and_mult>(
-            cl::sycl::range<1>{array_size},
-            [src_acc, dst_acc](cl::sycl::item<1> itemId) {
+            sycl::range<1>{array_size},
+            [src_acc, dst_acc](sycl::item<1> itemId) {
                 auto id = itemId.get_id(0);
                 dst_acc[id] = src_acc[id] * 2;
             });

test/conformance/device_code/cpy_and_mult_usm.cpp

@@ -3,17 +3,16 @@
 // See LICENSE.TXT
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include <CL/sycl.hpp>
+#include <sycl/sycl.hpp>
 
 int main() {
     size_t array_size = 16;
-    cl::sycl::queue sycl_queue;
-    uint32_t *src = cl::sycl::malloc_device<uint32_t>(array_size, sycl_queue);
-    uint32_t *dst = cl::sycl::malloc_device<uint32_t>(array_size, sycl_queue);
-    sycl_queue.submit([&](cl::sycl::handler &cgh) {
+    sycl::queue sycl_queue;
+    uint32_t *src = sycl::malloc_device<uint32_t>(array_size, sycl_queue);
+    uint32_t *dst = sycl::malloc_device<uint32_t>(array_size, sycl_queue);
+    sycl_queue.submit([&](sycl::handler &cgh) {
         cgh.parallel_for<class cpy_and_mult_usm>(
-            cl::sycl::range<1>{array_size},
-            [src, dst](cl::sycl::item<1> itemId) {
+            sycl::range<1>{array_size}, [src, dst](sycl::item<1> itemId) {
                 auto id = itemId.get_id(0);
                 dst[id] = src[id] * 2;
             });