Commit 8df3ac70 authored by Ian Lynagh's avatar Ian Lynagh

Make a "validate --hpc"; shows how much of the compiler the testsuite tests

Currently it causes a load of ghci-debugger tests to fail and takes
63% longer.
parent 073a9255
......@@ -5,7 +5,7 @@ HADDOCK_DOCS = YES
SRC_CC_OPTS = $(WERROR)
SRC_HC_OPTS = $(WERROR) -H64m -O0 -fasm
GhcStage1HcOpts = -O -fasm
GhcStage2HcOpts = -O0 -fasm
GhcStage2HcOpts = -O0 -fasm $(ValidateHpcFlags)
GhcLibHcOpts = -O -fasm -dcore-lint
GhcLibWays =
SplitObjs = NO
......
......@@ -5,11 +5,14 @@
# a previous interrupted validation run
# --testsuite-only: don't build the compiler, just run
# the test suite
# --hpc: build stage2 with -fhpc, and see how much of the
# compiler the test suite covers
set -e
no_clean=0
testsuite_only=0
hpc=0
while [ $# -gt 0 ]
do
......@@ -20,6 +23,9 @@ do
--testsuite-only)
testsuite_only=1
;;
--hpc)
hpc=1
;;
*)
echo "Bad argument: $1" >&2
exit 1;;
......@@ -51,11 +57,33 @@ fi
sh boot
./configure "--prefix=`pwd`/inst" $config_args
make Validating=YES -j$threads
thisdir=`utils/pwd/pwd forwardslash`
if [ "$hpc" = 1 ]
then
hpcflags="ValidateHpcFlags=-fhpc -hpcdir $thisdir/testsuite/hpc_output/"
fi
make Validating=YES -j$threads ${hpcflags+"$hpcflags"}
fi # testsuite-only
if [ "$hpc" = 1 ]
then
# XXX With threads we'd need to give a different tix file to each thread
# and then sum them up at the end
threads=1
HPCTIXFILE=$thisdir/testsuite/hpc_output/ghc.tix
export HPCTIXFILE
rm -f $HPCTIXFILE
fi
make Validating=YES -C testsuite/tests/ghc-regress fast stage=2 CLEANUP=1 THREADS=$threads 2>&1 | tee testlog
if [ "$hpc" = 1 ]
then
utils/hpc/hpc markup --hpcdir=. --srcdir=compiler --srcdir=testsuite/hpc_output --destdir=testsuite/hpc_output testsuite/hpc_output/ghc.tix
fi
echo "-------------------------------------------------------------------"
if
grep '\<0 caused framework failures' testlog >/dev/null 2>/dev/null &&
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment