From 8074617a846db5ba1e917c8ad7a3a13c47aa045d Mon Sep 17 00:00:00 2001
From: Alexey Bader <alexey.bader@intel.com>
Date: Mon, 11 Dec 2023 09:16:00 -0800
Subject: [PATCH] [SYCL][NFC] Remove item dependency on reduction. (#12135)

Use Builder::createItem help function to create `item` object instead of
adding one helper function in reduction namespace.
---
 sycl/include/sycl/detail/reduction_forward.hpp |  5 +++--
 sycl/include/sycl/item.hpp                     | 10 +---------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/sycl/include/sycl/detail/reduction_forward.hpp b/sycl/include/sycl/detail/reduction_forward.hpp
index 40c6968bfee86..63d6a19990757 100644
--- a/sycl/include/sycl/detail/reduction_forward.hpp
+++ b/sycl/include/sycl/detail/reduction_forward.hpp
@@ -8,9 +8,10 @@
 
 #pragma once
 
+#include <sycl/detail/helpers.hpp>   // for Builder
 #include <sycl/detail/item_base.hpp> // for range
 #include <sycl/id.hpp>               // for id
-#include <sycl/item.hpp>             // for getDelinearizedItem, item
+#include <sycl/item.hpp>             // for item
 #include <sycl/nd_range.hpp>         // for nd_range
 #include <sycl/range.hpp>            // for range
 
@@ -51,7 +52,7 @@ template <class FunctorTy> void withAuxHandler(handler &CGH, FunctorTy Func);
 
 template <int Dims>
 item<Dims, false> getDelinearizedItem(range<Dims> Range, id<Dims> Id) {
-  return {Range, Id};
+  return Builder::createItem<Dims, false>(Range, Id);
 }
 } // namespace reduction
 
diff --git a/sycl/include/sycl/item.hpp b/sycl/include/sycl/item.hpp
index 6b00c81697830..472668befdddf 100644
--- a/sycl/include/sycl/item.hpp
+++ b/sycl/include/sycl/item.hpp
@@ -21,17 +21,13 @@
 
 namespace sycl {
 inline namespace _V1 {
+
 namespace detail {
 class Builder;
 template <typename TransformedArgType, int Dims, typename KernelType>
 class RoundedRangeKernel;
 template <typename TransformedArgType, int Dims, typename KernelType>
 class RoundedRangeKernelWithKH;
-
-namespace reduction {
-template <int Dims>
-item<Dims, false> getDelinearizedItem(range<Dims> Range, id<Dims> Id);
-} // namespace reduction
 } // namespace detail
 
 /// Identifies an instance of the function object executing at each point
@@ -133,10 +129,6 @@ template <int Dimensions = 1, bool with_offset = true> class item {
   friend class detail::Builder;
 
 private:
-  template <int Dims>
-  friend item<Dims, false>
-  detail::reduction::getDelinearizedItem(range<Dims> Range, id<Dims> Id);
-
   detail::ItemBase<Dimensions, with_offset> MImpl;
 };