[SMPI] Datatypes: Make them all replayable

[simgrid.git] / src / smpi / internals / smpi_replay.cpp

diff --git a/src/smpi/internals/smpi_replay.cpp b/src/smpi/internals/smpi_replay.cpp
index 4be3f61..42c8904 100644 (file)
--- a/src/smpi/internals/smpi_replay.cpp
+++ b/src/smpi/internals/smpi_replay.cpp
@@ -26,13 +26,16 @@ static int active_processes  = 0;
 static std::unordered_map<int, std::vector<MPI_Request>*> reqq;
 
 static MPI_Datatype MPI_DEFAULT_TYPE;
-static MPI_Datatype MPI_CURRENT_TYPE;
 
 static int sendbuffer_size = 0;
 static char* sendbuffer    = nullptr;
 static int recvbuffer_size = 0;
 static char* recvbuffer    = nullptr;
 
+class ReplayActionArg {
+  ReplayActionArg() {}
+};
+
 static void log_timed_action (const char *const *action, double clock){
   if (XBT_LOG_ISENABLED(smpi_replay, xbt_log_priority_verbose)){
     char *name = xbt_str_join_array(action, " ");
@@ -93,53 +96,15 @@ static double parse_double(const char *string)
 //TODO: this logic should be moved inside the datatype class, to support all predefined types and get rid of is_replayable.
 static MPI_Datatype decode_datatype(const char *const action)
 {
-  switch(atoi(action)) {
-    case 0:
-      return MPI_DOUBLE;
-      break;
-    case 1:
-      return MPI_INT;
-      break;
-    case 2:
-      return MPI_CHAR;
-      break;
-    case 3:
-      return MPI_SHORT;
-      break;
-    case 4:
-      return MPI_LONG;
-      break;
-    case 5:
-      return MPI_FLOAT;
-      break;
-    case 6:
-      return MPI_BYTE;
-      break;
-    default:
-      return MPI_DEFAULT_TYPE;
-      break;
-  }
+  return simgrid::smpi::Datatype::decode(action);
 }
 
 const char* encode_datatype(MPI_Datatype datatype)
 {
-  if (datatype==MPI_BYTE)
-      return "";
-  if(datatype==MPI_DOUBLE)
-      return "0";
-  if(datatype==MPI_INT)
-      return "1";
-  if(datatype==MPI_CHAR)
-      return "2";
-  if(datatype==MPI_SHORT)
-      return "3";
-  if(datatype==MPI_LONG)
-    return "4";
-  if(datatype==MPI_FLOAT)
-      return "5";
-  // default - not implemented.
-  // do not warn here as we pass in this function even for other trace formats
-  return "-1";
+  if (datatype == nullptr) /* this actually does seem to be possible, had this in the scatter2 test */
+    return "-1";
+
+  return datatype->encode();
 }
 
 #define CHECK_ACTION_PARAMS(action, mandatory, optional) {\
@@ -215,7 +180,7 @@ static void action_send(const char *const *action)
   double size=parse_double(action[3]);
   double clock = smpi_process()->simulated_elapsed();
 
-  MPI_CURRENT_TYPE = (action[4]) ? decode_datatype(action[4]) : MPI_DEFAULT_TYPE;
+  MPI_Datatype MPI_CURRENT_TYPE = (action[4]) ? decode_datatype(action[4]) : MPI_DEFAULT_TYPE;
 
   int my_proc_id = Actor::self()->getPid();
   int dst_traced = MPI_COMM_WORLD->group()->actor(to)->getPid();
@@ -239,7 +204,7 @@ static void action_Isend(const char *const *action)
   double size=parse_double(action[3]);
   double clock = smpi_process()->simulated_elapsed();
 
-  MPI_CURRENT_TYPE = (action[4]) ? decode_datatype(action[4]) : MPI_DEFAULT_TYPE;
+  MPI_Datatype MPI_CURRENT_TYPE = (action[4]) ? decode_datatype(action[4]) : MPI_DEFAULT_TYPE;
 
   int my_proc_id = Actor::self()->getPid();
   int dst_traced = MPI_COMM_WORLD->group()->actor(to)->getPid();
@@ -264,7 +229,7 @@ static void action_recv(const char *const *action) {
   double clock = smpi_process()->simulated_elapsed();
   MPI_Status status;
 
-  MPI_CURRENT_TYPE = (action[4]) ? decode_datatype(action[4]) : MPI_DEFAULT_TYPE;
+  MPI_Datatype MPI_CURRENT_TYPE = (action[4]) ? decode_datatype(action[4]) : MPI_DEFAULT_TYPE;
 
   int my_proc_id = Actor::self()->getPid();
   int src_traced = MPI_COMM_WORLD->group()->actor(from)->getPid();
@@ -295,7 +260,7 @@ static void action_Irecv(const char *const *action)
   double size=parse_double(action[3]);
   double clock = smpi_process()->simulated_elapsed();
 
-  MPI_CURRENT_TYPE = (action[4]) ? decode_datatype(action[4]) : MPI_DEFAULT_TYPE;
+  MPI_Datatype MPI_CURRENT_TYPE = (action[4]) ? decode_datatype(action[4]) : MPI_DEFAULT_TYPE;
 
   int my_proc_id = Actor::self()->getPid();
   TRACE_smpi_comm_in(my_proc_id, __FUNCTION__,
@@ -422,7 +387,7 @@ static void action_bcast(const char *const *action)
   double clock = smpi_process()->simulated_elapsed();
   int root     = (action[3]) ? atoi(action[3]) : 0;
   /* Initialize MPI_CURRENT_TYPE in order to decrease the number of the checks */
-  MPI_CURRENT_TYPE = (action[3] && action[4]) ? decode_datatype(action[4]) : MPI_DEFAULT_TYPE;
+  MPI_Datatype MPI_CURRENT_TYPE = (action[3] && action[4]) ? decode_datatype(action[4]) : MPI_DEFAULT_TYPE;
 
   int my_proc_id = Actor::self()->getPid();
   TRACE_smpi_comm_in(my_proc_id, __FUNCTION__,
@@ -445,7 +410,7 @@ static void action_reduce(const char *const *action)
   double clock = smpi_process()->simulated_elapsed();
   int root         = (action[4]) ? atoi(action[4]) : 0;
 
-  MPI_CURRENT_TYPE = (action[4] && action[5]) ? decode_datatype(action[5]) : MPI_DEFAULT_TYPE;
+  MPI_Datatype MPI_CURRENT_TYPE = (action[4] && action[5]) ? decode_datatype(action[5]) : MPI_DEFAULT_TYPE;
 
   int my_proc_id = Actor::self()->getPid();
   TRACE_smpi_comm_in(my_proc_id, __FUNCTION__,
@@ -466,7 +431,7 @@ static void action_allReduce(const char *const *action) {
   double comm_size = parse_double(action[2]);
   double comp_size = parse_double(action[3]);
 
-  MPI_CURRENT_TYPE = (action[4]) ? decode_datatype(action[4]) : MPI_DEFAULT_TYPE;
+  MPI_Datatype MPI_CURRENT_TYPE = (action[4]) ? decode_datatype(action[4]) : MPI_DEFAULT_TYPE;
 
   double clock = smpi_process()->simulated_elapsed();
   int my_proc_id = Actor::self()->getPid();
@@ -488,7 +453,7 @@ static void action_allToAll(const char *const *action) {
   int comm_size = MPI_COMM_WORLD->size();
   int send_size = parse_double(action[2]);
   int recv_size = parse_double(action[3]);
-  MPI_CURRENT_TYPE = (action[4] && action[5]) ? decode_datatype(action[4]) : MPI_DEFAULT_TYPE;
+  MPI_Datatype MPI_CURRENT_TYPE = (action[4] && action[5]) ? decode_datatype(action[4]) : MPI_DEFAULT_TYPE;
   MPI_Datatype MPI_CURRENT_TYPE2{(action[4] && action[5]) ? decode_datatype(action[5]) : MPI_DEFAULT_TYPE};
 
   void *send = smpi_get_tmp_sendbuffer(send_size*comm_size* MPI_CURRENT_TYPE->size());
@@ -521,7 +486,7 @@ static void action_gather(const char *const *action) {
   int comm_size = MPI_COMM_WORLD->size();
   int send_size = parse_double(action[2]);
   int recv_size = parse_double(action[3]);
-  MPI_CURRENT_TYPE = (action[5] && action[6]) ? decode_datatype(action[5]) : MPI_DEFAULT_TYPE;
+  MPI_Datatype MPI_CURRENT_TYPE = (action[5] && action[6]) ? decode_datatype(action[5]) : MPI_DEFAULT_TYPE;
   MPI_Datatype MPI_CURRENT_TYPE2{(action[5] && action[6]) ? decode_datatype(action[6]) : MPI_DEFAULT_TYPE};
 
   void *send = smpi_get_tmp_sendbuffer(send_size* MPI_CURRENT_TYPE->size());
@@ -558,7 +523,7 @@ static void action_scatter(const char* const* action)
   int comm_size                  = MPI_COMM_WORLD->size();
   int send_size                  = parse_double(action[2]);
   int recv_size                  = parse_double(action[3]);
-  MPI_CURRENT_TYPE               = (action[5] && action[6]) ? decode_datatype(action[5]) : MPI_DEFAULT_TYPE;
+  MPI_Datatype MPI_CURRENT_TYPE  = (action[5] && action[6]) ? decode_datatype(action[5]) : MPI_DEFAULT_TYPE;
   MPI_Datatype MPI_CURRENT_TYPE2{(action[5] && action[6]) ? decode_datatype(action[6]) : MPI_DEFAULT_TYPE};
 
   void* send = smpi_get_tmp_sendbuffer(send_size * MPI_CURRENT_TYPE->size());
@@ -596,7 +561,7 @@ static void action_gatherv(const char *const *action) {
   std::vector<int> disps(comm_size, 0);
   std::shared_ptr<std::vector<int>> recvcounts(new std::vector<int>(comm_size));
 
-  MPI_CURRENT_TYPE =
+  MPI_Datatype MPI_CURRENT_TYPE =
       (action[4 + comm_size] && action[5 + comm_size]) ? decode_datatype(action[4 + comm_size]) : MPI_DEFAULT_TYPE;
   MPI_Datatype MPI_CURRENT_TYPE2{
       (action[4 + comm_size] && action[5 + comm_size]) ? decode_datatype(action[5 + comm_size]) : MPI_DEFAULT_TYPE};
@@ -643,7 +608,7 @@ static void action_scatterv(const char* const* action)
   std::vector<int> disps(comm_size, 0);
   std::shared_ptr<std::vector<int>> sendcounts(new std::vector<int>(comm_size));
 
-  MPI_CURRENT_TYPE =
+  MPI_Datatype MPI_CURRENT_TYPE =
       (action[4 + comm_size] && action[5 + comm_size]) ? decode_datatype(action[4 + comm_size]) : MPI_DEFAULT_TYPE;
   MPI_Datatype MPI_CURRENT_TYPE2{
       (action[4 + comm_size] && action[5 + comm_size]) ? decode_datatype(action[5 + comm_size]) : MPI_DEFAULT_TYPE};
@@ -686,7 +651,7 @@ static void action_reducescatter(const char *const *action) {
   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_CURRENT_TYPE = (action[3 + comm_size]) ? decode_datatype(action[3 + comm_size]) : MPI_DEFAULT_TYPE;
+  MPI_Datatype MPI_CURRENT_TYPE = (action[3 + comm_size]) ? decode_datatype(action[3 + comm_size]) : MPI_DEFAULT_TYPE;
 
   for(int i=0;i<comm_size;i++) {
     recvcounts->push_back(atoi(action[i + 2]));
@@ -722,7 +687,7 @@ static void action_allgather(const char *const *action) {
   int sendcount=atoi(action[2]);
   int recvcount=atoi(action[3]);
 
-  MPI_CURRENT_TYPE = (action[4] && action[5]) ? decode_datatype(action[4]) : MPI_DEFAULT_TYPE;
+  MPI_Datatype MPI_CURRENT_TYPE = (action[4] && action[5]) ? decode_datatype(action[4]) : MPI_DEFAULT_TYPE;
   MPI_Datatype MPI_CURRENT_TYPE2{(action[4] && action[5]) ? decode_datatype(action[5]) : MPI_DEFAULT_TYPE};
 
   void *sendbuf = smpi_get_tmp_sendbuffer(sendcount* MPI_CURRENT_TYPE->size());
@@ -754,11 +719,10 @@ static void action_allgatherv(const char *const *action) {
   int comm_size = MPI_COMM_WORLD->size();
   CHECK_ACTION_PARAMS(action, comm_size+1, 2)
   int sendcount=atoi(action[2]);
-  int recvcounts[comm_size];
+  std::shared_ptr<std::vector<int>> recvcounts(new std::vector<int>(comm_size));
   std::vector<int> disps(comm_size, 0);
-  int recv_sum=0;
 
-  MPI_CURRENT_TYPE =
+  MPI_Datatype MPI_CURRENT_TYPE =
       (action[3 + comm_size] && action[4 + comm_size]) ? decode_datatype(action[3 + comm_size]) : MPI_DEFAULT_TYPE;
   MPI_Datatype MPI_CURRENT_TYPE2{
       (action[3 + comm_size] && action[4 + comm_size]) ? decode_datatype(action[4 + comm_size]) : MPI_DEFAULT_TYPE};
@@ -766,22 +730,20 @@ static void action_allgatherv(const char *const *action) {
   void *sendbuf = smpi_get_tmp_sendbuffer(sendcount* MPI_CURRENT_TYPE->size());
 
   for(int i=0;i<comm_size;i++) {
-    recvcounts[i] = atoi(action[i+3]);
-    recv_sum=recv_sum+recvcounts[i];
+    (*recvcounts)[i] = atoi(action[i + 3]);
   }
+  int recv_sum  = std::accumulate(recvcounts->begin(), recvcounts->end(), 0);
   void *recvbuf = smpi_get_tmp_recvbuffer(recv_sum* MPI_CURRENT_TYPE2->size());
 
   int my_proc_id = Actor::self()->getPid();
 
-  std::vector<int>* trace_recvcounts = new std::vector<int>(recvcounts, recvcounts + comm_size);
-
   TRACE_smpi_comm_in(my_proc_id, __FUNCTION__,
-                     new simgrid::instr::VarCollTIData("allGatherV", -1, sendcount, nullptr, -1, trace_recvcounts,
+                     new simgrid::instr::VarCollTIData("allGatherV", -1, sendcount, nullptr, -1, recvcounts,
                                                        encode_datatype(MPI_CURRENT_TYPE),
                                                        encode_datatype(MPI_CURRENT_TYPE2)));
 
-  Colls::allgatherv(sendbuf, sendcount, MPI_CURRENT_TYPE, recvbuf, recvcounts, disps.data(), MPI_CURRENT_TYPE2,
-                          MPI_COMM_WORLD);
+  Colls::allgatherv(sendbuf, sendcount, MPI_CURRENT_TYPE, recvbuf, recvcounts->data(), disps.data(), MPI_CURRENT_TYPE2,
+                    MPI_COMM_WORLD);
 
   TRACE_smpi_comm_out(my_proc_id);
   log_timed_action (action, clock);
@@ -805,9 +767,9 @@ static void action_allToAllv(const char *const *action) {
   std::vector<int> senddisps(comm_size, 0);
   std::vector<int> recvdisps(comm_size, 0);
 
-  MPI_CURRENT_TYPE = (action[4 + 2 * comm_size] && action[5 + 2 * comm_size])
-                         ? decode_datatype(action[4 + 2 * comm_size])
-                         : MPI_DEFAULT_TYPE;
+  MPI_Datatype MPI_CURRENT_TYPE = (action[4 + 2 * comm_size] && action[5 + 2 * comm_size])
+                                      ? decode_datatype(action[4 + 2 * comm_size])
+                                      : MPI_DEFAULT_TYPE;
   MPI_Datatype MPI_CURRENT_TYPE2{(action[4 + 2 * comm_size] && action[5 + 2 * comm_size])
                                      ? decode_datatype(action[5 + 2 * comm_size])
                                      : MPI_DEFAULT_TYPE};