3333done
3434
3535
36+ echo " " | & tee -a $LOG_FILE
3637echo " # All results are in millions of operations per second." | & tee -a $LOG_FILE
37- echo " # Threads $BENCH_OPS_ORDERING " | & tee -a $LOG_FILE
38+
39+ printf " \r\n# Legend (numbers are threads)\r\n" | & tee -a $LOG_FILE
40+ printf " # BenchOp " | & tee -a $LOG_FILE
41+
42+ for (( threads = 1 ; threads <= $THREADS_MAX ; threads*= 4 )) ; do
43+ printf " & $threads " | & tee -a $LOG_FILE
44+ done
45+ echo " " | & tee -a $LOG_FILE
3846
3947SORTED_LOG_FILE=" ./sorted.tmp"
4048STATS_LOG_FILE=" ./stats.tmp"
@@ -50,14 +58,15 @@ printf "\r\n\r\n\r\n#Random Statistics\r\n" > $STATS_LOG_FILE
5058# Threads OP1 OP2 OP3 ...
5159# ####
5260
53- for (( threads = 1 ; threads <= $THREADS_MAX ; threads *= 4 )) ; do
54- (( itterations = $ITTRS / $threads ))
61+ for OP_KEY in $BENCH_OPS_ORDERING
62+ do
5563
56- printf " $threads " >> tee -a $LOG_FILE
64+ BENCH_OP=${BENCH_OPS[$OP_KEY]}
65+ echo -n " $OP_KEY " >> $LOG_FILE
66+ echo -n " $OP_KEY " >> $SORTED_LOG_FILE
5767
58- for OP_KEY in $BENCH_OPS_ORDERING
59- do
60- BENCH_OP=${BENCH_OPS[$OP_KEY]}
68+ for (( threads = 1 ; threads <= $THREADS_MAX ; threads*= 4 )) ; do
69+ (( itterations = $ITTRS / $threads ))
6170
6271 python genConfig.py --iterations=${itterations} --benchOp=" $BENCH_OP " --threads=${threads} > /dev/null
6372 ./run_bench.sh decompSetup > /dev/null
@@ -72,9 +81,9 @@ for (( threads = 1; threads <= $THREADS_MAX; threads*=4 )); do
7281 SORTED_THROUGHPUT=$(echo "scale=2 ; $ITTRS /(1000000 *${SORTED_TIME} )" | bc)
7382
7483 printf "At $threads threads, $OP_KEY had unsorted/sorted throughputs of "
75- printf " 0 %s" $UNSORTED_THROUGHPUT |& tee -a $LOG_FILE
84+ printf " & 0 %s" $UNSORTED_THROUGHPUT |& tee -a $LOG_FILE
7685 printf " / "
77- printf " 0 %s" $SORTED_THROUGHPUT |& tee -a $SORTED_LOG_FILE
86+ printf " & 0 %s" $SORTED_THROUGHPUT |& tee -a $SORTED_LOG_FILE
7887 echo ""
7988
8089 # (/usr/bin/time -f " %e " ./decompressor decompress /tmp/logFile > /tmp/decomp) |& tee -a $SORTED_LOG_FILE
0 commit comments