summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Craven <5086-clyring@users.noreply.gitlab.haskell.org>2023-01-14 17:17:38 -0500
committerMarge Bot <ben+marge-bot@smart-cactus.org>2023-01-23 21:46:41 -0500
commiteee3bf05f8ee29ae6c01a29db9502a390720f3b5 (patch)
tree384079cc0457acf4fb307ea18a88395a058c54a4
parent2c6deb186b3a25306c71bd75c6e676be43ddf603 (diff)
downloadhaskell-eee3bf05f8ee29ae6c01a29db9502a390720f3b5.tar.gz
Do not collect compile-time metrics for T21839r
...the testsuite doesn't handle this properly since it also collects run-time metrics. Compile-time metrics for this test are already tracked via T21839c. Metric Decrease: T21839r
-rw-r--r--testsuite/tests/perf/compiler/T21839c.stdout1
-rw-r--r--testsuite/tests/perf/compiler/all.T3
-rw-r--r--testsuite/tests/perf/should_run/all.T6
3 files changed, 7 insertions, 3 deletions
diff --git a/testsuite/tests/perf/compiler/T21839c.stdout b/testsuite/tests/perf/compiler/T21839c.stdout
deleted file mode 100644
index b95ab72342..0000000000
--- a/testsuite/tests/perf/compiler/T21839c.stdout
+++ /dev/null
@@ -1 +0,0 @@
-10008
diff --git a/testsuite/tests/perf/compiler/all.T b/testsuite/tests/perf/compiler/all.T
index 00a5abe8dd..ecb87fe7b7 100644
--- a/testsuite/tests/perf/compiler/all.T
+++ b/testsuite/tests/perf/compiler/all.T
@@ -646,6 +646,9 @@ test ('T20261',
[''])
# Track perf of generics based binary instances
+# See also T21839r in perf/should_run... the testsuite
+# does not sensibly handle one test acting as both
+# a compile-time and a run-time performance test
test('T21839c',
[ collect_compiler_stats('all', 10),
collect_compiler_stats('bytes allocated', 1),
diff --git a/testsuite/tests/perf/should_run/all.T b/testsuite/tests/perf/should_run/all.T
index ba75906c7d..89b690971a 100644
--- a/testsuite/tests/perf/should_run/all.T
+++ b/testsuite/tests/perf/should_run/all.T
@@ -400,11 +400,13 @@ test('T19347',
compile_and_run,
['-O'])
-# Track perf of generics based binary instances
+# Track runtime perf of generics based binary instances
+# See also T21839c in perf/compiler... the testsuite
+# does not sensibly handle one test acting as both
+# a compile-time and a run-time performance test
test('T21839r',
[ collect_stats('bytes allocated', 10),
collect_runtime_residency(10),
- collect_compiler_stats('bytes allocated', 1),
only_ways(['normal'])],
compile_and_run,
['-O'])