Just for fun: Added heapsort to the sorting benchmark.

[libucw.git] / debug / sorter / radix-tune-bits.sh

diff --git a/debug/sorter/radix-tune-bits.sh b/debug/sorter/radix-tune-bits.sh
index 65098382f34e742682540810634989ec05e21860..dbaa49c1a887d75240051287774be02002bf5ff4 100644 (file)
--- a/debug/sorter/radix-tune-bits.sh
+++ b/debug/sorter/radix-tune-bits.sh
@@ -7,7 +7,7 @@ UCW_PROGNAME="$0"
 
 # Path to Sherlock build directory
 [ -n "$BUILD" ] || BUILD=..
 
 # Path to Sherlock build directory
 [ -n "$BUILD" ] || BUILD=..

-[ -f "$BUILD/lib/sorter/sorter.h" ] || die "BUILD does not point to Sherlock build directory"
+[ -f "$BUILD/ucw/sorter/sorter.h" ] || die "BUILD does not point to Sherlock build directory"

 
 # Find out sort buffer size
 parse-config 'Sorter{##SortBuffer}'
 
 # Find out sort buffer size
 parse-config 'Sorter{##SortBuffer}'


@@ -23,7 +23,7 @@ log "Decided to benchmark sorting of $SIZE byte data"
 WIDTHS="0 6 7 8 9 10 11 12 13 14"
 
 # Which RadixThresholds we try
 WIDTHS="0 6 7 8 9 10 11 12 13 14"
 
 # Which RadixThresholds we try

-THRS="100 500 1000 2500 5000"
+THRS="2000 4000 10000 20000 50000"

 
 # Which sort-test tests we try
 TESTS="2,5,8,15"
 
 # Which sort-test tests we try
 TESTS="2,5,8,15"


@@ -31,19 +31,19 @@ TESTS="2,5,8,15"
 # Check various bit widths of the radix sorter
 rm -f tmp/radix-*
 for W in $WIDTHS ; do
 # Check various bit widths of the radix sorter
 rm -f tmp/radix-*
 for W in $WIDTHS ; do

-       rm -f $BUILD/obj/lib/sorter/sort-test{,.o}
+       rm -f $BUILD/obj/ucw/sorter/sort-test{,.o}

        if [ $W = 0 ] ; then
                log "Compiling with no radix splits"
        if [ $W = 0 ] ; then
                log "Compiling with no radix splits"

-               ( cd $BUILD && make obj/lib/sorter/sort-test )
+               ( cd $BUILD && make obj/ucw/sorter/sort-test )

                OPT="-d32"
        else
                log "Compiling with $W-bit radix splits"
                OPT="-d32"
        else
                log "Compiling with $W-bit radix splits"

-               ( cd $BUILD && make CEXTRA="-DFORCE_RADIX_BITS=$W" obj/lib/sorter/sort-test )
+               ( cd $BUILD && make CEXTRA="-DFORCE_RADIX_BITS=$W" obj/ucw/sorter/sort-test )

                OPT=
        fi
        for THR in $THRS ; do
                log "Testing with RadixThreshold=$THR"
                OPT=
        fi
        for THR in $THRS ; do
                log "Testing with RadixThreshold=$THR"

-               $BUILD/obj/lib/sorter/sort-test -SSorter.RadixThreshold=$THR -s$SIZE -t$TESTS $OPT -v 2>&1 | tee -a tmp/radix-$W
+               $BUILD/obj/ucw/sorter/sort-test -SThreads.DefaultStackSize=2M -SSorter.RadixThreshold=$THR -s$SIZE -t$TESTS $OPT -v 2>&1 | tee -a tmp/radix-$W

        done
 done
 
        done
 done