summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÖmer Sinan Ağacan <omeragacan@gmail.com>2016-08-07 15:19:01 +0000
committerÖmer Sinan Ağacan <omeragacan@gmail.com>2016-08-07 15:23:32 +0000
commit773e3aadac4bbee9a0173ebc90ffdc9458a2a3a9 (patch)
treed782a58b9e901f1d53451db76efffb22a4cabbee
parent6fe235543de7ea4319269f164ea444e4af68f759 (diff)
downloadhaskell-773e3aadac4bbee9a0173ebc90ffdc9458a2a3a9.tar.gz
T1969: Enable it again but bump the max residency temporarily
T1969 was broken by 714beb (which actually reduced allocations but residency was increased). Instead of disabling it completely, just bump the number a little bit to avoid making things even worse in the meantime. See also #12437.
-rw-r--r--testsuite/tests/perf/compiler/all.T5
1 files changed, 2 insertions, 3 deletions
diff --git a/testsuite/tests/perf/compiler/all.T b/testsuite/tests/perf/compiler/all.T
index e9e2493d20..4aff4fbf9d 100644
--- a/testsuite/tests/perf/compiler/all.T
+++ b/testsuite/tests/perf/compiler/all.T
@@ -28,8 +28,7 @@ setTestOpts(no_lint)
# really changed, then you know there's an issue.
test('T1969',
- [expect_broken(12437),
- compiler_stats_num_field('peak_megabytes_allocated', # Note [residency]
+ [compiler_stats_num_field('peak_megabytes_allocated', # Note [residency]
[(wordsize(32), 30, 15),
# 2010-05-17 14 (x86/Windows)
# 15 (x86/OS X)
@@ -65,7 +64,7 @@ test('T1969',
# 2014-06-29 5949188 (x86/Linux)
# 2015-07-11 6241108 (x86/Linux, 64bit machine) use +RTS -G1
# 2016-04-06 9093608 (x86/Linux, 64bit machine)
- (wordsize(64), 15017528, 15)]),
+ (wordsize(64), 15017528, 20)]),
# 2014-09-10 10463640, 10 # post-AMP-update (somewhat stabelish)
# looks like the peak is around ~10M, but we're
# unlikely to GC exactly on the peak.