GitLab maintenance scheduled for Today, 2019-12-05, from 17:00 to 18:00 CT - Services will be unavailable during this time.

Commit 4ede6937 authored by Misbah Mubarak's avatar Misbah Mubarak

Merge branch 'opt-debug-br' into 'master'

Opt debug br

See merge request !37
parents 7039c648 2f3b89ad
Contributors to date (in chronological order, with current affiliations)
- Ning Liu, IBM
- Jason Cope, DDN
- Philip Carns, Argonne National Labs
- Misbah Mubarak, Argonne National Labs
- Shane Snyder, Argonne National Labs
- Jonathan P. Jenkins
- Noah Wolfe, RPI
- Nikhil Jain, Lawrence Livermore Labs
- Matthieu Dorier, Argonne National Labs
- Caitlin Ross, RPI
- Xu Yang, Amazon
- Jens Domke, Tokyo Institute of Tech.
- Xin Wang, IIT
Contributions of external (non-Argonne) collaborators:
Nikhil Jain, Abhinav Bhatele (LLNL)
......
......@@ -194,7 +194,7 @@ struct codes_workload_op
/* TODO: not sure why source rank is here */
int source_rank;/* source rank of MPI send message */
int dest_rank; /* dest rank of MPI send message */
uint64_t num_bytes; /* number of bytes to be transferred over the network */
int64_t num_bytes; /* number of bytes to be transferred over the network */
int16_t data_type; /* MPI data type to be matched with the recv */
int count; /* number of elements to be received */
int tag; /* tag of the message */
......@@ -204,7 +204,7 @@ struct codes_workload_op
/* TODO: not sure why source rank is here */
int source_rank;/* source rank of MPI recv message */
int dest_rank;/* dest rank of MPI recv message */
uint64_t num_bytes; /* number of bytes to be transferred over the network */
int64_t num_bytes; /* number of bytes to be transferred over the network */
int16_t data_type; /* MPI data type to be matched with the send */
int count; /* number of elements to be sent */
int tag; /* tag of the message */
......
......@@ -2431,7 +2431,7 @@ dragonfly_terminal_final( terminal_state * s,
if(!s->terminal_id)
written = sprintf(s->output_buf, "# Format <LP id> <Terminal ID> <Total Data Size> <Aggregate packet latency> <# Flits/Packets finished> <Avg hops> <Busy Time>");
written += sprintf(s->output_buf + written, "\n %llu %u %lld %lf %ld %lf %lf",
written += sprintf(s->output_buf + written, "\n %llu %u %"PRId64" %lf %ld %lf %lf",
LLU(lp->gid), s->terminal_id, s->total_msg_size, (double)s->total_time/s->finished_packets,
s->finished_packets, (double)s->total_hops/s->finished_chunks,
s->busy_time);
......
......@@ -1027,7 +1027,7 @@ static void dimension_order_routing( nodes_state * s,
int * dir )
{
int dest[s->params->n_dims];
int dest_id;
int dest_id = -1;
/* dummys - check later */
*dim = -1;
......
......@@ -327,7 +327,7 @@ void codes_workload_print_op(
break;
case CODES_WK_SEND:
fprintf(f, "op: app:%d rank:%d type:send "
"src:%d dst:%d bytes:%llu type:%d count:%d tag:%d "
"src:%d dst:%d bytes:%"PRIu64" type:%d count:%d tag:%d "
"start:%.5e end:%.5e\n",
app_id, rank,
op->u.send.source_rank, op->u.send.dest_rank,
......@@ -337,7 +337,7 @@ void codes_workload_print_op(
break;
case CODES_WK_RECV:
fprintf(f, "op: app:%d rank:%d type:recv "
"src:%d dst:%d bytes:%llu type:%d count:%d tag:%d "
"src:%d dst:%d bytes:%"PRIu64" type:%d count:%d tag:%d "
"start:%.5e end:%.5e\n",
app_id, rank,
op->u.recv.source_rank, op->u.recv.dest_rank,
......@@ -347,7 +347,7 @@ void codes_workload_print_op(
break;
case CODES_WK_ISEND:
fprintf(f, "op: app:%d rank:%d type:isend "
"src:%d dst:%d bytes:%llu type:%d count:%d tag:%d "
"src:%d dst:%d bytes:%"PRIu64" type:%d count:%d tag:%d "
"start:%.5e end:%.5e\n",
app_id, rank,
op->u.send.source_rank, op->u.send.dest_rank,
......@@ -357,7 +357,7 @@ void codes_workload_print_op(
break;
case CODES_WK_IRECV:
fprintf(f, "op: app:%d rank:%d type:irecv "
"src:%d dst:%d bytes:%llu type:%d count:%d tag:%d "
"src:%d dst:%d bytes:%"PRIu64" type:%d count:%d tag:%d "
"start:%.5e end:%.5e\n",
app_id, rank,
op->u.recv.source_rank, op->u.recv.dest_rank,
......
......@@ -109,12 +109,12 @@ static inline double time_to_us_lf(dumpi_clock t){
static inline double time_to_ns_lf(dumpi_clock t){
return (double) t.sec * 1e9 + (double) t.nsec;
}
static int32_t get_unique_req_id(int32_t request_id)
/*static int32_t get_unique_req_id(int32_t request_id)
{
uint32_t pc = 0, pb = 0;
bj_hashlittle2(&request_id, sizeof(int32_t), &pc, &pb);
return pc;
}
}*/
/*static inline double time_to_s_lf(dumpi_clock t){
return (double) t.sec + (double) t.nsec / 1e9;
}*/
......
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