mirror of
https://github.com/composewell/streamly.git
synced 2024-08-16 15:00:25 +03:00
Refactor and improve error reporting
This commit is contained in:
Harendra Kumar
parent
0cbcf0b4ab
commit
2b8c70bfac
@ -247,7 +247,7 @@ $RTS_OPTIONS \
|
||||
$QUICK_BENCH_OPTIONS \
|
||||
"$@" \
|
||||
--csv=${output_file}.tmp \
|
||||
-p '$0 == "'"$BENCH_NAME_ESC"'"'
|
||||
-p '$0 == "'"$BENCH_NAME_ESC"'"' || die "Benchmark execution failed."
|
||||
|
||||
# Convert cpuTime field from picoseconds to seconds
|
||||
awk --version 2>&1 | grep -q "GNU Awk" \
|
||||
@ -262,7 +262,7 @@ $RTS_OPTIONS \
|
||||
$QUICK_BENCH_OPTIONS \
|
||||
"$@" \
|
||||
--csvraw=${output_file}.tmp \
|
||||
-m exact "$BENCH_NAME"
|
||||
-m exact "$BENCH_NAME" || die "Benchmark execution failed."
|
||||
tail -n +2 ${output_file}.tmp \
|
||||
>> $output_file
|
||||
fi
|
||||
@ -321,7 +321,12 @@ run_bench_target () {
|
||||
local target_name=$3
|
||||
|
||||
local target_prog
|
||||
target_prog=$(cabal_target_prog $package_name $component $target_name) || \
|
||||
if test -z "$BENCHMARK_PACKAGE_VERSION"
|
||||
then
|
||||
echo "Please set BENCHMARK_PACKAGE_VERSION in bench_config"
|
||||
exit 1
|
||||
fi
|
||||
target_prog=$(cabal_target_prog $package_name-$BENCHMARK_PACKAGE_VERSION $component $target_name) || \
|
||||
die "Cannot find executable for target $target_name"
|
||||
|
||||
echo "Running executable $target_name ..."
|
||||
|
||||
@ -112,6 +112,24 @@ set_targets() {
|
||||
fi
|
||||
}
|
||||
|
||||
# XXX cabal issue "cabal v2-exec which" cannot find benchmark/test executables
|
||||
|
||||
# $1: builddir
|
||||
# $2: package name with version
|
||||
# $3: component ("" (lib), t (test), b (benchmark), x (executable))
|
||||
# $4: command to find
|
||||
cabal_which_builddir() {
|
||||
local path=$(echo $1/build/*/ghc-${GHC_VERSION}/${2}/$3/$4/build/$4/$4)
|
||||
test -f "$path" && echo $path
|
||||
}
|
||||
|
||||
# $1: package name with version
|
||||
# $2: component
|
||||
# $3: command to find
|
||||
cabal_which() {
|
||||
cabal_which_builddir $BUILD_DIR $1 $2 $3
|
||||
}
|
||||
|
||||
# We run the benchmarks in isolation in a separate process so that different
|
||||
# benchmarks do not interfere with other. To enable that we need to pass the
|
||||
# benchmark exe path to gauge as an argument. Unfortunately it cannot find its
|
||||
@ -119,7 +137,7 @@ set_targets() {
|
||||
|
||||
# The path is dependent on the architecture and cabal version.
|
||||
|
||||
# $1: package name
|
||||
# $1: package name with version
|
||||
# $2: component
|
||||
# $3: target
|
||||
cabal_target_prog () {
|
||||
@ -169,24 +187,6 @@ set_derived_vars () {
|
||||
GHC_VERSION=$($CABAL_WITH_COMPILER --numeric-version)
|
||||
}
|
||||
|
||||
# XXX cabal issue "cabal v2-exec which" cannot find benchmark/test executables
|
||||
|
||||
# $1: builddir
|
||||
# $2: package name
|
||||
# $3: component ("" (lib), t (test), b (benchmark), x (executable))
|
||||
# $4: command to find
|
||||
cabal_which_builddir() {
|
||||
local path=$(echo $1/build/*/ghc-${GHC_VERSION}/${2}-0.0.0/$3/$4/build/$4/$4)
|
||||
test -f "$path" && echo $path
|
||||
}
|
||||
|
||||
# $1: package name
|
||||
# $2: component
|
||||
# $3: command to find
|
||||
cabal_which() {
|
||||
cabal_which_builddir $BUILD_DIR $1 $2 $3
|
||||
}
|
||||
|
||||
# $1: build program
|
||||
# $2: package name
|
||||
# $3: component prefix
|
||||
@ -204,47 +204,3 @@ run_build () {
|
||||
done
|
||||
run_verbose $build_prog $COMPONENTS || die "build failed"
|
||||
}
|
||||
|
||||
# $1: target name
|
||||
get_tix_file () {
|
||||
echo $BUILD_DIR/build/$SYSTEM/ghc-${GHC_VERSION}/$PACKAGE_FULL_NAME/hpc/vanilla/tix/$1/$1.tix
|
||||
}
|
||||
|
||||
# $1: package name
|
||||
# $2: component
|
||||
# $3: target
|
||||
# $4: args generator func
|
||||
run_target () {
|
||||
local package_name=$1
|
||||
local component=$2
|
||||
local target_name=$3
|
||||
local extra_args=$4
|
||||
|
||||
local target_prog
|
||||
target_prog=$(cabal_target_prog $package_name $component $target_name) || \
|
||||
die "Cannot find executable for target $target_name"
|
||||
|
||||
echo "Running executable $target_name ..."
|
||||
|
||||
# Needed by bench-exec-one.sh
|
||||
export BENCH_EXEC_PATH=$target_prog
|
||||
mkdir -p $(dirname $(get_tix_file $target_name))
|
||||
export HPCTIXFILE=$(get_tix_file $target_name)
|
||||
|
||||
run_verbose $target_prog $($extra_args $target_name $target_prog) \
|
||||
|| die "Target exe failed"
|
||||
|
||||
# hpc-coveralls fails if there is an empty dir and no .tix file generated
|
||||
rmdir $(dirname $(get_tix_file $target_name)) 2>/dev/null || true
|
||||
}
|
||||
|
||||
# $1: package name
|
||||
# $2: component
|
||||
# $3: targets
|
||||
# $4: args generator func
|
||||
run_targets() {
|
||||
for i in $3
|
||||
do
|
||||
run_target $1 $2 $i $4
|
||||
done
|
||||
}
|
||||
|
||||
@ -47,4 +47,4 @@ let haskellPackages =
|
||||
};
|
||||
in if nixpkgs.lib.inNixShell
|
||||
then shell
|
||||
else (mkHaskellPackages false).streamly
|
||||
else (mkHaskellPackages false).bench-report
|
||||
|
||||
@ -42,8 +42,13 @@ bench_rts_options () {
|
||||
*) echo -n "" ;;
|
||||
esac
|
||||
|
||||
echo " "
|
||||
echo -n " "
|
||||
case "$exe_name" in
|
||||
Prelude.Concurrent*) echo -n "-K256K -M384M" ;;
|
||||
*) echo -n "" ;;
|
||||
esac
|
||||
|
||||
echo -n " "
|
||||
# Based on specific benchmark
|
||||
# XXX Note: for tasty-bench we replace the "." separator in the benchmark names
|
||||
# with "/" for matching with this. It may not work reliably if the benchmark
|
||||
@ -106,11 +111,6 @@ bench_rts_options () {
|
||||
Data.Array.Foreign/o-1-space/elimination/foldable/sum) echo -n "-K8M" ;;
|
||||
*) echo -n "" ;;
|
||||
esac
|
||||
|
||||
case "$exe_name" in
|
||||
Prelude.Concurrent*) echo -n " -K256K -M384M" ;;
|
||||
*) echo -n "" ;;
|
||||
esac
|
||||
}
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
46
bin/test.sh
46
bin/test.sh
@ -156,9 +156,53 @@ fi
|
||||
# Run targets
|
||||
#-----------------------------------------------------------------------------
|
||||
|
||||
# $1: target name
|
||||
get_tix_file () {
|
||||
echo $BUILD_DIR/build/$SYSTEM/ghc-${GHC_VERSION}/$PACKAGE_FULL_NAME/hpc/vanilla/tix/$1/$1.tix
|
||||
}
|
||||
|
||||
# $1: package name
|
||||
# $2: component
|
||||
# $3: target
|
||||
# $4: args generator func
|
||||
run_target () {
|
||||
local package_name=$1
|
||||
local component=$2
|
||||
local target_name=$3
|
||||
local extra_args=$4
|
||||
|
||||
local target_prog
|
||||
target_prog=$(cabal_target_prog $package_name $component $target_name) || \
|
||||
die "Cannot find executable for target $target_name"
|
||||
|
||||
echo "Running executable $target_name ..."
|
||||
|
||||
# Needed by bench-exec-one.sh
|
||||
export BENCH_EXEC_PATH=$target_prog
|
||||
mkdir -p $(dirname $(get_tix_file $target_name))
|
||||
export HPCTIXFILE=$(get_tix_file $target_name)
|
||||
|
||||
run_verbose $target_prog $($extra_args $target_name $target_prog) \
|
||||
|| die "Target exe failed"
|
||||
|
||||
# hpc-coveralls fails if there is an empty dir and no .tix file generated
|
||||
rmdir $(dirname $(get_tix_file $target_name)) 2>/dev/null || true
|
||||
}
|
||||
|
||||
# $1: package name with version
|
||||
# $2: component
|
||||
# $3: targets
|
||||
# $4: args generator func
|
||||
run_targets() {
|
||||
for i in $3
|
||||
do
|
||||
run_target $1 $2 $i $4
|
||||
done
|
||||
}
|
||||
|
||||
if test "$MEASURE" -eq "1"
|
||||
then
|
||||
run_targets streamly-tests t "$TARGETS" target_exe_extra_args
|
||||
run_targets "streamly-tests-0.0.0" t "$TARGETS" target_exe_extra_args
|
||||
fi
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
|
||||
Loading…
Reference in New Issue
Block a user