Commit 4f6fc87d authored by Xin Wang's avatar Xin Wang

modify output of dumpi trace

parent f86fa5a2
...@@ -392,10 +392,10 @@ int main(int argc, char *argv[]) ...@@ -392,10 +392,10 @@ int main(int argc, char *argv[])
{ {
if(i == 0) if(i == 0)
{ {
int j; // int j;
printf("\n rank %d wait_all: ", i); // printf("\n rank %d wait_all: ", i);
for(j = 0; j < op.u.waits.count; j++) // for(j = 0; j < op.u.waits.count; j++)
printf(" %d ", op.u.waits.req_ids[j]); // printf(" %d ", op.u.waits.req_ids[j]);
num_waitalls++; num_waitalls++;
} }
} }
......
...@@ -328,7 +328,7 @@ void codes_workload_print_op( ...@@ -328,7 +328,7 @@ void codes_workload_print_op(
case CODES_WK_SEND: case CODES_WK_SEND:
fprintf(f, "op: app:%d rank:%d type:send " fprintf(f, "op: app:%d rank:%d type:send "
"src:%d dst:%d bytes:%"PRIu64" type:%d count:%d tag:%d " "src:%d dst:%d bytes:%"PRIu64" type:%d count:%d tag:%d "
"start:%.5e end:%.5e\n", "start:%.1f end:%.1f\n",
app_id, rank, app_id, rank,
op->u.send.source_rank, op->u.send.dest_rank, op->u.send.source_rank, op->u.send.dest_rank,
op->u.send.num_bytes, op->u.send.data_type, op->u.send.num_bytes, op->u.send.data_type,
...@@ -338,7 +338,7 @@ void codes_workload_print_op( ...@@ -338,7 +338,7 @@ void codes_workload_print_op(
case CODES_WK_RECV: case CODES_WK_RECV:
fprintf(f, "op: app:%d rank:%d type:recv " fprintf(f, "op: app:%d rank:%d type:recv "
"src:%d dst:%d bytes:%"PRIu64" type:%d count:%d tag:%d " "src:%d dst:%d bytes:%"PRIu64" type:%d count:%d tag:%d "
"start:%.5e end:%.5e\n", "start:%.1f end:%.1f\n",
app_id, rank, app_id, rank,
op->u.recv.source_rank, op->u.recv.dest_rank, op->u.recv.source_rank, op->u.recv.dest_rank,
op->u.recv.num_bytes, op->u.recv.data_type, op->u.recv.num_bytes, op->u.recv.data_type,
...@@ -348,7 +348,7 @@ void codes_workload_print_op( ...@@ -348,7 +348,7 @@ void codes_workload_print_op(
case CODES_WK_ISEND: case CODES_WK_ISEND:
fprintf(f, "op: app:%d rank:%d type:isend " fprintf(f, "op: app:%d rank:%d type:isend "
"src:%d dst:%d bytes:%"PRIu64" type:%d count:%d tag:%d " "src:%d dst:%d bytes:%"PRIu64" type:%d count:%d tag:%d "
"start:%.5e end:%.5e\n", "start:%.1f end:%.1f\n",
app_id, rank, app_id, rank,
op->u.send.source_rank, op->u.send.dest_rank, op->u.send.source_rank, op->u.send.dest_rank,
op->u.send.num_bytes, op->u.send.data_type, op->u.send.num_bytes, op->u.send.data_type,
...@@ -358,7 +358,7 @@ void codes_workload_print_op( ...@@ -358,7 +358,7 @@ void codes_workload_print_op(
case CODES_WK_IRECV: case CODES_WK_IRECV:
fprintf(f, "op: app:%d rank:%d type:irecv " fprintf(f, "op: app:%d rank:%d type:irecv "
"src:%d dst:%d bytes:%"PRIu64" type:%d count:%d tag:%d " "src:%d dst:%d bytes:%"PRIu64" type:%d count:%d tag:%d "
"start:%.5e end:%.5e\n", "start:%.1f end:%.1f\n",
app_id, rank, app_id, rank,
op->u.recv.source_rank, op->u.recv.dest_rank, op->u.recv.source_rank, op->u.recv.dest_rank,
op->u.recv.num_bytes, op->u.recv.data_type, op->u.recv.num_bytes, op->u.recv.data_type,
...@@ -366,14 +366,14 @@ void codes_workload_print_op( ...@@ -366,14 +366,14 @@ void codes_workload_print_op(
op->start_time, op->end_time); op->start_time, op->end_time);
break; break;
case CODES_WK_REQ_FREE: case CODES_WK_REQ_FREE:
fprintf(f, "op: app:%d rank:%d type:req free " fprintf(f, "op: app:%d rank:%d type:req free " \
" req:%d ", " req:%d ", \
app_id, rank, app_id, rank, \
op->u.free.req_id); op->u.free.req_id);
break; break;
#define PRINT_COL(_type_str) \ #define PRINT_COL(_type_str) \
fprintf(f, "op: app:%d rank:%d type:%s" \ fprintf(f, "op: app:%d rank:%d type:%s" \
" bytes:%d, start:%.5e, end:%.5e\n", app_id, rank, \ " bytes:%d start:%.1f end:%.1f\n", app_id, rank, \
_type_str, op->u.collective.num_bytes, op->start_time, \ _type_str, op->u.collective.num_bytes, op->start_time, \
op->end_time) op->end_time)
case CODES_WK_BCAST: case CODES_WK_BCAST:
...@@ -403,7 +403,7 @@ void codes_workload_print_op( ...@@ -403,7 +403,7 @@ void codes_workload_print_op(
#undef PRINT_COL #undef PRINT_COL
#define PRINT_WAIT(_type_str, _ct) \ #define PRINT_WAIT(_type_str, _ct) \
fprintf(f, "op: app:%d rank:%d type:%s" \ fprintf(f, "op: app:%d rank:%d type:%s" \
"num reqs:%d, start:%.5e, end:%.5e\n", \ " numreqs:%d start:%.1f end:%.1f\n", \
app_id, rank, _type_str, _ct, op->start_time, op->end_time) app_id, rank, _type_str, _ct, op->start_time, op->end_time)
case CODES_WK_WAITALL: case CODES_WK_WAITALL:
PRINT_WAIT("waitall", op->u.waits.count); PRINT_WAIT("waitall", op->u.waits.count);
......
...@@ -455,6 +455,7 @@ int handleDUMPIIRecv(const dumpi_irecv *prm, uint16_t thread, const dumpi_time * ...@@ -455,6 +455,7 @@ int handleDUMPIIRecv(const dumpi_irecv *prm, uint16_t thread, const dumpi_time *
wrkld_per_rank.u.recv.tag = prm->tag; wrkld_per_rank.u.recv.tag = prm->tag;
wrkld_per_rank.u.recv.num_bytes = prm->count * get_num_bytes(myctx,prm->datatype) * LOAD_CHANGE_FACTOR; wrkld_per_rank.u.recv.num_bytes = prm->count * get_num_bytes(myctx,prm->datatype) * LOAD_CHANGE_FACTOR;
// printf("recv count%d, recv byte %llu\n", prm->count, wrkld_per_rank.u.recv.num_bytes);
assert(wrkld_per_rank.u.recv.num_bytes >= 0); assert(wrkld_per_rank.u.recv.num_bytes >= 0);
wrkld_per_rank.u.recv.source_rank = prm->source; wrkld_per_rank.u.recv.source_rank = prm->source;
wrkld_per_rank.u.recv.dest_rank = -1; wrkld_per_rank.u.recv.dest_rank = -1;
......
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