Skip to content

Commit ac2c5bb

Browse files
slawekptakslawekptak
committed
Addressed more review comments
1 parent 9041e94 commit ac2c5bb

File tree

3 files changed

+5
-23
lines changed

3 files changed

+5
-23
lines changed

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

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -112,26 +112,22 @@ event submit_with_event_impl(const queue &Q, PropertiesT Props,
112112
Props, detail::type_erased_cgfo_ty{CGF}, CodeLoc);
113113
}
114114

115-
#ifdef __DPCPP_ENABLE_UNFINISHED_NO_CGH_SUBMIT
116115
template <typename KernelName, typename PropertiesT, typename KernelType,
117116
int Dims>
118117
void submit_direct_impl(const queue &Q, PropertiesT Props, nd_range<Dims> Range,
119118
const KernelType &KernelFunc,
120119
const sycl::detail::code_location &CodeLoc) {
121-
Q.submit_direct_without_event<KernelName,
122-
PropertiesT, KernelType, Dims>(
120+
Q.submit_direct_without_event<KernelName, PropertiesT, KernelType, Dims>(
123121
Props, Range, KernelFunc, CodeLoc);
124122
}
125123
template <typename KernelName, typename PropertiesT, typename KernelType,
126124
int Dims>
127125
event submit_direct_with_event_impl(
128126
const queue &Q, PropertiesT Props, nd_range<Dims> Range,
129127
const KernelType &KernelFunc, const sycl::detail::code_location &CodeLoc) {
130-
return Q.submit_direct_with_event<KernelName,
131-
PropertiesT, KernelType, Dims>(
128+
return Q.submit_direct_with_event<KernelName, PropertiesT, KernelType, Dims>(
132129
Props, Range, KernelFunc, CodeLoc);
133130
}
134-
#endif //__DPCPP_ENABLE_UNFINISHED_NO_CGH_SUBMIT
135131
} // namespace detail
136132

137133
template <typename CommandGroupFunc, typename PropertiesT>
@@ -149,7 +145,6 @@ void submit(const queue &Q, CommandGroupFunc &&CGF,
149145
submit(Q, empty_properties_t{}, std::forward<CommandGroupFunc>(CGF), CodeLoc);
150146
}
151147

152-
#ifdef __DPCPP_ENABLE_UNFINISHED_NO_CGH_SUBMIT
153148
template <typename KernelName = sycl::detail::auto_name, typename PropertiesT,
154149
typename KernelType, int Dims>
155150
void submit(const queue &Q, PropertiesT Props, nd_range<Dims> Range,
@@ -160,7 +155,6 @@ void submit(const queue &Q, PropertiesT Props, nd_range<Dims> Range,
160155
KernelName, PropertiesT, KernelType, Dims>(Q, Props, Range, KernelFunc,
161156
CodeLoc);
162157
}
163-
#endif //__DPCPP_ENABLE_UNFINISHED_NO_CGH_SUBMIT
164158

165159
template <typename CommandGroupFunc, typename PropertiesT>
166160
event submit_with_event(const queue &Q, PropertiesT Props,
@@ -179,7 +173,6 @@ event submit_with_event(const queue &Q, CommandGroupFunc &&CGF,
179173
std::forward<CommandGroupFunc>(CGF), CodeLoc);
180174
}
181175

182-
#ifdef __DPCPP_ENABLE_UNFINISHED_NO_CGH_SUBMIT
183176
template <typename KernelName = sycl::detail::auto_name, typename PropertiesT,
184177
typename KernelType, int Dims>
185178
event submit_with_event(const queue &Q, PropertiesT Props, nd_range<Dims> Range,
@@ -190,7 +183,6 @@ event submit_with_event(const queue &Q, PropertiesT Props, nd_range<Dims> Range,
190183
KernelName, PropertiesT, KernelType, Dims>(Q, Props, Range, KernelFunc,
191184
CodeLoc);
192185
}
193-
#endif //__DPCPP_ENABLE_UNFINISHED_NO_CGH_SUBMIT
194186

195187
template <typename KernelName = sycl::detail::auto_name, typename KernelType>
196188
void single_task(handler &CGH, const KernelType &KernelObj) {

‎sycl/include/sycl/khr/free_function_commands.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ void launch_grouped(const queue &q, range<1> r, range<1> size,
154154
const sycl::detail::code_location &codeLoc =
155155
sycl::detail::code_location::current()) {
156156
#ifdef __DPCPP_ENABLE_UNFINISHED_NO_CGH_SUBMIT
157-
submit(std::move(q), ext::oneapi::experimental::empty_properties_t{},
157+
submit(q, ext::oneapi::experimental::empty_properties_t{},
158158
nd_range<1>(r, size), k);
159159
#else
160160
submit(
@@ -168,7 +168,7 @@ void launch_grouped(const queue &q, range<2> r, range<2> size,
168168
const sycl::detail::code_location &codeLoc =
169169
sycl::detail::code_location::current()) {
170170
#ifdef __DPCPP_ENABLE_UNFINISHED_NO_CGH_SUBMIT
171-
submit(std::move(q), ext::oneapi::experimental::empty_properties_t{},
171+
submit(q, ext::oneapi::experimental::empty_properties_t{},
172172
nd_range<2>(r, size), k);
173173
#else
174174
submit(
@@ -182,7 +182,7 @@ void launch_grouped(const queue &q, range<3> r, range<3> size,
182182
const sycl::detail::code_location &codeLoc =
183183
sycl::detail::code_location::current()) {
184184
#ifdef __DPCPP_ENABLE_UNFINISHED_NO_CGH_SUBMIT
185-
submit(std::move(q), ext::oneapi::experimental::empty_properties_t{},
185+
submit(q, ext::oneapi::experimental::empty_properties_t{},
186186
nd_range<3>(r, size), k);
187187
#else
188188
submit(

‎sycl/include/sycl/queue.hpp‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,6 @@ event submit_with_event_impl(const queue &Q, PropertiesT Props,
234234
CommandGroupFunc &&CGF,
235235
const sycl::detail::code_location &CodeLoc);
236236

237-
#ifdef __DPCPP_ENABLE_UNFINISHED_NO_CGH_SUBMIT
238237
template <typename KernelName, typename PropertiesT, typename KernelType,
239238
int Dims>
240239
void submit_direct_impl(const queue &Q, PropertiesT Props, nd_range<Dims> Range,
@@ -247,7 +246,6 @@ event submit_direct_with_event_impl(const queue &Q, PropertiesT Props,
247246
nd_range<Dims> Range,
248247
const KernelType &KernelFunc,
249248
const sycl::detail::code_location &CodeLoc);
250-
#endif //__DPCPP_ENABLE_UNFINISHED_NO_CGH_SUBMIT
251249
} // namespace detail
252250
} // namespace ext::oneapi::experimental
253251

@@ -3687,7 +3685,6 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase<queue> {
36873685
const queue &Q, PropertiesT Props, CommandGroupFunc &&CGF,
36883686
const sycl::detail::code_location &CodeLoc);
36893687

3690-
#ifdef __DPCPP_ENABLE_UNFINISHED_NO_CGH_SUBMIT
36913688
template <typename KernelName, typename PropertiesT, typename KernelType,
36923689
int Dims>
36933690
friend void ext::oneapi::experimental::detail::submit_direct_impl(
@@ -3700,8 +3697,6 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase<queue> {
37003697
const queue &Q, PropertiesT Props, nd_range<Dims> Range,
37013698
const KernelType &KernelFunc, const sycl::detail::code_location &CodeLoc);
37023699

3703-
#endif //__DPCPP_ENABLE_UNFINISHED_NO_CGH_SUBMIT
3704-
37053700
template <typename PropertiesT>
37063701
void ProcessSubmitProperties(PropertiesT Props,
37073702
detail::v1::SubmissionInfo &SI) const {
@@ -3715,7 +3710,6 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase<queue> {
37153710
}
37163711
}
37173712

3718-
#ifdef __DPCPP_ENABLE_UNFINISHED_NO_CGH_SUBMIT
37193713
template <int Dims, typename LambdaArgType> struct TransformUserItemType {
37203714
using type = std::conditional_t<
37213715
std::is_convertible_v<nd_item<Dims>, LambdaArgType>, nd_item<Dims>,
@@ -3745,7 +3739,6 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase<queue> {
37453739
KRInfo.KernelNameBasedCachePtr() =
37463740
detail::getKernelNameBasedCache<KernelName>();
37473741
}
3748-
#endif //__DPCPP_ENABLE_UNFINISHED_NO_CGH_SUBMIT
37493742

37503743
#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
37513744
/// TODO: Unused. Remove these when ABI-break window is open.
@@ -3890,8 +3883,6 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase<queue> {
38903883
TlsCodeLocCapture.isToplevel());
38913884
}
38923885

3893-
#ifdef __DPCPP_ENABLE_UNFINISHED_NO_CGH_SUBMIT
3894-
38953886
template <typename KernelName = detail::auto_name,
38963887
typename PropertiesT, typename KernelType, int Dims>
38973888
event submit_direct_with_event(PropertiesT Props, nd_range<Dims> Range,
@@ -3941,7 +3932,6 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase<queue> {
39413932
TlsCodeLocCapture.query(),
39423933
TlsCodeLocCapture.isToplevel());
39433934
}
3944-
#endif //__DPCPP_ENABLE_UNFINISHED_NO_CGH_SUBMIT
39453935

39463936
/// Submits a command group function object to the queue, in order to be
39473937
/// scheduled for execution on the device.

0 commit comments

Comments
 (0)