Add DFDally work into its own model for merging

codes/model-net-lp.h

@@ -24,6 +24,7 @@ extern "C" {
 #include "net/dragonfly.h"
 #include "net/dragonfly-custom.h"
 #include "net/dragonfly-plus.h"
+#include "net/dragonfly-dally.h"
 #include "net/slimfly.h"
 #include "net/fattree.h"
 #include "net/loggp.h"
@@ -133,6 +134,7 @@ typedef struct model_net_wrap_msg {
         terminal_message        m_dfly;  // dragonfly
         terminal_custom_message        m_custom_dfly;  // dragonfly-custom
         terminal_plus_message        m_dfly_plus;  // dragonfly plus
+        terminal_dally_message        m_dally_dfly;  // dragonfly dally
         slim_terminal_message   m_slim;  // slimfly
 	fattree_message		m_fat;   // fattree
         loggp_message           m_loggp; // loggp

codes/model-net.h

@@ -76,6 +76,8 @@ typedef struct mn_stats mn_stats;
     X(EXPRESS_MESH_ROUTER, "modelnet_express_mesh_router", "express_mesh_router", &express_mesh_router_method)\
     X(DRAGONFLY_PLUS, "modelnet_dragonfly_plus", "dragonfly_plus", &dragonfly_plus_method)\
     X(DRAGONFLY_PLUS_ROUTER, "modelnet_dragonfly_plus_router", "dragonfly_plus_router", &dragonfly_plus_router_method)\
+    X(DRAGONFLY_DALLY, "modelnet_dragonfly_dally", "dragonfly_dally", &dragonfly_dally_method)\
+    X(DRAGONFLY_DALLY_ROUTER, "modelnet_dragonfly_dally_router", "dragonfly_dally_router", &dragonfly_dally_router_method)\
     X(MAX_NETS,  NULL,                 NULL,        NULL)
 
 #define X(a,b,c,d) a,

codes/net/dragonfly-dally.h

+/*
+ * Copyright (C) 2014 University of Chicago.
+ * See COPYRIGHT notice in top-level directory.
+ *
+ */
+
+#ifndef DRAGONFLY_DALLY_H
+#define DRAGONFLY_DALLY_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <ross.h>
+
+typedef struct terminal_dally_message terminal_dally_message;
+
+/* this message is used for both dragonfly compute nodes and routers */
+struct terminal_dally_message
+{
+  /* magic number */
+  int magic;
+  /* flit travel start time*/
+  tw_stime travel_start_time;
+ /* packet ID of the flit  */
+  unsigned long long packet_ID;
+  /* event type of the flit */
+  short  type;
+  /* category: comes from codes */
+  char category[CATEGORY_NAME_MAX];
+  /* store category hash in the event */
+  uint32_t category_hash;
+  /* final destination LP ID, this comes from codes can be a server or any other LP type*/
+  tw_lpid final_dest_gid;
+  /*sending LP ID from CODES, can be a server or any other LP type */
+  tw_lpid sender_lp;
+  tw_lpid sender_mn_lp; // source modelnet id
+ /* destination terminal ID of the dragonfly */
+  tw_lpid dest_terminal_id;
+  /* source terminal ID of the dragonfly */
+  unsigned int src_terminal_id;
+  /* message originating router id. MM: Can we calculate it through
+   * sender_mn_lp??*/
+  unsigned int origin_router_id;
+
+  /* number of hops traversed by the packet */
+  short my_N_hop;
+  short my_l_hop, my_g_hop;
+  short saved_channel;
+  short saved_vc;
+
+  int next_stop;
+
+  short nonmin_done;
+  /* Intermediate LP ID from which this message is coming */
+  unsigned int intm_lp_id;
+  /* last hop of the message, can be a terminal, local router or global router */
+  short last_hop;
+   /* For routing */
+  int intm_rtr_id;
+  int saved_src_dest;
+  int saved_src_chan;
+
+   uint32_t chunk_id;
+   uint32_t packet_size;
+   uint32_t message_id;
+   uint32_t total_size;
+
+   int remote_event_size_bytes;
+   int local_event_size_bytes;
+
+  // For buffer message
+   short vc_index;
+   int output_chan;
+   model_net_event_return event_rc;
+   int is_pull;
+   uint32_t pull_size;
+   int path_type;
+
+   /* for reverse computation */   
+   short num_rngs;
+   short num_cll;
+
+   int qos_index;
+   short last_saved_qos;
+   short qos_reset1;
+   short qos_reset2;
+
+   tw_stime saved_available_time;
+   tw_stime saved_avg_time;
+   tw_stime saved_rcv_time;
+   tw_stime saved_busy_time; 
+   tw_stime saved_total_time;
+   tw_stime saved_sample_time;
+   tw_stime msg_start_time;
+   tw_stime saved_busy_time_ross;
+   tw_stime saved_fin_chunks_ross;
+};
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* end of include guard: DRAGONFLY_H */
+
+/*
+ * Local variables:
+ *  c-indent-level: 4
+ *  c-basic-offset: 4
+ * End:
+ *
+ * vim: ft=c ts=8 sts=4 sw=4 expandtab
+ */

src/Makefile.subdir

@@ -94,6 +94,8 @@ nobase_include_HEADERS = \
 	codes/net/common-net.h \
 	codes/net/dragonfly.h \
 	codes/net/dragonfly-custom.h \
+	codes/net/dragonfly-dally.h \
+	codes/net/dragonfly-plus.h \
 	codes/net/slimfly.h \
 	codes/net/fattree.h \
 	codes/net/loggp.h \
@@ -162,6 +164,7 @@ src_libcodes_la_SOURCES =  \
 	src/networks/model-net/dragonfly.c \
 	src/networks/model-net/dragonfly-custom.C \
 	src/networks/model-net/dragonfly-plus.C \
+	src/networks/model-net/dragonfly-dally.C \
 	src/networks/model-net/slimfly.c \
 	src/networks/model-net/fattree.c \
 	src/networks/model-net/loggp.c \
@@ -196,6 +199,7 @@ bin_PROGRAMS += src/network-workloads/model-net-synthetic-custom-dfly
 bin_PROGRAMS += src/network-workloads/model-net-synthetic-slimfly
 bin_PROGRAMS += src/network-workloads/model-net-synthetic-fattree
 bin_PROGRAMS += src/network-workloads/model-net-synthetic-dfly-plus
+bin_PROGRAMS += src/network-workloads/model-net-synthetic-dally-dfly
 
 
 src_workload_codes_workload_dump_SOURCES = \
@@ -210,6 +214,7 @@ src_network_workloads_model_net_mpi_replay_CFLAGS = $(AM_CFLAGS)
 src_network_workloads_model_net_synthetic_SOURCES = src/network-workloads/model-net-synthetic.c
 src_network_workloads_model_net_synthetic_custom_dfly_SOURCES = src/network-workloads/model-net-synthetic-custom-dfly.c
 src_network_workloads_model_net_synthetic_dfly_plus_SOURCES = src/network-workloads/model-net-synthetic-dfly-plus.c
+src_network_workloads_model_net_synthetic_dally_dfly_SOURCES = src/network-workloads/model-net-synthetic-dally-dfly.c
 src_networks_model_net_topology_test_SOURCES = src/networks/model-net/topology-test.c
 
 #bin_PROGRAMS += src/network-workload/codes-nw-test

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

+LPGROUPS
+{
+   MODELNET_GRP
+   {
+      repetitions="1040";
+# name of this lp changes according to the model
+      nw-lp="8";
+# these lp names will be the same for dragonfly-custom model
+      modelnet_dragonfly_dally="8";
+      modelnet_dragonfly_dally_router="1";
+   }
+}
+PARAMS
+{
+   adaptive_threshold="131072";
+   num_qos_levels="2";
+   qos_bandwidth="30,70";
+   minimal-bias="1";
+   df-dally-vc = "1";
+# packet size in the network
+   packet_size="4096";
+   modelnet_order=( "dragonfly_dally","dragonfly_dally_router" );
+   # scheduler options
+   modelnet_scheduler="fcfs";
+# chunk size in the network (when chunk size = packet size, packets will not be
+# divided into chunks)
+   chunk_size="4096";
+   # modelnet_scheduler="round-robin";
+
+   num_router_rows="1";
+   # intra-group columns for routers
+   num_router_cols="16";
+   # number of groups in the network
+   num_groups="65";
+# buffer size in bytes for local virtual channels
+   local_vc_size="16384";
+#buffer size in bytes for global virtual channels
+   global_vc_size="16384";
+#buffer size in bytes for compute node virtual channels
+   cn_vc_size="32768";
+#bandwidth in GiB/s for local channels
+   local_bandwidth="2.0";
+# bandwidth in GiB/s for global channels
+   global_bandwidth="2.0";
+# bandwidth in GiB/s for compute node-router channels
+   cn_bandwidth="2.0";
+# Number of row channels
+   num_row_chans="1";
+# Number of column channels
+   num_col_chans="1";
+# ROSS message size
+   message_size="656";
+# 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="../src/network-workloads/conf/dragonfly-dally/dfdally_8k_intra";
+# network config file for inter-group connections
+   inter-group-connections="../src/network-workloads/conf/dragonfly-dally/dfdally_8k_inter";
+# routing protocol to be used
+   routing="prog-adaptive";
+}

src/networks/model-net/model-net-lp.c

@@ -391,6 +391,10 @@ void model_net_base_configure(){
         offsetof(model_net_wrap_msg, msg.m_dfly_plus);
     msg_offsets[DRAGONFLY_PLUS_ROUTER] =
         offsetof(model_net_wrap_msg, msg.m_dfly_plus);
+    msg_offsets[DRAGONFLY_DALLY] =
+        offsetof(model_net_wrap_msg, msg.m_dally_dfly);
+    msg_offsets[DRAGONFLY_DALLY_ROUTER] =
+        offsetof(model_net_wrap_msg, msg.m_dally_dfly);
     msg_offsets[SLIMFLY] =
         offsetof(model_net_wrap_msg, msg.m_slim);
     msg_offsets[FATTREE] =
@@ -402,6 +406,7 @@ void model_net_base_configure(){
     msg_offsets[EXPRESS_MESH_ROUTER] =
         offsetof(model_net_wrap_msg, msg.m_em);
 
+
     // perform the configuration(s)
     // This part is tricky, as we basically have to look up all annotations that
     // have LP names of the form modelnet_*. For each of those, we need to read

src/networks/model-net/model-net.c

@@ -25,6 +25,8 @@ extern struct model_net_method dragonfly_method;
 extern struct model_net_method dragonfly_custom_method;
 extern struct model_net_method dragonfly_plus_method;
 extern struct model_net_method dragonfly_plus_router_method;
+extern struct model_net_method dragonfly_dally_method;
+extern struct model_net_method dragonfly_dally_router_method;
 extern struct model_net_method slimfly_method;
 extern struct model_net_method fattree_method;
 extern struct model_net_method dragonfly_router_method;