Only core phases

Makefile

@@ -22,7 +22,7 @@ vpath %.h $(SEARCHPATH)
 DEPS += io500-util.h io500-debug.h io500-opt.h
 OBJSO += util.o
 OBJSO += ini-parse.o phase_dbg.o phase_opt.o phase_timestamp.o
-OBJSO += phase_find.o phase_find_easy.o phase_find_hard.o phase_ior_easy.o phase_ior_easy_read.o phase_mdtest.o phase_ior.o phase_ior_easy_write.o phase_ior_hard.o phase_ior_hard_read.o phase_ior_hard_write.o phase_mdtest_easy.o phase_mdtest_easy_delete.o phase_mdtest_easy_stat.o phase_mdtest_easy_write.o phase_mdtest_hard.o phase_mdtest_hard_delete.o phase_mdtest_hard_read.o phase_mdtest_hard_stat.o phase_mdtest_hard_write.o phase_ior_rnd1MB.o phase_ior_rnd4K.o phase_ior_rnd_write4K.o phase_ior_rnd_read4K.o phase_ior_rnd_write1MB.o phase_ior_rnd_read1MB.o phase_mdworkbench.o phase_mdworkbench_create.o phase_mdworkbench_delete.o phase_mdworkbench_bench.o phase_ior_rnd_read4k-easywrite.o
+OBJSO += phase_find.o phase_ior_easy.o phase_ior_easy_read.o phase_mdtest.o phase_ior.o phase_ior_easy_write.o phase_ior_hard.o phase_ior_hard_read.o phase_ior_hard_write.o phase_mdtest_easy.o phase_mdtest_easy_delete.o phase_mdtest_easy_stat.o phase_mdtest_easy_write.o phase_mdtest_hard.o phase_mdtest_hard_delete.o phase_mdtest_hard_read.o phase_mdtest_hard_stat.o phase_mdtest_hard_write.o phase_ior_rnd_read4k-easywrite.o
 
 OBJS = $(patsubst %,./build/%,$(OBJSO))
 

config-debug-run.ini

@@ -5,5 +5,4 @@ timestamp-resultdir = FALSE
 
 [debug]
 stonewall-time = 1
-pause-dir = ./pause/
 

find/sfind.sh

@@ -9,6 +9,10 @@
 # When you are done pring 'x/y' where x is matched files and y is total files searched.
 # There is a parallel version also install in bin that might be better
 
+# The script should support the following extra options
+# -e for deletion of found files 
+# -E for deletion of directories
+
 function parse_rates {
   #find -D rates gives a weird thing like this:
   #Predicate success rates after completion
@@ -18,7 +22,20 @@ function parse_rates {
   echo $rates | tr " " "\n" | grep '/' | $1 -1 | cut -d \/ -f 2 | cut -d = -f 1
 }
 
-rates=`find -D rates $* 2>&1 | grep -A1 Predicate | tail -1` 
+IN=""
+for var in "$@"
+do
+    if [[ $var == "-e" ]] ; then 
+      continue
+    fi
+    if [[ $var == "-E" ]] ; then 
+      IN="$IN -exec rm -f {} ;"
+      continue
+    fi
+    IN="$IN $var"
+done
+
+rates=$(find -D rates $IN 2>&1 | grep -A1 Predicate | tail -1)
 total_files=$(parse_rates 'head')
 match_files=$(parse_rates 'tail')
 echo "MATCHED $match_files/$total_files"

include/io500-opt.h

@@ -27,7 +27,8 @@ typedef struct{
 
   int rank;
   int mpi_size;
-  int io_buffers_on_gpu; /* are the I/O buffers to be allocated on a GPU */
+  int allocateBufferDevice; /* where are the I/O buffers allocated and processed */
+  int gpuDirect; /* useGPUDirect */
 
   char * api;
   char * apiArgs; // for IOR and mdtest

include/io500-phase.h

@@ -8,7 +8,7 @@
 #define DEBUG_OPTION "INVALIDATES RUN; FOR DEBUGGING."
 
 typedef enum {
-  IO500_NO_SCORE,
+  IO500_NO_SCORE = 0,
   IO500_SCORE_MD,
   IO500_SCORE_BW,
   IO500_SCORE_LAST
@@ -20,8 +20,7 @@ typedef enum {
   IO500_PHASE_WRITE = 2,
   IO500_PHASE_READ = 4,
   IO500_PHASE_UPDATE = 8,
-  IO500_PHASE_REMOVE = 16,
-  IO500_PHASE_FLAG_OPTIONAL = 32
+  IO500_PHASE_REMOVE = 16
 } io500_phase_type;
 
 typedef struct{
@@ -37,34 +36,19 @@ typedef struct{
   io500_phase_score_group group;
 } u_phase_t;
 
-#define IO500_PHASES (2 + 1 + 2*3 + 3 + 3 + 4 + 5 + 3 + 4 + 1)
+#define IO500_PHASES (2 + 1 + 1 + 3 + 4 + 4 + 5)
 
 extern u_phase_t p_opt;
 extern u_phase_t p_debug;
 
 extern u_phase_t p_timestamp;
 
 extern u_phase_t p_find;
-extern u_phase_t p_find_easy;
-extern u_phase_t p_find_hard;
 
 extern u_phase_t p_ior_hard;
 extern u_phase_t p_ior_hard_write;
 extern u_phase_t p_ior_hard_read;
 
-extern u_phase_t p_ior_rnd4K;
-extern u_phase_t p_ior_rnd4K_write;
-extern u_phase_t p_ior_rnd4K_read;
-
-extern u_phase_t p_ior_rnd1MB;
-extern u_phase_t p_ior_rnd1MB_write;
-extern u_phase_t p_ior_rnd1MB_read;
-
-extern u_phase_t p_mdworkbench;
-extern u_phase_t p_mdworkbench_create;
-extern u_phase_t p_mdworkbench_bench;
-extern u_phase_t p_mdworkbench_delete;
-
 extern u_phase_t p_ior_easy;
 extern u_phase_t p_ior_easy_write;
 extern u_phase_t p_ior_easy_read;

include/io500-util.h

@@ -82,7 +82,7 @@ void u_print_timestamp(FILE * out);
 void * u_malloc(int size);
 
 
-FILE * u_res_file_prep(char const * name);
+FILE * u_res_file_prep(char const * name, int rank);
 void u_res_file_close(FILE * out);
 
 uint32_t u_phase_unique_random_number(char const * phase_name);

prepare.sh

@@ -7,7 +7,7 @@ echo It will also attempt to build the benchmarks
 echo It will output OK at the end if builds succeed
 echo
 
-IOR_HASH=348572ccfe8963
+IOR_HASH=de7dc94f468d8cb8f
 PFIND_HASH=aaba722a178
 
 INSTALL_DIR=$PWD