1) Adding dragonfly adaptive and prog-adaptive routing algorithms--- still...

1) Adding dragonfly adaptive and prog-adaptive routing algorithms--- still testing with more workloads and crosschecking the computation 2) Two bug fixes in credit-based flow control

codes/net/dragonfly.h

@@ -32,6 +32,9 @@ struct terminal_message
   unsigned int src_terminal_id;
   /* local LP ID to calculate the radix of the sender node/router */
   unsigned int local_id;
+  /* message originating router id */
+  unsigned int origin_router_id;
+
   /* number of hops traversed by the packet */
   short my_N_hop;
   /* Intermediate LP ID from which this message is coming */

tests/Makefile.subdir

@@ -2,7 +2,8 @@
 check_PROGRAMS += tests/modelnet-test tests/modelnet-p2p-bw \
 				  tests/concurrent-msg-recv tests/modelnet-simplep2p-test \
 				  tests/modelnet-test-collective \
-				  tests/modelnet-prio-sched-test
+				  tests/modelnet-prio-sched-test \
+				  tests/modelnet-test-dragonfly
 
 TESTS += tests/modelnet-test.sh \
 	 tests/modelnet-test-torus.sh \
@@ -37,6 +38,10 @@ tests_modelnet_test_LDADD = $(testlib) ${CODES_BASE_LIBS}
 tests_modelnet_test_CFLAGS = ${CODES_BASE_CFLAGS}
 tests_modelnet_test_SOURCES = tests/modelnet-test.c
 
+tests_modelnet_test_dragonfly_LDADD = $(testlib) ${CODES_BASE_LIBS}
+tests_modelnet_test_dragonfly_CFLAGS = ${CODES_BASE_CFLAGS}
+tests_modelnet_test_dragonfly_SOURCES = tests/modelnet-test-dragonfly.c
+
 tests_modelnet_simplep2p_test_LDADD = $(testlib) ${CODES_BASE_LIBS}
 tests_modelnet_simplep2p_test_CFLAGS = ${CODES_BASE_CFLAGS}
 tests_modelnet_simplep2p_test_SOURCES = tests/modelnet-simplep2p-test.c

tests/conf/modelnet-test-dragonfly.conf

@@ -2,9 +2,9 @@ LPGROUPS
 {
    MODELNET_GRP
    {
-      repetitions="36";
-      server="2";
-      modelnet_dragonfly="2";
+      repetitions="264";
+      server="4";
+      modelnet_dragonfly="4";
       dragonfly_router="1";
    }
 }
@@ -17,13 +17,13 @@ PARAMS
    chunk_size="32";
    # modelnet_scheduler="round-robin";
    num_vcs="1";
-   num_routers="4";
-   local_vc_size="16384";
-   global_vc_size="32768";
-   cn_vc_size="16384";
+   num_routers="8";
+   local_vc_size="262144";
+   global_vc_size="262144";
+   cn_vc_size="65536";
    local_bandwidth="5.25";
    global_bandwidth="4.7";
    cn_bandwidth="5.25";
-   message_size="512";
-   routing="minimal";
+   message_size="256";
+   routing="adaptive";
 }