Skip to content

Commit 38945f3

Browse files
Alexandr-KonovalovAlexandr-Konovalov
committed
Rename RangesRefT to ranges_ref_view and move to sycl::detail namespace.
1 parent 1a90e48 commit 38945f3

File tree

4 files changed

+29
-29
lines changed

4 files changed

+29
-29
lines changed

‎sycl/include/sycl/ext/oneapi/experimental/rangesref.hpp‎ renamed to ‎sycl/include/sycl/detail/ranges_ref_view.hpp‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//==-------- rangesref.hpp --- SYCL iteration with reference to ranges -----==//
1+
//==---- ranges_ref_view.hpp --- SYCL iteration with reference to ranges ---==//
22
//
33
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
44
// See https://llvm.org/LICENSE.txt for license information.
@@ -12,42 +12,42 @@
1212

1313
namespace sycl {
1414
inline namespace _V1 {
15-
namespace ext::oneapi::experimental {
15+
namespace detail {
1616

17-
// The structure to keep references to ranges and dimension unified for
17+
// The structure to keep dimension and references to ranges unified for
1818
// all dimensions.
19-
class RangesRefT {
19+
class ranges_ref_view {
2020

2121
public:
22-
RangesRefT() = default;
23-
RangesRefT(const RangesRefT &Desc) = default;
24-
RangesRefT(RangesRefT &&Desc) = default;
22+
ranges_ref_view() = default;
23+
ranges_ref_view(const ranges_ref_view &Desc) = default;
24+
ranges_ref_view(ranges_ref_view &&Desc) = default;
2525

2626
template <int Dims_>
27-
RangesRefT(sycl::range<Dims_> &GlobalSizes, sycl::range<Dims_> &LocalSizes)
27+
ranges_ref_view(sycl::range<Dims_> &GlobalSizes, sycl::range<Dims_> &LocalSizes)
2828
: GlobalSize(&(GlobalSizes[0])), LocalSize(&(LocalSizes[0])),
2929
Dims{size_t(Dims_)} {}
3030

3131
// to support usage in sycl::ext::oneapi::experimental::submit_with_event()
3232
template <int Dims_>
33-
RangesRefT(sycl::nd_range<Dims_> &ExecutionRange)
33+
ranges_ref_view(sycl::nd_range<Dims_> &ExecutionRange)
3434
: GlobalSize(&ExecutionRange.globalSize[0]),
3535
LocalSize(&ExecutionRange.localSize[0]),
3636
GlobalOffset(&ExecutionRange.offset[0]), Dims{size_t(Dims_)} {}
3737

3838
template <int Dims_>
39-
RangesRefT(sycl::range<Dims_> &Range)
39+
ranges_ref_view(sycl::range<Dims_> &Range)
4040
: GlobalSize(&(Range[0])), Dims{size_t(Dims_)} {}
4141

42-
RangesRefT &operator=(const RangesRefT &Desc) = default;
43-
RangesRefT &operator=(RangesRefT &&Desc) = default;
42+
ranges_ref_view &operator=(const ranges_ref_view &Desc) = default;
43+
ranges_ref_view &operator=(ranges_ref_view &&Desc) = default;
4444

4545
const size_t *GlobalSize = nullptr;
4646
const size_t *LocalSize = nullptr;
4747
const size_t *GlobalOffset = nullptr;
4848
size_t Dims = 0;
4949
};
5050

51-
} // namespace ext::oneapi::experimental
51+
} // namespace detail
5252
} // namespace _V1
5353
} // namespace sycl

‎sycl/include/sycl/nd_range.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
namespace sycl {
1616
inline namespace _V1 {
1717

18-
namespace ext::oneapi::experimental {
19-
class RangesRefT;
18+
namespace detail {
19+
class ranges_ref_view;
2020
}
2121

2222
/// Defines the iteration domain of both the work-groups and the overall
@@ -70,7 +70,7 @@ template <int Dimensions = 1> class nd_range {
7070
return !(*this == rhs);
7171
}
7272

73-
friend class sycl::_V1::ext::oneapi::experimental::RangesRefT;
73+
friend class sycl::_V1::detail::ranges_ref_view;
7474
};
7575

7676
} // namespace _V1

‎sycl/unittests/scheduler/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ add_sycl_unittest(SchedulerTests OBJECT
2222
AccessorDefaultCtor.cpp
2323
HostTaskAndBarrier.cpp
2424
BarrierDependencies.cpp
25-
RangesRefUsage.cpp
25+
RangesRefViewUsage.cpp
2626
)

‎sycl/unittests/scheduler/RangesRefUsage.cpp‎ renamed to ‎sycl/unittests/scheduler/RangesRefViewUsage.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
//==---- RangesRefUsage.cpp --- Check RangesRefT --------------------------==//
1+
//==---- RangesRefViewUsage.cpp --- Check ranges_ref_view ------------------==//
22
//
33
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
44
// See https://llvm.org/LICENSE.txt for license information.
55
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
66
//
77
//===----------------------------------------------------------------------===//
8-
#include <sycl/ext/oneapi/experimental/rangesref.hpp>
8+
#include <sycl/detail/ranges_ref_view.hpp>
99

1010
#include <gtest/gtest.h>
1111

1212
TEST(RangesRefUsage, RangesRefUsage) {
13-
sycl::ext::oneapi::experimental::RangesRefT r0;
13+
sycl::detail::ranges_ref_view r0;
1414
ASSERT_EQ(r0.Dims, size_t{0});
1515

1616
{
@@ -20,20 +20,20 @@ TEST(RangesRefUsage, RangesRefUsage) {
2020
sycl::nd_range<1> nd_range{global_range, local_range, offset};
2121

2222
{
23-
sycl::ext::oneapi::experimental::RangesRefT r{nd_range};
23+
sycl::detail::ranges_ref_view r{nd_range};
2424
ASSERT_EQ(r.Dims, size_t{1});
2525
ASSERT_EQ(*r.GlobalSize, global_range[0]);
2626
ASSERT_EQ(*r.LocalSize, local_range[0]);
2727
ASSERT_EQ(*r.GlobalOffset, offset[0]);
2828
}
2929
{
30-
sycl::ext::oneapi::experimental::RangesRefT r{global_range, local_range};
30+
sycl::detail::ranges_ref_view r{global_range, local_range};
3131
ASSERT_EQ(r.Dims, size_t{1});
3232
ASSERT_EQ(*r.GlobalSize, global_range[0]);
3333
ASSERT_EQ(*r.LocalSize, local_range[0]);
3434
}
3535
{
36-
sycl::ext::oneapi::experimental::RangesRefT r{global_range};
36+
sycl::detail::ranges_ref_view r{global_range};
3737
ASSERT_EQ(r.Dims, size_t{1});
3838
ASSERT_EQ(*r.GlobalSize, global_range[0]);
3939
ASSERT_EQ(r.LocalSize, nullptr);
@@ -46,7 +46,7 @@ TEST(RangesRefUsage, RangesRefUsage) {
4646
sycl::nd_range<2> nd_range{global_range, local_range, offset};
4747

4848
{
49-
sycl::ext::oneapi::experimental::RangesRefT r{nd_range};
49+
sycl::detail::ranges_ref_view r{nd_range};
5050
ASSERT_EQ(r.Dims, size_t{2});
5151
ASSERT_EQ(r.GlobalSize[0], global_range[0]);
5252
ASSERT_EQ(r.GlobalSize[1], global_range[1]);
@@ -56,15 +56,15 @@ TEST(RangesRefUsage, RangesRefUsage) {
5656
ASSERT_EQ(r.GlobalOffset[1], offset[1]);
5757
}
5858
{
59-
sycl::ext::oneapi::experimental::RangesRefT r{global_range, local_range};
59+
sycl::detail::ranges_ref_view r{global_range, local_range};
6060
ASSERT_EQ(r.Dims, size_t{2});
6161
ASSERT_EQ(r.GlobalSize[0], global_range[0]);
6262
ASSERT_EQ(r.GlobalSize[1], global_range[1]);
6363
ASSERT_EQ(r.LocalSize[0], local_range[0]);
6464
ASSERT_EQ(r.LocalSize[1], local_range[1]);
6565
}
6666
{
67-
sycl::ext::oneapi::experimental::RangesRefT r{global_range};
67+
sycl::detail::ranges_ref_view r{global_range};
6868
ASSERT_EQ(r.Dims, size_t{2});
6969
ASSERT_EQ(r.GlobalSize[0], global_range[0]);
7070
ASSERT_EQ(r.GlobalSize[1], global_range[1]);
@@ -78,7 +78,7 @@ TEST(RangesRefUsage, RangesRefUsage) {
7878
sycl::nd_range<3> nd_range{global_range, local_range, offset};
7979

8080
{
81-
sycl::ext::oneapi::experimental::RangesRefT r{nd_range};
81+
sycl::detail::ranges_ref_view r{nd_range};
8282
ASSERT_EQ(r.Dims, size_t{3});
8383
ASSERT_EQ(r.GlobalSize[0], global_range[0]);
8484
ASSERT_EQ(r.GlobalSize[1], global_range[1]);
@@ -91,7 +91,7 @@ TEST(RangesRefUsage, RangesRefUsage) {
9191
ASSERT_EQ(r.GlobalOffset[2], offset[2]);
9292
}
9393
{
94-
sycl::ext::oneapi::experimental::RangesRefT r{global_range, local_range};
94+
sycl::detail::ranges_ref_view r{global_range, local_range};
9595
ASSERT_EQ(r.Dims, size_t{3});
9696
ASSERT_EQ(r.GlobalSize[0], global_range[0]);
9797
ASSERT_EQ(r.GlobalSize[1], global_range[1]);
@@ -101,7 +101,7 @@ TEST(RangesRefUsage, RangesRefUsage) {
101101
ASSERT_EQ(r.LocalSize[2], local_range[2]);
102102
}
103103
{
104-
sycl::ext::oneapi::experimental::RangesRefT r{global_range};
104+
sycl::detail::ranges_ref_view r{global_range};
105105
ASSERT_EQ(r.Dims, size_t{3});
106106
ASSERT_EQ(r.GlobalSize[0], global_range[0]);
107107
ASSERT_EQ(r.GlobalSize[1], global_range[1]);

0 commit comments

Comments
 (0)