X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1ecf051222132e156d089003dbc908e1d8f37e57..0b9803aff2b8893bed56c21012d86d0a19b186a0:/src/smpi/smpi_base.cpp diff --git a/src/smpi/smpi_base.cpp b/src/smpi/smpi_base.cpp index 0170851808..b64113ca98 100644 --- a/src/smpi/smpi_base.cpp +++ b/src/smpi/smpi_base.cpp @@ -5,7 +5,6 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include -#include #include #include "private.h" @@ -17,16 +16,21 @@ #include "src/simix/smx_private.h" #include "surf/surf.h" #include "simgrid/sg_config.h" +#include "smpi/smpi_utils.hpp" #include "colls/colls.h" +#include -#include "src/simix/SynchroComm.hpp" +#include "src/kernel/activity/SynchroComm.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_base, smpi, "Logging specific to SMPI (base)"); -static int match_recv(void* a, void* b, smx_synchro_t ignored) { - MPI_Request ref = static_cast(a); - MPI_Request req = static_cast(b); - XBT_DEBUG("Trying to match a recv of src %d against %d, tag %d against %d",ref->src,req->src, ref->tag, req->tag); +extern void (*smpi_comm_copy_data_callback) (smx_activity_t, void*, size_t); + + +static int match_recv(void* a, void* b, smx_activity_t ignored) { + MPI_Request ref = static_cast(a); + MPI_Request req = static_cast(b); + XBT_DEBUG("Trying to match a recv of src %d against %d, tag %d against %d",ref->src,req->src, ref->tag, req->tag); xbt_assert(ref, "Cannot match recv against null reference"); xbt_assert(req, "Cannot match recv against null request"); @@ -34,52 +38,44 @@ static int match_recv(void* a, void* b, smx_synchro_t ignored) { && ((ref->tag == MPI_ANY_TAG && req->tag >=0) || req->tag == ref->tag)){ //we match, we can transfer some values if(ref->src == MPI_ANY_SOURCE) - ref->real_src = req->src; + ref->real_src = req->src; if(ref->tag == MPI_ANY_TAG) - ref->real_tag = req->tag; + ref->real_tag = req->tag; if(ref->real_size < req->real_size) - ref->truncated = 1; + ref->truncated = 1; if(req->detached==1) - ref->detached_sender=req; //tie the sender to the receiver, as it is detached and has to be freed in the receiver + ref->detached_sender=req; //tie the sender to the receiver, as it is detached and has to be freed in the receiver XBT_DEBUG("match succeeded"); return 1; }else return 0; } -static int match_send(void* a, void* b,smx_synchro_t ignored) { - MPI_Request ref = static_cast(a); - MPI_Request req = static_cast(b); - XBT_DEBUG("Trying to match a send of src %d against %d, tag %d against %d",ref->src,req->src, ref->tag, req->tag); - xbt_assert(ref, "Cannot match send against null reference"); - xbt_assert(req, "Cannot match send against null request"); - - if((req->src == MPI_ANY_SOURCE || req->src == ref->src) - && ((req->tag == MPI_ANY_TAG && ref->tag >=0)|| req->tag == ref->tag)) - { - if(req->src == MPI_ANY_SOURCE) - req->real_src = ref->src; - if(req->tag == MPI_ANY_TAG) - req->real_tag = ref->tag; - if(req->real_size < ref->real_size) - req->truncated = 1; - if(ref->detached==1) - req->detached_sender=ref; //tie the sender to the receiver, as it is detached and has to be freed in the receiver - XBT_DEBUG("match succeeded"); - return 1; - } else return 0; +static int match_send(void* a, void* b,smx_activity_t ignored) { + MPI_Request ref = static_cast(a); + MPI_Request req = static_cast(b); + XBT_DEBUG("Trying to match a send of src %d against %d, tag %d against %d",ref->src,req->src, ref->tag, req->tag); + xbt_assert(ref, "Cannot match send against null reference"); + xbt_assert(req, "Cannot match send against null request"); + + if((req->src == MPI_ANY_SOURCE || req->src == ref->src) + && ((req->tag == MPI_ANY_TAG && ref->tag >=0)|| req->tag == ref->tag)){ + if(req->src == MPI_ANY_SOURCE) + req->real_src = ref->src; + if(req->tag == MPI_ANY_TAG) + req->real_tag = ref->tag; + if(req->real_size < ref->real_size) + req->truncated = 1; + if(ref->detached==1) + req->detached_sender=ref; //tie the sender to the receiver, as it is detached and has to be freed in the receiver + XBT_DEBUG("match succeeded"); + return 1; + } else + return 0; } -// Methods used to parse and store the values for timing injections in smpi -// These are taken from surf/network.c and generalized to have more values for each factor -typedef struct s_smpi_factor_multival *smpi_os_factor_multival_t; -typedef struct s_smpi_factor_multival { // FIXME: this should be merged (deduplicated) with s_smpi_factor defined in network_smpi.c - size_t factor=0; - std::vector values; -} s_smpi_factor_multival_t; - -std::vector smpi_os_values; -std::vector smpi_or_values; -std::vector smpi_ois_values; +std::vector smpi_os_values; +std::vector smpi_or_values; +std::vector smpi_ois_values; static simgrid::config::Flag smpi_wtime_sleep( "smpi/wtime", "Minimum time to inject inside a call to MPI_Wtime", 0.0); @@ -90,62 +86,6 @@ static simgrid::config::Flag smpi_iprobe_sleep( static simgrid::config::Flag smpi_test_sleep( "smpi/test", "Minimum time to inject inside a call to MPI_Test", 1e-4); -static std::vector parse_factor(const char *smpi_coef_string) -{ - std::vector smpi_factor; - - /** Setup the tokenizer that parses the string **/ - typedef boost::tokenizer> Tokenizer; - boost::char_separator sep(";"); - boost::char_separator factor_separator(":"); - std::string tmp_string(smpi_coef_string); - Tokenizer tokens(tmp_string, sep); - - /** - * Iterate over patterns like A:B:C:D;E:F;G:H - * These will be broken down into: - * A --> B, C, D - * E --> F - * G --> H - */ - for (Tokenizer::iterator token_iter = tokens.begin(); - token_iter != tokens.end(); token_iter++) { -XBT_DEBUG("token : %s", token_iter->c_str()); - Tokenizer factor_values(*token_iter, factor_separator); - s_smpi_factor_multival_t fact; - if (factor_values.begin() == factor_values.end()) { - xbt_die("Malformed radical for smpi factor: '%s'", smpi_coef_string); - } - unsigned int iteration = 0; - for (Tokenizer::iterator factor_iter = factor_values.begin(); - factor_iter != factor_values.end(); factor_iter++, iteration++) { - char *errmsg; - - if (factor_iter == factor_values.begin()) { /* first element */ - errmsg = bprintf("Invalid factor in chunk #%zu: %%s", smpi_factor.size()+1); - fact.factor = xbt_str_parse_int(factor_iter->c_str(), errmsg); - } - else { - errmsg = bprintf("Invalid factor value %d in chunk #%zu: %%s", iteration, smpi_factor.size()+1); - fact.values.push_back(xbt_str_parse_double(factor_iter->c_str(), errmsg)); - } - xbt_free(errmsg); - } - - smpi_factor.push_back(fact); - XBT_DEBUG("smpi_factor:\t%zu : %zu values, first: %f", fact.factor, smpi_factor.size(), fact.values[0]); - } - std::sort(smpi_factor.begin(), smpi_factor.end(), - [](const s_smpi_factor_multival_t &pa, - const s_smpi_factor_multival_t &pb) { - return (pa.factor < pb.factor); - }); - for (auto& fact : smpi_factor) { - XBT_DEBUG("smpi_factor:\t%zu : %zu values, first: %f", fact.factor, smpi_factor.size() ,fact.values[0]); - } - - return smpi_factor; -} static double smpi_os(size_t size) { @@ -156,11 +96,10 @@ static double smpi_os(size_t size) // Iterate over all the sections that were specified and find the right // value. (fact.factor represents the interval sizes; we want to find the // section that has fact.factor <= size and no other such fact.factor <= size) - // Note: parse_factor() (used before) already sorts the dynar we iterate over! + // Note: parse_factor() (used before) already sorts the vector we iterate over! for (auto& fact : smpi_os_values) { - if (size <= fact.factor) { // Values already too large, use the previously - // computed value of current! - XBT_DEBUG("os : %zu <= %zu return %.10f", size, fact.factor, current); + if (size <= fact.factor) { // Values already too large, use the previously computed value of current! + XBT_DEBUG("os : %zu <= %zu return %.10f", size, fact.factor, current); return current; }else{ // If the next section is too large, the current section must be used. @@ -181,10 +120,10 @@ static double smpi_ois(size_t size) double current=smpi_ois_values.empty()?0.0:smpi_ois_values[0].values[0]+smpi_ois_values[0].values[1]*size; // Iterate over all the sections that were specified and find the right value. (fact.factor represents the interval // sizes; we want to find the section that has fact.factor <= size and no other such fact.factor <= size) - // Note: parse_factor() (used before) already sorts the dynar we iterate over! + // Note: parse_factor() (used before) already sorts the vector we iterate over! for (auto& fact : smpi_ois_values) { if (size <= fact.factor) { // Values already too large, use the previously computed value of current! - XBT_DEBUG("ois : %zu <= %zu return %.10f", size, fact.factor, current); + XBT_DEBUG("ois : %zu <= %zu return %.10f", size, fact.factor, current); return current; }else{ // If the next section is too large, the current section must be used. @@ -207,11 +146,10 @@ static double smpi_or(size_t size) // Iterate over all the sections that were specified and find the right value. (fact.factor represents the interval // sizes; we want to find the section that has fact.factor <= size and no other such fact.factor <= size) - // Note: parse_factor() (used before) already sorts the dynar we iterate over! + // Note: parse_factor() (used before) already sorts the vector we iterate over! for (auto fact : smpi_or_values) { - if (size <= fact.factor) { // Values already too large, use the previously - // computed value of current! - XBT_DEBUG("or : %zu <= %zu return %.10f", size, fact.factor, current); + if (size <= fact.factor) { // Values already too large, use the previously computed value of current! + XBT_DEBUG("or : %zu <= %zu return %.10f", size, fact.factor, current); return current; } else { // If the next section is too large, the current section must be used. @@ -231,9 +169,7 @@ void smpi_mpi_init() { double smpi_mpi_wtime(){ double time; - if (smpi_process_initialized() != 0 && - smpi_process_finalized() == 0 && - smpi_process_get_sampling() == 0) { + if (smpi_process_initialized() != 0 && smpi_process_finalized() == 0 && smpi_process_get_sampling() == 0) { smpi_bench_end(); time = SIMIX_get_clock(); // to avoid deadlocks if used as a break condition, such as @@ -319,8 +255,7 @@ static void smpi_mpi_request_free_voidp(void* request) } /* MPI Low level calls */ -MPI_Request smpi_mpi_send_init(void *buf, int count, MPI_Datatype datatype, - int dst, int tag, MPI_Comm comm) +MPI_Request smpi_mpi_send_init(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm) { MPI_Request request = nullptr; /* MC needs the comm to be set to nullptr during the call */ request = build_request(buf==MPI_BOTTOM ? nullptr : buf, count, datatype, smpi_process_index(), @@ -328,8 +263,7 @@ MPI_Request smpi_mpi_send_init(void *buf, int count, MPI_Datatype datatype, return request; } -MPI_Request smpi_mpi_ssend_init(void *buf, int count, MPI_Datatype datatype, - int dst, int tag, MPI_Comm comm) +MPI_Request smpi_mpi_ssend_init(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm) { MPI_Request request = nullptr; /* MC needs the comm to be set to nullptr during the call */ request = build_request(buf==MPI_BOTTOM ? nullptr : buf, count, datatype, smpi_process_index(), @@ -337,8 +271,7 @@ MPI_Request smpi_mpi_ssend_init(void *buf, int count, MPI_Datatype datatype, return request; } -MPI_Request smpi_mpi_recv_init(void *buf, int count, MPI_Datatype datatype, - int src, int tag, MPI_Comm comm) +MPI_Request smpi_mpi_recv_init(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI_Comm comm) { MPI_Request request = nullptr; /* MC needs the comm to be set to nullptr during the call */ request = build_request(buf==MPI_BOTTOM ? nullptr : buf, count, datatype, @@ -373,8 +306,9 @@ void smpi_mpi_start(MPI_Request request) //begin with the more appropriate one : the small one. mailbox = smpi_process_mailbox_small(); XBT_DEBUG("Is there a corresponding send already posted in the small mailbox %p (in case of SSEND)?", mailbox); - smx_synchro_t action = simcall_comm_iprobe(mailbox, 0, request->src,request->tag, &match_recv, static_cast(request)); - + smx_activity_t action = simcall_comm_iprobe(mailbox, 0, request->src,request->tag, &match_recv, + static_cast(request)); + if (action == nullptr) { mailbox = smpi_process_mailbox(); XBT_DEBUG("No, nothing in the small mailbox test the other one : %p", mailbox); @@ -383,21 +317,18 @@ void smpi_mpi_start(MPI_Request request) XBT_DEBUG("Still nothing, switch back to the small mailbox : %p", mailbox); mailbox = smpi_process_mailbox_small(); } - } - else { + } else { XBT_DEBUG("yes there was something for us in the large mailbox"); } - } - else { + } else { mailbox = smpi_process_mailbox_small(); XBT_DEBUG("Is there a corresponding send already posted the small mailbox?"); - smx_synchro_t action = simcall_comm_iprobe(mailbox, 0, request->src,request->tag, &match_recv, (void*)request); - + smx_activity_t action = simcall_comm_iprobe(mailbox, 0, request->src,request->tag, &match_recv, (void*)request); + if (action == nullptr) { XBT_DEBUG("No, nothing in the permanent receive mailbox"); mailbox = smpi_process_mailbox(); - } - else { + } else { XBT_DEBUG("yes there was something for us in the small mailbox"); } } @@ -405,25 +336,24 @@ void smpi_mpi_start(MPI_Request request) // we make a copy here, as the size is modified by simix, and we may reuse the request in another receive later request->real_size=request->size; request->action = simcall_comm_irecv(SIMIX_process_self(), mailbox, request->buf, &request->real_size, &match_recv, - ! smpi_process_get_replaying()? &smpi_comm_copy_buffer_callback + ! smpi_process_get_replaying()? smpi_comm_copy_data_callback : &smpi_comm_null_copy_buffer_callback, request, -1.0); - XBT_DEBUG("recv simcall posted"); + XBT_DEBUG("recv simcall posted"); if (async_small_thresh != 0 || (request->flags & RMA) != 0 ) xbt_mutex_release(mut); - } - else { /* the RECV flag was not set, so this is a send */ + } else { /* the RECV flag was not set, so this is a send */ int receiver = request->dst; int rank = request->src; if (TRACE_smpi_view_internals()) { - TRACE_smpi_send(rank, rank, receiver,request->size); + TRACE_smpi_send(rank, rank, receiver, request->tag, request->size); } print_request("New send", request); void* buf = request->buf; - if ( (request->flags & SSEND) == 0 - && ( (request->flags & RMA) != 0 || static_cast(request->size) < xbt_cfg_get_int("smpi/send-is-detached-thresh") ) ) { + if ((request->flags & SSEND) == 0 && ( (request->flags & RMA) != 0 + || static_cast(request->size) < xbt_cfg_get_int("smpi/send-is-detached-thresh") ) ) { void *oldbuf = nullptr; request->detached = 1; XBT_DEBUG("Send request %p is detached", request); @@ -452,9 +382,9 @@ void smpi_mpi_start(MPI_Request request) } if(sleeptime > 0.0){ - simcall_process_sleep(sleeptime); - XBT_DEBUG("sending size of %zu : sleep %f ", request->size, sleeptime); - } + simcall_process_sleep(sleeptime); + XBT_DEBUG("sending size of %zu : sleep %f ", request->size, sleeptime); + } int async_small_thresh = xbt_cfg_get_int("smpi/async-small-thresh"); @@ -465,17 +395,16 @@ void smpi_mpi_start(MPI_Request request) if (!(async_small_thresh != 0 || (request->flags & RMA) !=0)) { mailbox = smpi_process_remote_mailbox(receiver); - } - else if (((request->flags & RMA) != 0) || static_cast(request->size) < async_small_thresh) { // eager mode + } else if (((request->flags & RMA) != 0) || static_cast(request->size) < async_small_thresh) { // eager mode mailbox = smpi_process_remote_mailbox(receiver); XBT_DEBUG("Is there a corresponding recv already posted in the large mailbox %p?", mailbox); - smx_synchro_t action = simcall_comm_iprobe(mailbox, 1,request->dst, request->tag, &match_send, static_cast(request)); + smx_activity_t action = simcall_comm_iprobe(mailbox, 1,request->dst, request->tag, &match_send, + static_cast(request)); if (action == nullptr) { if ((request->flags & SSEND) == 0){ mailbox = smpi_process_remote_mailbox_small(receiver); XBT_DEBUG("No, nothing in the large mailbox, message is to be sent on the small one %p", mailbox); - } - else { + } else { mailbox = smpi_process_remote_mailbox_small(receiver); XBT_DEBUG("SSEND : Is there a corresponding recv already posted in the small mailbox %p?", mailbox); action = simcall_comm_iprobe(mailbox, 1,request->dst, request->tag, &match_send, static_cast(request)); @@ -484,12 +413,10 @@ void smpi_mpi_start(MPI_Request request) mailbox = smpi_process_remote_mailbox(receiver); } } - } - else { + } else { XBT_DEBUG("Yes there was something for us in the large mailbox"); } - } - else { + } else { mailbox = smpi_process_remote_mailbox(receiver); XBT_DEBUG("Send request %p is in the large mailbox %p (buf: %p)",mailbox, request,request->buf); } @@ -499,7 +426,7 @@ void smpi_mpi_start(MPI_Request request) request->action = simcall_comm_isend(SIMIX_process_from_PID(request->src+1), mailbox, request->size, -1.0, buf, request->real_size, &match_send, &xbt_free_f, // how to free the userdata if a detached send fails - !smpi_process_get_replaying() ? &smpi_comm_copy_buffer_callback + !smpi_process_get_replaying() ? smpi_comm_copy_data_callback : &smpi_comm_null_copy_buffer_callback, request, // detach if msg size < eager/rdv switch limit request->detached); @@ -537,10 +464,10 @@ void smpi_mpi_request_free(MPI_Request * request) xbt_free(*request); *request = MPI_REQUEST_NULL; }else{ - print_request("Decrementing", (*request)); + print_request("Decrementing", (*request)); } }else{ - xbt_die("freeing an already free request"); + xbt_die("freeing an already free request"); } } @@ -722,16 +649,15 @@ static void finish_wait(MPI_Request * request, MPI_Status * status) if (TRACE_smpi_view_internals() && ((req->flags & RECV) != 0)){ int rank = smpi_process_index(); int src_traced = (req->src == MPI_ANY_SOURCE ? req->real_src : req->src); - TRACE_smpi_recv(rank, src_traced, rank); + TRACE_smpi_recv(rank, src_traced, rank,req->tag); } if(req->detached_sender != nullptr){ - //integrate pseudo-timing for buffering of small messages, do not bother to execute the simcall if 0 double sleeptime = smpi_or(req->real_size); if(sleeptime > 0.0){ - simcall_process_sleep(sleeptime); - XBT_DEBUG("receiving size of %zu : sleep %f ", req->real_size, sleeptime); + simcall_process_sleep(sleeptime); + XBT_DEBUG("receiving size of %zu : sleep %f ", req->real_size, sleeptime); } smpi_mpi_request_free(&(req->detached_sender)); } @@ -764,7 +690,7 @@ int smpi_mpi_test(MPI_Request * request, MPI_Status * status) { nsleeps=1;//reset the number of sleeps we will do next time if (*request != MPI_REQUEST_NULL && ((*request)->flags & PERSISTENT)==0) *request = MPI_REQUEST_NULL; - }else{ + } else if (xbt_cfg_get_boolean("smpi/grow-injected-times")){ nsleeps++; } } @@ -773,16 +699,18 @@ int smpi_mpi_test(MPI_Request * request, MPI_Status * status) { int smpi_mpi_testany(int count, MPI_Request requests[], int *index, MPI_Status * status) { - xbt_dynar_t comms; + std::vector comms; + comms.reserve(count); + int i; int flag = 0; *index = MPI_UNDEFINED; - comms = xbt_dynar_new(sizeof(smx_synchro_t), nullptr); + std::vector map; /** Maps all matching comms back to their location in requests **/ for(i = 0; i < count; i++) { if ((requests[i] != MPI_REQUEST_NULL) && requests[i]->action && !(requests[i]->flags & PREPARED)) { - xbt_dynar_push(comms, &requests[i]->action); + comms.push_back(requests[i]->action); map.push_back(i); } } @@ -792,7 +720,7 @@ int smpi_mpi_testany(int count, MPI_Request requests[], int *index, MPI_Status * if(smpi_test_sleep > 0) simcall_process_sleep(nsleeps*smpi_test_sleep); - i = simcall_comm_testany(comms); // The i-th element in comms matches! + i = simcall_comm_testany(comms.data(), comms.size()); // The i-th element in comms matches! if (i != -1) { // -1 is not MPI_UNDEFINED but a SIMIX return code. (nothing matches) *index = map[i]; finish_wait(&requests[*index], status); @@ -809,7 +737,6 @@ int smpi_mpi_testany(int count, MPI_Request requests[], int *index, MPI_Status * flag = 1; smpi_empty_status(status); } - xbt_dynar_free(&comms); return flag; } @@ -819,8 +746,7 @@ int smpi_mpi_testall(int count, MPI_Request requests[], MPI_Status status[]) MPI_Status stat; MPI_Status *pstat = status == MPI_STATUSES_IGNORE ? MPI_STATUS_IGNORE : &stat; int flag=1; - int i; - for(i=0; iflags & PREPARED)) { if (smpi_mpi_test(&requests[i], pstat)!=1){ flag=0; @@ -848,16 +774,20 @@ void smpi_mpi_probe(int source, int tag, MPI_Comm comm, MPI_Status* status){ } void smpi_mpi_iprobe(int source, int tag, MPI_Comm comm, int* flag, MPI_Status* status){ - MPI_Request request = build_request(nullptr, 0, MPI_CHAR, source == MPI_ANY_SOURCE ? MPI_ANY_SOURCE : smpi_group_index(smpi_comm_group(comm), source), smpi_comm_rank(comm), tag, comm, PERSISTENT | RECV); // to avoid deadlock, we have to sleep some time here, or the timer won't advance and we will only do iprobe simcalls // (especially when used as a break condition, such as while(MPI_Iprobe(...)) ... ) - // multiplier to the sleeptime, to increase speed of execution, each failed iprobe will increase it + // nsleeps is a multiplier to the sleeptime, to increase speed of execution, each failed iprobe will increase it + // (This can speed up the execution of certain applications by an order of magnitude, such as HPL) static int nsleeps = 1; - if(smpi_iprobe_sleep > 0) - simcall_process_sleep(nsleeps*smpi_iprobe_sleep); + double speed = simgrid::s4u::Actor::self()->host()->speed(); + double maxrate = xbt_cfg_get_double("smpi/iprobe-cpu-usage"); + if (smpi_iprobe_sleep > 0) { + smx_activity_t iprobe_sleep = simcall_execution_start("iprobe", /* flops to executek*/nsleeps*smpi_iprobe_sleep*speed*maxrate, /* priority */1.0, /* performance bound */maxrate*speed); + simcall_execution_wait(iprobe_sleep); + } // behave like a receive, but don't do it smx_mailbox_t mailbox; @@ -866,18 +796,20 @@ void smpi_mpi_iprobe(int source, int tag, MPI_Comm comm, int* flag, MPI_Status* if (xbt_cfg_get_int("smpi/async-small-thresh") > 0){ mailbox = smpi_process_mailbox_small(); XBT_DEBUG("Trying to probe the perm recv mailbox"); - request->action = simcall_comm_iprobe(mailbox, 0, request->src, request->tag, &match_recv, static_cast(request)); + request->action = simcall_comm_iprobe(mailbox, 0, request->src, request->tag, &match_recv, + static_cast(request)); } if (request->action == nullptr){ mailbox = smpi_process_mailbox(); XBT_DEBUG("trying to probe the other mailbox"); - request->action = simcall_comm_iprobe(mailbox, 0, request->src,request->tag, &match_recv, static_cast(request)); + request->action = simcall_comm_iprobe(mailbox, 0, request->src,request->tag, &match_recv, + static_cast(request)); } if (request->action != nullptr){ - simgrid::simix::Comm *sync_comm = static_cast(request->action); - MPI_Request req = static_cast(sync_comm->src_data); + simgrid::kernel::activity::Comm *sync_comm = static_cast(request->action); + MPI_Request req = static_cast(sync_comm->src_data); *flag = 1; if(status != MPI_STATUS_IGNORE && (req->flags & PREPARED) == 0) { status->MPI_SOURCE = smpi_group_rank(smpi_comm_group(comm), req->src); @@ -889,11 +821,10 @@ void smpi_mpi_iprobe(int source, int tag, MPI_Comm comm, int* flag, MPI_Status* } else { *flag = 0; - nsleeps++; + if (xbt_cfg_get_boolean("smpi/grow-injected-times")) + nsleeps++; } smpi_mpi_request_free(&request); - - return; } void smpi_mpi_wait(MPI_Request * request, MPI_Status * status) @@ -910,12 +841,17 @@ void smpi_mpi_wait(MPI_Request * request, MPI_Status * status) finish_wait(request, status); if (*request != MPI_REQUEST_NULL && (((*request)->flags & NON_PERSISTENT)!=0)) - *request = MPI_REQUEST_NULL; + *request = MPI_REQUEST_NULL; +} + +static int sort_accumulates(MPI_Request a, MPI_Request b) +{ + return (a->tag < b->tag); } int smpi_mpi_waitany(int count, MPI_Request requests[], MPI_Status * status) { - xbt_dynar_t comms; + s_xbt_dynar_t comms; // Keep it on stack to save some extra mallocs int i; int size = 0; int index = MPI_UNDEFINED; @@ -923,40 +859,47 @@ int smpi_mpi_waitany(int count, MPI_Request requests[], MPI_Status * status) if(count > 0) { // Wait for a request to complete - comms = xbt_dynar_new(sizeof(smx_synchro_t), nullptr); + xbt_dynar_init(&comms, sizeof(smx_activity_t), nullptr); map = xbt_new(int, count); XBT_DEBUG("Wait for one of %d", count); for(i = 0; i < count; i++) { if (requests[i] != MPI_REQUEST_NULL && !(requests[i]->flags & PREPARED) && !(requests[i]->flags & FINISHED)) { if (requests[i]->action != nullptr) { XBT_DEBUG("Waiting any %p ", requests[i]); - xbt_dynar_push(comms, &requests[i]->action); + xbt_dynar_push(&comms, &requests[i]->action); map[size] = i; size++; - }else{ - //This is a finished detached request, let's return this one - size=0;//so we free the dynar but don't do the waitany call - index=i; - finish_wait(&requests[i], status);//cleanup if refcount = 0 - if (requests[i] != MPI_REQUEST_NULL && (requests[i]->flags & NON_PERSISTENT)) - requests[i]=MPI_REQUEST_NULL;//set to null - break; - } + } else { + // This is a finished detached request, let's return this one + size = 0; // so we free the dynar but don't do the waitany call + index = i; + finish_wait(&requests[i], status); // cleanup if refcount = 0 + if (requests[i] != MPI_REQUEST_NULL && (requests[i]->flags & NON_PERSISTENT)) + requests[i] = MPI_REQUEST_NULL; // set to null + break; + } } } if(size > 0) { - i = simcall_comm_waitany(comms); + i = simcall_comm_waitany(&comms, -1); // not MPI_UNDEFINED, as this is a simix return code if (i != -1) { index = map[i]; - finish_wait(&requests[index], status); - if (requests[i] != MPI_REQUEST_NULL && (requests[i]->flags & NON_PERSISTENT)) - requests[index] = MPI_REQUEST_NULL; + //in case of an accumulate, we have to wait the end of all requests to apply the operation, ordered correctly. + if ((requests[index] == MPI_REQUEST_NULL) + || (!((requests[index]->flags & ACCUMULATE) && (requests[index]->flags & RECV)))){ + finish_wait(&requests[index], status); + if (requests[i] != MPI_REQUEST_NULL && (requests[i]->flags & NON_PERSISTENT)) + requests[index] = MPI_REQUEST_NULL; + }else{ + XBT_WARN("huu?"); + } } } + + xbt_dynar_free_data(&comms); xbt_free(map); - xbt_dynar_free(&comms); } if (index==MPI_UNDEFINED) @@ -967,13 +910,14 @@ int smpi_mpi_waitany(int count, MPI_Request requests[], MPI_Status * status) int smpi_mpi_waitall(int count, MPI_Request requests[], MPI_Status status[]) { - int index, c; + std::vector accumulates; + int index; MPI_Status stat; MPI_Status *pstat = status == MPI_STATUSES_IGNORE ? MPI_STATUS_IGNORE : &stat; int retvalue = MPI_SUCCESS; //tag invalid requests in the set if (status != MPI_STATUSES_IGNORE) { - for (c = 0; c < count; c++) { + for (int c = 0; c < count; c++) { if (requests[c] == MPI_REQUEST_NULL || requests[c]->dst == MPI_PROC_NULL || (requests[c]->flags & PREPARED)) { smpi_empty_status(&status[c]); } else if (requests[c]->src == MPI_PROC_NULL) { @@ -982,8 +926,7 @@ int smpi_mpi_waitall(int count, MPI_Request requests[], MPI_Status status[]) } } } - for(c = 0; c < count; c++) { - + for (int c = 0; c < count; c++) { if (MC_is_active() || MC_record_replay_is_active()) { smpi_mpi_wait(&requests[c], pstat); index = c; @@ -991,8 +934,13 @@ int smpi_mpi_waitall(int count, MPI_Request requests[], MPI_Status status[]) index = smpi_mpi_waitany(count, requests, pstat); if (index == MPI_UNDEFINED) break; + + if (requests[index] != MPI_REQUEST_NULL + && (requests[index]->flags & RECV) + && (requests[index]->flags & ACCUMULATE)) + accumulates.push_back(requests[index]); if (requests[index] != MPI_REQUEST_NULL && (requests[index]->flags & NON_PERSISTENT)) - requests[index]=MPI_REQUEST_NULL; + requests[index] = MPI_REQUEST_NULL; } if (status != MPI_STATUSES_IGNORE) { status[index] = *pstat; @@ -1001,6 +949,13 @@ int smpi_mpi_waitall(int count, MPI_Request requests[], MPI_Status status[]) } } + if (!accumulates.empty()) { + std::sort(accumulates.begin(), accumulates.end(), sort_accumulates); + for (auto req : accumulates) { + finish_wait(&req, status); + } + } + return retvalue; } @@ -1060,35 +1015,35 @@ int smpi_mpi_testsome(int incount, MPI_Request requests[], int *indices, MPI_Sta void smpi_mpi_bcast(void *buf, int count, MPI_Datatype datatype, int root, MPI_Comm comm) { - smpi_coll_tuned_bcast_binomial_tree(buf, count, datatype, root, comm); + smpi_coll_tuned_bcast_binomial_tree(buf, count, datatype, root, comm); } void smpi_mpi_barrier(MPI_Comm comm) { - smpi_coll_tuned_barrier_ompi_basic_linear(comm); + smpi_coll_tuned_barrier_ompi_basic_linear(comm); } void smpi_mpi_gather(void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPI_Comm comm) { int system_tag = COLL_TAG_GATHER; - int rank, size, src, index; - MPI_Aint lb = 0, recvext = 0; - MPI_Request *requests; + MPI_Aint lb = 0; + MPI_Aint recvext = 0; - rank = smpi_comm_rank(comm); - size = smpi_comm_size(comm); + int rank = smpi_comm_rank(comm); + int size = smpi_comm_size(comm); if(rank != root) { // Send buffer to root smpi_mpi_send(sendbuf, sendcount, sendtype, root, system_tag, comm); } else { smpi_datatype_extent(recvtype, &lb, &recvext); // Local copy from root - smpi_datatype_copy(sendbuf, sendcount, sendtype, static_cast(recvbuf) + root * recvcount * recvext, recvcount, recvtype); + smpi_datatype_copy(sendbuf, sendcount, sendtype, static_cast(recvbuf) + root * recvcount * recvext, + recvcount, recvtype); // Receive buffers from senders - requests = xbt_new(MPI_Request, size - 1); - index = 0; - for(src = 0; src < size; src++) { + MPI_Request *requests = xbt_new(MPI_Request, size - 1); + int index = 0; + for (int src = 0; src < size; src++) { if(src != root) { requests[index] = smpi_irecv_init(static_cast(recvbuf) + src * recvcount * recvext, recvcount, recvtype, src, system_tag, comm); @@ -1098,7 +1053,7 @@ void smpi_mpi_gather(void *sendbuf, int sendcount, MPI_Datatype sendtype, // Wait for completion of irecv's. smpi_mpi_startall(size - 1, requests); smpi_mpi_waitall(size - 1, requests, MPI_STATUS_IGNORE); - for(src = 0; src < size-1; src++) { + for (int src = 0; src < size-1; src++) { smpi_mpi_request_free(&requests[src]); } xbt_free(requests); @@ -1108,38 +1063,34 @@ void smpi_mpi_gather(void *sendbuf, int sendcount, MPI_Datatype sendtype, void smpi_mpi_reduce_scatter(void *sendbuf, void *recvbuf, int *recvcounts, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) { - int i, size, count; - int *displs; - int rank = smpi_comm_rank(comm); - void *tmpbuf; - - /* arbitrarily choose root as rank 0 */ - size = smpi_comm_size(comm); - count = 0; - displs = xbt_new(int, size); - for (i = 0; i < size; i++) { - displs[i] = count; - count += recvcounts[i]; - } - tmpbuf=static_cast(smpi_get_tmp_sendbuffer(count*smpi_datatype_get_extent(datatype))); + int rank = smpi_comm_rank(comm); + + /* arbitrarily choose root as rank 0 */ + int size = smpi_comm_size(comm); + int count = 0; + int *displs = xbt_new(int, size); + for (int i = 0; i < size; i++) { + displs[i] = count; + count += recvcounts[i]; + } + void *tmpbuf = static_cast(smpi_get_tmp_sendbuffer(count*smpi_datatype_get_extent(datatype))); - mpi_coll_reduce_fun(sendbuf, tmpbuf, count, datatype, op, 0, comm); - smpi_mpi_scatterv(tmpbuf, recvcounts, displs, datatype, recvbuf, recvcounts[rank], datatype, 0, comm); - xbt_free(displs); - smpi_free_tmp_buffer(tmpbuf); + mpi_coll_reduce_fun(sendbuf, tmpbuf, count, datatype, op, 0, comm); + smpi_mpi_scatterv(tmpbuf, recvcounts, displs, datatype, recvbuf, recvcounts[rank], datatype, 0, comm); + xbt_free(displs); + smpi_free_tmp_buffer(tmpbuf); } void smpi_mpi_gatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int *recvcounts, int *displs, MPI_Datatype recvtype, int root, MPI_Comm comm) { int system_tag = COLL_TAG_GATHERV; - int rank, size, src, index; - MPI_Aint lb = 0, recvext = 0; - MPI_Request *requests; + MPI_Aint lb = 0; + MPI_Aint recvext = 0; - rank = smpi_comm_rank(comm); - size = smpi_comm_size(comm); - if(rank != root) { + int rank = smpi_comm_rank(comm); + int size = smpi_comm_size(comm); + if (rank != root) { // Send buffer to root smpi_mpi_send(sendbuf, sendcount, sendtype, root, system_tag, comm); } else { @@ -1148,9 +1099,9 @@ void smpi_mpi_gatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype, void smpi_datatype_copy(sendbuf, sendcount, sendtype, static_cast(recvbuf) + displs[root] * recvext, recvcounts[root], recvtype); // Receive buffers from senders - requests = xbt_new(MPI_Request, size - 1); - index = 0; - for(src = 0; src < size; src++) { + MPI_Request *requests = xbt_new(MPI_Request, size - 1); + int index = 0; + for (int src = 0; src < size; src++) { if(src != root) { requests[index] = smpi_irecv_init(static_cast(recvbuf) + displs[src] * recvext, recvcounts[src], recvtype, src, system_tag, comm); @@ -1160,7 +1111,7 @@ void smpi_mpi_gatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype, void // Wait for completion of irecv's. smpi_mpi_startall(size - 1, requests); smpi_mpi_waitall(size - 1, requests, MPI_STATUS_IGNORE); - for(src = 0; src < size-1; src++) { + for (int src = 0; src < size-1; src++) { smpi_mpi_request_free(&requests[src]); } xbt_free(requests); @@ -1171,32 +1122,33 @@ void smpi_mpi_allgather(void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf,int recvcount, MPI_Datatype recvtype, MPI_Comm comm) { int system_tag = COLL_TAG_ALLGATHER; - int rank, size, other, index; - MPI_Aint lb = 0, recvext = 0; + MPI_Aint lb = 0; + MPI_Aint recvext = 0; MPI_Request *requests; - rank = smpi_comm_rank(comm); - size = smpi_comm_size(comm); + int rank = smpi_comm_rank(comm); + int size = smpi_comm_size(comm); // FIXME: check for errors smpi_datatype_extent(recvtype, &lb, &recvext); // Local copy from self - smpi_datatype_copy(sendbuf, sendcount, sendtype, static_cast(recvbuf) + rank * recvcount * recvext, recvcount, recvtype); + smpi_datatype_copy(sendbuf, sendcount, sendtype, static_cast(recvbuf) + rank * recvcount * recvext, recvcount, + recvtype); // Send/Recv buffers to/from others; requests = xbt_new(MPI_Request, 2 * (size - 1)); - index = 0; - for(other = 0; other < size; other++) { + int index = 0; + for (int other = 0; other < size; other++) { if(other != rank) { requests[index] = smpi_isend_init(sendbuf, sendcount, sendtype, other, system_tag,comm); index++; - requests[index] = smpi_irecv_init(static_cast(recvbuf) + other * recvcount * recvext, recvcount, recvtype, other, - system_tag, comm); + requests[index] = smpi_irecv_init(static_cast(recvbuf) + other * recvcount * recvext, recvcount, recvtype, + other, system_tag, comm); index++; } } // Wait for completion of all comms. smpi_mpi_startall(2 * (size - 1), requests); smpi_mpi_waitall(2 * (size - 1), requests, MPI_STATUS_IGNORE); - for(other = 0; other < 2*(size-1); other++) { + for (int other = 0; other < 2*(size-1); other++) { smpi_mpi_request_free(&requests[other]); } xbt_free(requests); @@ -1206,19 +1158,19 @@ void smpi_mpi_allgatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype, vo int *recvcounts, int *displs, MPI_Datatype recvtype, MPI_Comm comm) { int system_tag = COLL_TAG_ALLGATHERV; - int rank, size, other, index; - MPI_Aint lb = 0, recvext = 0; - MPI_Request *requests; + MPI_Aint lb = 0; + MPI_Aint recvext = 0; - rank = smpi_comm_rank(comm); - size = smpi_comm_size(comm); + int rank = smpi_comm_rank(comm); + int size = smpi_comm_size(comm); smpi_datatype_extent(recvtype, &lb, &recvext); // Local copy from self - smpi_datatype_copy(sendbuf, sendcount, sendtype, static_cast(recvbuf) + displs[rank] * recvext,recvcounts[rank], recvtype); + smpi_datatype_copy(sendbuf, sendcount, sendtype, + static_cast(recvbuf) + displs[rank] * recvext,recvcounts[rank], recvtype); // Send buffers to others; - requests = xbt_new(MPI_Request, 2 * (size - 1)); - index = 0; - for(other = 0; other < size; other++) { + MPI_Request *requests = xbt_new(MPI_Request, 2 * (size - 1)); + int index = 0; + for (int other = 0; other < size; other++) { if(other != rank) { requests[index] = smpi_isend_init(sendbuf, sendcount, sendtype, other, system_tag, comm); @@ -1231,7 +1183,7 @@ void smpi_mpi_allgatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype, vo // Wait for completion of all comms. smpi_mpi_startall(2 * (size - 1), requests); smpi_mpi_waitall(2 * (size - 1), requests, MPI_STATUS_IGNORE); - for(other = 0; other < 2*(size-1); other++) { + for (int other = 0; other < 2*(size-1); other++) { smpi_mpi_request_free(&requests[other]); } xbt_free(requests); @@ -1241,12 +1193,12 @@ void smpi_mpi_scatter(void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPI_Comm comm) { int system_tag = COLL_TAG_SCATTER; - int rank, size, dst, index; - MPI_Aint lb = 0, sendext = 0; + MPI_Aint lb = 0; + MPI_Aint sendext = 0; MPI_Request *requests; - rank = smpi_comm_rank(comm); - size = smpi_comm_size(comm); + int rank = smpi_comm_rank(comm); + int size = smpi_comm_size(comm); if(rank != root) { // Recv buffer from root smpi_mpi_recv(recvbuf, recvcount, recvtype, root, system_tag, comm, MPI_STATUS_IGNORE); @@ -1259,18 +1211,18 @@ void smpi_mpi_scatter(void *sendbuf, int sendcount, MPI_Datatype sendtype, } // Send buffers to receivers requests = xbt_new(MPI_Request, size - 1); - index = 0; - for(dst = 0; dst < size; dst++) { + int index = 0; + for(int dst = 0; dst < size; dst++) { if(dst != root) { - requests[index] = smpi_isend_init(static_cast(sendbuf) + dst * sendcount * sendext, sendcount, sendtype, dst, - system_tag, comm); + requests[index] = smpi_isend_init(static_cast(sendbuf) + dst * sendcount * sendext, sendcount, sendtype, + dst, system_tag, comm); index++; } } // Wait for completion of isend's. smpi_mpi_startall(size - 1, requests); smpi_mpi_waitall(size - 1, requests, MPI_STATUS_IGNORE); - for(dst = 0; dst < size-1; dst++) { + for (int dst = 0; dst < size-1; dst++) { smpi_mpi_request_free(&requests[dst]); } xbt_free(requests); @@ -1281,12 +1233,11 @@ void smpi_mpi_scatterv(void *sendbuf, int *sendcounts, int *displs, MPI_Datatype MPI_Datatype recvtype, int root, MPI_Comm comm) { int system_tag = COLL_TAG_SCATTERV; - int rank, size, dst, index; - MPI_Aint lb = 0, sendext = 0; - MPI_Request *requests; + MPI_Aint lb = 0; + MPI_Aint sendext = 0; - rank = smpi_comm_rank(comm); - size = smpi_comm_size(comm); + int rank = smpi_comm_rank(comm); + int size = smpi_comm_size(comm); if(rank != root) { // Recv buffer from root smpi_mpi_recv(recvbuf, recvcount, recvtype, root, system_tag, comm, MPI_STATUS_IGNORE); @@ -1298,10 +1249,10 @@ void smpi_mpi_scatterv(void *sendbuf, int *sendcounts, int *displs, MPI_Datatype sendtype, recvbuf, recvcount, recvtype); } // Send buffers to receivers - requests = xbt_new(MPI_Request, size - 1); - index = 0; - for(dst = 0; dst < size; dst++) { - if(dst != root) { + MPI_Request *requests = xbt_new(MPI_Request, size - 1); + int index = 0; + for (int dst = 0; dst < size; dst++) { + if (dst != root) { requests[index] = smpi_isend_init(static_cast(sendbuf) + displs[dst] * sendext, sendcounts[dst], sendtype, dst, system_tag, comm); index++; @@ -1310,7 +1261,7 @@ void smpi_mpi_scatterv(void *sendbuf, int *sendcounts, int *displs, MPI_Datatype // Wait for completion of isend's. smpi_mpi_startall(size - 1, requests); smpi_mpi_waitall(size - 1, requests, MPI_STATUS_IGNORE); - for(dst = 0; dst < size-1; dst++) { + for (int dst = 0; dst < size-1; dst++) { smpi_mpi_request_free(&requests[dst]); } xbt_free(requests); @@ -1321,16 +1272,13 @@ void smpi_mpi_reduce(void *sendbuf, void *recvbuf, int count, MPI_Datatype datat MPI_Comm comm) { int system_tag = COLL_TAG_REDUCE; - int rank, size, src, index; - MPI_Aint lb = 0, dataext = 0; - MPI_Request *requests; - void **tmpbufs; + MPI_Aint lb = 0; + MPI_Aint dataext = 0; char* sendtmpbuf = static_cast(sendbuf); - - rank = smpi_comm_rank(comm); - size = smpi_comm_size(comm); + int rank = smpi_comm_rank(comm); + int size = smpi_comm_size(comm); //non commutative case, use a working algo from openmpi if(!smpi_op_is_commute(op)){ smpi_coll_tuned_reduce_ompi_basic_linear(sendtmpbuf, recvbuf, count, datatype, op, root, comm); @@ -1351,11 +1299,11 @@ void smpi_mpi_reduce(void *sendbuf, void *recvbuf, int count, MPI_Datatype datat if (sendtmpbuf != nullptr && recvbuf != nullptr) smpi_datatype_copy(sendtmpbuf, count, datatype, recvbuf, count, datatype); // Receive buffers from senders - requests = xbt_new(MPI_Request, size - 1); - tmpbufs = xbt_new(void *, size - 1); - index = 0; - for(src = 0; src < size; src++) { - if(src != root) { + MPI_Request *requests = xbt_new(MPI_Request, size - 1); + void **tmpbufs = xbt_new(void *, size - 1); + int index = 0; + for (int src = 0; src < size; src++) { + if (src != root) { if (!smpi_process_get_replaying()) tmpbufs[index] = xbt_malloc(count * dataext); else @@ -1367,7 +1315,7 @@ void smpi_mpi_reduce(void *sendbuf, void *recvbuf, int count, MPI_Datatype datat } // Wait for completion of irecv's. smpi_mpi_startall(size - 1, requests); - for(src = 0; src < size - 1; src++) { + for (int src = 0; src < size - 1; src++) { index = smpi_mpi_waitany(size - 1, requests, MPI_STATUS_IGNORE); XBT_DEBUG("finished waiting any request with index %d", index); if(index == MPI_UNDEFINED) { @@ -1399,13 +1347,11 @@ void smpi_mpi_allreduce(void *sendbuf, void *recvbuf, int count, MPI_Datatype da void smpi_mpi_scan(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) { int system_tag = -888; - int rank, size, other, index; - MPI_Aint lb = 0, dataext = 0; - MPI_Request *requests; - void **tmpbufs; + MPI_Aint lb = 0; + MPI_Aint dataext = 0; - rank = smpi_comm_rank(comm); - size = smpi_comm_size(comm); + int rank = smpi_comm_rank(comm); + int size = smpi_comm_size(comm); smpi_datatype_extent(datatype, &lb, &dataext); @@ -1413,15 +1359,15 @@ void smpi_mpi_scan(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatyp smpi_datatype_copy(sendbuf, count, datatype, recvbuf, count, datatype); // Send/Recv buffers to/from others; - requests = xbt_new(MPI_Request, size - 1); - tmpbufs = xbt_new(void *, rank); - index = 0; - for(other = 0; other < rank; other++) { + MPI_Request *requests = xbt_new(MPI_Request, size - 1); + void **tmpbufs = xbt_new(void *, rank); + int index = 0; + for (int other = 0; other < rank; other++) { tmpbufs[index] = smpi_get_tmp_sendbuffer(count * dataext); requests[index] = smpi_irecv_init(tmpbufs[index], count, datatype, other, system_tag, comm); index++; } - for(other = rank + 1; other < size; other++) { + for (int other = rank + 1; other < size; other++) { requests[index] = smpi_isend_init(sendbuf, count, datatype, other, system_tag, comm); index++; } @@ -1429,7 +1375,7 @@ void smpi_mpi_scan(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatyp smpi_mpi_startall(size - 1, requests); if(smpi_op_is_commute(op)){ - for(other = 0; other < size - 1; other++) { + for (int other = 0; other < size - 1; other++) { index = smpi_mpi_waitany(size - 1, requests, MPI_STATUS_IGNORE); if(index == MPI_UNDEFINED) { break; @@ -1441,7 +1387,7 @@ void smpi_mpi_scan(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatyp } }else{ //non commutative case, wait in order - for(other = 0; other < size - 1; other++) { + for (int other = 0; other < size - 1; other++) { smpi_mpi_wait(&(requests[other]), MPI_STATUS_IGNORE); if(index < rank) { smpi_op_apply(op, tmpbufs[other], recvbuf, &count, &datatype); @@ -1461,35 +1407,32 @@ void smpi_mpi_scan(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatyp void smpi_mpi_exscan(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) { int system_tag = -888; - int rank, size, other, index; - MPI_Aint lb = 0, dataext = 0; - MPI_Request *requests; - void **tmpbufs; + MPI_Aint lb = 0; + MPI_Aint dataext = 0; int recvbuf_is_empty=1; - rank = smpi_comm_rank(comm); - size = smpi_comm_size(comm); + int rank = smpi_comm_rank(comm); + int size = smpi_comm_size(comm); smpi_datatype_extent(datatype, &lb, &dataext); // Send/Recv buffers to/from others; - requests = xbt_new(MPI_Request, size - 1); - tmpbufs = xbt_new(void *, rank); - index = 0; - for(other = 0; other < rank; other++) { + MPI_Request *requests = xbt_new(MPI_Request, size - 1); + void **tmpbufs = xbt_new(void *, rank); + int index = 0; + for (int other = 0; other < rank; other++) { tmpbufs[index] = smpi_get_tmp_sendbuffer(count * dataext); - requests[index] = - smpi_irecv_init(tmpbufs[index], count, datatype, other, system_tag, comm); + requests[index] = smpi_irecv_init(tmpbufs[index], count, datatype, other, system_tag, comm); index++; } - for(other = rank + 1; other < size; other++) { - requests[index] = - smpi_isend_init(sendbuf, count, datatype, other, system_tag, comm); + for (int other = rank + 1; other < size; other++) { + requests[index] = smpi_isend_init(sendbuf, count, datatype, other, system_tag, comm); index++; } // Wait for completion of all comms. smpi_mpi_startall(size - 1, requests); + if(smpi_op_is_commute(op)){ - for(other = 0; other < size - 1; other++) { + for (int other = 0; other < size - 1; other++) { index = smpi_mpi_waitany(size - 1, requests, MPI_STATUS_IGNORE); if(index == MPI_UNDEFINED) { break; @@ -1498,20 +1441,21 @@ void smpi_mpi_exscan(void *sendbuf, void *recvbuf, int count, MPI_Datatype datat if(recvbuf_is_empty){ smpi_datatype_copy(tmpbufs[index], count, datatype, recvbuf, count, datatype); recvbuf_is_empty=0; - }else - // #Request is below rank: it's a irecv - smpi_op_apply(op, tmpbufs[index], recvbuf, &count, &datatype); + } else + // #Request is below rank: it's a irecv + smpi_op_apply(op, tmpbufs[index], recvbuf, &count, &datatype); } } }else{ //non commutative case, wait in order - for(other = 0; other < size - 1; other++) { + for (int other = 0; other < size - 1; other++) { smpi_mpi_wait(&(requests[other]), MPI_STATUS_IGNORE); if(index < rank) { - if(recvbuf_is_empty){ - smpi_datatype_copy(tmpbufs[other], count, datatype, recvbuf, count, datatype); - recvbuf_is_empty=0; - }else smpi_op_apply(op, tmpbufs[other], recvbuf, &count, &datatype); + if (recvbuf_is_empty) { + smpi_datatype_copy(tmpbufs[other], count, datatype, recvbuf, count, datatype); + recvbuf_is_empty = 0; + } else + smpi_op_apply(op, tmpbufs[other], recvbuf, &count, &datatype); } } }