[Git][ghc/ghc][wip/T22264] 3 commits: testsuite: Skip some tests when sanity checking is enabled
Ben Gamari (@bgamari)
gitlab at gitlab.haskell.org
Tue Feb 7 19:14:23 UTC 2023
Ben Gamari pushed to branch wip/T22264 at Glasgow Haskell Compiler / GHC
Commits:
afd95331 by Ben Gamari at 2023-02-07T14:14:17-05:00
testsuite: Skip some tests when sanity checking is enabled
- - - - -
cb654e09 by Ben Gamari at 2023-02-07T14:14:17-05:00
nonmoving: Fix unregisterised build
- - - - -
df51737c by Ben Gamari at 2023-02-07T14:14:17-05:00
gitlab-ci: Add job bootstrapping with nonmoving GC
- - - - -
7 changed files:
- .gitlab/gen_ci.hs
- .gitlab/jobs.yaml
- libraries/ghc-heap/tests/all.T
- rts/sm/NonMoving.h
- testsuite/tests/codeGen/should_run/all.T
- testsuite/tests/perf/space_leaks/all.T
- testsuite/tests/rts/all.T
Changes:
=====================================
.gitlab/gen_ci.hs
=====================================
@@ -646,7 +646,6 @@ job arch opsys buildConfig = NamedJob { name = jobName, jobInfo = Job {..} }
, "bash .gitlab/ci.sh test_hadrian" ]
| otherwise
= [ "find libraries -name config.sub -exec cp config.sub {} \\;" | Darwin == opsys ] ++
- [ "sudo apk del --purge glibc*" | opsys == Linux Alpine, isNothing $ crossTarget buildConfig ] ++
[ "sudo chown ghc:ghc -R ." | Linux {} <- [opsys]] ++
[ ".gitlab/ci.sh setup"
, ".gitlab/ci.sh configure"
=====================================
.gitlab/jobs.yaml
=====================================
@@ -706,7 +706,6 @@
}
],
"script": [
- "sudo apk del --purge glibc*",
"sudo chown ghc:ghc -R .",
".gitlab/ci.sh setup",
".gitlab/ci.sh configure",
@@ -830,7 +829,6 @@
}
],
"script": [
- "sudo apk del --purge glibc*",
"sudo chown ghc:ghc -R .",
".gitlab/ci.sh setup",
".gitlab/ci.sh configure",
@@ -2459,7 +2457,6 @@
}
],
"script": [
- "sudo apk del --purge glibc*",
"sudo chown ghc:ghc -R .",
".gitlab/ci.sh setup",
".gitlab/ci.sh configure",
@@ -2523,7 +2520,6 @@
}
],
"script": [
- "sudo apk del --purge glibc*",
"sudo chown ghc:ghc -R .",
".gitlab/ci.sh setup",
".gitlab/ci.sh configure",
@@ -3621,7 +3617,6 @@
}
],
"script": [
- "sudo apk del --purge glibc*",
"sudo chown ghc:ghc -R .",
".gitlab/ci.sh setup",
".gitlab/ci.sh configure",
=====================================
libraries/ghc-heap/tests/all.T
=====================================
@@ -5,7 +5,8 @@ test('heap_all',
# These ways produce slightly different heap representations.
# Currently we don't test them.
omit_ways(['ghci', 'hpc',
- 'nonmoving', 'nonmoving_thr', 'nonmoving_thr_ghc']),
+ 'nonmoving', 'nonmoving_thr', 'nonmoving_thr_ghc',
+ 'nonmoving_thr_sanity']),
# The debug RTS initializes some fields with 0xaa and so
# this test spuriously fails.
when(compiler_debugged(), skip)
=====================================
rts/sm/NonMoving.h
=====================================
@@ -341,10 +341,14 @@ INLINE_HEADER bool nonmovingClosureBeingSwept(StgClosure *p)
}
}
+// N.B. RtsFlags is defined as a pointer in STG code consequently this code
+// doesn't typecheck.
+#if !IN_STG_CODE
INLINE_HEADER bool isNonmovingClosure(StgClosure *p)
{
return RtsFlags.GcFlags.useNonmoving && (!HEAP_ALLOCED_GC(p) || Bdescr((P_)p)->flags & BF_NONMOVING);
}
+#endif
#if defined(DEBUG)
=====================================
testsuite/tests/codeGen/should_run/all.T
=====================================
@@ -203,7 +203,7 @@ test('T15696_3', normal, compile_and_run, ['-O'])
test('T15892',
[ ignore_stdout,
# -G1 is unsupported by the nonmoving GC
- omit_ways(['nonmoving', 'nonmoving_thr', 'nonmoving_thr_ghc']),
+ omit_ways(['nonmoving', 'nonmoving_thr', 'nonmoving_thr_ghc', 'nonmoving_thr_sanity']),
# we want to do lots of major GC to make the bug more likely to
# happen, so -G1 -A32k:
extra_run_opts('+RTS -G1 -A32k -RTS') ],
=====================================
testsuite/tests/perf/space_leaks/all.T
=====================================
@@ -6,7 +6,8 @@ test('space_leak_001',
# 5% possible deviation.
[ collect_stats('bytes allocated',5),
collect_runtime_residency(15),
- omit_ways(['profasm','profthreaded','threaded1','threaded2','nonmoving_thr'])
+ omit_ways(['profasm','profthreaded','threaded1','threaded2',
+ 'nonmoving_thr', 'nonmoving_thr_sanity'])
],
compile_and_run,
[''])
@@ -17,7 +18,7 @@ test('T4334',
collect_runtime_residency(2),
# prof ways don't work well with +RTS -V0, nonmoving way residency is
# highly variable.
- omit_ways(['profasm','profthreaded','nonmoving_thr'])
+ omit_ways(['profasm','profthreaded','nonmoving_thr', 'nonmoving_thr_sanity'])
],
compile_and_run, [''])
=====================================
testsuite/tests/rts/all.T
=====================================
@@ -110,7 +110,7 @@ test('T2047',
[ignore_stdout,
extra_run_opts('+RTS -c -RTS'),
# Non-moving collector doesn't support -c
- omit_ways(['nonmoving', 'nonmoving_thr', 'nonmoving_thr_ghc'])],
+ omit_ways(['nonmoving', 'nonmoving_thr', 'nonmoving_thr_sanity', 'nonmoving_thr_ghc'])],
compile_and_run, ['-package containers'])
# Blackhole-detection test.
@@ -261,7 +261,8 @@ test('T6006', [ omit_ways(prof_ways + ['ghci']),
test('T7037', js_broken(22374), makefile_test, ['T7037'])
test('T7087', exit_code(1), compile_and_run, [''])
-test('T7160', [ omit_ways(['nonmoving_thr', 'nonmoving_thr_ghc'])
+test('T7160', [ # finalization order is too nondeterministic in the concurrent GC
+ omit_ways(['nonmoving_thr', 'nonmoving_thr_ghc', 'nonmoving_thr_sanity'])
, js_broken(22261)
], compile_and_run, [''])
@@ -450,6 +451,9 @@ test('T14900',
test('InternalCounters',
[ js_skip # JS backend doesn't support internal counters
+ # The ways which build against the debug RTS are built with PROF_SPIN and
+ # therefore differ in output
+ , omit_ways(['nonmoving_thr_sanity', 'threaded2_sanity', 'sanity'])
], makefile_test, ['InternalCounters'])
test('alloccounter1', js_broken(22261), compile_and_run,
[
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/4bca12b0355b844d40aacbf85705bcd6e2923175...df51737ca3b07794d9844fa95689305a75cbad74
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/4bca12b0355b844d40aacbf85705bcd6e2923175...df51737ca3b07794d9844fa95689305a75cbad74
You're receiving this email because of your account on gitlab.haskell.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20230207/11fea27e/attachment-0001.html>
More information about the ghc-commits
mailing list