From: degomme Date: Wed, 13 Jun 2018 12:58:15 +0000 (+0200) Subject: simplify tracing of MPI_Test. Add tracing for Testall and friends. X-Git-Tag: v3.20~108^2^2 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/3d565eeaa3e81cd3b49592cfe6899962527c06a5 simplify tracing of MPI_Test. Add tracing for Testall and friends. --- diff --git a/examples/smpi/trace/trace.tesh b/examples/smpi/trace/trace.tesh index 6b2902ab92..33df360104 100644 --- a/examples/smpi/trace/trace.tesh +++ b/examples/smpi/trace/trace.tesh @@ -149,7 +149,7 @@ $ tail -n +3 ${bindir:=.}/smpi_trace.trace > 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 test +> 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 a8453046a4..57ac211726 100644 --- a/src/smpi/internals/instr_smpi.cpp +++ b/src/smpi/internals/instr_smpi.cpp @@ -252,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); } }