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

Jump to bottom

[HIP][CUDA][Command-Buffer] Fix Coverity issues in HIP/CUDA command-buffer code #1340

Merged
merged 3 commits into from
Mar 10, 2024
Merged

[HIP][CUDA][Command-Buffer] Fix Coverity issues in HIP/CUDA command-buffer code #1340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b1a32ba
[EXP][Command-Buffer] Fix CUDA Coverity issues
EwanC Feb 14, 2024
273ac6b
Only destroy executable graph if command-buffer finalized
EwanC Feb 16, 2024
be622e7
[HIP][CMD-BUF] HIP coverity fixes
EwanC Feb 28, 2024
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
16 changes: 10 additions & 6 deletions source/adapters/cuda/command_buffer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,17 +66,20 @@ ur_exp_command_buffer_handle_t_::~ur_exp_command_buffer_handle_t_() {
cuGraphDestroy(CudaGraph);

// Release the memory allocated to the CudaGraphExec
cuGraphExecDestroy(CudaGraphExec);
if (CudaGraphExec) {
cuGraphExecDestroy(CudaGraphExec);
}
}

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;
Expand Down Expand Up @@ -375,6 +378,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
Expand All @@ -392,8 +396,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);
Expand Down
2 changes: 1 addition & 1 deletion source/adapters/cuda/command_buffer.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
6 changes: 3 additions & 3 deletions source/adapters/hip/command_buffer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ ur_exp_command_buffer_handle_t_::ur_exp_command_buffer_handle_t_(
ur_context_handle_t hContext, ur_device_handle_t hDevice, bool IsUpdatable)
: Context(hContext), Device(hDevice),
IsUpdatable(IsUpdatable), HIPGraph{nullptr}, HIPGraphExec{nullptr},
RefCountInternal{1}, RefCountExternal{1} {
RefCountInternal{1}, RefCountExternal{1}, NextSyncPoint{0} {
urContextRetain(hContext);
urDeviceRetain(hDevice);
}
Expand All @@ -65,11 +65,11 @@ ur_exp_command_buffer_handle_t_::~ur_exp_command_buffer_handle_t_() {
UR_TRACE(urDeviceRelease(Device));

// Release the memory allocated to the HIPGraph
UR_CHECK_ERROR(hipGraphDestroy(HIPGraph));
(void)hipGraphDestroy(HIPGraph);

// Release the memory allocated to the HIPGraphExec
if (HIPGraphExec) {
UR_CHECK_ERROR(hipGraphExecDestroy(HIPGraphExec));
(void)hipGraphExecDestroy(HIPGraphExec);
}
}

Expand Down
6 changes: 3 additions & 3 deletions source/adapters/hip/command_buffer.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,8 +254,8 @@ struct ur_exp_command_buffer_handle_t_ {
~ur_exp_command_buffer_handle_t_();

void registerSyncPoint(ur_exp_command_buffer_sync_point_t SyncPoint,
std::shared_ptr<hipGraphNode_t> HIPNode) {
SyncPoints[SyncPoint] = HIPNode;
std::shared_ptr<hipGraphNode_t> &&HIPNode) {
SyncPoints[SyncPoint] = std::move(HIPNode);
NextSyncPoint++;
}

Expand All @@ -269,7 +269,7 @@ struct ur_exp_command_buffer_handle_t_ {
ur_exp_command_buffer_sync_point_t
addSyncPoint(std::shared_ptr<hipGraphNode_t> HIPNode) {
ur_exp_command_buffer_sync_point_t SyncPoint = NextSyncPoint;
registerSyncPoint(SyncPoint, HIPNode);
registerSyncPoint(SyncPoint, std::move(HIPNode));
return SyncPoint;
}
uint32_t incrementInternalReferenceCount() noexcept {
Expand Down