Skip to content

Commit 5d39a3e

Browse files
author
Alexander Batashev
committed
update for new reality
1 parent 3fd9a98 commit 5d39a3e

File tree

8 files changed

+61
-28
lines changed

8 files changed

+61
-28
lines changed

‎sycl/include/CL/sycl/group.hpp

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,7 @@ template <int Dims> group<Dims> store_group(const group<Dims> *g) {
429429
} // namespace detail
430430

431431
template <int Dims>
432-
__SYCL_DEPRECATED("use sycl::experimental::this_group() instead")
432+
__SYCL_DEPRECATED("use sycl::ext::oneapi::experimental::this_group() instead")
433433
group<Dims> this_group() {
434434
#ifdef __SYCL_DEVICE_ONLY__
435435
return detail::Builder::getElement(detail::declptr<group<Dims>>());
@@ -438,14 +438,18 @@ group<Dims> this_group() {
438438
#endif
439439
}
440440

441+
namespace ext {
442+
namespace oneapi {
441443
namespace experimental {
442444
template <int Dims> group<Dims> this_group() {
443445
#ifdef __SYCL_DEVICE_ONLY__
444-
return detail::Builder::getElement(detail::declptr<group<Dims>>());
446+
return sycl::detail::Builder::getElement(detail::declptr<group<Dims>>());
445447
#else
446-
return detail::store_group<Dims>(nullptr);
448+
return sycl::detail::store_group<Dims>(nullptr);
447449
#endif
448450
}
449451
} // namespace experimental
452+
} // namespace oneapi
453+
} // namespace ext
450454
} // namespace sycl
451455
} // __SYCL_INLINE_NAMESPACE(cl)

‎sycl/include/CL/sycl/id.hpp

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ template <int Dims> id<Dims> store_id(const id<Dims> *i) {
290290
} // namespace detail
291291

292292
template <int Dims>
293-
__SYCL_DEPRECATED("use sycl::experimental::this_id() instead")
293+
__SYCL_DEPRECATED("use sycl::ext::oneapi::experimental::this_id() instead")
294294
id<Dims> this_id() {
295295
#ifdef __SYCL_DEVICE_ONLY__
296296
return detail::Builder::getElement(detail::declptr<id<Dims>>());
@@ -299,14 +299,18 @@ id<Dims> this_id() {
299299
#endif
300300
}
301301

302+
namespace ext {
303+
namespace oneapi {
302304
namespace experimental {
303305
template <int Dims> id<Dims> this_id() {
304306
#ifdef __SYCL_DEVICE_ONLY__
305-
return detail::Builder::getElement(detail::declptr<id<Dims>>());
307+
return sycl::detail::Builder::getElement(detail::declptr<id<Dims>>());
306308
#else
307-
return detail::store_id<Dims>(nullptr);
309+
return sycl::detail::store_id<Dims>(nullptr);
308310
#endif
309311
}
310312
} // namespace experimental
313+
} // namespace oneapi
314+
} // namespace ext
311315
} // namespace sycl
312316
} // __SYCL_INLINE_NAMESPACE(cl)

‎sycl/include/CL/sycl/item.hpp

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ template <int Dims> item<Dims> store_item(const item<Dims> *i) {
133133
} // namespace detail
134134

135135
template <int Dims>
136-
__SYCL_DEPRECATED("use sycl::experimental::this_item() instead")
136+
__SYCL_DEPRECATED("use sycl::ext::oneapi::experimental::this_item() instead")
137137
item<Dims> this_item() {
138138
#ifdef __SYCL_DEVICE_ONLY__
139139
return detail::Builder::getElement(detail::declptr<item<Dims>>());
@@ -142,14 +142,18 @@ item<Dims> this_item() {
142142
#endif
143143
}
144144

145+
namespace ext {
146+
namespace oneapi {
145147
namespace experimental {
146148
template <int Dims> item<Dims> this_item() {
147149
#ifdef __SYCL_DEVICE_ONLY__
148-
return detail::Builder::getElement(detail::declptr<item<Dims>>());
150+
return sycl::detail::Builder::getElement(detail::declptr<item<Dims>>());
149151
#else
150-
return detail::store_item<Dims>(nullptr);
152+
return sycl::detail::store_item<Dims>(nullptr);
151153
#endif
152154
}
153155
} // namespace experimental
156+
} // namespace oneapi
157+
} // namespace ext
154158
} // namespace sycl
155159
} // __SYCL_INLINE_NAMESPACE(cl)

‎sycl/include/CL/sycl/nd_item.hpp

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ template <int Dims> nd_item<Dims> store_nd_item(const nd_item<Dims> *nd_i) {
203203
} // namespace detail
204204

205205
template <int Dims>
206-
__SYCL_DEPRECATED("use sycl::experimental::this_nd_item() instead")
206+
__SYCL_DEPRECATED("use sycl::ext::oneapi::experimental::this_nd_item() instead")
207207
nd_item<Dims> this_nd_item() {
208208
#ifdef __SYCL_DEVICE_ONLY__
209209
return detail::Builder::getElement(detail::declptr<nd_item<Dims>>());
@@ -212,14 +212,18 @@ nd_item<Dims> this_nd_item() {
212212
#endif
213213
}
214214

215+
namespace ext {
216+
namespace oneapi {
215217
namespace experimental {
216218
template <int Dims> nd_item<Dims> this_nd_item() {
217219
#ifdef __SYCL_DEVICE_ONLY__
218-
return detail::Builder::getElement(detail::declptr<nd_item<Dims>>());
220+
return sycl::detail::Builder::getElement(detail::declptr<nd_item<Dims>>());
219221
#else
220-
return detail::store_nd_item<Dims>(nullptr);
222+
return sycl::detail::store_nd_item<Dims>(nullptr);
221223
#endif
222224
}
223225
} // namespace experimental
226+
} // namespace oneapi
227+
} // namespace ext
224228
} // namespace sycl
225229
} // __SYCL_INLINE_NAMESPACE(cl)

‎sycl/include/CL/sycl/sub_group.hpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ using ext::oneapi::sub_group;
1717
// TODO move the entire sub_group class implementation to this file once
1818
// breaking changes are allowed.
1919

20+
namespace ext {
21+
namespace oneapi {
2022
namespace experimental {
2123
inline sub_group this_sub_group() {
2224
#ifdef __SYCL_DEVICE_ONLY__
@@ -27,5 +29,7 @@ inline sub_group this_sub_group() {
2729
#endif
2830
}
2931
} // namespace experimental
32+
} // namespace oneapi
33+
} // namespace ext
3034
} // namespace sycl
3135
} // __SYCL_INLINE_NAMESPACE(cl)

‎sycl/include/sycl/ext/oneapi/sub_group.hpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,11 @@ void store(multi_ptr<T, Space> dst, const vec<T, N> &x) {
100100
namespace ext {
101101
namespace oneapi {
102102

103+
struct sub_group;
104+
namespace experimental {
105+
inline sub_group this_sub_group();
106+
}
107+
103108
struct sub_group {
104109

105110
using id_type = id<1>;
@@ -733,9 +738,12 @@ struct sub_group {
733738
protected:
734739
template <int dimensions> friend class cl::sycl::nd_item;
735740
friend sub_group this_sub_group();
741+
friend sub_group experimental::this_sub_group();
736742
sub_group() = default;
737743
};
738744

745+
__SYCL_DEPRECATED(
746+
"use sycl::ext::oneapi::experimental::this_sub_group() instead")
739747
inline sub_group this_sub_group() {
740748
#ifdef __SYCL_DEVICE_ONLY__
741749
return sub_group();

‎sycl/test/basic_tests/free_function_queries/free_function_queries_interface.cpp

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,27 +13,30 @@
1313
#include <type_traits>
1414

1515
template <int Dims> struct this_id_caller {
16-
auto operator()() const -> decltype(sycl::experimental::this_id<Dims>()) {
17-
return sycl::experimental::this_id<Dims>();
16+
auto operator()() const
17+
-> decltype(sycl::ext::oneapi::experimental::this_id<Dims>()) {
18+
return sycl::ext::oneapi::experimental::this_id<Dims>();
1819
}
1920
};
2021

2122
template <int Dims> struct this_item_caller {
22-
auto operator()() const -> decltype(sycl::experimental::this_item<Dims>()) {
23-
return sycl::experimental::this_item<Dims>();
23+
auto operator()() const
24+
-> decltype(sycl::ext::oneapi::experimental::this_item<Dims>()) {
25+
return sycl::ext::oneapi::experimental::this_item<Dims>();
2426
}
2527
};
2628

2729
template <int Dims> struct this_nd_item_caller {
2830
auto operator()() const
29-
-> decltype(sycl::experimental::this_nd_item<Dims>()) {
30-
return sycl::experimental::this_nd_item<Dims>();
31+
-> decltype(sycl::ext::oneapi::experimental::this_nd_item<Dims>()) {
32+
return sycl::ext::oneapi::experimental::this_nd_item<Dims>();
3133
}
3234
};
3335

3436
template <int Dims> struct this_group_caller {
35-
auto operator()() const -> decltype(sycl::experimental::this_group<Dims>()) {
36-
return sycl::experimental::this_group<Dims>();
37+
auto operator()() const
38+
-> decltype(sycl::ext::oneapi::experimental::this_group<Dims>()) {
39+
return sycl::ext::oneapi::experimental::this_group<Dims>();
3740
}
3841
};
3942

@@ -67,6 +70,8 @@ int main() {
6770
test<sycl::group>(this_group_caller<2>{});
6871
test<sycl::group>(this_group_caller<3>{});
6972

70-
static_assert(std::is_same<decltype(sycl::ext::oneapi::this_sub_group()),
71-
sycl::ext::oneapi::sub_group>::value,
73+
static_assert(
74+
std::is_same<decltype(sycl::ext::oneapi::experimental::this_sub_group()),
75+
sycl::ext::oneapi::sub_group>::value,
76+
"Wrong return type of free function query for Sub Group");
7277
}

‎sycl/test/warnings/free_functions_deprecation.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
#include <CL/sycl.hpp>
44

55
int main() {
6-
// expected-warning@+1 {{'this_group<1>' is deprecated: use sycl::experimental::this_group() instead}}
6+
// expected-warning@+1 {{'this_group<1>' is deprecated: use sycl::ext::oneapi::experimental::this_group() instead}}
77
(void)sycl::this_group<1>();
8-
// expected-warning@+1 {{'this_item<1>' is deprecated: use sycl::experimental::this_item() instead}}
8+
// expected-warning@+1 {{'this_item<1>' is deprecated: use sycl::ext::oneapi::experimental::this_item() instead}}
99
(void)sycl::this_item<1>();
10-
// expected-warning@+1 {{'this_nd_item<1>' is deprecated: use sycl::experimental::this_nd_item() instead}}
10+
// expected-warning@+1 {{'this_nd_item<1>' is deprecated: use sycl::ext::oneapi::experimental::this_nd_item() instead}}
1111
(void)sycl::this_nd_item<1>();
12-
// expected-warning@+1 {{'this_id<1>' is deprecated: use sycl::experimental::this_id() instead}}
12+
// expected-warning@+1 {{'this_id<1>' is deprecated: use sycl::ext::oneapi::experimental::this_id() instead}}
1313
(void)sycl::this_id<1>();
14-
// expected-warning@+1 {{'this_sub_group' is deprecated: use sycl::experimental::this_sub_group() instead}}
15-
(void)sycl::ONEAPI::this_sub_group();
14+
// expected-warning@+1 {{'this_sub_group' is deprecated: use sycl::ext::oneapi::experimental::this_sub_group() instead}}
15+
(void)sycl::ext::oneapi::this_sub_group();
1616

1717
return 0;
1818
}

0 commit comments

Comments
 (0)