August 2013 - commits - mailman3.cels.anl.gov

[mpich] MPICH primary repository branch, master, updated. v3.0.4-444-g92a7e41
by noreply＠mpich.org 07 Aug '13

07 Aug '13

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 92a7e4115d8c923dc4cf8c0002f911f7f60138c9 (commit) via 4e00ba381ee3c69aa53bc2fa020e4f0f74260e67 (commit) via e0a1cf6190ac813b9460af51606bf99ba11a2c03 (commit) from a3571f526d03db5362dfaac3c819434a55915925 (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/92a7e4115d8c923dc4cf8c0002f911f7f… commit 92a7e4115d8c923dc4cf8c0002f911f7f60138c9 Author: Michael Blocksome <blocksom(a)us.ibm.com> Date: Thu Jul 18 12:38:40 2013 -0500 add 'dbg_next' field to mpi request structure. Do not overload the 'mpid.next' pointer in the request as this field is defined by the mpid layer and therefore is specific to the device. Not all adi implementations have this field. Signed-off-by: Haizhu Liu <haizhu(a)us.ibm.com> Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h index 9786192..48b6733 100644 --- a/src/include/mpiimpl.h +++ b/src/include/mpiimpl.h @@ -1484,6 +1484,8 @@ typedef struct MPID_Request { * bloated request for regular pt2pt and NBC requests. */ struct MPID_Grequest_fns *greq_fns; + struct MPIR_Sendq *dbg_next; + /* Other, device-specific information */ #ifdef MPID_DEV_REQUEST_DECL MPID_DEV_REQUEST_DECL diff --git a/src/mpi/debugger/dbginit.c b/src/mpi/debugger/dbginit.c index 86f4b4d..90a8101 100644 --- a/src/mpi/debugger/dbginit.c +++ b/src/mpi/debugger/dbginit.c @@ -337,7 +337,7 @@ void MPIR_Sendq_remember( MPID_Request *req, p = (MPIR_Sendq *)MPIU_Malloc( sizeof(MPIR_Sendq) ); if (!p) { /* Just ignore it */ - req->mpid.next = NULL; + req->dbg_next = NULL; goto fn_exit; } } @@ -349,7 +349,7 @@ void MPIR_Sendq_remember( MPID_Request *req, p->prev = NULL; MPIR_Sendq_head = p; if (p->next) p->next->prev = p; - req->mpid.next = (MPID_Request *)p; /* overload 'next' for debugger SEND queue */ + req->dbg_next = p; fn_exit: MPIU_THREAD_CS_EXIT(HANDLE,req); } @@ -359,7 +359,7 @@ void MPIR_Sendq_forget( MPID_Request *req ) MPIR_Sendq *p, *prev; MPIU_THREAD_CS_ENTER(HANDLE,req); - p = (MPIR_Sendq *)req->mpid.next; + p = req->dbg_next; if (!p) { /* Just ignore it */ MPIU_THREAD_CS_EXIT(HANDLE,req); http://git.mpich.org/mpich.git/commitdiff/4e00ba381ee3c69aa53bc2fa020e4f0f7… commit 4e00ba381ee3c69aa53bc2fa020e4f0f74260e67 Author: Douglas Miller <dougmill(a)us.ibm.com> Date: Thu Jun 28 08:29:02 2012 -0500 Make debugger SEND queue faster This patch overloads the MPID_Request.mpid.next pointer to use for referencing the debugger SEND queue structure to facilitate faster removal during completion. MPID_Request.mpid.next is only used by receives and free-pools otherwise. (ibm) Issue 8178 (ibm) e1c4d5cfe88fccc67624f81497a74bc55d774e43 Signed-off-by: Su Huang <suhuang(a)us.ibm.com> Signed-off-by: Michael Blocksome <blocksom(a)us.ibm.com> Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/src/mpi/debugger/dbginit.c b/src/mpi/debugger/dbginit.c index 52bac79..86f4b4d 100644 --- a/src/mpi/debugger/dbginit.c +++ b/src/mpi/debugger/dbginit.c @@ -312,6 +312,7 @@ typedef struct MPIR_Sendq { MPID_Request *sreq; int tag, rank, context_id; struct MPIR_Sendq *next; + struct MPIR_Sendq *prev; } MPIR_Sendq; MPIR_Sendq *MPIR_Sendq_head = 0; @@ -336,6 +337,7 @@ void MPIR_Sendq_remember( MPID_Request *req, p = (MPIR_Sendq *)MPIU_Malloc( sizeof(MPIR_Sendq) ); if (!p) { /* Just ignore it */ + req->mpid.next = NULL; goto fn_exit; } } @@ -344,7 +346,10 @@ void MPIR_Sendq_remember( MPID_Request *req, p->rank = rank; p->context_id = context_id; p->next = MPIR_Sendq_head; + p->prev = NULL; MPIR_Sendq_head = p; + if (p->next) p->next->prev = p; + req->mpid.next = (MPID_Request *)p; /* overload 'next' for debugger SEND queue */ fn_exit: MPIU_THREAD_CS_EXIT(HANDLE,req); } @@ -354,22 +359,19 @@ void MPIR_Sendq_forget( MPID_Request *req ) MPIR_Sendq *p, *prev; MPIU_THREAD_CS_ENTER(HANDLE,req); - p = MPIR_Sendq_head; - prev = 0; - - while (p) { - if (p->sreq == req) { - if (prev) prev->next = p->next; - else MPIR_Sendq_head = p->next; - /* Return this element to the pool */ - p->next = pool; - pool = p; - break; - } - prev = p; - p = p->next; + p = (MPIR_Sendq *)req->mpid.next; + if (!p) { + /* Just ignore it */ + MPIU_THREAD_CS_EXIT(HANDLE,req); + return; } - /* If we don't find the request, just ignore it */ + prev = p->prev; + if (prev != NULL) prev->next = p->next; + else MPIR_Sendq_head = p->next; + if (p->next != NULL) p->next->prev = prev; + /* Return this element to the pool */ + p->next = pool; + pool = p; MPIU_THREAD_CS_EXIT(HANDLE,req); } diff --git a/src/mpi/debugger/dll_mpich.c b/src/mpi/debugger/dll_mpich.c index ac9b834..cf957eb 100644 --- a/src/mpi/debugger/dll_mpich.c +++ b/src/mpi/debugger/dll_mpich.c @@ -655,7 +655,8 @@ static int fetch_receive (mqs_process *proc, mpich_process_info *p_info, int is_complete = fetch_int ( proc, base + i_info->req_cc_offs, p_info); mqs_taddr_t buffer = 0; unsigned buf_count = -1; - int datatype = fetch_int(proc, base + i_info->req_datatype_offs, p_info); + int datatype; + datatype = fetch_int(proc, base + i_info->req_datatype_offs, p_info); if(look_for_user_buffer) { @@ -816,7 +817,7 @@ static int fetch_send (mqs_process *proc, mpich_process_info *p_info, while (base != 0) { /* Check this entry to see if the context matches */ - int actual_context = fetch_int( proc, base + i_info->sendq_context_id_offs, p_info ); + int actual_context = fetch_int16( proc, base + i_info->sendq_context_id_offs, p_info ); if (actual_context == wanted_context) { /* Fill in some of the fields */ @@ -846,6 +847,7 @@ static int fetch_send (mqs_process *proc, mpich_process_info *p_info, res->system_buffer = 0; res->buffer = data; + /* Don't forget to step the queue ! */ p_info->next_msg = base + i_info->sendq_next_offs; return mqs_ok; @@ -1121,6 +1123,7 @@ static mqs_tword_t fetch_int16 (mqs_process * proc, mqs_taddr_t addr, dbgr_target_to_host (proc, buffer, ((char *)&res) + (host_is_big_endian ? sizeof(mqs_tword_t)-2 : 0), 2); + return res; } http://git.mpich.org/mpich.git/commitdiff/e0a1cf6190ac813b9460af51606bf99ba… commit e0a1cf6190ac813b9460af51606bf99ba11a2c03 Author: Keira Zhang <keirazhang(a)cn.ibm.com> Date: Sun Dec 18 21:16:22 2011 -0500 Message Queue debug support (ibm) bd92b21a52afd8f4f6ef018d764d50060966f20b Signed-off-by: Michael Blocksome <blocksom(a)us.ibm.com> Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/src/mpi/debugger/dbginit.c b/src/mpi/debugger/dbginit.c index 57227e5..52bac79 100644 --- a/src/mpi/debugger/dbginit.c +++ b/src/mpi/debugger/dbginit.c @@ -87,8 +87,11 @@ void *MPIR_Breakpoint(void); library that the debugger can load in order to access information about the parallel program, such as message queues */ #ifdef HAVE_DEBUGGER_SUPPORT +#undef MPICH_INFODLL_LOC #ifdef MPICH_INFODLL_LOC char MPIR_dll_name[] = MPICH_INFODLL_LOC; +#else +char MPIR_dll_name[] = "libtvmpich2.so"; #endif #endif diff --git a/src/mpi/debugger/dll_mpich.c b/src/mpi/debugger/dll_mpich.c index 5578a31..ac9b834 100644 --- a/src/mpi/debugger/dll_mpich.c +++ b/src/mpi/debugger/dll_mpich.c @@ -308,57 +308,54 @@ int mqs_image_has_queues (mqs_image *image, char **message) request definition */ { mqs_type *req_type = dbgr_find_type( image, (char *)"MPID_Request", mqs_lang_c ); - if (req_type) { - int dev_offs; + if (req_type) { + int mpid_offs; have_req = 1; - dev_offs = dbgr_field_offset( req_type, (char *)"dev" ); + mpid_offs = dbgr_field_offset( req_type, (char *)"mpid" ); i_info->req_status_offs = dbgr_field_offset( req_type, (char *)"status" ); i_info->req_cc_offs = dbgr_field_offset( req_type, (char *)"cc" ); - if (dev_offs >= 0) { + + if (mpid_offs >= 0) { mqs_type *dreq_type = dbgr_find_type( image, (char *)"MPIDI_Request", mqs_lang_c ); - i_info->req_dev_offs = dev_offs; + i_info->req_mpid_offs = mpid_offs; if (dreq_type) { - int loff, match_offs; + int loff, envelope_offs; have_dreq = 1; loff = dbgr_field_offset( dreq_type, (char *)"next" ); - i_info->req_next_offs = dev_offs + loff; - loff = dbgr_field_offset( dreq_type, (char *)"user_buf" ); - i_info->req_user_buf_offs = dev_offs + loff; - loff = dbgr_field_offset( dreq_type, (char *)"user_count" ); - i_info->req_user_count_offs = dev_offs + loff; + i_info->req_next_offs = mpid_offs + loff; + loff = dbgr_field_offset( dreq_type, (char *)"userbuf" ); + i_info->req_userbuf_offs = mpid_offs + loff; + loff = dbgr_field_offset( dreq_type, (char *)"userbufcount" ); + i_info->req_userbufcount_offs = mpid_offs + loff; loff = dbgr_field_offset( dreq_type, (char *)"datatype" ); - i_info->req_datatype_offs = dev_offs + loff; - match_offs = dbgr_field_offset( dreq_type, (char *)"match" ); - /* - Current definition from the mpidpre.h file for ch3. - - typedef struct MPIDI_Message_match_parts { - int32_t tag; - MPIR_Rank_t rank; - MPIR_Context_id_t context_id; - } MPIDI_Message_match_parts_t; - typedef union { - MPIDI_Message_match_parts_t parts; - MPIR_Upint whole; - } MPIDI_Message_match; - */ - if (match_offs >= 0) { - mqs_type *match_type = dbgr_find_type( image, (char *)"MPIDI_Message_match", mqs_lang_c ); - if (match_type) { - int parts_offs = dbgr_field_offset( match_type, (char *)"parts" ); - if (parts_offs >= 0) { - mqs_type *parts_type = dbgr_find_type( image, (char *)"MPIDI_Message_match_parts_t", mqs_lang_c ); - if (parts_type) { + i_info->req_datatype_offs = mpid_offs + loff; + loff = dbgr_field_offset( dreq_type, (char *)"uebuflen" ); + i_info->req_uebuflen_offs = mpid_offs + loff; + loff = dbgr_field_offset( dreq_type, (char *)"uebuf" ); + i_info->req_uebuf_offs = mpid_offs + loff; + envelope_offs = dbgr_field_offset( dreq_type, (char *)"envelope" ); + envelope_offs += mpid_offs ; + + if (envelope_offs >= 0) { + mqs_type *envelope_type = dbgr_find_type( image, (char *)"MPIDI_MsgEnvelope", mqs_lang_c ); + if (envelope_type) { + int msginfo_offs= dbgr_field_offset( envelope_type, (char *)"msginfo" ); + msginfo_offs = envelope_offs + msginfo_offs; + + if (msginfo_offs >= 0) { + mqs_type *msginfo_type= dbgr_find_type( image, (char *)"MPIDI_MsgInfo", mqs_lang_c ); + if (msginfo_type) { int moff; - moff = dbgr_field_offset( parts_type, (char *)"tag" ); - i_info->req_tag_offs = dev_offs + match_offs + moff; - moff = dbgr_field_offset( parts_type, (char *)"rank" ); - i_info->req_rank_offs = dev_offs + match_offs + moff; - moff = dbgr_field_offset( parts_type, (char *)"context_id" ); - i_info->req_context_id_offs = dev_offs + match_offs + moff; + moff = dbgr_field_offset( msginfo_type, (char *)"MPItag" ); + i_info->req_tag_offs = msginfo_offs + moff; + moff = dbgr_field_offset( msginfo_type, (char *)"MPIrank" ); + i_info->req_rank_offs = msginfo_offs + moff; + moff = dbgr_field_offset( msginfo_type, (char *)"MPIctxt" ); + i_info->req_context_id_offs = msginfo_offs + moff; } } + } } } @@ -645,7 +642,7 @@ static int fetch_receive (mqs_process *proc, mpich_process_info *p_info, #endif while (base != 0) { /* Check this entry to see if the context matches */ - int16_t actual_context = fetch_int16( proc, base + i_info->req_context_id_offs, p_info ); + int actual_context = fetch_int16( proc, base + i_info->req_context_id_offs, p_info ); #ifdef DEBUG_LIST_ITER initLogFile(); @@ -654,27 +651,38 @@ static int fetch_receive (mqs_process *proc, mpich_process_info *p_info, if (actual_context == wanted_context) { /* Found a request for this communicator */ int tag = fetch_int( proc, base + i_info->req_tag_offs, p_info ); - int rank = fetch_int16( proc, base + i_info->req_rank_offs, p_info ); + int rank = fetch_int( proc, base + i_info->req_rank_offs, p_info ); int is_complete = fetch_int ( proc, base + i_info->req_cc_offs, p_info); - mqs_tword_t user_buffer = fetch_pointer( proc,base+i_info->req_user_buf_offs, p_info); - int user_count = fetch_int( proc,base + i_info->req_user_count_offs, p_info ); - - /* Return -1 for ANY_TAG or ANY_SOURCE */ + mqs_taddr_t buffer = 0; + unsigned buf_count = -1; + int datatype = fetch_int(proc, base + i_info->req_datatype_offs, p_info); + + if(look_for_user_buffer) + { + buffer = fetch_pointer(proc, base + i_info->req_userbuf_offs, p_info); + buf_count = fetch_int(proc, base + i_info->req_userbufcount_offs, p_info); + }else{ + /* unexpected buffer*/ + buffer = fetch_pointer(proc, base + i_info->req_uebuf_offs, p_info); + buf_count = fetch_int(proc, base + i_info->req_uebuflen_offs, p_info); + } + + /* Return -1 for ANY_TAG or ANY_SOURCE */ res->desired_tag = (tag >= 0) ? tag : -1; res->desired_local_rank = (rank >= 0) ? rank : -1; res->desired_global_rank = -1; /* Convert to rank in comm world, if valid (in mpi-2, may not be available) */ - res->desired_length = user_count; /* Count, not bytes */ + res->desired_length = buf_count; /* Count, not bytes */ res->tag_wild = (tag < 0); - res->buffer = user_buffer; + res->buffer = buffer; /* We don't know the rest of these */ res->system_buffer = 0; res->actual_local_rank = rank; res->actual_global_rank = -1; res->actual_tag = tag; - res->actual_length = -1; + res->actual_length = buf_count; res->extra_text[0][0] = 0; res->status = (is_complete != 0) ? mqs_st_pending : mqs_st_complete; @@ -795,7 +803,7 @@ static int fetch_send (mqs_process *proc, mpich_process_info *p_info, #ifdef DEBUG_LIST_ITER if (base) { initLogFile(); - fprintf( debugf, "comm ptr = %p, comm context = %d\n", + fprintf( debugfp, "comm ptr = %p, comm context = %d\n", comm, comm->context_id ); } #endif @@ -808,7 +816,7 @@ static int fetch_send (mqs_process *proc, mpich_process_info *p_info, while (base != 0) { /* Check this entry to see if the context matches */ - int actual_context = fetch_int16( proc, base + i_info->sendq_context_id_offs, p_info ); + int actual_context = fetch_int( proc, base + i_info->sendq_context_id_offs, p_info ); if (actual_context == wanted_context) { /* Fill in some of the fields */ @@ -818,13 +826,13 @@ static int fetch_send (mqs_process *proc, mpich_process_info *p_info, mqs_taddr_t data = 0; mqs_taddr_t sreq = fetch_pointer(proc, base+i_info->sendq_req_offs, p_info ); mqs_tword_t is_complete = fetch_int( proc, sreq+i_info->req_cc_offs, p_info ); - data = fetch_pointer( proc, sreq+i_info->req_user_buf_offs, p_info ); - length = fetch_int( proc, sreq+i_info->req_user_count_offs, p_info ); + data = fetch_pointer( proc, sreq+i_info->req_userbuf_offs, p_info ); + length = fetch_int( proc, sreq+i_info->req_userbufcount_offs, p_info ); /* mqs_tword_t complete=0; */ #ifdef DEBUG_LIST_ITER initLogFile(); - fprintf( debugpf, "sendq entry = %p, rank off = %d, tag off = %d, context = %d\n", + fprintf( debugfp, "sendq entry = %p, rank off = %d, tag off = %d, context = %d\n", base, i_info->sendq_rank_offs, i_info->sendq_tag_offs, actual_context ); #endif @@ -838,7 +846,6 @@ static int fetch_send (mqs_process *proc, mpich_process_info *p_info, res->system_buffer = 0; res->buffer = data; - /* Don't forget to step the queue ! */ p_info->next_msg = base + i_info->sendq_next_offs; return mqs_ok; @@ -1101,20 +1108,19 @@ static mqs_tword_t fetch_int (mqs_process * proc, mqs_taddr_t addr, dbgr_target_to_host (proc, buffer, ((char *)&res) + (host_is_big_endian ? sizeof(mqs_tword_t)-isize : 0), isize); - + return res; } static mqs_tword_t fetch_int16 (mqs_process * proc, mqs_taddr_t addr, mpich_process_info *p_info) { char buffer[8]; /* ASSUME an integer fits in 8 bytes */ - int16_t res = 0; + mqs_tword_t res = 0; if (mqs_ok == dbgr_fetch_data (proc, addr, 2, buffer)) dbgr_target_to_host (proc, buffer, ((char *)&res) + (host_is_big_endian ? sizeof(mqs_tword_t)-2 : 0), 2); - return res; } diff --git a/src/mpi/debugger/mpich_dll_defs.h b/src/mpi/debugger/mpich_dll_defs.h index c66c39a..561dfba 100644 --- a/src/mpi/debugger/mpich_dll_defs.h +++ b/src/mpi/debugger/mpich_dll_defs.h @@ -32,14 +32,16 @@ typedef struct /* Fields in MPID_Request (including structures within the request) */ int req_status_offs; int req_cc_offs; - int req_dev_offs; + int req_mpid_offs; int req_next_offs; int req_tag_offs; int req_rank_offs; int req_context_id_offs; - int req_user_buf_offs; - int req_user_count_offs; + int req_userbuf_offs; + int req_userbufcount_offs; int req_datatype_offs; + int req_uebuf_offs; + int req_uebuflen_offs; /* Fields in MPIR_Sendq */ int sendq_next_offs; ----------------------------------------------------------------------- Summary of changes: src/include/mpiimpl.h | 2 + src/mpi/debugger/dbginit.c | 35 ++++++----- src/mpi/debugger/dll_mpich.c | 117 ++++++++++++++++++++----------------- src/mpi/debugger/mpich_dll_defs.h | 8 ++- 4 files changed, 90 insertions(+), 72 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.4-441-ga3571f5
by noreply＠mpich.org 06 Aug '13

06 Aug '13

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 a3571f526d03db5362dfaac3c819434a55915925 (commit) from 254aa2cdaba145bf9c7f6a42665cae32d1b31685 (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/a3571f526d03db5362dfaac3c819434a5… commit a3571f526d03db5362dfaac3c819434a55915925 Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Tue Aug 6 12:28:47 2013 -0500 Make sure MPID_REQUEST_PREALLOC is always defined. Allows the minimal configure ../configure --host=powerpc64-bgq-linux --with-device=pamid --enable-thread-cs=per-object. Without this change the MPID_REQUEST_PREALLOC symbol would be undefined. Signed-off-by: Michael Blocksome <blocksom(a)us.ibm.com> diff --git a/src/mpid/pamid/src/mpid_request.c b/src/mpid/pamid/src/mpid_request.c index 84a6141..4fccb00 100644 --- a/src/mpid/pamid/src/mpid_request.c +++ b/src/mpid/pamid/src/mpid_request.c @@ -26,6 +26,8 @@ #define MPID_REQUEST_PREALLOC 16 #elif (MPIU_HANDLE_ALLOCATION_METHOD == MPIU_HANDLE_ALLOCATION_THREAD_LOCAL) #define MPID_REQUEST_PREALLOC 512 //Have direct more reqyests for all threads +#else +#define MPID_REQUEST_PREALLOC 8 #endif #endif ----------------------------------------------------------------------- Summary of changes: src/mpid/pamid/src/mpid_request.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.4-440-g254aa2c
by noreply＠mpich.org 06 Aug '13

06 Aug '13

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 254aa2cdaba145bf9c7f6a42665cae32d1b31685 (commit) from 4824c7620ed2da59c1bbb9411b414725462972d0 (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/254aa2cdaba145bf9c7f6a42665cae32d… commit 254aa2cdaba145bf9c7f6a42665cae32d1b31685 Author: Michael Blocksome <blocksom(a)us.ibm.com> Date: Tue Aug 6 11:32:15 2013 -0500 Clean up pamid MPID_Abort() logic Removed the processing of the (undocumented) environment variable 'PAMID_CORE_ON_ABORT' which was being checked to determine if the user does *not* want the process to core dump. On Blue Gene/Q the core dump was accomplished by calling 'abort()' which sends SIGSBRT to all processes and all processes would then write a core file. This is not scalable. Instead, MPID_Abort() will invoke 'exit(1)' which will terminate all processes in the job. This behavior is identical for both the POE and the Blue Gene/Q control systems. On Blue Gene/Q the user may replicate the previous core dump behavior by using the environment variables 'BG_COREDUMPONERROR=1' or 'BG_COREDUMPONEXIT=1'. Finally, the 'DYNAMIC_TASKING' #ifdef is moved up so it is checked first. 'MPIDI_NO_ASSERT' and 'DYNAMIC_TASKING' are typically defined for PE. It appears that the dynamic tasking code was never being invoked. (ibm) CPS 99YURA Signed-off-by: Bob Cernohous <bobc(a)us.ibm.com> diff --git a/src/mpid/pamid/src/misc/mpid_abort.c b/src/mpid/pamid/src/misc/mpid_abort.c index ef8af06..dc618af 100644 --- a/src/mpid/pamid/src/misc/mpid_abort.c +++ b/src/mpid/pamid/src/misc/mpid_abort.c @@ -27,8 +27,8 @@ * * \param[in] comm The communicator associated with the failure (can be null). * \param[in] mpi_errno The MPI error associated with the failure (can be zero). - * \param[in] exit_code The requested exit code, however BG features imply that exit(1) will always be used. - * \param[in] error_msg The message to display (may be NULL_ + * \param[in] exit_code The requested exit code. + * \param[in] error_msg The message to display (may be NULL) * * This is the majority of the call to MPID_Abort(). The only * difference is that it does not call exit. That allows it to be @@ -74,26 +74,28 @@ void MPIDI_Abort_core(MPID_Comm * comm, int mpi_errno, int exit_code, const char * \brief The central parts of the MPID_Abort call * \param[in] comm The communicator associated with the failure (can be null). * \param[in] mpi_errno The MPI error associated with the failure (can be zero). - * \param[in] exit_code The requested exit code, however BG features imply that exit(1) will always be used. - * \param[in] error_msg The message to display (may be NULL_ - * \returns MPI_ERR_INTERN + * \param[in] exit_code The requested exit code. + * \param[in] error_msg The message to display (may be NULL) + * \return MPI_ERR_INTERN * * This function MUST NEVER return. */ int MPID_Abort(MPID_Comm * comm, int mpi_errno, int exit_code, const char *error_msg) { - char* env = getenv("PAMID_CORE_ON_ABORT"); MPIDI_Abort_core(comm, mpi_errno, exit_code, error_msg); -#ifdef MPIDI_NO_ASSERT - exit(1); -#endif - if (env != NULL) - if ( (strncasecmp("no", env, 2)==0) || (strncasecmp("exit", env, 4)==0) || (strncmp("0", env, 1)==0) ) - exit(1); - #ifdef DYNAMIC_TASKING return PMI2_Abort(1,error_msg); +#else + /* The POE and BGQ control systems both catch the exit value for additional + * processing. If a process exits with '1' then all processes in the job + * are terminated. The requested error code is lost in this process however + * this is acceptable, but not desirable, behavior according to the MPI + * standard. + * + * On BGQ, the user may force the process (rank) that exited with '1' to core + * dump by setting the environment variable 'BG_COREDUMPONERROR=1'. + */ + exit(1); #endif - abort(); } ----------------------------------------------------------------------- Summary of changes: src/mpid/pamid/src/misc/mpid_abort.c | 30 ++++++++++++++++-------------- 1 files changed, 16 insertions(+), 14 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.4-439-g4824c76
by noreply＠mpich.org 06 Aug '13

06 Aug '13

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 4824c7620ed2da59c1bbb9411b414725462972d0 (commit) from 7ddfa17b5b811025293fadf000e7c5bbc6c32066 (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/4824c7620ed2da59c1bbb9411b4147254… commit 4824c7620ed2da59c1bbb9411b414725462972d0 Author: Wesley Bland <wbland(a)mcs.anl.gov> Date: Tue Aug 6 13:24:03 2013 -0500 Remove the ft tests from the default test suite. These tests should not be distributed with the test suite when grabbing a release. They are still enabled for developer builds. Signed-off-by: Pavan Balaji <balaji(a)mcs.anl.gov> diff --git a/maint/release.pl b/maint/release.pl index 743772f..9fcebc7 100755 --- a/maint/release.pl +++ b/maint/release.pl @@ -271,6 +271,7 @@ print("done\n"); print("===> Disabling unnecessary tests in the main codebase... "); chdir($expdir); run_cmd(q{perl -p -i -e 's/^\@perfdir\@/#\@perfdir@/' test/mpi/testlist.in}); +run_cmd(q{perl -p -i -e 's/^\@ftdir\@/#\@ftdir@/' test/mpi/testlist.in}); run_cmd("perl -p -i -e 's/^large_message /#large_message /' test/mpi/pt2pt/testlist"); run_cmd("perl -p -i -e 's/^large-count /#large-count /' test/mpi/datatype/testlist"); print("done\n"); ----------------------------------------------------------------------- Summary of changes: maint/release.pl | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.4-438-g7ddfa17
by noreply＠mpich.org 06 Aug '13

06 Aug '13

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 7ddfa17b5b811025293fadf000e7c5bbc6c32066 (commit) from 9a742ca5ec305b0654b5619be2f4ee86bdcb8047 (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/7ddfa17b5b811025293fadf000e7c5bbc… commit 7ddfa17b5b811025293fadf000e7c5bbc6c32066 Author: Sameer Kumar <sameerk(a)us.ibm.com> Date: Thu Aug 1 05:12:43 2013 -0500 Trac 665. Memory leak fix for MPI RMA. diff --git a/src/mpid/pamid/src/onesided/mpid_1s.c b/src/mpid/pamid/src/onesided/mpid_1s.c index 784d9a6..1353662 100644 --- a/src/mpid/pamid/src/onesided/mpid_1s.c +++ b/src/mpid/pamid/src/onesided/mpid_1s.c @@ -29,10 +29,10 @@ MPIDI_Win_DoneCB(pami_context_t context, { MPIDI_Win_request *req = (MPIDI_Win_request*)cookie; ++req->win->mpid.sync.complete; + ++req->origin.completed; if ((req->buffer_free) && (req->type == MPIDI_WIN_REQUEST_GET)) { - ++req->origin.completed; if (req->origin.completed == req->target.dt.num_contig) { int mpi_errno; @@ -49,7 +49,8 @@ MPIDI_Win_DoneCB(pami_context_t context, } } - if (req->win->mpid.sync.total == req->win->mpid.sync.complete) + //if (req->win->mpid.sync.total == req->win->mpid.sync.complete) + if (req->origin.completed == req->target.dt.num_contig) { if (req->buffer_free) MPIU_Free(req->buffer); diff --git a/src/mpid/pamid/src/onesided/mpid_win_accumulate.c b/src/mpid/pamid/src/onesided/mpid_win_accumulate.c index b34c083..287c7eb 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_accumulate.c +++ b/src/mpid/pamid/src/onesided/mpid_win_accumulate.c @@ -107,7 +107,12 @@ MPIDI_Accumulate(pami_context_t context, TRACE_ERR(" Sub index=%u bytes=%zu l-offset=%zu r-addr=%p l-buf=%p *(int*)buf=0x%08x *(double*)buf=%g\n", req->state.index, params.send.data.iov_len, req->state.local_offset, req->accum_headers[req->state.index].addr, buf, *ibuf, *dbuf); #endif - if (sync->total - sync->complete == 1) { + + /** sync->total will be updated with every RMA and the complete + will not change till that RMA has completed. In the meanwhile + the rest of the RMAs will have memory leaks */ + if (req->target.dt.num_contig - req->state.index == 1) { + //if (sync->total - sync->complete == 1) { map=NULL; if (req->target.dt.map != &req->target.dt.__map) { map=(void *) req->target.dt.map; diff --git a/src/mpid/pamid/src/onesided/mpid_win_get.c b/src/mpid/pamid/src/onesided/mpid_win_get.c index 79a1c0b..7d3c4e5 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_get.c +++ b/src/mpid/pamid/src/onesided/mpid_win_get.c @@ -99,7 +99,12 @@ MPIDI_Get_use_pami_rget(pami_context_t context, MPIDI_Win_request * req, int *fr unsigned* buf = (unsigned*)(req->buffer + params.rdma.local.offset); #endif TRACE_ERR(" Sub index=%u bytes=%zu l-offset=%zu r-offset=%zu buf=%p *(int*)buf=0x%08x\n", req->state.index, params.rma.bytes, params.rdma.local.offset, params.rdma.remote.offset, buf, *buf); - if (sync->total - sync->complete == 1) { + + /** sync->total will be updated with every RMA and the complete + will not change till that RMA has completed. In the meanwhile + the rest of the RMAs will have memory leaks */ + if (req->target.dt.num_contig - req->state.index == 1) { + //if (sync->total - sync->complete == 1) { map=NULL; if (req->target.dt.map != &req->target.dt.__map) { map=(void *) req->target.dt.map; @@ -164,7 +169,12 @@ MPIDI_Get_use_pami_get(pami_context_t context, MPIDI_Win_request * req, int *fre #endif TRACE_ERR(" Sub index=%u bytes=%zu l-offset=%zu r-offset=%zu buf=%p *(int*)buf=0x%08x\n", req->state.index, params.rma.bytes, params.rdma.local.offset, params.rdma.remote.offset, buf, *buf); - if (sync->total - sync->complete == 1) { + + /** sync->total will be updated with every RMA and the complete + will not change till that RMA has completed. In the meanwhile + the rest of the RMAs will have memory leaks */ + if (req->target.dt.num_contig - req->state.index == 1) { + //if (sync->total - sync->complete == 1) { map=NULL; if (req->target.dt.map != &req->target.dt.__map) { map=(void *) req->target.dt.map; diff --git a/src/mpid/pamid/src/onesided/mpid_win_put.c b/src/mpid/pamid/src/onesided/mpid_win_put.c index ecfd444..9995386 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_put.c +++ b/src/mpid/pamid/src/onesided/mpid_win_put.c @@ -101,7 +101,12 @@ MPIDI_Put_use_pami_rput(pami_context_t context, MPIDI_Win_request * req,int *fre #endif TRACE_ERR(" Sub index=%u bytes=%zu l-offset=%zu r-offset=%zu buf=%p *(int*)buf=0x%08x\n", req->state.index, params.rma.bytes, params.rdma.local.offset, params.rdma.remote.offset, buf, *buf); - if (sync->total - sync->complete == 1) { + + /** sync->total will be updated with every RMA and the complete + will not change till that RMA has completed. In the meanwhile + the rest of the RMAs will have memory leaks */ + if (req->target.dt.num_contig - req->state.index == 1) { + //if (sync->total - sync->complete == 1) { map=NULL; if (req->target.dt.map != &req->target.dt.__map) { map=(void *) req->target.dt.map; @@ -166,7 +171,11 @@ MPIDI_Put_use_pami_put(pami_context_t context, MPIDI_Win_request * req,int *fr #endif TRACE_ERR(" Sub index=%u bytes=%zu l-offset=%zu r-offset=%zu buf=%p *(int*)buf=0x%08x\n", req->state.index, params.rma.bytes, params.addr.local, params.addr.remote, buf, *buf); - if (sync->total - sync->complete == 1) { + + /** sync->total will be updated with every RMA and the complete + will not change till that RMA has completed. In the meanwhile + the rest of the RMAs will have memory leaks */ + if (req->target.dt.num_contig - req->state.index == 1) { map=NULL; if (req->target.dt.map != &req->target.dt.__map) { map=(void *) req->target.dt.map; @@ -338,7 +347,6 @@ MPID_Put(void *origin_addr, MPIDI_Win_datatype_map(&req->target.dt); win->mpid.sync.total += req->target.dt.num_contig; - /* The pamid one-sided design requires context post in order to handle the * case where the number of pending rma operation exceeds the * 'PAMID_RMA_PENDING' threshold. When there are too many pending requests the @@ -351,7 +359,8 @@ MPID_Put(void *origin_addr, * the rma pending threshold has been reached. This would result in * better latency for one-sided operations. */ - PAMI_Context_post(MPIDI_Context[0], &req->post_request, MPIDI_Put, req); + PAMI_Context_post(MPIDI_Context[0], &req->post_request, MPIDI_Put, req); + //MPIDI_Put(MPIDI_Context[0], req); fn_fail: return mpi_errno; ----------------------------------------------------------------------- Summary of changes: src/mpid/pamid/src/onesided/mpid_1s.c | 5 +++-- src/mpid/pamid/src/onesided/mpid_win_accumulate.c | 7 ++++++- src/mpid/pamid/src/onesided/mpid_win_get.c | 14 ++++++++++++-- src/mpid/pamid/src/onesided/mpid_win_put.c | 17 +++++++++++++---- 4 files changed, 34 insertions(+), 9 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.4-437-g9a742ca
by noreply＠mpich.org 06 Aug '13

06 Aug '13

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 9a742ca5ec305b0654b5619be2f4ee86bdcb8047 (commit) from 66119f1fe341d34bec41dd5e81e18c759d2f9ad5 (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/9a742ca5ec305b0654b5619be2f4ee86b… commit 9a742ca5ec305b0654b5619be2f4ee86bdcb8047 Author: Charles Archer <archerc(a)us.ibm.com> Date: Tue Jul 30 13:37:09 2013 -0400 PAMID: Fix MPIC_Sendrecv interface break in dynamic tasking Signed-off-by: Michael Blocksome <blocksom(a)us.ibm.com> diff --git a/src/mpid/pamid/src/dyntask/mpidi_port.c b/src/mpid/pamid/src/dyntask/mpidi_port.c index bea645a..2d4fecf 100644 --- a/src/mpid/pamid/src/dyntask/mpidi_port.c +++ b/src/mpid/pamid/src/dyntask/mpidi_port.c @@ -1272,7 +1272,7 @@ int MPIDI_Comm_accept(const char *port_name, MPID_Info *info, int root, MPI_INT, 0, sendtag++, remote_translation, remote_comm_size * 3, MPI_INT, 0, recvtag++, tmp_comm->handle, - MPI_STATUS_IGNORE); + MPI_STATUS_IGNORE, &errflag); for (i=0; i<remote_comm_size; i++) { TRACE_ERR(" remote_translation[%d].pg_index = %d\n remote_translation[%d].pg_rank = %d\n", ----------------------------------------------------------------------- Summary of changes: src/mpid/pamid/src/dyntask/mpidi_port.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.4-436-g66119f1
by noreply＠mpich.org 05 Aug '13

05 Aug '13

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 66119f1fe341d34bec41dd5e81e18c759d2f9ad5 (commit) from 117a24f5bc55ba13ca643903b5a64469d5ac946c (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/66119f1fe341d34bec41dd5e81e18c759… commit 66119f1fe341d34bec41dd5e81e18c759d2f9ad5 Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Wed Jul 31 12:51:11 2013 -0500 Add FT test with communication. Tweak other FT tests. Adds an FT test that attempts communication without touching a failed process. Other changes are to use SIGKILL to simulate failures and also to flush all output to stdout. Signed-off-by: Wesley Bland <wbland(a)mcs.anl.gov> diff --git a/test/mpi/ft/Makefile.am b/test/mpi/ft/Makefile.am index 40061d3..03e7578 100644 --- a/test/mpi/ft/Makefile.am +++ b/test/mpi/ft/Makefile.am @@ -10,4 +10,4 @@ include $(top_srcdir)/Makefile.mtest ## for all programs that are just built from the single corresponding source ## file, we don't need per-target _SOURCES rules, automake will infer them ## correctly -noinst_PROGRAMS = die abort +noinst_PROGRAMS = die abort send diff --git a/test/mpi/ft/abort.c b/test/mpi/ft/abort.c index 0578fd4..de299a8 100644 --- a/test/mpi/ft/abort.c +++ b/test/mpi/ft/abort.c @@ -15,6 +15,7 @@ int main(int argc, char **argv) MPI_Comm_rank(MPI_COMM_WORLD, &rank); printf("No Errors\n"); + fflush( stdout ); if (rank == 0) MPI_Abort(MPI_COMM_WORLD, MPI_SUCCESS); diff --git a/test/mpi/ft/die.c b/test/mpi/ft/die.c index 337f14b..c9d658d 100644 --- a/test/mpi/ft/die.c +++ b/test/mpi/ft/die.c @@ -20,14 +20,17 @@ int main(int argc, char **argv) if (rank == 1) { pid = getpid(); - kill(pid, SIGSTOP); + kill(pid, SIGKILL); } - MPI_Finalize(); + MTestSleep(1); if (rank == 0) { printf("No Errors\n"); + fflush( stdout ); } + MPI_Finalize(); + return 0; } diff --git a/test/mpi/ft/send.c b/test/mpi/ft/send.c new file mode 100644 index 0000000..8a5b5c3 --- /dev/null +++ b/test/mpi/ft/send.c @@ -0,0 +1,46 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */ +/* + * + * (C) 2003 by Argonne National Laboratory. + * See COPYRIGHT in top-level directory. + */ +#include <mpi.h> +#include <stdio.h> +#include <sys/types.h> +#include <unistd.h> +#include <signal.h> + +/* + * This test attempts communication between 2 running processes + * after another process has failed. + */ +int main(int argc, char **argv) +{ + int rank, size, err; + char buf[10]; + pid_t pid; + + MPI_Init(&argc, &argv); + MPI_Comm_rank(MPI_COMM_WORLD, &rank); + + if (rank == 1) { + pid = getpid(); + kill(pid, SIGKILL); + } + + MTestSleep(1); + + if (rank == 0) { + err = MPI_Send("No Errors", 10, MPI_CHAR, 2, 0, MPI_COMM_WORLD); + } + + if (rank == 2) { + MPI_Recv(buf, 10, MPI_CHAR, 0, 0, MPI_COMM_WORLD, MPI_STATUS_IGNORE); + printf("%s\n", buf); + fflush( stdout ); + } + + MPI_Finalize(); + + return 0; +} diff --git a/test/mpi/ft/testlist b/test/mpi/ft/testlist index 00187ae..6622554 100644 --- a/test/mpi/ft/testlist +++ b/test/mpi/ft/testlist @@ -1,2 +1,3 @@ die 4 mpiexecarg=-disable-auto-cleanup timeLimit=10 abort 2 mpiexecarg=-disable-auto-cleanup timeLimit=10 +send 4 mpiexecarg=-disable-auto-cleanup timeLimit=10 ----------------------------------------------------------------------- Summary of changes: test/mpi/ft/Makefile.am | 2 +- test/mpi/ft/abort.c | 1 + test/mpi/ft/die.c | 7 +++++-- test/mpi/ft/send.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ test/mpi/ft/testlist | 1 + 5 files changed, 54 insertions(+), 3 deletions(-) create mode 100644 test/mpi/ft/send.c hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.4-435-g117a24f
by noreply＠mpich.org 03 Aug '13

03 Aug '13

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 117a24f5bc55ba13ca643903b5a64469d5ac946c (commit) from d81904d6f6a76a44588b34e8878c5297486d9ea2 (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/117a24f5bc55ba13ca643903b5a64469d… commit 117a24f5bc55ba13ca643903b5a64469d5ac946c Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Sat Aug 3 13:04:53 2013 -0500 Intel scif code contribution. This update fixes the following problems: * Unexpected connection, mostly appears with number of ranks > 3 * Several problems related to SCIF DMA usage * Intel(R) Symmetric Communication Interface (Intel(R) SCI) registered memory used for DMA is not unregistered yet Current status: * IMB-MPI1 w/ CHECK runs well * MPICH tests run except spawn tests Known issues: * Spawn tests still fail diff --git a/src/mpid/ch3/channels/nemesis/netmod/scif/scif_finalize.c b/src/mpid/ch3/channels/nemesis/netmod/scif/scif_finalize.c index 0989842..ea1ed87 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/scif/scif_finalize.c +++ b/src/mpid/ch3/channels/nemesis/netmod/scif/scif_finalize.c @@ -17,10 +17,21 @@ #define FCNAME MPIDI_QUOTE(FUNCNAME) int MPID_nem_scif_finalize(void) { + int i, ret; + scifconn_t *it_sc; + MPIDI_STATE_DECL(MPID_STATE_MPID_NEM_SCIF_FINALIZE); MPIDI_FUNC_ENTER(MPID_STATE_MPID_NEM_SCIF_FINALIZE); + for (i = 0; i < MPID_nem_scif_nranks; ++i) { + it_sc = &MPID_nem_scif_conns[i]; + if (it_sc->fd == -1) { + continue; /* no connection */ + } + if (scif_close(it_sc->fd) == 0) + it_sc->fd = -1; + } MPIDI_FUNC_EXIT(MPID_STATE_MPID_NEM_SCIF_FINALIZE); return MPI_SUCCESS; } diff --git a/src/mpid/ch3/channels/nemesis/netmod/scif/scifrw.c b/src/mpid/ch3/channels/nemesis/netmod/scif/scifrw.c index a4e0588..c1536d2 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/scif/scifrw.c +++ b/src/mpid/ch3/channels/nemesis/netmod/scif/scifrw.c @@ -4,7 +4,7 @@ * See COPYRIGHT in top-level directory. * * Portions of this code were written by Intel Corporation. - * Copyright (C) 2011-2013 Intel Corporation. Intel provides this material + * Copyright (C) 2011-2012 Intel Corporation. Intel provides this material * to Argonne National Laboratory subject to Software Grant and Corporate * Contributor License Agreement dated February 8, 2012. */ @@ -56,6 +56,8 @@ int MPID_nem_scif_init_shmsend(shmchan_t * csend, int ep, int rank) csend->pos = -1; csend->reg = 0; csend->rank = rank; + csend->dma_count = 0; + csend->dma_chdseqno = 0; fn_exit: return retval; @@ -87,6 +89,29 @@ int MPID_nem_scif_init_shmrecv(shmchan_t * crecv, int ep, off_t offs, int rank) return retval; } +void MPID_nem_scif_unregmem(int ep, shmchan_t * c) +{ + regmem_t *rp = c->reg, *prev = c->reg; + uint64_t lseqno = c->dma_chdseqno; + + while (rp && c->dma_count) { + if (rp->seqno <= lseqno) { + scif_unregister(ep, rp->offset, rp->size); + prev->next = rp->next; + if (c->reg == rp) { + c->reg = rp->next; + } + free(rp); + --c->dma_count; + rp = prev->next; + } + else { + prev = rp; + rp = rp->next; + } + } +} + static regmem_t *regmem(int ep, shmchan_t * c, void *addr, size_t len) { regmem_t *rp; @@ -161,6 +186,8 @@ static int dma_read(int ep, shmchan_t * c, void *recv_buf, off_t raddr, size_t m fprintf(stderr, "recv_buf: %p raddr: 0x%lx buflen: %ld\n", recv_buf, raddr + c->pos, buflen); } + scif_fence_mark(ep, SCIF_FENCE_INIT_SELF, &mark); + scif_fence_wait(ep, mark); *did_dma = 1; goto fn_exit; } @@ -423,6 +450,11 @@ ssize_t MPID_nem_scif_writev(int ep, shmchan_t * c, const struct iovec * iov, in c->curp += len; nwritten += iovlen; ++c->seqno; + + if (did_dma) { + rp->seqno = c->seqno; + ++c->dma_count; + } } fn_exit: #if !defined(__MIC__) diff --git a/src/mpid/ch3/channels/nemesis/netmod/scif/scifrw.h b/src/mpid/ch3/channels/nemesis/netmod/scif/scifrw.h index 075eaf4..f371fc0 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/scif/scifrw.h +++ b/src/mpid/ch3/channels/nemesis/netmod/scif/scifrw.h @@ -24,6 +24,8 @@ typedef struct regmem { char *base; size_t size; off_t offset; /* for DMA */ + uint64_t seqno; /* sender sequence number, */ + /* used for unreg */ struct regmem *next; } regmem_t; @@ -47,6 +49,8 @@ typedef struct { ssize_t dmaend; /* end of the read in the DMA buffer */ regmem_t *reg; /* registration list */ int rank; /* mostly for debugging */ + int dma_count; /* count of DMA ops (send only) */ + int dma_chdseqno; /* last checked segno */ } shmchan_t; int MPID_nem_scif_init_shmsend(shmchan_t * csend, int ep, int rank); @@ -70,4 +74,15 @@ static inline int MPID_nem_scif_chk_seqno(shmchan_t * csend, int seqno) { return *csend->lseqno >= seqno; } + +static inline int MPID_nem_scif_chk_dma_unreg(shmchan_t * csend) +{ + uint64_t lseqno = *csend->lseqno; + + if (lseqno != csend->dma_chdseqno) { + csend->dma_chdseqno = lseqno; + return csend->dma_count; + } + return 0; +} #endif diff --git a/src/mpid/ch3/channels/nemesis/netmod/scif/scifsm.c b/src/mpid/ch3/channels/nemesis/netmod/scif/scifsm.c index f77ec5a..e2dd96b 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/scif/scifsm.c +++ b/src/mpid/ch3/channels/nemesis/netmod/scif/scifsm.c @@ -70,10 +70,8 @@ static int MPID_nem_scif_recv_handler(scifconn_t * const sc) rreq->dev.iov_count = &rreq->dev.iov[rreq->dev.iov_offset + rreq->dev.iov_count] - iov; rreq->dev.iov_offset = iov - rreq->dev.iov; - MPIU_DBG_MSG_D(CH3_CHANNEL, VERBOSE, "bytes_recvd = %ld", - (long int) bytes_recvd); - MPIU_DBG_MSG_D(CH3_CHANNEL, VERBOSE, "iov len = %ld", - (long int) iov->MPID_IOV_LEN); + MPIU_DBG_MSG_D(CH3_CHANNEL, VERBOSE, "bytes_recvd = %ld", (long int) bytes_recvd); + MPIU_DBG_MSG_D(CH3_CHANNEL, VERBOSE, "iov len = %ld", (long int) iov->MPID_IOV_LEN); MPIU_DBG_MSG_D(CH3_CHANNEL, VERBOSE, "iov_offset = %d", rreq->dev.iov_offset); goto fn_exit; } @@ -111,8 +109,7 @@ static int MPID_nem_scif_recv_handler(scifconn_t * const sc) return mpi_errno; fn_fail: /* comm related failures jump here */ { - MPIU_ERR_SET1(mpi_errno, MPI_ERR_OTHER, "**comm_fail", - "**comm_fail %d", sc_vc->pg_rank); + MPIU_ERR_SET1(mpi_errno, MPI_ERR_OTHER, "**comm_fail", "**comm_fail %d", sc_vc->pg_rank); } fn_noncomm_fail: /* NON-comm related failures jump here */ goto fn_exit; @@ -143,6 +140,13 @@ static int state_commrdy_handler(int is_readable, int is_writeable, scifconn_t * MPIU_ERR_POP(mpi_errno); /* check to see if this VC is waiting for outstanding sends to * finish in order to terminate */ + if (MPIDI_CH3I_Sendq_empty(sc_vc_scif->send_queue) && sc_vc_scif->terminate == 1) { + /* The sendq is empty, so we can immediately terminate + * the connection. */ + mpi_errno = MPID_nem_scif_vc_terminated(sc_vc); + if (mpi_errno) + MPIU_ERR_POP(mpi_errno); + } } fn_exit: MPIDI_FUNC_EXIT(MPID_STATE_STATE_COMMRDY_HANDLER); @@ -166,6 +170,9 @@ int MPID_nem_scif_connpoll(int in_blocking_poll) scifconn_t *it_sc = &MPID_nem_scif_conns[i]; if (it_sc->fd == -1) continue; /* no connection */ + if (MPID_nem_scif_chk_dma_unreg(&it_sc->csend)) { + MPID_nem_scif_unregmem(it_sc->fd, &it_sc->csend); + } is_readable = MPID_nem_scif_poll_recv(&it_sc->crecv); is_writeable = MPID_nem_scif_poll_send(it_sc->fd, &it_sc->csend); MPIU_ERR_CHKANDJUMP1(is_writeable == -1, mpi_errno, MPI_ERR_OTHER, @@ -180,8 +187,7 @@ int MPID_nem_scif_connpoll(int in_blocking_poll) fds.revents = 0; MPIU_ERR_CHKANDJUMP1(poll(&fds, 1, 0) < 0, mpi_errno, MPI_ERR_OTHER, "**poll", "**poll %s", MPIU_Strerror(errno)); - MPIU_ERR_CHKANDJUMP(fds.revents & (POLLERR | POLLHUP), mpi_errno, - MPI_ERR_OTHER, "**poll"); + MPIU_ERR_CHKANDJUMP(fds.revents & POLLERR, mpi_errno, MPI_ERR_OTHER, "**poll"); } } if (npolls++ >= NPOLLS) @@ -190,7 +196,6 @@ int MPID_nem_scif_connpoll(int in_blocking_poll) fn_exit: return mpi_errno; fn_fail: - MPIU_DBG_MSG_FMT(NEM_SOCK_DET, VERBOSE, - (MPIU_DBG_FDEST, "failure. mpi_errno = %d", mpi_errno)); + MPIU_DBG_MSG_FMT(NEM_SOCK_DET, VERBOSE, (MPIU_DBG_FDEST, "failure. mpi_errno = %d", mpi_errno)); goto fn_exit; } ----------------------------------------------------------------------- Summary of changes: .../channels/nemesis/netmod/scif/scif_finalize.c | 11 ++++++ src/mpid/ch3/channels/nemesis/netmod/scif/scifrw.c | 34 +++++++++++++++++++- src/mpid/ch3/channels/nemesis/netmod/scif/scifrw.h | 15 +++++++++ src/mpid/ch3/channels/nemesis/netmod/scif/scifsm.c | 25 +++++++++------ 4 files changed, 74 insertions(+), 11 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.4-434-gd81904d
by noreply＠mpich.org 02 Aug '13

02 Aug '13

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 d81904d6f6a76a44588b34e8878c5297486d9ea2 (commit) from 0c41233e795db2fe8e3bd59263187a15cfa93240 (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/d81904d6f6a76a44588b34e8878c52974… commit d81904d6f6a76a44588b34e8878c5297486d9ea2 Author: Antonio J. Pena <apenya(a)mcs.anl.gov> Date: Fri Aug 2 18:25:45 2013 -0500 Regenerate configure after patching libtool.m4 Signed-off-by: Pavan Balaji <balaji(a)mcs.anl.gov> diff --git a/autogen.sh b/autogen.sh index 5dc2a7e..e30f6fb 100755 --- a/autogen.sh +++ b/autogen.sh @@ -913,11 +913,13 @@ if [ "$do_build_configure" = "yes" ] ; then echo_n "Patching libtool.m4 for compatibility with nagfor shared libraries... " patch --forward -s -l $amdir/confdb/libtool.m4 maint/libtool.m4.patch if [ $? -eq 0 ] ; then - echo "done" # Remove possible leftovers, which don't imply a failure rm -f $amdir/confdb/libtool.m4.orig + # Rebuild configure + (cd $amdir && $autoconf -f) || exit 1 # Reset libtool.m4 timestamps to avoid confusing make touch -r $amdir/confdb/ltversion.m4 $amdir/confdb/libtool.m4 + echo "done" else echo "failed" fi ----------------------------------------------------------------------- Summary of changes: autogen.sh | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.4-433-g0c41233
by noreply＠mpich.org 02 Aug '13

02 Aug '13

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 0c41233e795db2fe8e3bd59263187a15cfa93240 (commit) from e259dcd97ede800b086c96d76f5213fe973ecd2a (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/0c41233e795db2fe8e3bd59263187a15c… commit 0c41233e795db2fe8e3bd59263187a15cfa93240 Author: Rob Latham <robl(a)mcs.anl.gov> Date: Fri Aug 2 09:04:16 2013 -0500 zap arch-specific stuff most of this stuff is either broken, for ancient platofrms, or both. Let's re-commit ourselves to using autoconf as it was intended, testing for features, not platforms. diff --git a/src/mpi/romio/configure.ac b/src/mpi/romio/configure.ac index 298ab99..ba39b6f 100644 --- a/src/mpi/romio/configure.ac +++ b/src/mpi/romio/configure.ac @@ -349,81 +349,6 @@ fi # C_DEBUG_FLAG="-g" F77_DEBUG_FLAG="-g" -case $ARCH in - solaris|solaris86) - CC=${CC:-cc} - F77=${FC:-f77} - if test "$CC" != "gcc" ; then - C_DEBUG_FLAG="-g -v" - fi - ;; - - rs6000) - F77=${FC} - # Try to use mpcc if no CC specified - AC_PROGRAMS_CHECK(CC, mpcc, cc) - if test $NOF77 = 0 && test -z "$F77"; then - AC_PROGRAMS_CHECK(F77, mpxlf, f77) - fi - ;; - - tflop|tflops) - CC=${CC:-pgcc} - F77=${FC:-pgf77} - CFLAGS="$CFLAGS -cougar -D__PUMA" - if test "$CC" = "pgcc" ; then - C_OPT_FLAG="-Knoieee -Mvect -O3" - fi - ;; - - freebsd|LINUX|netbsd|openbsd|LINUX_ALPHA) - CC=${CC:-gcc} - # Let the prog_f77 file g77/f77/others - F77=${FC} - ;; - - SX4) - CC=${CC:-mpicc} - F77=${FC:-mpif90} - if test $DEBUG != "yes" ; then - USER_FFLAGS="$FFLAGS -Chopt" - F77_OPT_FLAG="-Chopt" - fi - ;; - - hpux|sppux) - C_DEBUG_FLAG="-g +w1" - ;; - - alpha|ALPHA) - CC=${CC:-cc} - F77=${FC:-f77} - dnl CFLAGS="$CFLAGS -g -std1 -warnprotos -verbose" - C_DEBUG_FLAG="-g -verbose" - ;; - - CRAY) - CC=${CC:-cc} - F77=${FC:-f90} - NOF77=1 - CFLAGS="$CFLAGS -D_UNICOS" - ;; - - sgi|IRIX64|IRIX32|IRIXN32) - arch_IRIX=1 - CC=${CC:-cc} - F77=${FC:-f77} - C_DEBUG_FLAG="-g -fullwarn" - ;; - - sgi5) - ;; - - *) - # Fall-through case. Take FC - F77=${FC:-f77} - ;; -esac dnl AC_PROG_{CXX,F77,FC} must come early in configure.ac in order to control dnl compiler search order and avoid some esoteric autoconf macro expansion @@ -450,236 +375,24 @@ fi # --------------------------------------------------------------------------- # Here go the rest of the tests # --------------------------------------------------------------------------- -if test -n "$arch_solaris" || test -n "$arch_solaris86" ; then - if test -z "$MPI_IMPL" ; then - MPI_IMPL=mpich - mpi_mpich=1 - fi - if test $MPI_IMPL = "mpich" ; then - TEST_CC=mpicc - TEST_F77=mpif77 - else - TEST_CC="$CC" - TEST_F77="$F77" - fi -fi - -if test -n "$arch_rs6000"; then - if test -z "$MPI_IMPL" ; then - MPI_IMPL=mpich - mpi_mpich=1 - fi - AC_DEFINE(AIX,1,[Define for AIX]) -# assume long long exists. - ac_cv_sizeof_long_long=${ac_cv_sizeof_long_long:-8} - MPI_OFFSET_KIND1=" INTEGER MPI_OFFSET_KIND" - MPI_OFFSET_KIND2=" PARAMETER (MPI_OFFSET_KIND=8)" - MPI_OFFSET_KIND_VAL=8 -fi -# - -if test -n "$arch_freebsd" || test -n "$arch_LINUX" || test -n "$arch_LINUX_ALPHA" || test -n "$arch_netbsd" || test -n "$arch_openbsd" ; then - if test -n "$arch_freebsd" || test -n "$arch_netbsd" || test -n "$arch_openbsd"; then - ac_cv_sizeof_long_long=${ac_cv_sizeof_long_long:-0} - # printf doesn't work properly and no integer*8 as far as I can tell - fi - # Find the CPP before the header check - AC_PROG_CPP - if test -z "$MPI_IMPL" ; then - MPI_IMPL=mpich - mpi_mpich=1 - fi -fi -# -if test -n "$arch_SX4" ; then - have_aio=no - AC_DEFINE(SX4,1,[Define for NEC SX4]) - if test -z "$MPI_IMPL" ; then - MPI_IMPL=mpich - mpi_mpich=1 - fi - # supply a reasonable default fs - if test -z "$FILE_SYSTEM" ; then - FILE_SYSTEM="sfs nfs" - fi - MPI_OFFSET_KIND1=" INTEGER MPI_OFFSET_KIND" - MPI_OFFSET_KIND2=" PARAMETER (MPI_OFFSET_KIND=8)" - MPI_OFFSET_KIND_VAL=8 -fi -# -if test -n "$arch_hpux" || test -n "$arch_sppux" ; then - have_aio=no - RANLIB=":" - if test -z "$MPI_IMPL"; then - if test -f "/opt/mpi/include/mpi.h" ; then - echo "assuming that you want to use ROMIO with HP MPI" - MPI_IMPL=hp - else - echo "assuming that you want to use ROMIO with MPICH" - MPI_IMPL=mpich - fi - fi - if test $MPI_IMPL = "mpich" ; then - mpi_mpich=1 - MPI_LIB="$MPI_LIB -lV3" - CC=${CC:-cc -Ae} - F77=${FC:-f77 +U77} - fi - if test $MPI_IMPL = "hp" ; then - mpi_hp=1 - CC=${CC:-mpicc -Ae} - F77=${FC:-mpif77 +U77} - fi - if test $MPI_IMPL = "lam" && test "$FC" != ""; then - F77="$F77 +U77" - fi - FTESTDEFINE="external iargc, getarg" - if test -n "$arch_hpux" ; then - CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE" - AC_DEFINE(HPUX,1,[Define for HPUX]) - if test $MPI_IMPL = "hp" ; then - F77=${FC:-mpif90 +U77} - else - F77=${FC:-f90 +U77} - fi - else - AC_DEFINE(SPPUX,1,[Define for SPPUX (Convex)]) - fi - - MPI_OFFSET_KIND1=" INTEGER MPI_OFFSET_KIND" - MPI_OFFSET_KIND2=" PARAMETER (MPI_OFFSET_KIND=8)" - MPI_OFFSET_KIND_VAL=8 - if test "$CC" != "gcc" ; then - ROMIO_TCFLAGS="-Ae" - fi - if test "$F77" != "g77" ; then - ROMIO_TFFLAGS="+U77" - fi -fi -# -if test -n "$arch_alpha" || test -n "$arch_ALPHA" ; then - if test -z "$MPI_IMPL" ; then - MPI_IMPL=mpich - mpi_mpich=1 - fi - - MPI_OFFSET_KIND1=" INTEGER MPI_OFFSET_KIND" - MPI_OFFSET_KIND2=" PARAMETER (MPI_OFFSET_KIND=8)" - MPI_OFFSET_KIND_VAL=8 - LIBS="$LIBS -laio" -fi -# -if test -n "$arch_CRAY" ; then - NOF77=1 - FTESTDEFINE="integer ilen" - F77GETARG="call pxfgetarg(i, str, ilen, ierr)" - have_aio=no - RANLIB=":" - AC_DEFINE(CRAY,1,[Define if Cray]) - if test -z "$MPI_IMPL" || test -n "$mpi_sgi" ; then - MPI_IMPL=cray - mpi_cray=1 - mpi_sgi="" -# above is to disable configure tests specific to SGI MPI - AC_DEFINE(MPISGI,1,[Define if SGI MPI]) - AC_DEFINE(HAVE_MPI_COMBINERS,1,[Define if MPI supports datatype combiners]) - AC_DEFINE(NO_MPI_SGI_type_is_contig,1,[Define if no types show contig]) - fi -# MPISGI needed because of error in Cray's and SGI's -# MPI_Type_get_contents (does not increment reference count). -# Others needed because MPISGI needed. - - MPI_OFFSET_KIND1=" INTEGER MPI_OFFSET_KIND" - MPI_OFFSET_KIND2=" PARAMETER (MPI_OFFSET_KIND=8)" - MPI_OFFSET_KIND_VAL=8 -fi -# -if test -n "$arch_sgi" ; then - arch_IRIX=1 - ARCH=IRIX -fi -if test -n "$arch_IRIX64" || test -n "$arch_IRIX32" || test -n "$arch_IRIXN32" ; then - arch_IRIX=1 +AC_CHECK_TYPE(long long) +AC_CHECK_SIZEOF(long long) +if test -z "$MPI_IMPL" ; then + MPI_IMPL=mpich + mpi_mpich=1 fi -if test -n "$arch_sgi5" ; then - arch_IRIX5=1 - ARCH=IRIX +if test $MPI_IMPL = "mpich" ; then + TEST_CC=mpicc + TEST_F77=mpif77 +else + TEST_CC="$CC" + TEST_F77="$F77" fi -# +# there used to be a ton of arch-specific stuff in here. If some random +# platform really truly needs it, restore it, but that defeats the whole + PAC_GET_SPECIAL_SYSTEM_INFO -# -# special case 'sgi5' for use on MESHINE which is much like an SGI running -# irix 5 with r4400 chips, but does not have 'hinv', so above code doesn't -# work -if test -n "$arch_sgi5"; then - osversion=5 - cputype=4400 - IRIXARCH="$ARCH_$osversion" - IRIXARCH="$IRIXARCH_$cputype" -# now set arch_IRIX to 1 - arch_IRIX=1 - echo "IRIX-specific architecture is $IRIXARCH" - AC_DEFINE(IRIX,1,[Define if IRIX]) -fi -# -if test -n "$arch_IRIX"; then - if test $osversion = 4 ; then - RANLIB="ar ts" - if test -n "$mpi_sgi"; then - AC_MSG_ERROR([SGI\'s MPI does not work with IRIX 4.x]) - fi - elif test $osversion = 5 ; then - if test -n "$mpi_sgi"; then - AC_MSG_ERROR([SGI\'s MPI does not work with IRIX 5.x]) - fi - elif test $osversion = 6 ; then - if test -z "$MPI_IMPL"; then - if test "$FROM_MPICH" = "yes" ; then - MPI_IMPL=mpich - mpi_mpich=1 - elif test -f "/usr/include/mpi.h" ; then - # removed use of escaped single quotes in messages - # because they confuse Emacs, making it hard to - # read the files (with emacs :) ) - AC_MSG_WARN([assuming that you want to use ROMIO with the SGI MPI]) - MPI_IMPL=sgi - mpi_sgi=1 - fi - fi - RANLIB=":" - AC_DEFINE(AIO_SIGNOTIFY_NONE,1,[Define if no signotify]) - if test $cputype -ge 5000 ; then - MIPS=4 - else - MIPS=3 - fi - fi - if test -n "$mpi_sgi" && test -z "$MPI_LIB" ; then - MPI_LIB="-lmpi" - fi -# check if pread64 is defined - PAC_HAVE_PREAD64 - - # supply a reasonable default fs - if test -z "$FILE_SYSTEM" ; then - FILE_SYSTEM="nfs" - AC_MSG_CHECKING(for xfs) - AC_TRY_COMPILE([ -#include <aio.h>], -[aiocb64_t *t1;],xfs_works=1;FILE_SYSTEM="xfs $FILE_SYSTEM";) - if test "$xfs_works" = 1 ; then - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) - FILE_SYSTEM="ufs $FILE_SYSTEM" - fi - fi - AC_DEFINE(IRIX,1,[Define if IRIX]) - MPI_OFFSET_KIND1=" INTEGER MPI_OFFSET_KIND" - MPI_OFFSET_KIND2=" PARAMETER (MPI_OFFSET_KIND=8)" - MPI_OFFSET_KIND_VAL=8 -fi AC_HAVE_FUNCS(memalign) ----------------------------------------------------------------------- Summary of changes: src/mpi/romio/configure.ac | 313 ++------------------------------------------ 1 files changed, 13 insertions(+), 300 deletions(-) hooks/post-receive -- MPICH primary repository

1 0