/* 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. */
+#include "smpi_replay.hpp"
+#include "simgrid/s4u/Exec.hpp"
#include "smpi_coll.hpp"
#include "smpi_comm.hpp"
+#include "smpi_config.hpp"
#include "smpi_datatype.hpp"
#include "smpi_group.hpp"
#include "smpi_request.hpp"
+#include "src/smpi/include/private.hpp"
#include "xbt/replay.hpp"
-#include <simgrid/smpi/smpi_replay.hpp>
-#include <src/smpi/include/private.hpp>
#include <cmath>
#include <limits>
#include <vector>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_replay, smpi, "Trace Replay with SMPI");
-
// From https://stackoverflow.com/questions/7110301/generic-hash-for-tuples-in-unordered-map-unordered-set
// This is all just to make std::unordered_map work with std::tuple. If we need this in other places,
// this could go into a header file.
4) 0 is the send datatype id, see simgrid::smpi::Datatype::decode()
5) 0 is the recv datatype id, see simgrid::smpi::Datatype::decode()
*/
+ comm_size = MPI_COMM_WORLD->size();
CHECK_ACTION_PARAMS(action, 2, 3)
comm_size = MPI_COMM_WORLD->size();
send_size = parse_integer<int>(action[2]);
4) 0 is the send datatype id, see simgrid::smpi::Datatype::decode()
5) 0 is the recv datatype id, see simgrid::smpi::Datatype::decode()
*/
+ comm_size = MPI_COMM_WORLD->size();
CHECK_ACTION_PARAMS(action, comm_size + 1, 2)
recv_size = parse_integer<int>(action[2 + comm_size]);
disps = std::vector<int>(comm_size, 0);
datatype1 = parse_datatype(action, 3 + comm_size);
for (unsigned int i = 0; i < comm_size; i++) {
- recvcounts->push_back(std::stoi(action[i + 2]));
+ (*recvcounts)[i]= std::stoi(action[i + 2]);
}
recv_size_sum = std::accumulate(recvcounts->begin(), recvcounts->end(), 0);
}
+void ScanArgParser::parse(simgrid::xbt::ReplayAction& action, const std::string&)
+{
+ CHECK_ACTION_PARAMS(action, 2, 1)
+ size = parse_integer<size_t>(action[2]);
+ comp_size = parse_double(action[3]);
+ datatype1 = parse_datatype(action, 4);
+}
+
void AllToAllVArgParser::parse(simgrid::xbt::ReplayAction& action, const std::string&)
{
/* The structure of the alltoallv action for the rank 0 (total 4 processes) is the following:
colls::reduce(send_buffer(args.comm_size * args.datatype1->size()),
recv_buffer(args.comm_size * args.datatype1->size()), args.comm_size, args.datatype1, MPI_OP_NULL,
args.root, MPI_COMM_WORLD);
- if(args.comp_size != 0.0)
- private_execute_flops(args.comp_size);
+ if (args.comp_size != 0.0)
+ simgrid::s4u::this_actor::exec_init(args.comp_size)
+ ->set_name("computation")
+ ->start()
+ ->wait();
TRACE_smpi_comm_out(get_pid());
}
colls::allreduce(send_buffer(args.comm_size * args.datatype1->size()),
recv_buffer(args.comm_size * args.datatype1->size()), args.comm_size, args.datatype1, MPI_OP_NULL,
MPI_COMM_WORLD);
- if(args.comp_size != 0.0)
- private_execute_flops(args.comp_size);
+ if (args.comp_size != 0.0)
+ simgrid::s4u::this_actor::exec_init(args.comp_size)
+ ->set_name("computation")
+ ->start()
+ ->wait();
TRACE_smpi_comm_out(get_pid());
}
const GatherVArgParser& args = get_args();
TRACE_smpi_comm_in(get_pid(), get_name().c_str(),
new simgrid::instr::VarCollTIData(
- get_name(), (get_name() == "gatherv") ? args.root : -1, args.send_size, nullptr, 0,
+ get_name(), (get_name() == "gatherv") ? args.root : -1, args.send_size, nullptr, -1,
args.recvcounts, Datatype::encode(args.datatype1), Datatype::encode(args.datatype2)));
if (get_name() == "gatherv") {
int rank = MPI_COMM_WORLD->rank();
const ScatterVArgParser& args = get_args();
TRACE_smpi_comm_in(get_pid(), "action_scatterv",
- new simgrid::instr::VarCollTIData(get_name(), args.root, 0, args.sendcounts, args.recv_size,
+ new simgrid::instr::VarCollTIData(get_name(), args.root, -1, args.sendcounts, args.recv_size,
nullptr, Datatype::encode(args.datatype1),
Datatype::encode(args.datatype2)));
const ReduceScatterArgParser& args = get_args();
TRACE_smpi_comm_in(
get_pid(), "action_reducescatter",
- new simgrid::instr::VarCollTIData("reducescatter", -1, 0, nullptr, 0, args.recvcounts,
- std::to_string(args.comp_size), /* ugly hack to print comp_size */
+ new simgrid::instr::VarCollTIData(get_name(), -1, -1, nullptr, -1, args.recvcounts,
+ /* ugly as we use datatype field to pass computation as string */
+ /* and because of the trick to avoid getting 0.000000 when 0 is given */
+ args.comp_size == 0 ? "0" : std::to_string(args.comp_size),
Datatype::encode(args.datatype1)));
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);
+ if (args.comp_size != 0.0)
+ simgrid::s4u::this_actor::exec_init(args.comp_size)
+ ->set_name("computation")
+ ->start()
+ ->wait();
+ TRACE_smpi_comm_out(get_pid());
+}
- private_execute_flops(args.comp_size);
+void ScanAction::kernel(simgrid::xbt::ReplayAction&)
+{
+ const ScanArgParser& args = get_args();
+ TRACE_smpi_comm_in(get_pid(), "action_scan",
+ new simgrid::instr::CollTIData(get_name(), -1, args.comp_size,
+ args.size, 0, Datatype::encode(args.datatype1), ""));
+ if (get_name() == "scan")
+ colls::scan(send_buffer(args.size * args.datatype1->size()),
+ recv_buffer(args.size * args.datatype1->size()), args.size,
+ args.datatype1, MPI_OP_NULL, MPI_COMM_WORLD);
+ else
+ colls::exscan(send_buffer(args.size * args.datatype1->size()),
+ recv_buffer(args.size * args.datatype1->size()), args.size,
+ args.datatype1, MPI_OP_NULL, MPI_COMM_WORLD);
+
+ if (args.comp_size != 0.0)
+ simgrid::s4u::this_actor::exec_init(args.comp_size)
+ ->set_name("computation")
+ ->start()
+ ->wait();
TRACE_smpi_comm_out(get_pid());
}
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::xbt::ReplayAction& action) { simgrid::smpi::replay::ReduceScatterAction().execute(action); });
+ xbt_replay_action_register("scan", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::ScanAction("scan").execute(action); });
+ xbt_replay_action_register("exscan", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::ScanAction("exscan").execute(action); });
xbt_replay_action_register("compute", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::ComputeAction().execute(action); });
xbt_replay_action_register("sleep", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::SleepAction().execute(action); });
xbt_replay_action_register("location", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::LocationAction().execute(action); });
// Wait for the other actors to initialize also
simgrid::s4u::this_actor::yield();
}
+ if(_smpi_init_sleep > 0)
+ simgrid::s4u::this_actor::sleep_for(_smpi_init_sleep);
}
/** @brief actually run the replay after initialization */
