Additional changes per reviewer's comments + fixed a warning (unused var)

Signed-off-by: Vyacheslav N Klochkov <[email protected]>

Author: v-klochkov

sycl/include/CL/sycl/ONEAPI/reduction.hpp

@@ -673,7 +673,7 @@ class reduction_impl : private reduction_impl_base {
   }
 
   /// Constructs a new temporary buffer to hold partial sums and returns
-  /// the accessor that that buffer. Non-placeholder case.
+  /// the accessor for that buffer. Non-placeholder case.
   template <bool IsOneWG, access::placeholder _IsPlaceholder = IsPlaceholder>
   std::enable_if_t<!IsOneWG && _IsPlaceholder == access::placeholder::false_t,
                    accessor_type>
@@ -684,7 +684,7 @@ class reduction_impl : private reduction_impl_base {
   }
 
   /// Constructs a new temporary buffer to hold partial sums and returns
-  /// the accessor that that buffer. Placeholder case.
+  /// the accessor for that buffer. Placeholder case.
   template <bool IsOneWG, access::placeholder _IsPlaceholder = IsPlaceholder>
   std::enable_if_t<!IsOneWG && _IsPlaceholder == access::placeholder::true_t,
                    accessor_type>

sycl/include/CL/sycl/reduction.hpp

@@ -43,7 +43,7 @@ std::enable_if_t<has_known_identity<BinaryOperation, T>::value,
                  ONEAPI::detail::reduction_impl<T, BinaryOperation, 1, false,
                                                 access::mode::read_write,
                                                 access::placeholder::true_t>>
-reduction(buffer<T, 1, AllocatorT> Var, handler &CGH, BinaryOperation Combiner,
+reduction(buffer<T, 1, AllocatorT> Var, handler &CGH, BinaryOperation,
           const property_list &PropList = {}) {
   // TODO: need to handle 'PropList'.
   if (PropList.has_property<property::reduction::initialize_to_identity>())

sycl/test/basic_tests/reduction_ctor.cpp

@@ -42,10 +42,11 @@ template <typename... Ts> class KernelNameGroup;
 template <typename SpecializationKernelName, typename T, int Dim,
           class BinaryOperation>
 void testKnown(T Identity, BinaryOperation BOp, T A, T B) {
-  buffer<T, 1> ReduBuf(1);
-
   static_assert(has_known_identity<BinaryOperation, T>::value);
   queue Q;
+  buffer<T, 1> ReduBuf(1);
+  T* ReduUSMPtr = malloc_host<T>(1, Q);
+
   Q.submit([&](handler &CGH) {
     // Reduction needs a global_buffer accessor as a parameter.
     // This accessor is not really used in this test.
@@ -55,29 +56,41 @@ void testKnown(T Identity, BinaryOperation BOp, T A, T B) {
         ReduDWAcc(ReduBuf, CGH);
     auto ReduRW = ONEAPI::reduction(ReduRWAcc, BOp);
     auto ReduDW = ONEAPI::reduction(ReduDWAcc, BOp);
+    auto ReduRWUSM = ONEAPI::reduction(ReduUSMPtr, BOp);
     auto ReduRW2020 = sycl::reduction(ReduBuf, CGH, BOp);
+    auto ReduRWUSM2020 = sycl::reduction(ReduUSMPtr, BOp);
+
     assert(toBool(ReduRW.getIdentity() == Identity) &&
            toBool(ReduDW.getIdentity() == Identity) &&
+           toBool(ReduRWUSM.getIdentity() == Identity) &&
            toBool(ReduRW2020.getIdentity() == Identity) &&
+           toBool(ReduRWUSM2020.getIdentity() == Identity) &&
            toBool(known_identity<BinaryOperation, T>::value == Identity) &&
            "Failed getIdentity() check().");
     test_reducer(ReduRW, A, B);
     test_reducer(ReduDW, A, B);
+    test_reducer(ReduRWUSM, A, B);
     test_reducer(ReduRW2020, A, B);
+    test_reducer(ReduRWUSM2020, A, B);
+
     test_reducer(ReduRW, Identity, BOp, A, B);
     test_reducer(ReduDW, Identity, BOp, A, B);
+    test_reducer(ReduRWUSM, Identity, BOp, A, B);
     test_reducer(ReduRW2020, Identity, BOp, A, B);
+    test_reducer(ReduRWUSM2020, Identity, BOp, A, B);
 
     // Command group must have at least one task in it. Use an empty one.
     CGH.single_task<SpecializationKernelName>([=]() {});
   });
+  free(ReduUSMPtr, Q);
 }
 
 template <typename SpecializationKernelName, typename T, int Dim,
           class BinaryOperation>
 void testUnknown(T Identity, BinaryOperation BOp, T A, T B) {
-  buffer<T, 1> ReduBuf(1);
   queue Q;
+  buffer<T, 1> ReduBuf(1);
+  T* ReduUSMPtr = malloc_host<T>(1, Q);
   Q.submit([&](handler &CGH) {
     // Reduction needs a global_buffer accessor as a parameter.
     // This accessor is not really used in this test.
@@ -87,18 +100,25 @@ void testUnknown(T Identity, BinaryOperation BOp, T A, T B) {
         ReduDWAcc(ReduBuf, CGH);
     auto ReduRW = ONEAPI::reduction(ReduRWAcc, Identity, BOp);
     auto ReduDW = ONEAPI::reduction(ReduDWAcc, Identity, BOp);
+    auto ReduRWUSM = ONEAPI::reduction(ReduUSMPtr, Identity, BOp);
     auto ReduRW2020 = sycl::reduction(ReduBuf, CGH, Identity, BOp);
+    auto ReduRWUSM2020 = sycl::reduction(ReduUSMPtr, Identity, BOp);
     assert(toBool(ReduRW.getIdentity() == Identity) &&
            toBool(ReduDW.getIdentity() == Identity) &&
+           toBool(ReduRWUSM.getIdentity() == Identity) &&
            toBool(ReduRW2020.getIdentity() == Identity) &&
+           toBool(ReduRWUSM2020.getIdentity() == Identity) &&
            "Failed getIdentity() check().");
     test_reducer(ReduRW, Identity, BOp, A, B);
     test_reducer(ReduDW, Identity, BOp, A, B);
+    test_reducer(ReduRWUSM, Identity, BOp, A, B);
     test_reducer(ReduRW2020, Identity, BOp, A, B);
+    test_reducer(ReduRWUSM2020, Identity, BOp, A, B);
 
     // Command group must have at least one task in it. Use an empty one.
     CGH.single_task<SpecializationKernelName>([=]() {});
   });
+  free(ReduUSMPtr, Q);
 }
 
 template <typename SpecializationKernelName, typename T, class BinaryOperation>