From: Arnaud Giersch Date: Wed, 13 Jun 2018 13:48:33 +0000 (+0200) Subject: Merge branch 'master' of ssh://scm.gforge.inria.fr/gitroot/simgrid/simgrid X-Git-Tag: v3.20~108^2 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/0e1d91113222f171af1130c8881c72b19de77869?hp=e40fee8bdae77532f3cc572fe1ba01a1acebc3c7 Merge branch 'master' of ssh://scm.gforge.inria.fr/gitroot/simgrid/simgrid --- diff --git a/examples/smpi/trace/trace.tesh b/examples/smpi/trace/trace.tesh index bbd5580e39..33df360104 100644 --- a/examples/smpi/trace/trace.tesh +++ b/examples/smpi/trace/trace.tesh @@ -136,7 +136,7 @@ $ tail -n +3 ${bindir:=.}/smpi_trace.trace > 12 0.000000 2 3 6 > 13 0.000000 2 3 > 12 0.000000 2 3 8 -> 5 9 2 PMPI_Isend "0 0 1" +> 5 9 2 PMPI_Isend "0.52 0.52 1" > 5 10 2 PMPI_Wait "1 1 0" > 13 0.000000 2 1 > 12 0.000000 2 1 9 @@ -146,10 +146,10 @@ $ tail -n +3 ${bindir:=.}/smpi_trace.trace > 5 11 2 PMPI_Recv "1 0 0" > 5 12 2 PMPI_Barrier "0 0.78 0.78" > 5 13 2 PMPI_Send "0 0 1" -> 5 14 2 PMPI_Irecv "1 0 0" -> 5 15 2 PMPI_Waitany "1 1 0" -> 5 16 2 PMPI_Waitall "1 1 0" -> 5 17 2 test +> 5 14 2 PMPI_Irecv "1 0.52 0.52" +> 5 15 2 PMPI_Waitany "0.78 0.78 0.58" +> 5 16 2 PMPI_Waitall "0.78 0.78 0" +> 5 17 2 PMPI_Test "0.52 0.52 0" > 5 18 2 PMPI_Finalize "0 1 0" > 13 1.000000 2 2 > 12 1.000000 2 2 11 diff --git a/src/instr/instr_smpi.hpp b/src/instr/instr_smpi.hpp index 01a46afbd3..e6a72b348d 100644 --- a/src/instr/instr_smpi.hpp +++ b/src/instr/instr_smpi.hpp @@ -22,8 +22,6 @@ XBT_PRIVATE void TRACE_smpi_computing_in(int rank, double amount); XBT_PRIVATE void TRACE_smpi_sleeping_init(int rank); XBT_PRIVATE void TRACE_smpi_sleeping_out(int rank); XBT_PRIVATE void TRACE_smpi_sleeping_in(int rank, double duration); -XBT_PRIVATE void TRACE_smpi_testing_out(int rank); -XBT_PRIVATE void TRACE_smpi_testing_in(int rank); XBT_PRIVATE void TRACE_smpi_release(); XBT_PRIVATE void TRACE_smpi_comm_in(int rank, const char* operation, simgrid::instr::TIData* extra); XBT_PRIVATE void TRACE_smpi_comm_out(int rank); diff --git a/src/smpi/bindings/smpi_pmpi_request.cpp b/src/smpi/bindings/smpi_pmpi_request.cpp index b2192d9055..e1a2e34bce 100644 --- a/src/smpi/bindings/smpi_pmpi_request.cpp +++ b/src/smpi/bindings/smpi_pmpi_request.cpp @@ -522,11 +522,11 @@ int PMPI_Test(MPI_Request * request, int *flag, MPI_Status * status) } else { int my_proc_id = ((*request)->comm() != MPI_COMM_NULL) ? simgrid::s4u::this_actor::get_pid() : -1; - TRACE_smpi_testing_in(my_proc_id); - + TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("test")); + *flag = simgrid::smpi::Request::test(request,status); - TRACE_smpi_testing_out(my_proc_id); + TRACE_smpi_comm_out(my_proc_id); retval = MPI_SUCCESS; } smpi_bench_begin(); @@ -541,7 +541,10 @@ int PMPI_Testany(int count, MPI_Request requests[], int *index, int *flag, MPI_S if (index == nullptr || flag == nullptr) { retval = MPI_ERR_ARG; } else { + int my_proc_id = simgrid::s4u::this_actor::get_pid(); + TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("testany")); *flag = simgrid::smpi::Request::testany(count, requests, index, status); + TRACE_smpi_comm_out(my_proc_id); retval = MPI_SUCCESS; } smpi_bench_begin(); @@ -556,13 +559,34 @@ int PMPI_Testall(int count, MPI_Request* requests, int* flag, MPI_Status* status if (flag == nullptr) { retval = MPI_ERR_ARG; } else { + int my_proc_id = simgrid::s4u::this_actor::get_pid(); + TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("testall")); *flag = simgrid::smpi::Request::testall(count, requests, statuses); + TRACE_smpi_comm_out(my_proc_id); retval = MPI_SUCCESS; } smpi_bench_begin(); return retval; } +int PMPI_Testsome(int incount, MPI_Request requests[], int* outcount, int* indices, MPI_Status status[]) +{ + int retval = 0; + + smpi_bench_end(); + if (outcount == nullptr) { + retval = MPI_ERR_ARG; + } else { + int my_proc_id = simgrid::s4u::this_actor::get_pid(); + TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("testsome")); + *outcount = simgrid::smpi::Request::testsome(incount, requests, indices, status); + TRACE_smpi_comm_out(my_proc_id); + retval = MPI_SUCCESS; + } + smpi_bench_begin(); + return retval; +} + int PMPI_Probe(int source, int tag, MPI_Comm comm, MPI_Status* status) { int retval = 0; smpi_bench_end(); @@ -744,21 +768,6 @@ int PMPI_Waitsome(int incount, MPI_Request requests[], int *outcount, int *indic return retval; } -int PMPI_Testsome(int incount, MPI_Request requests[], int* outcount, int* indices, MPI_Status status[]) -{ - int retval = 0; - - smpi_bench_end(); - if (outcount == nullptr) { - retval = MPI_ERR_ARG; - } else { - *outcount = simgrid::smpi::Request::testsome(incount, requests, indices, status); - retval = MPI_SUCCESS; - } - smpi_bench_begin(); - return retval; -} - int PMPI_Cancel(MPI_Request* request) { int retval = 0; diff --git a/src/smpi/internals/instr_smpi.cpp b/src/smpi/internals/instr_smpi.cpp index 1feaa2a4b6..57ac211726 100644 --- a/src/smpi/internals/instr_smpi.cpp +++ b/src/smpi/internals/instr_smpi.cpp @@ -20,132 +20,78 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_smpi, instr, "Tracing SMPI"); static std::unordered_map*> keys; -static const char* smpi_colors[] = {"recv", - "1 0 0", - "irecv", - "1 0.52 0.52", - "send", - "0 0 1", - "isend", - "0.52 0.52 1", - "sendrecv", - "0 1 1", - "wait", - "1 1 0", - "waitall", - "0.78 0.78 0", - "waitany", - "0.78 0.78 0.58", - "test", - "0.52 0.52 0", - - "allgather", - "1 0 0", - "allgatherv", - "1 0.52 0.52", - "allreduce", - "1 0 1", - "alltoall", - "0.52 0 1", - "alltoallv", - "0.78 0.52 1", - "barrier", - "0 0.78 0.78", - "bcast", - "0 0.78 0.39", - "gather", - "1 1 0", - "gatherv", - "1 1 0.52", - "reduce", - "0 1 0", - "reducescatter", - "0.52 1 0.52", - "scan", - "1 0.58 0.23", - "exscan", - "1 0.54 0.25", - "scatterv", - "0.52 0 0.52", - "scatter", - "1 0.74 0.54", - - "computing", - "0 1 1", - "sleeping", - "0 0.5 0.5", - - "init", - "0 1 0", - "finalize", - "0 1 0", - - "put", - "0.3 1 0", - "get", - "0 1 0.3", - "accumulate", - "1 0.3 0", - "migration", - "0.2 0.5 0.2", - "rput", - "0.3 1 0", - "rget", - "0 1 0.3", - "raccumulate", - "1 0.3 0", - "compare_and_swap", - "0.3 1 0", - "get_accumulate", - "0 1 0.3", - "rget_accumulate", - "1 0.3 0", - "win_fence", - "1 0 0.3", - "win_post", - "1 0 0.8", - "win_wait", - "1 0.8 0", - "win_start", - "0.8 0 1", - "win_complete", - "0.8 1 0", - "win_lock", - "1 0 0.3", - "win_unlock", - "1 0 0.3", - "win_lock_all", - "1 0 0.8", - "win_unlock_all", - "1 0.8 0", - "win_flush", - "1 0 0.3", - "win_flush_local", - "1 0 0.8", - "win_flush_all", - "1 0.8 0", - "win_flush_local_all", - "1 0 0.3", - "", - ""}; - -static const char* instr_find_color(const char* state) +static std::map smpi_colors = {{"recv", "1 0 0"}, + {"irecv", "1 0.52 0.52"}, + {"send", "0 0 1"}, + {"isend", "0.52 0.52 1"}, + {"sendrecv", "0 1 1"}, + {"wait", "1 1 0"}, + {"waitall", "0.78 0.78 0"}, + {"waitany", "0.78 0.78 0.58"}, + {"test", "0.52 0.52 0"}, + + {"allgather", "1 0 0"}, + {"allgatherv", "1 0.52 0.52"}, + {"allreduce", "1 0 1"}, + {"alltoall", "0.52 0 1"}, + {"alltoallv", "0.78 0.52 1"}, + {"barrier", "0 0.78 0.78"}, + {"bcast", "0 0.78 0.39"}, + {"gather", "1 1 0"}, + {"gatherv", "1 1 0.52"}, + {"reduce", "0 1 0"}, + {"reducescatter", "0.52 1 0.52"}, + {"scan", "1 0.58 0.23"}, + {"exscan", "1 0.54 0.25"}, + {"scatterv", "0.52 0 0.52"}, + {"scatter", "1 0.74 0.54"}, + + {"computing", "0 1 1"}, + {"sleeping", "0 0.5 0.5"}, + + {"init", "0 1 0"}, + {"finalize", "0 1 0"}, + + {"put", "0.3 1 0"}, + {"get", "0 1 0.3"}, + {"accumulate", "1 0.3 0"}, + {"migration", "0.2 0.5 0.2"}, + {"rput", "0.3 1 0"}, + {"rget", "0 1 0.3"}, + {"raccumulate", "1 0.3 0"}, + {"compare_and_swap", "0.3 1 0"}, + {"get_accumulate", "0 1 0.3"}, + {"rget_accumulate", "1 0.3 0"}, + {"win_fence", "1 0 0.3"}, + {"win_post", "1 0 0.8"}, + {"win_wait", "1 0.8 0"}, + {"win_start", "0.8 0 1"}, + {"win_complete", "0.8 1 0"}, + {"win_lock", "1 0 0.3"}, + {"win_unlock", "1 0 0.3"}, + {"win_lock_all", "1 0 0.8"}, + {"win_unlock_all", "1 0.8 0"}, + {"win_flush", "1 0 0.3"}, + {"win_flush_local", "1 0 0.8"}, + {"win_flush_all", "1 0.8 0"}, + {"win_flush_local_all", "1 0 0.3"} +}; + +static const char* instr_find_color(std::string state) { - std::string target = std::string(state); - boost::algorithm::to_lower(target); - const char* ret = nullptr; - unsigned int i = 0; - const char* current = smpi_colors[i]; - while (current != nullptr) { - if (target == current // exact match - || strstr(target.c_str(), current) != 0) { // as substring - ret = smpi_colors[i + 1]; - break; - } - i+=2; - current = smpi_colors[i]; + boost::algorithm::to_lower(state); + if (state.substr(0, 5) == "pmpi_") + state = state.substr(5, std::string::npos); // Remove pmpi_ to allow for exact matches + + if (smpi_colors.find(state) != smpi_colors.end()) { // Exact match in the map? + return smpi_colors.find(state)->second.c_str(); } - return ret; + for (const auto& pair : smpi_colors) { // Is an entry of our map a substring of this state name? + if (std::strstr(state.c_str(), pair.first.c_str()) != 0) + return pair.second.c_str(); + } + + return "0.5 0.5 0.5"; // Just in case we find nothing in the map ... } XBT_PRIVATE container_t smpi_container(int rank) @@ -306,23 +252,6 @@ void TRACE_smpi_sleeping_out(int rank) smpi_container(rank)->get_state("MPI_STATE")->pop_event(); } -void TRACE_smpi_testing_in(int rank) -{ - //do not forget to set the color first, otherwise this will explode - if (not TRACE_smpi_is_enabled()) - return; - - simgrid::instr::StateType* state = smpi_container(rank)->get_state("MPI_STATE"); - state->add_entity_value("test"); - state->push_event("test", new simgrid::instr::NoOpTIData("test")); -} - -void TRACE_smpi_testing_out(int rank) -{ - if (TRACE_smpi_is_enabled()) - smpi_container(rank)->get_state("MPI_STATE")->pop_event(); -} - void TRACE_smpi_comm_in(int rank, const char* operation, simgrid::instr::TIData* extra) { if (not TRACE_smpi_is_enabled()) { diff --git a/src/smpi/internals/smpi_replay.cpp b/src/smpi/internals/smpi_replay.cpp index 21d9183f0a..671ed7ced7 100644 --- a/src/smpi/internals/smpi_replay.cpp +++ b/src/smpi/internals/smpi_replay.cpp @@ -498,7 +498,7 @@ void WaitAction::kernel(simgrid::xbt::ReplayAction& action) // Different times in traced application and replayed version may lead to this // In this case, ignore the extra calls. if (request != MPI_REQUEST_NULL) { - TRACE_smpi_testing_in(my_proc_id); + TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("test")); MPI_Status status; int flag = Request::test(&request, &status); @@ -511,7 +511,7 @@ void WaitAction::kernel(simgrid::xbt::ReplayAction& action) else req_storage.add(request); - TRACE_smpi_testing_out(my_proc_id); + TRACE_smpi_comm_out(my_proc_id); } }