Commit 107deef1 authored by Sudheer Chunduri's avatar Sudheer Chunduri
Browse files

name consistency changes

parent 6ee1eeac
......@@ -150,7 +150,7 @@ enum apmpi_mpiop_indices
APMPI_MPI_BLOCKING_COLL \
APMPI_MPI_NONBLOCKING_COLL \
APMPI_MPI_ONESIDED \
Z(APMPI_F_NUM_INDICES)
Z(APMPI_F_MPIOP_TOTALTIME_NUM_INDICES)
/* float counters for the "APMPI" module */
#define X F_TIME
......@@ -167,11 +167,11 @@ enum apmpi_f_mpiop_totaltime_indices
#define APMPI_F_MPIOP_SYNCTIME_COUNTERS \
APMPI_MPI_COLL_SYNC \
APMPI_MPI_BLOCKING_COLL \
Z(APMPI_F_SYNC_NUM_INDICES)
Z(APMPI_F_MPIOP_SYNCTIME_NUM_INDICES)
/* float counters for the "APMPI" module */
#define X F_SYNC
#define V F_SYNC
enum apmpi_f_mpiop_totalsync_indices
enum apmpi_f_mpiop_synctime_indices
{
APMPI_F_MPIOP_SYNCTIME_COUNTERS
};
......@@ -179,13 +179,13 @@ enum apmpi_f_mpiop_totalsync_indices
#undef V
/* aggregate (across all the ranks) per MPI op times */
#define APMPI_F_MPI_GLOBAL_COUNTERS \
#define APMPI_F_RANK_TOTAL_COUNTERS \
Y(RANK_TOTAL_MPITIME) \
Y(RANK_TOTAL_MPISYNCTIME) \
Z(APMPI_F_GLOBAL_NUM_INDICES)
Z(APMPI_F_RANK_TOTAL_NUM_INDICES)
enum apmpi_f_mpi_global_indices
{
APMPI_F_MPI_GLOBAL_COUNTERS
APMPI_F_RANK_TOTAL_COUNTERS
};
#undef Z
#undef Y
......@@ -203,9 +203,9 @@ struct darshan_apmpi_perf_record
/* nodeid is system dependent */
uint32_t nodeid;
uint64_t counters[APMPI_NUM_INDICES];
double fcounters[APMPI_F_NUM_INDICES];
double fsynccounters[APMPI_F_SYNC_NUM_INDICES];
double fglobalcounters[APMPI_F_GLOBAL_NUM_INDICES];
double fcounters[APMPI_F_MPIOP_TOTALTIME_NUM_INDICES];
double fsynccounters[APMPI_F_MPIOP_SYNCTIME_NUM_INDICES];
double fglobalcounters[APMPI_F_RANK_TOTAL_NUM_INDICES];
};
struct darshan_apmpi_header_record
{
......
......@@ -242,15 +242,15 @@ static void initialize_counters (void)
{
apmpi_runtime->perf_record->counters[i] = 0;
}
for (i = 0; i < APMPI_F_NUM_INDICES; i++)
for (i = 0; i < APMPI_F_MPIOP_TOTALTIME_NUM_INDICES; i++)
{
apmpi_runtime->perf_record->fcounters[i] = 0;
}
for (i = 0; i < APMPI_F_SYNC_NUM_INDICES; i++)
for (i = 0; i < APMPI_F_MPIOP_SYNCTIME_NUM_INDICES; i++)
{
apmpi_runtime->perf_record->fsynccounters[i] = 0;
}
for (i = 0; i < APMPI_F_GLOBAL_NUM_INDICES; i++)
for (i = 0; i < APMPI_F_RANK_TOTAL_NUM_INDICES; i++)
{
apmpi_runtime->perf_record->fsynccounters[i] = 0;
}
......@@ -487,10 +487,10 @@ static void apmpi_mpi_redux(
}
double mpisync_time = 0.0;
/* Compute Total MPI time per rank: RANK_TOTAL_MPITIME */
for (i=MPI_SEND_TOTAL_TIME; i<APMPI_F_NUM_INDICES; i+=3){
for (i=MPI_SEND_TOTAL_TIME; i<APMPI_F_MPIOP_TOTALTIME_NUM_INDICES; i+=3){
apmpi_runtime->perf_record->fglobalcounters[RANK_TOTAL_MPITIME] += apmpi_runtime->perf_record->fcounters[i];
}
for (i=MPI_BARRIER_TOTAL_SYNC_TIME; i<APMPI_F_SYNC_NUM_INDICES; i++){
for (i=MPI_BARRIER_TOTAL_SYNC_TIME; i<APMPI_F_MPIOP_SYNCTIME_NUM_INDICES; i++){
mpisync_time += apmpi_runtime->perf_record->fsynccounters[i];
}
apmpi_runtime->perf_record->fglobalcounters[RANK_TOTAL_MPITIME] += mpisync_time;
......
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