Skip to content

Commit 229e9c4

Browse files
KornevNikitaKornevNikita
authored
[SYCL] Use new empty_properties_t alias (#11476)
Spec: #11439
1 parent cbcd010 commit 229e9c4

File tree

8 files changed

+63
-64
lines changed

8 files changed

+63
-64
lines changed

‎sycl/include/sycl/ext/intel/experimental/fpga_mem/fpga_mem.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,15 +82,15 @@ using properties_t = ext::oneapi::experimental::detail::properties_t<Props...>;
8282

8383
// Empty property list specialization
8484
template <typename T, typename PropertyListT =
85-
ext::oneapi::experimental::detail::empty_properties_t>
85+
ext::oneapi::experimental::empty_properties_t>
8686
class
8787
#ifdef __SYCL_DEVICE_ONLY__
8888
[[__sycl_detail__::add_ir_attributes_global_variable("sycl-resource",
8989
"DEFAULT")]]
9090
#endif
9191
fpga_mem : public detail::fpga_mem_base<T> {
9292

93-
using property_list_t = ext::oneapi::experimental::detail::empty_properties_t;
93+
using property_list_t = ext::oneapi::experimental::empty_properties_t;
9494

9595
// Inherits the base class' constructors
9696
using detail::fpga_mem_base<T>::fpga_mem_base;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ class device_global_base<
111111
};
112112
} // namespace detail
113113

114-
template <typename T, typename PropertyListT = detail::empty_properties_t>
114+
template <typename T, typename PropertyListT = empty_properties_t>
115115
class
116116
#ifdef __SYCL_DEVICE_ONLY__
117117
// FIXME: Temporary work-around. Remove when fixed.

‎sycl/include/sycl/ext/oneapi/experimental/annotated_arg/annotated_arg.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ annotated_arg(annotated_arg<T, old>, properties<std::tuple<ArgT...>>)
5151
-> annotated_arg<
5252
T, detail::merged_properties_t<old, detail::properties_t<ArgT...>>>;
5353

54-
template <typename T, typename PropertyListT = detail::empty_properties_t>
54+
template <typename T, typename PropertyListT = empty_properties_t>
5555
class annotated_arg {
5656
// This should always fail when instantiating the unspecialized version.
5757
static_assert(is_property_list<PropertyListT>::value,

‎sycl/include/sycl/ext/oneapi/experimental/annotated_ptr/annotated_ptr.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ struct PropertiesFilter {
5959
std::tuple<>>::type...>;
6060
};
6161
} // namespace
62-
template <typename T, typename PropertyListT = detail::empty_properties_t>
62+
template <typename T, typename PropertyListT = empty_properties_t>
6363
class annotated_ref {
6464
// This should always fail when instantiating the unspecialized version.
6565
static_assert(is_property_list<PropertyListT>::value,
@@ -143,7 +143,7 @@ annotated_ptr(annotated_ptr<T, old>, properties<std::tuple<ArgT...>>)
143143
T, detail::merged_properties_t<old, detail::properties_t<ArgT...>>>;
144144
#endif // __cpp_deduction_guides
145145

146-
template <typename T, typename PropertyListT = detail::empty_properties_t>
146+
template <typename T, typename PropertyListT = empty_properties_t>
147147
class annotated_ptr {
148148
// This should always fail when instantiating the unspecialized version.
149149
static_assert(is_property_list<PropertyListT>::value,

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,8 @@ properties(PropertyValueTs... props)
187187
-> properties<typename detail::Sorted<PropertyValueTs...>::type>;
188188
#endif
189189

190+
using empty_properties_t = decltype(properties{});
191+
190192
// Property list traits
191193
template <typename propertiesT> struct is_property_list : std::false_type {};
192194
template <typename... PropertyValueTs>

‎sycl/include/sycl/handler.hpp

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -907,8 +907,8 @@ class __SYCL_EXPORT handler {
907907
/// Process kernel properties.
908908
///
909909
/// Stores information about kernel properties into the handler.
910-
template <typename PropertiesT =
911-
ext::oneapi::experimental::detail::empty_properties_t>
910+
template <
911+
typename PropertiesT = ext::oneapi::experimental::empty_properties_t>
912912
void processProperties(PropertiesT Props) {
913913
static_assert(
914914
ext::oneapi::experimental::is_property_list<PropertiesT>::value,
@@ -1214,9 +1214,9 @@ class __SYCL_EXPORT handler {
12141214
///
12151215
/// \param NumWorkItems is a range defining indexing space.
12161216
/// \param KernelFunc is a SYCL kernel function.
1217-
template <typename KernelName, typename KernelType, int Dims,
1218-
typename PropertiesT =
1219-
ext::oneapi::experimental::detail::empty_properties_t>
1217+
template <
1218+
typename KernelName, typename KernelType, int Dims,
1219+
typename PropertiesT = ext::oneapi::experimental::empty_properties_t>
12201220
void parallel_for_lambda_impl(range<Dims> UserRange, PropertiesT Props,
12211221
KernelType KernelFunc) {
12221222
throwIfActionIsCreated();
@@ -1375,9 +1375,9 @@ class __SYCL_EXPORT handler {
13751375
/// \param NumWorkGroups is a range describing the number of work-groups in
13761376
/// each dimension.
13771377
/// \param KernelFunc is a lambda representing kernel.
1378-
template <typename KernelName, typename KernelType, int Dims,
1379-
typename PropertiesT =
1380-
ext::oneapi::experimental::detail::empty_properties_t>
1378+
template <
1379+
typename KernelName, typename KernelType, int Dims,
1380+
typename PropertiesT = ext::oneapi::experimental::empty_properties_t>
13811381
void parallel_for_work_group_lambda_impl(range<Dims> NumWorkGroups,
13821382
PropertiesT Props,
13831383
_KERNELFUNCPARAM(KernelFunc)) {
@@ -1414,9 +1414,9 @@ class __SYCL_EXPORT handler {
14141414
/// \param WorkGroupSize is a range describing the size of work-groups in
14151415
/// each dimension.
14161416
/// \param KernelFunc is a lambda representing kernel.
1417-
template <typename KernelName, typename KernelType, int Dims,
1418-
typename PropertiesT =
1419-
ext::oneapi::experimental::detail::empty_properties_t>
1417+
template <
1418+
typename KernelName, typename KernelType, int Dims,
1419+
typename PropertiesT = ext::oneapi::experimental::empty_properties_t>
14201420
void parallel_for_work_group_lambda_impl(range<Dims> NumWorkGroups,
14211421
range<Dims> WorkGroupSize,
14221422
PropertiesT Props,
@@ -1643,9 +1643,9 @@ class __SYCL_EXPORT handler {
16431643
// NOTE: to support kernel_handler argument in kernel lambdas, only
16441644
// kernel_***_wrapper functions must be called in this code
16451645

1646-
template <typename KernelName, typename KernelType,
1647-
typename PropertiesT =
1648-
ext::oneapi::experimental::detail::empty_properties_t>
1646+
template <
1647+
typename KernelName, typename KernelType,
1648+
typename PropertiesT = ext::oneapi::experimental::empty_properties_t>
16491649
void kernel_single_task_wrapper(_KERNELFUNCPARAM(KernelFunc)) {
16501650
unpack<KernelType, PropertiesT,
16511651
detail::KernelLambdaHasKernelHandlerArgT<KernelType>::value>(
@@ -1655,9 +1655,9 @@ class __SYCL_EXPORT handler {
16551655
});
16561656
}
16571657

1658-
template <typename KernelName, typename ElementType, typename KernelType,
1659-
typename PropertiesT =
1660-
ext::oneapi::experimental::detail::empty_properties_t>
1658+
template <
1659+
typename KernelName, typename ElementType, typename KernelType,
1660+
typename PropertiesT = ext::oneapi::experimental::empty_properties_t>
16611661
void kernel_parallel_for_wrapper(_KERNELFUNCPARAM(KernelFunc)) {
16621662
unpack<KernelType, PropertiesT,
16631663
detail::KernelLambdaHasKernelHandlerArgT<KernelType,
@@ -1668,9 +1668,9 @@ class __SYCL_EXPORT handler {
16681668
});
16691669
}
16701670

1671-
template <typename KernelName, typename ElementType, typename KernelType,
1672-
typename PropertiesT =
1673-
ext::oneapi::experimental::detail::empty_properties_t>
1671+
template <
1672+
typename KernelName, typename ElementType, typename KernelType,
1673+
typename PropertiesT = ext::oneapi::experimental::empty_properties_t>
16741674
void kernel_parallel_for_work_group_wrapper(_KERNELFUNCPARAM(KernelFunc)) {
16751675
unpack<KernelType, PropertiesT,
16761676
detail::KernelLambdaHasKernelHandlerArgT<KernelType,
@@ -1688,9 +1688,9 @@ class __SYCL_EXPORT handler {
16881688
/// a kernel name for it.
16891689
///
16901690
/// \param KernelFunc is a SYCL kernel function.
1691-
template <typename KernelName, typename KernelType,
1692-
typename PropertiesT =
1693-
ext::oneapi::experimental::detail::empty_properties_t>
1691+
template <
1692+
typename KernelName, typename KernelType,
1693+
typename PropertiesT = ext::oneapi::experimental::empty_properties_t>
16941694
void single_task_lambda_impl(PropertiesT Props,
16951695
_KERNELFUNCPARAM(KernelFunc)) {
16961696
(void)Props;
@@ -1881,27 +1881,27 @@ class __SYCL_EXPORT handler {
18811881
template <typename KernelName = detail::auto_name, typename KernelType>
18821882
void single_task(_KERNELFUNCPARAM(KernelFunc)) {
18831883
single_task_lambda_impl<KernelName>(
1884-
ext::oneapi::experimental::detail::empty_properties_t{}, KernelFunc);
1884+
ext::oneapi::experimental::empty_properties_t{}, KernelFunc);
18851885
}
18861886

18871887
template <typename KernelName = detail::auto_name, typename KernelType>
18881888
void parallel_for(range<1> NumWorkItems, _KERNELFUNCPARAM(KernelFunc)) {
18891889
parallel_for_lambda_impl<KernelName>(
1890-
NumWorkItems, ext::oneapi::experimental::detail::empty_properties_t{},
1890+
NumWorkItems, ext::oneapi::experimental::empty_properties_t{},
18911891
std::move(KernelFunc));
18921892
}
18931893

18941894
template <typename KernelName = detail::auto_name, typename KernelType>
18951895
void parallel_for(range<2> NumWorkItems, _KERNELFUNCPARAM(KernelFunc)) {
18961896
parallel_for_lambda_impl<KernelName>(
1897-
NumWorkItems, ext::oneapi::experimental::detail::empty_properties_t{},
1897+
NumWorkItems, ext::oneapi::experimental::empty_properties_t{},
18981898
std::move(KernelFunc));
18991899
}
19001900

19011901
template <typename KernelName = detail::auto_name, typename KernelType>
19021902
void parallel_for(range<3> NumWorkItems, _KERNELFUNCPARAM(KernelFunc)) {
19031903
parallel_for_lambda_impl<KernelName>(
1904-
NumWorkItems, ext::oneapi::experimental::detail::empty_properties_t{},
1904+
NumWorkItems, ext::oneapi::experimental::empty_properties_t{},
19051905
std::move(KernelFunc));
19061906
}
19071907

@@ -1968,7 +1968,7 @@ class __SYCL_EXPORT handler {
19681968
void parallel_for_work_group(range<Dims> NumWorkGroups,
19691969
_KERNELFUNCPARAM(KernelFunc)) {
19701970
parallel_for_work_group_lambda_impl<KernelName>(
1971-
NumWorkGroups, ext::oneapi::experimental::detail::empty_properties_t{},
1971+
NumWorkGroups, ext::oneapi::experimental::empty_properties_t{},
19721972
KernelFunc);
19731973
}
19741974

@@ -1991,7 +1991,7 @@ class __SYCL_EXPORT handler {
19911991
_KERNELFUNCPARAM(KernelFunc)) {
19921992
parallel_for_work_group_lambda_impl<KernelName>(
19931993
NumWorkGroups, WorkGroupSize,
1994-
ext::oneapi::experimental::detail::empty_properties_t{}, KernelFunc);
1994+
ext::oneapi::experimental::empty_properties_t{}, KernelFunc);
19951995
}
19961996

19971997
/// Invokes a SYCL kernel.
@@ -2388,25 +2388,25 @@ class __SYCL_EXPORT handler {
23882388
template <typename KernelName = detail::auto_name, typename... RestT>
23892389
std::enable_if_t<detail::AreAllButLastReductions<RestT...>::value>
23902390
parallel_for(range<1> Range, RestT &&...Rest) {
2391-
parallel_for<KernelName>(
2392-
Range, ext::oneapi::experimental::detail::empty_properties_t{},
2393-
std::forward<RestT>(Rest)...);
2391+
parallel_for<KernelName>(Range,
2392+
ext::oneapi::experimental::empty_properties_t{},
2393+
std::forward<RestT>(Rest)...);
23942394
}
23952395

23962396
template <typename KernelName = detail::auto_name, typename... RestT>
23972397
std::enable_if_t<detail::AreAllButLastReductions<RestT...>::value>
23982398
parallel_for(range<2> Range, RestT &&...Rest) {
2399-
parallel_for<KernelName>(
2400-
Range, ext::oneapi::experimental::detail::empty_properties_t{},
2401-
std::forward<RestT>(Rest)...);
2399+
parallel_for<KernelName>(Range,
2400+
ext::oneapi::experimental::empty_properties_t{},
2401+
std::forward<RestT>(Rest)...);
24022402
}
24032403

24042404
template <typename KernelName = detail::auto_name, typename... RestT>
24052405
std::enable_if_t<detail::AreAllButLastReductions<RestT...>::value>
24062406
parallel_for(range<3> Range, RestT &&...Rest) {
2407-
parallel_for<KernelName>(
2408-
Range, ext::oneapi::experimental::detail::empty_properties_t{},
2409-
std::forward<RestT>(Rest)...);
2407+
parallel_for<KernelName>(Range,
2408+
ext::oneapi::experimental::empty_properties_t{},
2409+
std::forward<RestT>(Rest)...);
24102410
}
24112411

24122412
template <typename KernelName = detail::auto_name, int Dims,
@@ -2426,9 +2426,9 @@ class __SYCL_EXPORT handler {
24262426
typename... RestT>
24272427
std::enable_if_t<detail::AreAllButLastReductions<RestT...>::value>
24282428
parallel_for(nd_range<Dims> Range, RestT &&...Rest) {
2429-
parallel_for<KernelName>(
2430-
Range, ext::oneapi::experimental::detail::empty_properties_t{},
2431-
std::forward<RestT>(Rest)...);
2429+
parallel_for<KernelName>(Range,
2430+
ext::oneapi::experimental::empty_properties_t{},
2431+
std::forward<RestT>(Rest)...);
24322432
}
24332433

24342434
/// }@
@@ -3605,7 +3605,7 @@ class __SYCL_EXPORT handler {
36053605
ext::oneapi::experimental::is_property_list<PropertiesT>::value>
36063606
throwIfGraphAssociatedAndKernelProperties() const {
36073607
if (!std::is_same_v<PropertiesT,
3608-
ext::oneapi::experimental::detail::empty_properties_t>)
3608+
ext::oneapi::experimental::empty_properties_t>)
36093609
throwIfGraphAssociated<
36103610
ext::oneapi::experimental::detail::UnsupportedGraphFeatures::
36113611
sycl_ext_oneapi_kernel_properties>();

‎sycl/include/sycl/queue.hpp

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2184,8 +2184,7 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase<queue> {
21842184
_KERNELFUNCPARAM(KernelFunc),
21852185
const detail::code_location &CodeLoc = detail::code_location::current()) {
21862186
return single_task<KernelName, KernelType>(
2187-
ext::oneapi::experimental::detail::empty_properties_t{}, KernelFunc,
2188-
CodeLoc);
2187+
ext::oneapi::experimental::empty_properties_t{}, KernelFunc, CodeLoc);
21892188
}
21902189

21912190
/// single_task version with a kernel represented as a lambda.
@@ -2229,8 +2228,8 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase<queue> {
22292228
event DepEvent, _KERNELFUNCPARAM(KernelFunc),
22302229
const detail::code_location &CodeLoc = detail::code_location::current()) {
22312230
return single_task<KernelName, KernelType>(
2232-
DepEvent, ext::oneapi::experimental::detail::empty_properties_t{},
2233-
KernelFunc, CodeLoc);
2231+
DepEvent, ext::oneapi::experimental::empty_properties_t{}, KernelFunc,
2232+
CodeLoc);
22342233
}
22352234

22362235
/// single_task version with a kernel represented as a lambda.
@@ -2277,8 +2276,8 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase<queue> {
22772276
const std::vector<event> &DepEvents, _KERNELFUNCPARAM(KernelFunc),
22782277
const detail::code_location &CodeLoc = detail::code_location::current()) {
22792278
return single_task<KernelName, KernelType>(
2280-
DepEvents, ext::oneapi::experimental::detail::empty_properties_t{},
2281-
KernelFunc, CodeLoc);
2279+
DepEvents, ext::oneapi::experimental::empty_properties_t{}, KernelFunc,
2280+
CodeLoc);
22822281
}
22832282

22842283
/// parallel_for version with a kernel represented as a lambda + range that
@@ -2521,8 +2520,7 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase<queue> {
25212520
std::enable_if_t<detail::AreAllButLastReductions<RestT...>::value, event>
25222521
parallel_for(nd_range<Dims> Range, RestT &&...Rest) {
25232522
return parallel_for<KernelName>(
2524-
Range, ext::oneapi::experimental::detail::empty_properties_t{},
2525-
Rest...);
2523+
Range, ext::oneapi::experimental::empty_properties_t{}, Rest...);
25262524
}
25272525

25282526
/// parallel_for version with a kernel represented as a lambda + nd_range that
@@ -2884,8 +2882,7 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase<queue> {
28842882
std::enable_if_t<detail::AreAllButLastReductions<RestT...>::value, event>
28852883
parallel_for_impl(range<Dims> Range, RestT &&...Rest) {
28862884
return parallel_for_impl<KernelName>(
2887-
Range, ext::oneapi::experimental::detail::empty_properties_t{},
2888-
Rest...);
2885+
Range, ext::oneapi::experimental::empty_properties_t{}, Rest...);
28892886
}
28902887

28912888
/// parallel_for_impl with a kernel represented as a lambda + range that
@@ -2923,8 +2920,8 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase<queue> {
29232920
template <typename KernelName, int Dims, typename... RestT>
29242921
event parallel_for_impl(range<Dims> Range, event DepEvent, RestT &&...Rest) {
29252922
return parallel_for_impl<KernelName>(
2926-
Range, DepEvent,
2927-
ext::oneapi::experimental::detail::empty_properties_t{}, Rest...);
2923+
Range, DepEvent, ext::oneapi::experimental::empty_properties_t{},
2924+
Rest...);
29282925
}
29292926

29302927
/// parallel_for_impl version with a kernel represented as a lambda + range
@@ -2966,8 +2963,8 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase<queue> {
29662963
const std::vector<event> &DepEvents,
29672964
RestT &&...Rest) {
29682965
return parallel_for_impl<KernelName>(
2969-
Range, DepEvents,
2970-
ext::oneapi::experimental::detail::empty_properties_t{}, Rest...);
2966+
Range, DepEvents, ext::oneapi::experimental::empty_properties_t{},
2967+
Rest...);
29712968
}
29722969

29732970
buffer<detail::AssertHappened, 1> &getAssertHappenedBuffer();

‎sycl/test-e2e/Reduction/reduction_internal.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ static void test(RedStorage &Storage, RangeTy Range) {
7777
return reduction(Red, cgh, BinOpTy{});
7878
}();
7979
detail::reduction_parallel_for<detail::auto_name, Strategy>(
80-
cgh, Range, ext::oneapi::experimental::detail::empty_properties_t{},
81-
RedSycl, [=](auto Item, auto &Red) { Red.combine(T{1}); });
80+
cgh, Range, ext::oneapi::experimental::empty_properties_t{}, RedSycl,
81+
[=](auto Item, auto &Red) { Red.combine(T{1}); });
8282
}).wait();
8383

8484
auto *Result = malloc_shared<T>(1, q);

0 commit comments

Comments
 (0)