Rename sycl::detail::ranges_ref_view to nd_range_view.

Alexandr-Konovalov · Alexandr-Konovalov · commit d309440bb1cf · 2025-08-27T12:00:36.000+02:00
diff --git a/sycl/include/sycl/detail/nd_range_view.hpp b/sycl/include/sycl/detail/nd_range_view.hpp
@@ -1,4 +1,4 @@
-//==---- ranges_ref_view.hpp --- SYCL iteration with reference to ranges ---==//
+//==---- nd_range_view.hpp --- SYCL iteration with reference to ranges ---==//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -18,37 +18,37 @@ class NDRDescT;
 
 // The structure to keep dimension and references to ranges unified for
 // all dimensions.
-class ranges_ref_view {
+class nd_range_view {
 
 public:
-  ranges_ref_view() = default;
-  ranges_ref_view(const ranges_ref_view &Desc) = default;
-  ranges_ref_view(ranges_ref_view &&Desc) = default;
-  ranges_ref_view &operator=(const ranges_ref_view &Desc) = default;
-  ranges_ref_view &operator=(ranges_ref_view &&Desc) = default;
+  nd_range_view() = default;
+  nd_range_view(const nd_range_view &Desc) = default;
+  nd_range_view(nd_range_view &&Desc) = default;
+  nd_range_view &operator=(const nd_range_view &Desc) = default;
+  nd_range_view &operator=(nd_range_view &&Desc) = default;
 
   template <int Dims_>
-  ranges_ref_view(sycl::range<Dims_> &GlobalSizes,
+  nd_range_view(sycl::range<Dims_> &GlobalSizes,
                   sycl::range<Dims_> &LocalSizes)
       : GlobalSize(&(GlobalSizes[0])), LocalSize(&(LocalSizes[0])),
         Dims{size_t(Dims_)} {}
 
   // to support usage in sycl::ext::oneapi::experimental::submit_with_event()
   template <int Dims_>
-  ranges_ref_view(sycl::nd_range<Dims_> &ExecutionRange)
+  nd_range_view(sycl::nd_range<Dims_> &ExecutionRange)
       : GlobalSize(&ExecutionRange.globalSize[0]),
         LocalSize(&ExecutionRange.localSize[0]),
-        GlobalOffset(&ExecutionRange.offset[0]), Dims{size_t(Dims_)} {}
+        Offset(&ExecutionRange.offset[0]), Dims{size_t(Dims_)} {}
 
   template <int Dims_>
-  ranges_ref_view(sycl::range<Dims_> &Range)
+  nd_range_view(sycl::range<Dims_> &Range)
       : GlobalSize(&(Range[0])), Dims{size_t(Dims_)} {}
 
   sycl::detail::NDRDescT toNDRDescT() const;
 
   const size_t *GlobalSize = nullptr;
   const size_t *LocalSize = nullptr;
-  const size_t *GlobalOffset = nullptr;
+  const size_t *Offset = nullptr;
   size_t Dims = 0;
 };
 
diff --git a/sycl/include/sycl/nd_range.hpp b/sycl/include/sycl/nd_range.hpp
@@ -16,7 +16,7 @@ namespace sycl {
 inline namespace _V1 {
 
 namespace detail {
-class ranges_ref_view;
+class nd_range_view;
 }
 
 /// Defines the iteration domain of both the work-groups and the overall
@@ -70,7 +70,7 @@ template <int Dimensions = 1> class nd_range {
     return !(*this == rhs);
   }
 
-  friend class sycl::_V1::detail::ranges_ref_view;
+  friend class sycl::_V1::detail::nd_range_view;
 };
 
 } // namespace _V1
diff --git a/sycl/source/detail/queue_impl.cpp b/sycl/source/detail/queue_impl.cpp
@@ -11,7 +11,7 @@
 #include <detail/queue_impl.hpp>
 #include <sycl/context.hpp>
 #include <sycl/detail/common.hpp>
-#include <sycl/detail/ranges_ref_view.hpp>
+#include <sycl/detail/nd_range_view.hpp>
 #include <sycl/detail/ur.hpp>
 #include <sycl/device.hpp>
 
@@ -127,7 +127,7 @@ prepareSYCLEventAssociatedWithQueue(detail::queue_impl &QueueImpl) {
   return detail::createSyclObjFromImpl<event>(EventImpl);
 }
 
-sycl::detail::NDRDescT ranges_ref_view::toNDRDescT() const {
+sycl::detail::NDRDescT nd_range_view::toNDRDescT() const {
   NDRDescT NDRDesc;
 
   NDRDesc.Dims = Dims;
@@ -138,9 +138,9 @@ sycl::detail::NDRDescT ranges_ref_view::toNDRDescT() const {
     for (size_t i = 0; i < Dims; ++i) {
       NDRDesc.LocalSize[i] = LocalSize[i];
     }
-  if (GlobalOffset)
+  if (Offset)
     for (size_t i = 0; i < Dims; ++i) {
-      NDRDesc.GlobalOffset[i] = GlobalOffset[i];
+      NDRDesc.GlobalOffset[i] = Offset[i];
     }
   return NDRDesc;
 }
diff --git a/sycl/unittests/scheduler/CMakeLists.txt b/sycl/unittests/scheduler/CMakeLists.txt
@@ -22,5 +22,5 @@ add_sycl_unittest(SchedulerTests OBJECT
     AccessorDefaultCtor.cpp
     HostTaskAndBarrier.cpp
     BarrierDependencies.cpp
-    RangesRefViewUsage.cpp
+    NdRangeViewUsage.cpp
 )
diff --git a/sycl/unittests/scheduler/NdRangeViewUsage.cpp b/sycl/unittests/scheduler/NdRangeViewUsage.cpp
@@ -1,26 +1,26 @@
-//==---- RangesRefViewUsage.cpp --- Check ranges_ref_view ------------------==//
+//==---- NdRangeViewUsage.cpp --- Check nd_range_view ------------------==//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 #include <detail/cg.hpp>
-#include <sycl/detail/ranges_ref_view.hpp>
+#include <sycl/detail/nd_range_view.hpp>
 
 #include <gtest/gtest.h>
 
 template <int dims>
-void TestNDRangesRefView(sycl::range<dims> global, sycl::range<dims> local,
+void TestNdRangeView(sycl::range<dims> global, sycl::range<dims> local,
                          sycl::id<dims> offset) {
   {
     sycl::nd_range<dims> nd_range{global, local, offset};
-    sycl::detail::ranges_ref_view r{nd_range};
+    sycl::detail::nd_range_view r{nd_range};
     ASSERT_EQ(r.Dims, size_t{dims});
     for (int d = 0; d < dims; d++) {
       ASSERT_EQ(r.GlobalSize[d], global[d]);
       ASSERT_EQ(r.LocalSize[d], local[d]);
-      ASSERT_EQ(r.GlobalOffset[d], offset[d]);
+      ASSERT_EQ(r.Offset[d], offset[d]);
     }
 
     sycl::detail::NDRDescT NDRDesc = r.toNDRDescT();
@@ -32,13 +32,13 @@ void TestNDRangesRefView(sycl::range<dims> global, sycl::range<dims> local,
     }
   }
   {
-    sycl::detail::ranges_ref_view r{global, local};
+    sycl::detail::nd_range_view r{global, local};
     ASSERT_EQ(r.Dims, size_t{dims});
     for (int d = 0; d < dims; d++) {
       ASSERT_EQ(r.GlobalSize[d], global[d]);
       ASSERT_EQ(r.LocalSize[d], local[d]);
     }
-    ASSERT_EQ(r.GlobalOffset, nullptr);
+    ASSERT_EQ(r.Offset, nullptr);
 
     sycl::detail::NDRDescT NDRDesc = r.toNDRDescT();
     ASSERT_EQ(NDRDesc.Dims, size_t{dims});
@@ -55,13 +55,13 @@ void TestNDRangesRefView(sycl::range<dims> global, sycl::range<dims> local,
     }
   }
   {
-    sycl::detail::ranges_ref_view r{global};
+    sycl::detail::nd_range_view r{global};
     ASSERT_EQ(r.Dims, size_t{dims});
     for (int d = 0; d < dims; d++) {
       ASSERT_EQ(r.GlobalSize[d], global[d]);
     }
     ASSERT_EQ(r.LocalSize, nullptr);
-    ASSERT_EQ(r.GlobalOffset, nullptr);
+    ASSERT_EQ(r.Offset, nullptr);
 
     sycl::detail::NDRDescT NDRDesc = r.toNDRDescT();
     ASSERT_EQ(NDRDesc.Dims, size_t{dims});
@@ -79,10 +79,10 @@ void TestNDRangesRefView(sycl::range<dims> global, sycl::range<dims> local,
 }
 
 TEST(RangesRefUsage, RangesRefUsage) {
-  TestNDRangesRefView(sycl::range<1>{1024}, sycl::range<1>{64},
+  TestNdRangeView(sycl::range<1>{1024}, sycl::range<1>{64},
                       sycl::id<1>{10});
-  TestNDRangesRefView(sycl::range<2>{1024, 512}, sycl::range<2>{64, 32},
+  TestNdRangeView(sycl::range<2>{1024, 512}, sycl::range<2>{64, 32},
                       sycl::id<2>{10, 5});
-  TestNDRangesRefView(sycl::range<3>{1024, 512, 256},
+  TestNdRangeView(sycl::range<3>{1024, 512, 256},
                       sycl::range<3>{64, 32, 16}, sycl::id<3>{10, 5, 2});
 }

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ namespace sycl {`
`16`	`16`	`inline namespace _V1 {`
`17`	`17`
`18`	`18`	`namespace detail {`
`19`		`-class ranges_ref_view;`
	`19`	`+class nd_range_view;`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`/// Defines the iteration domain of both the work-groups and the overall`
`@@ -70,7 +70,7 @@ template <int Dimensions = 1> class nd_range {`
`70`	`70`	`return !(*this == rhs);`
`71`	`71`	`}`
`72`	`72`
`73`		`- friend class sycl::_V1::detail::ranges_ref_view;`
	`73`	`+ friend class sycl::_V1::detail::nd_range_view;`
`74`	`74`	`};`
`75`	`75`
`76`	`76`	`} // namespace _V1`
Original file line number	Diff line number	Diff line change
`@@ -22,5 +22,5 @@ add_sycl_unittest(SchedulerTests OBJECT`
`22`	`22`	`AccessorDefaultCtor.cpp`
`23`	`23`	`HostTaskAndBarrier.cpp`
`24`	`24`	`BarrierDependencies.cpp`
`25`		`- RangesRefViewUsage.cpp`
	`25`	`+ NdRangeViewUsage.cpp`
`26`	`26`	`)`