Skip to content

TL/UCP: Split single and multithreaded send/receive #1109

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
merged 7 commits into from
Apr 11, 2025
Merged

TL/UCP: Split single and multithreaded send/receive #1109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d0777fe
TL/UCP: completion callback st/mt
ikryukov Apr 1, 2025
b33fe77
TL/UCP: ucc_tl_ucp_send_nb callback
ikryukov Apr 2, 2025
c7f27da
TL/UCP: recv implementation
ikryukov Apr 3, 2025
5d19f81
TL/UCP: fix conflict
ikryukov Apr 3, 2025
cf5e6cb
TL/UCP: disable clang tidy error
ikryukov Apr 4, 2025
603d02f
TL/UCP: non zero versions
ikryukov Apr 4, 2025
6607294
TL/UCP: rename and format
ikryukov Apr 8, 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
70 changes: 50 additions & 20 deletions src/components/tl/ucp/tl_ucp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,11 +143,59 @@ typedef ucc_status_t (*ucc_tl_ucp_copy_test_fn_t)(ucc_tl_ucp_context_t *ctx,
ucc_tl_ucp_copy_task_t *copy_task);
typedef ucc_status_t (*ucc_tl_ucp_copy_finalize_fn_t)(ucc_tl_ucp_copy_task_t *copy_task);

typedef struct ucc_tl_ucp_team {
ucc_tl_team_t super;
ucc_status_t status;
uint32_t seq_num;
ucc_tl_ucp_task_t *preconnect_task;
void * va_base[MAX_NR_SEGMENTS];
size_t base_length[MAX_NR_SEGMENTS];
ucc_tl_ucp_worker_t * worker;
ucc_tl_ucp_team_config_t cfg;
const char * tuning_str;
ucc_topo_t *topo;
ucc_ep_map_t ctx_map;
ucc_rank_t opt_radix; /* generic opt radix */
ucc_rank_t opt_radix_host; /* host specific opt radix */
} ucc_tl_ucp_team_t;
UCC_CLASS_DECLARE(ucc_tl_ucp_team_t, ucc_base_context_t *,
const ucc_base_team_params_t *);

typedef ucc_status_t (*ucc_tl_ucp_send_nb_fn_t)(void *buffer, size_t msglen,
ucc_memory_type_t mtype,
ucc_rank_t dest_group_rank,
ucc_tl_ucp_team_t *team,
ucc_tl_ucp_task_t *task);

typedef ucc_status_t (*ucc_tl_ucp_recv_nb_fn_t)(void *buffer, size_t msglen,
ucc_memory_type_t mtype,
ucc_rank_t dest_group_rank,
ucc_tl_ucp_team_t *team,
ucc_tl_ucp_task_t *task);

typedef ucc_status_t (*ucc_tl_ucp_recv_nz_fn_t)(void *buffer, size_t msglen,
ucc_memory_type_t mtype,
ucc_rank_t dest_group_rank,
ucc_tl_ucp_team_t *team,
ucc_tl_ucp_task_t *task);

typedef ucc_status_t (*ucc_tl_ucp_send_nz_fn_t)(void *buffer, size_t msglen,
ucc_memory_type_t mtype,
ucc_rank_t dest_group_rank,
ucc_tl_ucp_team_t *team,
ucc_tl_ucp_task_t *task);

typedef struct ucc_tl_ucp_context {
ucc_tl_context_t super;
ucc_tl_ucp_context_config_t cfg;
ucc_tl_ucp_worker_t worker;
ucc_tl_ucp_worker_t service_worker;
struct {
ucc_tl_ucp_send_nb_fn_t ucc_tl_ucp_send_nb;
ucc_tl_ucp_recv_nb_fn_t ucc_tl_ucp_recv_nb;
ucc_tl_ucp_send_nz_fn_t ucc_tl_ucp_send_nz;
ucc_tl_ucp_recv_nz_fn_t ucc_tl_ucp_recv_nz;
} sendrecv_cbs;
uint32_t service_worker_throttling_count;
ucc_mpool_t req_mp;
ucc_tl_ucp_remote_info_t * remote_info;
Expand All @@ -162,26 +210,8 @@ typedef struct ucc_tl_ucp_context {
} copy;
} ucc_tl_ucp_context_t;
UCC_CLASS_DECLARE(ucc_tl_ucp_context_t, const ucc_base_context_params_t *,
const ucc_base_config_t *);

typedef struct ucc_tl_ucp_team {
ucc_tl_team_t super;
ucc_status_t status;
uint32_t seq_num;
ucc_tl_ucp_task_t *preconnect_task;
void * va_base[MAX_NR_SEGMENTS];
size_t base_length[MAX_NR_SEGMENTS];
ucc_tl_ucp_worker_t * worker;
ucc_tl_ucp_team_config_t cfg;
const char * tuning_str;
ucc_topo_t *topo;
ucc_ep_map_t ctx_map;
ucc_rank_t opt_radix; /* generic opt radix */
ucc_rank_t opt_radix_host; /* host specific opt radix */
} ucc_tl_ucp_team_t;
UCC_CLASS_DECLARE(ucc_tl_ucp_team_t, ucc_base_context_t *,
const ucc_base_team_params_t *);

const ucc_base_config_t *);

extern ucc_config_field_t ucc_tl_ucp_lib_config_table[];

#define UCC_TL_UCP_SUPPORTED_COLLS \
Expand Down
37 changes: 32 additions & 5 deletions src/components/tl/ucp/tl_ucp_coll.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,21 @@ void ucc_tl_ucp_team_default_score_str_free(
}
}

void ucc_tl_ucp_send_completion_cb(void *request, ucs_status_t status,
void *user_data)
void ucc_tl_ucp_send_completion_cb_st(void *request, ucs_status_t status,
void *user_data)
{
ucc_tl_ucp_task_t *task = (ucc_tl_ucp_task_t *)user_data;
if (ucc_unlikely(UCS_OK != status)) {
tl_error(UCC_TASK_LIB(task), "failure in send completion %s",
ucs_status_string(status));
task->super.status = ucs_status_to_ucc_status(status);
}
++task->tagged.send_completed;
ucp_request_free(request);
}

void ucc_tl_ucp_send_completion_cb_mt(void *request, ucs_status_t status,
void *user_data)
{
ucc_tl_ucp_task_t *task = (ucc_tl_ucp_task_t *)user_data;
if (ucc_unlikely(UCS_OK != status)) {
Expand Down Expand Up @@ -136,9 +149,9 @@ void ucc_tl_ucp_get_completion_cb(void *request, ucs_status_t status,
ucp_request_free(request);
}

void ucc_tl_ucp_recv_completion_cb(void *request, ucs_status_t status,
const ucp_tag_recv_info_t *info, /* NOLINT */
void *user_data)
void ucc_tl_ucp_recv_completion_cb_mt(void *request, ucs_status_t status,
const ucp_tag_recv_info_t *info, /* NOLINT */
void *user_data)
{
ucc_tl_ucp_task_t *task = (ucc_tl_ucp_task_t *)user_data;
if (ucc_unlikely(UCS_OK != status)) {
Expand All @@ -150,6 +163,20 @@ void ucc_tl_ucp_recv_completion_cb(void *request, ucs_status_t status,
ucp_request_free(request);
}

void ucc_tl_ucp_recv_completion_cb_st(void *request, ucs_status_t status,
const ucp_tag_recv_info_t *info, /* NOLINT */
void *user_data)
{
ucc_tl_ucp_task_t *task = (ucc_tl_ucp_task_t *)user_data;
if (ucc_unlikely(UCS_OK != status)) {
tl_error(UCC_TASK_LIB(task), "failure in recv completion %s",
ucs_status_string(status));
task->super.status = ucs_status_to_ucc_status(status);
}
++task->tagged.recv_completed;
ucp_request_free(request);
}

ucc_status_t ucc_tl_ucp_coll_finalize(ucc_coll_task_t *coll_task)
{
ucc_tl_ucp_task_t *task = ucc_derived_of(coll_task, ucc_tl_ucp_task_t);
Expand Down
11 changes: 10 additions & 1 deletion src/components/tl/ucp/tl_ucp_context.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
#include "tl_ucp_copy.h"
#include <limits.h>

#include "tl_ucp_sendrecv.h"

#define UCP_CHECK(function, msg, go, ctx) \
status = function; \
if (UCS_OK != status) { \
Expand Down Expand Up @@ -215,9 +217,17 @@ UCC_CLASS_INIT_FUNC(ucc_tl_ucp_context_t,
case UCC_THREAD_SINGLE:
case UCC_THREAD_FUNNELED:
worker_params.thread_mode = UCS_THREAD_MODE_SINGLE;
self->sendrecv_cbs.ucc_tl_ucp_send_nb = ucc_tl_ucp_send_nb_st;
self->sendrecv_cbs.ucc_tl_ucp_recv_nb = ucc_tl_ucp_recv_nb_st;
self->sendrecv_cbs.ucc_tl_ucp_send_nz = ucc_tl_ucp_send_nz_st;
self->sendrecv_cbs.ucc_tl_ucp_recv_nz = ucc_tl_ucp_recv_nz_st;
break;
case UCC_THREAD_MULTIPLE:
worker_params.thread_mode = UCS_THREAD_MODE_MULTI;
self->sendrecv_cbs.ucc_tl_ucp_send_nb = ucc_tl_ucp_send_nb_mt;
self->sendrecv_cbs.ucc_tl_ucp_recv_nb = ucc_tl_ucp_recv_nb_mt;
self->sendrecv_cbs.ucc_tl_ucp_send_nz = ucc_tl_ucp_send_nz_mt;
self->sendrecv_cbs.ucc_tl_ucp_recv_nz = ucc_tl_ucp_recv_nz_mt;
break;
default:
/* unreachable */
Expand Down Expand Up @@ -294,7 +304,6 @@ UCC_CLASS_INIT_FUNC(ucc_tl_ucp_context_t,
ucc_free(prefix);
prefix = NULL;


switch (self->cfg.local_copy_type) {
case UCC_TL_UCP_LOCAL_COPY_TYPE_MC:
self->copy.post = ucc_tl_ucp_mc_copy_post;
Expand Down
Loading