Skip to content

[CUDA][HIP] Improve command-buffer sync points #1910

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

Merged
omarahmed1111 merged 1 commit into from
Aug 9, 2024
Merged

[CUDA][HIP] Improve command-buffer sync points #1910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
296 changes: 117 additions & 179 deletions source/adapters/cuda/command_buffer.cpp
View file
Open in desktop

Large diffs are not rendered by default.

18 changes: 8 additions & 10 deletions source/adapters/cuda/command_buffer.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@
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,
uint32_t WorkDim, const size_t *GlobalWorkOffsetPtr,
const size_t *GlobalWorkSizePtr, const size_t *LocalWorkSizePtr);
CUgraphNode Node, CUDA_KERNEL_NODE_PARAMS Params, uint32_t WorkDim,
const size_t *GlobalWorkOffsetPtr, const size_t *GlobalWorkSizePtr,
const size_t *LocalWorkSizePtr);

void setGlobalOffset(const size_t *GlobalWorkOffsetPtr) {
const size_t CopySize = sizeof(size_t) * WorkDim;
Expand Down Expand Up @@ -97,7 +97,7 @@ struct ur_exp_command_buffer_command_handle_t_ {

ur_exp_command_buffer_handle_t CommandBuffer;
ur_kernel_handle_t Kernel;
std::shared_ptr<CUgraphNode> Node;
CUgraphNode Node;
CUDA_KERNEL_NODE_PARAMS Params;

uint32_t WorkDim;
Expand All @@ -118,8 +118,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<CUgraphNode> CuNode) {
SyncPoints[SyncPoint] = std::move(CuNode);
CUgraphNode CuNode) {
SyncPoints[SyncPoint] = CuNode;
NextSyncPoint++;
}

Expand All @@ -130,8 +130,7 @@ struct ur_exp_command_buffer_handle_t_ {
// Helper to register next sync point
// @param CuNode Node to register as next sync point
// @return Pointer to the sync that registers the Node
ur_exp_command_buffer_sync_point_t
addSyncPoint(std::shared_ptr<CUgraphNode> CuNode) {
ur_exp_command_buffer_sync_point_t addSyncPoint(CUgraphNode CuNode) {
ur_exp_command_buffer_sync_point_t SyncPoint = NextSyncPoint;
registerSyncPoint(SyncPoint, std::move(CuNode));
return SyncPoint;
Expand Down Expand Up @@ -173,8 +172,7 @@ struct ur_exp_command_buffer_handle_t_ {
std::atomic_uint32_t RefCountExternal;

// Map of sync_points to ur_events
std::unordered_map<ur_exp_command_buffer_sync_point_t,
std::shared_ptr<CUgraphNode>>
std::unordered_map<ur_exp_command_buffer_sync_point_t, CUgraphNode>
SyncPoints;
// Next sync_point value (may need to consider ways to reuse values if 32-bits
// is not enough)
Expand Down
Loading