diff --git a/tools/optimization/block_split_params.txt b/tools/optimization/block_split_params.txt index 4ab80cc..592de66 100644 --- a/tools/optimization/block_split_params.txt +++ b/tools/optimization/block_split_params.txt @@ -1,6 +1,4 @@ VARIABLE MIN INITIAL MAX BLOCK_SIZE_SHIFT 0 12 20 BLOCK_CUTOFF 0 200 2000 -MIN_BLOCK_LENGTH 1000 10000 500000 -MAX_BLOCK_LENGTH 1000 300000 2000000 OBSERVATIONS_PER_CHECK 10 512 10000 diff --git a/tools/optimization/try_block_params.sh b/tools/optimization/try_block_params.sh index 9f058c3..6c1be56 100755 --- a/tools/optimization/try_block_params.sh +++ b/tools/optimization/try_block_params.sh @@ -2,6 +2,11 @@ set -e +if [ -z "$LEVEL" -o -z "$INPUTFILE" ]; then + echo "Must specify LEVEL and INPUTFILE" 1>&2 + exit 1 +fi + topdir="$(dirname "$0")/../.." git checkout -f "$topdir/src" > /dev/null @@ -10,11 +15,9 @@ sed -i -e \ " s/\> 12\>/block_size >> $BLOCK_SIZE_SHIFT/ s/\<200 \* stats->num_observations/$BLOCK_CUTOFF * stats->num_observations/ - s/#define MIN_BLOCK_LENGTH.*$/#define MIN_BLOCK_LENGTH $MIN_BLOCK_LENGTH/ - s/#define MAX_BLOCK_LENGTH.*$/#define MAX_BLOCK_LENGTH $MAX_BLOCK_LENGTH/ s/num_new_observations < 512\>/num_new_observations < $OBSERVATIONS_PER_CHECK/ " \ "$topdir/src/deflate_compress.c" make -C "$topdir" -j BUILD_BENCHMARK_PROGRAM=yes > /dev/null -"$topdir/benchmark" -l 12 -s 100000000 $HOME/data/testdata | grep Compressed | cut -f 4 -d ' ' +"$topdir/benchmark" -l $LEVEL -s 100000000 $INPUTFILE | grep Compressed | cut -f 4 -d ' '