testsuite: Convert hole fit performance tests into proper perf testswip/hole-fit-perf

Fixes #20621

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 a2bb10ba02..de2e5f7946 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, [''])