Merge from 'sycl' to 'sycl-web' (4 commits)

Author: iclsrc

sycl/doc/extensions/experimental/sycl_ext_oneapi_graph.asciidoc

@@ -1258,6 +1258,29 @@ _Throws:_ Synchronously `exception` with error code `invalid` if the device
 associated with
 `syclQueue` <<device-info-query, reports this extension as unsupported>>.
 
+[source,c++]
+----
+command_graph(const device& syclDevice,
+              const property_list& propList = {});
+----
+
+_Effects:_ Simplified constructor form where only device `syclDevice` is provided
+without explicitly passing a context. The graph uses the platform's default context.
+Zero or more properties can be provided to the constructed SYCL `command_graph`
+via an instance of `property_list`. All other properties of the queue are
+ignored for the purposes of graph creation. See the
+<<Queue Properties, Queue Properties>> section for more general information
+about how queue properties interact with `command_graph` objects.
+
+_Constraints:_ This constructor is only available when the `command_graph` state is
+`graph_state::modifiable`.
+
+_Preconditions:_ Valid `command_graph` constructor properties are listed in
+Section <<graph-properties, Graph Properties>>.
+
+_Throws:_ Synchronously `exception` with error code `invalid` if `syclDevice`
+  <<device-info-query, reports this extension as unsupported>>.
+
 ===== Member functions of the `command_graph` class
 
 [source,c++]

sycl/include/sycl/accessor_image.hpp

@@ -907,7 +907,7 @@ class __SYCL_EBO unsampled_image_accessor :
   DataT read(const CoordT &Coords) const noexcept {
 #ifdef __SYCL_DEVICE_ONLY__
     // Currently not reachable on device.
-    std::ignore = Coords;
+    (void)Coords;
     return {0, 0, 0, 0};
 #else
     return host_base_class::read<DataT>(Coords);
@@ -925,8 +925,8 @@ class __SYCL_EBO unsampled_image_accessor :
   void write(const CoordT &Coords, const DataT &Color) const {
 #ifdef __SYCL_DEVICE_ONLY__
     // Currently not reachable on device.
-    std::ignore = Coords;
-    std::ignore = Color;
+    (void)Coords;
+    (void)Color;
 #else
     host_base_class::write<DataT>(Coords, Color);
 #endif // __SYCL_DEVICE_ONLY__
@@ -938,7 +938,7 @@ class __SYCL_EBO unsampled_image_accessor :
       : host_base_class{Impl}
 #endif // __SYCL_DEVICE_ONLY__
   {
-    std::ignore = Impl;
+    (void)Impl;
   }
 
   template <class Obj>
@@ -1216,7 +1216,7 @@ class __SYCL_EBO sampled_image_accessor :
   DataT read(const CoordT &Coords) const noexcept {
 #ifdef __SYCL_DEVICE_ONLY__
     // Currently not reachable on device.
-    std::ignore = Coords;
+    (void)Coords;
     return {0, 0, 0, 0};
 #else
     return host_base_class::read<DataT>(Coords);
@@ -1229,7 +1229,7 @@ class __SYCL_EBO sampled_image_accessor :
       : host_base_class{Impl}
 #endif // __SYCL_DEVICE_ONLY__
   {
-    std::ignore = Impl;
+    (void)Impl;
   }
 
   template <class Obj>

sycl/include/sycl/detail/spirv.hpp

@@ -924,7 +924,7 @@ template <typename GroupT, typename T>
 EnableIfNativeShuffle<T> Shuffle(GroupT g, T x, id<1> local_id) {
   uint32_t LocalId = MapShuffleID(g, local_id);
 #ifndef __NVPTX__
-  std::ignore = g;
+  (void)g;
   if constexpr (ext::oneapi::experimental::is_user_constructed_group_v<
                     GroupT> &&
                 detail::is_vec<T>::value) {
@@ -957,7 +957,7 @@ EnableIfNativeShuffle<T> Shuffle(GroupT g, T x, id<1> local_id) {
 template <typename GroupT, typename T>
 EnableIfNativeShuffle<T> ShuffleXor(GroupT g, T x, id<1> mask) {
 #ifndef __NVPTX__
-  std::ignore = g;
+  (void)g;
   if constexpr (ext::oneapi::experimental::is_user_constructed_group_v<
                     GroupT> &&
                 detail::is_vec<T>::value) {

sycl/include/sycl/ext/intel/esimd/memory.hpp

@@ -2155,7 +2155,7 @@ __ESIMD_API simd<Tx, N> block_load(AccessorTy acc,
   return block_load<Tx, N>(__ESIMD_DNS::accessorToPointer<Tx>(acc, byte_offset),
                            flags);
 #else
-  std::ignore = flags;
+  (void)flags;
   constexpr unsigned Sz = sizeof(T) * N;
   static_assert(Sz >= detail::OperandSize::OWORD,
                 "block size must be at least 1 oword");

sycl/include/sycl/ext/intel/experimental/pipes.hpp

@@ -110,7 +110,7 @@ class pipe : public pipe_base {
   static _dataT read(queue &Q, bool &Success,
                      memory_order Order = memory_order::seq_cst) {
     // Order is currently unused.
-    std::ignore = Order;
+    (void)Order;
 
     const device Dev = Q.get_device();
     bool IsPipeSupported =
@@ -139,7 +139,7 @@ class pipe : public pipe_base {
   static void write(queue &Q, const _dataT &Data, bool &Success,
                     memory_order Order = memory_order::seq_cst) {
     // Order is currently unused.
-    std::ignore = Order;
+    (void)Order;
 
     const device Dev = Q.get_device();
     bool IsPipeSupported =
@@ -267,7 +267,7 @@ class pipe : public pipe_base {
   // Host API
   static _dataT read(queue &Q, memory_order Order = memory_order::seq_cst) {
     // Order is currently unused.
-    std::ignore = Order;
+    (void)Order;
 
     const device Dev = Q.get_device();
     bool IsPipeSupported =
@@ -290,7 +290,7 @@ class pipe : public pipe_base {
   static void write(queue &Q, const _dataT &Data,
                     memory_order Order = memory_order::seq_cst) {
     // Order is currently unused.
-    std::ignore = Order;
+    (void)Order;
 
     const device Dev = Q.get_device();
     bool IsPipeSupported =

sycl/include/sycl/ext/oneapi/experimental/graph/command_graph.hpp

@@ -101,6 +101,13 @@ class command_graph : public detail::modifiable_command_graph {
                          const property_list &PropList = {})
       : modifiable_command_graph(SyclQueue, PropList) {}
 
+  /// Constructor with default context.
+  /// @param SyclDevice Device all nodes will be associated with.
+  /// @param PropList Optional list of properties to pass.
+  explicit command_graph(const device &SyclDevice,
+                         const property_list &PropList = {})
+      : modifiable_command_graph(SyclDevice, PropList) {}
+
 private:
   /// Constructor used internally by the runtime.
   /// @param Impl Detail implementation class to construct object with.

sycl/include/sycl/ext/oneapi/experimental/graph/modifiable_graph.hpp

@@ -55,6 +55,12 @@ class __SYCL_EXPORT modifiable_command_graph
   modifiable_command_graph(const queue &SyclQueue,
                            const property_list &PropList = {});
 
+  /// Constructor with default context.
+  /// @param SyclDevice Device all nodes will be associated with.
+  /// @param PropList Optional list of properties to pass.
+  modifiable_command_graph(const device &SyclDevice,
+                           const property_list &PropList = {});
+
   /// Add an empty node to the graph.
   /// @param PropList Property list used to pass [0..n] predecessor nodes.
   /// @return Constructed empty node which has been added to the graph.

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

@@ -90,9 +90,9 @@ void prefetch_impl(T *ptr, size_t bytes, Properties properties) {
   }
   __spirv_ocl_prefetch(ptrAnnotated, bytes);
 #else
-  std::ignore = ptr;
-  std::ignore = bytes;
-  std::ignore = properties;
+  (void)ptr;
+  (void)bytes;
+  (void)properties;
 #endif
 }
 
@@ -101,7 +101,7 @@ void joint_prefetch_impl(Group g, T *ptr, size_t bytes, Properties properties) {
   // Although calling joint_prefetch is functionally equivalent to calling
   // prefetch from every work-item in a group, native suppurt may be added to to
   // issue cooperative prefetches more efficiently on some hardware.
-  std::ignore = g;
+  (void)g;
   prefetch_impl(ptr, bytes, properties);
 }
 } // namespace detail

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

@@ -33,10 +33,10 @@ T reduce_over_group_impl(GroupHelper group_helper, T x, size_t num_elements,
   group_barrier(g);
   return group_broadcast(g, result);
 #else
-  std::ignore = group_helper;
-  std::ignore = x;
-  std::ignore = num_elements;
-  std::ignore = binary_op;
+  (void)group_helper;
+  (void)x;
+  (void)num_elements;
+  (void)binary_op;
   throw exception(make_error_code(errc::runtime),
                   "Group algorithms are not supported on host.");
 #endif
@@ -73,7 +73,7 @@ reduce_over_group(GroupHelper group_helper, V x, T init,
 #ifdef __SYCL_DEVICE_ONLY__
   return binary_op(init, reduce_over_group(group_helper, x, binary_op));
 #else
-  std::ignore = group_helper;
+  (void)group_helper;
   throw exception(make_error_code(errc::runtime),
                   "Group algorithms are not supported on host.");
 #endif
@@ -107,10 +107,10 @@ joint_reduce(GroupHelper group_helper, Ptr first, Ptr last,
   return detail::reduce_over_group_impl(group_helper, partial, num_elements,
                                         binary_op);
 #else
-  std::ignore = group_helper;
-  std::ignore = first;
-  std::ignore = last;
-  std::ignore = binary_op;
+  (void)group_helper;
+  (void)first;
+  (void)last;
+  (void)binary_op;
   throw exception(make_error_code(errc::runtime),
                   "Group algorithms are not supported on host.");
 #endif
@@ -129,8 +129,8 @@ joint_reduce(GroupHelper group_helper, Ptr first, Ptr last, T init,
 #ifdef __SYCL_DEVICE_ONLY__
   return binary_op(init, joint_reduce(group_helper, first, last, binary_op));
 #else
-  std::ignore = group_helper;
-  std::ignore = last;
+  (void)group_helper;
+  (void)last;
   throw exception(make_error_code(errc::runtime),
                   "Group algorithms are not supported on host.");
 #endif