on master help sign in
Move "dev" flag benchmarks to regular build

Now we have all the internal modules exposed, we can build these in the regular build itself.

commit45b6a21dc533951adde50dc29f6cad6a15037997 authorHarendra Kumar <harendra.kumar@gmail.com> dateFri 14 Feb 2020, 17:47 (7 years ago) parentd6993b7
1 file changed+4−18
bench.sh+4−18
bench.sh+4−18
@@ -1,19 +1,18 @@
11#!/bin/bash
22
3−DEV_BENCHMARKS="base concurrent adaptive"
4−SERIAL_BENCHMARKS="linear linear-rate nested nested-unfold"
3+SERIAL_BENCHMARKS="linear linear-rate nested nested-unfold base"
54# parallel benchmark-suite is separated because we run it with a higher
65# heap size limit.
7−CONCURRENT_BENCHMARKS="linear-async nested-concurrent parallel"
6+CONCURRENT_BENCHMARKS="linear-async nested-concurrent parallel concurrent adaptive"
87ARRAY_BENCHMARKS="array unpinned-array prim-array small-array"
98
109INFINITE_BENCHMARKS="$SERIAL_BENCHMARKS linear-async nested-concurrent"
11−FINITE_BENCHMARKS="$ARRAY_BENCHMARKS fileio parallel"
10+FINITE_BENCHMARKS="$ARRAY_BENCHMARKS fileio parallel concurrent adaptive"
1211
1312QUICK_BENCHMARKS="linear-rate concurrent adaptive"
1413VIRTUAL_BENCHMARKS="array-cmp"
1514
16−ALL_BENCHMARKS="$SERIAL_BENCHMARKS $CONCURRENT_BENCHMARKS $ARRAY_BENCHMARKS $VIRTUAL_BENCHMARKS $DEV_BENCHMARKS"
15+ALL_BENCHMARKS="$SERIAL_BENCHMARKS $CONCURRENT_BENCHMARKS $ARRAY_BENCHMARKS $VIRTUAL_BENCHMARKS"
1716
1817list_benches () {
1918 for i in $ALL_BENCHMARKS
@@ -65,7 +64,6 @@ set_benchmarks() {
6564 do
6665 case $i in
6766 ALL) echo -n $ALL_BENCHMARKS ;;
68− DEV) echo -n $DEV_BENCHMARKS ;;
6967 SERIAL) echo -n $SERIAL_BENCHMARKS ;;
7068 CONCURRENT) echo -n $CONCURRENT_BENCHMARKS ;;
7169 ARRAY) echo -n $ARRAY_BENCHMARKS ;;
@@ -392,18 +390,6 @@ has_benchmark () {
392390 done
393391}
394392
395−for i in $DEV_BENCHMARKS
396−do
397− if test "$(has_benchmark $i)" = "$i"
398− then
399− STACK_DEV_FLAG="--flag streamly:dev"
400− CABAL_DEV_FLAG="--flag dev"
401− fi
402−done
403−
404−STACK_BUILD_FLAGS="$STACK_BUILD_FLAGS $STACK_DEV_FLAG"
405−CABAL_BUILD_FLAGS="$CABAL_BUILD_FLAGS $CABAL_DEV_FLAG"
406−
407393if test "$USE_STACK" = "1"
408394then
409395 WHICH_COMMAND="stack exec which"