Optimization 2

This commit is contained in:
Eric Biggers 2016-05-20 21:03:07 -05:00
parent 4c5d30387a
commit bc02ba9d2f
2 changed files with 6 additions and 5 deletions

View File

@ -1,6 +1,4 @@
VARIABLE MIN INITIAL MAX VARIABLE MIN INITIAL MAX
BLOCK_SIZE_SHIFT 0 12 20 BLOCK_SIZE_SHIFT 0 12 20
BLOCK_CUTOFF 0 200 2000 BLOCK_CUTOFF 0 200 2000
MIN_BLOCK_LENGTH 1000 10000 500000
MAX_BLOCK_LENGTH 1000 300000 2000000
OBSERVATIONS_PER_CHECK 10 512 10000 OBSERVATIONS_PER_CHECK 10 512 10000

View File

@ -2,6 +2,11 @@
set -e set -e
if [ -z "$LEVEL" -o -z "$INPUTFILE" ]; then
echo "Must specify LEVEL and INPUTFILE" 1>&2
exit 1
fi
topdir="$(dirname "$0")/../.." topdir="$(dirname "$0")/../.."
git checkout -f "$topdir/src" > /dev/null git checkout -f "$topdir/src" > /dev/null
@ -10,11 +15,9 @@ sed -i -e \
" "
s/\<block_size >> 12\>/block_size >> $BLOCK_SIZE_SHIFT/ s/\<block_size >> 12\>/block_size >> $BLOCK_SIZE_SHIFT/
s/\<200 \* stats->num_observations/$BLOCK_CUTOFF * stats->num_observations/ 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/ s/num_new_observations < 512\>/num_new_observations < $OBSERVATIONS_PER_CHECK/
" \ " \
"$topdir/src/deflate_compress.c" "$topdir/src/deflate_compress.c"
make -C "$topdir" -j BUILD_BENCHMARK_PROGRAM=yes > /dev/null 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 ' '