summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Pickering <matthewtpickering@gmail.com>2021-11-05 17:09:23 +0000
committerMarge Bot <ben+marge-bot@smart-cactus.org>2021-11-11 07:21:28 -0500
commit11c9a469b8857ff49aa2f0744bec001a904761e9 (patch)
tree7aa15df51c82a0b4b6c7a1fc88c74028c5529801
parent8c0aec38c129ca58c270f687e009a1c457fd0a10 (diff)
downloadhaskell-11c9a469b8857ff49aa2f0744bec001a904761e9.tar.gz
testsuite: Convert hole fit performance tests into proper perf tests
Fixes #20621
-rw-r--r--testsuite/tests/perf/compiler/T16875.hs (renamed from testsuite/tests/typecheck/should_compile/T16875.hs)0
-rw-r--r--testsuite/tests/perf/compiler/T16875.stderr (renamed from testsuite/tests/typecheck/should_compile/T16875.stderr)0
-rw-r--r--testsuite/tests/perf/compiler/all.T8
-rw-r--r--testsuite/tests/perf/compiler/hard_hole_fits.hs (renamed from testsuite/tests/typecheck/should_compile/hard_hole_fits.hs)0
-rw-r--r--testsuite/tests/perf/compiler/hard_hole_fits.stderr (renamed from testsuite/tests/typecheck/should_compile/hard_hole_fits.stderr)0
-rw-r--r--testsuite/tests/typecheck/should_compile/all.T6
6 files changed, 8 insertions, 6 deletions
diff --git a/testsuite/tests/typecheck/should_compile/T16875.hs b/testsuite/tests/perf/compiler/T16875.hs
index 0ba3c17d5b..0ba3c17d5b 100644
--- a/testsuite/tests/typecheck/should_compile/T16875.hs
+++ b/testsuite/tests/perf/compiler/T16875.hs
diff --git a/testsuite/tests/typecheck/should_compile/T16875.stderr b/testsuite/tests/perf/compiler/T16875.stderr
index af6954792e..af6954792e 100644
--- a/testsuite/tests/typecheck/should_compile/T16875.stderr
+++ b/testsuite/tests/perf/compiler/T16875.stderr
diff --git a/testsuite/tests/perf/compiler/all.T b/testsuite/tests/perf/compiler/all.T
index 9f726cc755..28f899f7ef 100644
--- a/testsuite/tests/perf/compiler/all.T
+++ b/testsuite/tests/perf/compiler/all.T
@@ -512,3 +512,11 @@ test ('T19695',
[ collect_compiler_stats('bytes allocated',2)],
compile,
['-v0 -O2'])
+
+test('hard_hole_fits', # Testing multiple hole-fits with lots in scope for #16875
+ collect_compiler_stats('bytes allocated', 2), # 1 is 300s, 0.010 is 3s. Without hole-fits it takes 1s
+ compile, ['-fdefer-type-errors -fno-max-valid-hole-fits -package ghc'])
+
+test('T16875', # Testing one hole-fit with a lot in scope for #16875
+ collect_compiler_stats('bytes allocated', 2),
+ compile, ['-fdefer-type-errors -fno-max-valid-hole-fits -package ghc'])
diff --git a/testsuite/tests/typecheck/should_compile/hard_hole_fits.hs b/testsuite/tests/perf/compiler/hard_hole_fits.hs
index a1cbec4b59..a1cbec4b59 100644
--- a/testsuite/tests/typecheck/should_compile/hard_hole_fits.hs
+++ b/testsuite/tests/perf/compiler/hard_hole_fits.hs
diff --git a/testsuite/tests/typecheck/should_compile/hard_hole_fits.stderr b/testsuite/tests/perf/compiler/hard_hole_fits.stderr
index 78a3584f1c..78a3584f1c 100644
--- a/testsuite/tests/typecheck/should_compile/hard_hole_fits.stderr
+++ b/testsuite/tests/perf/compiler/hard_hole_fits.stderr
diff --git a/testsuite/tests/typecheck/should_compile/all.T b/testsuite/tests/typecheck/should_compile/all.T
index eb0520be2c..7061f26779 100644
--- a/testsuite/tests/typecheck/should_compile/all.T
+++ b/testsuite/tests/typecheck/should_compile/all.T
@@ -397,12 +397,6 @@ test('abstract_refinement_hole_fits', normal, compile, ['-fdefer-type-errors -fn
test('free_monad_hole_fits', normal, compile, ['-fdefer-type-errors -fno-max-valid-hole-fits -fno-max-refinement-hole-fits -frefinement-level-hole-fits=2 -funclutter-valid-hole-fits'])
test('constraint_hole_fits', normal, compile, ['-fdefer-type-errors -fno-max-valid-hole-fits -fno-max-refinement-hole-fits -frefinement-level-hole-fits=2 -funclutter-valid-hole-fits'])
test('type_in_type_hole_fits', normal, compile, ['-fdefer-type-errors -fno-max-valid-hole-fits'])
-test('hard_hole_fits', # Testing multiple hole-fits with lots in scope for #16875
- compile_timeout_multiplier(0.010), # 1 is 300s, 0.010 is 3s. Without hole-fits it takes 1s
- compile, ['-fdefer-type-errors -fno-max-valid-hole-fits -package ghc'])
-test('T16875', # Testing one hole-fit with a lot in scope for #16875
- compile_timeout_multiplier(0.0015), #0.45s
- compile, ['-fdefer-type-errors -fno-max-valid-hole-fits -package ghc'])
test('T15370', normal, compile, ['-fdefer-type-errors -fno-max-valid-hole-fits -funclutter-valid-hole-fits'])
test('T7408', normal, compile, [''])
test('UnboxStrictPrimitiveFields', normal, compile, [''])