[mpich] MPICH primary repository branch, master, updated. v3.2a2-40-gef22b67
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via ef22b67d3cc87300cbd3ffc44e6914207ddc44d2 (commit) from a4b5016f282fe2a1c4e6e81c4d3fc4f5c66e6de7 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/ef22b67d3cc87300cbd3ffc44e6914207d... commit ef22b67d3cc87300cbd3ffc44e6914207ddc44d2 Author: Charles J Archer <[email protected]> Date: Thu Dec 11 19:10:47 2014 -0800 Include uppercase SFI to OFI in netmod rename diff --git a/src/mpid/ch3/channels/nemesis/netmod/ofi/Makefile.mk b/src/mpid/ch3/channels/nemesis/netmod/ofi/Makefile.mk index 0e19072..70487e3 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ofi/Makefile.mk +++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/Makefile.mk @@ -4,7 +4,7 @@ ## (C) 2011 by Argonne National Laboratory. ## See COPYRIGHT in top-level directory. ## -if BUILD_NEMESIS_NETMOD_SFI +if BUILD_NEMESIS_NETMOD_OFI mpi_core_sources += \ src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_init.c \ diff --git a/src/mpid/ch3/channels/nemesis/netmod/ofi/errnames.txt b/src/mpid/ch3/channels/nemesis/netmod/ofi/errnames.txt index 16c61b0..620e52d 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ofi/errnames.txt +++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/errnames.txt @@ -1,42 +1,42 @@ -**ofi_avmap:SFI get address vector map failed -**ofi_avmap %s %d %s %s:SFI address vector map failed (%s:%d:%s:%s) -**ofi_tsend:SFI tagged sendto failed -**ofi_tsend %s %d %s %s:SFI tagged sendto failed (%s:%d:%s:%s) -**ofi_trecv:SFI tagged recvfrom failed -**ofi_trecv %s %d %s %s:SFI tagged recvfrom failed (%s:%d:%s:%s) -**ofi_getinfo:SFI getinfo() failed -**ofi_getinfo %s %d %s %s:SFI getinfo() failed (%s:%d:%s:%s) -**ofi_openep:SFI endpoint open failed -**ofi_openep %s %d %s %s:SFI endpoint open failed (%s:%d:%s:%s) -**ofi_openfabric:SFI fabric open failure -**ofi_openfabric %s %d %s %s:SFI fabric open failed (%s:%d:%s:%s) -**ofi_opendomain:SFI domain open failure -**ofi_opendomain %s %d %s %s:SFI domain open failed (%s:%d:%s:%s) -**ofi_opencq:SFI event queue create failure -**ofi_opencq %s %d %s %s:SFI event queue create failed (%s:%d:%s:%s) -**ofi_avopen:SFI address vector open failed -**ofi_avopen %s %d %s %s:SFI address vector open failed (%s:%d:%s:%s) -**ofi_bind:SFI resource bind failure -**ofi_bind %s %d %s %s:SFI resource bind failed (%s:%d:%s:%s) -**ofi_ep_enable:SFI endpoint enable failed -**ofi_ep_enable %s %d %s %s:SFI endpoint enable failed (%s:%d:%s:%s) -**ofi_getname:SFI get endpoint name failed -**ofi_getname %s %d %s %s:SFI get endpoint name failed (%s:%d:%s:%s) -**ofi_avclose:SFI av close failed -**ofi_avclose %s %d %s %s:SFI av close failed (%s:%d:%s:%s) -**ofi_epclose:SFI endpoint close failed -**ofi_epclose %s %d %s %s:SFI endpoint close failed (%s:%d:%s:%s) -**ofi_cqclose:SFI cq close failed -**ofi_cqclose %s %d %s %s:SFI cq close failed (%s:%d:%s:%s) -**ofi_mrclose:SFI mr close failed -**ofi_mrclose %s %d %s %s:SFI mr close failed (%s:%d:%s:%s) -**ofi_fabricclose:SFI fabric close failed -**ofi_fabricclose %s %d %s %s:SFI fabric close failed (%s:%d:%s:%s) -**ofi_domainclose:SFI domain close failed -**ofi_domainclose %s %d %s %s:SFI domain close failed (%s:%d:%s:%s) -**ofi_tsearch:SFI tsearch failed -**ofi_tsearch %s %d %s %s:SFI tsearch failed (%s:%d:%s:%s) -**ofi_poll:SFI poll failed -**ofi_poll %s %d %s %s:SFI poll failed (%s:%d:%s:%s) -**ofi_cancel:SFI cancel failed -**ofi_cancel %s %d %s %s:SFI cancel failed (%s:%d:%s:%s) +**ofi_avmap:OFI get address vector map failed +**ofi_avmap %s %d %s %s:OFI address vector map failed (%s:%d:%s:%s) +**ofi_tsend:OFI tagged sendto failed +**ofi_tsend %s %d %s %s:OFI tagged sendto failed (%s:%d:%s:%s) +**ofi_trecv:OFI tagged recvfrom failed +**ofi_trecv %s %d %s %s:OFI tagged recvfrom failed (%s:%d:%s:%s) +**ofi_getinfo:OFI getinfo() failed +**ofi_getinfo %s %d %s %s:OFI getinfo() failed (%s:%d:%s:%s) +**ofi_openep:OFI endpoint open failed +**ofi_openep %s %d %s %s:OFI endpoint open failed (%s:%d:%s:%s) +**ofi_openfabric:OFI fabric open failure +**ofi_openfabric %s %d %s %s:OFI fabric open failed (%s:%d:%s:%s) +**ofi_opendomain:OFI domain open failure +**ofi_opendomain %s %d %s %s:OFI domain open failed (%s:%d:%s:%s) +**ofi_opencq:OFI event queue create failure +**ofi_opencq %s %d %s %s:OFI event queue create failed (%s:%d:%s:%s) +**ofi_avopen:OFI address vector open failed +**ofi_avopen %s %d %s %s:OFI address vector open failed (%s:%d:%s:%s) +**ofi_bind:OFI resource bind failure +**ofi_bind %s %d %s %s:OFI resource bind failed (%s:%d:%s:%s) +**ofi_ep_enable:OFI endpoint enable failed +**ofi_ep_enable %s %d %s %s:OFI endpoint enable failed (%s:%d:%s:%s) +**ofi_getname:OFI get endpoint name failed +**ofi_getname %s %d %s %s:OFI get endpoint name failed (%s:%d:%s:%s) +**ofi_avclose:OFI av close failed +**ofi_avclose %s %d %s %s:OFI av close failed (%s:%d:%s:%s) +**ofi_epclose:OFI endpoint close failed +**ofi_epclose %s %d %s %s:OFI endpoint close failed (%s:%d:%s:%s) +**ofi_cqclose:OFI cq close failed +**ofi_cqclose %s %d %s %s:OFI cq close failed (%s:%d:%s:%s) +**ofi_mrclose:OFI mr close failed +**ofi_mrclose %s %d %s %s:OFI mr close failed (%s:%d:%s:%s) +**ofi_fabricclose:OFI fabric close failed +**ofi_fabricclose %s %d %s %s:OFI fabric close failed (%s:%d:%s:%s) +**ofi_domainclose:OFI domain close failed +**ofi_domainclose %s %d %s %s:OFI domain close failed (%s:%d:%s:%s) +**ofi_tsearch:OFI tsearch failed +**ofi_tsearch %s %d %s %s:OFI tsearch failed (%s:%d:%s:%s) +**ofi_poll:OFI poll failed +**ofi_poll %s %d %s %s:OFI poll failed (%s:%d:%s:%s) +**ofi_cancel:OFI cancel failed +**ofi_cancel %s %d %s %s:OFI cancel failed (%s:%d:%s:%s) diff --git a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_cm.c b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_cm.c index 686a905..31b38fc 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_cm.c +++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_cm.c @@ -38,7 +38,7 @@ static inline MPIDI_VC_t *ofi_tag_to_vc(uint64_t match_bits) port = get_port(match_bits); vc = gl_data.cm_vcs; while (vc && vc->port_name_tag != port) { - vc = VC_SFI(vc)->next; + vc = VC_OFI(vc)->next; } if (NULL == vc) { MPIU_Assertp(0); @@ -90,7 +90,7 @@ static inline MPIDI_VC_t *ofi_tag_to_vc(uint64_t match_bits) static inline int MPID_nem_ofi_conn_req_callback(cq_tagged_entry_t * wc, MPID_Request * rreq) { int ret, len, mpi_errno = MPI_SUCCESS; - char bc[SFI_KVSAPPSTRLEN]; + char bc[OFI_KVSAPPSTRLEN]; MPIDI_VC_t *vc; char *addr = NULL; @@ -103,12 +103,12 @@ static inline int MPID_nem_ofi_conn_req_callback(cq_tagged_entry_t * wc, MPID_Re MPIU_Assert(gl_data.conn_req == rreq); FI_RC(fi_trecv(gl_data.endpoint, gl_data.conn_req->dev.user_buf, - SFI_KVSAPPSTRLEN, + OFI_KVSAPPSTRLEN, gl_data.mr, 0, MPID_CONN_REQ, ~MPID_PROTOCOL_MASK, - (void *) &(REQ_SFI(gl_data.conn_req)->ofi_context)), trecv); + (void *) &(REQ_OFI(gl_data.conn_req)->ofi_context)), trecv); addr = MPIU_Malloc(gl_data.bound_addrlen); MPIU_Assertp(addr); @@ -118,16 +118,16 @@ static inline int MPID_nem_ofi_conn_req_callback(cq_tagged_entry_t * wc, MPID_Re MPIDI_VC_Init(vc, NULL, 0); MPI_RC(MPIDI_GetTagFromPort(bc, &vc->port_name_tag)); - ret = MPIU_Str_get_binary_arg(bc, "SFI", addr, gl_data.bound_addrlen, &len); + ret = MPIU_Str_get_binary_arg(bc, "OFI", addr, gl_data.bound_addrlen, &len); MPIU_ERR_CHKANDJUMP((ret != MPIU_STR_SUCCESS && ret != MPIU_STR_NOMEM) || (size_t) len != gl_data.bound_addrlen, mpi_errno, MPI_ERR_OTHER, "**badbusinesscard"); FI_RC(fi_av_insert(gl_data.av, addr, 1, &direct_addr, 0ULL, NULL), avmap); - VC_SFI(vc)->direct_addr = direct_addr; - VC_SFI(vc)->ready = 1; - VC_SFI(vc)->is_cmvc = 1; - VC_SFI(vc)->next = gl_data.cm_vcs; + VC_OFI(vc)->direct_addr = direct_addr; + VC_OFI(vc)->ready = 1; + VC_OFI(vc)->is_cmvc = 1; + VC_OFI(vc)->next = gl_data.cm_vcs; gl_data.cm_vcs = vc; MPIDI_CH3I_Acceptq_enqueue(vc, vc->port_name_tag); @@ -159,10 +159,10 @@ static inline int MPID_nem_ofi_handle_packet(cq_tagged_entry_t * wc ATTRIBUTE((u BEGIN_FUNC(FCNAME); if (rreq->cc == 1) { - vc = REQ_SFI(rreq)->vc; + vc = REQ_OFI(rreq)->vc; MPIU_Assert(vc); - MPI_RC(MPID_nem_handle_pkt(vc, REQ_SFI(rreq)->pack_buffer, REQ_SFI(rreq)->pack_buffer_size)) - MPIU_Free(REQ_SFI(rreq)->pack_buffer); + MPI_RC(MPID_nem_handle_pkt(vc, REQ_OFI(rreq)->pack_buffer, REQ_OFI(rreq)->pack_buffer_size)) + MPIU_Free(REQ_OFI(rreq)->pack_buffer); } MPIDI_CH3U_Request_complete(rreq); END_FUNC_RC(FCNAME); @@ -179,7 +179,7 @@ static inline int MPID_nem_ofi_cts_send_callback(cq_tagged_entry_t * wc, MPID_Re { int mpi_errno = MPI_SUCCESS; BEGIN_FUNC(FCNAME); - MPI_RC(MPID_nem_ofi_handle_packet(wc, REQ_SFI(sreq)->parent)); + MPI_RC(MPID_nem_ofi_handle_packet(wc, REQ_OFI(sreq)->parent)); MPIDI_CH3U_Request_complete(sreq); END_FUNC_RC(FCNAME); } @@ -217,28 +217,28 @@ static inline int MPID_nem_ofi_preposted_callback(cq_tagged_entry_t * wc, MPID_R MPID_cc_incr(new_rreq->cc_ptr, &c); new_rreq->dev.OnDataAvail = NULL; new_rreq->dev.next = NULL; - REQ_SFI(new_rreq)->event_callback = MPID_nem_ofi_handle_packet; - REQ_SFI(new_rreq)->vc = vc; - REQ_SFI(new_rreq)->pack_buffer = pack_buffer; - REQ_SFI(new_rreq)->pack_buffer_size = pkt_len; + REQ_OFI(new_rreq)->event_callback = MPID_nem_ofi_handle_packet; + REQ_OFI(new_rreq)->vc = vc; + REQ_OFI(new_rreq)->pack_buffer = pack_buffer; + REQ_OFI(new_rreq)->pack_buffer_size = pkt_len; FI_RC(fi_trecv(gl_data.endpoint, - REQ_SFI(new_rreq)->pack_buffer, - REQ_SFI(new_rreq)->pack_buffer_size, + REQ_OFI(new_rreq)->pack_buffer, + REQ_OFI(new_rreq)->pack_buffer_size, gl_data.mr, - VC_SFI(vc)->direct_addr, - wc->tag | MPID_MSG_DATA, 0, &(REQ_SFI(new_rreq)->ofi_context)), trecv); + VC_OFI(vc)->direct_addr, + wc->tag | MPID_MSG_DATA, 0, &(REQ_OFI(new_rreq)->ofi_context)), trecv); MPID_nem_ofi_create_req(&sreq, 1); sreq->dev.OnDataAvail = NULL; sreq->dev.next = NULL; - REQ_SFI(sreq)->event_callback = MPID_nem_ofi_cts_send_callback; - REQ_SFI(sreq)->parent = new_rreq; + REQ_OFI(sreq)->event_callback = MPID_nem_ofi_cts_send_callback; + REQ_OFI(sreq)->parent = new_rreq; FI_RC(fi_tsend(gl_data.endpoint, NULL, 0, gl_data.mr, - VC_SFI(vc)->direct_addr, - wc->tag | MPID_MSG_CTS, &(REQ_SFI(sreq)->ofi_context)), tsend); + VC_OFI(vc)->direct_addr, + wc->tag | MPID_MSG_CTS, &(REQ_OFI(sreq)->ofi_context)), tsend); MPIU_Assert(gl_data.persistent_req == rreq); rreq->dev.user_count = 0; @@ -248,7 +248,7 @@ static inline int MPID_nem_ofi_preposted_callback(cq_tagged_entry_t * wc, MPID_R gl_data.mr, 0, MPID_MSG_RTS, - ~MPID_PROTOCOL_MASK, &(REQ_SFI(rreq)->ofi_context)), trecv); + ~MPID_PROTOCOL_MASK, &(REQ_OFI(rreq)->ofi_context)), trecv); END_FUNC_RC(FCNAME); } @@ -264,8 +264,8 @@ int MPID_nem_ofi_connect_to_root_callback(cq_tagged_entry_t * wc ATTRIBUTE((unus int mpi_errno = MPI_SUCCESS; BEGIN_FUNC(FCNAME); - if (REQ_SFI(sreq)->pack_buffer) - MPIU_Free(REQ_SFI(sreq)->pack_buffer); + if (REQ_OFI(sreq)->pack_buffer) + MPIU_Free(REQ_OFI(sreq)->pack_buffer); MPIDI_CH3U_Request_complete(sreq); END_FUNC(FCNAME); @@ -301,8 +301,8 @@ int MPID_nem_ofi_cm_init(MPIDI_PG_t * pg_p, int pg_rank ATTRIBUTE((unused))) MPID_nem_ofi_create_req(&persistent_req, 1); persistent_req->dev.OnDataAvail = NULL; persistent_req->dev.next = NULL; - REQ_SFI(persistent_req)->vc = NULL; - REQ_SFI(persistent_req)->event_callback = MPID_nem_ofi_preposted_callback; + REQ_OFI(persistent_req)->vc = NULL; + REQ_OFI(persistent_req)->event_callback = MPID_nem_ofi_preposted_callback; FI_RC(fi_trecv(gl_data.endpoint, &persistent_req->dev.user_count, sizeof persistent_req->dev.user_count, @@ -310,25 +310,25 @@ int MPID_nem_ofi_cm_init(MPIDI_PG_t * pg_p, int pg_rank ATTRIBUTE((unused))) 0, MPID_MSG_RTS, ~MPID_PROTOCOL_MASK, - (void *) &(REQ_SFI(persistent_req)->ofi_context)), trecv); + (void *) &(REQ_OFI(persistent_req)->ofi_context)), trecv); gl_data.persistent_req = persistent_req; /* --------------------------------- */ /* Post recv for connection requests */ /* --------------------------------- */ MPID_nem_ofi_create_req(&conn_req, 1); - conn_req->dev.user_buf = MPIU_Malloc(SFI_KVSAPPSTRLEN * sizeof(char)); + conn_req->dev.user_buf = MPIU_Malloc(OFI_KVSAPPSTRLEN * sizeof(char)); conn_req->dev.OnDataAvail = NULL; conn_req->dev.next = NULL; - REQ_SFI(conn_req)->vc = NULL; /* We don't know the source yet */ - REQ_SFI(conn_req)->event_callback = MPID_nem_ofi_conn_req_callback; + REQ_OFI(conn_req)->vc = NULL; /* We don't know the source yet */ + REQ_OFI(conn_req)->event_callback = MPID_nem_ofi_conn_req_callback; FI_RC(fi_trecv(gl_data.endpoint, conn_req->dev.user_buf, - SFI_KVSAPPSTRLEN, + OFI_KVSAPPSTRLEN, gl_data.mr, 0, MPID_CONN_REQ, - ~MPID_PROTOCOL_MASK, (void *) &(REQ_SFI(conn_req)->ofi_context)), trecv); + ~MPID_PROTOCOL_MASK, (void *) &(REQ_OFI(conn_req)->ofi_context)), trecv); gl_data.conn_req = conn_req; @@ -351,12 +351,12 @@ int MPID_nem_ofi_cm_finalize() int mpi_errno = MPI_SUCCESS; BEGIN_FUNC(FCNAME); FI_RC(fi_cancel((fid_t) gl_data.endpoint, - &(REQ_SFI(gl_data.persistent_req)->ofi_context)), cancel); + &(REQ_OFI(gl_data.persistent_req)->ofi_context)), cancel); MPIR_STATUS_SET_CANCEL_BIT(gl_data.persistent_req->status, TRUE); MPIR_STATUS_SET_COUNT(gl_data.persistent_req->status, 0); MPIDI_CH3U_Request_complete(gl_data.persistent_req); - FI_RC(fi_cancel((fid_t) gl_data.endpoint, &(REQ_SFI(gl_data.conn_req)->ofi_context)), cancel); + FI_RC(fi_cancel((fid_t) gl_data.endpoint, &(REQ_OFI(gl_data.conn_req)->ofi_context)), cancel); MPIU_Free(gl_data.conn_req->dev.user_buf); MPIR_STATUS_SET_CANCEL_BIT(gl_data.conn_req->status, TRUE); MPIR_STATUS_SET_COUNT(gl_data.conn_req->status, 0); @@ -373,31 +373,31 @@ int MPID_nem_ofi_cm_finalize() /* Handle CH3/Nemesis VC connections */ /* * Query the VC address information. In particular we are looking for */ /* the fabric address name. */ -/* * Use fi_av_insert to register the address name with SFI */ +/* * Use fi_av_insert to register the address name with OFI */ /* ------------------------------------------------------------------------ */ #undef FCNAME #define FCNAME DECL_FUNC(MPID_nem_ofi_vc_connect) int MPID_nem_ofi_vc_connect(MPIDI_VC_t * vc) { int len, ret, mpi_errno = MPI_SUCCESS; - char bc[SFI_KVSAPPSTRLEN], *addr = NULL; + char bc[OFI_KVSAPPSTRLEN], *addr = NULL; BEGIN_FUNC(FCNAME); addr = MPIU_Malloc(gl_data.bound_addrlen); MPIU_Assert(addr); - MPIU_Assert(1 != VC_SFI(vc)->ready); + MPIU_Assert(1 != VC_OFI(vc)->ready); if (!vc->pg || !vc->pg->getConnInfo) { goto fn_exit; } - MPI_RC(vc->pg->getConnInfo(vc->pg_rank, bc, SFI_KVSAPPSTRLEN, vc->pg)); - ret = MPIU_Str_get_binary_arg(bc, "SFI", addr, gl_data.bound_addrlen, &len); + MPI_RC(vc->pg->getConnInfo(vc->pg_rank, bc, OFI_KVSAPPSTRLEN, vc->pg)); + ret = MPIU_Str_get_binary_arg(bc, "OFI", addr, gl_data.bound_addrlen, &len); MPIU_ERR_CHKANDJUMP((ret != MPIU_STR_SUCCESS && ret != MPIU_STR_NOMEM) || (size_t) len != gl_data.bound_addrlen, mpi_errno, MPI_ERR_OTHER, "**badbusinesscard"); - FI_RC(fi_av_insert(gl_data.av, addr, 1, &(VC_SFI(vc)->direct_addr), 0ULL, NULL), avmap); - VC_SFI(vc)->ready = 1; + FI_RC(fi_av_insert(gl_data.av, addr, 1, &(VC_OFI(vc)->direct_addr), 0ULL, NULL), avmap); + VC_OFI(vc)->ready = 1; fn_exit: if (addr) @@ -415,7 +415,7 @@ int MPID_nem_ofi_vc_init(MPIDI_VC_t * vc) { int mpi_errno = MPI_SUCCESS; MPIDI_CH3I_VC *const vc_ch = &vc->ch; - MPID_nem_ofi_vc_t *const vc_ofi = VC_SFI(vc); + MPID_nem_ofi_vc_t *const vc_ofi = VC_OFI(vc); BEGIN_FUNC(FCNAME); vc->sendNoncontig_fn = MPID_nem_ofi_SendNoncontig; @@ -447,25 +447,25 @@ int MPID_nem_ofi_vc_init(MPIDI_VC_t * vc) int MPID_nem_ofi_vc_destroy(MPIDI_VC_t * vc) { BEGIN_FUNC(FCNAME); - if (vc && (VC_SFI(vc)->is_cmvc == 1) && (VC_SFI(vc)->ready == 1)) { + if (vc && (VC_OFI(vc)->is_cmvc == 1) && (VC_OFI(vc)->ready == 1)) { if (vc->pg != NULL) { printf("ERROR: VC Destroy (%p) pg = %s\n", vc, (char *) vc->pg->id); } MPIDI_VC_t *prev = gl_data.cm_vcs; - while (prev && prev != vc && VC_SFI(prev)->next != vc) { - prev = VC_SFI(vc)->next; + while (prev && prev != vc && VC_OFI(prev)->next != vc) { + prev = VC_OFI(vc)->next; } - if (VC_SFI(prev)->next == vc) { - VC_SFI(prev)->next = VC_SFI(vc)->next; + if (VC_OFI(prev)->next == vc) { + VC_OFI(prev)->next = VC_OFI(vc)->next; } else if (vc == gl_data.cm_vcs) { - gl_data.cm_vcs = VC_SFI(vc)->next; + gl_data.cm_vcs = VC_OFI(vc)->next; } else { MPIU_Assert(0); } } - VC_SFI(vc)->ready = 0; + VC_OFI(vc)->ready = 0; END_FUNC(FCNAME); return MPI_SUCCESS; } @@ -477,7 +477,7 @@ int MPID_nem_ofi_vc_terminate(MPIDI_VC_t * vc) int mpi_errno = MPI_SUCCESS; BEGIN_FUNC(FCNAME); MPI_RC(MPIDI_CH3U_Handle_connection(vc, MPIDI_VC_EVENT_TERMINATED)); - VC_SFI(vc)->ready = 0; + VC_OFI(vc)->ready = 0; END_FUNC_RC(FCNAME); } @@ -502,14 +502,14 @@ int MPID_nem_ofi_vc_terminate(MPIDI_VC_t * vc) int MPID_nem_ofi_connect_to_root(const char *business_card, MPIDI_VC_t * new_vc) { int len, ret, mpi_errno = MPI_SUCCESS, str_errno = MPI_SUCCESS; - int my_bc_len = SFI_KVSAPPSTRLEN; + int my_bc_len = OFI_KVSAPPSTRLEN; char *addr = NULL, *bc = NULL, *my_bc = NULL; MPID_Request *sreq; uint64_t conn_req_send_bits; BEGIN_FUNC(FCNAME); addr = MPIU_Malloc(gl_data.bound_addrlen); - bc = MPIU_Malloc(SFI_KVSAPPSTRLEN); + bc = MPIU_Malloc(OFI_KVSAPPSTRLEN); MPIU_Assertp(addr); MPIU_Assertp(bc); my_bc = bc; @@ -518,34 +518,34 @@ int MPID_nem_ofi_connect_to_root(const char *business_card, MPIDI_VC_t * new_vc) goto fn_fail; } MPI_RC(MPIDI_GetTagFromPort(business_card, &new_vc->port_name_tag)); - ret = MPIU_Str_get_binary_arg(business_card, "SFI", addr, gl_data.bound_addrlen, &len); + ret = MPIU_Str_get_binary_arg(business_card, "OFI", addr, gl_data.bound_addrlen, &len); MPIU_ERR_CHKANDJUMP((ret != MPIU_STR_SUCCESS && ret != MPIU_STR_NOMEM) || (size_t) len != gl_data.bound_addrlen, mpi_errno, MPI_ERR_OTHER, "**badbusinesscard"); - FI_RC(fi_av_insert(gl_data.av, addr, 1, &(VC_SFI(new_vc)->direct_addr), 0ULL, NULL), avmap); + FI_RC(fi_av_insert(gl_data.av, addr, 1, &(VC_OFI(new_vc)->direct_addr), 0ULL, NULL), avmap); - VC_SFI(new_vc)->ready = 1; + VC_OFI(new_vc)->ready = 1; str_errno = MPIU_Str_add_int_arg(&bc, &my_bc_len, "tag", new_vc->port_name_tag); MPIU_ERR_CHKANDJUMP(str_errno, mpi_errno, MPI_ERR_OTHER, "**argstr_port_name_tag"); MPI_RC(MPID_nem_ofi_get_business_card(MPIR_Process.comm_world->rank, &bc, &my_bc_len)); - my_bc_len = SFI_KVSAPPSTRLEN - my_bc_len; + my_bc_len = OFI_KVSAPPSTRLEN - my_bc_len; MPID_nem_ofi_create_req(&sreq, 1); sreq->kind = MPID_REQUEST_SEND; sreq->dev.OnDataAvail = NULL; sreq->dev.next = NULL; - REQ_SFI(sreq)->event_callback = MPID_nem_ofi_connect_to_root_callback; - REQ_SFI(sreq)->pack_buffer = my_bc; + REQ_OFI(sreq)->event_callback = MPID_nem_ofi_connect_to_root_callback; + REQ_OFI(sreq)->pack_buffer = my_bc; conn_req_send_bits = init_sendtag(0, MPIR_Process.comm_world->rank, 0, MPID_CONN_REQ); FI_RC(fi_tsend(gl_data.endpoint, - REQ_SFI(sreq)->pack_buffer, + REQ_OFI(sreq)->pack_buffer, my_bc_len, gl_data.mr, - VC_SFI(new_vc)->direct_addr, - conn_req_send_bits, &(REQ_SFI(sreq)->ofi_context)), tsend); + VC_OFI(new_vc)->direct_addr, + conn_req_send_bits, &(REQ_OFI(sreq)->ofi_context)), tsend); MPID_nem_ofi_poll(MPID_NONBLOCKING_POLL); - VC_SFI(new_vc)->is_cmvc = 1; - VC_SFI(new_vc)->next = gl_data.cm_vcs; + VC_OFI(new_vc)->is_cmvc = 1; + VC_OFI(new_vc)->next = gl_data.cm_vcs; gl_data.cm_vcs = new_vc; fn_exit: if (addr) @@ -567,7 +567,7 @@ int MPID_nem_ofi_get_business_card(int my_rank ATTRIBUTE((unused)), BEGIN_FUNC(FCNAME); str_errno = MPIU_Str_add_binary_arg(bc_val_p, val_max_sz_p, - "SFI", + "OFI", (char *) &gl_data.bound_addr, sizeof(gl_data.bound_addr)); if (str_errno) { MPIU_ERR_CHKANDJUMP(str_errno == MPIU_STR_NOMEM, mpi_errno, MPI_ERR_OTHER, "**buscard_len"); diff --git a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_impl.h b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_impl.h index 553a5b7..9e5f048 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_impl.h +++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_impl.h @@ -7,8 +7,8 @@ * to Argonne National Laboratory subject to Software Grant and Corporate * Contributor License Agreement dated February 8, 2012. */ -#ifndef SFI_IMPL_H -#define SFI_IMPL_H +#ifndef OFI_IMPL_H +#define OFI_IMPL_H #include "mpid_nem_impl.h" #include "mpihandlemem.h" @@ -61,20 +61,20 @@ typedef struct { /* This is per destination */ /* ******************************** */ typedef struct { - fi_addr_t direct_addr; /* Remote SFI address */ + fi_addr_t direct_addr; /* Remote OFI address */ int ready; /* VC ready state */ int is_cmvc; /* Cleanup VC */ MPIDI_VC_t *next; /* VC queue */ } MPID_nem_ofi_vc_t; -#define VC_SFI(vc) ((MPID_nem_ofi_vc_t *)vc->ch.netmod_area.padding) +#define VC_OFI(vc) ((MPID_nem_ofi_vc_t *)vc->ch.netmod_area.padding) /* ******************************** */ /* Per request object data */ -/* SFI/Netmod specific */ +/* OFI/Netmod specific */ /* ******************************** */ typedef struct { context_t ofi_context; /* Context Object */ - void *addr; /* SFI Address */ + void *addr; /* OFI Address */ event_callback_fn event_callback; /* Callback Event */ char *pack_buffer; /* MPI Pack Buffer */ int pack_buffer_size; /* Pack buffer size */ @@ -84,7 +84,7 @@ typedef struct { uint64_t tag; /* 64 bit tag request */ MPID_Request *parent; /* Parent request */ } MPID_nem_ofi_req_t; -#define REQ_SFI(req) ((MPID_nem_ofi_req_t *)((req)->ch.netmod_area.padding)) +#define REQ_OFI(req) ((MPID_nem_ofi_req_t *)((req)->ch.netmod_area.padding)) /* ******************************** */ /* Logging and function macros */ @@ -109,7 +109,7 @@ fn_fail: \ : __FILE__ \ ) #define DECL_FUNC(FUNCNAME) MPIU_QUOTE(FUNCNAME) -#define SFI_COMPILE_TIME_ASSERT(expr_) \ +#define OFI_COMPILE_TIME_ASSERT(expr_) \ do { switch(0) { case 0: case (expr_): default: break; } } while (0) #define FI_RC(FUNC,STR) \ @@ -151,17 +151,17 @@ fn_fail: \ #define VC_READY_CHECK(vc) \ ({ \ - if (1 != VC_SFI(vc)->ready) { \ + if (1 != VC_OFI(vc)->ready) { \ MPI_RC(MPID_nem_ofi_vc_connect(vc)); \ } \ }) -#define SFI_ADDR_INIT(src, vc, remote_proc) \ +#define OFI_ADDR_INIT(src, vc, remote_proc) \ ({ \ if (MPI_ANY_SOURCE != src) { \ MPIU_Assert(vc != NULL); \ VC_READY_CHECK(vc); \ - remote_proc = VC_SFI(vc)->direct_addr; \ + remote_proc = VC_OFI(vc)->direct_addr; \ } else { \ MPIU_Assert(vc == NULL); \ remote_proc = gl_data.any_addr; \ @@ -197,14 +197,14 @@ fn_fail: \ #define MPID_TAG_SHIFT (28) #define MPID_PSOURCE_SHIFT (16) #define MPID_PORT_SHIFT (32) -#define SFI_KVSAPPSTRLEN 1024 +#define OFI_KVSAPPSTRLEN 1024 /* ******************************** */ /* Request manipulation inlines */ /* ******************************** */ static inline void MPID_nem_ofi_init_req(MPID_Request * req) { - memset(REQ_SFI(req), 0, sizeof(MPID_nem_ofi_req_t)); + memset(REQ_OFI(req), 0, sizeof(MPID_nem_ofi_req_t)); } static inline int MPID_nem_ofi_create_req(MPID_Request ** request, int refcnt) @@ -320,7 +320,7 @@ int MPID_nem_ofi_iSendContig(MPIDI_VC_t * vc, MPID_Request * sreq, void *hdr, MPIDI_msg_sz_t hdr_sz, void *data, MPIDI_msg_sz_t data_sz); /* ************************************************************************** */ -/* SFI utility functions : not exposed as a netmod public API */ +/* OFI utility functions : not exposed as a netmod public API */ /* ************************************************************************** */ #define MPID_NONBLOCKING_POLL 0 #define MPID_BLOCKING_POLL 1 diff --git a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_init.c b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_init.c index cd9e7c7..182a780 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_init.c +++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_init.c @@ -21,7 +21,7 @@ int MPID_nem_ofi_init(MPIDI_PG_t * pg_p, int pg_rank, char **bc_val_p, int *val_ info_t hints, *prov_tagged, *prov_use; cq_attr_t cq_attr; av_attr_t av_attr; - char kvsname[SFI_KVSAPPSTRLEN], key[SFI_KVSAPPSTRLEN], bc[SFI_KVSAPPSTRLEN]; + char kvsname[OFI_KVSAPPSTRLEN], key[OFI_KVSAPPSTRLEN], bc[OFI_KVSAPPSTRLEN]; char *my_bc, *addrs, *null_addr; fi_addr_t *fi_addrs = NULL; MPIDI_VC_t *vc; @@ -39,11 +39,11 @@ int MPID_nem_ofi_init(MPIDI_PG_t * pg_p, int pg_rank, char **bc_val_p, int *val_ /* communication calls. */ /* Note that we do not fill in FI_LOCAL_MR, which means this netmod */ /* does not support exchange of memory regions on communication calls */ - /* SFI requires that all communication calls use a registered mr */ + /* OFI requires that all communication calls use a registered mr */ /* but in our case this netmod is written to only support transfers */ /* on a dynamic memory region that spans all of memory. So, we do */ /* not set the FI_LOCAL_MR mode bit, and we set the FI_DYNAMIC_MR */ - /* bit to tell SFI our requirement and filter providers appropriately */ + /* bit to tell OFI our requirement and filter providers appropriately */ /* ep_type: reliable datagram operation */ /* caps: Capabilities required from the provider. The bits specified */ /* with buffered receive, cancel, and remote complete implements */ @@ -62,7 +62,7 @@ int MPID_nem_ofi_init(MPIDI_PG_t * pg_p, int pg_rank, char **bc_val_p, int *val_ /* ------------------------------------------------------------------------ */ /* FI_VERSION provides binary backward and forward compatibility support */ - /* Specify the version of SFI is coded to, the provider will select struct */ + /* Specify the version of OFI is coded to, the provider will select struct */ /* layouts that are compatible with this version. */ /* ------------------------------------------------------------------------ */ fi_version = FI_VERSION(1, 0); @@ -203,8 +203,8 @@ int MPID_nem_ofi_init(MPIDI_PG_t * pg_p, int pg_rank, char **bc_val_p, int *val_ /* Publish the business card */ /* to the KVS */ /* -------------------------------- */ - PMI_RC(PMI_KVS_Get_my_name(kvsname, SFI_KVSAPPSTRLEN), pmi); - sprintf(key, "SFI-%d", pg_rank); + PMI_RC(PMI_KVS_Get_my_name(kvsname, OFI_KVSAPPSTRLEN), pmi); + sprintf(key, "OFI-%d", pg_rank); PMI_RC(PMI_KVS_Put(kvsname, key, my_bc), pmi); PMI_RC(PMI_KVS_Commit(kvsname), pmi); @@ -228,10 +228,10 @@ int MPID_nem_ofi_init(MPIDI_PG_t * pg_p, int pg_rank, char **bc_val_p, int *val_ MPIU_CHKLMEM_MALLOC(addrs, char *, pg_p->size * gl_data.bound_addrlen, mpi_errno, "addrs"); for (i = 0; i < pg_p->size; ++i) { - sprintf(key, "SFI-%d", i); + sprintf(key, "OFI-%d", i); - PMI_RC(PMI_KVS_Get(kvsname, key, bc, SFI_KVSAPPSTRLEN), pmi); - ret = MPIU_Str_get_binary_arg(bc, "SFI", + PMI_RC(PMI_KVS_Get(kvsname, key, bc, OFI_KVSAPPSTRLEN), pmi); + ret = MPIU_Str_get_binary_arg(bc, "OFI", (char *) &addrs[i * gl_data.bound_addrlen], gl_data.bound_addrlen, &len); MPIU_ERR_CHKANDJUMP((ret != MPIU_STR_SUCCESS && ret != MPIU_STR_NOMEM) || @@ -261,8 +261,8 @@ int MPID_nem_ofi_init(MPIDI_PG_t * pg_p, int pg_rank, char **bc_val_p, int *val_ /* --------------------------------- */ for (i = 0; i < pg_p->size; ++i) { MPIDI_PG_Get_vc(pg_p, i, &vc); - VC_SFI(vc)->direct_addr = fi_addrs[i]; - VC_SFI(vc)->ready = 1; + VC_OFI(vc)->direct_addr = fi_addrs[i]; + VC_OFI(vc)->ready = 1; } /* --------------------------------------------- */ @@ -316,9 +316,9 @@ int MPID_nem_ofi_finalize(void) static inline int compile_time_checking() { - SFI_COMPILE_TIME_ASSERT(sizeof(MPID_nem_ofi_vc_t) <= MPID_NEM_VC_NETMOD_AREA_LEN); - SFI_COMPILE_TIME_ASSERT(sizeof(MPID_nem_ofi_req_t) <= MPID_NEM_REQ_NETMOD_AREA_LEN); - SFI_COMPILE_TIME_ASSERT(sizeof(iovec_t) == sizeof(MPID_IOV)); + OFI_COMPILE_TIME_ASSERT(sizeof(MPID_nem_ofi_vc_t) <= MPID_NEM_VC_NETMOD_AREA_LEN); + OFI_COMPILE_TIME_ASSERT(sizeof(MPID_nem_ofi_req_t) <= MPID_NEM_REQ_NETMOD_AREA_LEN); + OFI_COMPILE_TIME_ASSERT(sizeof(iovec_t) == sizeof(MPID_IOV)); MPIU_Assert(((void *) &(((iovec_t *) 0)->iov_base)) == ((void *) &(((MPID_IOV *) 0)->MPID_IOV_BUF))); MPIU_Assert(((void *) &(((iovec_t *) 0)->iov_len)) == diff --git a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_msg.c b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_msg.c index ffa3761..49a6277 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_msg.c +++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_msg.c @@ -61,33 +61,33 @@ c = 1; \ MPID_cc_incr(sreq->cc_ptr, &c); \ MPID_cc_incr(sreq->cc_ptr, &c); \ - REQ_SFI(sreq)->event_callback = MPID_nem_ofi_data_callback; \ - REQ_SFI(sreq)->pack_buffer = pack_buffer; \ - REQ_SFI(sreq)->pack_buffer_size = pkt_len; \ - REQ_SFI(sreq)->vc = vc; \ - REQ_SFI(sreq)->tag = match_bits; \ + REQ_OFI(sreq)->event_callback = MPID_nem_ofi_data_callback; \ + REQ_OFI(sreq)->pack_buffer = pack_buffer; \ + REQ_OFI(sreq)->pack_buffer_size = pkt_len; \ + REQ_OFI(sreq)->vc = vc; \ + REQ_OFI(sreq)->tag = match_bits; \ \ MPID_nem_ofi_create_req(&cts_req, 1); \ cts_req->dev.OnDataAvail = NULL; \ cts_req->dev.next = NULL; \ - REQ_SFI(cts_req)->event_callback = MPID_nem_ofi_cts_recv_callback; \ - REQ_SFI(cts_req)->parent = sreq; \ + REQ_OFI(cts_req)->event_callback = MPID_nem_ofi_cts_recv_callback; \ + REQ_OFI(cts_req)->parent = sreq; \ \ FI_RC(fi_trecv(gl_data.endpoint, \ NULL, \ 0, \ gl_data.mr, \ - VC_SFI(vc)->direct_addr, \ + VC_OFI(vc)->direct_addr, \ match_bits | MPID_MSG_CTS, \ 0, /* Exact tag match, no ignore bits */ \ - &(REQ_SFI(cts_req)->ofi_context)),trecv); \ + &(REQ_OFI(cts_req)->ofi_context)),trecv); \ FI_RC(fi_tsend(gl_data.endpoint, \ - &REQ_SFI(sreq)->pack_buffer_size, \ - sizeof(REQ_SFI(sreq)->pack_buffer_size), \ + &REQ_OFI(sreq)->pack_buffer_size, \ + sizeof(REQ_OFI(sreq)->pack_buffer_size), \ gl_data.mr, \ - VC_SFI(vc)->direct_addr, \ + VC_OFI(vc)->direct_addr, \ match_bits, \ - &(REQ_SFI(sreq)->ofi_context)),tsend); \ + &(REQ_OFI(sreq)->ofi_context)),tsend); \ }) @@ -106,25 +106,25 @@ static int MPID_nem_ofi_data_callback(cq_tagged_entry_t * wc, MPID_Request * sre uint64_t tag = 0; BEGIN_FUNC(FCNAME); if (sreq->cc == 2) { - vc = REQ_SFI(sreq)->vc; - REQ_SFI(sreq)->tag = tag | MPID_MSG_DATA; + vc = REQ_OFI(sreq)->vc; + REQ_OFI(sreq)->tag = tag | MPID_MSG_DATA; FI_RC(fi_tsend(gl_data.endpoint, - REQ_SFI(sreq)->pack_buffer, - REQ_SFI(sreq)->pack_buffer_size, + REQ_OFI(sreq)->pack_buffer, + REQ_OFI(sreq)->pack_buffer_size, gl_data.mr, - VC_SFI(vc)->direct_addr, - wc->tag | MPID_MSG_DATA, (void *) &(REQ_SFI(sreq)->ofi_context)), tsend); + VC_OFI(vc)->direct_addr, + wc->tag | MPID_MSG_DATA, (void *) &(REQ_OFI(sreq)->ofi_context)), tsend); } if (sreq->cc == 1) { - if (REQ_SFI(sreq)->pack_buffer) - MPIU_Free(REQ_SFI(sreq)->pack_buffer); + if (REQ_OFI(sreq)->pack_buffer) + MPIU_Free(REQ_OFI(sreq)->pack_buffer); reqFn = sreq->dev.OnDataAvail; if (!reqFn) { MPIDI_CH3U_Request_complete(sreq); } else { - vc = REQ_SFI(sreq)->vc; + vc = REQ_OFI(sreq)->vc; MPI_RC(reqFn(vc, sreq, &complete)); } } @@ -144,7 +144,7 @@ static int MPID_nem_ofi_cts_recv_callback(cq_tagged_entry_t * wc, MPID_Request * { int mpi_errno = MPI_SUCCESS; BEGIN_FUNC(FCNAME); - MPI_RC(MPID_nem_ofi_data_callback(wc, REQ_SFI(rreq)->parent)); + MPI_RC(MPID_nem_ofi_data_callback(wc, REQ_OFI(rreq)->parent)); MPIDI_CH3U_Request_complete(rreq); END_FUNC_RC(FCNAME); } diff --git a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_progress.c b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_progress.c index ebe1fa2..02cc02e 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_progress.c +++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_progress.c @@ -50,14 +50,14 @@ static int tsearch_callback(cq_tagged_entry_t * wc, MPID_Request * rreq) int mpi_errno = MPI_SUCCESS; BEGIN_FUNC(FCNAME); if (wc->data) { - REQ_SFI(rreq)->match_state = TSEARCH_FOUND; + REQ_OFI(rreq)->match_state = TSEARCH_FOUND; rreq->status.MPI_SOURCE = get_source(wc->tag); rreq->status.MPI_TAG = get_tag(wc->tag); MPIR_STATUS_SET_COUNT(rreq->status, wc->len); rreq->status.MPI_ERROR = MPI_SUCCESS; } else { - REQ_SFI(rreq)->match_state = TSEARCH_NOT_FOUND; + REQ_OFI(rreq)->match_state = TSEARCH_NOT_FOUND; } END_FUNC(FCNAME); return mpi_errno; @@ -92,9 +92,9 @@ int MPID_nem_ofi_iprobe_impl(struct MPIDI_VC *vc, rreq = &rreq_s; rreq->dev.OnDataAvail = NULL; } - REQ_SFI(rreq)->event_callback = tsearch_callback; - REQ_SFI(rreq)->match_state = TSEARCH_INIT; - SFI_ADDR_INIT(source, vc, remote_proc); + REQ_OFI(rreq)->event_callback = tsearch_callback; + REQ_OFI(rreq)->match_state = TSEARCH_INIT; + OFI_ADDR_INIT(source, vc, remote_proc); match_bits = init_recvtag(&mask_bits, comm->context_id + context_offset, source, tag); /* ------------------------------------------------------------------------ */ @@ -110,7 +110,7 @@ int MPID_nem_ofi_iprobe_impl(struct MPIDI_VC *vc, 0, /* Flags */ &remote_proc, /* Remote Address */ &len, /* Out: incoming msglen */ - &(REQ_SFI(rreq)->ofi_context)); /* Nonblocking context */ + &(REQ_OFI(rreq)->ofi_context)); /* Nonblocking context */ if (ret == -FI_ENOMSG) { *flag = 0; goto fn_exit; @@ -126,10 +126,10 @@ int MPID_nem_ofi_iprobe_impl(struct MPIDI_VC *vc, "**ofi_tsearch", "**ofi_tsearch %s %d %s %s", __SHORT_FILE__, __LINE__, FCNAME, fi_strerror(-ret)); } - while (TSEARCH_INIT == REQ_SFI(rreq)->match_state) + while (TSEARCH_INIT == REQ_OFI(rreq)->match_state) MPID_nem_ofi_poll(MPID_BLOCKING_POLL); - if (REQ_SFI(rreq)->match_state == TSEARCH_NOT_FOUND) { + if (REQ_OFI(rreq)->match_state == TSEARCH_NOT_FOUND) { if (rreq_ptr) { MPIDI_CH3_Request_destroy(rreq); *rreq_ptr = NULL; @@ -233,16 +233,16 @@ int MPID_nem_ofi_poll(int in_blocking_poll) if (ret > 0) { if (NULL != wc.op_context) { req = context_to_req(wc.op_context); - if (REQ_SFI(req)->event_callback) { - MPI_RC(REQ_SFI(req)->event_callback(&wc, req)); + if (REQ_OFI(req)->event_callback) { + MPI_RC(REQ_OFI(req)->event_callback(&wc, req)); continue; } reqFn = req->dev.OnDataAvail; if (reqFn) { - if (REQ_SFI(req)->pack_buffer) { - MPIU_Free(REQ_SFI(req)->pack_buffer); + if (REQ_OFI(req)->pack_buffer) { + MPIU_Free(REQ_OFI(req)->pack_buffer); } - vc = REQ_SFI(req)->vc; + vc = REQ_OFI(req)->vc; complete = 0; MPI_RC(reqFn(vc, req, &complete)); @@ -268,10 +268,10 @@ int MPID_nem_ofi_poll(int in_blocking_poll) /* ----------------------------------------------------- */ req = context_to_req(error.op_context); if (req->kind == MPID_REQUEST_SEND) { - mpi_errno = REQ_SFI(req)->event_callback(NULL, req); + mpi_errno = REQ_OFI(req)->event_callback(NULL, req); } else if (req->kind == MPID_REQUEST_RECV) { - mpi_errno = REQ_SFI(req)->event_callback(&wc, req); + mpi_errno = REQ_OFI(req)->event_callback(&wc, req); req->status.MPI_ERROR = MPI_ERR_TRUNCATE; req->status.MPI_TAG = error.tag; } diff --git a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_tagged.c b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_tagged.c index 89affd2..23abe0e 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_tagged.c +++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_tagged.c @@ -23,8 +23,8 @@ static inline int MPID_nem_ofi_sync_recv_callback(cq_tagged_entry_t * wc ATTRIBU BEGIN_FUNC(FCNAME); - MPIDI_CH3U_Recvq_DP(REQ_SFI(rreq)->parent); - MPIDI_CH3U_Request_complete(REQ_SFI(rreq)->parent); + MPIDI_CH3U_Recvq_DP(REQ_OFI(rreq)->parent); + MPIDI_CH3U_Request_complete(REQ_OFI(rreq)->parent); MPIDI_CH3U_Request_complete(rreq); END_FUNC(FCNAME); @@ -42,8 +42,8 @@ static inline int MPID_nem_ofi_send_callback(cq_tagged_entry_t * wc ATTRIBUTE((u { int mpi_errno = MPI_SUCCESS; BEGIN_FUNC(FCNAME); - if (REQ_SFI(sreq)->pack_buffer) - MPIU_Free(REQ_SFI(sreq)->pack_buffer); + if (REQ_OFI(sreq)->pack_buffer) + MPIU_Free(REQ_OFI(sreq)->pack_buffer); MPIDI_CH3U_Request_complete(sreq); END_FUNC(FCNAME); return mpi_errno; @@ -69,16 +69,16 @@ static inline int MPID_nem_ofi_recv_callback(cq_tagged_entry_t * wc, MPID_Reques rreq->status.MPI_ERROR = MPI_SUCCESS; rreq->status.MPI_SOURCE = get_source(wc->tag); rreq->status.MPI_TAG = get_tag(wc->tag); - REQ_SFI(rreq)->req_started = 1; + REQ_OFI(rreq)->req_started = 1; MPIR_STATUS_SET_COUNT(rreq->status, wc->len); - if (REQ_SFI(rreq)->pack_buffer) { - MPIDI_CH3U_Buffer_copy(REQ_SFI(rreq)->pack_buffer, + if (REQ_OFI(rreq)->pack_buffer) { + MPIDI_CH3U_Buffer_copy(REQ_OFI(rreq)->pack_buffer, MPIR_STATUS_GET_COUNT(rreq->status), MPI_BYTE, &err0, rreq->dev.user_buf, rreq->dev.user_count, rreq->dev.datatype, &sz, &err1); MPIR_STATUS_SET_COUNT(rreq->status, sz); - MPIU_Free(REQ_SFI(rreq)->pack_buffer); + MPIU_Free(REQ_OFI(rreq)->pack_buffer); if (err0 || err1) { rreq->status.MPI_ERROR = MPI_ERR_TYPE; } @@ -91,7 +91,7 @@ static inline int MPID_nem_ofi_recv_callback(cq_tagged_entry_t * wc, MPID_Reques /* MPID_SYNC_SEND_ACK is set in the tag bits to provide */ /* separation of MPI messages and protocol messages */ /* ---------------------------------------------------- */ - vc = REQ_SFI(rreq)->vc; + vc = REQ_OFI(rreq)->vc; if (!vc) { /* MPI_ANY_SOURCE -- Post message from status, complete the VC */ src = get_source(wc->tag); vc = rreq->comm->vcr[src]; @@ -102,14 +102,14 @@ static inline int MPID_nem_ofi_recv_callback(cq_tagged_entry_t * wc, MPID_Reques MPID_nem_ofi_create_req(&sync_req, 1); sync_req->dev.OnDataAvail = NULL; sync_req->dev.next = NULL; - REQ_SFI(sync_req)->event_callback = MPID_nem_ofi_sync_recv_callback; - REQ_SFI(sync_req)->parent = rreq; + REQ_OFI(sync_req)->event_callback = MPID_nem_ofi_sync_recv_callback; + REQ_OFI(sync_req)->parent = rreq; FI_RC(fi_tsend(gl_data.endpoint, NULL, 0, gl_data.mr, - VC_SFI(vc)->direct_addr, - ssend_bits, &(REQ_SFI(sync_req)->ofi_context)), tsend); + VC_OFI(vc)->direct_addr, + ssend_bits, &(REQ_OFI(sync_req)->ofi_context)), tsend); } else { /* ---------------------------------------------------- */ @@ -150,8 +150,8 @@ static inline int do_isend(struct MPIDI_VC *vc, MPID_nem_ofi_create_req(&sreq, 2); sreq->kind = MPID_REQUEST_SEND; sreq->dev.OnDataAvail = NULL; - REQ_SFI(sreq)->event_callback = MPID_nem_ofi_send_callback; - REQ_SFI(sreq)->vc = vc; + REQ_OFI(sreq)->event_callback = MPID_nem_ofi_send_callback; + REQ_OFI(sreq)->vc = vc; /* ---------------------------------------------------- */ /* Create the pack buffer (if required), and allocate */ @@ -167,7 +167,7 @@ static inline int do_isend(struct MPIDI_VC *vc, MPI_ERR_OTHER, "**nomem", "**nomem %s", "Send buffer alloc"); MPIDI_CH3U_Buffer_copy(buf, count, datatype, &err0, send_buffer, data_sz, MPI_BYTE, &data_sz, &err1); - REQ_SFI(sreq)->pack_buffer = send_buffer; + REQ_OFI(sreq)->pack_buffer = send_buffer; } if (type == MPID_SYNC_SEND) { @@ -181,26 +181,26 @@ static inline int do_isend(struct MPIDI_VC *vc, MPID_nem_ofi_create_req(&sync_req, 1); sync_req->dev.OnDataAvail = NULL; sync_req->dev.next = NULL; - REQ_SFI(sync_req)->event_callback = MPID_nem_ofi_sync_recv_callback; - REQ_SFI(sync_req)->parent = sreq; + REQ_OFI(sync_req)->event_callback = MPID_nem_ofi_sync_recv_callback; + REQ_OFI(sync_req)->parent = sreq; ssend_match = init_recvtag(&ssend_mask, comm->context_id + context_offset, dest, tag); ssend_match |= MPID_SYNC_SEND_ACK; FI_RC(fi_trecv(gl_data.endpoint, /* endpoint */ NULL, /* recvbuf */ 0, /* data sz */ gl_data.mr, /* dynamic mr */ - VC_SFI(vc)->direct_addr, /* remote proc */ + VC_OFI(vc)->direct_addr, /* remote proc */ ssend_match, /* match bits */ 0ULL, /* mask bits */ - &(REQ_SFI(sync_req)->ofi_context)), trecv); + &(REQ_OFI(sync_req)->ofi_context)), trecv); } FI_RC(fi_tsend(gl_data.endpoint, /* Endpoint */ send_buffer, /* Send buffer(packed or user) */ data_sz, /* Size of the send */ gl_data.mr, /* Dynamic memory region */ - VC_SFI(vc)->direct_addr, /* Use the address of this VC */ + VC_OFI(vc)->direct_addr, /* Use the address of this VC */ match_bits, /* Match bits */ - &(REQ_SFI(sreq)->ofi_context)), tsend); + &(REQ_OFI(sreq)->ofi_context)), tsend); *request = sreq; END_FUNC_RC(FCNAME); } @@ -223,8 +223,8 @@ int MPID_nem_ofi_recv_posted(struct MPIDI_VC *vc, struct MPID_Request *rreq) /* Initialize the request */ /* ------------------------ */ MPID_nem_ofi_init_req(rreq); - REQ_SFI(rreq)->event_callback = MPID_nem_ofi_recv_callback; - REQ_SFI(rreq)->vc = vc; + REQ_OFI(rreq)->event_callback = MPID_nem_ofi_recv_callback; + REQ_OFI(rreq)->vc = vc; /* ---------------------------------------------------- */ /* Fill out the match info, and allocate the pack buffer */ @@ -234,7 +234,7 @@ int MPID_nem_ofi_recv_posted(struct MPIDI_VC *vc, struct MPID_Request *rreq) tag = rreq->dev.match.parts.tag; context_id = rreq->dev.match.parts.context_id; match_bits = init_recvtag(&mask_bits, context_id, src, tag); - SFI_ADDR_INIT(src, vc, remote_proc); + OFI_ADDR_INIT(src, vc, remote_proc); MPIDI_Datatype_get_info(rreq->dev.user_count, rreq->dev.datatype, dt_contig, data_sz, dt_ptr, dt_true_lb); if (dt_contig) { @@ -244,7 +244,7 @@ int MPID_nem_ofi_recv_posted(struct MPIDI_VC *vc, struct MPID_Request *rreq) recv_buffer = (char *) MPIU_Malloc(data_sz); MPIU_ERR_CHKANDJUMP1(recv_buffer == NULL, mpi_errno, MPI_ERR_OTHER, "**nomem", "**nomem %s", "Recv Pack Buffer alloc"); - REQ_SFI(rreq)->pack_buffer = recv_buffer; + REQ_OFI(rreq)->pack_buffer = recv_buffer; } /* ---------------- */ @@ -255,7 +255,7 @@ int MPID_nem_ofi_recv_posted(struct MPIDI_VC *vc, struct MPID_Request *rreq) data_sz, gl_data.mr, remote_proc, - match_bits, mask_bits, &(REQ_SFI(rreq)->ofi_context)), trecv); + match_bits, mask_bits, &(REQ_OFI(rreq)->ofi_context)), trecv); MPID_nem_ofi_poll(MPID_NONBLOCKING_POLL); END_FUNC_RC(FCNAME); } @@ -337,7 +337,7 @@ int MPID_nem_ofi_issend(struct MPIDI_VC *vc, BEGIN_FUNC(FCNAME); \ MPID_nem_ofi_poll(MPID_NONBLOCKING_POLL); \ ret = fi_cancel((fid_t)gl_data.endpoint, \ - &(REQ_SFI(req)->ofi_context)); \ + &(REQ_OFI(req)->ofi_context)); \ if (ret == 0) { \ MPIR_STATUS_SET_CANCEL_BIT(req->status, TRUE); \ } else { \ @@ -384,7 +384,7 @@ int MPID_nem_ofi_anysource_matched(MPID_Request * rreq) /* source request on another device. We have the chance */ /* to cancel this shared request if it has been posted */ /* ----------------------------------------------------- */ - ret = fi_cancel((fid_t) gl_data.endpoint, &(REQ_SFI(rreq)->ofi_context)); + ret = fi_cancel((fid_t) gl_data.endpoint, &(REQ_OFI(rreq)->ofi_context)); if (ret == 0) { /* --------------------------------------------------- */ /* Request cancelled: cancel and complete the request */ diff --git a/src/mpid/ch3/channels/nemesis/netmod/ofi/subconfigure.m4 b/src/mpid/ch3/channels/nemesis/netmod/ofi/subconfigure.m4 index cb6b35c..ac39fe7 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ofi/subconfigure.m4 +++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/subconfigure.m4 @@ -7,18 +7,18 @@ AC_DEFUN([PAC_SUBCFG_PREREQ_]PAC_SUBCFG_AUTO_SUFFIX,[ AS_CASE([$net],[ofi],[build_nemesis_netmod_ofi=yes]) done ]) - AM_CONDITIONAL([BUILD_NEMESIS_NETMOD_SFI],[test "X$build_nemesis_netmod_ofi" = "Xyes"]) + AM_CONDITIONAL([BUILD_NEMESIS_NETMOD_OFI],[test "X$build_nemesis_netmod_ofi" = "Xyes"]) ])dnl AC_DEFUN([PAC_SUBCFG_BODY_]PAC_SUBCFG_AUTO_SUFFIX,[ -AM_COND_IF([BUILD_NEMESIS_NETMOD_SFI],[ +AM_COND_IF([BUILD_NEMESIS_NETMOD_OFI],[ AC_MSG_NOTICE([RUNNING CONFIGURE FOR ch3:nemesis:ofi]) PAC_SET_HEADER_LIB_PATH(ofi) PAC_CHECK_HEADER_LIB_FATAL(ofi, rdma/fabric.h, fabric, fi_getinfo) AC_DEFINE([ENABLE_COMM_OVERRIDES], 1, [define to add per-vc function pointers to override send and recv functions]) -])dnl end AM_COND_IF(BUILD_NEMESIS_NETMOD_SFI,...) +])dnl end AM_COND_IF(BUILD_NEMESIS_NETMOD_OFI,...) ])dnl end _BODY [#] end of __file__ ----------------------------------------------------------------------- Summary of changes: .../ch3/channels/nemesis/netmod/ofi/Makefile.mk | 2 +- .../ch3/channels/nemesis/netmod/ofi/errnames.txt | 84 ++++++------ src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_cm.c | 136 ++++++++++---------- .../ch3/channels/nemesis/netmod/ofi/ofi_impl.h | 28 ++-- .../ch3/channels/nemesis/netmod/ofi/ofi_init.c | 28 ++-- src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_msg.c | 46 ++++---- .../ch3/channels/nemesis/netmod/ofi/ofi_progress.c | 30 ++-- .../ch3/channels/nemesis/netmod/ofi/ofi_tagged.c | 58 ++++---- .../channels/nemesis/netmod/ofi/subconfigure.m4 | 6 +- 9 files changed, 209 insertions(+), 209 deletions(-) hooks/post-receive -- MPICH primary repository
participants (1)
-
noreply＠mpich.org