Dragonfly Plus: Model, Workload, and Config change

src/network-workloads/conf/dragonfly-custom/modelnet-test-dragonfly-plus-testing.conf

@@ -30,6 +30,10 @@ PARAMS
    num_level_chans="1";
    # number of groups in the network
    num_groups="4";
+
+# predefined threshold (T) deciding when to reassign packet to a lower priority queue
+   queue_threshold="50";
+
 # buffer size in bytes for local virtual channels
    local_vc_size="8192";
 #buffer size in bytes for global virtual channels

src/network-workloads/model-net-synthetic-dfly-plus.c

@@ -360,7 +360,8 @@ int main(
     int rank;
     int num_nets;
     int *net_ids;
-    int num_router_rows, num_router_cols;
+    int num_routers;
+    int num_router_leaf, num_router_spine;
 
     tw_opt_add(app_opt);
     tw_init(&argc, &argv);
@@ -399,15 +400,16 @@ int main(
     }
     num_servers_per_rep = codes_mapping_get_lp_count("MODELNET_GRP", 1, "nw-lp",
             NULL, 1);
-    configuration_get_value_int(&config, "PARAMS", "num_router_rows", NULL, &num_router_rows);
-    configuration_get_value_int(&config, "PARAMS", "num_router_cols", NULL, &num_router_cols);
+    configuration_get_value_int(&config, "PARAMS", "num_router_leaf", NULL, &num_router_leaf);
+    configuration_get_value_int(&config, "PARAMS", "num_router_spine", NULL, &num_router_spine);
+    configuration_get_value_int(&config, "PARAMS", "num_routers", NULL, &num_routers);
     configuration_get_value_int(&config, "PARAMS", "num_groups", NULL, &num_groups);
     configuration_get_value_int(&config, "PARAMS", "num_cns_per_router", NULL, &num_nodes_per_cn);
 
-    num_routers_per_grp = num_router_rows * num_router_cols;
+    num_routers_per_grp = num_routers;
 
-    num_nodes = num_groups * num_routers_per_grp * num_nodes_per_cn;
-    num_nodes_per_grp = num_routers_per_grp * num_nodes_per_cn;
+    num_nodes = num_groups * num_router_leaf * num_nodes_per_cn;
+    num_nodes_per_grp = num_router_leaf * num_nodes_per_cn;
 
     assert(num_nodes);