Torus model revision: adding bubble flow control for deadlock prevention and...

Torus model revision: adding bubble flow control for deadlock prevention and updated congestion control

codes/net/torus.h

@@ -37,6 +37,7 @@ struct nodes_message
   /* for saving recv and total times*/
   tw_stime saved_recv_time;
   tw_stime saved_total_time;
+  tw_stime saved_busy_time;
 
   /* packet ID */
   unsigned long long packet_ID;

src/models/network-workloads/conf/modelnet-mpi-test-dragonfly.conf

@@ -18,12 +18,12 @@ PARAMS
    # modelnet_scheduler="round-robin";
    num_vcs="1";
    num_routers="4";
-   local_vc_size="8192";
-   global_vc_size="16384";
-   cn_vc_size="8192";
+   local_vc_size="16384";
+   global_vc_size="32768";
+   cn_vc_size="16384";
    local_bandwidth="5.25";
    global_bandwidth="4.7";
    cn_bandwidth="5.25";
    message_size="552";
-   routing="adaptive";
+   routing="minimal";
 }

src/models/network-workloads/conf/modelnet-mpi-test-torus.conf

@@ -19,7 +19,7 @@ PARAMS
    n_dims="3";
    dim_length="4,4,2";
    link_bandwidth="10.0";
-   buffer_size="1310720";
+   buffer_size="8192";
    num_vc="1";
-   chunk_size="64"; 
+   chunk_size="512"; 
 }

src/models/networks/model-net/dragonfly.c

@@ -340,11 +340,6 @@ static int dragonfly_get_msg_sz(void)
 	   return sizeof(terminal_message);
 }
 
-static void free_nothing(void* ptr)
-{
-
-    /* Do nothing */
-}
 static void free_tmp(void * ptr)
 {
     struct dfly_qhash_entry * dfly = ptr; 
@@ -1436,7 +1431,9 @@ void packet_arrive(terminal_state * s, tw_bf * bf, terminal_message * msg,
 
     msg->saved_avg_time = s->total_time;
     s->total_time += (tw_now(lp) - msg->travel_start_time); 
-    
+
+    if(s->terminal_id == TRACK)
+        printf("\n Updating travel time %lf ", s->total_time);
     msg->saved_total_time = dragonfly_total_time;
     dragonfly_total_time += tw_now( lp ) - msg->travel_start_time;
     total_hops += msg->my_N_hop;

tests/conf/modelnet-test-torus.conf

@@ -2,7 +2,7 @@ LPGROUPS
 {
    MODELNET_GRP
    {
-      repetitions="32";
+      repetitions="16";
       server="1";
       modelnet_torus="1";
    }
@@ -15,10 +15,10 @@ PARAMS
    modelnet_scheduler="fcfs";
    # modelnet_scheduler="round-robin";
    message_size="360";
-   n_dims="4";
-   dim_length="4,2,2,2";
+   n_dims="3";
+   dim_length="4,2,2";
    link_bandwidth="2.0";
    buffer_size="4096";
    num_vc="1";
-   chunk_size="32";
+   chunk_size="512";
 }