-/* Copyright (c) 2007-2021. 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. */
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(smpi_pmpi);
-static int getPid(MPI_Comm comm, int id)
+static aid_t getPid(MPI_Comm comm, int id)
{
return comm->group()->actor(id);
}
CHECK_REQUEST(7)\
*request = MPI_REQUEST_NULL;\
CHECK_SEND_INPUTS
-
+
#define CHECK_IRECV_INPUTS\
SET_BUF1(buf)\
CHECK_REQUEST(7)\
{
CHECK_ISEND_INPUTS
- smpi_bench_end();
+ const SmpiBenchGuard suspend_bench;
*request = simgrid::smpi::Request::send_init(buf, count, datatype, dst, tag, comm);
- smpi_bench_begin();
return MPI_SUCCESS;
}
{
CHECK_IRECV_INPUTS
- smpi_bench_end();
+ const SmpiBenchGuard suspend_bench;
*request = simgrid::smpi::Request::recv_init(buf, count, datatype, src, tag, comm);
- smpi_bench_begin();
return MPI_SUCCESS;
}
CHECK_ISEND_INPUTS
int retval = 0;
- smpi_bench_end();
+ const SmpiBenchGuard suspend_bench;
*request = simgrid::smpi::Request::ssend_init(buf, count, datatype, dst, tag, comm);
retval = MPI_SUCCESS;
- smpi_bench_begin();
return retval;
}
{
int retval = 0;
- smpi_bench_end();
+ const SmpiBenchGuard suspend_bench;
CHECK_REQUEST_VALID(1)
if ( *request == MPI_REQUEST_NULL) {
retval = MPI_ERR_REQUEST;
} else {
MPI_Request req = *request;
- int my_proc_id = (req->comm() != MPI_COMM_NULL) ? simgrid::s4u::this_actor::get_pid() : -1;
+ aid_t my_proc_id = (req->comm() != MPI_COMM_NULL) ? simgrid::s4u::this_actor::get_pid() : -1;
TRACE_smpi_comm_in(my_proc_id, __func__,
- new simgrid::instr::Pt2PtTIData("Start", req->dst(),
- req->size(),
- req->tag(),
+ new simgrid::instr::Pt2PtTIData("Start", MPI_COMM_WORLD->group()->rank(req->dst()), req->size(), req->tag(),
simgrid::smpi::Datatype::encode(req->type())));
if (not TRACE_smpi_view_internals() && req->flags() & MPI_REQ_SEND)
TRACE_smpi_send(my_proc_id, my_proc_id, getPid(req->comm(), req->dst()), req->tag(), req->size());
retval = MPI_SUCCESS;
TRACE_smpi_comm_out(my_proc_id);
}
- smpi_bench_begin();
return retval;
}
int PMPI_Startall(int count, MPI_Request * requests)
{
int retval;
- smpi_bench_end();
+ const SmpiBenchGuard suspend_bench;
if (requests == nullptr) {
retval = MPI_ERR_ARG;
} else {
}
}
if(retval != MPI_ERR_REQUEST) {
- int my_proc_id = simgrid::s4u::this_actor::get_pid();
+ aid_t my_proc_id = simgrid::s4u::this_actor::get_pid();
TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("Startall"));
if (not TRACE_smpi_view_internals())
for (int i = 0; i < count; i++) {
TRACE_smpi_comm_out(my_proc_id);
}
}
- smpi_bench_begin();
return retval;
}
{
int retval = 0;
- smpi_bench_end();
+ const SmpiBenchGuard suspend_bench;
if (*request != MPI_REQUEST_NULL) {
(*request)->mark_as_deleted();
simgrid::smpi::Request::unref(request);
*request = MPI_REQUEST_NULL;
retval = MPI_SUCCESS;
}
- smpi_bench_begin();
return retval;
}
{
CHECK_IRECV_INPUTS
- smpi_bench_end();
- int my_proc_id = simgrid::s4u::this_actor::get_pid();
+ const SmpiBenchGuard suspend_bench;
+ aid_t my_proc_id = simgrid::s4u::this_actor::get_pid();
TRACE_smpi_comm_in(my_proc_id, __func__,
- new simgrid::instr::Pt2PtTIData("irecv", src,
- datatype->is_replayable() ? count : count * datatype->size(),
+ new simgrid::instr::Pt2PtTIData("irecv", MPI_COMM_WORLD->group()->rank(getPid(comm, src)),
+ count,
tag, simgrid::smpi::Datatype::encode(datatype)));
*request = simgrid::smpi::Request::irecv(buf, count, datatype, src, tag, comm);
TRACE_smpi_comm_out(my_proc_id);
- smpi_bench_begin();
return MPI_SUCCESS;
}
{
CHECK_ISEND_INPUTS
- smpi_bench_end();
+ const SmpiBenchGuard suspend_bench;
int retval = 0;
- int my_proc_id = simgrid::s4u::this_actor::get_pid();
- int trace_dst = getPid(comm, dst);
+ aid_t my_proc_id = simgrid::s4u::this_actor::get_pid();
+ aid_t trace_dst = getPid(comm, dst);
TRACE_smpi_comm_in(my_proc_id, __func__,
- new simgrid::instr::Pt2PtTIData("isend", dst,
- datatype->is_replayable() ? count : count * datatype->size(),
+ new simgrid::instr::Pt2PtTIData("isend", MPI_COMM_WORLD->group()->rank(trace_dst),
+ count,
tag, simgrid::smpi::Datatype::encode(datatype)));
TRACE_smpi_send(my_proc_id, my_proc_id, trace_dst, tag, count * datatype->size());
*request = simgrid::smpi::Request::isend(buf, count, datatype, dst, tag, comm);
retval = MPI_SUCCESS;
TRACE_smpi_comm_out(my_proc_id);
- smpi_bench_begin();
return retval;
}
{
CHECK_ISEND_INPUTS
- smpi_bench_end();
- int my_proc_id = simgrid::s4u::this_actor::get_pid();
- int trace_dst = getPid(comm, dst);
+ const SmpiBenchGuard suspend_bench;
+ aid_t my_proc_id = simgrid::s4u::this_actor::get_pid();
+ aid_t trace_dst = getPid(comm, dst);
TRACE_smpi_comm_in(my_proc_id, __func__,
- new simgrid::instr::Pt2PtTIData("ISsend", dst,
- datatype->is_replayable() ? count : count * datatype->size(),
+ new simgrid::instr::Pt2PtTIData("ISsend", MPI_COMM_WORLD->group()->rank(trace_dst),
+ count,
tag, simgrid::smpi::Datatype::encode(datatype)));
TRACE_smpi_send(my_proc_id, my_proc_id, trace_dst, tag, count * datatype->size());
*request = simgrid::smpi::Request::issend(buf, count, datatype, dst, tag, comm);
TRACE_smpi_comm_out(my_proc_id);
- smpi_bench_begin();
return MPI_SUCCESS;
}
CHECK_TAG(5, tag)
CHECK_COMM(6)
- smpi_bench_end();
+ const SmpiBenchGuard suspend_bench;
if (src == MPI_PROC_NULL) {
if(status != MPI_STATUS_IGNORE){
simgrid::smpi::Status::empty(status);
} else if (src!=MPI_ANY_SOURCE && (src >= comm->group()->size() || src <0)){
retval = MPI_ERR_RANK;
} else {
- int my_proc_id = simgrid::s4u::this_actor::get_pid();
+ aid_t my_proc_id = simgrid::s4u::this_actor::get_pid();
TRACE_smpi_comm_in(my_proc_id, __func__,
- new simgrid::instr::Pt2PtTIData("recv", src,
- datatype->is_replayable() ? count : count * datatype->size(),
+ new simgrid::instr::Pt2PtTIData("recv", MPI_COMM_WORLD->group()->rank(getPid(comm, src)),
+ count,
tag, simgrid::smpi::Datatype::encode(datatype)));
retval = simgrid::smpi::Request::recv(buf, count, datatype, src, tag, comm, status);
// the src may not have been known at the beginning of the recv (MPI_ANY_SOURCE)
- int src_traced=0;
- if (status != MPI_STATUS_IGNORE)
- src_traced = getPid(comm, status->MPI_SOURCE);
- else
- src_traced = getPid(comm, src);
if (not TRACE_smpi_view_internals()) {
+ aid_t src_traced = (status != MPI_STATUS_IGNORE) ? getPid(comm, status->MPI_SOURCE) : getPid(comm, src);
TRACE_smpi_recv(src_traced, my_proc_id, tag);
}
-
+
TRACE_smpi_comm_out(my_proc_id);
}
- smpi_bench_begin();
return retval;
}
{
CHECK_SEND_INPUTS
- smpi_bench_end();
- int my_proc_id = simgrid::s4u::this_actor::get_pid();
- int dst_traced = getPid(comm, dst);
+ const SmpiBenchGuard suspend_bench;
+ aid_t my_proc_id = simgrid::s4u::this_actor::get_pid();
+ aid_t dst_traced = getPid(comm, dst);
TRACE_smpi_comm_in(my_proc_id, __func__,
- new simgrid::instr::Pt2PtTIData("send", dst,
- datatype->is_replayable() ? count : count * datatype->size(),
+ new simgrid::instr::Pt2PtTIData("send", MPI_COMM_WORLD->group()->rank(dst_traced),
+ count,
tag, simgrid::smpi::Datatype::encode(datatype)));
if (not TRACE_smpi_view_internals()) {
TRACE_smpi_send(my_proc_id, my_proc_id, dst_traced, tag, count * datatype->size());
}
simgrid::smpi::Request::send(buf, count, datatype, dst, tag, comm);
TRACE_smpi_comm_out(my_proc_id);
- smpi_bench_begin();
return MPI_SUCCESS;
}
{
CHECK_SEND_INPUTS
- smpi_bench_end();
- int my_proc_id = simgrid::s4u::this_actor::get_pid();
- int dst_traced = getPid(comm, dst);
+ const SmpiBenchGuard suspend_bench;
+ aid_t my_proc_id = simgrid::s4u::this_actor::get_pid();
+ aid_t dst_traced = getPid(comm, dst);
int bsend_buf_size = 0;
void* bsend_buf = nullptr;
smpi_process()->bsend_buffer(&bsend_buf, &bsend_buf_size);
- int size = datatype->get_extent() * count;
- if(bsend_buf==nullptr || bsend_buf_size < size + MPI_BSEND_OVERHEAD )
+ if (bsend_buf == nullptr || bsend_buf_size < datatype->get_extent() * count + MPI_BSEND_OVERHEAD)
return MPI_ERR_BUFFER;
TRACE_smpi_comm_in(my_proc_id, __func__,
- new simgrid::instr::Pt2PtTIData("bsend", dst,
- datatype->is_replayable() ? count : count * datatype->size(),
+ new simgrid::instr::Pt2PtTIData("bsend", MPI_COMM_WORLD->group()->rank(dst_traced),
+ count,
tag, simgrid::smpi::Datatype::encode(datatype)));
if (not TRACE_smpi_view_internals()) {
TRACE_smpi_send(my_proc_id, my_proc_id, dst_traced, tag, count * datatype->size());
}
simgrid::smpi::Request::bsend(buf, count, datatype, dst, tag, comm);
TRACE_smpi_comm_out(my_proc_id);
- smpi_bench_begin();
return MPI_SUCCESS;
}
{
CHECK_ISEND_INPUTS
- smpi_bench_end();
- int my_proc_id = simgrid::s4u::this_actor::get_pid();
- int trace_dst = getPid(comm, dst);
+ const SmpiBenchGuard suspend_bench;
+ aid_t my_proc_id = simgrid::s4u::this_actor::get_pid();
+ aid_t trace_dst = getPid(comm, dst);
int bsend_buf_size = 0;
void* bsend_buf = nullptr;
smpi_process()->bsend_buffer(&bsend_buf, &bsend_buf_size);
- int size = datatype->get_extent() * count;
- if(bsend_buf==nullptr || bsend_buf_size < size + MPI_BSEND_OVERHEAD )
+ if (bsend_buf == nullptr || bsend_buf_size < datatype->get_extent() * count + MPI_BSEND_OVERHEAD)
return MPI_ERR_BUFFER;
TRACE_smpi_comm_in(my_proc_id, __func__,
- new simgrid::instr::Pt2PtTIData("ibsend", dst,
- datatype->is_replayable() ? count : count * datatype->size(),
+ new simgrid::instr::Pt2PtTIData("ibsend", MPI_COMM_WORLD->group()->rank(trace_dst),
+ count,
tag, simgrid::smpi::Datatype::encode(datatype)));
TRACE_smpi_send(my_proc_id, my_proc_id, trace_dst, tag, count * datatype->size());
*request = simgrid::smpi::Request::ibsend(buf, count, datatype, dst, tag, comm);
TRACE_smpi_comm_out(my_proc_id);
- smpi_bench_begin();
return MPI_SUCCESS;
}
{
CHECK_ISEND_INPUTS
- smpi_bench_end();
+ const SmpiBenchGuard suspend_bench;
int retval = 0;
int bsend_buf_size = 0;
void* bsend_buf = nullptr;
*request = simgrid::smpi::Request::bsend_init(buf, count, datatype, dst, tag, comm);
retval = MPI_SUCCESS;
}
- smpi_bench_begin();
return retval;
}
{
CHECK_SEND_INPUTS
- smpi_bench_end();
- int my_proc_id = simgrid::s4u::this_actor::get_pid();
- int dst_traced = getPid(comm, dst);
+ const SmpiBenchGuard suspend_bench;
+ aid_t my_proc_id = simgrid::s4u::this_actor::get_pid();
+ aid_t dst_traced = getPid(comm, dst);
TRACE_smpi_comm_in(my_proc_id, __func__,
- new simgrid::instr::Pt2PtTIData("Ssend", dst,
- datatype->is_replayable() ? count : count * datatype->size(),
+ new simgrid::instr::Pt2PtTIData("Ssend", MPI_COMM_WORLD->group()->rank(dst_traced),
+ count,
tag, simgrid::smpi::Datatype::encode(datatype)));
TRACE_smpi_send(my_proc_id, my_proc_id, dst_traced, tag, count * datatype->size());
simgrid::smpi::Request::ssend(buf, count, datatype, dst, tag, comm);
TRACE_smpi_comm_out(my_proc_id);
- smpi_bench_begin();
return MPI_SUCCESS;
}
CHECK_TYPE(8, recvtype)
CHECK_BUFFER(1, sendbuf, sendcount, sendtype)
CHECK_BUFFER(6, recvbuf, recvcount, recvtype)
+ CHECK_ARGS(sendbuf == recvbuf && sendcount > 0 && recvcount > 0, MPI_ERR_BUFFER,
+ "%s: Invalid parameters 1 and 6: sendbuf and recvbuf must be disjoint", __func__);
CHECK_TAG(10, recvtag)
CHECK_COMM(11)
- smpi_bench_end();
+ const SmpiBenchGuard suspend_bench;
if (src == MPI_PROC_NULL) {
if(status!=MPI_STATUS_IGNORE){
(src!=MPI_ANY_SOURCE && (src >= comm->group()->size() || src <0))){
retval = MPI_ERR_RANK;
} else {
- int my_proc_id = simgrid::s4u::this_actor::get_pid();
- int dst_traced = getPid(comm, dst);
- int src_traced = getPid(comm, src);
+ aid_t my_proc_id = simgrid::s4u::this_actor::get_pid();
+ aid_t dst_traced = MPI_COMM_WORLD->group()->rank(getPid(comm, dst));
+ aid_t src_traced = MPI_COMM_WORLD->group()->rank(getPid(comm, src));
// FIXME: Hack the way to trace this one
auto dst_hack = std::make_shared<std::vector<int>>();
src_hack->push_back(src_traced);
TRACE_smpi_comm_in(my_proc_id, __func__,
new simgrid::instr::VarCollTIData(
- "sendRecv", -1, sendtype->is_replayable() ? sendcount : sendcount * sendtype->size(),
- dst_hack, recvtype->is_replayable() ? recvcount : recvcount * recvtype->size(), src_hack,
+ "sendRecv", -1, sendcount,
+ dst_hack, recvcount, src_hack,
simgrid::smpi::Datatype::encode(sendtype), simgrid::smpi::Datatype::encode(recvtype)));
TRACE_smpi_send(my_proc_id, my_proc_id, dst_traced, sendtag, sendcount * sendtype->size());
TRACE_smpi_comm_out(my_proc_id);
}
- smpi_bench_begin();
return retval;
}
+int PMPI_Isendrecv(const void* sendbuf, int sendcount, MPI_Datatype sendtype, int dst, int sendtag, void* recvbuf,
+ int recvcount, MPI_Datatype recvtype, int src, int recvtag, MPI_Comm comm, MPI_Request* request)
+{
+ int retval = 0;
+ SET_BUF1(sendbuf)
+ SET_BUF2(recvbuf)
+ CHECK_COUNT(2, sendcount)
+ CHECK_TYPE(3, sendtype)
+ CHECK_TAG(5, sendtag)
+ CHECK_COUNT(7, recvcount)
+ CHECK_TYPE(8, recvtype)
+ CHECK_BUFFER(1, sendbuf, sendcount, sendtype)
+ CHECK_BUFFER(6, recvbuf, recvcount, recvtype)
+ CHECK_ARGS(sendbuf == recvbuf && sendcount > 0 && recvcount > 0, MPI_ERR_BUFFER,
+ "%s: Invalid parameters 1 and 6: sendbuf and recvbuf must be disjoint", __func__);
+ CHECK_TAG(10, recvtag)
+ CHECK_COMM(11)
+ CHECK_REQUEST(12)
+ *request = MPI_REQUEST_NULL;
+ const SmpiBenchGuard suspend_bench;
+
+ if (src == MPI_PROC_NULL && dst != MPI_PROC_NULL){
+ *request=simgrid::smpi::Request::isend(sendbuf, sendcount, sendtype, dst, sendtag, comm);
+ retval = MPI_SUCCESS;
+ } else if (dst == MPI_PROC_NULL){
+ *request = simgrid::smpi::Request::irecv(recvbuf, recvcount, recvtype, src, recvtag, comm);
+ retval = MPI_SUCCESS;
+ } else if (dst >= comm->group()->size() || dst <0 ||
+ (src!=MPI_ANY_SOURCE && (src >= comm->group()->size() || src <0))){
+ retval = MPI_ERR_RANK;
+ } else {
+ aid_t my_proc_id = simgrid::s4u::this_actor::get_pid();
+ aid_t dst_traced = MPI_COMM_WORLD->group()->rank(getPid(comm, dst));
+ aid_t src_traced = MPI_COMM_WORLD->group()->rank(getPid(comm, src));
+
+ // FIXME: Hack the way to trace this one
+ auto dst_hack = std::make_shared<std::vector<int>>();
+ auto src_hack = std::make_shared<std::vector<int>>();
+ dst_hack->push_back(dst_traced);
+ src_hack->push_back(src_traced);
+ TRACE_smpi_comm_in(my_proc_id, __func__,
+ new simgrid::instr::VarCollTIData(
+ "isendRecv", -1, sendcount,
+ dst_hack, recvcount, src_hack,
+ simgrid::smpi::Datatype::encode(sendtype), simgrid::smpi::Datatype::encode(recvtype)));
+
+ TRACE_smpi_send(my_proc_id, my_proc_id, dst_traced, sendtag, sendcount * sendtype->size());
+
+ simgrid::smpi::Request::isendrecv(sendbuf, sendcount, sendtype, dst, sendtag, recvbuf, recvcount, recvtype, src,
+ recvtag, comm, request);
+ retval = MPI_SUCCESS;
+
+ TRACE_smpi_recv(src_traced, my_proc_id, recvtag);
+ TRACE_smpi_comm_out(my_proc_id);
+ }
+
+ return retval;
+}
+
+
int PMPI_Sendrecv_replace(void* buf, int count, MPI_Datatype datatype, int dst, int sendtag, int src, int recvtag,
MPI_Comm comm, MPI_Status* status)
{
CHECK_BUFFER(1, buf, count, datatype)
int size = datatype->get_extent() * count;
- xbt_assert(size > 0);
+ if (size == 0)
+ return MPI_SUCCESS;
+ else if (size <0)
+ return MPI_ERR_ARG;
std::vector<char> recvbuf(size);
retval =
MPI_Sendrecv(buf, count, datatype, dst, sendtag, recvbuf.data(), count, datatype, src, recvtag, comm, status);
return retval;
}
+int PMPI_Isendrecv_replace(void* buf, int count, MPI_Datatype datatype, int dst, int sendtag, int src, int recvtag,
+ MPI_Comm comm, MPI_Request* request)
+{
+ int retval = 0;
+ SET_BUF1(buf)
+ CHECK_COUNT(2, count)
+ CHECK_TYPE(3, datatype)
+ CHECK_BUFFER(1, buf, count, datatype)
+ CHECK_REQUEST(10)
+ *request = MPI_REQUEST_NULL;
+
+ int size = datatype->get_extent() * count;
+ if (size == 0)
+ return MPI_SUCCESS;
+ else if (size <0)
+ return MPI_ERR_ARG;
+ std::vector<char> sendbuf(size);
+ simgrid::smpi::Datatype::copy(buf, count, datatype, sendbuf.data(), count, datatype);
+ retval =
+ MPI_Isendrecv(sendbuf.data(), count, datatype, dst, sendtag, buf, count, datatype, src, recvtag, comm, request);
+ return retval;
+}
+
int PMPI_Test(MPI_Request * request, int *flag, MPI_Status * status)
{
int retval = 0;
- smpi_bench_end();
+ const SmpiBenchGuard suspend_bench;
if (request == nullptr || flag == nullptr) {
retval = MPI_ERR_ARG;
} else if (*request == MPI_REQUEST_NULL) {
}
retval = MPI_SUCCESS;
} else {
- int my_proc_id = ((*request)->comm() != MPI_COMM_NULL) ? simgrid::s4u::this_actor::get_pid() : -1;
+ aid_t my_proc_id = ((*request)->comm() != MPI_COMM_NULL) ? simgrid::s4u::this_actor::get_pid() : -1;
- TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("test"));
+ TRACE_smpi_comm_in(my_proc_id, __func__,
+ new simgrid::instr::WaitTIData("test", MPI_COMM_WORLD->group()->rank((*request)->src()),
+ MPI_COMM_WORLD->group()->rank((*request)->dst()),
+ (*request)->tag()));
retval = simgrid::smpi::Request::test(request,status, flag);
TRACE_smpi_comm_out(my_proc_id);
}
- smpi_bench_begin();
return retval;
}
{
int retval = 0;
CHECK_COUNT(1, count)
- smpi_bench_end();
+ const SmpiBenchGuard suspend_bench;
if (index == nullptr || flag == nullptr) {
retval = MPI_ERR_ARG;
} else {
- int my_proc_id = simgrid::s4u::this_actor::get_pid();
+ aid_t my_proc_id = simgrid::s4u::this_actor::get_pid();
TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("testany"));
retval = simgrid::smpi::Request::testany(count, requests, index, flag, status);
TRACE_smpi_comm_out(my_proc_id);
}
- smpi_bench_begin();
return retval;
}
{
int retval = 0;
CHECK_COUNT(1, count)
- smpi_bench_end();
+ const SmpiBenchGuard suspend_bench;
if (flag == nullptr) {
retval = MPI_ERR_ARG;
} else {
- int my_proc_id = simgrid::s4u::this_actor::get_pid();
+ aid_t my_proc_id = simgrid::s4u::this_actor::get_pid();
TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("testall"));
retval = simgrid::smpi::Request::testall(count, requests, flag, statuses);
TRACE_smpi_comm_out(my_proc_id);
}
- smpi_bench_begin();
return retval;
}
{
int retval = 0;
CHECK_COUNT(1, incount)
- smpi_bench_end();
+ const SmpiBenchGuard suspend_bench;
if (outcount == nullptr) {
retval = MPI_ERR_ARG;
} else {
- int my_proc_id = simgrid::s4u::this_actor::get_pid();
+ aid_t my_proc_id = simgrid::s4u::this_actor::get_pid();
TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("testsome"));
retval = simgrid::smpi::Request::testsome(incount, requests, outcount, indices, status);
TRACE_smpi_comm_out(my_proc_id);
}
- smpi_bench_begin();
return retval;
}
int PMPI_Probe(int source, int tag, MPI_Comm comm, MPI_Status* status) {
int retval = 0;
- smpi_bench_end();
+ const SmpiBenchGuard suspend_bench;
CHECK_COMM(6)
if(source!=MPI_ANY_SOURCE && source!=MPI_PROC_NULL)\
simgrid::smpi::Request::probe(source, tag, comm, status);
retval = MPI_SUCCESS;
}
- smpi_bench_begin();
return retval;
}
int PMPI_Iprobe(int source, int tag, MPI_Comm comm, int* flag, MPI_Status* status) {
int retval = 0;
- smpi_bench_end();
+ const SmpiBenchGuard suspend_bench;
CHECK_COMM(6)
if(source!=MPI_ANY_SOURCE && source!=MPI_PROC_NULL)\
CHECK_RANK(1, source, comm)
simgrid::smpi::Request::iprobe(source, tag, comm, flag, status);
retval = MPI_SUCCESS;
}
- smpi_bench_begin();
return retval;
}
-// TODO: cheinrich: Move declaration to other file? Rename this function - it's used for PMPI_Wait*?
-static void trace_smpi_recv_helper(MPI_Request* request, MPI_Status* status)
+static void trace_smpi_wait_recv_helper(MPI_Request* request, MPI_Status* status)
{
const simgrid::smpi::Request* req = *request;
// Requests already received are null. Is this request a wait for RECV?
if (req != MPI_REQUEST_NULL && (req->flags() & MPI_REQ_RECV)) {
- int src_traced = req->src();
- int dst_traced = req->dst();
+ aid_t src_traced = req->src();
+ aid_t dst_traced = req->dst();
// the src may not have been known at the beginning of the recv (MPI_ANY_SOURCE)
if (src_traced == MPI_ANY_SOURCE && status != MPI_STATUS_IGNORE)
src_traced = req->comm()->group()->actor(status->MPI_SOURCE);
{
int retval = 0;
- smpi_bench_end();
+ const SmpiBenchGuard suspend_bench;
simgrid::smpi::Status::empty(status);
- CHECK_NULL(1, MPI_ERR_ARG, request)
+ CHECK_NULL(1, MPI_ERR_ARG, request)
if (*request == MPI_REQUEST_NULL) {
retval = MPI_SUCCESS;
} else {
// for tracing, save the handle which might get overridden before we can use the helper on it
MPI_Request savedreq = *request;
- if (savedreq != MPI_REQUEST_NULL && not(savedreq->flags() & MPI_REQ_FINISHED)
- && not(savedreq->flags() & MPI_REQ_GENERALIZED))
+ if (not(savedreq->flags() & (MPI_REQ_FINISHED | MPI_REQ_GENERALIZED | MPI_REQ_NBC)))
savedreq->ref();//don't erase the handle in Request::wait, we'll need it later
else
savedreq = MPI_REQUEST_NULL;
- int my_proc_id = (*request)->comm() != MPI_COMM_NULL ? simgrid::s4u::this_actor::get_pid() : -1;
+ aid_t my_proc_id = (*request)->comm() != MPI_COMM_NULL ? simgrid::s4u::this_actor::get_pid() : -1;
TRACE_smpi_comm_in(my_proc_id, __func__,
- new simgrid::instr::WaitTIData((*request)->src(), (*request)->dst(), (*request)->tag()));
+ new simgrid::instr::WaitTIData("wait", MPI_COMM_WORLD->group()->rank((*request)->src()),
+ MPI_COMM_WORLD->group()->rank((*request)->dst()),
+ (*request)->tag()));
retval = simgrid::smpi::Request::wait(request, status);
//the src may not have been known at the beginning of the recv (MPI_ANY_SOURCE)
TRACE_smpi_comm_out(my_proc_id);
- trace_smpi_recv_helper(&savedreq, status);
+ trace_smpi_wait_recv_helper(&savedreq, status);
if (savedreq != MPI_REQUEST_NULL)
simgrid::smpi::Request::unref(&savedreq);
}
- smpi_bench_begin();
return retval;
}
if (count <= 0)
return MPI_SUCCESS;
- smpi_bench_end();
+ const SmpiBenchGuard suspend_bench;
// for tracing, save the handles which might get overridden before we can use the helper on it
std::vector<MPI_Request> savedreqs(requests, requests + count);
for (MPI_Request& req : savedreqs) {
- if (req != MPI_REQUEST_NULL && not(req->flags() & MPI_REQ_FINISHED))
+ if (req != MPI_REQUEST_NULL && not(req->flags() & (MPI_REQ_FINISHED | MPI_REQ_NBC)))
req->ref();
else
req = MPI_REQUEST_NULL;
}
- int rank_traced = simgrid::s4u::this_actor::get_pid(); // FIXME: In PMPI_Wait, we check if the comm is null?
+ aid_t rank_traced = simgrid::s4u::this_actor::get_pid(); // FIXME: In PMPI_Wait, we check if the comm is null?
TRACE_smpi_comm_in(rank_traced, __func__, new simgrid::instr::CpuTIData("waitAny", count));
*index = simgrid::smpi::Request::waitany(count, requests, status);
if(*index!=MPI_UNDEFINED){
- trace_smpi_recv_helper(&savedreqs[*index], status);
+ trace_smpi_wait_recv_helper(&savedreqs[*index], status);
TRACE_smpi_comm_out(rank_traced);
}
if (req != MPI_REQUEST_NULL)
simgrid::smpi::Request::unref(&req);
- smpi_bench_begin();
return MPI_SUCCESS;
}
int PMPI_Waitall(int count, MPI_Request requests[], MPI_Status status[])
{
- smpi_bench_end();
+ const SmpiBenchGuard suspend_bench;
CHECK_COUNT(1, count)
// for tracing, save the handles which might get overridden before we can use the helper on it
std::vector<MPI_Request> savedreqs(requests, requests + count);
for (MPI_Request& req : savedreqs) {
- if (req != MPI_REQUEST_NULL && not(req->flags() & MPI_REQ_FINISHED))
+ if (req != MPI_REQUEST_NULL && not(req->flags() & (MPI_REQ_FINISHED | MPI_REQ_NBC)))
req->ref();
else
req = MPI_REQUEST_NULL;
}
- int rank_traced = simgrid::s4u::this_actor::get_pid(); // FIXME: In PMPI_Wait, we check if the comm is null?
+ aid_t rank_traced = simgrid::s4u::this_actor::get_pid(); // FIXME: In PMPI_Wait, we check if the comm is null?
TRACE_smpi_comm_in(rank_traced, __func__, new simgrid::instr::CpuTIData("waitall", count));
int retval = simgrid::smpi::Request::waitall(count, requests, status);
for (int i = 0; i < count; i++) {
- trace_smpi_recv_helper(&savedreqs[i], status!=MPI_STATUSES_IGNORE ? &status[i]: MPI_STATUS_IGNORE);
+ trace_smpi_wait_recv_helper(&savedreqs[i], status != MPI_STATUSES_IGNORE ? &status[i] : MPI_STATUS_IGNORE);
}
TRACE_smpi_comm_out(rank_traced);
if (req != MPI_REQUEST_NULL)
simgrid::smpi::Request::unref(&req);
- smpi_bench_begin();
return retval;
}
{
int retval = 0;
CHECK_COUNT(1, incount)
- smpi_bench_end();
+ const SmpiBenchGuard suspend_bench;
if (outcount == nullptr) {
retval = MPI_ERR_ARG;
} else {
*outcount = simgrid::smpi::Request::waitsome(incount, requests, indices, status);
retval = MPI_SUCCESS;
}
- smpi_bench_begin();
return retval;
}
{
int retval = 0;
- smpi_bench_end();
+ const SmpiBenchGuard suspend_bench;
CHECK_REQUEST_VALID(1)
if (*request == MPI_REQUEST_NULL) {
retval = MPI_ERR_REQUEST;
(*request)->cancel();
retval = MPI_SUCCESS;
}
- smpi_bench_begin();
return retval;
}
return MPI_ERR_ARG;
}
*flag=simgrid::smpi::Status::cancelled(status);
- return MPI_SUCCESS;
+ return MPI_SUCCESS;
}
int PMPI_Status_set_cancelled(MPI_Status* status, int flag){
return MPI_ERR_ARG;
}
simgrid::smpi::Status::set_cancelled(status,flag);
- return MPI_SUCCESS;
+ return MPI_SUCCESS;
}
int PMPI_Status_set_elements(MPI_Status* status, MPI_Datatype datatype, int count){
