summaryrefslogtreecommitdiffstats
path: root/perform
diff options
context:
space:
mode:
authorBill Wendling <wendling@ncsa.uiuc.edu>2002-01-11 19:44:51 (GMT)
committerBill Wendling <wendling@ncsa.uiuc.edu>2002-01-11 19:44:51 (GMT)
commitaa8897734fe3c7c2e8b64820577162eaa4bce4fe (patch)
tree9ee02ef0a798a95bcf0887a3f56edad8cd76d86f /perform
parentaabfa5c03f1637afce3b04d0c9cdb30360c30a18 (diff)
downloadhdf5-aa8897734fe3c7c2e8b64820577162eaa4bce4fe.zip
hdf5-aa8897734fe3c7c2e8b64820577162eaa4bce4fe.tar.gz
hdf5-aa8897734fe3c7c2e8b64820577162eaa4bce4fe.tar.bz2
[svn-r4816]
Purpose: Feature Fix Description: Added timer from open to close for write. Changed reporting of time for write and read to only measure the actual read/write instead of the open/close as well... Platforms tested: Linux(pp)
Diffstat (limited to 'perform')
-rw-r--r--perform/pio_engine.c10
-rw-r--r--perform/pio_perf.c79
-rw-r--r--perform/pio_timer.c4
3 files changed, 69 insertions, 24 deletions
diff --git a/perform/pio_engine.c b/perform/pio_engine.c
index e627e21..d1ea6d3 100644
--- a/perform/pio_engine.c
+++ b/perform/pio_engine.c
@@ -252,8 +252,6 @@ buf_size=MIN(1024*1024, buf_size);
GOTOERROR(FAIL);
}
- set_time(res.timers, HDF5_FILE_OPENCLOSE, START);
-
for (nf = 1; nf <= nfiles; nf++) {
/*
* Write performance measurement
@@ -261,6 +259,8 @@ buf_size=MIN(1024*1024, buf_size);
/* Open file for write */
char base_name[256];
+ MPI_Barrier(pio_comm_g);
+
sprintf(base_name, "#pio_tmp_%u", nf);
pio_create_filename(iot, base_name, fname, sizeof(fname));
#if AKCDEBUG
@@ -286,6 +286,8 @@ fprintf(stderr, "filename=%s\n", fname);
VRFY((hrc == SUCCESS), "do_fclose failed");
+ MPI_Barrier(pio_comm_g);
+
/*
* Read performance measurement
*/
@@ -309,11 +311,11 @@ fprintf(stderr, "filename=%s\n", fname);
VRFY((hrc == SUCCESS), "do_fclose failed");
+ MPI_Barrier(pio_comm_g);
+
do_cleanupfile(iot, fname);
}
- set_time(res.timers, HDF5_FILE_OPENCLOSE, STOP);
-
done:
/* clean up */
/* release HDF5 objects */
diff --git a/perform/pio_perf.c b/perform/pio_perf.c
index 7def961..e5e11a8 100644
--- a/perform/pio_perf.c
+++ b/perform/pio_perf.c
@@ -385,11 +385,13 @@ run_test(FILE *output, iotype iot, parameters parms)
long raw_size;
minmax total_mm;
minmax *write_mm_table;
+ minmax *write_gross_mm_table;
minmax *read_mm_table;
- minmax *openclose_mm_table;
+ minmax *read_gross_mm_table;
minmax write_mm = {0.0, 0.0, 0.0, 0};
+ minmax write_gross_mm = {0.0, 0.0, 0.0, 0};
minmax read_mm = {0.0, 0.0, 0.0, 0};
- minmax openclose_mm = {0.0, 0.0, 0.0, 0};
+ minmax read_gross_mm = {0.0, 0.0, 0.0, 0};
raw_size = parms.num_dsets * parms.num_elmts * sizeof(int);
parms.io_type = iot;
@@ -411,8 +413,9 @@ run_test(FILE *output, iotype iot, parameters parms)
MPI_Comm_size(pio_comm_g, &comm_size);
write_mm_table = malloc(parms.num_iters * sizeof(minmax));
+ write_gross_mm_table = malloc(parms.num_iters * sizeof(minmax));
read_mm_table = malloc(parms.num_iters * sizeof(minmax));
- openclose_mm_table = malloc(parms.num_iters * sizeof(minmax));
+ read_gross_mm_table = malloc(parms.num_iters * sizeof(minmax));
for (i = 0; i < parms.num_iters; ++i) {
write_mm_table[i].min = 0.0;
@@ -420,15 +423,20 @@ run_test(FILE *output, iotype iot, parameters parms)
write_mm_table[i].sum = 0.0;
write_mm_table[i].num = 0;
+ write_gross_mm_table[i].min = 0.0;
+ write_gross_mm_table[i].max = 0.0;
+ write_gross_mm_table[i].sum = 0.0;
+ write_gross_mm_table[i].num = 0;
+
read_mm_table[i].min = 0.0;
read_mm_table[i].max = 0.0;
read_mm_table[i].sum = 0.0;
read_mm_table[i].num = 0;
- openclose_mm_table[i].min = 0.0;
- openclose_mm_table[i].max = 0.0;
- openclose_mm_table[i].sum = 0.0;
- openclose_mm_table[i].num = 0;
+ read_gross_mm_table[i].min = 0.0;
+ read_gross_mm_table[i].max = 0.0;
+ read_gross_mm_table[i].sum = 0.0;
+ read_gross_mm_table[i].num = 0;
}
/* call Albert's testing here */
@@ -440,7 +448,7 @@ run_test(FILE *output, iotype iot, parameters parms)
res = do_pio(parms);
/* gather all of the "write" times */
- t = get_time(res.timers, HDF5_GROSS_WRITE_FIXED_DIMS);
+ t = get_time(res.timers, HDF5_FINE_WRITE_FIXED_DIMS);
MPI_Send((void *)&t, 1, MPI_DOUBLE, 0, 0, pio_comm_g);
for (j = 0; j < comm_size; ++j)
@@ -448,8 +456,17 @@ run_test(FILE *output, iotype iot, parameters parms)
write_mm_table[i] = write_mm;
+ /* gather all of the "write" times from open to close */
+ t = get_time(res.timers, HDF5_GROSS_WRITE_FIXED_DIMS);
+ MPI_Send((void *)&t, 1, MPI_DOUBLE, 0, 0, pio_comm_g);
+
+ for (j = 0; j < comm_size; ++j)
+ get_minmax(&write_gross_mm);
+
+ write_gross_mm_table[i] = write_gross_mm;
+
/* gather all of the "read" times */
- t = get_time(res.timers, HDF5_GROSS_READ_FIXED_DIMS);
+ t = get_time(res.timers, HDF5_FINE_READ_FIXED_DIMS);
MPI_Send((void *)&t, 1, MPI_DOUBLE, 0, 0, pio_comm_g);
for (j = 0; j < comm_size; ++j)
@@ -457,14 +474,14 @@ run_test(FILE *output, iotype iot, parameters parms)
read_mm_table[i] = read_mm;
- /* gather all of the "file open to close" times */
- t = get_time(res.timers, HDF5_FILE_OPENCLOSE);
+ /* gather all of the "read" times from open to close */
+ t = get_time(res.timers, HDF5_GROSS_READ_FIXED_DIMS);
MPI_Send((void *)&t, 1, MPI_DOUBLE, 0, 0, pio_comm_g);
for (j = 0; j < comm_size; ++j)
- get_minmax(&openclose_mm);
+ get_minmax(&read_gross_mm);
- openclose_mm_table[i] = openclose_mm;
+ read_gross_mm_table[i] = read_gross_mm;
}
/* accumulate and output the max, min, and average "write" times */
@@ -477,7 +494,24 @@ run_test(FILE *output, iotype iot, parameters parms)
output_report(output, "Minimum Time: %.2fs (%.2f MB/s)\n",
total_mm.min,
MB_PER_SEC(raw_size, total_mm.min));
+ print_indent(output, TAB_SPACE * 4);
+ output_report(output, "Maximum Time: %.2fs (%.2f MB/s)\n",
+ total_mm.max, MB_PER_SEC(raw_size, total_mm.max));
+ print_indent(output, TAB_SPACE * 4);
+ output_report(output, "Average Time: %.2fs (%.2f MB/s)\n",
+ total_mm.sum / total_mm.num,
+ MB_PER_SEC(raw_size, (total_mm.sum / total_mm.num)));
+ /* accumulate and output the max, min, and average "gross write" times */
+ total_mm = accumulate_minmax_stuff(write_gross_mm_table, parms.num_iters);
+
+ print_indent(output, TAB_SPACE * 3);
+ output_report(output, "Write Open-Close (%d iteration(s)):\n", parms.num_iters);
+
+ print_indent(output, TAB_SPACE * 4);
+ output_report(output, "Minimum Time: %.2fs (%.2f MB/s)\n",
+ total_mm.min,
+ MB_PER_SEC(raw_size, total_mm.min));
print_indent(output, TAB_SPACE * 4);
output_report(output, "Maximum Time: %.2fs (%.2f MB/s)\n",
total_mm.max, MB_PER_SEC(raw_size, total_mm.max));
@@ -503,22 +537,27 @@ run_test(FILE *output, iotype iot, parameters parms)
total_mm.sum / total_mm.num,
MB_PER_SEC(raw_size, (total_mm.sum / total_mm.num)));
- /* accumulate and output the max, min, and average "file open to close" times */
- total_mm = accumulate_minmax_stuff(openclose_mm_table, parms.num_iters);
+ /* accumulate and output the max, min, and average "gross read" times */
+ total_mm = accumulate_minmax_stuff(read_gross_mm_table, parms.num_iters);
print_indent(output, TAB_SPACE * 3);
- output_report(output, "Open to Close (%d iteration(s)):\n", parms.num_iters);
+ output_report(output, "Read Open-Close (%d iteration(s)):\n", parms.num_iters);
print_indent(output, TAB_SPACE * 4);
- output_report(output, "Minimum Time: %.2fs\n", total_mm.min);
+ output_report(output, "Minimum Time: %.2fs (%.2f MB/s)\n",
+ total_mm.min,
+ MB_PER_SEC(raw_size, total_mm.min));
print_indent(output, TAB_SPACE * 4);
- output_report(output, "Maximum Time: %.2fs\n", total_mm.max);
+ output_report(output, "Maximum Time: %.2fs (%.2f MB/s)\n",
+ total_mm.max, MB_PER_SEC(raw_size, total_mm.max));
+
print_indent(output, TAB_SPACE * 4);
- output_report(output, "Average Time: %.2fs\n", total_mm.sum / total_mm.num);
+ output_report(output, "Average Time: %.2fs (%.2f MB/s)\n",
+ total_mm.sum / total_mm.num,
+ MB_PER_SEC(raw_size, (total_mm.sum / total_mm.num)));
free(write_mm_table);
free(read_mm_table);
- free(openclose_mm_table);
pio_time_destroy(res.timers);
return ret_value;
}
diff --git a/perform/pio_timer.c b/perform/pio_timer.c
index 0bfb96a..2ebdbce 100644
--- a/perform/pio_timer.c
+++ b/perform/pio_timer.c
@@ -39,6 +39,10 @@ pio_time *
pio_time_new(unsigned int type)
{
pio_time *pt = (pio_time *)calloc(1, sizeof(struct pio_time_));
+ register int i;
+
+ for (i = 0; i < NUM_TIMERS; ++i)
+ pt->total_time[i] = 0.0;
pt->type = type;
return pt;