#include <simgrid/smpi/smpi_replay.hpp>
#include <src/smpi/include/private.hpp>
+#include <cmath>
+#include <limits>
#include <memory>
#include <numeric>
+#include <tuple>
#include <unordered_map>
#include <vector>
-#include <tuple>
-
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
};
}
-using req_key_t = std::tuple</*sender*/ int, /* receiver */ int, /* tag */ int>;
-using req_storage_t = std::unordered_map<req_key_t, MPI_Request, hash_tuple::hash<std::tuple<int, int, int>>>;
-
void log_timed_action(const simgrid::xbt::ReplayAction& action, double clock)
{
if (XBT_LOG_ISENABLED(smpi_replay, xbt_log_priority_verbose)){
/* Helper function */
static double parse_double(const std::string& string)
{
- return xbt_str_parse_double(string.c_str(), "%s is not a double");
+ return xbt_str_parse_double(string.c_str(), "not a double");
}
namespace simgrid {
class RequestStorage {
private:
- req_storage_t store;
+ using req_key_t = std::tuple</*sender*/ int, /* receiver */ int, /* tag */ int>;
+ using req_storage_t = std::unordered_map<req_key_t, MPI_Request, hash_tuple::hash<std::tuple<int, int, int>>>;
+
+ req_storage_t store;
public:
RequestStorage() = default;
- int size() const { return store.size(); }
+ size_t size() const { return store.size(); }
req_storage_t& get_store() { return store; }
void ReduceArgParser::parse(simgrid::xbt::ReplayAction& action, const std::string&)
{
CHECK_ACTION_PARAMS(action, 2, 2)
- comm_size = parse_double(action[2]);
+ double arg2 = trunc(parse_double(action[2]));
+ xbt_assert(0.0 <= arg2 && arg2 <= static_cast<double>(std::numeric_limits<unsigned>::max()));
+ comm_size = static_cast<unsigned>(arg2);
comp_size = parse_double(action[3]);
root = (action.size() > 4) ? std::stoi(action[4]) : 0;
if (action.size() > 5)
void AllReduceArgParser::parse(simgrid::xbt::ReplayAction& action, const std::string&)
{
CHECK_ACTION_PARAMS(action, 2, 1)
- comm_size = parse_double(action[2]);
+ double arg2 = trunc(parse_double(action[2]));
+ xbt_assert(0.0 <= arg2 && arg2 <= static_cast<double>(std::numeric_limits<unsigned>::max()));
+ comm_size = static_cast<unsigned>(arg2);
comp_size = parse_double(action[3]);
if (action.size() > 4)
datatype1 = simgrid::smpi::Datatype::decode(action[4]);
void WaitAllAction::kernel(simgrid::xbt::ReplayAction&)
{
- const unsigned int count_requests = req_storage.size();
+ const size_t count_requests = req_storage.size();
if (count_requests > 0) {
TRACE_smpi_comm_in(get_pid(), __func__, new simgrid::instr::Pt2PtTIData("waitall", -1, count_requests, ""));
const BcastArgParser& args = get_args();
TRACE_smpi_comm_in(get_pid(), "action_bcast",
new simgrid::instr::CollTIData("bcast", MPI_COMM_WORLD->group()->actor(args.root), -1.0, args.size,
- -1, Datatype::encode(args.datatype1), ""));
+ 0, Datatype::encode(args.datatype1), ""));
colls::bcast(send_buffer(args.size * args.datatype1->size()), args.size, args.datatype1, args.root, MPI_COMM_WORLD);
const ReduceArgParser& args = get_args();
TRACE_smpi_comm_in(get_pid(), "action_reduce",
new simgrid::instr::CollTIData("reduce", MPI_COMM_WORLD->group()->actor(args.root), args.comp_size,
- args.comm_size, -1, Datatype::encode(args.datatype1), ""));
+ args.comm_size, 0, Datatype::encode(args.datatype1), ""));
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,
{
const AllReduceArgParser& args = get_args();
TRACE_smpi_comm_in(get_pid(), "action_allreduce",
- new simgrid::instr::CollTIData("allreduce", -1, args.comp_size, args.comm_size, -1,
+ new simgrid::instr::CollTIData("allreduce", -1, args.comp_size, args.comm_size, 0,
Datatype::encode(args.datatype1), ""));
colls::allreduce(send_buffer(args.comm_size * args.datatype1->size()),
Datatype::encode(args.datatype1),
Datatype::encode(args.datatype2)));
- colls::alltoall(send_buffer(args.send_size * args.comm_size * args.datatype1->size()), args.send_size, args.datatype1,
- recv_buffer(args.recv_size * args.comm_size * args.datatype2->size()), args.recv_size, args.datatype2,
+ colls::alltoall(send_buffer(args.datatype1->size() * args.send_size * args.comm_size), args.send_size, args.datatype1,
+ recv_buffer(args.datatype2->size() * args.recv_size * args.comm_size), args.recv_size, args.datatype2,
MPI_COMM_WORLD);
TRACE_smpi_comm_out(get_pid());
if (get_name() == "gather") {
int rank = MPI_COMM_WORLD->rank();
colls::gather(send_buffer(args.send_size * args.datatype1->size()), args.send_size, args.datatype1,
- (rank == args.root) ? recv_buffer(args.recv_size * args.comm_size * args.datatype2->size()) : nullptr,
+ (rank == args.root) ? recv_buffer(args.datatype2->size() * args.recv_size * args.comm_size) : nullptr,
args.recv_size, args.datatype2, args.root, MPI_COMM_WORLD);
} else
colls::allgather(send_buffer(args.send_size * args.datatype1->size()), args.send_size, args.datatype1,
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, -1,
+ get_name(), (get_name() == "gatherv") ? args.root : -1, args.send_size, nullptr, 0,
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, -1, args.sendcounts, args.recv_size,
+ new simgrid::instr::VarCollTIData(get_name(), args.root, 0, 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, -1, args.recvcounts,
+ new simgrid::instr::VarCollTIData("reducescatter", -1, 0, nullptr, 0, args.recvcounts,
std::to_string(args.comp_size), /* ugly hack to print comp_size */
Datatype::encode(args.datatype1)));
const AllToAllVArgParser& args = get_args();
TRACE_smpi_comm_in(get_pid(), __func__,
new simgrid::instr::VarCollTIData(
- "alltoallv", -1, args.send_size_sum, args.sendcounts, args.recv_size_sum, args.recvcounts,
+ "alltoallv", 0, args.send_size_sum, args.sendcounts, args.recv_size_sum, args.recvcounts,
Datatype::encode(args.datatype1), Datatype::encode(args.datatype2)));
colls::alltoallv(send_buffer(args.send_buf_size * args.datatype1->size()), args.sendcounts->data(),
/* and now, finalize everything */
/* One active process will stop. Decrease the counter*/
unsigned int count_requests = storage[simgrid::s4u::this_actor::get_pid()].size();
- XBT_DEBUG("There are %ud elements in reqq[*]", count_requests);
+ XBT_DEBUG("There are %u elements in reqq[*]", count_requests);
if (count_requests > 0) {
std::vector<MPI_Request> requests(count_requests);
unsigned int i=0;