From b393ab61cbbad38aa1078d83076e85d8c2147a6c Mon Sep 17 00:00:00 2001 From: "Larsen, Steffen" Date: Fri, 16 Aug 2024 00:46:32 -0700 Subject: [PATCH 1/3] Undeprecate legacy multi_ptr The legacy decoration for multi_ptr has been made the default template argument of the decoration in multi_ptr to bridge the gap between SYCL 1.2.1 and SYCL 2020 multi_ptr interfaces. However, the legacy decoration and the specialization of multi_ptr with the decoration is deprecated with SYCL 2020. This is confusing to users as they may easily run into deprecation warnings simply due to not specifying the decoration. This commit proposes that we remove the deprecation of legacy in SYCL 2020. Signed-off-by: Larsen, Steffen --- adoc/chapters/programming_interface.adoc | 1 - adoc/headers/multipointer.h | 2 +- adoc/headers/multipointerlegacy.h | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/adoc/chapters/programming_interface.adoc b/adoc/chapters/programming_interface.adoc index aaa0c8e0..61792b79 100644 --- a/adoc/chapters/programming_interface.adoc +++ b/adoc/chapters/programming_interface.adoc @@ -9138,7 +9138,6 @@ For interoperability with the <>, users should rely on types exposed by the decorated version. If the value of [code]#access::decorated# is [code]#access::decorated::legacy#, the 1.2.1 interface is exposed. -This interface is deprecated. The template traits [code]#remove_decoration# and type alias [code]#remove_decoration_t# retrieve the non-decorated pointer or reference from diff --git a/adoc/headers/multipointer.h b/adoc/headers/multipointer.h index c9e727b8..32cb6aac 100644 --- a/adoc/headers/multipointer.h +++ b/adoc/headers/multipointer.h @@ -15,7 +15,7 @@ enum class address_space : /* unspecified */ { enum class decorated : /* unspecified */ { no, yes, - legacy // Deprecated in SYCL 2020 + legacy }; } // namespace access diff --git a/adoc/headers/multipointerlegacy.h b/adoc/headers/multipointerlegacy.h index f413cad0..0d510730 100644 --- a/adoc/headers/multipointerlegacy.h +++ b/adoc/headers/multipointerlegacy.h @@ -4,7 +4,6 @@ namespace sycl { // Legacy interface, inherited from 1.2.1. -// Deprecated. template class [[deprecated]] multi_ptr { public: @@ -162,7 +161,6 @@ class [[deprecated]] multi_ptr { }; // Legacy interface, inherited from 1.2.1. -// Deprecated. // Specialization of multi_ptr for void and const void // VoidType can be either void or const void template From f495a777842e9f21d5b2f718be65d1fcbb2e0975 Mon Sep 17 00:00:00 2001 From: "Larsen, Steffen" Date: Thu, 29 Aug 2024 02:57:35 -0700 Subject: [PATCH 2/3] Remove alias deprecation note Signed-off-by: Larsen, Steffen --- adoc/chapters/programming_interface.adoc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/adoc/chapters/programming_interface.adoc b/adoc/chapters/programming_interface.adoc index 61792b79..e95b3cb7 100644 --- a/adoc/chapters/programming_interface.adoc +++ b/adoc/chapters/programming_interface.adoc @@ -9846,10 +9846,6 @@ below. include::{header_dir}/pointer.h[lines=4..-1] ---- -Note that using [code]#global_ptr#, [code]#local_ptr#, [code]#constant_ptr# or -[code]#private_ptr# without specifying the decoration is deprecated. -The default argument is provided for compatibility with 1.2.1. - [[subsec:samplers]] === Image samplers From 83732050907f3726caa784188d3d0dac846cf96e Mon Sep 17 00:00:00 2001 From: "Larsen, Steffen" Date: Tue, 10 Sep 2024 09:23:23 -0700 Subject: [PATCH 3/3] Remove deprecation entry in changelog Signed-off-by: Larsen, Steffen --- adoc/chapters/what_changed.adoc | 1 - 1 file changed, 1 deletion(-) diff --git a/adoc/chapters/what_changed.adoc b/adoc/chapters/what_changed.adoc index 5085b0d3..bb96a207 100644 --- a/adoc/chapters/what_changed.adoc +++ b/adoc/chapters/what_changed.adoc @@ -381,7 +381,6 @@ Changes in [code]#multi_ptr# interface: Returned pointer and reference are not annotated by an address space; ** interface exposing decorated types. Returned pointer and reference are annotated by an address space; - ** legacy 1.2.1 interface (deprecated). * deprecation of the 1.2.1 interface; * deprecation of [code]#constant_ptr#; * [code]#global_ptr#, [code]#local_ptr# and [code]#private_ptr# alias take the