Commit 54570e79 authored by Jonathan Jenkins's avatar Jonathan Jenkins

all the 'searching' times are no-ops, so rm them

parent f10eaf1f
...@@ -98,9 +98,6 @@ struct nw_state ...@@ -98,9 +98,6 @@ struct nw_state
/* time spent in compute operations */ /* time spent in compute operations */
double compute_time; double compute_time;
/* search time */
double search_overhead;
/* time spent in message send/isend */ /* time spent in message send/isend */
double send_time; double send_time;
...@@ -838,20 +835,16 @@ static void codes_exec_mpi_recv(nw_state* s, nw_message* m, tw_lp* lp) ...@@ -838,20 +835,16 @@ static void codes_exec_mpi_recv(nw_state* s, nw_message* m, tw_lp* lp)
m->u.rc.saved_recv_time = s->recv_time; m->u.rc.saved_recv_time = s->recv_time;
struct codes_workload_op* mpi_op = m->op; struct codes_workload_op* mpi_op = m->op;
mpi_op->sim_start_time = tw_now(lp); mpi_op->sim_start_time = tw_now(lp);
unsigned long long start_searching, end_searching;
num_bytes_recvd += mpi_op->u.recv.num_bytes; num_bytes_recvd += mpi_op->u.recv.num_bytes;
if(lp->gid == TRACE) if(lp->gid == TRACE)
printf("\n %lf codes exec mpi recv req id %d", tw_now(lp), (int)mpi_op->u.recv.req_id); printf("\n %lf codes exec mpi recv req id %d", tw_now(lp), (int)mpi_op->u.recv.req_id);
start_searching = tw_now(lp);
dumpi_req_id req_id; dumpi_req_id req_id;
int found_matching_sends = mpi_queue_remove_matching_op(s, lp, s->arrival_queue, m); int found_matching_sends = mpi_queue_remove_matching_op(s, lp, s->arrival_queue, m);
/* save the req id inserted in the completed queue for reverse computation. */ /* save the req id inserted in the completed queue for reverse computation. */
//m->matched_recv = req_id; //m->matched_recv = req_id;
end_searching = tw_now(lp);
s->search_overhead += (end_searching - start_searching);
if(found_matching_sends < 0) if(found_matching_sends < 0)
{ {
...@@ -1011,7 +1004,6 @@ static void update_arrival_queue(nw_state* s, tw_bf * bf, nw_message * m, tw_lp ...@@ -1011,7 +1004,6 @@ static void update_arrival_queue(nw_state* s, tw_bf * bf, nw_message * m, tw_lp
{ {
//int count_before = numQueue(s->pending_recvs_queue); //int count_before = numQueue(s->pending_recvs_queue);
int is_blocking = 0; /* checks if the recv operation was blocking or not */ int is_blocking = 0; /* checks if the recv operation was blocking or not */
unsigned long long start_searching, end_searching;
m->u.rc.saved_send_time = s->send_time; m->u.rc.saved_send_time = s->send_time;
m->u.rc.saved_recv_time = s->recv_time; m->u.rc.saved_recv_time = s->recv_time;
...@@ -1019,8 +1011,6 @@ static void update_arrival_queue(nw_state* s, tw_bf * bf, nw_message * m, tw_lp ...@@ -1019,8 +1011,6 @@ static void update_arrival_queue(nw_state* s, tw_bf * bf, nw_message * m, tw_lp
s->send_time += tw_now(lp) - m->u.msg_info.sim_start_time; s->send_time += tw_now(lp) - m->u.msg_info.sim_start_time;
dumpi_req_id req_id = -1; dumpi_req_id req_id = -1;
start_searching = tw_now(lp);
/* Now reconstruct the mpi op */ /* Now reconstruct the mpi op */
struct codes_workload_op * arrived_op = (struct codes_workload_op *) malloc(sizeof(struct codes_workload_op)); struct codes_workload_op * arrived_op = (struct codes_workload_op *) malloc(sizeof(struct codes_workload_op));
arrived_op->op_type = m->u.msg_info.op_type; arrived_op->op_type = m->u.msg_info.op_type;
...@@ -1032,10 +1022,7 @@ static void update_arrival_queue(nw_state* s, tw_bf * bf, nw_message * m, tw_lp ...@@ -1032,10 +1022,7 @@ static void update_arrival_queue(nw_state* s, tw_bf * bf, nw_message * m, tw_lp
m->op = arrived_op; m->op = arrived_op;
int found_matching_recv = mpi_queue_remove_matching_op(s, lp, s->pending_recvs_queue, m); int found_matching_recv = mpi_queue_remove_matching_op(s, lp, s->pending_recvs_queue, m);
end_searching = tw_now(lp);
s->search_overhead += (end_searching - start_searching);
if(TRACE == lp->gid) if(TRACE == lp->gid)
printf("\n %lf update arrival queue req id %d %d", tw_now(lp), arrived_op->u.send.req_id, m->op->u.send.source_rank); printf("\n %lf update arrival queue req id %d %d", tw_now(lp), arrived_op->u.send.req_id, m->op->u.send.source_rank);
if(found_matching_recv < 0) if(found_matching_recv < 0)
...@@ -1268,8 +1255,8 @@ void nw_test_finalize(nw_state* s, tw_lp* lp) ...@@ -1268,8 +1255,8 @@ void nw_test_finalize(nw_state* s, tw_lp* lp)
{ {
int count_irecv = numQueue(s->pending_recvs_queue); int count_irecv = numQueue(s->pending_recvs_queue);
int count_isend = numQueue(s->arrival_queue); int count_isend = numQueue(s->arrival_queue);
printf("\n LP %ld unmatched irecvs %d unmatched sends %d Total sends %ld receives %ld collectives %ld delays %ld wait alls %ld waits %ld search overhead %lf send time %lf wait %lf", printf("\n LP %ld unmatched irecvs %d unmatched sends %d Total sends %ld receives %ld collectives %ld delays %ld wait alls %ld waits %ld send time %lf wait %lf",
lp->gid, s->pending_recvs_queue->num_elems, s->arrival_queue->num_elems, s->num_sends, s->num_recvs, s->num_cols, s->num_delays, s->num_waitall, s->num_wait, s->search_overhead, s->send_time, s->wait_time); lp->gid, s->pending_recvs_queue->num_elems, s->arrival_queue->num_elems, s->num_sends, s->num_recvs, s->num_cols, s->num_delays, s->num_waitall, s->num_wait, s->send_time, s->wait_time);
if(lp->gid == TRACE) if(lp->gid == TRACE)
{ {
printQueue(lp->gid, s->pending_recvs_queue, "irecv "); printQueue(lp->gid, s->pending_recvs_queue, "irecv ");
......
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