Added support for Cache VOL

CMakeLists.txt

@@ -22,6 +22,13 @@ if(WITH_ASYNC_VOL)
 	add_definitions(-DUSE_ASYNC_VOL)
 endif()
 
+# Dependency: VOL Cache
+set(CACHE_HOME $ENV{CACHE_HOME})
+option(WITH_CACHE_VOL "" OFF)
+if (WITH_CACHE_VOL)
+   add_definitions(-DUSE_CACHE_VOL)
+endif()
+
 # =========== Utilility libs ==============
 set(h5bench_util_src
     commons/h5bench_util.c
@@ -31,6 +38,9 @@ add_library(h5bench_util ${h5bench_util_src})
 if(WITH_ASYNC_VOL)
 	target_link_libraries(h5bench_util asynchdf5 h5async)
 endif()
+if(WITH_CACHE_VOL)
+	target_link_libraries(h5bench_util cache_new_h5api)
+endif()
 # =================================================================
 
 # ===========  Build h5bench_patterns: h5bench_write and h5bench_read ===========

commons/h5bench_util.c

@@ -23,6 +23,10 @@
 #include "async_adaptor.h"
 #endif
 
+#ifdef USE_CACHE_VOL
+#include "cache_new_h5api.h"
+#endif
+
 #include "h5bench_util.h"
 
 int str_to_ull(char *str_in, unsigned long long *num_out);
@@ -67,11 +71,13 @@ h5bench_sleep(duration sleep_time)
 void
 async_sleep(hid_t file_id, hid_t fapl, duration sleep_time)
 {
+#ifndef USE_CACHE_VOL
 #ifdef USE_ASYNC_VOL
     unsigned cap = 0;
     H5Pget_vol_cap_flags(fapl, &cap);
     if (H5VL_CAP_FLAG_ASYNC & cap)
         H5Fstart(file_id, fapl);
+#endif
 #endif
     h5bench_sleep(sleep_time);
 }
@@ -179,9 +185,6 @@ ts_delayed_close(mem_monitor *mon, unsigned long *metadata_time_total, int dset_
     unsigned long t1, t2;
     unsigned long meta_time = 0;
 
-    if (mon->mode == ASYNC_NON)
-        return 0;
-
     for (int i = 0; i < mon->time_step_cnt; i++) {
         ts_run = &(mon->time_steps[i]);
         if (mon->time_steps[i].status == TS_DELAY) {
@@ -256,6 +259,7 @@ mem_monitor_final_run(mem_monitor *mon, unsigned long *metadata_time_total, unsi
     int           dset_cnt = 8;
 
     if (mon->mode == ASYNC_NON) {
+        t1 = get_time_usec();
         for (int i = 0; i < mon->time_step_cnt; i++) {
             ts_run = &(mon->time_steps[i]);
             if (mon->time_steps[i].status == TS_DELAY) {
@@ -265,6 +269,8 @@ mem_monitor_final_run(mem_monitor *mon, unsigned long *metadata_time_total, unsi
                 H5Gclose_async(ts_run->grp_id, ts_run->es_meta_close);
             }
         }
+        t2 = get_time_usec();
+        meta_time += (t2 - t1);
         return 0;
     }
 

h5bench_patterns/h5bench_write.c

@@ -48,7 +48,9 @@
 #include <time.h>
 #include "../commons/h5bench_util.h"
 #include "../commons/async_adaptor.h"
-
+#ifdef USE_CACHE_VOL
+#include "cache_new_h5api.h"
+#endif
 #define DIM_MAX 3
 
 herr_t ierr;
@@ -463,7 +465,6 @@ data_write_contig_contig_MD_array(time_step *ts, hid_t loc, hid_t *dset_ids, hid
     dset_ids[7] = H5Dcreate_async(loc, "id_2", H5T_NATIVE_FLOAT, filespace, H5P_DEFAULT, dcpl, H5P_DEFAULT,
                                   ts->es_meta_create);
     unsigned t2 = get_time_usec();
-
     ierr =
         H5Dwrite_async(dset_ids[0], H5T_NATIVE_FLOAT, memspace, filespace, plist_id, data_in->x, ts->es_data);
     ierr =
@@ -756,7 +757,10 @@ _run_benchmark_write(bench_params params, hid_t file_id, hid_t fapl, hid_t files
 
         if (MY_RANK == 0)
             printf("Writing %s ... \n", grp_name);
-
+#ifdef USE_CACHE_VOL
+        MPI_Barrier(MPI_COMM_WORLD);
+        H5Fcache_async_op_pause(file_id);
+#endif
         switch (pattern) {
             case CONTIG_CONTIG_1D:
             case CONTIG_CONTIG_2D:
@@ -792,7 +796,9 @@ _run_benchmark_write(bench_params params, hid_t file_id, hid_t fapl, hid_t files
             default:
                 break;
         }
-
+#ifdef USE_CACHE_VOL
+        H5Fcache_async_op_start(file_id);
+#endif
         ts->status = TS_DELAY;
 
         if (params.cnt_time_step_delay == 0) {
@@ -804,7 +810,6 @@ _run_benchmark_write(bench_params params, hid_t file_id, hid_t fapl, hid_t files
             t4         = get_time_usec();
             meta_time5 += (t4 - t3);
         }
-
         if (ts_index != timestep_cnt - 1) { // no sleep after the last ts
             if (params.compute_time.time_num >= 0) {
                 if (MY_RANK == 0)
@@ -813,7 +818,7 @@ _run_benchmark_write(bench_params params, hid_t file_id, hid_t fapl, hid_t files
             }
         }
 
-        *metadata_time_total += (meta_time1 + meta_time2 + meta_time3 + meta_time4);
+        *metadata_time_total += (meta_time1 + meta_time2 + meta_time3 + meta_time4 + meta_time5);
         *data_time_total += (data_time_exp + data_time_imp);
     } // end for timestep_cnt
 
@@ -1066,7 +1071,6 @@ main(int argc, char *argv[])
         mode_str = "Sync";
 #endif
         printf("\n==================  Performance results  =================\n");
-
         unsigned long long total_sleep_time_us =
             read_time_val(params.compute_time, TIME_US) * (params.cnt_time_step - 1);
         unsigned long total_size_gb = NUM_RANKS * local_data_size / (1024 * 1024 * 1024);