From 225c6c033d3aaea49753877ed8a812538032ef0c Mon Sep 17 00:00:00 2001 From: IgorKharchikov <95442829+IgorKharchikov@users.noreply.github.com> Date: Fri, 14 Jan 2022 21:20:07 +0300 Subject: [PATCH 01/19] Updated image_accessor constructor Redefinition of default constructor image_accessor() (previously used "= default") to make it possible to use const references in parallel_for. --- sycl/include/CL/sycl/accessor.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sycl/include/CL/sycl/accessor.hpp b/sycl/include/CL/sycl/accessor.hpp index c94b281b6c342..cd0b69a2b457f 100644 --- a/sycl/include/CL/sycl/accessor.hpp +++ b/sycl/include/CL/sycl/accessor.hpp @@ -494,7 +494,7 @@ class image_accessor #ifdef __SYCL_DEVICE_ONLY__ // Default constructor for objects later initialized with __init member. - image_accessor() = default; + image_accessor() : MImageObj() {} #endif // Available only when: accessTarget == access::target::host_image From 667ce934904a4cbad9923a435f52ceec6d2ef202 Mon Sep 17 00:00:00 2001 From: IgorKharchikov <95442829+IgorKharchikov@users.noreply.github.com> Date: Fri, 14 Jan 2022 21:25:13 +0300 Subject: [PATCH 02/19] Added test for image_accessor const ref fix --- .../const_ref_image_accessor.cpp | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 sycl/test/check_device_code/const_ref_image_accessor.cpp diff --git a/sycl/test/check_device_code/const_ref_image_accessor.cpp b/sycl/test/check_device_code/const_ref_image_accessor.cpp new file mode 100644 index 0000000000000..5fe66fe89c240 --- /dev/null +++ b/sycl/test/check_device_code/const_ref_image_accessor.cpp @@ -0,0 +1,32 @@ +// RUN: %clangxx -I %sycl_include -S -emit-llvm -fsycl -fsycl-device-only %s -o - | FileCheck %s + +#include + +void func(sycl::handler &handler, const sycl::range<2> &range, + const sycl::accessor& src_accessor, + const sycl::accessor& dst_accessor) { + handler.parallel_for(range, [=](const sycl::item<2> item) { + const sycl::int2 coords{ item[1], item[0] }; + auto pixel = src_accessor.read(coords); + dst_accessor.write(coords, pixel); + }); +} +int main() { + const sycl::range<2> range{ 16, 16 }; + const std::size_t size{ range.size() }; + const sycl::float4 default_value{ 1.0f, 2.0f, 3.0f, 4.0f }; + const std::vector src_data(size, default_value); + sycl::image<2> src_image{ src_data.data(), + sycl::image_channel_order::rgba, + sycl::image_channel_type::fp32, + range }; + sycl::image<2> dst_image{ sycl::image_channel_order::rgba, sycl::image_channel_type::fp32, range }; + sycl::queue queue; + + queue.submit([&](sycl::handler& handler) { + const auto src_accessor = src_image.get_access(handler); + const auto dst_accessor = dst_image.get_access(handler); + func(handler, range, src_accessor, dst_accessor); + }); + return 0; +} From 0645ee6f593fdc6ae75ca6e8f09a9aa3a801e531 Mon Sep 17 00:00:00 2001 From: IgorKharchikov <95442829+IgorKharchikov@users.noreply.github.com> Date: Mon, 17 Jan 2022 19:09:04 +0300 Subject: [PATCH 03/19] Update const_ref_image_accessor.cpp Reduced ad hoc test file. --- .../const_ref_image_accessor.cpp | 48 +++++++++---------- 1 file changed, 22 insertions(+), 26 deletions(-) diff --git a/sycl/test/check_device_code/const_ref_image_accessor.cpp b/sycl/test/check_device_code/const_ref_image_accessor.cpp index 5fe66fe89c240..14dd780674c86 100644 --- a/sycl/test/check_device_code/const_ref_image_accessor.cpp +++ b/sycl/test/check_device_code/const_ref_image_accessor.cpp @@ -1,32 +1,28 @@ -// RUN: %clangxx -I %sycl_include -S -emit-llvm -fsycl -fsycl-device-only %s -o - | FileCheck %s +// RUN: %clangxx -S -fsycl -fsycl-device-only %s -o #include -void func(sycl::handler &handler, const sycl::range<2> &range, - const sycl::accessor& src_accessor, - const sycl::accessor& dst_accessor) { - handler.parallel_for(range, [=](const sycl::item<2> item) { - const sycl::int2 coords{ item[1], item[0] }; - auto pixel = src_accessor.read(coords); - dst_accessor.write(coords, pixel); - }); -} int main() { - const sycl::range<2> range{ 16, 16 }; - const std::size_t size{ range.size() }; - const sycl::float4 default_value{ 1.0f, 2.0f, 3.0f, 4.0f }; - const std::vector src_data(size, default_value); - sycl::image<2> src_image{ src_data.data(), - sycl::image_channel_order::rgba, - sycl::image_channel_type::fp32, - range }; - sycl::image<2> dst_image{ sycl::image_channel_order::rgba, sycl::image_channel_type::fp32, range }; - sycl::queue queue; + const sycl::range<2> range{16, 16}; + const std::size_t size{range.size()}; + const sycl::float4 default_value{1.0f, 2.0f, 3.0f, 4.0f}; + const std::vector src_data(size, default_value); + sycl::image<2> src_image{src_data.data(), sycl::image_channel_order::rgba, + sycl::image_channel_type::fp32, range}; + sycl::image<2> dst_image{sycl::image_channel_order::rgba, + sycl::image_channel_type::fp32, range}; + sycl::queue queue; - queue.submit([&](sycl::handler& handler) { - const auto src_accessor = src_image.get_access(handler); - const auto dst_accessor = dst_image.get_access(handler); - func(handler, range, src_accessor, dst_accessor); - }); - return 0; + queue.submit([&](sycl::handler &handler) { + const auto src_accessor = + src_image.get_access(handler); + const auto dst_accessor = + dst_image.get_access(handler); + handler.parallel_for(range, [=](const sycl::item<2> item) { + const sycl::int2 coords{item[1], item[0]}; + auto pixel = src_accessor.read(coords); + dst_accessor.write(coords, pixel); + }); + }); + return 0; } From a6eefc86d1a4ef8fbf0d11960155c7b137629f7c Mon Sep 17 00:00:00 2001 From: IgorKharchikov <95442829+IgorKharchikov@users.noreply.github.com> Date: Mon, 17 Jan 2022 19:35:05 +0300 Subject: [PATCH 04/19] Update const_ref_image_accessor.cpp Fixed typo --- sycl/test/check_device_code/const_ref_image_accessor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sycl/test/check_device_code/const_ref_image_accessor.cpp b/sycl/test/check_device_code/const_ref_image_accessor.cpp index 14dd780674c86..de17a07a973e3 100644 --- a/sycl/test/check_device_code/const_ref_image_accessor.cpp +++ b/sycl/test/check_device_code/const_ref_image_accessor.cpp @@ -1,4 +1,4 @@ -// RUN: %clangxx -S -fsycl -fsycl-device-only %s -o +// RUN: %clangxx -fsycl -fsycl-device-only -O0 -S -emit-llvm -x c++ %s -o - | FileCheck %s --check-prefix CHECK-O0 #include From f5641da1c83135d43619448ef255978453bda9c4 Mon Sep 17 00:00:00 2001 From: IgorKharchikov <95442829+IgorKharchikov@users.noreply.github.com> Date: Mon, 17 Jan 2022 19:53:10 +0300 Subject: [PATCH 05/19] Update const_ref_image_accessor.cpp Rewrite of RUN part. --- sycl/test/check_device_code/const_ref_image_accessor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sycl/test/check_device_code/const_ref_image_accessor.cpp b/sycl/test/check_device_code/const_ref_image_accessor.cpp index de17a07a973e3..8fd2461ec8c6c 100644 --- a/sycl/test/check_device_code/const_ref_image_accessor.cpp +++ b/sycl/test/check_device_code/const_ref_image_accessor.cpp @@ -1,4 +1,4 @@ -// RUN: %clangxx -fsycl -fsycl-device-only -O0 -S -emit-llvm -x c++ %s -o - | FileCheck %s --check-prefix CHECK-O0 +// RUN: %clangxx -S -fsycl -fsycl-device-only %s #include From b8f75093ad29c037615dc0ed705f2595c7061687 Mon Sep 17 00:00:00 2001 From: IgorKharchikov <95442829+IgorKharchikov@users.noreply.github.com> Date: Tue, 18 Jan 2022 04:11:23 +0300 Subject: [PATCH 06/19] [SYCL]Created regression test for ctz fix Created new test for fixed issue with mismatched namespace for ctz function. --- sycl/test/regression/ctz_namespace.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 sycl/test/regression/ctz_namespace.cpp diff --git a/sycl/test/regression/ctz_namespace.cpp b/sycl/test/regression/ctz_namespace.cpp new file mode 100644 index 0000000000000..4ec67eafbe7db --- /dev/null +++ b/sycl/test/regression/ctz_namespace.cpp @@ -0,0 +1,11 @@ +// RUN: %clangxx -S -fsycl -fsycl-device-only %s +#include + +int main() { + long long int a = -9223372034707292160ll; + auto b = sycl::ctz(a); + return 0; + // CHECK: _Z3ctzc + // CHECK: call spir_func i32 addrspace(1)* {{.*}}spirv_ocl_ctz{{.*}}(i32 + // addrspace(4)* +} From 0f546117a9a0dae6709408f9eee83d1fa4a9d7ef Mon Sep 17 00:00:00 2001 From: IgorKharchikov <95442829+IgorKharchikov@users.noreply.github.com> Date: Tue, 18 Jan 2022 04:13:06 +0300 Subject: [PATCH 07/19] Revert "[SYCL]Created regression test for ctz fix" --- sycl/test/regression/ctz_namespace.cpp | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 sycl/test/regression/ctz_namespace.cpp diff --git a/sycl/test/regression/ctz_namespace.cpp b/sycl/test/regression/ctz_namespace.cpp deleted file mode 100644 index 4ec67eafbe7db..0000000000000 --- a/sycl/test/regression/ctz_namespace.cpp +++ /dev/null @@ -1,11 +0,0 @@ -// RUN: %clangxx -S -fsycl -fsycl-device-only %s -#include - -int main() { - long long int a = -9223372034707292160ll; - auto b = sycl::ctz(a); - return 0; - // CHECK: _Z3ctzc - // CHECK: call spir_func i32 addrspace(1)* {{.*}}spirv_ocl_ctz{{.*}}(i32 - // addrspace(4)* -} From 7465d36cebec60a0c8acf21c15ba31add8f247b6 Mon Sep 17 00:00:00 2001 From: IgorKharchikov <95442829+IgorKharchikov@users.noreply.github.com> Date: Tue, 18 Jan 2022 16:43:26 +0300 Subject: [PATCH 08/19] Update const_ref_image_accessor.cpp Reduced test file so it contains only func() function, edited commented line for test running. --- .../const_ref_image_accessor.cpp | 31 +++++-------------- 1 file changed, 8 insertions(+), 23 deletions(-) diff --git a/sycl/test/check_device_code/const_ref_image_accessor.cpp b/sycl/test/check_device_code/const_ref_image_accessor.cpp index 8fd2461ec8c6c..77c3ca658bf34 100644 --- a/sycl/test/check_device_code/const_ref_image_accessor.cpp +++ b/sycl/test/check_device_code/const_ref_image_accessor.cpp @@ -1,28 +1,13 @@ -// RUN: %clangxx -S -fsycl -fsycl-device-only %s +// RUN: %clangxx -fsycl -fsycl-device-only %s -o /dev/null #include -int main() { - const sycl::range<2> range{16, 16}; - const std::size_t size{range.size()}; - const sycl::float4 default_value{1.0f, 2.0f, 3.0f, 4.0f}; - const std::vector src_data(size, default_value); - sycl::image<2> src_image{src_data.data(), sycl::image_channel_order::rgba, - sycl::image_channel_type::fp32, range}; - sycl::image<2> dst_image{sycl::image_channel_order::rgba, - sycl::image_channel_type::fp32, range}; - sycl::queue queue; - - queue.submit([&](sycl::handler &handler) { - const auto src_accessor = - src_image.get_access(handler); - const auto dst_accessor = - dst_image.get_access(handler); - handler.parallel_for(range, [=](const sycl::item<2> item) { - const sycl::int2 coords{item[1], item[0]}; - auto pixel = src_accessor.read(coords); - dst_accessor.write(coords, pixel); - }); +SYCL_EXTERNAL void +func(sycl::handler &handler, const sycl::range<2> &range, + const sycl::accessor &dummy_accessor, + handler.parallel_for(range, [=](const sycl::item<2> item) { + const sycl::int2 coords{item[1], item[0]}; + auto pixel = dummy_accessor.read(coords); }); - return 0; } From 9b4be53475bd234a62a9dcaf0517bbd1340250ab Mon Sep 17 00:00:00 2001 From: IgorKharchikov <95442829+IgorKharchikov@users.noreply.github.com> Date: Tue, 18 Jan 2022 17:10:29 +0300 Subject: [PATCH 09/19] Update const_ref_image_accessor.cpp Edited commented line for testing, corrected typos in code. --- .../check_device_code/const_ref_image_accessor.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/sycl/test/check_device_code/const_ref_image_accessor.cpp b/sycl/test/check_device_code/const_ref_image_accessor.cpp index 77c3ca658bf34..46aaa55ca05d3 100644 --- a/sycl/test/check_device_code/const_ref_image_accessor.cpp +++ b/sycl/test/check_device_code/const_ref_image_accessor.cpp @@ -1,13 +1,15 @@ -// RUN: %clangxx -fsycl -fsycl-device-only %s -o /dev/null +// RUN: %clangxx -fsycl -fsycl-device-only -fsyntax-only -Xclang -verify -Xclang -verify-ignore-unexpected=note,warning %s -#include +// expected-no-diagnostics + +#include SYCL_EXTERNAL void func(sycl::handler &handler, const sycl::range<2> &range, const sycl::accessor &dummy_accessor, + sycl::access::target::image> &dummy_accessor) { handler.parallel_for(range, [=](const sycl::item<2> item) { - const sycl::int2 coords{item[1], item[0]}; - auto pixel = dummy_accessor.read(coords); + const sycl::int2 coords{item[1], item[0]}; + auto pixel = dummy_accessor.read(coords); }); } From 333ea45f174622ff02d9fcfcb8f784ffe2643399 Mon Sep 17 00:00:00 2001 From: IgorKharchikov <95442829+IgorKharchikov@users.noreply.github.com> Date: Mon, 24 Jan 2022 14:36:22 +0300 Subject: [PATCH 10/19] Update const_ref_image_accessor.cpp Removed SYCL_EXTERNAL attribute due to it's unnecessity in this test (parallel_for is used here). --- sycl/test/check_device_code/const_ref_image_accessor.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sycl/test/check_device_code/const_ref_image_accessor.cpp b/sycl/test/check_device_code/const_ref_image_accessor.cpp index 46aaa55ca05d3..c24b754aabe97 100644 --- a/sycl/test/check_device_code/const_ref_image_accessor.cpp +++ b/sycl/test/check_device_code/const_ref_image_accessor.cpp @@ -4,10 +4,9 @@ #include -SYCL_EXTERNAL void -func(sycl::handler &handler, const sycl::range<2> &range, - const sycl::accessor &dummy_accessor) { +void func(sycl::handler &handler, const sycl::range<2> &range, + const sycl::accessor &dummy_accessor) { handler.parallel_for(range, [=](const sycl::item<2> item) { const sycl::int2 coords{item[1], item[0]}; auto pixel = dummy_accessor.read(coords); From e65067677d929f7bc6441e65f4526d0e6a26d3ec Mon Sep 17 00:00:00 2001 From: IgorKharchikov <95442829+IgorKharchikov@users.noreply.github.com> Date: Tue, 25 Jan 2022 17:13:44 +0300 Subject: [PATCH 11/19] Update const_ref_image_accessor.cpp --- .../check_device_code/const_ref_image_accessor.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/sycl/test/check_device_code/const_ref_image_accessor.cpp b/sycl/test/check_device_code/const_ref_image_accessor.cpp index c24b754aabe97..924d75b2b784e 100644 --- a/sycl/test/check_device_code/const_ref_image_accessor.cpp +++ b/sycl/test/check_device_code/const_ref_image_accessor.cpp @@ -4,11 +4,9 @@ #include -void func(sycl::handler &handler, const sycl::range<2> &range, - const sycl::accessor &dummy_accessor) { - handler.parallel_for(range, [=](const sycl::item<2> item) { - const sycl::int2 coords{item[1], item[0]}; - auto pixel = dummy_accessor.read(coords); - }); +SYCL_EXTERNAL void +func(const sycl::accessor &dummy_accessor) { + const sycl::int2 coords{0, 0}; + auto pixel = dummy_accessor.read(coords); } From 92a181c26065179ee3f8cd5b5de05a65a88e13f8 Mon Sep 17 00:00:00 2001 From: IgorKharchikov <95442829+IgorKharchikov@users.noreply.github.com> Date: Tue, 25 Jan 2022 20:35:55 +0300 Subject: [PATCH 12/19] Update sycl/test/check_device_code/const_ref_image_accessor.cpp Co-authored-by: Alexey Bader --- sycl/test/check_device_code/const_ref_image_accessor.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/sycl/test/check_device_code/const_ref_image_accessor.cpp b/sycl/test/check_device_code/const_ref_image_accessor.cpp index 924d75b2b784e..c117dca7e1253 100644 --- a/sycl/test/check_device_code/const_ref_image_accessor.cpp +++ b/sycl/test/check_device_code/const_ref_image_accessor.cpp @@ -4,9 +4,8 @@ #include -SYCL_EXTERNAL void -func(const sycl::accessor &dummy_accessor) { - const sycl::int2 coords{0, 0}; - auto pixel = dummy_accessor.read(coords); +SYCL_EXTERNAL void func() { + const sycl::accessor + x; } From a8c14923d585fe83e3f1f1b7331aae0f951ff6e4 Mon Sep 17 00:00:00 2001 From: IgorKharchikov <95442829+IgorKharchikov@users.noreply.github.com> Date: Tue, 1 Feb 2022 02:26:38 +0300 Subject: [PATCH 13/19] Update atomic.hpp cl::sycl::atomic was marked as deprecated to meet new SYCL standart. --- sycl/include/CL/sycl/atomic.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sycl/include/CL/sycl/atomic.hpp b/sycl/include/CL/sycl/atomic.hpp index 8c6a3ed10101f..944a648bcbe6c 100644 --- a/sycl/include/CL/sycl/atomic.hpp +++ b/sycl/include/CL/sycl/atomic.hpp @@ -168,7 +168,8 @@ namespace sycl { template -class atomic { +class __SYCL2020_DEPRECATED( + "sycl::atomic is deprecated since SYCL 2020") atomic { friend class atomic; static_assert(detail::IsValidAtomicType::value, "Invalid SYCL atomic type. Valid types are: int, " From b0647433e528d29b20e12c895db27c32436a04e6 Mon Sep 17 00:00:00 2001 From: IgorKharchikov <95442829+IgorKharchikov@users.noreply.github.com> Date: Tue, 1 Feb 2022 02:27:44 +0300 Subject: [PATCH 14/19] Create atomic_deprecated.cpp --- sycl/test/regression/atomic_deprecated.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 sycl/test/regression/atomic_deprecated.cpp diff --git a/sycl/test/regression/atomic_deprecated.cpp b/sycl/test/regression/atomic_deprecated.cpp new file mode 100644 index 0000000000000..f836d0ad9cb4b --- /dev/null +++ b/sycl/test/regression/atomic_deprecated.cpp @@ -0,0 +1,10 @@ +// RUN: %clangxx %fsycl-host-only -fsyntax-only -Xclang -verify -Xclang -verify-ignore-unexpected=note %s + +#include +int main() { + cl::sycl::multi_ptr a( + nullptr); + // expected-warning@+1 {{'atomic' is deprecated: sycl::atomic is deprecated since SYCL 2020}} + cl::sycl::atomic b(a); + return 0; +} From 2d73f271e44e962ec5bab260b5e8195d2bb789a9 Mon Sep 17 00:00:00 2001 From: IgorKharchikov <95442829+IgorKharchikov@users.noreply.github.com> Date: Tue, 1 Feb 2022 11:43:28 +0300 Subject: [PATCH 15/19] Update sycl_2020_deprecations.cpp --- sycl/test/warnings/sycl_2020_deprecations.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sycl/test/warnings/sycl_2020_deprecations.cpp b/sycl/test/warnings/sycl_2020_deprecations.cpp index 3518540b93378..86f20db3ad232 100644 --- a/sycl/test/warnings/sycl_2020_deprecations.cpp +++ b/sycl/test/warnings/sycl_2020_deprecations.cpp @@ -177,5 +177,10 @@ int main() { // expected-warning@+1{{'barrier' is deprecated: use 'ext_oneapi_barrier' instead}} Queue.submit([&](sycl::handler &CGH) { CGH.barrier(); }); + cl::sycl::multi_ptr a( + nullptr); + // expected-warning@+1 {{'atomic' is deprecated: sycl::atomic is deprecated since SYCL 2020}} + cl::sycl::atomic b(a); + return 0; } From 5aeef52585fe0421885818f36e36669d17f689d0 Mon Sep 17 00:00:00 2001 From: IgorKharchikov <95442829+IgorKharchikov@users.noreply.github.com> Date: Tue, 1 Feb 2022 11:43:50 +0300 Subject: [PATCH 16/19] Delete atomic_deprecated.cpp --- sycl/test/regression/atomic_deprecated.cpp | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 sycl/test/regression/atomic_deprecated.cpp diff --git a/sycl/test/regression/atomic_deprecated.cpp b/sycl/test/regression/atomic_deprecated.cpp deleted file mode 100644 index f836d0ad9cb4b..0000000000000 --- a/sycl/test/regression/atomic_deprecated.cpp +++ /dev/null @@ -1,10 +0,0 @@ -// RUN: %clangxx %fsycl-host-only -fsyntax-only -Xclang -verify -Xclang -verify-ignore-unexpected=note %s - -#include -int main() { - cl::sycl::multi_ptr a( - nullptr); - // expected-warning@+1 {{'atomic' is deprecated: sycl::atomic is deprecated since SYCL 2020}} - cl::sycl::atomic b(a); - return 0; -} From 74acc3986ded38b8821ef8ae3e9a553311edbf68 Mon Sep 17 00:00:00 2001 From: IgorKharchikov <95442829+IgorKharchikov@users.noreply.github.com> Date: Tue, 1 Feb 2022 11:54:27 +0300 Subject: [PATCH 17/19] Update sycl_2020_deprecations.cpp --- sycl/test/warnings/sycl_2020_deprecations.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sycl/test/warnings/sycl_2020_deprecations.cpp b/sycl/test/warnings/sycl_2020_deprecations.cpp index 86f20db3ad232..347fb0c255936 100644 --- a/sycl/test/warnings/sycl_2020_deprecations.cpp +++ b/sycl/test/warnings/sycl_2020_deprecations.cpp @@ -176,7 +176,7 @@ int main() { // expected-warning@+1{{'barrier' is deprecated: use 'ext_oneapi_barrier' instead}} Queue.submit([&](sycl::handler &CGH) { CGH.barrier(); }); - + cl::sycl::multi_ptr a( nullptr); // expected-warning@+1 {{'atomic' is deprecated: sycl::atomic is deprecated since SYCL 2020}} From af9ba6565c45aa0d14e0ec223f22395f2c9d0683 Mon Sep 17 00:00:00 2001 From: IgorKharchikov <95442829+IgorKharchikov@users.noreply.github.com> Date: Tue, 1 Feb 2022 12:36:27 +0300 Subject: [PATCH 18/19] Update sycl_2020_deprecations.cpp --- sycl/test/warnings/sycl_2020_deprecations.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sycl/test/warnings/sycl_2020_deprecations.cpp b/sycl/test/warnings/sycl_2020_deprecations.cpp index 347fb0c255936..028f1f34a285f 100644 --- a/sycl/test/warnings/sycl_2020_deprecations.cpp +++ b/sycl/test/warnings/sycl_2020_deprecations.cpp @@ -179,7 +179,7 @@ int main() { cl::sycl::multi_ptr a( nullptr); - // expected-warning@+1 {{'atomic' is deprecated: sycl::atomic is deprecated since SYCL 2020}} + // expected-warning@+1 {{'atomic' is deprecated: sycl::atomic is deprecated since SYCL 2020}} cl::sycl::atomic b(a); return 0; From d0a07a653acbc5e6709addf67d5af76cd18a6780 Mon Sep 17 00:00:00 2001 From: IgorKharchikov <95442829+IgorKharchikov@users.noreply.github.com> Date: Thu, 3 Feb 2022 11:01:37 +0300 Subject: [PATCH 19/19] Update sycl_2020_deprecations.cpp --- sycl/test/warnings/sycl_2020_deprecations.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/sycl/test/warnings/sycl_2020_deprecations.cpp b/sycl/test/warnings/sycl_2020_deprecations.cpp index 028f1f34a285f..745406f02ebf0 100644 --- a/sycl/test/warnings/sycl_2020_deprecations.cpp +++ b/sycl/test/warnings/sycl_2020_deprecations.cpp @@ -1,7 +1,4 @@ // RUN: %clangxx %fsycl-host-only -fsyntax-only -sycl-std=2020 -Xclang -verify -Xclang -verify-ignore-unexpected=note %s -o %t.out -// RUN: %clangxx %fsycl-host-only -fsyntax-only -Xclang -verify -Xclang -verify-ignore-unexpected=note %s -o %t.out -// RUN: %clangxx %fsycl-host-only -fsyntax-only -sycl-std=2017 -Xclang -verify -Xclang -verify-ignore-unexpected=note %s -o %t.out -// RUN: %clangxx %fsycl-host-only -fsyntax-only -sycl-std=1.2.1 -Xclang -verify -Xclang -verify-ignore-unexpected=note %s -o %t.out #include #include