X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b4f5f7b99f3d61a9b5fc838e514179290b213548..a0717ebd450c0d360a4ef5c5898d51e3b12cbb81:/src/smpi/smpi_replay.c

diff --git a/src/smpi/smpi_replay.c b/src/smpi/smpi_replay.c
index 7214b99498..1f4b8421b0 100644
--- a/src/smpi/smpi_replay.c
+++ b/src/smpi/smpi_replay.c
@@ -13,12 +13,24 @@
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_replay,smpi,"Trace Replay with SMPI");
 
 int communicator_size = 0;
+static int active_processes = 0;
+xbt_dynar_t *reqq;
+
+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, " ");
+    XBT_VERB("%s %f", name, smpi_process_simulated_elapsed()-clock);
+    free(name);
+  }
+}
+
 
 typedef struct {
   xbt_dynar_t isends; /* of MPI_Request */
   xbt_dynar_t irecvs; /* of MPI_Request */
 } s_smpi_replay_globals_t, *smpi_replay_globals_t;
 
+
 /* Helper function */
 static double parse_double(const char *string)
 {
@@ -32,20 +44,31 @@ static double parse_double(const char *string)
 
 static void action_init(const char *const *action)
 {
+  int i;
   XBT_DEBUG("Initialize the counters");
   smpi_replay_globals_t globals =  xbt_new(s_smpi_replay_globals_t, 1);
   globals->isends = xbt_dynar_new(sizeof(MPI_Request),NULL);
   globals->irecvs = xbt_dynar_new(sizeof(MPI_Request),NULL);
-
+  
+  
   smpi_process_set_user_data((void*) globals);
 
   /* start a simulated timer */
   smpi_process_simulated_start();
+  /*initialize the number of active processes */
+  active_processes = smpi_process_count();
+
+  reqq=xbt_new0(xbt_dynar_t,active_processes);
+  
+  for(i=0;i<active_processes;i++){
+    reqq[i]=xbt_dynar_new(sizeof(MPI_Request),NULL);
+  }
+    
+  
 }
 
 static void action_finalize(const char *const *action)
 {
-  double sim_time= 1.;
   smpi_replay_globals_t globals =
       (smpi_replay_globals_t) smpi_process_get_user_data();
 
@@ -56,12 +79,6 @@ static void action_finalize(const char *const *action)
     xbt_dynar_free_container(&(globals->irecvs));
   }
   free(globals);
-  /* end the simulated timer */
-  sim_time = smpi_process_simulated_elapsed();
-  if (!smpi_process_index())
-    XBT_INFO("Simulation time %g", sim_time);
-  smpi_process_finalize();
-  smpi_process_destroy();
 }
 
 static void action_comm_size(const char *const *action)
@@ -69,25 +86,29 @@ static void action_comm_size(const char *const *action)
   double clock = smpi_process_simulated_elapsed();
 
   communicator_size = parse_double(action[2]);
+  log_timed_action (action, clock);
+}
 
-  if (XBT_LOG_ISENABLED(smpi_replay, xbt_log_priority_verbose)){
-    char *name = xbt_str_join_array(action, " ");
-    XBT_VERB("%s %f", name, smpi_process_simulated_elapsed()-clock);
-    free(name);
-  }
+static void action_comm_split(const char *const *action)
+{
+  double clock = smpi_process_simulated_elapsed();
+
+  log_timed_action (action, clock);
 }
 
+static void action_comm_dup(const char *const *action)
+{
+  double clock = smpi_process_simulated_elapsed();
+
+  log_timed_action (action, clock);
+}
 
 static void action_compute(const char *const *action)
 {
   double clock = smpi_process_simulated_elapsed();
   smpi_execute_flops(parse_double(action[2]));
 
-  if (XBT_LOG_ISENABLED(smpi_replay, xbt_log_priority_verbose)){
-    char *name = xbt_str_join_array(action, " ");
-    XBT_VERB("%s %f", name, smpi_process_simulated_elapsed()-clock);
-    free(name);
-  }
+  log_timed_action (action, clock);
 }
 
 static void action_send(const char *const *action)
@@ -105,11 +126,7 @@ static void action_send(const char *const *action)
 
   smpi_mpi_send(NULL, size, MPI_BYTE, to , 0, MPI_COMM_WORLD);
 
-  if (XBT_LOG_ISENABLED(smpi_replay, xbt_log_priority_verbose)){
-    char *name = xbt_str_join_array(action, " ");
-    XBT_VERB("%s %f", name, smpi_process_simulated_elapsed()-clock);
-    free(name);
-  }
+  log_timed_action (action, clock);
 
   #ifdef HAVE_TRACING
   TRACE_smpi_ptp_out(rank, rank, dst_traced, __FUNCTION__);
@@ -123,6 +140,7 @@ static void action_Isend(const char *const *action)
   int to = atoi(action[2]);
   double size=parse_double(action[3]);
   double clock = smpi_process_simulated_elapsed();
+  MPI_Request request;
   smpi_replay_globals_t globals =
      (smpi_replay_globals_t) smpi_process_get_user_data();
 #ifdef HAVE_TRACING
@@ -133,8 +151,8 @@ static void action_Isend(const char *const *action)
   TRACE_smpi_send(rank, rank, dst_traced);
 #endif
 
-  MPI_Request request = smpi_mpi_isend(NULL, size, MPI_BYTE, to, 0,
-                                       MPI_COMM_WORLD);
+  request = smpi_mpi_isend(NULL, size, MPI_BYTE, to, 0,MPI_COMM_WORLD);
+  
 #ifdef HAVE_TRACING
   TRACE_smpi_ptp_out(rank, rank, dst_traced, __FUNCTION__);
   request->send = 1;
@@ -142,13 +160,9 @@ static void action_Isend(const char *const *action)
 #endif
 
   xbt_dynar_push(globals->isends,&request);
+  xbt_dynar_push(reqq[smpi_comm_rank(MPI_COMM_WORLD)],&request);
 
-  //TODO do the asynchronous cleanup
-  if (XBT_LOG_ISENABLED(smpi_replay, xbt_log_priority_verbose)){
-    char *name = xbt_str_join_array(action, " ");
-    XBT_VERB("%s %f", name, smpi_process_simulated_elapsed()-clock);
-    free(name);
-  }
+  log_timed_action (action, clock);
 }
 
 static void action_recv(const char *const *action) {
@@ -172,11 +186,7 @@ static void action_recv(const char *const *action) {
   TRACE_smpi_computing_in(rank);
 #endif
 
-  if (XBT_LOG_ISENABLED(smpi_replay, xbt_log_priority_verbose)){
-    char *name = xbt_str_join_array(action, " ");
-    XBT_VERB("%s %f", name, smpi_process_simulated_elapsed()-clock);
-    free(name);
-  }
+  log_timed_action (action, clock);
 }
 
 static void action_Irecv(const char *const *action)
@@ -195,18 +205,15 @@ static void action_Irecv(const char *const *action)
 #endif
 
   request = smpi_mpi_irecv(NULL, size, MPI_BYTE, from, 0, MPI_COMM_WORLD);
+  
 #ifdef HAVE_TRACING
   TRACE_smpi_ptp_out(rank, src_traced, rank, __FUNCTION__);
   request->recv = 1;
 #endif
   xbt_dynar_push(globals->irecvs,&request);
+  xbt_dynar_push(reqq[smpi_comm_rank(MPI_COMM_WORLD)],&request);
 
-  //TODO do the asynchronous cleanup
-  if (XBT_LOG_ISENABLED(smpi_replay, xbt_log_priority_verbose)){
-    char *name = xbt_str_join_array(action, " ");
-    XBT_VERB("%s %f", name, smpi_process_simulated_elapsed()-clock);
-    free(name);
-  }
+  log_timed_action (action, clock);
 }
 
 static void action_wait(const char *const *action){
@@ -241,11 +248,82 @@ static void action_wait(const char *const *action){
   TRACE_smpi_computing_in(rank);
 #endif
 
-  if (XBT_LOG_ISENABLED(smpi_replay, xbt_log_priority_verbose)){
-    char *name = xbt_str_join_array(action, " ");
-    XBT_VERB("%s %f", name, smpi_process_simulated_elapsed()-clock);
-    free(name);
+  log_timed_action (action, clock);
+}
+
+static void action_waitall(const char *const *action){
+  double clock = smpi_process_simulated_elapsed();
+  int count_requests=0,req_counts=0,i=0;
+    smpi_replay_globals_t globals =
+      (smpi_replay_globals_t) smpi_process_get_user_data();
+
+  count_requests=xbt_dynar_length(reqq[smpi_comm_rank(MPI_COMM_WORLD)]);
+
+  if (count_requests>0) {
+    MPI_Request requests[count_requests];
+    MPI_Status status[count_requests];
+  
+    for(i=0;i<count_requests;i++){
+      xbt_dynar_foreach(reqq[smpi_comm_rank(MPI_COMM_WORLD)],i,requests[i]); 
+    }
+    
+  #ifdef HAVE_TRACING
+   //save information from requests
+ 
+   xbt_dynar_t srcs = xbt_dynar_new(sizeof(int), NULL);
+   xbt_dynar_t dsts = xbt_dynar_new(sizeof(int), NULL);
+   xbt_dynar_t recvs = xbt_dynar_new(sizeof(int), NULL);
+   for (i = 0; i < count_requests; i++) {
+    if(requests[i]){
+      int *asrc = xbt_new(int, 1);
+      int *adst = xbt_new(int, 1);
+      int *arecv = xbt_new(int, 1);
+      *asrc = requests[i]->src;
+      *adst = requests[i]->dst;
+      *arecv = requests[i]->recv;
+      xbt_dynar_insert_at(srcs, i, asrc);
+      xbt_dynar_insert_at(dsts, i, adst);
+      xbt_dynar_insert_at(recvs, i, arecv);
+      xbt_free(asrc);
+      xbt_free(adst);
+      xbt_free(arecv);
+    }else {
+      int *t = xbt_new(int, 1);
+      xbt_dynar_insert_at(srcs, i, t);
+      xbt_dynar_insert_at(dsts, i, t);
+      xbt_dynar_insert_at(recvs, i, t);
+      xbt_free(t);
+    }
+   }
+   int rank_traced = smpi_process_index();
+   TRACE_smpi_computing_out(rank_traced);
+
+   TRACE_smpi_ptp_in(rank_traced, -1, -1, __FUNCTION__);
+  #endif
+
+    smpi_mpi_waitall(count_requests, requests, status);
+
+  #ifdef HAVE_TRACING
+   for (i = 0; i < count_requests; i++) {
+    int src_traced, dst_traced, is_wait_for_receive;
+    xbt_dynar_get_cpy(srcs, i, &src_traced);
+    xbt_dynar_get_cpy(dsts, i, &dst_traced);
+    xbt_dynar_get_cpy(recvs, i, &is_wait_for_receive);
+    if (is_wait_for_receive) {
+      TRACE_smpi_recv(rank_traced, src_traced, dst_traced);
+    }
+   }
+   TRACE_smpi_ptp_out(rank_traced, -1, -1, __FUNCTION__);
+   //clean-up of dynars
+   xbt_dynar_free(&srcs);
+   xbt_dynar_free(&dsts);
+   xbt_dynar_free(&recvs);
+   TRACE_smpi_computing_in(rank_traced);
+  #endif
+   
+   xbt_dynar_reset(reqq[smpi_comm_rank(MPI_COMM_WORLD)]);
   }
+  log_timed_action (action, clock);
 }
 
 static void action_barrier(const char *const *action){
@@ -261,11 +339,7 @@ static void action_barrier(const char *const *action){
   TRACE_smpi_computing_in(rank);
 #endif
 
-  if (XBT_LOG_ISENABLED(smpi_replay, xbt_log_priority_verbose)){
-    char *name = xbt_str_join_array(action, " ");
-    XBT_VERB("%s %f", name, smpi_process_simulated_elapsed()-clock);
-    free(name);
-  }
+  log_timed_action (action, clock);
 }
 
 static void action_bcast(const char *const *action)
@@ -285,11 +359,7 @@ static void action_bcast(const char *const *action)
   TRACE_smpi_computing_in(rank);
 #endif
 
-  if (XBT_LOG_ISENABLED(smpi_replay, xbt_log_priority_verbose)){
-    char *name = xbt_str_join_array(action, " ");
-    XBT_VERB("%s %f", name, smpi_process_simulated_elapsed()-clock);
-    free(name);
-  }
+  log_timed_action (action, clock);
 }
 
 static void action_reduce(const char *const *action)
@@ -308,11 +378,7 @@ static void action_reduce(const char *const *action)
   TRACE_smpi_computing_in(rank);
 #endif
 
-  if (XBT_LOG_ISENABLED(smpi_replay, xbt_log_priority_verbose)){
-    char *name = xbt_str_join_array(action, " ");
-    XBT_VERB("%s %f", name, smpi_process_simulated_elapsed()-clock);
-    free(name);
-  }
+  log_timed_action (action, clock);
 }
 
 static void action_allReduce(const char *const *action) {
@@ -332,37 +398,100 @@ static void action_allReduce(const char *const *action) {
   TRACE_smpi_computing_in(rank);
 #endif
 
-  if (XBT_LOG_ISENABLED(smpi_replay, xbt_log_priority_verbose)){
-    char *name = xbt_str_join_array(action, " ");
-    XBT_VERB("%s %f", name, smpi_process_simulated_elapsed()-clock);
-    free(name);
+  log_timed_action (action, clock);
+}
+
+static void action_allToAll(const char *const *action) {
+  double clock = smpi_process_simulated_elapsed();
+  int comm_size = smpi_comm_size(MPI_COMM_WORLD);
+  int send_size = atoi(action[2]);
+  int recv_size = atoi(action[3]);
+  void *send = xbt_new0(int, send_size*comm_size);  
+  void *recv = xbt_new0(int, send_size*comm_size);
+
+
+#ifdef HAVE_TRACING
+  int rank = smpi_process_index();
+  TRACE_smpi_computing_out(rank);
+  TRACE_smpi_collective_in(rank, -1, __FUNCTION__);
+#endif
+
+  if (send_size < 200 && comm_size > 12) {
+    smpi_coll_tuned_alltoall_bruck(send, send_size, MPI_BYTE,
+                                   recv, recv_size, MPI_BYTE,
+                                   MPI_COMM_WORLD);
+  } else if (send_size < 3000) {
+  
+    smpi_coll_tuned_alltoall_basic_linear(send, send_size, MPI_BYTE,
+                                          recv, recv_size, MPI_BYTE,
+                                          MPI_COMM_WORLD);
+  } else {
+    smpi_coll_tuned_alltoall_pairwise(send, send_size, MPI_BYTE,
+                                      recv, recv_size, MPI_BYTE,
+                                      MPI_COMM_WORLD);
   }
+
+#ifdef HAVE_TRACING
+  TRACE_smpi_collective_out(rank, -1, __FUNCTION__);
+  TRACE_smpi_computing_in(rank);
+#endif
+
+  log_timed_action (action, clock);
+  xbt_free(send);
+  xbt_free(recv);
+}
+
+static void action_allToAllv(const char *const *action) {
+  double clock = smpi_process_simulated_elapsed();
+  int comm_size = smpi_comm_size(MPI_COMM_WORLD);
+
+//  PMPI_Alltoallv(NULL, send_size, send_disp,
+//                   MPI_BYTE, NULL, recv_size,
+//                   recv_disp, MPI_BYTE, MPI_COMM_WORLD);
+
+   
+  log_timed_action (action, clock);
+  
 }
 
 void smpi_replay_init(int *argc, char***argv){
   PMPI_Init(argc, argv);
   if (!smpi_process_index()){
     _xbt_replay_action_init();
-    xbt_replay_action_register("init",     action_init);
-    xbt_replay_action_register("finalize", action_finalize);
-    xbt_replay_action_register("comm_size",action_comm_size);
-    xbt_replay_action_register("send",     action_send);
-    xbt_replay_action_register("Isend",    action_Isend);
-    xbt_replay_action_register("recv",     action_recv);
-    xbt_replay_action_register("Irecv",    action_Irecv);
-    xbt_replay_action_register("wait",     action_wait);
-    xbt_replay_action_register("barrier",  action_barrier);
-    xbt_replay_action_register("bcast",    action_bcast);
-    xbt_replay_action_register("reduce",   action_reduce);
-    xbt_replay_action_register("allReduce",action_allReduce);
-    xbt_replay_action_register("compute",  action_compute);
+    xbt_replay_action_register("init",       action_init);
+    xbt_replay_action_register("finalize",   action_finalize);
+    xbt_replay_action_register("comm_size",  action_comm_size);
+    xbt_replay_action_register("comm_split", action_comm_split);
+    xbt_replay_action_register("comm_dup",   action_comm_dup);
+    xbt_replay_action_register("send",       action_send);
+    xbt_replay_action_register("Isend",      action_Isend);
+    xbt_replay_action_register("recv",       action_recv);
+    xbt_replay_action_register("Irecv",      action_Irecv);
+    xbt_replay_action_register("wait",       action_wait);
+    xbt_replay_action_register("waitAll",    action_waitall);
+    xbt_replay_action_register("barrier",    action_barrier);
+    xbt_replay_action_register("bcast",      action_bcast);
+    xbt_replay_action_register("reduce",     action_reduce);
+    xbt_replay_action_register("allReduce",  action_allReduce);
+    xbt_replay_action_register("allToAll",   action_allToAll);
+    xbt_replay_action_register("allToAllV",  action_allToAllv);
+    xbt_replay_action_register("compute",    action_compute);
   }
 
   xbt_replay_action_runner(*argc, *argv);
 }
 
 int smpi_replay_finalize(){
-  if(!smpi_process_index())
-     _xbt_replay_action_exit();
+  double sim_time= 1.;
+  /* One active process will stop. Decrease the counter*/
+  active_processes--;
+  if(!active_processes){
+    /* Last process alive speaking */
+    /* end the simulated timer */
+    xbt_dynar_free(reqq);
+    sim_time = smpi_process_simulated_elapsed();
+    XBT_INFO("Simulation time %g", sim_time);
+    _xbt_replay_action_exit();
+  }
   return PMPI_Finalize();
 }