From 2cee92861c43ac74154bbd155a83f9f4ad0b9f2f Mon Sep 17 00:00:00 2001
From: Andreas Klebinger <klebinger.andreas@gmx.at>
Date: Tue, 21 Jun 2022 00:08:37 +0200
Subject: [PATCH] Adjust default benchmark set and base bounds.
Some of the parallel benchmarks aren't very stable with a limited number
of iterations so don't run them by default. They used to be not run at
all! So not a huge change imo.
Also bump the base bounds to make newer ghcs work again.
---
shake/nofib-run.cabal | 8 ++++----
shake/runner/Main.hs | 9 +++++++--
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/shake/nofib-run.cabal b/shake/nofib-run.cabal
index 86295245..be70452a 100644
--- a/shake/nofib-run.cabal
+++ b/shake/nofib-run.cabal
@@ -16,7 +16,7 @@ library
exposed-modules: Measurements
ghc-options: -Wall
hs-source-dirs: src
- build-depends: base >=4.5 && <4.16,
+ build-depends: base >=4.5 && <4.17,
aeson,
these >= 0.8,
containers,
@@ -42,7 +42,7 @@ executable nofib-run
, DeriveDataTypeable
, BangPatterns
, ScopedTypeVariables
- build-depends: base >=4.5 && <4.16,
+ build-depends: base >=4.5 && <4.17,
time >=1.4 && <1.10,
containers,
bytestring,
@@ -62,7 +62,7 @@ executable nofib-compare
ghc-options: -Wall
other-modules: LabelMatch
other-extensions: RecordWildCards, DeriveDataTypeable
- build-depends: base >=4.5 && <4.16,
+ build-depends: base >=4.5 && <4.17,
these,
containers,
directory,
@@ -81,7 +81,7 @@ executable nofib-compare
executable nofib-merge
main-is: Merge.hs
ghc-options: -Wall
- build-depends: base >=4.5 && <4.16,
+ build-depends: base >=4.5 && <4.17,
optparse-applicative,
cassava,
bytestring,
diff --git a/shake/runner/Main.hs b/shake/runner/Main.hs
index 326440ff..6625ad7e 100644
--- a/shake/runner/Main.hs
+++ b/shake/runner/Main.hs
@@ -45,8 +45,13 @@ ml = Ms.mkLabel
-- | These are directories that we look into for tests by default.
testRoots :: [String]
-testRoots = words "imaginary spectral real shootout parallel smp"
- -- Note that we don't run the gc tests by default.
+testRoots = words "imaginary spectral real shootout"
+ -- Note that we don't run the gc smp and parallel tests by default.
+ -- See #24 for some of the reasoning. The short version is that they are not very
+ -- stable run to run and are more sensitive to system load. So more care has to be
+ -- taken to properly run these.
+ -- Currently we value benchmark stability higher than including these in the default set
+ -- therefore we skip these by default.
defaultNoFibHcOpts :: [String]
defaultNoFibHcOpts = words "-O2 -Wno-tabs"
--
GitLab