Skip to content

Commit 72dc199

Browse files
slawekptakslawekptak
committed
Rename KernelRuntimeInfo to KernelDataDesc
1 parent 3375e77 commit 72dc199

File tree

4 files changed

+54
-54
lines changed

4 files changed

+54
-54
lines changed

‎sycl/include/sycl/queue.hpp‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -144,17 +144,17 @@ using KernelParamDescGetterFuncPtr = detail::kernel_param_desc_t (*)(int);
144144

145145
// This class is intended to store the kernel runtime information,
146146
// extracted from the compile time kernel structures.
147-
class __SYCL_EXPORT KernelRuntimeInfo {
147+
class __SYCL_EXPORT KernelDataDesc {
148148
public:
149-
KernelRuntimeInfo() {}
149+
KernelDataDesc() {}
150150

151-
KernelRuntimeInfo(const KernelRuntimeInfo &rhs) = delete;
151+
KernelDataDesc(const KernelDataDesc &rhs) = delete;
152152

153-
KernelRuntimeInfo(KernelRuntimeInfo &&rhs) = delete;
153+
KernelDataDesc(KernelDataDesc &&rhs) = delete;
154154

155-
KernelRuntimeInfo &operator=(const KernelRuntimeInfo &rhs) = delete;
155+
KernelDataDesc &operator=(const KernelDataDesc &rhs) = delete;
156156

157-
KernelRuntimeInfo &operator=(KernelRuntimeInfo &&rhs) = delete;
157+
KernelDataDesc &operator=(KernelDataDesc &&rhs) = delete;
158158

159159
std::shared_ptr<detail::HostKernelBase> &HostKernel() { return MHostKernel; }
160160
const std::shared_ptr<detail::HostKernelBase> &HostKernel() const {
@@ -3693,8 +3693,8 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase<queue> {
36933693

36943694
template <typename KernelName, typename KernelType, int Dims,
36953695
detail::WrapAs WrapAsVal>
3696-
void ProcessKernelRuntimeInfo(const KernelType &KernelFunc,
3697-
detail::v1::KernelRuntimeInfo &KRInfo) const {
3696+
void ProcessKernelDataDesc(const KernelType &KernelFunc,
3697+
detail::v1::KernelDataDesc &KDDesc) const {
36983698

36993699
using LambdaArgType = sycl::detail::lambda_arg_type<KernelType, item<Dims>>;
37003700
using TransformedArgType = std::conditional_t<
@@ -3704,11 +3704,11 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase<queue> {
37043704
typename TransformUserItemType<Dims, LambdaArgType>::type>,
37053705
void>;
37063706

3707-
KRInfo.HostKernel().reset(
3707+
KDDesc.HostKernel().reset(
37083708
new detail::HostKernel<KernelType, TransformedArgType, Dims>(
37093709
KernelFunc));
37103710

3711-
KRInfo.DeviceKernelInfoPtr() = &detail::getDeviceKernelInfo<KernelName>();
3711+
KDDesc.DeviceKernelInfoPtr() = &detail::getDeviceKernelInfo<KernelName>();
37123712
}
37133713

37143714
#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
@@ -3783,27 +3783,27 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase<queue> {
37833783
bool IsTopCodeLoc) const;
37843784

37853785
event submit_kernel_direct_with_event_impl(
3786-
nd_range<1> Range, const detail::v1::KernelRuntimeInfo &KRInfo,
3786+
nd_range<1> Range, const detail::v1::KernelDataDesc &KDDesc,
37873787
const detail::code_location &CodeLoc, bool IsTopCodeLoc) const;
37883788

37893789
event submit_kernel_direct_with_event_impl(
3790-
nd_range<2> Range, const detail::v1::KernelRuntimeInfo &KRInfo,
3790+
nd_range<2> Range, const detail::v1::KernelDataDesc &KDDesc,
37913791
const detail::code_location &CodeLoc, bool IsTopCodeLoc) const;
37923792

37933793
event submit_kernel_direct_with_event_impl(
3794-
nd_range<3> Range, const detail::v1::KernelRuntimeInfo &KRInfo,
3794+
nd_range<3> Range, const detail::v1::KernelDataDesc &KDDesc,
37953795
const detail::code_location &CodeLoc, bool IsTopCodeLoc) const;
37963796

37973797
void submit_kernel_direct_without_event_impl(
3798-
nd_range<1> Range, const detail::v1::KernelRuntimeInfo &KRInfo,
3798+
nd_range<1> Range, const detail::v1::KernelDataDesc &KDDesc,
37993799
const detail::code_location &CodeLoc, bool IsTopCodeLoc) const;
38003800

38013801
void submit_kernel_direct_without_event_impl(
3802-
nd_range<2> Range, const detail::v1::KernelRuntimeInfo &KRInfo,
3802+
nd_range<2> Range, const detail::v1::KernelDataDesc &KDDesc,
38033803
const detail::code_location &CodeLoc, bool IsTopCodeLoc) const;
38043804

38053805
void submit_kernel_direct_without_event_impl(
3806-
nd_range<3> Range, const detail::v1::KernelRuntimeInfo &KRInfo,
3806+
nd_range<3> Range, const detail::v1::KernelDataDesc &KDDesc,
38073807
const detail::code_location &CodeLoc, bool IsTopCodeLoc) const;
38083808

38093809
/// A template-free version of submit_without_event as const member function.
@@ -3845,18 +3845,18 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase<queue> {
38453845
detail::code_location::current()) const {
38463846
(void)Props;
38473847
detail::tls_code_loc_t TlsCodeLocCapture(CodeLoc);
3848-
detail::v1::KernelRuntimeInfo KRInfo{};
3848+
detail::v1::KernelDataDesc KDDesc{};
38493849

38503850
using NameT =
38513851
typename detail::get_kernel_name_t<KernelName, KernelType>::name;
38523852

3853-
ProcessKernelRuntimeInfo<NameT, KernelType, Dims, WrapAsVal>(KernelFunc,
3854-
KRInfo);
3853+
ProcessKernelDataDesc<NameT, KernelType, Dims, WrapAsVal>(KernelFunc,
3854+
KDDesc);
38553855

38563856
detail::KernelWrapper<WrapAsVal, NameT, KernelType, ElementType,
38573857
PropertiesT>::wrap(KernelFunc);
38583858

3859-
return submit_kernel_direct_with_event_impl(Range, KRInfo,
3859+
return submit_kernel_direct_with_event_impl(Range, KDDesc,
38603860
TlsCodeLocCapture.query(),
38613861
TlsCodeLocCapture.isToplevel());
38623862
}
@@ -3869,18 +3869,18 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase<queue> {
38693869
detail::code_location::current()) const {
38703870
(void)Props;
38713871
detail::tls_code_loc_t TlsCodeLocCapture(CodeLoc);
3872-
detail::v1::KernelRuntimeInfo KRInfo{};
3872+
detail::v1::KernelDataDesc KDDesc{};
38733873

38743874
using NameT =
38753875
typename detail::get_kernel_name_t<KernelName, KernelType>::name;
38763876

3877-
ProcessKernelRuntimeInfo<NameT, KernelType, Dims,
3878-
detail::WrapAs::parallel_for>(KernelFunc, KRInfo);
3877+
ProcessKernelDataDesc<NameT, KernelType, Dims,
3878+
detail::WrapAs::parallel_for>(KernelFunc, KDDesc);
38793879

38803880
detail::KernelWrapper<detail::WrapAs::parallel_for, NameT, KernelType,
38813881
sycl::nd_item<Dims>, PropertiesT>::wrap(KernelFunc);
38823882

3883-
submit_kernel_direct_without_event_impl(Range, KRInfo,
3883+
submit_kernel_direct_without_event_impl(Range, KDDesc,
38843884
TlsCodeLocCapture.query(),
38853885
TlsCodeLocCapture.isToplevel());
38863886
}

‎sycl/source/detail/queue_impl.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -439,17 +439,17 @@ std::vector<ArgDesc> queue_impl::extractArgsAndReqsFromLambda(
439439
}
440440

441441
detail::EventImplPtr queue_impl::submit_kernel_direct_impl(
442-
const NDRDescT &NDRDesc, const v1::KernelRuntimeInfo &KRInfo,
442+
const NDRDescT &NDRDesc, const v1::KernelDataDesc &KDDesc,
443443
bool CallerNeedsEvent, const detail::code_location &CodeLoc,
444444
bool IsTopCodeLoc) {
445445

446446
KernelData KData;
447447

448-
KData.setDeviceKernelInfoPtr(KRInfo.DeviceKernelInfoPtr());
449-
KData.setKernelFunc(KRInfo.GetKernelFuncPtr());
448+
KData.setDeviceKernelInfoPtr(KDDesc.DeviceKernelInfoPtr());
449+
KData.setKernelFunc(KDDesc.GetKernelFuncPtr());
450450
KData.setNDRDesc(NDRDesc);
451451

452-
return submit_kernel_direct_impl(KData, KRInfo.HostKernel(), CallerNeedsEvent,
452+
return submit_kernel_direct_impl(KData, KDDesc.HostKernel(), CallerNeedsEvent,
453453
CodeLoc, IsTopCodeLoc);
454454
}
455455

‎sycl/source/detail/queue_impl.hpp‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -360,47 +360,47 @@ class queue_impl : public std::enable_shared_from_this<queue_impl> {
360360
}
361361

362362
event submit_kernel_direct_with_event(
363-
nd_range<1> Range, const detail::v1::KernelRuntimeInfo &KRInfo,
363+
nd_range<1> Range, const detail::v1::KernelDataDesc &KDDesc,
364364
const detail::code_location &CodeLoc, bool IsTopCodeLoc) {
365365
detail::EventImplPtr EventImpl = submit_kernel_direct_impl(
366-
NDRDescT{Range}, KRInfo, true, CodeLoc, IsTopCodeLoc);
366+
NDRDescT{Range}, KDDesc, true, CodeLoc, IsTopCodeLoc);
367367
return createSyclObjFromImpl<event>(EventImpl);
368368
}
369369

370370
event submit_kernel_direct_with_event(
371-
nd_range<2> Range, const detail::v1::KernelRuntimeInfo &KRInfo,
371+
nd_range<2> Range, const detail::v1::KernelDataDesc &KDDesc,
372372
const detail::code_location &CodeLoc, bool IsTopCodeLoc) {
373373
detail::EventImplPtr EventImpl = submit_kernel_direct_impl(
374-
NDRDescT{Range}, KRInfo, true, CodeLoc, IsTopCodeLoc);
374+
NDRDescT{Range}, KDDesc, true, CodeLoc, IsTopCodeLoc);
375375
return createSyclObjFromImpl<event>(EventImpl);
376376
}
377377

378378
event submit_kernel_direct_with_event(
379-
nd_range<3> Range, const detail::v1::KernelRuntimeInfo &KRInfo,
379+
nd_range<3> Range, const detail::v1::KernelDataDesc &KDDesc,
380380
const detail::code_location &CodeLoc, bool IsTopCodeLoc) {
381381
detail::EventImplPtr EventImpl = submit_kernel_direct_impl(
382-
NDRDescT{Range}, KRInfo, true, CodeLoc, IsTopCodeLoc);
382+
NDRDescT{Range}, KDDesc, true, CodeLoc, IsTopCodeLoc);
383383
return createSyclObjFromImpl<event>(EventImpl);
384384
}
385385

386386
void submit_kernel_direct_without_event(
387-
nd_range<1> Range, const detail::v1::KernelRuntimeInfo &KRInfo,
387+
nd_range<1> Range, const detail::v1::KernelDataDesc &KDDesc,
388388
const detail::code_location &CodeLoc, bool IsTopCodeLoc) {
389-
submit_kernel_direct_impl(NDRDescT{Range}, KRInfo, false, CodeLoc,
389+
submit_kernel_direct_impl(NDRDescT{Range}, KDDesc, false, CodeLoc,
390390
IsTopCodeLoc);
391391
}
392392

393393
void submit_kernel_direct_without_event(
394-
nd_range<2> Range, const detail::v1::KernelRuntimeInfo &KRInfo,
394+
nd_range<2> Range, const detail::v1::KernelDataDesc &KDDesc,
395395
const detail::code_location &CodeLoc, bool IsTopCodeLoc) {
396-
submit_kernel_direct_impl(NDRDescT{Range}, KRInfo, false, CodeLoc,
396+
submit_kernel_direct_impl(NDRDescT{Range}, KDDesc, false, CodeLoc,
397397
IsTopCodeLoc);
398398
}
399399

400400
void submit_kernel_direct_without_event(
401-
nd_range<3> Range, const detail::v1::KernelRuntimeInfo &KRInfo,
401+
nd_range<3> Range, const detail::v1::KernelDataDesc &KDDesc,
402402
const detail::code_location &CodeLoc, bool IsTopCodeLoc) {
403-
submit_kernel_direct_impl(NDRDescT{Range}, KRInfo, false, CodeLoc,
403+
submit_kernel_direct_impl(NDRDescT{Range}, KDDesc, false, CodeLoc,
404404
IsTopCodeLoc);
405405
}
406406

@@ -922,7 +922,7 @@ class queue_impl : public std::enable_shared_from_this<queue_impl> {
922922
/// Performs kernel submission to the queue.
923923
///
924924
/// \param NDRDesc is an NDRange descriptor
925-
/// \param KRInfo is a descriptor of the kernel
925+
/// \param KDDesc is a descriptor of the kernel
926926
/// \param CallerNeedsEvent is a boolean indicating whether the event is
927927
/// required by the user after the call.
928928
/// \param CodeLoc is the code location of the submit call
@@ -931,7 +931,7 @@ class queue_impl : public std::enable_shared_from_this<queue_impl> {
931931
///
932932
/// \return a SYCL event representing submitted command group or nullptr.
933933
detail::EventImplPtr submit_kernel_direct_impl(
934-
const NDRDescT &NDRDesc, const v1::KernelRuntimeInfo &KRInfo,
934+
const NDRDescT &NDRDesc, const v1::KernelDataDesc &KDDesc,
935935
bool CallerNeedsEvent, const detail::code_location &CodeLoc,
936936
bool IsTopCodeLoc);
937937

‎sycl/source/queue.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -320,44 +320,44 @@ event queue::submit_with_event_impl(
320320
}
321321

322322
event queue::submit_kernel_direct_with_event_impl(
323-
nd_range<1> Range, const detail::v1::KernelRuntimeInfo &KRInfo,
323+
nd_range<1> Range, const detail::v1::KernelDataDesc &KDDesc,
324324
const detail::code_location &CodeLoc, bool IsTopCodeLoc) const {
325-
return impl->submit_kernel_direct_with_event(Range, KRInfo, CodeLoc,
325+
return impl->submit_kernel_direct_with_event(Range, KDDesc, CodeLoc,
326326
IsTopCodeLoc);
327327
}
328328

329329
event queue::submit_kernel_direct_with_event_impl(
330-
nd_range<2> Range, const detail::v1::KernelRuntimeInfo &KRInfo,
330+
nd_range<2> Range, const detail::v1::KernelDataDesc &KDDesc,
331331
const detail::code_location &CodeLoc, bool IsTopCodeLoc) const {
332-
return impl->submit_kernel_direct_with_event(Range, KRInfo, CodeLoc,
332+
return impl->submit_kernel_direct_with_event(Range, KDDesc, CodeLoc,
333333
IsTopCodeLoc);
334334
}
335335

336336
event queue::submit_kernel_direct_with_event_impl(
337-
nd_range<3> Range, const detail::v1::KernelRuntimeInfo &KRInfo,
337+
nd_range<3> Range, const detail::v1::KernelDataDesc &KDDesc,
338338
const detail::code_location &CodeLoc, bool IsTopCodeLoc) const {
339-
return impl->submit_kernel_direct_with_event(Range, KRInfo, CodeLoc,
339+
return impl->submit_kernel_direct_with_event(Range, KDDesc, CodeLoc,
340340
IsTopCodeLoc);
341341
}
342342

343343
void queue::submit_kernel_direct_without_event_impl(
344-
nd_range<1> Range, const detail::v1::KernelRuntimeInfo &KRInfo,
344+
nd_range<1> Range, const detail::v1::KernelDataDesc &KDDesc,
345345
const detail::code_location &CodeLoc, bool IsTopCodeLoc) const {
346-
impl->submit_kernel_direct_without_event(Range, KRInfo, CodeLoc,
346+
impl->submit_kernel_direct_without_event(Range, KDDesc, CodeLoc,
347347
IsTopCodeLoc);
348348
}
349349

350350
void queue::submit_kernel_direct_without_event_impl(
351-
nd_range<2> Range, const detail::v1::KernelRuntimeInfo &KRInfo,
351+
nd_range<2> Range, const detail::v1::KernelDataDesc &KDDesc,
352352
const detail::code_location &CodeLoc, bool IsTopCodeLoc) const {
353-
impl->submit_kernel_direct_without_event(Range, KRInfo, CodeLoc,
353+
impl->submit_kernel_direct_without_event(Range, KDDesc, CodeLoc,
354354
IsTopCodeLoc);
355355
}
356356

357357
void queue::submit_kernel_direct_without_event_impl(
358-
nd_range<3> Range, const detail::v1::KernelRuntimeInfo &KRInfo,
358+
nd_range<3> Range, const detail::v1::KernelDataDesc &KDDesc,
359359
const detail::code_location &CodeLoc, bool IsTopCodeLoc) const {
360-
impl->submit_kernel_direct_without_event(Range, KRInfo, CodeLoc,
360+
impl->submit_kernel_direct_without_event(Range, KDDesc, CodeLoc,
361361
IsTopCodeLoc);
362362
}
363363

0 commit comments

Comments
 (0)