Updating CODES test suite, it may take a little longer to run make tests now

src/network-workloads/conf/modelnet-synthetic-fattree.conf

@@ -2,7 +2,8 @@ LPGROUPS
 {
    MODELNET_GRP
    {
-      repetitions="4";				#Number of leaf level switches
+      repetitions="4";				
+      #Number of leaf level switches
       server="2";
       modelnet_fattree="2";
       fattree_switch="2";
@@ -10,10 +11,14 @@ LPGROUPS
 }
 PARAMS
 {
-   ft_type="1";							# Only appears to be one type (type=0) in fattree.c
-   num_levels="2";						# Must be 1 < num_levels < 4
-   switch_count="2,4";					# Some sort of csv string. I'm thinking it's the number of switches per level
-   switch_radix="4,4";						# Another csv string. I'm thinking it's the radix of the switches per level. All switches within same level have same radix
+   # Only appears to be one type (type=0) in fattree.c
+   ft_type="1";							
+   # Must be 1 < num_levels < 4
+   num_levels="2";						
+   # Some sort of csv string. I'm thinking it's the number of switches per level
+   switch_count="2,4";					
+   # Another csv string. I'm thinking it's the radix of the switches per level. All switches within same level have same radix
+   switch_radix="4,4";						
    packet_size="512";
    modelnet_order=( "fattree" );
    # scheduler options

src/networks/model-net/dragonfly.c

@@ -2341,7 +2341,7 @@ dragonfly_terminal_final( terminal_state * s,
         sprintf(meta_fname, "dragonfly-msg-stats.meta");
 
         FILE * fp = fopen(meta_fname, "w");
-        fprintf(fp, "# Format <LP id> <Terminal ID> <Total Data Size> <Avg packet latency> <# Flits/Packets finished> <Avg hops> <Busy Time>");
+        fprintf(fp, "# Format <LP id> <Terminal ID> <Total Data Size> <Aggregate packet latency> <# Flits/Packets finished> <Avg hops> <Busy Time>");
 
         fclose(fp);
     }

tests/Makefile.subdir

@@ -9,6 +9,10 @@ check_PROGRAMS += tests/lp-io-test \
  tests/map-ctx-test \
  tests/modelnet-test \
  tests/modelnet-p2p-bw \
+ src/network-workloads/model-net-synthetic \
+ src/network-workloads/model-net-synthetic-fattree \
+ src/network-workloads/model-net-synthetic-slimfly \
+ src/network-workloads/model-net-synthetic-custom-dfly \
  tests/concurrent-msg-recv tests/modelnet-simplep2p-test \
  tests/modelnet-test-collective \
  tests/modelnet-prio-sched-test \
@@ -27,6 +31,9 @@ TESTS += tests/lp-io-test.sh \
  tests/modelnet-test-loggp.sh \
  tests/modelnet-test-dragonfly.sh \
  tests/modelnet-test-slimfly.sh \
+ tests/modelnet-test-dragonfly-synthetic.sh \
+ tests/modelnet-test-slimfly-synthetic.sh \
+ tests/modelnet-test-dragonfly-custom-synthetic.sh \
  tests/modelnet-p2p-bw-loggp.sh \
  tests/modelnet-prio-sched-test.sh
 

tests/modelnet-test-dragonfly-custom-synthetic.sh

+#!/bin/bash
+
+if [ -z $srcdir ]; then
+         echo srcdir variable not set.
+              exit 1
+ fi
+
+src/network-workloads/model-net-synthetic-custom-dfly --sync=1 --num_messages=1 -- $srcdir/src/network-workloads/conf/dragonfly-custom/modelnet-test-dragonfly-theta.conf 
+
+
+

tests/modelnet-test-dragonfly-synthetic.sh

+#!/bin/bash
+
+if [ -z $srcdir ]; then
+         echo srcdir variable not set.
+              exit 1
+ fi
+
+src/network-workloads/model-net-synthetic --sync=1 --num_messages=1 -- $srcdir/src/network-workloads/conf/modelnet-synthetic-dragonfly.conf 
+
+
+

tests/modelnet-test-dragonfly.sh

 #!/bin/bash
 
 tests/modelnet-test --sync=1 -- tests/conf/modelnet-test-dragonfly.conf
+
+

tests/modelnet-test-fattree-synthetic.sh

+#!/bin/bash
+
+if [ -z $srcdir ]; then
+         echo srcdir variable not set.
+              exit 1
+ fi
+
+src/network-workloads/model-net-synthetic-fattree --sync=1 --num_messages=1 -- $srcdir/src/network-workloads/conf/modelnet-synthetic-fattree.conf 
+
+
+

tests/modelnet-test-slimfly-synthetic.sh

+#!/bin/bash
+
+if [ -z $srcdir ]; then
+         echo srcdir variable not set.
+              exit 1
+ fi
+
+src/network-workloads/model-net-synthetic-slimfly --sync=1 -- $srcdir/src/network-workloads/conf/modelnet-synthetic-slimfly-min.conf 
+
+
+