A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Remove explicit conversion to std::string when it's not required.
[simgrid.git]
/
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
3fd9db7
..
f83a8d3
100644
(file)
--- a/
src/smpi/bindings/smpi_pmpi_coll.cpp
+++ b/
src/smpi/bindings/smpi_pmpi_coll.cpp
@@
-37,7
+37,7
@@
int PMPI_Ibarrier(MPI_Comm comm, MPI_Request *request)
{
CHECK_COMM(1)
CHECK_REQUEST(2)
-
+ CHECK_COLLECTIVE(comm, request == MPI_REQUEST_IGNORED ? "PMPI_Barrier" : "PMPI_Ibarrier")
const SmpiBenchGuard suspend_bench;
aid_t pid = simgrid::s4u::this_actor::get_pid();
TRACE_smpi_comm_in(pid, request == MPI_REQUEST_IGNORED ? "PMPI_Barrier" : "PMPI_Ibarrier",
@@
-67,6
+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, 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();
@@
-74,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<bool>("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);
@@
-115,6
+121,8
@@
int PMPI_Igather(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void
}
CHECK_ROOT(7)
CHECK_REQUEST(9)
+ 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;
@@
-131,6
+139,10
@@
int PMPI_Igather(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void
const SmpiBenchGuard suspend_bench;
+ if (simgrid::config::get_value<bool>("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",
@@
-175,6
+187,8
@@
int PMPI_Igatherv(const void* sendbuf, int sendcount, MPI_Datatype sendtype, voi
}
CHECK_ROOT(8)
CHECK_REQUEST(10)
+ 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++) {
@@
-184,6
+198,11
@@
int PMPI_Igatherv(const void* sendbuf, int sendcount, MPI_Datatype sendtype, voi
}
const SmpiBenchGuard suspend_bench;
+
+ if (simgrid::config::get_value<bool>("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;
@@
-239,6
+258,7
@@
int PMPI_Iallgather(const void* sendbuf, int sendcount, MPI_Datatype sendtype, v
CHECK_BUFFER(1, sendbuf, sendcount, sendtype)
CHECK_BUFFER(4, recvbuf, recvcount, recvtype)
CHECK_REQUEST(8)
+ CHECK_COLLECTIVE(comm, request == MPI_REQUEST_IGNORED ? "PMPI_Allgather" : "PMPI_Iallggather")
if (sendbuf == MPI_IN_PLACE) {
sendbuf = static_cast<char*>(recvbuf) + recvtype->get_extent() * recvcount * comm->rank();
@@
-296,8
+316,10
@@
int PMPI_Iallgatherv(const void* sendbuf, int sendcount, MPI_Datatype sendtype,
CHECK_COUNT(5, recvcounts[i])
CHECK_BUFFER(4, recvbuf, recvcounts[i], recvtype)
}
+ CHECK_COLLECTIVE(comm, MPI_REQUEST_IGNORED ? "PMPI_Allgatherv" : "PMPI_Iallgatherv")
const SmpiBenchGuard suspend_bench;
+
if (sendbuf == MPI_IN_PLACE) {
sendbuf = static_cast<char*>(recvbuf) + recvtype->get_extent() * displs[comm->rank()];
sendcount = recvcounts[comm->rank()];
@@
-351,6
+373,8
@@
int PMPI_Iscatter(const void* sendbuf, int sendcount, MPI_Datatype sendtype, voi
}
CHECK_ROOT(8)
CHECK_REQUEST(9)
+ 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;
@@
-364,6
+388,10
@@
int PMPI_Iscatter(const void* sendbuf, int sendcount, MPI_Datatype sendtype, voi
const SmpiBenchGuard suspend_bench;
+ if (simgrid::config::get_value<bool>("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",
@@
-415,9
+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, 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<bool>("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<std::vector<int>>();
@@
-464,8
+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, 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<bool>("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",
@@
-514,8
+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, std::string(request == MPI_REQUEST_IGNORED ? "PMPI_Alleduce" : "PMPI_Iallreduce") +
+ " with op " + op->name())
const SmpiBenchGuard suspend_bench;
+
std::vector<unsigned char> tmp_sendbuf;
const void* real_sendbuf = smpi_get_in_place_buf(sendbuf, recvbuf, tmp_sendbuf, count, datatype);
@@
-551,8
+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,
+ std::string(request == MPI_REQUEST_IGNORED ? "PMPI_Scan" : "PMPI_Iscan") + " with op " + op->name())
const SmpiBenchGuard suspend_bench;
+
+ if (simgrid::config::get_value<bool>("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<unsigned char> tmp_sendbuf;
const void* real_sendbuf = smpi_get_in_place_buf(sendbuf, recvbuf, tmp_sendbuf, count, datatype);
@@
-586,8
+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, std::string(request == MPI_REQUEST_IGNORED ? "PMPI_Exscan" : "PMPI_Iexscan") + " with op " +
+ op->name())
const SmpiBenchGuard suspend_bench;
+
+ if (simgrid::config::get_value<bool>("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<unsigned char> tmp_sendbuf;
const void* real_sendbuf = smpi_get_in_place_buf(sendbuf, recvbuf, tmp_sendbuf, count, datatype);
@@
-627,8
+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, 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<std::vector<int>>();
trace_recvcounts->insert(trace_recvcounts->end(), &recvcounts[0], &recvcounts[comm->size()]);
@@
-673,8
+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, 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();
@@
-721,6
+786,7
@@
int PMPI_Ialltoall(const void* sendbuf, int sendcount, MPI_Datatype sendtype, vo
CHECK_COUNT(5, recvcount)
CHECK_BUFFER(4, recvbuf, recvcount, recvtype)
CHECK_REQUEST(8)
+ CHECK_COLLECTIVE(comm, request == MPI_REQUEST_IGNORED ? "PMPI_Alltoall" : "PMPI_Ialltoall")
aid_t pid = simgrid::s4u::this_actor::get_pid();
int real_sendcount = sendcount;
@@
-779,6
+845,7
@@
int PMPI_Ialltoallv(const void* sendbuf, const int* sendcounts, const int* sendd
CHECK_NULL(6, MPI_ERR_COUNT, recvcounts)
CHECK_NULL(7, MPI_ERR_ARG, recvdispls)
CHECK_REQUEST(10)
+ CHECK_COLLECTIVE(comm, request == MPI_REQUEST_IGNORED ? "PMPI_Alltoallv" : "PMPI_Ialltoallv")
aid_t pid = simgrid::s4u::this_actor::get_pid();
int size = comm->size();
@@
-792,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<std::vector<int>>();
@@
-883,6
+951,7
@@
int PMPI_Ialltoallw(const void* sendbuf, const int* sendcounts, const int* sendd
CHECK_TYPE(8, recvtypes[i])
CHECK_BUFFER(5, recvbuf, recvcounts[i], recvtypes[i])
}
+ CHECK_COLLECTIVE(comm, request == MPI_REQUEST_IGNORED ? "PMPI_Alltoallw" : "PMPI_Ialltoallw")
const SmpiBenchGuard suspend_bench;