[SYCL] Changed noinit to no_init according to the final published SYCL 2020 spec. (#3718)

Author: pkeir

sycl/doc/extensions/accessor_properties/SYCL_ONEAPI_accessor_properties.asciidoc

@@ -72,10 +72,10 @@ Here are some examples of legal and illegal conversions:
 
 ```c++
 accessor A2(B, h, accessor_property_list{no_alias});
-accessor A3(B, h, accessor_property_list{no_alias, noinit});
+accessor A3(B, h, accessor_property_list{no_alias, no_init});
 accessor A4(B, h, accessor_property_list{no_alias, no_offset});
 accessor A5(B, h, accessor_property_list{no_offset, no_alias});
-A2 = A3; // Legal because noinit is a runtime property and A2 and A3 otherwise have the same properties
+A2 = A3; // Legal because no_init is a runtime property and A2 and A3 otherwise have the same properties
 A3 = A2; // Legal for the same reasons as the previous line
 A2 = A4; // Illegal as A2 doesn't have the compile-time-constant property no_offset
 A5 = A4; // Legal as the order of properties doesn't matter
@@ -473,7 +473,7 @@ Rewrite Table 4.50: Properties supported by the SYCL accessor class as follows,
 [options="header"]
 |====
 | Property | Description | Compile-time Constant
-| sycl::property::noinit | The noinit property notifies the SYCL runtime that previous contents of a buffer can be discarded. Replaces deprecated discard_write and discard_read_write access modes. | No
+| sycl::property::no_init | The no_init property notifies the SYCL runtime that previous contents of a buffer can be discarded. Replaces deprecated discard_write and discard_read_write access modes. | No
 | ONEAPI::property::no_offset | The no_offset property notifies the SYCL device compiler that the accessor will never contain an offset.  This may enable the compiler to make assumptions about the alignment of the accessor that it couldn't make otherwise. | Yes
 | ONEAPI::property::no_alias | The no_alias property notifies the SYCL device compiler that all modifications to the memory locations accessed (directly or indirectly) by this accessor, that occur during kernel execution, will be done through this accessor (directly or indirectly) and no other accessor or USM pointer in the kernel.  This is an unchecked assertion by the programmer and results in undefined behaviour if it is violated.  | Yes
 |====

sycl/include/CL/sycl/accessor.hpp

@@ -838,7 +838,8 @@ class accessor :
   static access::mode getAdjustedMode(const PropertyListT &PropertyList) {
     access::mode AdjustedMode = AccessMode;
 
-    if (PropertyList.template has_property<property::noinit>()) {
+    if (PropertyList.template has_property<property::no_init>() ||
+        PropertyList.template has_property<property::noinit>()) {
       if (AdjustedMode == access::mode::write) {
         AdjustedMode = access::mode::discard_write;
       } else if (AdjustedMode == access::mode::read_write) {

sycl/include/CL/sycl/detail/accessor_impl.hpp

@@ -214,7 +214,7 @@ void __SYCL_EXPORT addHostAccessorAndWait(Requirement *Req);
 template <typename MayBeTag1, typename MayBeTag2>
 constexpr access::mode deduceAccessMode() {
   // property_list = {} is not properly detected by deduction guide,
-  // when parameter is passed without curly braces: access(buffer, noinit)
+  // when parameter is passed without curly braces: access(buffer, no_init)
   // thus simplest approach is to check 2 last arguments for being a tag
   if constexpr (std::is_same<MayBeTag1,
                              mode_tag_t<access::mode::read>>::value ||

sycl/include/CL/sycl/detail/properties_traits.def

@@ -6,6 +6,7 @@ __SYCL_PARAM_TRAITS_SPEC(sycl::property::image::use_mutex)
 __SYCL_PARAM_TRAITS_SPEC(sycl::property::image::context_bound)
 __SYCL_PARAM_TRAITS_SPEC(sycl::ext::oneapi::property::buffer::use_pinned_host_memory)
 __SYCL_PARAM_TRAITS_SPEC(sycl::property::noinit)
+__SYCL_PARAM_TRAITS_SPEC(sycl::property::no_init)
 __SYCL_PARAM_TRAITS_SPEC(sycl::property::context::cuda::use_primary_context)
 __SYCL_PARAM_TRAITS_SPEC(sycl::property::queue::in_order)
 __SYCL_PARAM_TRAITS_SPEC(sycl::property::reduction::initialize_to_identity)

sycl/include/CL/sycl/properties/accessor_properties.hpp

@@ -17,19 +17,28 @@ __SYCL_INLINE_NAMESPACE(cl) {
 namespace sycl {
 namespace property {
 
-class noinit : public detail::DataLessProperty<detail::NoInit> {};
+class no_init : public detail::DataLessProperty<detail::NoInit> {};
+
+class __SYCL2020_DEPRECATED("spelling is now: no_init") noinit
+    : public detail::DataLessProperty<detail::NoInit> {};
 
 } // namespace property
 
 #if __cplusplus > 201402L
 
-inline constexpr property::noinit noinit;
+__SYCL_INLINE_CONSTEXPR property::no_init no_init;
+
+__SYCL_INLINE_CONSTEXPR property::noinit
+    __SYCL2020_DEPRECATED("spelling is now: no_init") noinit;
 
 #else
 
 namespace {
 
-constexpr const auto &noinit =
+constexpr const auto &no_init =
+    sycl::detail::InlineVariableHelper<property::no_init>::value;
+
+constexpr const auto &noinit __SYCL2020_DEPRECATED("spelling is now: no_init") =
     sycl::detail::InlineVariableHelper<property::noinit>::value;
 }
 

sycl/test/abi/sycl_symbols_linux.dump

@@ -4143,6 +4143,7 @@ _ZNK2cl4sycl7context12get_propertyINS0_8property6buffer13context_boundEEET_v
 _ZNK2cl4sycl7context12get_propertyINS0_8property6buffer9use_mutexEEET_v
 _ZNK2cl4sycl7context12get_propertyINS0_8property6noinitEEET_v
 _ZNK2cl4sycl7context12get_propertyINS0_8property7context4cuda19use_primary_contextEEET_v
+_ZNK2cl4sycl7context12get_propertyINS0_8property7no_initEEET_v
 _ZNK2cl4sycl7context12get_propertyINS0_8property9reduction22initialize_to_identityEEET_v
 _ZNK2cl4sycl7context12has_propertyINS0_3ext6oneapi8property6buffer22use_pinned_host_memoryEEEbv
 _ZNK2cl4sycl7context12has_propertyINS0_8property5image12use_host_ptrEEEbv
@@ -4154,6 +4155,7 @@ _ZNK2cl4sycl7context12has_propertyINS0_8property6buffer13context_boundEEEbv
 _ZNK2cl4sycl7context12has_propertyINS0_8property6buffer9use_mutexEEEbv
 _ZNK2cl4sycl7context12has_propertyINS0_8property6noinitEEEbv
 _ZNK2cl4sycl7context12has_propertyINS0_8property7context4cuda19use_primary_contextEEEbv
+_ZNK2cl4sycl7context12has_propertyINS0_8property7no_initEEEbv
 _ZNK2cl4sycl7context12has_propertyINS0_8property9reduction22initialize_to_identityEEEbv
 _ZNK2cl4sycl7context3getEv
 _ZNK2cl4sycl7context7is_hostEv
@@ -4180,6 +4182,7 @@ _ZNK2cl4sycl7program12get_propertyINS0_8property6buffer13context_boundEEET_v
 _ZNK2cl4sycl7program12get_propertyINS0_8property6buffer9use_mutexEEET_v
 _ZNK2cl4sycl7program12get_propertyINS0_8property6noinitEEET_v
 _ZNK2cl4sycl7program12get_propertyINS0_8property7context4cuda19use_primary_contextEEET_v
+_ZNK2cl4sycl7program12get_propertyINS0_8property7no_initEEET_v
 _ZNK2cl4sycl7program12get_propertyINS0_8property9reduction22initialize_to_identityEEET_v
 _ZNK2cl4sycl7program12has_propertyINS0_3ext6oneapi8property6buffer22use_pinned_host_memoryEEEbv
 _ZNK2cl4sycl7program12has_propertyINS0_8property5image12use_host_ptrEEEbv
@@ -4191,6 +4194,7 @@ _ZNK2cl4sycl7program12has_propertyINS0_8property6buffer13context_boundEEEbv
 _ZNK2cl4sycl7program12has_propertyINS0_8property6buffer9use_mutexEEEbv
 _ZNK2cl4sycl7program12has_propertyINS0_8property6noinitEEEbv
 _ZNK2cl4sycl7program12has_propertyINS0_8property7context4cuda19use_primary_contextEEEbv
+_ZNK2cl4sycl7program12has_propertyINS0_8property7no_initEEEbv
 _ZNK2cl4sycl7program12has_propertyINS0_8property9reduction22initialize_to_identityEEEbv
 _ZNK2cl4sycl7program16get_link_optionsB5cxx11Ev
 _ZNK2cl4sycl7program17get_build_optionsB5cxx11Ev
@@ -4212,6 +4216,7 @@ _ZNK2cl4sycl7sampler12get_propertyINS0_8property6buffer13context_boundEEET_v
 _ZNK2cl4sycl7sampler12get_propertyINS0_8property6buffer9use_mutexEEET_v
 _ZNK2cl4sycl7sampler12get_propertyINS0_8property6noinitEEET_v
 _ZNK2cl4sycl7sampler12get_propertyINS0_8property7context4cuda19use_primary_contextEEET_v
+_ZNK2cl4sycl7sampler12get_propertyINS0_8property7no_initEEET_v
 _ZNK2cl4sycl7sampler12get_propertyINS0_8property9reduction22initialize_to_identityEEET_v
 _ZNK2cl4sycl7sampler12has_propertyINS0_3ext6oneapi8property6buffer22use_pinned_host_memoryEEEbv
 _ZNK2cl4sycl7sampler12has_propertyINS0_8property5image12use_host_ptrEEEbv
@@ -4223,6 +4228,7 @@ _ZNK2cl4sycl7sampler12has_propertyINS0_8property6buffer13context_boundEEEbv
 _ZNK2cl4sycl7sampler12has_propertyINS0_8property6buffer9use_mutexEEEbv
 _ZNK2cl4sycl7sampler12has_propertyINS0_8property6noinitEEEbv
 _ZNK2cl4sycl7sampler12has_propertyINS0_8property7context4cuda19use_primary_contextEEEbv
+_ZNK2cl4sycl7sampler12has_propertyINS0_8property7no_initEEEbv
 _ZNK2cl4sycl7sampler12has_propertyINS0_8property9reduction22initialize_to_identityEEEbv
 _ZNK2cl4sycl7sampler18get_filtering_modeEv
 _ZNK2cl4sycl7sampler19get_addressing_modeEv

sycl/test/basic_tests/accessor/accessor_property_list_ct.cpp

@@ -45,7 +45,7 @@ int main() {
 
   {
     // Property list copy
-    accessor_property_list PL{no_alias, sycl::noinit};
+    accessor_property_list PL{no_alias, sycl::no_init};
 
     accessor_property_list PL_1{PL};
     static_assert(PL_1.has_property<property::no_alias>(),
@@ -108,7 +108,7 @@ int main() {
     sycl::buffer<int, 1> buf_data(data, sycl::range<1>(1),
                                   {sycl::property::buffer::use_host_ptr()});
 
-    accessor_property_list PL{sycl::noinit, no_alias};
+    accessor_property_list PL{sycl::no_init, no_alias};
     sycl::accessor acc_1(buf_data, PL);
     sycl::accessor<int, 1, sycl::access::mode::read_write,
                    sycl::access::target::global_buffer,

sycl/test/basic_tests/accessor/accessor_property_list_rt.cpp

@@ -8,13 +8,27 @@
 using namespace sycl::ONEAPI;
 
 int main() {
+  {
+    // Single RT property
+    accessor_property_list PL{sycl::no_init};
+    static_assert(!PL.has_property<property::no_offset>(), "Property is found");
+    assert(PL.has_property<sycl::property::no_init>() && "Property not found");
+  }
+
   {
     // Single RT property
     accessor_property_list PL{sycl::noinit};
     static_assert(!PL.has_property<property::no_offset>(), "Property is found");
     assert(PL.has_property<sycl::property::noinit>() && "Property not found");
   }
 
+  {
+    // Compile time and runtime properties
+    accessor_property_list PL{sycl::no_init, no_alias};
+    assert(PL.has_property<property::no_alias>() && "Property not found");
+    assert(PL.has_property<sycl::property::no_init>() && "Property not found");
+  }
+
   {
     // Compile time and runtime properties
     accessor_property_list PL{sycl::noinit, no_alias};