Skip to content

MCA/ATOMICS/UCX: workaround for abstraction violation - v3.1 #5380

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 1 commit into from
Jul 13, 2018
Merged

MCA/ATOMICS/UCX: workaround for abstraction violation - v3.1 #5380

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
2 changes: 1 addition & 1 deletion oshmem/mca/atomic/ucx/atomic_ucx_cswap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ int mca_atomic_ucx_cswap(void *target,
spml_ucx_mkey_t *ucx_mkey;
uint64_t rva;

ucx_mkey = mca_spml_ucx_get_mkey(pe, target, (void *)&rva);
ucx_mkey = mca_spml_ucx_get_mkey(pe, target, (void *)&rva, mca_spml_self);
if (NULL == cond) {
switch (nlong) {
case 4:
Expand Down
3 changes: 1 addition & 2 deletions oshmem/mca/atomic/ucx/atomic_ucx_fadd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ int mca_atomic_ucx_fadd(void *target,
spml_ucx_mkey_t *ucx_mkey;
uint64_t rva;

ucx_mkey = mca_spml_ucx_get_mkey(pe, target, (void *)&rva);

ucx_mkey = mca_spml_ucx_get_mkey(pe, target, (void *)&rva, mca_spml_self);
if (NULL == prev) {
switch (nlong) {
case 4:
Expand Down
3 changes: 2 additions & 1 deletion oshmem/mca/spml/ucx/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ mcacomponentdir = $(ompilibdir)
mcacomponent_LTLIBRARIES = $(component_install)
mca_spml_ucx_la_SOURCES = $(ucx_sources)
mca_spml_ucx_la_LIBADD = $(top_builddir)/oshmem/liboshmem.la \
$(spml_ucx_LIBS)
$(spml_ucx_LIBS) \
$(top_builddir)/oshmem/mca/spml/libmca_spml.la
mca_spml_ucx_la_LDFLAGS = -module -avoid-version $(spml_ucx_LDFLAGS)

noinst_LTLIBRARIES = $(component_noinst)
Expand Down
16 changes: 11 additions & 5 deletions oshmem/mca/spml/ucx/spml_ucx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@
#define SPML_UCX_PUT_DEBUG 0
#endif

static
spml_ucx_mkey_t * mca_spml_ucx_get_mkey_slow(int pe, void *va, void **rva);

mca_spml_ucx_t mca_spml_ucx = {
{
/* Init mca_spml_base_module_t */
Expand Down Expand Up @@ -74,7 +77,9 @@ mca_spml_ucx_t mca_spml_ucx = {
NULL, /* ucp_peers */
0, /* using_mem_hooks */
1, /* num_disconnect */
0 /* heap_reg_nb */
0, /* heap_reg_nb */
0, /* enabled */
mca_spml_ucx_get_mkey_slow
};

int mca_spml_ucx_enable(bool enable)
Expand Down Expand Up @@ -330,6 +335,7 @@ int mca_spml_ucx_add_procs(ompi_proc_t** procs, size_t nprocs)
}


static
spml_ucx_mkey_t * mca_spml_ucx_get_mkey_slow(int pe, void *va, void **rva)
{
sshmem_mkey_t *r_mkey;
Expand Down Expand Up @@ -550,7 +556,7 @@ int mca_spml_ucx_get(void *src_addr, size_t size, void *dst_addr, int src)
ucs_status_t status;
spml_ucx_mkey_t *ucx_mkey;

ucx_mkey = mca_spml_ucx_get_mkey(src, src_addr, &rva);
ucx_mkey = mca_spml_ucx_get_mkey(src, src_addr, &rva, &mca_spml_ucx);
status = ucp_get(mca_spml_ucx.ucp_peers[src].ucp_conn, dst_addr, size,
(uint64_t)rva, ucx_mkey->rkey);

Expand All @@ -563,7 +569,7 @@ int mca_spml_ucx_get_nb(void *src_addr, size_t size, void *dst_addr, int src, vo
ucs_status_t status;
spml_ucx_mkey_t *ucx_mkey;

ucx_mkey = mca_spml_ucx_get_mkey(src, src_addr, &rva);
ucx_mkey = mca_spml_ucx_get_mkey(src, src_addr, &rva, &mca_spml_ucx);
status = ucp_get_nbi(mca_spml_ucx.ucp_peers[src].ucp_conn, dst_addr, size,
(uint64_t)rva, ucx_mkey->rkey);

Expand All @@ -576,7 +582,7 @@ int mca_spml_ucx_put(void* dst_addr, size_t size, void* src_addr, int dst)
ucs_status_t status;
spml_ucx_mkey_t *ucx_mkey;

ucx_mkey = mca_spml_ucx_get_mkey(dst, dst_addr, &rva);
ucx_mkey = mca_spml_ucx_get_mkey(dst, dst_addr, &rva, &mca_spml_ucx);
status = ucp_put(mca_spml_ucx.ucp_peers[dst].ucp_conn, src_addr, size,
(uint64_t)rva, ucx_mkey->rkey);

Expand All @@ -589,7 +595,7 @@ int mca_spml_ucx_put_nb(void* dst_addr, size_t size, void* src_addr, int dst, vo
ucs_status_t status;
spml_ucx_mkey_t *ucx_mkey;

ucx_mkey = mca_spml_ucx_get_mkey(dst, dst_addr, &rva);
ucx_mkey = mca_spml_ucx_get_mkey(dst, dst_addr, &rva, &mca_spml_ucx);
status = ucp_put_nbi(mca_spml_ucx.ucp_peers[dst].ucp_conn, src_addr, size,
(uint64_t)rva, ucx_mkey->rkey);

Expand Down
13 changes: 8 additions & 5 deletions oshmem/mca/spml/ucx/spml_ucx.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ struct ucp_peer {
};
typedef struct ucp_peer ucp_peer_t;

typedef spml_ucx_mkey_t * (*mca_spml_ucx_get_mkey_slow_fn_t)(int pe, void *va, void **rva);

struct mca_spml_ucx {
mca_spml_base_module_t super;
ucp_context_h ucp_context;
Expand All @@ -68,6 +70,8 @@ struct mca_spml_ucx {

int priority; /* component priority */
bool enabled;

mca_spml_ucx_get_mkey_slow_fn_t get_mkey_slow;
};
typedef struct mca_spml_ucx mca_spml_ucx_t;

Expand Down Expand Up @@ -121,17 +125,16 @@ extern int mca_spml_ucx_quiet(void);
extern int spml_ucx_progress(void);


spml_ucx_mkey_t * mca_spml_ucx_get_mkey_slow(int pe, void *va, void **rva);

static inline spml_ucx_mkey_t *
mca_spml_ucx_get_mkey(int pe, void *va, void **rva)
mca_spml_ucx_get_mkey(int pe, void *va, void **rva, mca_spml_ucx_t* module)
{
spml_ucx_cached_mkey_t *mkey;

mkey = mca_spml_ucx.ucp_peers[pe].mkeys;
mkey = module->ucp_peers[pe].mkeys;
mkey = (spml_ucx_cached_mkey_t *)map_segment_find_va(&mkey->super.super, sizeof(*mkey), va);
if (OPAL_UNLIKELY(NULL == mkey)) {
return mca_spml_ucx_get_mkey_slow(pe, va, rva);
assert(module->get_mkey_slow);
return module->get_mkey_slow(pe, va, rva);
}
*rva = map_segment_va2rva(&mkey->super, va);
return &mkey->key;
Expand Down