#include <sstream>
#include <vector>
-using simgrid::s4u::Actor;
-
#include <tuple>
// 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.
-namespace hash_tuple{
- template <typename TT>
- struct hash
- {
- size_t
- operator()(TT const& tt) const
- {
- return std::hash<TT>()(tt);
- }
- };
+namespace hash_tuple {
+template <typename TT> class hash {
+public:
+ size_t operator()(TT const& tt) const { return std::hash<TT>()(tt); }
+};
- template <class T>
- inline void hash_combine(std::size_t& seed, T const& v)
- {
- seed ^= hash_tuple::hash<T>()(v) + 0x9e3779b9 + (seed<<6) + (seed>>2);
- }
+template <class T> inline void hash_combine(std::size_t& seed, T const& v)
+{
+ seed ^= hash_tuple::hash<T>()(v) + 0x9e3779b9 + (seed << 6) + (seed >> 2);
+}
- // Recursive template code derived from Matthieu M.
- template <class Tuple, size_t Index = std::tuple_size<Tuple>::value - 1>
- struct HashValueImpl
- {
- static void apply(size_t& seed, Tuple const& tuple)
- {
- HashValueImpl<Tuple, Index-1>::apply(seed, tuple);
- hash_combine(seed, std::get<Index>(tuple));
- }
- };
+// Recursive template code derived from Matthieu M.
+template <class Tuple, size_t Index = std::tuple_size<Tuple>::value - 1> class HashValueImpl {
+public:
+ static void apply(size_t& seed, Tuple const& tuple)
+ {
+ HashValueImpl<Tuple, Index - 1>::apply(seed, tuple);
+ hash_combine(seed, std::get<Index>(tuple));
+ }
+};
- template <class Tuple>
- struct HashValueImpl<Tuple,0>
- {
- static void apply(size_t& seed, Tuple const& tuple)
- {
- hash_combine(seed, std::get<0>(tuple));
- }
- };
+template <class Tuple> class HashValueImpl<Tuple, 0> {
+public:
+ static void apply(size_t& seed, Tuple const& tuple) { hash_combine(seed, std::get<0>(tuple)); }
+};
- template <typename ... TT>
- struct hash<std::tuple<TT...>>
- {
- size_t
- operator()(std::tuple<TT...> const& tt) const
- {
- size_t seed = 0;
- HashValueImpl<std::tuple<TT...> >::apply(seed, tt);
- return seed;
- }
- };
+template <typename... TT> class hash<std::tuple<TT...>> {
+public:
+ size_t operator()(std::tuple<TT...> const& tt) const
+ {
+ size_t seed = 0;
+ HashValueImpl<std::tuple<TT...>>::apply(seed, tt);
+ return seed;
+ }
+};
}
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_replay,smpi,"Trace Replay with SMPI");
template <class T> class ReplayAction {
protected:
const std::string name;
- RequestStorage* req_storage; // Points to the right storage for this process, nullptr except for Send/Recv/Wait/Test actions.
const int my_proc_id;
T args;
public:
- explicit ReplayAction(std::string name, RequestStorage& storage) : name(name), req_storage(&storage), my_proc_id(simgrid::s4u::this_actor::get_pid()) {}
- explicit ReplayAction(std::string name) : name(name), req_storage(nullptr), my_proc_id(simgrid::s4u::this_actor::get_pid()) {}
+ explicit ReplayAction(std::string name) : name(name), my_proc_id(simgrid::s4u::this_actor::get_pid()) {}
virtual ~ReplayAction() = default;
virtual void execute(simgrid::xbt::ReplayAction& action)
};
class WaitAction : public ReplayAction<WaitTestParser> {
+private:
+ RequestStorage& req_storage;
+
public:
- WaitAction(RequestStorage& storage) : ReplayAction("Wait", storage) {}
+ explicit WaitAction(RequestStorage& storage) : ReplayAction("Wait"), req_storage(storage) {}
void kernel(simgrid::xbt::ReplayAction& action) override
{
std::string s = boost::algorithm::join(action, " ");
- xbt_assert(req_storage->size(), "action wait not preceded by any irecv or isend: %s", s.c_str());
- MPI_Request request = req_storage->find(args.src, args.dst, args.tag);
- req_storage->remove(request);
+ xbt_assert(req_storage.size(), "action wait not preceded by any irecv or isend: %s", s.c_str());
+ MPI_Request request = req_storage.find(args.src, args.dst, args.tag);
+ req_storage.remove(request);
if (request == MPI_REQUEST_NULL) {
/* Assume that the trace is well formed, meaning the comm might have been caught by a MPI_test. Then just
};
class SendAction : public ReplayAction<SendRecvParser> {
+private:
+ RequestStorage& req_storage;
+
public:
- SendAction() = delete;
- explicit SendAction(std::string name, RequestStorage& storage) : ReplayAction(name, storage) {}
+ explicit SendAction(std::string name, RequestStorage& storage) : ReplayAction(name), req_storage(storage) {}
void kernel(simgrid::xbt::ReplayAction& action) override
{
int dst_traced = MPI_COMM_WORLD->group()->actor(args.partner)->get_pid();
Request::send(nullptr, args.size, args.datatype1, args.partner, args.tag, MPI_COMM_WORLD);
} else if (name == "Isend") {
MPI_Request request = Request::isend(nullptr, args.size, args.datatype1, args.partner, args.tag, MPI_COMM_WORLD);
- req_storage->add(request);
+ req_storage.add(request);
} else {
xbt_die("Don't know this action, %s", name.c_str());
}
};
class RecvAction : public ReplayAction<SendRecvParser> {
+private:
+ RequestStorage& req_storage;
+
public:
- RecvAction() = delete;
- explicit RecvAction(std::string name, RequestStorage& storage) : ReplayAction(name, storage) {}
+ explicit RecvAction(std::string name, RequestStorage& storage) : ReplayAction(name), req_storage(storage) {}
void kernel(simgrid::xbt::ReplayAction& action) override
{
int src_traced = MPI_COMM_WORLD->group()->actor(args.partner)->get_pid();
Request::recv(nullptr, args.size, args.datatype1, args.partner, args.tag, MPI_COMM_WORLD, &status);
} else if (name == "Irecv") {
MPI_Request request = Request::irecv(nullptr, args.size, args.datatype1, args.partner, args.tag, MPI_COMM_WORLD);
- req_storage->add(request);
+ req_storage.add(request);
}
TRACE_smpi_comm_out(my_proc_id);
};
class TestAction : public ReplayAction<WaitTestParser> {
+private:
+ RequestStorage& req_storage;
+
public:
- TestAction(RequestStorage& storage) : ReplayAction("Test", storage) {}
+ explicit TestAction(RequestStorage& storage) : ReplayAction("Test"), req_storage(storage) {}
void kernel(simgrid::xbt::ReplayAction& action) override
{
- MPI_Request request = req_storage->find(args.src, args.dst, args.tag);
- req_storage->remove(request);
+ MPI_Request request = req_storage.find(args.src, args.dst, args.tag);
+ req_storage.remove(request);
// if request is null here, this may mean that a previous test has succeeded
// Different times in traced application and replayed version may lead to this
// In this case, ignore the extra calls.
/* push back request in vector to be caught by a subsequent wait. if the test did succeed, the request is now
* nullptr.*/
if (request == MPI_REQUEST_NULL)
- req_storage->addNullRequest(args.src, args.dst, args.tag);
+ req_storage.addNullRequest(args.src, args.dst, args.tag);
else
- req_storage->add(request);
+ req_storage.add(request);
TRACE_smpi_testing_out(my_proc_id);
}
};
class WaitAllAction : public ReplayAction<ActionArgParser> {
+private:
+ RequestStorage& req_storage;
+
public:
- WaitAllAction(RequestStorage& storage) : ReplayAction("waitAll", storage) {}
+ explicit WaitAllAction(RequestStorage& storage) : ReplayAction("waitAll"), req_storage(storage) {}
void kernel(simgrid::xbt::ReplayAction& action) override
{
- const unsigned int count_requests = req_storage->size();
+ const unsigned int count_requests = req_storage.size();
if (count_requests > 0) {
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;
std::vector<MPI_Request> reqs;
- req_storage->get_requests(reqs);
+ req_storage.get_requests(reqs);
for (const auto& req : reqs) {
if (req && (req->flags() & RECV)) {
sender_receiver.push_back({req->src(), req->dst()});
}
MPI_Status status[count_requests];
Request::waitall(count_requests, &(reqs.data())[0], status);
+ req_storage.get_store().clear();
for (auto& pair : sender_receiver) {
TRACE_smpi_recv(pair.first, pair.second, 0);
