X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dbb0c80acf5f0b020ed570a418601afc09e693e3..abf3b21ad3f4a19475431076e6e2b26f76d2e7d6:/src/smpi/bindings/smpi_pmpi_coll.cpp diff --git a/src/smpi/bindings/smpi_pmpi_coll.cpp b/src/smpi/bindings/smpi_pmpi_coll.cpp index 4549c06970..7e613a5b63 100644 --- a/src/smpi/bindings/smpi_pmpi_coll.cpp +++ b/src/smpi/bindings/smpi_pmpi_coll.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2022. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2023. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -67,7 +67,8 @@ int PMPI_Ibcast(void* buf, int count, MPI_Datatype datatype, int root, MPI_Comm CHECK_BUFFER(1, buf, count, datatype) CHECK_ROOT(4) CHECK_REQUEST(6) - CHECK_COLLECTIVE(comm, request == MPI_REQUEST_IGNORED ? "PMPI_Bcast" : "PMPI_Ibcast") + CHECK_COLLECTIVE(comm, std::string(request == MPI_REQUEST_IGNORED ? "PMPI_Bcast" : "PMPI_Ibcast") + " with root " + + std::to_string(root)) const SmpiBenchGuard suspend_bench; aid_t pid = simgrid::s4u::this_actor::get_pid(); @@ -75,6 +76,10 @@ int PMPI_Ibcast(void* buf, int count, MPI_Datatype datatype, int root, MPI_Comm new simgrid::instr::CollTIData(request == MPI_REQUEST_IGNORED ? "bcast" : "ibcast", root, -1.0, count, 0, simgrid::smpi::Datatype::encode(datatype), "")); + if (simgrid::config::get_value("smpi/barrier-collectives") && + request == MPI_REQUEST_IGNORED) // No barrier in Ibcast + smpi_deployment_startup_barrier(smpi_process()->get_instance_id()); + if (comm->size() > 1) { if (request == MPI_REQUEST_IGNORED) simgrid::smpi::colls::bcast(buf, count, datatype, root, comm); @@ -116,7 +121,8 @@ int PMPI_Igather(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void } CHECK_ROOT(7) CHECK_REQUEST(9) - CHECK_COLLECTIVE(comm, request == MPI_REQUEST_IGNORED ? "PMPI_Gather" : "PMPI_Igather") + CHECK_COLLECTIVE(comm, std::string(request == MPI_REQUEST_IGNORED ? "PMPI_Gather" : "PMPI_Igather") + " with root " + + std::to_string(root)) const void* real_sendbuf = sendbuf; int real_sendcount = sendcount; @@ -133,6 +139,10 @@ int PMPI_Igather(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void const SmpiBenchGuard suspend_bench; + if (simgrid::config::get_value("smpi/barrier-collectives") && + request == MPI_REQUEST_IGNORED) // no barrier in Igather + smpi_deployment_startup_barrier(smpi_process()->get_instance_id()); + aid_t pid = simgrid::s4u::this_actor::get_pid(); TRACE_smpi_comm_in(pid, request == MPI_REQUEST_IGNORED ? "PMPI_Gather" : "PMPI_Igather", @@ -177,7 +187,8 @@ int PMPI_Igatherv(const void* sendbuf, int sendcount, MPI_Datatype sendtype, voi } CHECK_ROOT(8) CHECK_REQUEST(10) - CHECK_COLLECTIVE(comm, request == MPI_REQUEST_IGNORED ? "PMPI_Gatherv" : "PMPI_Igatherv") + CHECK_COLLECTIVE(comm, std::string(request == MPI_REQUEST_IGNORED ? "PMPI_Gatherv" : "PMPI_Igatherv") + + " with root " + std::to_string(root)) if (rank == root){ for (int i = 0; i < comm->size(); i++) { @@ -187,6 +198,11 @@ int PMPI_Igatherv(const void* sendbuf, int sendcount, MPI_Datatype sendtype, voi } const SmpiBenchGuard suspend_bench; + + if (simgrid::config::get_value("smpi/barrier-collectives") && + request == MPI_REQUEST_IGNORED) // no barrier in Igatherv + smpi_deployment_startup_barrier(smpi_process()->get_instance_id()); + const void* real_sendbuf = sendbuf; int real_sendcount = sendcount; MPI_Datatype real_sendtype = sendtype; @@ -303,6 +319,7 @@ int PMPI_Iallgatherv(const void* sendbuf, int sendcount, MPI_Datatype sendtype, CHECK_COLLECTIVE(comm, MPI_REQUEST_IGNORED ? "PMPI_Allgatherv" : "PMPI_Iallgatherv") const SmpiBenchGuard suspend_bench; + if (sendbuf == MPI_IN_PLACE) { sendbuf = static_cast(recvbuf) + recvtype->get_extent() * displs[comm->rank()]; sendcount = recvcounts[comm->rank()]; @@ -356,7 +373,8 @@ int PMPI_Iscatter(const void* sendbuf, int sendcount, MPI_Datatype sendtype, voi } CHECK_ROOT(8) CHECK_REQUEST(9) - CHECK_COLLECTIVE(comm, request == MPI_REQUEST_IGNORED ? "PMPI_Scatter" : "PMPI_Iscatter") + CHECK_COLLECTIVE(comm, std::string(request == MPI_REQUEST_IGNORED ? "PMPI_Scatter" : "PMPI_Iscatter") + + " with root " + std::to_string(root)) if (recvbuf == MPI_IN_PLACE) { recvtype = sendtype; @@ -370,6 +388,10 @@ int PMPI_Iscatter(const void* sendbuf, int sendcount, MPI_Datatype sendtype, voi const SmpiBenchGuard suspend_bench; + if (simgrid::config::get_value("smpi/barrier-collectives") && + request == MPI_REQUEST_IGNORED) // no barrier in Iscatter + smpi_deployment_startup_barrier(smpi_process()->get_instance_id()); + aid_t pid = simgrid::s4u::this_actor::get_pid(); TRACE_smpi_comm_in(pid, request == MPI_REQUEST_IGNORED ? "PMPI_Scatter" : "PMPI_Iscatter", @@ -421,10 +443,15 @@ int PMPI_Iscatterv(const void* sendbuf, const int* sendcounts, const int* displs } else { CHECK_NOT_IN_PLACE_ROOT(4, recvbuf) } - CHECK_COLLECTIVE(comm, request == MPI_REQUEST_IGNORED ? "PMPI_Scatterv" : "PMPI_Iscatterv") + CHECK_COLLECTIVE(comm, std::string(request == MPI_REQUEST_IGNORED ? "PMPI_Scatterv" : "PMPI_Iscatterv") + + " with root " + std::to_string(root)) const SmpiBenchGuard suspend_bench; + if (simgrid::config::get_value("smpi/barrier-collectives") && + request == MPI_REQUEST_IGNORED) // no barrier in Iscatterv + smpi_deployment_startup_barrier(smpi_process()->get_instance_id()); + aid_t pid = simgrid::s4u::this_actor::get_pid(); auto trace_sendcounts = std::make_shared>(); @@ -471,9 +498,15 @@ int PMPI_Ireduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype dat CHECK_OP(5, op, datatype) CHECK_ROOT(7) CHECK_REQUEST(8) - CHECK_COLLECTIVE(comm, request == MPI_REQUEST_IGNORED ? "PMPI_Reduce" : "PMPI_Ireduce") + CHECK_COLLECTIVE(comm, std::string(request == MPI_REQUEST_IGNORED ? "PMPI_Reduce" : "PMPI_Ireduce") + " with op " + + op->name() + " and root " + std::to_string(root)) const SmpiBenchGuard suspend_bench; + + if (simgrid::config::get_value("smpi/barrier-collectives") && + request == MPI_REQUEST_IGNORED) // no barrier in Ireduce + smpi_deployment_startup_barrier(smpi_process()->get_instance_id()); + aid_t pid = simgrid::s4u::this_actor::get_pid(); TRACE_smpi_comm_in(pid, request == MPI_REQUEST_IGNORED ? "PMPI_Reduce" : "PMPI_Ireduce", @@ -522,9 +555,11 @@ int PMPI_Iallreduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype CHECK_BUFFER(1, sendbuf, count, datatype) CHECK_BUFFER(2, recvbuf, count, datatype) CHECK_REQUEST(7) - CHECK_COLLECTIVE(comm, request == MPI_REQUEST_IGNORED ? "PMPI_Allreduce" : "PMPI_Iallreduce") + CHECK_COLLECTIVE(comm, std::string(request == MPI_REQUEST_IGNORED ? "PMPI_Alleduce" : "PMPI_Iallreduce") + + " with op " + op->name()) const SmpiBenchGuard suspend_bench; + std::vector tmp_sendbuf; const void* real_sendbuf = smpi_get_in_place_buf(sendbuf, recvbuf, tmp_sendbuf, count, datatype); @@ -560,9 +595,15 @@ int PMPI_Iscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datat CHECK_BUFFER(2,recvbuf,count, datatype) CHECK_REQUEST(7) CHECK_OP(5, op, datatype) - CHECK_COLLECTIVE(comm, request == MPI_REQUEST_IGNORED ? "PMPI_Scan" : "PMPI_Iscan") + CHECK_COLLECTIVE(comm, + std::string(request == MPI_REQUEST_IGNORED ? "PMPI_Scan" : "PMPI_Iscan") + " with op " + op->name()) const SmpiBenchGuard suspend_bench; + + if (simgrid::config::get_value("smpi/barrier-collectives") && + request == MPI_REQUEST_IGNORED) // no barrier in Iscan + smpi_deployment_startup_barrier(smpi_process()->get_instance_id()); + aid_t pid = simgrid::s4u::this_actor::get_pid(); std::vector tmp_sendbuf; const void* real_sendbuf = smpi_get_in_place_buf(sendbuf, recvbuf, tmp_sendbuf, count, datatype); @@ -596,9 +637,15 @@ int PMPI_Iexscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype dat CHECK_BUFFER(2, recvbuf, count, datatype) CHECK_REQUEST(7) CHECK_OP(5, op, datatype) - CHECK_COLLECTIVE(comm, request == MPI_REQUEST_IGNORED ? "PMPI_Exscan" : "PMPI_Iexscan") + CHECK_COLLECTIVE(comm, std::string(request == MPI_REQUEST_IGNORED ? "PMPI_Exscan" : "PMPI_Iexscan") + " with op " + + op->name()) const SmpiBenchGuard suspend_bench; + + if (simgrid::config::get_value("smpi/barrier-collectives") && + request == MPI_REQUEST_IGNORED) // no barrier in Iexscan + smpi_deployment_startup_barrier(smpi_process()->get_instance_id()); + aid_t pid = simgrid::s4u::this_actor::get_pid(); std::vector tmp_sendbuf; const void* real_sendbuf = smpi_get_in_place_buf(sendbuf, recvbuf, tmp_sendbuf, count, datatype); @@ -638,9 +685,11 @@ int PMPI_Ireduce_scatter(const void *sendbuf, void *recvbuf, const int *recvcoun CHECK_BUFFER(1, sendbuf, recvcounts[i], datatype) CHECK_BUFFER(2, recvbuf, recvcounts[i], datatype) } - CHECK_COLLECTIVE(comm, request == MPI_REQUEST_IGNORED ? "PMPI_Reduce_scatter" : "PMPI_Ireduce_scatter") + CHECK_COLLECTIVE(comm, std::string(request == MPI_REQUEST_IGNORED ? "PMPI_Reduce_scatter" : "PMPI_Ireduce_scatter") + + " with op " + op->name()) const SmpiBenchGuard suspend_bench; + aid_t pid = simgrid::s4u::this_actor::get_pid(); auto trace_recvcounts = std::make_shared>(); trace_recvcounts->insert(trace_recvcounts->end(), &recvcounts[0], &recvcounts[comm->size()]); @@ -685,9 +734,12 @@ int PMPI_Ireduce_scatter_block(const void* sendbuf, void* recvbuf, int recvcount CHECK_BUFFER(2, recvbuf, recvcount, datatype) CHECK_REQUEST(7) CHECK_OP(5, op, datatype) - CHECK_COLLECTIVE(comm, request == MPI_REQUEST_IGNORED ? "PMPI_Reduce_scatter_block" : "PMPI_Ireduce_scatter_block") + CHECK_COLLECTIVE( + comm, std::string(request == MPI_REQUEST_IGNORED ? "PMPI_Reduce_scatter_block" : "PMPI_Ireduce_scatter_block") + + " with op " + op->name()) const SmpiBenchGuard suspend_bench; + int count = comm->size(); aid_t pid = simgrid::s4u::this_actor::get_pid(); @@ -807,6 +859,7 @@ int PMPI_Ialltoallv(const void* sendbuf, const int* sendcounts, const int* sendd } const SmpiBenchGuard suspend_bench; + int send_size = 0; int recv_size = 0; auto trace_sendcounts = std::make_shared>();