[EXP][Command-Buffer] Fix CUDA Coverity issues

Address issues in the CUDA adapter code added by oneapi-src#1089 flagged by Coverity. * Uninitalized struct member of `CUDA_KERNEL_NODE_PARAMS` struct * copying instead of moving a shared pointer to a node when constructing a command-handle.
Bensuo · Feb 28, 2024 · 41ec993 · 41ec993
1 parent 3e01f39
commit 41ec993
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/source/adapters/cuda/command_buffer.cpp b/source/adapters/cuda/command_buffer.cpp
@@ -72,11 +72,12 @@ ur_exp_command_buffer_handle_t_::~ur_exp_command_buffer_handle_t_() {
 ur_exp_command_buffer_command_handle_t_::
  ur_exp_command_buffer_command_handle_t_(
  ur_exp_command_buffer_handle_t CommandBuffer, ur_kernel_handle_t Kernel,
- std::shared_ptr<CUgraphNode> Node, CUDA_KERNEL_NODE_PARAMS Params,
+ std::shared_ptr<CUgraphNode> &&Node, CUDA_KERNEL_NODE_PARAMS Params,
  uint32_t WorkDim, const size_t *GlobalWorkOffsetPtr,
  const size_t *GlobalWorkSizePtr, const size_t *LocalWorkSizePtr)
- : CommandBuffer(CommandBuffer), Kernel(Kernel), Node(Node), Params(Params),
- WorkDim(WorkDim), RefCountInternal(1), RefCountExternal(1) {
+ : CommandBuffer(CommandBuffer), Kernel(Kernel), Node{std::move(Node)},
+ Params(Params), WorkDim(WorkDim), RefCountInternal(1),
+ RefCountExternal(1) {
  CommandBuffer->incrementInternalReferenceCount();
 
  const size_t CopySize = sizeof(size_t) * WorkDim;
@@ -375,6 +376,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendKernelLaunchExp(
  NodeParams.blockDimZ = ThreadsPerBlock[2];
  NodeParams.sharedMemBytes = LocalSize;
  NodeParams.kernelParams = const_cast<void **>(ArgIndices.data());
+ NodeParams.kern = nullptr;
  NodeParams.extra = nullptr;
 
  // Create and add an new kernel node to the Cuda graph
@@ -392,8 +394,8 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendKernelLaunchExp(
  }
 
  auto NewCommand = new ur_exp_command_buffer_command_handle_t_{
- hCommandBuffer, hKernel, NodeSP,  NodeParams,
- workDim, pGlobalWorkOffset, pGlobalWorkSize, pLocalWorkSize};
+ hCommandBuffer, hKernel, std::move(NodeSP), NodeParams,
+ workDim, pGlobalWorkOffset, pGlobalWorkSize,  pLocalWorkSize};
 
  NewCommand->incrementInternalReferenceCount();
  hCommandBuffer->CommandHandles.push_back(NewCommand);

diff --git a/source/adapters/cuda/command_buffer.hpp b/source/adapters/cuda/command_buffer.hpp
@@ -183,7 +183,7 @@ static inline const char *getUrResultString(ur_result_t Result) {
 struct ur_exp_command_buffer_command_handle_t_ {
  ur_exp_command_buffer_command_handle_t_(
  ur_exp_command_buffer_handle_t CommandBuffer, ur_kernel_handle_t Kernel,
- std::shared_ptr<CUgraphNode> Node, CUDA_KERNEL_NODE_PARAMS Params,
+ std::shared_ptr<CUgraphNode> &&Node, CUDA_KERNEL_NODE_PARAMS Params,
  uint32_t WorkDim, const size_t *GlobalWorkOffsetPtr,
  const size_t *GlobalWorkSizePtr, const size_t *LocalWorkSizePtr);