Commit 0981fdb3 authored by Misbah Mubarak's avatar Misbah Mubarak

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
parent b5b8f6d6
...@@ -32,6 +32,9 @@ struct terminal_message ...@@ -32,6 +32,9 @@ struct terminal_message
unsigned int src_terminal_id; unsigned int src_terminal_id;
/* local LP ID to calculate the radix of the sender node/router */ /* local LP ID to calculate the radix of the sender node/router */
unsigned int local_id; unsigned int local_id;
/* message originating router id */
unsigned int origin_router_id;
/* number of hops traversed by the packet */ /* number of hops traversed by the packet */
short my_N_hop; short my_N_hop;
/* Intermediate LP ID from which this message is coming */ /* Intermediate LP ID from which this message is coming */
......
This diff is collapsed.
...@@ -2,7 +2,8 @@ ...@@ -2,7 +2,8 @@
check_PROGRAMS += tests/modelnet-test tests/modelnet-p2p-bw \ check_PROGRAMS += tests/modelnet-test tests/modelnet-p2p-bw \
tests/concurrent-msg-recv tests/modelnet-simplep2p-test \ tests/concurrent-msg-recv tests/modelnet-simplep2p-test \
tests/modelnet-test-collective \ tests/modelnet-test-collective \
tests/modelnet-prio-sched-test tests/modelnet-prio-sched-test \
tests/modelnet-test-dragonfly
TESTS += tests/modelnet-test.sh \ TESTS += tests/modelnet-test.sh \
tests/modelnet-test-torus.sh \ tests/modelnet-test-torus.sh \
...@@ -37,6 +38,10 @@ tests_modelnet_test_LDADD = $(testlib) ${CODES_BASE_LIBS} ...@@ -37,6 +38,10 @@ tests_modelnet_test_LDADD = $(testlib) ${CODES_BASE_LIBS}
tests_modelnet_test_CFLAGS = ${CODES_BASE_CFLAGS} tests_modelnet_test_CFLAGS = ${CODES_BASE_CFLAGS}
tests_modelnet_test_SOURCES = tests/modelnet-test.c 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_LDADD = $(testlib) ${CODES_BASE_LIBS}
tests_modelnet_simplep2p_test_CFLAGS = ${CODES_BASE_CFLAGS} tests_modelnet_simplep2p_test_CFLAGS = ${CODES_BASE_CFLAGS}
tests_modelnet_simplep2p_test_SOURCES = tests/modelnet-simplep2p-test.c tests_modelnet_simplep2p_test_SOURCES = tests/modelnet-simplep2p-test.c
......
...@@ -2,9 +2,9 @@ LPGROUPS ...@@ -2,9 +2,9 @@ LPGROUPS
{ {
MODELNET_GRP MODELNET_GRP
{ {
repetitions="36"; repetitions="264";
server="2"; server="4";
modelnet_dragonfly="2"; modelnet_dragonfly="4";
dragonfly_router="1"; dragonfly_router="1";
} }
} }
...@@ -17,13 +17,13 @@ PARAMS ...@@ -17,13 +17,13 @@ PARAMS
chunk_size="32"; chunk_size="32";
# modelnet_scheduler="round-robin"; # modelnet_scheduler="round-robin";
num_vcs="1"; num_vcs="1";
num_routers="4"; num_routers="8";
local_vc_size="16384"; local_vc_size="262144";
global_vc_size="32768"; global_vc_size="262144";
cn_vc_size="16384"; cn_vc_size="65536";
local_bandwidth="5.25"; local_bandwidth="5.25";
global_bandwidth="4.7"; global_bandwidth="4.7";
cn_bandwidth="5.25"; cn_bandwidth="5.25";
message_size="512"; message_size="256";
routing="minimal"; routing="adaptive";
} }
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment