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

Author: iclsrc

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
 

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;
 };
 

sycl/test-e2e/Basic/get_backend.cpp

@@ -1,5 +1,5 @@
 // Failing due to old driver
-// XFAIL: gpu-intel-dg2
+// REQUIRES-INTEL-DRIVER: lin: 27202, win: 101.4677
 // RUN: %{build} -o %t.out
 // RUN: %{run-unfiltered-devices} %t.out
 //

sycl/test-e2e/Graph/Explicit/work_group_size_prop.cpp

@@ -5,10 +5,8 @@
 //
 // CHECK-NOT: LEAK
 
-// Temporarily disabled for CUDA.
-// XFAIL: cuda
-// Note: failing negative test with HIP in the original test
-// TODO: disable hip when HIP backend will be supported by Graph
+// Note: failing negative test with CUDA & HIP in the original test
+// UNSUPPORTED: cuda, hip
 
 #define GRAPH_E2E_EXPLICIT
 

sycl/test-e2e/Graph/RecordReplay/work_group_size_prop.cpp

@@ -5,11 +5,8 @@
 //
 // CHECK-NOT: LEAK
 
-// Temporarily disabled for CUDA.
-// XFAIL: cuda
-
-// Note: failing negative test with HIP in the original test
-// TODO: disable hip when HIP backend will be supported by Graph
+// Note: failing negative test with CUDA & HIP in the original test
+// UNSUPPORTED: cuda, hip
 
 #define GRAPH_E2E_RECORD_REPLAY