Move properties argument and fix editorial issues

Signed-off-by: Larsen, Steffen <[email protected]>

Author: steffenlarsen

sycl/doc/extensions/experimental/sycl_ext_oneapi_enqueue_functions.asciidoc

@@ -230,8 +230,11 @@ a!
 ----
 namespace sycl::ext::oneapi::experimental {
 
-template <typename CommandGroupFunc, typename Properties = empty_properties_t>
-void submit(sycl::queue q, CommandGroupFunc&& cgf, Properties properties = {});
+template <typename CommandGroupFunc>
+void submit(sycl::queue q, CommandGroupFunc&& cgf);
+
+template <typename CommandGroupFunc, typename Properties>
+void submit(sycl::queue q, Properties properties, CommandGroupFunc&& cgf);
 
 }
 ----
@@ -247,9 +250,12 @@ a!
 ----
 namespace sycl::ext::oneapi::experimental {
 
-template <typename CommandGroupFunc, typename Properties = empty_properties_t>
-sycl::event submit_with_event(sycl::queue q, CommandGroupFunc&& cgf,
-                              Properties properties = {});
+template <typename CommandGroupFunc>
+sycl::event submit_with_event(sycl::queue q, CommandGroupFunc&& cgf);
+
+template <typename CommandGroupFunc, typename Properties>
+sycl::event submit_with_event(sycl::queue q, Properties properties,
+                              CommandGroupFunc&& cgf);
 
 }
 ----

sycl/doc/extensions/proposed/sycl_ext_intel_low_power_event.asciidoc

@@ -59,13 +59,9 @@ incompatible ways before it is finalized.  *Shipping software products should
 not rely on APIs defined in this specification.*
 
 
-== Backend support status
-
-This extension is currently implemented in {dpcpp} only for all device targets.
-
 == Overview
 
-On some backends, calling `wait()` on a `event` will synchronize using a
+On some backends, calling `wait()` on an `event` will synchronize using a
 busy-waiting implementation. Though this comes at a low latency for the
 synchronization of the event, it has the downside of consuming high amounts of
 CPU time for no meaningful work.  This extension introduces a new property for
@@ -82,7 +78,7 @@ cost of latency.
 
 This extension provides a feature-test macro as described in the core SYCL
 specification.  An implementation supporting this extension must predefine the
-macro `SYCL_EXT_ONEAPI_LOW_POWER_EVENT` to one of the values defined in the table
+macro `SYCL_EXT_INTEL_LOW_POWER_EVENT` to one of the values defined in the table
 below.  Applications can test for the existence of this macro to determine if
 the implementation supports this feature, or applications can test the macro's
 value to determine which of the extension's features the implementation
@@ -104,9 +100,9 @@ supports.
 This extension adds a new property which can be used with the
 `submit_with_event` free function from
 link:../experimental/sycl_ext_oneapi_enqueue_functions.asciidoc[sycl_ext_oneapi_enqueue_functions].
-Passing this property to either of these functions will act as a hint to the
-`event` created from the corresponding commands to do low-power synchronization.
-If the backend is able to handle low-power events, calling `event::wait()` or
+Passing this property to this function will act as a hint to the `event` created
+from the corresponding commands to do low-power synchronization. If the backend
+is able to handle low-power events, calling `event::wait()` or
 `event::wait_and_throw()` will cause the thread to yield and only do occasional
 wake-ups to check the event progress.
 
@@ -146,9 +142,10 @@ int main() {
   oneapiex::submit(Q, [&](sycl::handler &CGH) {...});
 
   // Submit a command with the low-power event property.
-  sycl::event E = oneapiex::submit_with_event(Q, [&](sycl::handler &CGH) {
+  oneapiex::properties Props{intelex::low_power_event};
+  sycl::event E = oneapiex::submit_with_event(Q, Props, [&](sycl::handler &CGH) {
     ...
-  }, oneapiex::properties{intelex::low_power_event});
+  });
 
   // Waiting for the resulting event will use low-power waiting if possible.
   E.wait();

sycl/include/sycl/ext/oneapi/experimental/enqueue_functions.hpp

@@ -95,23 +95,38 @@ void submit_impl(queue &Q, CommandGroupFunc &&CGF,
 }
 } // namespace detail
 
-template <typename CommandGroupFunc, typename PropertiesT = empty_properties_t>
-void submit(queue Q, CommandGroupFunc &&CGF, PropertiesT Props = {},
+template <typename CommandGroupFunc, typename PropertiesT>
+void submit(queue Q, PropertiesT Props, CommandGroupFunc &&CGF,
             const sycl::detail::code_location &CodeLoc =
                 sycl::detail::code_location::current()) {
   std::ignore = Props;
   sycl::ext::oneapi::experimental::detail::submit_impl(
       Q, std::forward<CommandGroupFunc>(CGF), CodeLoc);
 }
 
-template <typename CommandGroupFunc, typename PropertiesT = empty_properties_t>
-event submit_with_event(queue Q, CommandGroupFunc &&CGF, PropertiesT Props = {},
+template <typename CommandGroupFunc>
+void submit(queue Q, CommandGroupFunc &&CGF,
+            const sycl::detail::code_location &CodeLoc =
+                sycl::detail::code_location::current()) {
+  submit(Q, empty_properties_t{}, CGF, CodeLoc);
+}
+
+template <typename CommandGroupFunc, typename PropertiesT>
+event submit_with_event(queue Q, PropertiesT Props, CommandGroupFunc &&CGF,
                         const sycl::detail::code_location &CodeLoc =
                             sycl::detail::code_location::current()) {
   std::ignore = Props;
   return Q.submit(std::forward<CommandGroupFunc>(CGF), CodeLoc);
 }
 
+template <typename CommandGroupFunc>
+event submit_with_event(queue Q, CommandGroupFunc &&CGF,
+                        const sycl::detail::code_location &CodeLoc =
+                            sycl::detail::code_location::current()) {
+  return submit_with_event(Q, std::forward<CommandGroupFunc>(CGF),
+                           empty_properties_t{}, CodeLoc);
+}
+
 template <typename KernelName = sycl::detail::auto_name, typename KernelType>
 void single_task(handler &CGH, const KernelType &KernelObj) {
   CGH.single_task<KernelName>(KernelObj);