-/* Copyright (c) 2009-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-2018. 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. */
{ \
if (action.size() < static_cast<unsigned long>(mandatory + 2)) \
THROWF(arg_error, 0, "%s replay failed.\n" \
- "%lu items were given on the line. First two should be process_id and action. " \
+ "%zu items were given on the line. First two should be process_id and action. " \
"This action needs after them %lu mandatory arguments, and accepts %lu optional ones. \n" \
"Please contact the Simgrid team if support is needed", \
- __FUNCTION__, action.size(), static_cast<unsigned long>(mandatory), \
- static_cast<unsigned long>(optional)); \
+ __func__, action.size(), static_cast<unsigned long>(mandatory), static_cast<unsigned long>(optional)); \
}
static void log_timed_action(simgrid::xbt::ReplayAction& action, double clock)
class GatherVArgParser : public CollCommParser {
public:
- int recv_sum;
+ int recv_size_sum;
std::shared_ptr<std::vector<int>> recvcounts;
std::vector<int> disps;
void parse(simgrid::xbt::ReplayAction& action, std::string name) override
}
else {
int datatype_index = 0, disp_index = 0;
- if (action.size() > 3 + 2 * comm_size) { /* datatype + disp are specified */
+ /* The 3 comes from "0 gather <sendcount>", which must always be present.
+ * The + comm_size is the recvcounts array, which must also be present
+ */
+ if (action.size() > 3 + comm_size + comm_size) { /* datatype + disp are specified */
datatype_index = 3 + comm_size;
disp_index = datatype_index + 1;
- } else if (action.size() > 3 + 2 * comm_size) { /* disps specified; datatype is not specified; use the default one */
+ } else if (action.size() > 3 + comm_size + 2) { /* disps specified; datatype is not specified; use the default one */
datatype_index = -1;
disp_index = 3 + comm_size;
- } else if (action.size() > 3 + comm_size) { /* only datatype, no disp specified */
+ } else if (action.size() > 3 + comm_size) { /* only datatype, no disp specified */
datatype_index = 3 + comm_size;
}
for (unsigned int i = 0; i < comm_size; i++) {
(*recvcounts)[i] = std::stoi(action[i + 3]);
}
- recv_sum = std::accumulate(recvcounts->begin(), recvcounts->end(), 0);
+ recv_size_sum = std::accumulate(recvcounts->begin(), recvcounts->end(), 0);
}
};
class ScatterVArgParser : public CollCommParser {
public:
- int recv_sum;
- int send_sum;
+ int recv_size_sum;
+ int send_size_sum;
std::shared_ptr<std::vector<int>> sendcounts;
std::vector<int> disps;
void parse(simgrid::xbt::ReplayAction& action, std::string name) override
for (unsigned int i = 0; i < comm_size; i++) {
(*sendcounts)[i] = std::stoi(action[i + 2]);
}
- send_sum = std::accumulate(sendcounts->begin(), sendcounts->end(), 0);
+ send_size_sum = std::accumulate(sendcounts->begin(), sendcounts->end(), 0);
root = (action.size() > 3 + comm_size) ? std::stoi(action[3 + comm_size]) : 0;
}
};
+class ReduceScatterArgParser : public CollCommParser {
+public:
+ int recv_size_sum;
+ std::shared_ptr<std::vector<int>> recvcounts;
+ std::vector<int> disps;
+ void parse(simgrid::xbt::ReplayAction& action, std::string name) override
+ {
+ /* The structure of the reducescatter action for the rank 0 (total 4 processes) is the following:
+ 0 reduceScatter 275427 275427 275427 204020 11346849 0
+ where:
+ 1) The first four values after the name of the action declare the recvcounts array
+ 2) The value 11346849 is the amount of instructions
+ 3) The last value corresponds to the datatype, see simgrid::smpi::Datatype::decode().
+ */
+ comm_size = MPI_COMM_WORLD->size();
+ CHECK_ACTION_PARAMS(action, comm_size+1, 1)
+ comp_size = parse_double(action[2+comm_size]);
+ recvcounts = std::shared_ptr<std::vector<int>>(new std::vector<int>(comm_size));
+ if (action.size() > 3 + comm_size)
+ datatype1 = simgrid::smpi::Datatype::decode(action[3 + comm_size]);
+
+ for (unsigned int i = 0; i < comm_size; i++) {
+ recvcounts->push_back(std::stoi(action[i + 2]));
+ }
+ recv_size_sum = std::accumulate(recvcounts->begin(), recvcounts->end(), 0);
+ }
+};
+
+class AllToAllVArgParser : public CollCommParser {
+public:
+ int recv_size_sum;
+ int send_size_sum;
+ std::shared_ptr<std::vector<int>> recvcounts;
+ std::shared_ptr<std::vector<int>> sendcounts;
+ std::vector<int> senddisps;
+ std::vector<int> recvdisps;
+ int send_buf_size;
+ int recv_buf_size;
+ void parse(simgrid::xbt::ReplayAction& action, std::string name) override
+ {
+ /* The structure of the allToAllV action for the rank 0 (total 4 processes) is the following:
+ 0 allToAllV 100 1 7 10 12 100 1 70 10 5
+ where:
+ 1) 100 is the size of the send buffer *sizeof(int),
+ 2) 1 7 10 12 is the sendcounts array
+ 3) 100*sizeof(int) is the size of the receiver buffer
+ 4) 1 70 10 5 is the recvcounts array
+ */
+ comm_size = MPI_COMM_WORLD->size();
+ CHECK_ACTION_PARAMS(action, 2*comm_size+2, 2)
+ sendcounts = std::shared_ptr<std::vector<int>>(new std::vector<int>(comm_size));
+ recvcounts = std::shared_ptr<std::vector<int>>(new std::vector<int>(comm_size));
+ senddisps = std::vector<int>(comm_size, 0);
+ recvdisps = std::vector<int>(comm_size, 0);
+
+ if (action.size() > 5 + 2 * comm_size)
+ datatype1 = simgrid::smpi::Datatype::decode(action[4 + 2 * comm_size]);
+ if (action.size() > 5 + 2 * comm_size)
+ datatype2 = simgrid::smpi::Datatype::decode(action[5 + 2 * comm_size]);
+
+ send_buf_size=parse_double(action[2]);
+ recv_buf_size=parse_double(action[3+comm_size]);
+ for (unsigned int i = 0; i < comm_size; i++) {
+ (*sendcounts)[i] = std::stoi(action[3 + i]);
+ (*recvcounts)[i] = std::stoi(action[4 + comm_size + i]);
+ }
+ send_size_sum = std::accumulate(sendcounts->begin(), sendcounts->end(), 0);
+ recv_size_sum = std::accumulate(recvcounts->begin(), recvcounts->end(), 0);
+ }
+};
+
template <class T> class ReplayAction {
protected:
const std::string name;
int dst = request->comm()->group()->rank(request->dst());
bool is_wait_for_receive = (request->flags() & RECV);
// TODO: Here we take the rank while we normally take the process id (look for my_proc_id)
- TRACE_smpi_comm_in(rank, __FUNCTION__, new simgrid::instr::NoOpTIData("wait"));
+ TRACE_smpi_comm_in(rank, __func__, new simgrid::instr::NoOpTIData("wait"));
MPI_Status status;
Request::wait(&request, &status);
{
int dst_traced = MPI_COMM_WORLD->group()->actor(args.partner)->getPid();
- TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, new simgrid::instr::Pt2PtTIData(name, args.partner, args.size,
- Datatype::encode(args.datatype1)));
+ TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::Pt2PtTIData(name, args.partner, args.size,
+ Datatype::encode(args.datatype1)));
if (not TRACE_smpi_view_internals())
TRACE_smpi_send(my_proc_id, my_proc_id, dst_traced, 0, args.size * args.datatype1->size());
{
int src_traced = MPI_COMM_WORLD->group()->actor(args.partner)->getPid();
- TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, new simgrid::instr::Pt2PtTIData(name, args.partner, args.size,
- Datatype::encode(args.datatype1)));
+ TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::Pt2PtTIData(name, args.partner, args.size,
+ Datatype::encode(args.datatype1)));
MPI_Status status;
// unknown size from the receiver point of view
const unsigned int count_requests = get_reqq_self()->size();
if (count_requests > 0) {
- TRACE_smpi_comm_in(my_proc_id, __FUNCTION__,
- new simgrid::instr::Pt2PtTIData("waitAll", -1, count_requests, ""));
+ TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::Pt2PtTIData("waitAll", -1, count_requests, ""));
std::vector<std::pair</*sender*/int,/*recv*/int>> sender_receiver;
for (const auto& req : (*get_reqq_self())) {
if (req && (req->flags() & RECV)) {
BarrierAction() : ReplayAction("barrier") {}
void kernel(simgrid::xbt::ReplayAction& action) override
{
- TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, new simgrid::instr::NoOpTIData("barrier"));
+ TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("barrier"));
Colls::barrier(MPI_COMM_WORLD);
TRACE_smpi_comm_out(my_proc_id);
}
if (name == "gatherV") {
Colls::gatherv(send_buffer(args.send_size * args.datatype1->size()), args.send_size, args.datatype1,
- (rank == args.root) ? recv_buffer(args.recv_sum * args.datatype2->size()) : nullptr, args.recvcounts->data(), args.disps.data(), args.datatype2, args.root,
+ (rank == args.root) ? recv_buffer(args.recv_size_sum * args.datatype2->size()) : nullptr, args.recvcounts->data(), args.disps.data(), args.datatype2, args.root,
MPI_COMM_WORLD);
}
else {
Colls::allgatherv(send_buffer(args.send_size * args.datatype1->size()), args.send_size, args.datatype1,
- recv_buffer(args.recv_sum * args.datatype2->size()), args.recvcounts->data(), args.disps.data(), args.datatype2,
+ recv_buffer(args.recv_size_sum * args.datatype2->size()), args.recvcounts->data(), args.disps.data(), args.datatype2,
MPI_COMM_WORLD);
}
nullptr, Datatype::encode(args.datatype1),
Datatype::encode(args.datatype2)));
- Colls::scatterv((rank == args.root) ? send_buffer(args.send_sum * args.datatype1->size()) : nullptr, args.sendcounts->data(), args.disps.data(),
+ Colls::scatterv((rank == args.root) ? send_buffer(args.send_size_sum * args.datatype1->size()) : nullptr, args.sendcounts->data(), args.disps.data(),
args.datatype1, recv_buffer(args.recv_size * args.datatype2->size()), args.recv_size, args.datatype2, args.root,
MPI_COMM_WORLD);
TRACE_smpi_comm_out(my_proc_id);
}
};
-} // Replay Namespace
-static void action_reducescatter(simgrid::xbt::ReplayAction& action)
-{
- /* The structure of the reducescatter action for the rank 0 (total 4 processes) is the following:
- 0 reduceScatter 275427 275427 275427 204020 11346849 0
- where:
- 1) The first four values after the name of the action declare the recvcounts array
- 2) The value 11346849 is the amount of instructions
- 3) The last value corresponds to the datatype, see simgrid::smpi::Datatype::decode().
- */
- double clock = smpi_process()->simulated_elapsed();
- unsigned long comm_size = MPI_COMM_WORLD->size();
- CHECK_ACTION_PARAMS(action, comm_size+1, 1)
- int comp_size = parse_double(action[2+comm_size]);
- int my_proc_id = Actor::self()->getPid();
- std::shared_ptr<std::vector<int>> recvcounts(new std::vector<int>);
- MPI_Datatype MPI_CURRENT_TYPE =
- (action.size() > 3 + comm_size) ? simgrid::smpi::Datatype::decode(action[3 + comm_size]) : MPI_DEFAULT_TYPE;
-
- for (unsigned int i = 0; i < comm_size; i++) {
- recvcounts->push_back(std::stoi(action[i + 2]));
- }
- int size{std::accumulate(recvcounts->begin(), recvcounts->end(), 0)};
-
- TRACE_smpi_comm_in(my_proc_id, __FUNCTION__,
- new simgrid::instr::VarCollTIData("reduceScatter", -1, 0, nullptr, -1, recvcounts,
- std::to_string(comp_size), /* ugly hack to print comp_size */
- Datatype::encode(MPI_CURRENT_TYPE)));
-
- void *sendbuf = smpi_get_tmp_sendbuffer(size* MPI_CURRENT_TYPE->size());
- void *recvbuf = smpi_get_tmp_recvbuffer(size* MPI_CURRENT_TYPE->size());
-
- Colls::reduce_scatter(sendbuf, recvbuf, recvcounts->data(), MPI_CURRENT_TYPE, MPI_OP_NULL, MPI_COMM_WORLD);
- smpi_execute_flops(comp_size);
+class ReduceScatterAction : public ReplayAction<ReduceScatterArgParser> {
+public:
+ ReduceScatterAction() : ReplayAction("reduceScatter") {}
+ void kernel(simgrid::xbt::ReplayAction& action) override
+ {
+ TRACE_smpi_comm_in(my_proc_id, "action_reducescatter",
+ new simgrid::instr::VarCollTIData("reduceScatter", -1, 0, nullptr, -1, args.recvcounts,
+ std::to_string(args.comp_size), /* ugly hack to print comp_size */
+ Datatype::encode(args.datatype1)));
- TRACE_smpi_comm_out(my_proc_id);
- log_timed_action (action, clock);
-}
+ Colls::reduce_scatter(send_buffer(args.recv_size_sum * args.datatype1->size()), recv_buffer(args.recv_size_sum * args.datatype1->size()),
+ args.recvcounts->data(), args.datatype1, MPI_OP_NULL, MPI_COMM_WORLD);
-static void action_allToAllv(simgrid::xbt::ReplayAction& action)
-{
- /* The structure of the allToAllV action for the rank 0 (total 4 processes) is the following:
- 0 allToAllV 100 1 7 10 12 100 1 70 10 5
- where:
- 1) 100 is the size of the send buffer *sizeof(int),
- 2) 1 7 10 12 is the sendcounts array
- 3) 100*sizeof(int) is the size of the receiver buffer
- 4) 1 70 10 5 is the recvcounts array
- */
- double clock = smpi_process()->simulated_elapsed();
-
- unsigned long comm_size = MPI_COMM_WORLD->size();
- CHECK_ACTION_PARAMS(action, 2*comm_size+2, 2)
- std::shared_ptr<std::vector<int>> sendcounts(new std::vector<int>(comm_size));
- std::shared_ptr<std::vector<int>> recvcounts(new std::vector<int>(comm_size));
- std::vector<int> senddisps(comm_size, 0);
- std::vector<int> recvdisps(comm_size, 0);
-
- MPI_Datatype MPI_CURRENT_TYPE = (action.size() > 5 + 2 * comm_size)
- ? simgrid::smpi::Datatype::decode(action[4 + 2 * comm_size])
- : MPI_DEFAULT_TYPE;
- MPI_Datatype MPI_CURRENT_TYPE2{(action.size() > 5 + 2 * comm_size)
- ? simgrid::smpi::Datatype::decode(action[5 + 2 * comm_size])
- : MPI_DEFAULT_TYPE};
-
- int send_buf_size=parse_double(action[2]);
- int recv_buf_size=parse_double(action[3+comm_size]);
- int my_proc_id = Actor::self()->getPid();
- void *sendbuf = smpi_get_tmp_sendbuffer(send_buf_size* MPI_CURRENT_TYPE->size());
- void *recvbuf = smpi_get_tmp_recvbuffer(recv_buf_size* MPI_CURRENT_TYPE2->size());
-
- for (unsigned int i = 0; i < comm_size; i++) {
- (*sendcounts)[i] = std::stoi(action[3 + i]);
- (*recvcounts)[i] = std::stoi(action[4 + comm_size + i]);
+ smpi_execute_flops(args.comp_size);
+ TRACE_smpi_comm_out(my_proc_id);
}
- int send_size = std::accumulate(sendcounts->begin(), sendcounts->end(), 0);
- int recv_size = std::accumulate(recvcounts->begin(), recvcounts->end(), 0);
-
- TRACE_smpi_comm_in(my_proc_id, __FUNCTION__,
- new simgrid::instr::VarCollTIData("allToAllV", -1, send_size, sendcounts, recv_size, recvcounts,
- Datatype::encode(MPI_CURRENT_TYPE),
- Datatype::encode(MPI_CURRENT_TYPE2)));
+};
- Colls::alltoallv(sendbuf, sendcounts->data(), senddisps.data(), MPI_CURRENT_TYPE, recvbuf, recvcounts->data(),
- recvdisps.data(), MPI_CURRENT_TYPE, MPI_COMM_WORLD);
+class AllToAllVAction : public ReplayAction<AllToAllVArgParser> {
+public:
+ AllToAllVAction() : ReplayAction("allToAllV") {}
+ void kernel(simgrid::xbt::ReplayAction& action) override
+ {
+ TRACE_smpi_comm_in(my_proc_id, __func__,
+ new simgrid::instr::VarCollTIData(
+ "allToAllV", -1, args.send_size_sum, args.sendcounts, args.recv_size_sum, args.recvcounts,
+ Datatype::encode(args.datatype1), Datatype::encode(args.datatype2)));
- TRACE_smpi_comm_out(my_proc_id);
- log_timed_action (action, clock);
-}
+ Colls::alltoallv(send_buffer(args.send_buf_size * args.datatype1->size()), args.sendcounts->data(), args.senddisps.data(), args.datatype1,
+ recv_buffer(args.recv_buf_size * args.datatype2->size()), args.recvcounts->data(), args.recvdisps.data(), args.datatype2, MPI_COMM_WORLD);
+ TRACE_smpi_comm_out(my_proc_id);
+ }
+};
+} // Replay Namespace
}} // namespace simgrid::smpi
/** @brief Only initialize the replay, don't do it for real */
xbt_replay_action_register("reduce", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::Replay::ReduceAction().execute(action); });
xbt_replay_action_register("allReduce", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::Replay::AllReduceAction().execute(action); });
xbt_replay_action_register("allToAll", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::Replay::AllToAllAction().execute(action); });
- xbt_replay_action_register("allToAllV", simgrid::smpi::action_allToAllv);
+ xbt_replay_action_register("allToAllV", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::Replay::AllToAllVAction().execute(action); });
xbt_replay_action_register("gather", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::Replay::GatherAction("gather").execute(action); });
xbt_replay_action_register("scatter", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::Replay::ScatterAction().execute(action); });
xbt_replay_action_register("gatherV", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::Replay::GatherVAction("gatherV").execute(action); });
xbt_replay_action_register("scatterV", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::Replay::ScatterVAction().execute(action); });
xbt_replay_action_register("allGather", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::Replay::GatherAction("allGather").execute(action); });
xbt_replay_action_register("allGatherV", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::Replay::GatherVAction("allGatherV").execute(action); });
- xbt_replay_action_register("reduceScatter", simgrid::smpi::action_reducescatter);
+ xbt_replay_action_register("reduceScatter", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::Replay::ReduceScatterAction().execute(action); });
xbt_replay_action_register("compute", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::Replay::ComputeAction().execute(action); });
//if we have a delayed start, sleep here.
