Commit c4663579 authored by Jonathan Jenkins's avatar Jonathan Jenkins

update to use model_net_event_rc2 properly

NOTE: caused an event size bump - you may need to update config files
parent 5c98582c
......@@ -61,6 +61,7 @@ struct terminal_message
short vc_index;
int sender_radix;
int output_chan;
model_net_event_return event_rc;
int is_pull;
uint64_t pull_size;
......
......@@ -30,6 +30,7 @@ struct loggp_message
int event_size_bytes; /* size of simulator event message that will be tunnelled to destination */
int local_event_size_bytes; /* size of simulator event message that delivered locally upon local completion */
char category[CATEGORY_NAME_MAX]; /* category for communication */
model_net_event_return event_rc;
int is_pull;
uint64_t pull_size;
......
......@@ -28,6 +28,7 @@ struct sn_message
int event_size_bytes; /* size of simulator event message that will be tunnelled to destination */
int local_event_size_bytes; /* size of simulator event message that delivered locally upon local completion */
char category[CATEGORY_NAME_MAX]; /* category for communication */
model_net_event_return event_rc;
int is_pull; /* this message represents a pull request from the destination LP to the source */
uint64_t pull_size; /* data size to pull from dest LP */
......
......@@ -31,6 +31,7 @@ struct sp_message
int local_event_size_bytes; /* size of simulator event message that delivered locally upon local completion */
char category[CATEGORY_NAME_MAX]; /* category for communication */
model_net_event_return event_rc;
int is_pull;
uint64_t pull_size;
......
......@@ -74,6 +74,7 @@ struct nodes_message
/* chunk id of the flit (distinguishes flits) */
int chunk_id;
model_net_event_return event_rc;
int is_pull;
uint64_t pull_size;
......
......@@ -1174,7 +1174,7 @@ void packet_arrive_rc(terminal_state * s, tw_bf * bf, terminal_message * msg, tw
if(bf->c4)
{
int net_id = model_net_get_id(LP_METHOD_NM);
model_net_event_rc(net_id, lp, msg->pull_size);
model_net_event_rc2(lp, &msg->event_rc);
}
}
......@@ -1254,8 +1254,8 @@ void packet_arrive(terminal_state * s, tw_bf * bf, terminal_message * msg,
struct codes_mctx mc_src =
codes_mctx_set_global_direct(lp->gid);
int net_id = model_net_get_id(LP_METHOD_NM);
model_net_event_mctx(net_id, &mc_src, &mc_dst, msg->category,
msg->sender_lp, msg->pull_size, ts,
msg->event_rc = model_net_event_mctx(net_id, &mc_src, &mc_dst,
msg->category, msg->sender_lp, msg->pull_size, ts,
msg->remote_event_size_bytes, tmp_ptr, 0, NULL, lp);
}
else{
......
......@@ -353,8 +353,7 @@ static void handle_msg_ready_rev_event(
#endif
if (m->event_size_bytes && m->is_pull){
int net_id = model_net_get_id(LP_METHOD_NM);
model_net_event_rc(net_id, lp, m->pull_size);
model_net_event_rc2(lp, &m->event_rc);
}
return;
......@@ -433,8 +432,8 @@ static void handle_msg_ready_event(
struct codes_mctx mc_src =
codes_mctx_set_global_direct(lp->gid);
int net_id = model_net_get_id(LP_METHOD_NM);
model_net_event_mctx(net_id, &mc_src, &mc_dst, m->category,
m->src_gid, m->pull_size, recv_queue_time,
m->event_rc = model_net_event_mctx(net_id, &mc_src, &mc_dst,
m->category, m->src_gid, m->pull_size, recv_queue_time,
m->event_size_bytes, tmp_ptr, 0, NULL, lp);
}
else{
......
......@@ -323,8 +323,7 @@ static void handle_msg_ready_rev_event(
stat->recv_time = m->recv_time_saved;
if (m->event_size_bytes && m->is_pull){
int net_id = model_net_get_id(LP_METHOD_NM);
model_net_event_rc(net_id, lp, m->pull_size);
model_net_event_rc2(lp, &m->event_rc);
}
return;
......@@ -380,8 +379,8 @@ static void handle_msg_ready_event(
struct codes_mctx mc_src =
codes_mctx_set_global_direct(lp->gid);
int net_id = model_net_get_id(LP_METHOD_NM);
model_net_event_mctx(net_id, &mc_src, &mc_dst, m->category,
m->src_gid, m->pull_size, recv_queue_time,
m->event_rc = model_net_event_mctx(net_id, &mc_src, &mc_dst,
m->category, m->src_gid, m->pull_size, recv_queue_time,
m->event_size_bytes, tmp_ptr, 0, NULL, lp);
}
else{
......
......@@ -514,8 +514,7 @@ static void handle_msg_ready_rev_event(
idles->recv_prev_idle_all = m->recv_prev_idle_all_saved;
if (m->event_size_bytes && m->is_pull){
int net_id = model_net_get_id(LP_METHOD_NM);
model_net_event_rc(net_id, lp, m->pull_size);
model_net_event_rc2(lp, &m->event_rc);
}
return;
......@@ -615,7 +614,7 @@ static void handle_msg_ready_event(
struct codes_mctx mc_src =
codes_mctx_set_global_direct(lp->gid);
int net_id = model_net_get_id(LP_METHOD_NM);
model_net_event_mctx(net_id, &mc_src, &mc_dst, m->category,
m->event_rc = model_net_event_mctx(net_id, &mc_src, &mc_dst, m->category,
m->src_gid, m->pull_size, recv_queue_time,
m->event_size_bytes, tmp_ptr, 0, NULL, lp);
}
......
......@@ -1120,7 +1120,7 @@ static void packet_arrive( nodes_state * s,
codes_mctx_set_global_direct(msg->sender_node);
struct codes_mctx mc_src =
codes_mctx_set_global_direct(lp->gid);
model_net_event_mctx(net_id, &mc_src, &mc_dst,
msg->event_rc = model_net_event_mctx(net_id, &mc_src, &mc_dst,
msg->category, msg->sender_svr, msg->pull_size,
0.0, msg->remote_event_size_bytes, tmp_ptr, 0,
NULL, lp);
......@@ -1250,8 +1250,7 @@ static void node_rc_handler(nodes_state * s, tw_bf * bf, nodes_message * msg, tw
if (lp->gid == msg->dest_lp &&
msg->chunk_id == num_chunks-1 &&
msg->remote_event_size_bytes && msg->is_pull){
int net_id = model_net_get_id(LP_METHOD_NM);
model_net_event_rc(net_id, lp, msg->pull_size);
model_net_event_rc2(lp, &msg->event_rc);
}
}
break;
......
......@@ -23,6 +23,6 @@ PARAMS
local_bandwidth="5.25";
global_bandwidth="4.7";
cn_bandwidth="5.25";
message_size="320";
message_size="328";
routing="adaptive";
}
......@@ -9,7 +9,7 @@ LPGROUPS
}
PARAMS
{
message_size="320";
message_size="328";
modelnet_order=( "loggp" );
# scheduler options
modelnet_scheduler="fcfs-full";
......
......@@ -14,7 +14,7 @@ PARAMS
# scheduler options
modelnet_scheduler="fcfs";
# modelnet_scheduler="round-robin";
message_size="320";
message_size="328";
n_dims="4";
dim_length="4,2,2,2";
link_bandwidth="2.0";
......
......@@ -10,7 +10,7 @@ LPGROUPS
PARAMS
{
packet_size="512";
message_size="320";
message_size="328";
modelnet_order=( "simplenet" );
# scheduler options
modelnet_scheduler="fcfs";
......
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