Skip to content

Commit 502557b

Browse files
garimagugarimagu
committed
Removed the use of auto keyword.
Changed auto Plugin to const detail::plugin &Plugin Signed-off-by: Garima Gupta <[email protected]>
1 parent 8570e84 commit 502557b

16 files changed

+65
-65
lines changed

‎sycl/include/CL/sycl/detail/image_impl.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ template <int Dimensions> class image_impl final : public SYCLMemObjT {
222222
template <typename T>
223223
void getImageInfo(const ContextImplPtr Context, RT::PiMemImageInfo Info,
224224
T &Dest) {
225-
auto Plugin = Context->getPlugin();
225+
const detail::plugin &Plugin = Context->getPlugin();
226226
RT::PiMem Mem = pi::cast<RT::PiMem>(BaseT::MInteropMemObject);
227227
Plugin.call<PiApiKind::piMemImageGetInfo>(Mem, Info, sizeof(T), &Dest,
228228
nullptr);

‎sycl/include/CL/sycl/detail/queue_impl.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ class queue_impl {
8888
MCommandQueue = pi::cast<RT::PiQueue>(PiQueue);
8989

9090
RT::PiDevice Device = nullptr;
91-
auto Plugin = getPlugin();
91+
const detail::plugin &Plugin = getPlugin();
9292
// TODO catch an exception and put it to list of asynchronous exceptions
9393
Plugin.call<PiApiKind::piQueueGetInfo>(MCommandQueue, PI_QUEUE_INFO_DEVICE,
9494
sizeof(Device), &Device, nullptr);
@@ -231,7 +231,7 @@ class queue_impl {
231231
RT::PiQueue Queue;
232232
RT::PiContext Context = MContext->getHandleRef();
233233
RT::PiDevice Device = MDevice->getHandleRef();
234-
auto Plugin = getPlugin();
234+
const detail::plugin &Plugin = getPlugin();
235235
RT::PiResult Error = Plugin.call_nocheck<PiApiKind::piQueueCreate>(
236236
Context, Device, CreationFlags, &Queue);
237237

‎sycl/source/detail/device_impl.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ device_impl::device_impl(RT::PiDevice Device, PlatformImplPtr Platform,
5757
device_impl::~device_impl() {
5858
if (!MIsRootDevice && !MIsHostDevice) {
5959
// TODO catch an exception and put it to list of asynchronous exceptions
60-
auto Plugin = getPlugin();
60+
const detail::plugin &Plugin = getPlugin();
6161
RT::PiResult Err = Plugin.call_nocheck<PiApiKind::piDeviceRelease>(MDevice);
6262
CHECK_OCL_CODE_NO_EXC(Err);
6363
}
@@ -76,7 +76,7 @@ cl_device_id device_impl::get() const {
7676

7777
if (!MIsRootDevice) {
7878
// TODO catch an exception and put it to list of asynchronous exceptions
79-
auto Plugin = getPlugin();
79+
const detail::plugin &Plugin = getPlugin();
8080
Plugin.call<PiApiKind::piDeviceRetain>(MDevice);
8181
}
8282
// TODO: check that device is an OpenCL interop one
@@ -110,7 +110,7 @@ device_impl::create_sub_devices(const cl_device_partition_property *Properties,
110110

111111
vector_class<RT::PiDevice> SubDevices(SubDevicesCount);
112112
pi_uint32 ReturnedSubDevices = 0;
113-
auto Plugin = getPlugin();
113+
const detail::plugin &Plugin = getPlugin();
114114
Plugin.call<PiApiKind::piDevicePartition>(MDevice, Properties,
115115
SubDevicesCount, SubDevices.data(),
116116
&ReturnedSubDevices);

‎sycl/source/detail/image_impl.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ image_impl<Dimensions>::image_impl(
241241
MRange(InitializedVal<Dimensions, range>::template get<0>()) {
242242
RT::PiMem Mem = pi::cast<RT::PiMem>(BaseT::MInteropMemObject);
243243
const ContextImplPtr Context = getSyclObjImpl(SyclContext);
244-
auto Plugin = Context->getPlugin();
244+
const detail::plugin &Plugin = Context->getPlugin();
245245
Plugin.call<PiApiKind::piMemGetInfo>(Mem, CL_MEM_SIZE, sizeof(size_t),
246246
&(BaseT::MSizeInBytes), nullptr);
247247

‎sycl/source/detail/kernel_program_cache.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ KernelProgramCache::~KernelProgramCache() {
3131
PiKernelT *Kern = KernelWithState.Ptr.load();
3232

3333
if (Kern) {
34-
auto Plugin = MParentContext->getPlugin();
34+
const detail::plugin &Plugin = MParentContext->getPlugin();
3535
Plugin.call<PiApiKind::piKernelRelease>(Kern);
3636
}
3737
}
3838

39-
auto Plugin = MParentContext->getPlugin();
39+
const detail::plugin &Plugin = MParentContext->getPlugin();
4040
Plugin.call<PiApiKind::piProgramRelease>(ToBeDeleted);
4141
}
4242
}

‎sycl/source/detail/memory_manager.cpp

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ static void waitForEvents(const std::vector<EventImplPtr> &Events) {
2525
// Assuming all events will be on the same device or
2626
// devices associated with the same Backend.
2727
if (!Events.empty()) {
28-
auto Plugin = Events[0]->getPlugin();
28+
const detail::plugin &Plugin = Events[0]->getPlugin();
2929
std::vector<RT::PiEvent> PiEvents(Events.size());
3030
std::transform(Events.begin(), Events.end(), PiEvents.begin(),
3131
[](const EventImplPtr &EventImpl) {
@@ -59,7 +59,7 @@ void MemoryManager::releaseMemObj(ContextImplPtr TargetContext,
5959
return;
6060
}
6161

62-
auto Plugin = TargetContext->getPlugin();
62+
const detail::plugin &Plugin = TargetContext->getPlugin();
6363
Plugin.call<PiApiKind::piMemRelease>(pi::cast<RT::PiMem>(MemAllocation));
6464
}
6565

@@ -102,7 +102,7 @@ void *MemoryManager::allocateInteropMemObject(
102102
// Retain the event since it will be released during alloca command
103103
// destruction
104104
if (nullptr != OutEventToWait) {
105-
auto Plugin = InteropEvent->getPlugin();
105+
const detail::plugin &Plugin = InteropEvent->getPlugin();
106106
Plugin.call<PiApiKind::piEventRetain>(OutEventToWait);
107107
}
108108
return UserPtr;
@@ -123,7 +123,7 @@ void *MemoryManager::allocateImageObject(ContextImplPtr TargetContext,
123123
: PI_MEM_FLAGS_HOST_PTR_USE;
124124

125125
RT::PiMem NewMem;
126-
auto Plugin = TargetContext->getPlugin();
126+
const detail::plugin &Plugin = TargetContext->getPlugin();
127127
Plugin.call<PiApiKind::piMemImageCreate>(TargetContext->getHandleRef(),
128128
CreationFlags, &Format, &Desc,
129129
UserPtr, &NewMem);
@@ -140,7 +140,7 @@ void *MemoryManager::allocateBufferObject(ContextImplPtr TargetContext,
140140
: PI_MEM_FLAGS_HOST_PTR_USE;
141141

142142
RT::PiMem NewMem;
143-
auto Plugin = TargetContext->getPlugin();
143+
const detail::plugin &Plugin = TargetContext->getPlugin();
144144
Plugin.call<PiApiKind::piMemBufferCreate>(
145145
TargetContext->getHandleRef(), CreationFlags, Size, UserPtr, &NewMem);
146146
return NewMem;
@@ -193,7 +193,7 @@ void *MemoryManager::allocateMemSubBuffer(ContextImplPtr TargetContext,
193193
// TODO replace with pi_buffer_region
194194
cl_buffer_region Region{Offset, SizeInBytes};
195195
RT::PiMem NewMem;
196-
auto Plugin = TargetContext->getPlugin();
196+
const detail::plugin &Plugin = TargetContext->getPlugin();
197197
Error = Plugin.call_nocheck<PiApiKind::piMemBufferPartition>(
198198
pi::cast<RT::PiMem>(ParentMemObj), PI_MEM_FLAGS_ACCESS_RW,
199199
PI_BUFFER_CREATE_TYPE_REGION, &Region, &NewMem);
@@ -218,7 +218,7 @@ void copyH2D(SYCLMemObjI *SYCLMemObj, char *SrcMem, QueueImplPtr SrcQueue,
218218
// Adjust first dimension of copy range and offset as OpenCL expects size in
219219
// bytes.
220220
DstSize[0] *= DstElemSize;
221-
auto Plugin = TgtQueue->getPlugin();
221+
const detail::plugin &Plugin = TgtQueue->getPlugin();
222222
if (SYCLMemObj->getType() == detail::SYCLMemObjI::MemObjType::BUFFER) {
223223
DstOffset[0] *= DstElemSize;
224224
SrcOffset[0] *= SrcElemSize;
@@ -266,7 +266,7 @@ void copyD2H(SYCLMemObjI *SYCLMemObj, RT::PiMem SrcMem, QueueImplPtr SrcQueue,
266266
const RT::PiQueue Queue = SrcQueue->getHandleRef();
267267
// Adjust sizes of 1 dimensions as OpenCL expects size in bytes.
268268
SrcSize[0] *= SrcElemSize;
269-
auto Plugin = SrcQueue->getPlugin();
269+
const detail::plugin &Plugin = SrcQueue->getPlugin();
270270
if (SYCLMemObj->getType() == detail::SYCLMemObjI::MemObjType::BUFFER) {
271271
DstOffset[0] *= DstElemSize;
272272
SrcOffset[0] *= SrcElemSize;
@@ -311,7 +311,7 @@ void copyD2D(SYCLMemObjI *SYCLMemObj, RT::PiMem SrcMem, QueueImplPtr SrcQueue,
311311
assert(SYCLMemObj && "The SYCLMemObj is nullptr");
312312

313313
const RT::PiQueue Queue = SrcQueue->getHandleRef();
314-
auto Plugin = SrcQueue->getPlugin();
314+
const detail::plugin &Plugin = SrcQueue->getPlugin();
315315
if (SYCLMemObj->getType() == detail::SYCLMemObjI::MemObjType::BUFFER) {
316316
// Adjust sizes of 1 dimensions as OpenCL expects size in bytes.
317317
DstOffset[0] *= DstElemSize;
@@ -417,7 +417,7 @@ void MemoryManager::fill(SYCLMemObjI *SYCLMemObj, void *Mem, QueueImplPtr Queue,
417417
RT::PiEvent &OutEvent) {
418418
assert(SYCLMemObj && "The SYCLMemObj is nullptr");
419419

420-
auto Plugin = Queue->getPlugin();
420+
const detail::plugin &Plugin = Queue->getPlugin();
421421
if (SYCLMemObj->getType() == detail::SYCLMemObjI::MemObjType::BUFFER) {
422422
if (Dim == 1) {
423423
Plugin.call<PiApiKind::piEnqueueMemBufferFill>(
@@ -473,7 +473,7 @@ void *MemoryManager::map(SYCLMemObjI *SYCLMemObj, void *Mem, QueueImplPtr Queue,
473473

474474
void *MappedPtr = nullptr;
475475
const size_t BytesToMap = AccessRange[0] * AccessRange[1] * AccessRange[2];
476-
auto Plugin = Queue->getPlugin();
476+
const detail::plugin &Plugin = Queue->getPlugin();
477477
Plugin.call<PiApiKind::piEnqueueMemBufferMap>(
478478
Queue->getHandleRef(), pi::cast<RT::PiMem>(Mem), CL_FALSE, Flags,
479479
AccessOffset[0], BytesToMap, DepEvents.size(),
@@ -490,7 +490,7 @@ void MemoryManager::unmap(SYCLMemObjI *SYCLMemObj, void *Mem,
490490
// All DepEvents are to the same Context.
491491
// Using the plugin of the Queue.
492492

493-
auto Plugin = Queue->getPlugin();
493+
const detail::plugin &Plugin = Queue->getPlugin();
494494
Plugin.call<PiApiKind::piEnqueueMemUnmap>(
495495
Queue->getHandleRef(), pi::cast<RT::PiMem>(Mem), MappedPtr,
496496
DepEvents.size(), DepEvents.empty() ? nullptr : &DepEvents[0], &OutEvent);
@@ -505,7 +505,7 @@ void MemoryManager::copy_usm(const void *SrcMem, QueueImplPtr SrcQueue,
505505
if (Context.is_host()) {
506506
std::memcpy(DstMem, SrcMem, Len);
507507
} else {
508-
auto Plugin = SrcQueue->getPlugin();
508+
const detail::plugin &Plugin = SrcQueue->getPlugin();
509509
Plugin.call<PiApiKind::piextUSMEnqueueMemcpy>(SrcQueue->getHandleRef(),
510510
/* blocking */ false, DstMem,
511511
SrcMem, Len, DepEvents.size(),
@@ -521,7 +521,7 @@ void MemoryManager::fill_usm(void *Mem, QueueImplPtr Queue, size_t Length,
521521
if (Context.is_host()) {
522522
std::memset(Mem, Pattern, Length);
523523
} else {
524-
auto Plugin = Queue->getPlugin();
524+
const detail::plugin &Plugin = Queue->getPlugin();
525525
Plugin.call<PiApiKind::piextUSMEnqueueMemset>(
526526
Queue->getHandleRef(), Mem, Pattern, Length, DepEvents.size(),
527527
&DepEvents[0], &OutEvent);
@@ -536,7 +536,7 @@ void MemoryManager::prefetch_usm(void *Mem, QueueImplPtr Queue, size_t Length,
536536
if (Context.is_host()) {
537537
// TODO: Potentially implement prefetch on the host.
538538
} else {
539-
auto Plugin = Queue->getPlugin();
539+
const detail::plugin &Plugin = Queue->getPlugin();
540540
Plugin.call<PiApiKind::piextUSMEnqueuePrefetch>(
541541
Queue->getHandleRef(), Mem, Length, PI_USM_MIGRATION_TBD0,
542542
DepEvents.size(), &DepEvents[0], &OutEvent);

‎sycl/source/detail/platform_impl.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ platform_impl::get_devices(info::device_type DeviceType) const {
211211
return Res;
212212

213213
pi_uint32 NumDevices;
214-
auto Plugin = getPlugin();
214+
const detail::plugin &Plugin = getPlugin();
215215
Plugin.call<PiApiKind::piDevicesGet>(
216216
MPlatform, pi::cast<RT::PiDeviceType>(DeviceType), 0,
217217
pi::cast<RT::PiDevice *>(nullptr), &NumDevices);

‎sycl/source/detail/program_impl.cpp

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ program_impl::program_impl(
6868
NonInterOpToLink |= !Prg->MLinkable;
6969
Programs.push_back(Prg->MProgram);
7070
}
71-
auto Plugin = getPlugin();
71+
const detail::plugin &Plugin = getPlugin();
7272
RT::PiResult Err = Plugin.call_nocheck<PiApiKind::piProgramLink>(
7373
MContext->getHandleRef(), Devices.size(), Devices.data(),
7474
LinkOptions.c_str(), Programs.size(), Programs.data(), nullptr, nullptr,
@@ -82,7 +82,7 @@ program_impl::program_impl(ContextImplPtr Context, RT::PiProgram Program)
8282

8383
// TODO handle the case when cl_program build is in progress
8484
cl_uint NumDevices;
85-
auto Plugin = getPlugin();
85+
const detail::plugin &Plugin = getPlugin();
8686
Plugin.call<PiApiKind::piProgramGetInfo>(
8787
Program, CL_PROGRAM_NUM_DEVICES, sizeof(cl_uint), &NumDevices, nullptr);
8888
vector_class<RT::PiDevice> PiDevices(NumDevices);
@@ -144,7 +144,7 @@ program_impl::program_impl(ContextImplPtr Context, RT::PiKernel Kernel)
144144
program_impl::~program_impl() {
145145
// TODO catch an exception and put it to list of asynchronous exceptions
146146
if (!is_host() && MProgram != nullptr) {
147-
auto Plugin = getPlugin();
147+
const detail::plugin &Plugin = getPlugin();
148148
Plugin.call<PiApiKind::piProgramRelease>(MProgram);
149149
}
150150
}
@@ -154,7 +154,7 @@ cl_program program_impl::get() const {
154154
if (is_host()) {
155155
throw invalid_object_error("This instance of program is a host instance");
156156
}
157-
auto Plugin = getPlugin();
157+
const detail::plugin &Plugin = getPlugin();
158158
Plugin.call<PiApiKind::piProgramRetain>(MProgram);
159159
return pi::cast<cl_program>(MProgram);
160160
}
@@ -193,7 +193,7 @@ void program_impl::build_with_kernel_name(string_class KernelName,
193193
MProgramAndKernelCachingAllowed = true;
194194
MProgram = ProgramManager::getInstance().getBuiltPIProgram(
195195
Module, get_context(), KernelName);
196-
auto Plugin = getPlugin();
196+
const detail::plugin &Plugin = getPlugin();
197197
Plugin.call<PiApiKind::piProgramRetain>(MProgram);
198198
} else {
199199
create_pi_program_with_kernel_name(Module, KernelName);
@@ -219,7 +219,7 @@ void program_impl::link(string_class LinkOptions) {
219219
if (!is_host()) {
220220
check_device_feature_support<info::device::is_linker_available>(MDevices);
221221
vector_class<RT::PiDevice> Devices(get_pi_devices());
222-
auto Plugin = getPlugin();
222+
const detail::plugin &Plugin = getPlugin();
223223
RT::PiResult Err = Plugin.call_nocheck<PiApiKind::piProgramLink>(
224224
MContext->getHandleRef(), Devices.size(), Devices.data(),
225225
LinkOptions.c_str(), 1, &MProgram, nullptr, nullptr, &MProgram);
@@ -258,7 +258,7 @@ kernel program_impl::get_kernel(string_class KernelName,
258258
vector_class<vector_class<char>> program_impl::get_binaries() const {
259259
throw_if_state_is(program_state::none);
260260
vector_class<vector_class<char>> Result;
261-
auto Plugin = getPlugin();
261+
const detail::plugin &Plugin = getPlugin();
262262
if (!is_host()) {
263263
vector_class<size_t> BinarySizes(MDevices.size());
264264
Plugin.call<PiApiKind::piProgramGetInfo>(
@@ -281,15 +281,15 @@ void program_impl::create_cl_program_with_source(const string_class &Source) {
281281
assert(!MProgram && "This program already has an encapsulated cl_program");
282282
const char *Src = Source.c_str();
283283
size_t Size = Source.size();
284-
auto Plugin = getPlugin();
284+
const detail::plugin &Plugin = getPlugin();
285285
Plugin.call<PiApiKind::piclProgramCreateWithSource>(
286286
MContext->getHandleRef(), 1, &Src, &Size, &MProgram);
287287
}
288288

289289
void program_impl::compile(const string_class &Options) {
290290
check_device_feature_support<info::device::is_compiler_available>(MDevices);
291291
vector_class<RT::PiDevice> Devices(get_pi_devices());
292-
auto Plugin = getPlugin();
292+
const detail::plugin &Plugin = getPlugin();
293293
RT::PiResult Err = Plugin.call_nocheck<PiApiKind::piProgramCompile>(
294294
MProgram, Devices.size(), Devices.data(), Options.c_str(), 0, nullptr,
295295
nullptr, nullptr, nullptr);
@@ -305,7 +305,7 @@ void program_impl::compile(const string_class &Options) {
305305
void program_impl::build(const string_class &Options) {
306306
check_device_feature_support<info::device::is_compiler_available>(MDevices);
307307
vector_class<RT::PiDevice> Devices(get_pi_devices());
308-
auto Plugin = getPlugin();
308+
const detail::plugin &Plugin = getPlugin();
309309
RT::PiResult Err = Plugin.call_nocheck<PiApiKind::piProgramBuild>(
310310
MProgram, Devices.size(), Devices.data(), Options.c_str(), nullptr,
311311
nullptr);
@@ -329,7 +329,7 @@ vector_class<RT::PiDevice> program_impl::get_pi_devices() const {
329329

330330
bool program_impl::has_cl_kernel(const string_class &KernelName) const {
331331
size_t Size;
332-
auto Plugin = getPlugin();
332+
const detail::plugin &Plugin = getPlugin();
333333
Plugin.call<PiApiKind::piProgramGetInfo>(MProgram, CL_PROGRAM_KERNEL_NAMES, 0,
334334
nullptr, &Size);
335335
string_class ClResult(Size, ' ');
@@ -354,7 +354,7 @@ RT::PiKernel program_impl::get_pi_kernel(const string_class &KernelName) const {
354354
Kernel = ProgramManager::getInstance().getOrCreateKernel(
355355
MProgramModuleHandle, get_context(), KernelName);
356356
} else {
357-
auto Plugin = getPlugin();
357+
const detail::plugin &Plugin = getPlugin();
358358
RT::PiResult Err = Plugin.call_nocheck<PiApiKind::piKernelCreate>(
359359
MProgram, KernelName.c_str(), &Kernel);
360360
if (Err == PI_RESULT_INVALID_KERNEL_NAME) {
@@ -403,7 +403,7 @@ cl_uint program_impl::get_info<info::program::reference_count>() const {
403403
throw invalid_object_error("This instance of program is a host instance");
404404
}
405405
cl_uint Result;
406-
auto Plugin = getPlugin();
406+
const detail::plugin &Plugin = getPlugin();
407407
Plugin.call<PiApiKind::piProgramGetInfo>(MProgram, CL_PROGRAM_REFERENCE_COUNT,
408408
sizeof(cl_uint), &Result, nullptr);
409409
return Result;

0 commit comments

Comments
 (0)