assigning minimal paths to df-dally

src/network-workloads/conf/dragonfly-custom/dfdally_8k.conf

@@ -12,6 +12,8 @@ LPGROUPS
 }
 PARAMS
 {
+   adaptive_threshold="8192";
+   minimal-bias="1";
    df-dally-vc = "1";
 # packet size in the network
    packet_size="4096";
@@ -45,16 +47,16 @@ PARAMS
 # Number of column channels
    num_col_chans="1";
 # ROSS message size
-   message_size="624";
+   message_size="640";
 # number of compute nodes connected to router, dictated by dragonfly config
 # file
    num_cns_per_router="8";
 # number of global channels per router
    num_global_channels="8";
 # network config file for intra-group connections
-   intra-group-connections="/Users/mmubarak/Documents/software_development/codes-neil/codes/src/network-workloads/conf/dragonfly-custom/dfdally_8k_intra";
+   intra-group-connections="/home/mubarak/codes-online/codes/src/network-workloads/conf/dragonfly-custom/dfdally_8k_intra";
 # network config file for inter-group connections
-   inter-group-connections="/Users/mmubarak/Documents/software_development/codes-neil/codes/src/network-workloads/conf/dragonfly-custom/dfdally_8k_inter";
+   inter-group-connections="/home/mubarak/codes-online/codes/src/network-workloads/conf/dragonfly-custom/dfdally_8k_inter";
 # routing protocol to be used
 #    routing="minimal";
    routing="prog-adaptive";

src/network-workloads/model-net-mpi-replay.c

@@ -32,7 +32,7 @@
 static int msg_size_hash_compare(
             void *key, struct qhash_head *link);
 
-static unsigned long perm_switch_thresh = 20971520;
+static unsigned long perm_switch_thresh = 8388608;
 
 /* NOTE: Message tracking works in sequential mode only! */
 static int debug_cols = 0;

src/networks/model-net/dragonfly-custom.C

@@ -27,7 +27,7 @@
 
 #define DUMP_CONNECTIONS 0
 #define CREDIT_SIZE 8
-#define DFLY_HASH_TABLE_SIZE 4999
+#define DFLY_HASH_TABLE_SIZE 100000
 // debugging parameters
 #define DEBUG_LP 892
 #define T_ID -1
@@ -2895,10 +2895,15 @@ router_packet_receive( router_state * s,
           (routing == ADAPTIVE || routing == PROG_ADAPTIVE) 
           && cur_chunk->msg.last_hop == TERMINAL)
   {
-      bf->c6 = 1;
-      do_local_adaptive_routing(s, lp, &(cur_chunk->msg), bf, dest_router_id, intm_router_id);
+      
+      //bf->c6 = 1;
+      //do_local_adaptive_routing(s, lp, &(cur_chunk->msg), bf, dest_router_id, intm_router_id);
+      cur_chunk->msg.path_type = MINIMAL;
   }
 
+  if(dest_router_id == s->router_id )
+	cur_chunk->msg.path_type = MINIMAL;
+
   next_path_type = cur_chunk->msg.path_type;
 
   if(cur_chunk->msg.path_type != MINIMAL && cur_chunk->msg.path_type != NON_MINIMAL)