Explorar el Código

Fix off-by-one error in heap extract experiments

Ian Goldberg hace 5 meses
padre
commit
ba5dee080a
Se han modificado 3 ficheros con 5 adiciones y 5 borrados
  1. 1 1
      repro/generate_raw_data_heap.sh
  2. 1 1
      repro/generate_raw_data_heap_const_db.sh
  3. 3 3
      repro/repro

+ 1 - 1
repro/generate_raw_data_heap.sh

@@ -11,7 +11,7 @@ cd ..
 mkdir -p repro/data
 for itr in $(seq 1 $nitrs); do
     for size in 16 18 20 22 24 26; do
-        ops=$((size * 6))
+        ops=$(( (size-1) * 6))
         now=`date`; echo "$now: Running heap extract on heapsize of 2^${size} ..."
 	Docker/run-experiment ${size} ${ops} >> repro/data/log_${size}_1_heap.out
     done

+ 1 - 1
repro/generate_raw_data_heap_const_db.sh

@@ -11,7 +11,7 @@ cd ..
 mkdir -p repro/data
 for itr in $(seq 1 $nitrs); do
     for num in 4 8 16 32; do
-        ops=$((num * 120))
+        ops=$((num * 114))
         now=`date`; echo "$now: Running $num Heap Extracts ..."
 	Docker/run-experiment 20 ${ops} >> repro/data/log_20_${num}_heap.out
     done

+ 3 - 3
repro/repro

@@ -139,13 +139,13 @@ echo "# Figure 7(c)"
 egrep 'Ramen read ([0-9]+) \1 .* KiB$' data/ramen.dat | sort -k3 -n
 echo
 echo "# Figure 8(a)"
-egrep 'Ramen read 20 (480|960|1920|3840) .* s$' data/ramen.dat | sort -k4 -n
+egrep 'Ramen read 20 (456|912|1824|3648) .* s$' data/ramen.dat | sort -k4 -n
 echo
 echo "# Figure 8(b)"
-egrep 'Ramen read (16 96|18 108|20 120|22 132|24 144|26 156|28 168|30 180) .* s$' data/ramen.dat | sort -k3 -n
+egrep 'Ramen read (16 90|18 102|20 114|22 126|24 138|26 150|28 162|30 174) .* s$' data/ramen.dat | sort -k3 -n
 echo
 echo "# Figure 8(c)"
-egrep 'Ramen read (16 96|18 108|20 120|22 132|24 144|26 156|28 168|30 180) .* KiB$' data/ramen.dat | sort -k3 -n
+egrep 'Ramen read (16 90|18 102|20 114|22 126|24 138|26 150|28 162|30 174) .* KiB$' data/ramen.dat | sort -k3 -n
 echo
 echo "# End figures"