Skip to content

Commit 17f6259

Browse files
oleksandr-pavlykoleksandr-pavlyk
committed
Fixed coverity issues COPY_INSTEAD_OF_MOVE in libsyclinterface
1 parent 0370b09 commit 17f6259

7 files changed

+31
-22
lines changed

‎libsyclinterface/source/dpctl_sycl_context_interface.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
#include "dpctl_error_handlers.h"
3030
#include "dpctl_sycl_type_casters.hpp"
3131
#include <CL/sycl.hpp>
32+
#include <utility>
3233
#include <vector>
3334

3435
using namespace sycl;
@@ -86,7 +87,7 @@ DPCTLContext_CreateFromDevices(__dpctl_keep const DPCTLDeviceVectorRef DVRef,
8687

8788
try {
8889
CRef = wrap<context>(
89-
new context(Devices, DPCTL_AsyncErrorHandler(handler)));
90+
new context(std::move(Devices), DPCTL_AsyncErrorHandler(handler)));
9091
} catch (std::exception const &e) {
9192
error_handler(e, __FILE__, __func__, __LINE__);
9293
}
@@ -146,7 +147,8 @@ DPCTLContext_GetDevices(__dpctl_keep const DPCTLSyclContextRef CRef)
146147
auto Devices = Context->get_devices();
147148
DevicesVectorPtr->reserve(Devices.size());
148149
for (const auto &Dev : Devices) {
149-
DevicesVectorPtr->emplace_back(wrap<device>(new device(Dev)));
150+
DevicesVectorPtr->emplace_back(
151+
wrap<device>(new device(std::move(Dev))));
150152
}
151153
return wrap<vecTy>(DevicesVectorPtr);
152154
} catch (std::exception const &e) {

‎libsyclinterface/source/dpctl_sycl_device_interface.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
#include <CL/sycl.hpp> /* SYCL headers */
3636
#include <algorithm>
3737
#include <cstring>
38+
#include <utility>
3839
#include <vector>
3940

4041
using namespace sycl;
@@ -543,7 +544,7 @@ DPCTLDevice_GetParentDevice(__dpctl_keep const DPCTLSyclDeviceRef DRef)
543544
auto D = unwrap<device>(DRef);
544545
if (D) {
545546
try {
546-
auto parent_D = D->get_info<info::device::parent_device>();
547+
const auto &parent_D = D->get_info<info::device::parent_device>();
547548
return wrap<device>(new device(parent_D));
548549
} catch (std::exception const &e) {
549550
error_handler(e, __FILE__, __func__, __LINE__);

‎libsyclinterface/source/dpctl_sycl_device_manager.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
#include <iomanip>
3535
#include <iostream>
3636
#include <unordered_map>
37+
#include <utility>
3738
#include <vector>
3839

3940
using namespace sycl;
@@ -188,7 +189,7 @@ DPCTLDeviceMgr_GetCachedContext(__dpctl_keep const DPCTLSyclDeviceRef DRef)
188189
if (entry != cache.end()) {
189190
context *ContextPtr = nullptr;
190191
try {
191-
ContextPtr = new context(entry->second);
192+
ContextPtr = new context(std::move(entry->second));
192193
CRef = wrap<context>(ContextPtr);
193194
} catch (std::exception const &e) {
194195
error_handler(e, __FILE__, __func__, __LINE__);

‎libsyclinterface/source/dpctl_sycl_kernel_bundle_interface.cpp

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
#include <CL/sycl/backend/opencl.hpp>
3939
#endif
4040
#include <sstream>
41+
#include <utility>
4142

4243
#ifdef DPCTL_ENABLE_L0_PROGRAM_CREATION
4344
// Note: include ze_api.h before level_zero.hpp. Make sure clang-format does
@@ -202,7 +203,7 @@ _CreateKernelBundle_common_ocl_impl(cl_program clProgram,
202203
}
203204

204205
using ekbTy = kernel_bundle<bundle_state::executable>;
205-
ekbTy kb =
206+
const ekbTy &kb =
206207
make_kernel_bundle<cl_be, bundle_state::executable>(clProgram, ctx);
207208
return wrap<ekbTy>(new ekbTy(kb));
208209
}
@@ -317,7 +318,8 @@ _GetKernel_ocl_impl(const kernel_bundle<bundle_state::executable> &kb,
317318
try {
318319
context ctx = kb.get_context();
319320

320-
kernel interop_kernel = make_kernel<cl_be>(ocl_kernel_from_kb, ctx);
321+
const kernel &interop_kernel =
322+
make_kernel<cl_be>(ocl_kernel_from_kb, ctx);
321323

322324
return wrap<kernel>(new kernel(interop_kernel));
323325
} catch (std::exception const &e) {
@@ -473,7 +475,7 @@ _CreateKernelBundleWithIL_ze_impl(const context &SyclCtx,
473475
}
474476

475477
try {
476-
auto kb = make_kernel_bundle<ze_be, bundle_state::executable>(
478+
const auto &kb = make_kernel_bundle<ze_be, bundle_state::executable>(
477479
{ZeModule, ext::oneapi::level_zero::ownership::keep}, SyclCtx);
478480

479481
return wrap<kernel_bundle<bundle_state::executable>>(
@@ -514,8 +516,8 @@ _GetKernel_ze_impl(const kernel_bundle<bundle_state::executable> &kb,
514516

515517
if (ze_status == ZE_RESULT_SUCCESS) {
516518
found = true;
517-
auto ctx = kb.get_context();
518-
auto k = make_kernel<ze_be>(
519+
const auto &ctx = kb.get_context();
520+
const auto &k = make_kernel<ze_be>(
519521
{kb, ZeKern, ext::oneapi::level_zero::ownership::keep}, ctx);
520522
syclInteropKern_ptr = std::unique_ptr<kernel>(new kernel(k));
521523
break;

‎libsyclinterface/source/dpctl_sycl_platform_interface.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
#include <iostream>
3737
#include <set>
3838
#include <sstream>
39+
#include <utility>
3940
#include <vector>
4041

4142
using namespace sycl;
@@ -224,7 +225,7 @@ DPCTLPlatform_GetDefaultContext(__dpctl_keep const DPCTLSyclPlatformRef PRef)
224225
{
225226
auto P = unwrap<platform>(PRef);
226227
if (P) {
227-
auto default_ctx = P->ext_oneapi_get_default_context();
228+
const auto &default_ctx = P->ext_oneapi_get_default_context();
228229
return wrap<context>(new context(default_ctx));
229230
}
230231
else {

‎libsyclinterface/source/dpctl_sycl_queue_interface.cpp

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
#include <CL/sycl.hpp> /* SYCL headers */
3535
#include <exception>
3636
#include <stdexcept>
37+
#include <utility>
3738

3839
using namespace sycl;
3940

@@ -387,7 +388,7 @@ DPCTLQueue_SubmitRange(__dpctl_keep const DPCTLSyclKernelRef KRef,
387388
return nullptr;
388389
}
389390

390-
return wrap<event>(new event(e));
391+
return wrap<event>(new event(std::move(e)));
391392
}
392393

393394
__dpctl_give DPCTLSyclEventRef
@@ -443,7 +444,7 @@ DPCTLQueue_SubmitNDRange(__dpctl_keep const DPCTLSyclKernelRef KRef,
443444
return nullptr;
444445
}
445446

446-
return wrap<event>(new event(e));
447+
return wrap<event>(new event(std::move(e)));
447448
}
448449

449450
void DPCTLQueue_Wait(__dpctl_keep DPCTLSyclQueueRef QRef)
@@ -475,7 +476,7 @@ DPCTLQueue_Memcpy(__dpctl_keep const DPCTLSyclQueueRef QRef,
475476
error_handler(e, __FILE__, __func__, __LINE__);
476477
return nullptr;
477478
}
478-
return wrap<event>(new event(ev));
479+
return wrap<event>(new event(std::move(ev)));
479480
}
480481
else {
481482
error_handler("QRef passed to memcpy was NULL.", __FILE__, __func__,
@@ -529,7 +530,7 @@ DPCTLQueue_MemAdvise(__dpctl_keep DPCTLSyclQueueRef QRef,
529530
error_handler(e, __FILE__, __func__, __LINE__);
530531
return nullptr;
531532
}
532-
return wrap<event>(new event(ev));
533+
return wrap<event>(new event(std::move(ev)));
533534
}
534535
else {
535536
error_handler("QRef passed to prefetch was NULL.", __FILE__, __func__,
@@ -593,7 +594,7 @@ __dpctl_give DPCTLSyclEventRef DPCTLQueue_SubmitBarrierForEvents(
593594
return nullptr;
594595
}
595596

596-
return wrap<event>(new event(e));
597+
return wrap<event>(new event(std::move(e)));
597598
}
598599
else {
599600
error_handler("Argument QRef is NULL", __FILE__, __func__, __LINE__);
@@ -622,7 +623,7 @@ DPCTLQueue_Memset(__dpctl_keep const DPCTLSyclQueueRef QRef,
622623
error_handler(e, __FILE__, __func__, __LINE__);
623624
return nullptr;
624625
}
625-
return wrap<event>(new event(ev));
626+
return wrap<event>(new event(std::move(ev)));
626627
}
627628
else {
628629
error_handler("QRef or USMRef passed to fill8 were NULL.", __FILE__,
@@ -646,7 +647,7 @@ DPCTLQueue_Fill8(__dpctl_keep const DPCTLSyclQueueRef QRef,
646647
error_handler(e, __FILE__, __func__, __LINE__);
647648
return nullptr;
648649
}
649-
return wrap<event>(new event(ev));
650+
return wrap<event>(new event(std::move(ev)));
650651
}
651652
else {
652653
error_handler("QRef or USMRef passed to fill8 were NULL.", __FILE__,
@@ -670,7 +671,7 @@ DPCTLQueue_Fill16(__dpctl_keep const DPCTLSyclQueueRef QRef,
670671
error_handler(e, __FILE__, __func__, __LINE__);
671672
return nullptr;
672673
}
673-
return wrap<event>(new event(ev));
674+
return wrap<event>(new event(std::move(ev)));
674675
}
675676
else {
676677
error_handler("QRef or USMRef passed to fill16 were NULL.", __FILE__,
@@ -694,7 +695,7 @@ DPCTLQueue_Fill32(__dpctl_keep const DPCTLSyclQueueRef QRef,
694695
error_handler(e, __FILE__, __func__, __LINE__);
695696
return nullptr;
696697
}
697-
return wrap<event>(new event(ev));
698+
return wrap<event>(new event(std::move(ev)));
698699
}
699700
else {
700701
error_handler("QRef or USMRef passed to fill32 were NULL.", __FILE__,
@@ -718,7 +719,7 @@ DPCTLQueue_Fill64(__dpctl_keep const DPCTLSyclQueueRef QRef,
718719
error_handler(e, __FILE__, __func__, __LINE__);
719720
return nullptr;
720721
}
721-
return wrap<event>(new event(ev));
722+
return wrap<event>(new event(std::move(ev)));
722723
}
723724
else {
724725
error_handler("QRef or USMRef passed to fill64 were NULL.", __FILE__,
@@ -745,7 +746,7 @@ DPCTLQueue_Fill128(__dpctl_keep const DPCTLSyclQueueRef QRef,
745746
error_handler(e, __FILE__, __func__, __LINE__);
746747
return nullptr;
747748
}
748-
return wrap<event>(new event(ev));
749+
return wrap<event>(new event(std::move(ev)));
749750
}
750751
else {
751752
error_handler("QRef or USMRef passed to fill128 were NULL.", __FILE__,

‎libsyclinterface/source/dpctl_sycl_usm_interface.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#include "dpctl_sycl_device_interface.h"
3131
#include "dpctl_sycl_type_casters.hpp"
3232
#include <CL/sycl.hpp> /* SYCL headers */
33+
#include <utility>
3334

3435
using namespace sycl;
3536

@@ -221,7 +222,7 @@ DPCTLUSM_GetPointerDevice(__dpctl_keep const DPCTLSyclUSMRef MRef,
221222
auto Ptr = unwrap<void>(MRef);
222223
auto C = unwrap<context>(CRef);
223224

224-
auto Dev = get_pointer_device(Ptr, *C);
225+
const auto &Dev = get_pointer_device(Ptr, *C);
225226

226227
return wrap<device>(new device(Dev));
227228
}

0 commit comments

Comments
 (0)