Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[SYCL] Fix 'move instead of copy' Coverity hits #17619

Merged
merged 5 commits into from
Mar 26, 2025
Merged

[SYCL] Fix 'move instead of copy' Coverity hits #17619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
30612c6
[SYCL] Fix 'move instead of copy' Coverity hits
ayylol Mar 24, 2025
4c465e8
Instead of move pass const ref to `completeSpecConstMaterialization`
ayylol Mar 25, 2025
db6a8e3
Make strings not const so move ctor is called automatically
ayylol Mar 25, 2025
8f37c82
Revert change to `getSyclObjImpl` call
ayylol Mar 25, 2025
51840e5
Remove dead code
ayylol Mar 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions sycl/source/detail/config.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -647,7 +647,7 @@ template <> class SYCLConfig<SYCL_JIT_AMDGCN_PTX_TARGET_CPU> {

public:
static std::string get() {
const std::string DefaultValue{""};
std::string DefaultValue{""};

const char *ValStr = getCachedValue();

Expand Down Expand Up @@ -675,7 +675,7 @@ template <> class SYCLConfig<SYCL_JIT_AMDGCN_PTX_TARGET_FEATURES> {

public:
static std::string get() {
const std::string DefaultValue{""};
std::string DefaultValue{""};

const char *ValStr = getCachedValue();

Expand Down
15 changes: 6 additions & 9 deletions sycl/source/detail/jit_compiler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ translateBinaryImageFormat(ur::DeviceBinaryType Type) {
}
}

::jit_compiler::BinaryFormat getTargetFormat(QueueImplPtr &Queue) {
::jit_compiler::BinaryFormat getTargetFormat(const QueueImplPtr &Queue) {
auto Backend = Queue->getDeviceImplPtr()->getBackend();
switch (Backend) {
case backend::ext_oneapi_level_zero:
Expand All @@ -154,7 +154,7 @@ ::jit_compiler::BinaryFormat getTargetFormat(QueueImplPtr &Queue) {
}
}

::jit_compiler::TargetInfo getTargetInfo(QueueImplPtr &Queue) {
::jit_compiler::TargetInfo getTargetInfo(const QueueImplPtr &Queue) {
::jit_compiler::BinaryFormat Format = getTargetFormat(Queue);
return ::jit_compiler::TargetInfo::get(
Format, static_cast<::jit_compiler::DeviceArchitecture>(
Expand Down Expand Up @@ -659,7 +659,7 @@ updatePromotedArgs(const ::jit_compiler::SYCLKernelInfo &FusedKernelInfo,
}

ur_kernel_handle_t jit_compiler::materializeSpecConstants(
QueueImplPtr Queue, const RTDeviceBinaryImage *BinImage,
const QueueImplPtr &Queue, const RTDeviceBinaryImage *BinImage,
const std::string &KernelName,
const std::vector<unsigned char> &SpecConstBlob) {
#ifndef _WIN32
Expand Down Expand Up @@ -1042,16 +1042,13 @@ jit_compiler::fuseKernels(QueueImplPtr Queue,
FusedOrCachedKernelName);

std::shared_ptr<detail::kernel_bundle_impl> KernelBundleImplPtr;
if (TargetFormat == ::jit_compiler::BinaryFormat::SPIRV) {
detail::getSyclObjImpl(get_kernel_bundle<bundle_state::executable>(
Queue->get_context(), {Queue->get_device()}, {FusedKernelId}));
}

std::unique_ptr<detail::CG> FusedCG;
FusedCG.reset(new detail::CGExecKernel(
NDRDesc, nullptr, nullptr, std::move(KernelBundleImplPtr),
std::move(CGData), std::move(FusedArgs), FusedOrCachedKernelName, {}, {},
CGType::Kernel, KernelCacheConfig, false /* KernelIsCooperative */,
std::move(CGData), std::move(FusedArgs),
std::move(FusedOrCachedKernelName), {}, {}, CGType::Kernel,
KernelCacheConfig, false /* KernelIsCooperative */,
false /* KernelUsesClusterLaunch*/, 0 /* KernelWorkGroupMemorySize */));
return FusedCG;
}
Expand Down
2 changes: 1 addition & 1 deletion sycl/source/detail/jit_compiler.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class jit_compiler {
fuseKernels(QueueImplPtr Queue, std::vector<ExecCGCommand *> &InputKernels,
const property_list &);
ur_kernel_handle_t
materializeSpecConstants(QueueImplPtr Queue,
materializeSpecConstants(const QueueImplPtr &Queue,
const RTDeviceBinaryImage *BinImage,
const std::string &KernelName,
const std::vector<unsigned char> &SpecConstBlob);
Expand Down
2 changes: 1 addition & 1 deletion sycl/source/detail/scheduler/scheduler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,7 +587,7 @@ void Scheduler::cleanupAuxiliaryResources(BlockingT Blocking) {
}

ur_kernel_handle_t Scheduler::completeSpecConstMaterialization(
[[maybe_unused]] QueueImplPtr Queue,
[[maybe_unused]] const QueueImplPtr &Queue,
[[maybe_unused]] const RTDeviceBinaryImage *BinImage,
[[maybe_unused]] const std::string &KernelName,
[[maybe_unused]] std::vector<unsigned char> &SpecConstBlob) {
Expand Down
2 changes: 1 addition & 1 deletion sycl/source/detail/scheduler/scheduler.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ class Scheduler {
void deferMemObjRelease(const std::shared_ptr<detail::SYCLMemObjI> &MemObj);

ur_kernel_handle_t completeSpecConstMaterialization(
QueueImplPtr Queue, const RTDeviceBinaryImage *BinImage,
const QueueImplPtr &Queue, const RTDeviceBinaryImage *BinImage,
const std::string &KernelName, std::vector<unsigned char> &SpecConstBlob);

void releaseResources(BlockingT Blocking = BlockingT::BLOCKING);
Expand Down