[Git][ghc/ghc][master] ghci: Prefer exact source spans in :type-at
by Marge Bot (@marge-bot) 18 Oct '26
by Marge Bot (@marge-bot) 18 Oct '26
18 Oct '26
Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC
Commits:
26b9a8a0 by Arkissa at 2026-10-17T16:04:10+00:00
ghci: Prefer exact source spans in :type-at
Prefer expression types for identical source spans.
Fixes #27412.
- - - - -
12 changed files:
- + changelog.d/T27412
- ghc/GHCi/UI/Info.hs
- testsuite/tests/ghci/prog-mhu001/prog-mhu001c.stdout
- testsuite/tests/ghci/prog-mhu002/prog-mhu002d.stdout
- testsuite/tests/ghci/scripts/T16575.script
- testsuite/tests/ghci/scripts/T16575.stdout
- testsuite/tests/ghci/scripts/T16804.stdout
- testsuite/tests/ghci/scripts/T20150.stdout
- + testsuite/tests/ghci/scripts/T27412.hs
- + testsuite/tests/ghci/scripts/T27412.script
- + testsuite/tests/ghci/scripts/T27412.stdout
- testsuite/tests/ghci/scripts/all.T
Changes:
=====================================
changelog.d/T27412
=====================================
@@ -0,0 +1,10 @@
+section: ghci
+synopsis: Make ``:type-at`` prefer an exact source span match.
+issues: #27412
+mrs: !16332
+
+description: {
+ GHCi's ``:type-at`` command now prefers type information whose source
+ span exactly matches the requested range. This prevents a multi-line
+ selection from incorrectly returning the type of a contained expression.
+}
=====================================
ghc/GHCi/UI/Info.hs
=====================================
@@ -61,6 +61,7 @@ data ModInfo = ModInfo
-- ^ Generated set of information about all spans in the
-- module that correspond to some kind of identifier for
-- which there will be type info and/or location info.
+ -- Sorted by 'leftmost_largest', with enclosing spans before contained spans.
, modinfoRdrEnv :: !IfGlobalRdrEnv
-- ^ What's in scope in the module.
, modinfoLastUpdate :: !UTCTime
@@ -202,7 +203,7 @@ resolveNameFromModule infos name = do
-- | Try to resolve the type display from the given span.
resolveName :: [SpanInfo] -> SpanInfo -> Maybe Var
resolveName spans' si = listToMaybe $ mapMaybe spaninfoVar $
- reverse spans' `spaninfosWithin` si
+ spans' `spaninfosWithin` si
-- | Try to find the type of the given span.
findType :: GhcMonad m
@@ -224,7 +225,7 @@ findType infos span0 string = do
-- | Try to resolve the type display from the given span.
resolveType :: [SpanInfo] -> SpanInfo -> Maybe Type
resolveType spans' si = listToMaybe $ mapMaybe spaninfoType $
- reverse spans' `spaninfosWithin` si
+ spans' `spaninfosWithin` si
-- | Guess a module name from a file path.
guessModule :: GhcMonad m
@@ -333,7 +334,7 @@ processAllTypeCheckedModule :: TypecheckedModule -> [SpanInfo]
processAllTypeCheckedModule tcm
= mapMaybe toSpanInfo
$ sortBy cmpSpan
- $ catMaybes (bts ++ ets ++ pts)
+ $ catMaybes (ets ++ bts ++ pts)
where
bts = map getTypeLHsBind $ listifyAllSpans tcs
ets = map getTypeLHsExpr $ listifyAllSpans tcs
@@ -384,10 +385,8 @@ processAllTypeCheckedModule tcm
| (False `mkQ` (const True :: OverLitTc -> Bool)) x = z
| otherwise = foldl k (f x) (gmapQ (everythingAllSpans k z f) x)
- cmpSpan (_,a,_) (_,b,_)
- | a `isSubspanOf` b = LT
- | b `isSubspanOf` a = GT
- | otherwise = EQ
+ -- Put enclosing spans first so :type-at prefers exact matches. See (#27412).
+ cmpSpan (_,a,_) (_,b,_) = leftmost_largest a b
-- | Pretty print the types into a 'SpanInfo'.
toSpanInfo :: (Maybe Id,SrcSpan,Type) -> Maybe SpanInfo
=====================================
testsuite/tests/ghci/prog-mhu001/prog-mhu001c.stdout
=====================================
@@ -1,36 +1,36 @@
Collecting type info for 1 module(s) ...
:all-types
-e/E.hs:(24,1)-(24,12): GHC.Internal.Types.IO ()
-e/E.hs:(19,1)-(19,3): E.E -> E.E
-e/E.hs:(5,1)-(5,3): GHC.Internal.Bignum.Integer.Integer
e/E.hs:(3,1)-(3,3): GHC.Internal.Bignum.Integer.Integer
-e/E.hs:(7,1)-(7,4): GHC.Internal.Types.IO ()
-e/E.hs:(15,3)-(15,6): GHC.Internal.Types.Int -> GHC.Internal.Base.String
-e/E.hs:(22,3)-(22,6): E.E -> GHC.Internal.Base.String
-e/E.hs:(25,3)-(25,10): GHC.Internal.Base.String -> GHC.Internal.Types.IO ()
-e/E.hs:(25,12)-(25,37): GHC.Internal.Base.String
-e/E.hs:(25,3)-(25,37): GHC.Internal.Types.IO ()
-e/E.hs:(24,16)-(25,37): GHC.Internal.Types.IO ()
-e/E.hs:(19,9)-(19,9): E.E
-e/E.hs:(5,7)-(5,8): GHC.Internal.Bignum.Integer.Integer
e/E.hs:(3,7)-(3,7): GHC.Internal.Bignum.Integer.Integer
+e/E.hs:(5,1)-(5,3): GHC.Internal.Bignum.Integer.Integer
+e/E.hs:(5,7)-(5,8): GHC.Internal.Bignum.Integer.Integer
+e/E.hs:(7,1)-(7,4): GHC.Internal.Types.IO ()
+e/E.hs:(7,8)-(9,11): GHC.Internal.Types.IO ()
+e/E.hs:(8,3)-(8,11): GHC.Internal.Types.IO ()
e/E.hs:(8,3)-(8,7): GHC.Internal.Bignum.Integer.Integer -> GHC.Internal.Types.IO ()
e/E.hs:(8,9)-(8,11): GHC.Internal.Bignum.Integer.Integer
-e/E.hs:(8,3)-(8,11): GHC.Internal.Types.IO ()
+e/E.hs:(9,3)-(9,11): GHC.Internal.Types.IO ()
e/E.hs:(9,3)-(9,7): GHC.Internal.Bignum.Integer.Integer -> GHC.Internal.Types.IO ()
e/E.hs:(9,9)-(9,11): GHC.Internal.Bignum.Integer.Integer
-e/E.hs:(9,3)-(9,11): GHC.Internal.Types.IO ()
-e/E.hs:(7,8)-(9,11): GHC.Internal.Types.IO ()
e/E.hs:(14,10)-(14,17): E.Test GHC.Internal.Types.Int
e/E.hs:(14,10)-(14,17): (GHC.Internal.Types.Int -> GHC.Internal.Base.String) -=> E.Test GHC.Internal.Types.Int
e/E.hs:(14,10)-(14,17): GHC.Internal.Types.Int -> GHC.Internal.Base.String
+e/E.hs:(15,3)-(15,6): GHC.Internal.Types.Int -> GHC.Internal.Base.String
e/E.hs:(15,10)-(15,13): GHC.Internal.Types.Int -> GHC.Internal.Base.String
+e/E.hs:(19,1)-(19,3): E.E -> E.E
+e/E.hs:(19,5)-(19,5): E.E
+e/E.hs:(19,9)-(19,9): E.E
e/E.hs:(21,10)-(21,15): E.Test E.E
e/E.hs:(21,10)-(21,15): (E.E -> GHC.Internal.Base.String) -=> E.Test E.E
e/E.hs:(21,10)-(21,15): E.E -> GHC.Internal.Base.String
-e/E.hs:(22,12)-(22,14): GHC.Internal.Base.String
-e/E.hs:(19,5)-(19,5): E.E
+e/E.hs:(22,3)-(22,6): E.E -> GHC.Internal.Base.String
e/E.hs:(22,8)-(22,8): E.E
+e/E.hs:(22,12)-(22,14): GHC.Internal.Base.String
+e/E.hs:(24,1)-(24,12): GHC.Internal.Types.IO ()
+e/E.hs:(24,16)-(25,37): GHC.Internal.Types.IO ()
+e/E.hs:(25,3)-(25,37): GHC.Internal.Types.IO ()
+e/E.hs:(25,3)-(25,10): GHC.Internal.Base.String -> GHC.Internal.Types.IO ()
+e/E.hs:(25,12)-(25,37): GHC.Internal.Base.String
:type-at
:: Integer
:: Int -> String
=====================================
testsuite/tests/ghci/prog-mhu002/prog-mhu002d.stdout
=====================================
@@ -1,15 +1,11 @@
Collecting type info for 4 module(s) ...
-a/A.hs:(7,1)-(7,6): GHC.Internal.Bignum.Integer.Integer
a/A.hs:(5,1)-(5,3): GHC.Internal.Bignum.Integer.Integer
-a/A.hs:(9,22)-(9,25): GHC.Internal.Types.Int -> A.A -> GHC.Internal.Show.ShowS
-a/A.hs:(9,22)-(9,25): A.A -> GHC.Internal.Base.String
-a/A.hs:(9,22)-(9,25): [A.A] -> GHC.Internal.Show.ShowS
-a/A.hs:(12,3)-(12,6): A.A -> GHC.Internal.Base.String
-a/A.hs:(7,10)-(7,11): GHC.Internal.Bignum.Integer.Integer
-a/A.hs:(5,11)-(5,11): GHC.Internal.Bignum.Integer.Integer -> GHC.Internal.Bignum.Integer.Integer -> GHC.Internal.Bignum.Integer.Integer
+a/A.hs:(5,7)-(5,18): GHC.Internal.Bignum.Integer.Integer
a/A.hs:(5,7)-(5,9): GHC.Internal.Bignum.Integer.Integer
+a/A.hs:(5,11)-(5,11): GHC.Internal.Bignum.Integer.Integer -> GHC.Internal.Bignum.Integer.Integer -> GHC.Internal.Bignum.Integer.Integer
a/A.hs:(5,13)-(5,18): GHC.Internal.Bignum.Integer.Integer
-a/A.hs:(5,7)-(5,18): GHC.Internal.Bignum.Integer.Integer
+a/A.hs:(7,1)-(7,6): GHC.Internal.Bignum.Integer.Integer
+a/A.hs:(7,10)-(7,11): GHC.Internal.Bignum.Integer.Integer
a/A.hs:(9,22)-(9,25): GHC.Internal.Show.Show A.A
a/A.hs:(9,22)-(9,25): ([A.A] -> GHC.Internal.Show.ShowS) -=> GHC.Internal.Show.Show A.A
a/A.hs:(9,22)-(9,25): (A.A -> GHC.Internal.Base.String) -=> ([A.A] -> GHC.Internal.Show.ShowS) -=> GHC.Internal.Show.Show A.A
@@ -17,25 +13,29 @@ a/A.hs:(9,22)-(9,25): (GHC.Internal.Types.Int -> A.A -> GHC.Internal.Show.ShowS)
a/A.hs:(9,22)-(9,25): GHC.Internal.Types.Int -> A.A -> GHC.Internal.Show.ShowS
a/A.hs:(9,22)-(9,25): A.A -> GHC.Internal.Base.String
a/A.hs:(9,22)-(9,25): [A.A] -> GHC.Internal.Show.ShowS
+a/A.hs:(9,22)-(9,25): GHC.Internal.Types.Int -> A.A -> GHC.Internal.Show.ShowS
+a/A.hs:(9,22)-(9,25): A.A -> GHC.Internal.Base.String
+a/A.hs:(9,22)-(9,25): [A.A] -> GHC.Internal.Show.ShowS
a/A.hs:(11,10)-(11,15): B.Test A.A
a/A.hs:(11,10)-(11,15): (A.A -> GHC.Internal.Base.String) -=> B.Test A.A
a/A.hs:(11,10)-(11,15): A.A -> GHC.Internal.Base.String
+a/A.hs:(12,3)-(12,6): A.A -> GHC.Internal.Base.String
a/A.hs:(12,10)-(12,13): A.A -> GHC.Internal.Base.String
b/B.hs:(3,1)-(3,3): GHC.Internal.Bignum.Integer.Integer
-b/B.hs:(9,3)-(9,6): GHC.Internal.Types.Int -> GHC.Internal.Base.String
b/B.hs:(3,7)-(3,8): GHC.Internal.Bignum.Integer.Integer
b/B.hs:(8,10)-(8,17): B.Test GHC.Internal.Types.Int
b/B.hs:(8,10)-(8,17): (GHC.Internal.Types.Int -> GHC.Internal.Base.String) -=> B.Test GHC.Internal.Types.Int
b/B.hs:(8,10)-(8,17): GHC.Internal.Types.Int -> GHC.Internal.Base.String
+b/B.hs:(9,3)-(9,6): GHC.Internal.Types.Int -> GHC.Internal.Base.String
b/B.hs:(9,10)-(9,13): GHC.Internal.Types.Int -> GHC.Internal.Base.String
-c/C.hs:(4,1)-(4,3): GHC.Internal.Bignum.Integer.Integer
c/C.hs:(3,1)-(3,3): GHC.Internal.Bignum.Integer.Integer
-c/C.hs:(4,7)-(4,7): GHC.Internal.Bignum.Integer.Integer
c/C.hs:(3,7)-(3,7): GHC.Internal.Bignum.Integer.Integer
-d/Main.hs:(5,1)-(5,4): GHC.Internal.Bignum.Integer.Integer
+c/C.hs:(4,1)-(4,3): GHC.Internal.Bignum.Integer.Integer
+c/C.hs:(4,7)-(4,7): GHC.Internal.Bignum.Integer.Integer
d/Main.hs:(3,1)-(3,4): GHC.Internal.Types.IO ()
-d/Main.hs:(5,8)-(5,8): GHC.Internal.Bignum.Integer.Integer
+d/Main.hs:(3,1)-(3,4): GHC.Internal.Types.IO ()
+d/Main.hs:(3,8)-(3,30): GHC.Internal.Types.IO ()
d/Main.hs:(3,8)-(3,15): GHC.Internal.Base.String -> GHC.Internal.Types.IO ()
d/Main.hs:(3,17)-(3,30): GHC.Internal.Base.String
-d/Main.hs:(3,8)-(3,30): GHC.Internal.Types.IO ()
-d/Main.hs:(3,1)-(3,4): GHC.Internal.Types.IO ()
+d/Main.hs:(5,1)-(5,4): GHC.Internal.Bignum.Integer.Integer
+d/Main.hs:(5,8)-(5,8): GHC.Internal.Bignum.Integer.Integer
=====================================
testsuite/tests/ghci/scripts/T16575.script
=====================================
@@ -7,12 +7,13 @@
-- ^^^^
:type-at T16575.hs 4 15 4 19
-- wrongly outputs:
--- :: [X] -> ShowS
+-- :: Show X
+
-- instance Eq X where
-- ^^^^
:type-at T16575.hs 6 10 6 14
-- wrongly outputs:
--- :: X -> X -> Bool
+-- :: Eq X
-- also note how :all-types is inconsistent with :type-at
=====================================
testsuite/tests/ghci/scripts/T16575.stdout
=====================================
@@ -1,9 +1,4 @@
Collecting type info for 1 module(s) ...
-T16575.hs:(4,15)-(4,18): GHC.Internal.Types.Int -> Ghost.X -> GHC.Internal.Show.ShowS
-T16575.hs:(4,15)-(4,18): Ghost.X -> GHC.Internal.Base.String
-T16575.hs:(4,15)-(4,18): [Ghost.X] -> GHC.Internal.Show.ShowS
-T16575.hs:(7,7)-(7,8): Ghost.X -> Ghost.X -> GHC.Internal.Types.Bool
-T16575.hs:(6,10)-(6,13): Ghost.X -> Ghost.X -> GHC.Internal.Types.Bool
T16575.hs:(4,15)-(4,18): GHC.Internal.Show.Show Ghost.X
T16575.hs:(4,15)-(4,18): ([Ghost.X] -> GHC.Internal.Show.ShowS) -=> GHC.Internal.Show.Show Ghost.X
T16575.hs:(4,15)-(4,18): (Ghost.X -> GHC.Internal.Base.String) -=> ([Ghost.X] -> GHC.Internal.Show.ShowS) -=> GHC.Internal.Show.Show Ghost.X
@@ -11,19 +6,24 @@ T16575.hs:(4,15)-(4,18): (GHC.Internal.Types.Int -> Ghost.X -> GHC.Internal.Show
T16575.hs:(4,15)-(4,18): GHC.Internal.Types.Int -> Ghost.X -> GHC.Internal.Show.ShowS
T16575.hs:(4,15)-(4,18): Ghost.X -> GHC.Internal.Base.String
T16575.hs:(4,15)-(4,18): [Ghost.X] -> GHC.Internal.Show.ShowS
+T16575.hs:(4,15)-(4,18): GHC.Internal.Types.Int -> Ghost.X -> GHC.Internal.Show.ShowS
+T16575.hs:(4,15)-(4,18): Ghost.X -> GHC.Internal.Base.String
+T16575.hs:(4,15)-(4,18): [Ghost.X] -> GHC.Internal.Show.ShowS
T16575.hs:(6,10)-(6,13): GHC.Internal.Classes.Eq Ghost.X
T16575.hs:(6,10)-(6,13): (Ghost.X -> Ghost.X -> GHC.Internal.Types.Bool) -=> GHC.Internal.Classes.Eq Ghost.X
T16575.hs:(6,10)-(6,13): (Ghost.X -> Ghost.X -> GHC.Internal.Types.Bool) -=> (Ghost.X -> Ghost.X -> GHC.Internal.Types.Bool) -=> GHC.Internal.Classes.Eq Ghost.X
T16575.hs:(6,10)-(6,13): Ghost.X -> Ghost.X -> GHC.Internal.Types.Bool
T16575.hs:(6,10)-(6,13): Ghost.X -> Ghost.X -> GHC.Internal.Types.Bool
-T16575.hs:(7,14)-(7,17): GHC.Internal.Types.Bool
-T16575.hs:(8,14)-(8,17): GHC.Internal.Types.Bool
-T16575.hs:(9,14)-(9,18): GHC.Internal.Types.Bool
+T16575.hs:(6,10)-(6,13): Ghost.X -> Ghost.X -> GHC.Internal.Types.Bool
T16575.hs:(7,5)-(7,5): Ghost.X
+T16575.hs:(7,7)-(7,8): Ghost.X -> Ghost.X -> GHC.Internal.Types.Bool
T16575.hs:(7,10)-(7,10): Ghost.X
+T16575.hs:(7,14)-(7,17): GHC.Internal.Types.Bool
T16575.hs:(8,5)-(8,5): Ghost.X
T16575.hs:(8,10)-(8,10): Ghost.X
+T16575.hs:(8,14)-(8,17): GHC.Internal.Types.Bool
T16575.hs:(9,5)-(9,5): Ghost.X
T16575.hs:(9,10)-(9,10): Ghost.X
- :: [X] -> ShowS
- :: X -> X -> Bool
+T16575.hs:(9,14)-(9,18): GHC.Internal.Types.Bool
+ :: Show X
+ :: Eq X
=====================================
testsuite/tests/ghci/scripts/T16804.stdout
=====================================
@@ -109,7 +109,7 @@ undefined :: forall a. GHC.Internal.Stack.Types.HasCallStack => a
% ^~~^
> instance Monoid Test where
% output:
-undefined :: [Test] -> ShowS
+undefined :: Show Test
% executing: ":uses T16804a.hs 5 6 5 9"
% file snippet:
@@ -178,7 +178,7 @@ undefined :: forall a. GHC.Internal.Stack.Types.HasCallStack => a
% ^~~~~~~~~~^
> mempty = A
% output:
-undefined :: [Test] -> Test
+undefined :: Monoid Test
% executing: ":type-at T16804a.hs 8 3 8 8 undefined"
% file snippet:
@@ -610,8 +610,8 @@ T16804a.hs:(28,5)-(28,6)
> B <> _ = B
% output:
T16804a.hs:(28,8)-(28,10)
-T16804a.hs:(28,14)-(28,16)
T16804a.hs:(28,8)-(28,10)
+T16804a.hs:(28,14)-(28,16)
% executing: ":uses T16804a.hs 28 14 28 16"
% file snippet:
@@ -621,8 +621,8 @@ T16804a.hs:(28,8)-(28,10)
> B <> _ = B
% output:
T16804a.hs:(28,8)-(28,10)
-T16804a.hs:(28,14)-(28,16)
T16804a.hs:(28,8)-(28,10)
+T16804a.hs:(28,14)-(28,16)
% executing: ":uses T16804a.hs 29 3 29 3"
% file snippet:
@@ -777,8 +777,8 @@ T16804c.hs:(6,1)-(6,1)
>
% output:
T16804c.hs:(9,12)-(9,14)
-T16804c.hs:(9,33)-(9,35)
T16804c.hs:(9,12)-(9,14)
+T16804c.hs:(9,33)-(9,35)
% executing: ":uses T16804c.hs 9 31 9 31"
% file snippet:
@@ -798,8 +798,8 @@ T16804c.hs:(9,31)-(9,31)
>
% output:
T16804c.hs:(9,12)-(9,14)
-T16804c.hs:(9,33)-(9,35)
T16804c.hs:(9,12)-(9,14)
+T16804c.hs:(9,33)-(9,35)
% executing: ":uses T16804c.hs 12 13 12 13"
% file snippet:
@@ -809,8 +809,8 @@ T16804c.hs:(9,12)-(9,14)
>
% output:
T16804c.hs:(12,13)-(12,13)
-T16804c.hs:(12,32)-(12,32)
T16804c.hs:(12,13)-(12,13)
+T16804c.hs:(12,32)-(12,32)
% executing: ":uses T16804c.hs 12 32 12 32"
% file snippet:
@@ -820,8 +820,8 @@ T16804c.hs:(12,13)-(12,13)
>
% output:
T16804c.hs:(12,13)-(12,13)
-T16804c.hs:(12,32)-(12,32)
T16804c.hs:(12,13)-(12,13)
+T16804c.hs:(12,32)-(12,32)
% executing: ":uses T16804c.hs 15 13 15 13"
% file snippet:
@@ -830,8 +830,8 @@ T16804c.hs:(12,13)-(12,13)
% ^
% output:
T16804c.hs:(15,13)-(15,13)
-T16804c.hs:(15,30)-(15,30)
T16804c.hs:(15,13)-(15,13)
+T16804c.hs:(15,30)-(15,30)
% executing: ":uses T16804c.hs 15 30 15 30"
% file snippet:
@@ -840,5 +840,5 @@ T16804c.hs:(15,13)-(15,13)
% ^
% output:
T16804c.hs:(15,13)-(15,13)
-T16804c.hs:(15,30)-(15,30)
T16804c.hs:(15,13)-(15,13)
+T16804c.hs:(15,30)-(15,30)
=====================================
testsuite/tests/ghci/scripts/T20150.stdout
=====================================
@@ -1,4 +1,4 @@
Collecting type info for 1 module(s) ...
T20150.hs:(7,1)-(7,3): GHC.Internal.StaticPtr.StaticPtr GHC.Internal.Types.Int
-T20150.hs:(7,14)-(7,14): GHC.Internal.Types.Int
T20150.hs:(7,7)-(7,14): GHC.Internal.StaticPtr.StaticPtr GHC.Internal.Types.Int
+T20150.hs:(7,14)-(7,14): GHC.Internal.Types.Int
=====================================
testsuite/tests/ghci/scripts/T27412.hs
=====================================
@@ -0,0 +1,8 @@
+module T27412 where
+
+foo :: IO ()
+foo =
+ mapM_ (\(x, y) -> do
+ print x
+ print y)
+ [(True, False)]
=====================================
testsuite/tests/ghci/scripts/T27412.script
=====================================
@@ -0,0 +1,3 @@
+:set +c
+:load T27412.hs
+:type-at T27412.hs 5 3 7 14
=====================================
testsuite/tests/ghci/scripts/T27412.stdout
=====================================
@@ -0,0 +1,2 @@
+Collecting type info for 1 module(s) ...
+ :: [(Bool, Bool)] -> IO ()
=====================================
testsuite/tests/ghci/scripts/all.T
=====================================
@@ -385,6 +385,7 @@ test('ListTuplePunsPpr', normal, ghci_script, ['ListTuplePunsPpr.script'])
test('ListTuplePunsPprNoAbbrevTuple', [limit_stdout_lines(14)], ghci_script, ['ListTuplePunsPprNoAbbrevTuple.script'])
test('T24459', normal, ghci_script, ['T24459.script'])
test('T24632', normal, ghci_script, ['T24632.script'])
+test('T27412', normal, ghci_script, ['T27412.script'])
# bytecode backend doesn't support '-finfo-table-map' (#27039)
test('bytecodeIPE',
[ extra_hc_opts('-finfo-table-map')
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/26b9a8a02a5c5dc2471d2aa4ac7df48…
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/26b9a8a02a5c5dc2471d2aa4ac7df48…
You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help
1
0
18 Oct '26
Florian Ragwitz pushed to branch wip/rafl/hpc-tixdir at Glasgow Haskell Compiler / GHC
Commits:
cfb735b0 by Florian Ragwitz at 2026-10-18T13:21:53-07:00
Merge tix data
- - - - -
43de045c by Florian Ragwitz at 2026-10-18T13:21:53-07:00
Extend test timeout for coverage testing
- - - - -
3 changed files:
- .gitlab/ci.sh
- .gitlab/generate-ci/gen_ci.hs
- .gitlab/jobs.yaml
Changes:
=====================================
.gitlab/ci.sh
=====================================
@@ -901,10 +901,13 @@ function save_test_output() {
function save_hpc_coverage() {
# Keep whatever has been generated even if the build or tests failed.
+ $GHC -c -o tix-rle-merge.o tix-rle-merge.c
+ $GHC -no-hs-main -o tix-rle-merge tix-rle-merge.o
+ ./tix-rle-merge _build/ghc-tix/ _build/ghc.tix
if [[ -d _build/ghc-hpc || -d _build/ghc-tix ]]; then
mkdir -p _build/ghc-hpc _build/ghc-tix
- du -sh _build/ghc-hpc _build/ghc-tix
- tar -czf ghc-hpc-coverage.tar.gz _build/ghc-hpc _build/ghc-tix
+ du -sh _build/ghc-hpc _build/ghc-tix _build/ghc.tix
+ tar -czf ghc-hpc-coverage.tar.gz _build/ghc-hpc _build/ghc.tix
ls -lh ghc-hpc-coverage.tar.gz
else
warn "No HPC coverage directories found"
=====================================
.gitlab/generate-ci/gen_ci.hs
=====================================
@@ -1000,7 +1000,11 @@ delVariable k j = j { jobVariables = MonoidalMap $ Map.delete k $ unMonoidalMap
validate :: Arch -> Opsys -> BuildConfig -> NamedJob Job
validate arch opsys bc =
let NamedJob n j = job arch opsys bc
- covered = ignorePerfFailures $ setVariable "BUILD_FLAVOUR"
+ covered = ignorePerfFailures
+ $ setVariable "RUNTEST_ARGS"
+ (unwords $ fromMaybe [] (mmlookup "RUNTEST_ARGS" (jobVariables j))
+ ++ ["-e config.timeout+=config.timeout+config.timeout"])
+ $ setVariable "BUILD_FLAVOUR"
(flavourString (mkJobFlavour bc) ++ "+coverage") j
saveCoverage = (if opsys == Windows then "bash " else "")
++ ".gitlab/ci.sh save_hpc_coverage"
=====================================
.gitlab/jobs.yaml
=====================================
@@ -65,7 +65,7 @@
"LANG": "en_US.UTF-8",
"MACOSX_DEPLOYMENT_TARGET": "11.0",
"NIX_SYSTEM": "aarch64-darwin",
- "RUNTEST_ARGS": "",
+ "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
"TEST_ENV": "aarch64-darwin-validate",
"TEST_WAYS": ""
}
@@ -132,7 +132,7 @@
"CONFIGURE_ARGS": "--disable-ld-override --enable-ignore-build-platform-mismatch --build=aarch64-unknown-linux --host=aarch64-unknown-linux --target=aarch64-unknown-linux --enable-strict-ghc-toolchain-check",
"IGNORE_PERF_FAILURES": "all",
"INSTALL_CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
- "RUNTEST_ARGS": "",
+ "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
"TEST_ENV": "aarch64-linux-alpine3_23-validate",
"TEST_WAYS": ""
}
@@ -198,7 +198,7 @@
"CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"IGNORE_PERF_FAILURES": "all",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
- "RUNTEST_ARGS": "",
+ "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
"TEST_ENV": "aarch64-linux-deb11-validate",
"TEST_WAYS": ""
}
@@ -264,7 +264,7 @@
"CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"IGNORE_PERF_FAILURES": "all",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
- "RUNTEST_ARGS": "",
+ "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
"TEST_ENV": "aarch64-linux-deb12-validate",
"TEST_WAYS": ""
}
@@ -346,7 +346,7 @@
"OBJCOPY": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-objcopy",
"OBJDUMP": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-objdump",
"RANLIB": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-llvm-ranlib",
- "RUNTEST_ARGS": "-e config.timeout=900",
+ "RUNTEST_ARGS": "-e config.timeout=900 -e config.timeout+=config.timeout+config.timeout",
"SIZE": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-size",
"STRINGS": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-strings",
"STRIP": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-strip",
@@ -433,7 +433,7 @@
"OBJCOPY": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-objcopy",
"OBJDUMP": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-objdump",
"RANLIB": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-llvm-ranlib",
- "RUNTEST_ARGS": "-e config.timeout=900",
+ "RUNTEST_ARGS": "-e config.timeout=900 -e config.timeout+=config.timeout+config.timeout",
"SIZE": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-size",
"STRINGS": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-strings",
"STRIP": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-strip",
@@ -504,7 +504,7 @@
"CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"IGNORE_PERF_FAILURES": "all",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
- "RUNTEST_ARGS": "",
+ "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
"TEST_ENV": "aarch64-linux-deb13-validate",
"TEST_WAYS": ""
}
@@ -570,7 +570,7 @@
"CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"IGNORE_PERF_FAILURES": "all",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
- "RUNTEST_ARGS": "",
+ "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
"TEST_ENV": "aarch64-linux-deb13-validate+llvm",
"TEST_WAYS": "llvm optllvm"
}
@@ -637,7 +637,7 @@
"CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
"IGNORE_PERF_FAILURES": "all",
"INSTALL_CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
- "RUNTEST_ARGS": "",
+ "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
"TEST_ENV": "i386-linux-alpine3_23-validate",
"TEST_WAYS": ""
}
@@ -703,7 +703,7 @@
"CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"IGNORE_PERF_FAILURES": "all",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
- "RUNTEST_ARGS": "",
+ "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
"TEST_ENV": "i386-linux-deb11-validate",
"TEST_WAYS": ""
}
@@ -769,7 +769,7 @@
"CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"IGNORE_PERF_FAILURES": "all",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
- "RUNTEST_ARGS": "",
+ "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
"TEST_ENV": "i386-linux-deb12-validate",
"TEST_WAYS": ""
}
@@ -835,7 +835,7 @@
"CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"IGNORE_PERF_FAILURES": "all",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
- "RUNTEST_ARGS": "",
+ "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
"TEST_ENV": "i386-linux-deb13-validate",
"TEST_WAYS": ""
}
@@ -5711,7 +5711,7 @@
"LANG": "en_US.UTF-8",
"MACOSX_DEPLOYMENT_TARGET": "11.0",
"NIX_SYSTEM": "x86_64-darwin",
- "RUNTEST_ARGS": "",
+ "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
"TEST_ENV": "x86_64-darwin-validate",
"TEST_WAYS": "",
"ac_cv_func_clock_gettime": "no",
@@ -5783,7 +5783,7 @@
"FETCH_GHC_VERSION": "9.10.3",
"IGNORE_PERF_FAILURES": "all",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
- "RUNTEST_ARGS": "",
+ "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
"TEST_ENV": "x86_64-freebsd14-validate",
"TEST_WAYS": ""
}
@@ -5850,7 +5850,7 @@
"CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
"IGNORE_PERF_FAILURES": "all",
"INSTALL_CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
- "RUNTEST_ARGS": "",
+ "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
"TEST_ENV": "x86_64-linux-alpine3_12-int_native-validate+fully_static",
"TEST_WAYS": ""
}
@@ -5917,7 +5917,7 @@
"CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
"IGNORE_PERF_FAILURES": "all",
"INSTALL_CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
- "RUNTEST_ARGS": "",
+ "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
"TEST_ENV": "x86_64-linux-alpine3_12-validate+fully_static",
"TEST_WAYS": ""
}
@@ -5984,7 +5984,7 @@
"CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
"IGNORE_PERF_FAILURES": "all",
"INSTALL_CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
- "RUNTEST_ARGS": "",
+ "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
"TEST_ENV": "x86_64-linux-alpine3_23-validate",
"TEST_WAYS": ""
}
@@ -6053,7 +6053,7 @@
"FIREFOX_LAUNCH_OPTS": "{\"browser\":\"firefox\",\"executablePath\":\"/usr/bin/firefox\"}",
"HADRIAN_ARGS": "--docs=no-sphinx-pdfs --docs=no-sphinx-man",
"IGNORE_PERF_FAILURES": "all",
- "RUNTEST_ARGS": "",
+ "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
"TEST_ENV": "x86_64-linux-alpine3_23-wasm-cross_wasm32-wasi-release+host_fully_static+text_simdutf",
"TEST_WAYS": ""
}
@@ -6123,7 +6123,7 @@
"FIREFOX_LAUNCH_OPTS": "{\"browser\":\"firefox\",\"executablePath\":\"/usr/bin/firefox\"}",
"HADRIAN_ARGS": "--docs=no-sphinx-pdfs --docs=no-sphinx-man",
"IGNORE_PERF_FAILURES": "all",
- "RUNTEST_ARGS": "",
+ "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
"TEST_ENV": "x86_64-linux-alpine3_23-wasm-int_native-cross_wasm32-wasi-release+host_fully_static+text_simdutf",
"TEST_WAYS": ""
}
@@ -6193,7 +6193,7 @@
"FIREFOX_LAUNCH_OPTS": "{\"browser\":\"firefox\",\"executablePath\":\"/usr/bin/firefox\"}",
"HADRIAN_ARGS": "--docs=no-sphinx-pdfs --docs=no-sphinx-man",
"IGNORE_PERF_FAILURES": "all",
- "RUNTEST_ARGS": "",
+ "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
"TEST_ENV": "x86_64-linux-alpine3_23-wasm-unreg-cross_wasm32-wasi-release+host_fully_static+text_simdutf",
"TEST_WAYS": ""
}
@@ -6262,7 +6262,7 @@
"CROSS_TARGET": "javascript-unknown-ghcjs",
"IGNORE_PERF_FAILURES": "all",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
- "RUNTEST_ARGS": "-e config.timeout=900",
+ "RUNTEST_ARGS": "-e config.timeout=900 -e config.timeout+=config.timeout+config.timeout",
"TEST_ENV": "x86_64-linux-deb11-emsdk-closure-int_native-cross_javascript-unknown-ghcjs-validate",
"TEST_WAYS": ""
}
@@ -6328,7 +6328,7 @@
"CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"IGNORE_PERF_FAILURES": "all",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
- "RUNTEST_ARGS": "",
+ "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
"TEST_ENV": "x86_64-linux-deb11-validate",
"TEST_WAYS": ""
}
@@ -6394,7 +6394,7 @@
"CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"IGNORE_PERF_FAILURES": "all",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
- "RUNTEST_ARGS": "",
+ "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
"TEST_ENV": "x86_64-linux-deb11-validate+debug_info",
"TEST_WAYS": ""
}
@@ -6460,7 +6460,7 @@
"CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"IGNORE_PERF_FAILURES": "all",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
- "RUNTEST_ARGS": "",
+ "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
"TEST_ENV": "x86_64-linux-deb12-validate",
"TEST_WAYS": ""
}
@@ -6529,7 +6529,7 @@
"CROSS_TARGET": "aarch64-linux-gnu",
"IGNORE_PERF_FAILURES": "all",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
- "RUNTEST_ARGS": "-e config.timeout=900",
+ "RUNTEST_ARGS": "-e config.timeout=900 -e config.timeout+=config.timeout+config.timeout",
"TEST_ENV": "x86_64-linux-deb13-cross_aarch64-linux-gnu-validate",
"TEST_WAYS": ""
}
@@ -6595,7 +6595,7 @@
"CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"IGNORE_PERF_FAILURES": "all",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
- "RUNTEST_ARGS": "",
+ "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
"TEST_ENV": "x86_64-linux-deb13-int_native-validate",
"TEST_WAYS": ""
}
@@ -6662,7 +6662,7 @@
"CONFIGURE_ARGS": "--disable-tables-next-to-code --enable-strict-ghc-toolchain-check",
"IGNORE_PERF_FAILURES": "all",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
- "RUNTEST_ARGS": "",
+ "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
"TEST_ENV": "x86_64-linux-deb13-no_tntc-validate",
"TEST_WAYS": ""
}
@@ -6729,7 +6729,7 @@
"ENABLE_NUMA": "1",
"IGNORE_PERF_FAILURES": "all",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
- "RUNTEST_ARGS": "",
+ "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
"TEST_ENV": "x86_64-linux-deb13-numa-slow-validate",
"TEST_WAYS": ""
}
@@ -6795,7 +6795,7 @@
"CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"IGNORE_PERF_FAILURES": "all",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
- "RUNTEST_ARGS": " --config perf_path=perf",
+ "RUNTEST_ARGS": " --config perf_path=perf -e config.timeout+=config.timeout+config.timeout",
"TEST_ENV": "x86_64-linux-deb13-release",
"TEST_WAYS": ""
}
@@ -6864,7 +6864,7 @@
"CROSS_TARGET": "riscv64-linux-gnu",
"IGNORE_PERF_FAILURES": "all",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
- "RUNTEST_ARGS": "-e config.timeout=900",
+ "RUNTEST_ARGS": "-e config.timeout=900 -e config.timeout+=config.timeout+config.timeout",
"TEST_ENV": "x86_64-linux-deb13-riscv-cross_riscv64-linux-gnu-validate",
"TEST_WAYS": ""
}
@@ -6930,7 +6930,7 @@
"CONFIGURE_ARGS": "--enable-unregisterised --enable-strict-ghc-toolchain-check",
"IGNORE_PERF_FAILURES": "all",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
- "RUNTEST_ARGS": "",
+ "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
"TEST_ENV": "x86_64-linux-deb13-unreg-validate",
"TEST_WAYS": ""
}
@@ -6996,7 +6996,7 @@
"CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"IGNORE_PERF_FAILURES": "all",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
- "RUNTEST_ARGS": "",
+ "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
"TEST_ENV": "x86_64-linux-deb13-validate",
"TEST_WAYS": ""
}
@@ -7062,7 +7062,7 @@
"CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"IGNORE_PERF_FAILURES": "all",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
- "RUNTEST_ARGS": "--way=nonmoving --way=nonmoving_thr --way=nonmoving_thr_sanity",
+ "RUNTEST_ARGS": "--way=nonmoving --way=nonmoving_thr --way=nonmoving_thr_sanity -e config.timeout+=config.timeout+config.timeout",
"TEST_ENV": "x86_64-linux-deb13-validate+boot_nonmoving_gc",
"TEST_WAYS": ""
}
@@ -7128,7 +7128,7 @@
"CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"IGNORE_PERF_FAILURES": "all",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
- "RUNTEST_ARGS": "",
+ "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
"TEST_ENV": "x86_64-linux-deb13-validate+llvm",
"TEST_WAYS": "llvm optllvm"
}
@@ -7196,7 +7196,7 @@
"HADRIAN_ARGS": "--docs=none",
"IGNORE_PERF_FAILURES": "all",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
- "RUNTEST_ARGS": "",
+ "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
"TEST_ENV": "x86_64-linux-deb13-validate+thread_sanitizer_cmm",
"TEST_WAYS": "",
"TSAN_OPTIONS": "suppressions=$CI_PROJECT_DIR/rts/.tsan-suppressions"
@@ -7263,7 +7263,7 @@
"CONFIGURE_ARGS": "--enable-ipe-data-compression --enable-strict-ghc-toolchain-check",
"IGNORE_PERF_FAILURES": "all",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
- "RUNTEST_ARGS": "",
+ "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
"TEST_ENV": "x86_64-linux-deb13-zstd-validate",
"TEST_WAYS": ""
}
@@ -7329,7 +7329,7 @@
"CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"IGNORE_PERF_FAILURES": "all",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
- "RUNTEST_ARGS": "",
+ "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
"TEST_ENV": "x86_64-linux-fedora43-release",
"TEST_WAYS": ""
}
@@ -7396,7 +7396,7 @@
"HADRIAN_ARGS": "--haddock-for-hackage",
"IGNORE_PERF_FAILURES": "all",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
- "RUNTEST_ARGS": "",
+ "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
"TEST_ENV": "x86_64-linux-fedora43-release",
"TEST_WAYS": ""
}
@@ -7462,7 +7462,7 @@
"CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"IGNORE_PERF_FAILURES": "all",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
- "RUNTEST_ARGS": "",
+ "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
"TEST_ENV": "x86_64-linux-fedora43-validate",
"TEST_WAYS": ""
}
@@ -7528,7 +7528,7 @@
"CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"IGNORE_PERF_FAILURES": "all",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
- "RUNTEST_ARGS": "",
+ "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
"TEST_ENV": "x86_64-linux-fedora43-validate+debug_info",
"TEST_WAYS": ""
}
@@ -7595,7 +7595,7 @@
"HADRIAN_ARGS": "--docs=none",
"IGNORE_PERF_FAILURES": "all",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
- "RUNTEST_ARGS": "",
+ "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
"TEST_ENV": "x86_64-linux-fedora43-validate+debug_info+ubsan",
"TEST_WAYS": "",
"UBSAN_OPTIONS": "suppressions=$CI_PROJECT_DIR/rts/.ubsan-suppressions"
@@ -7662,7 +7662,7 @@
"CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"IGNORE_PERF_FAILURES": "all",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
- "RUNTEST_ARGS": "",
+ "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
"TEST_ENV": "x86_64-linux-rocky8-validate",
"TEST_WAYS": ""
}
@@ -7728,7 +7728,7 @@
"CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"IGNORE_PERF_FAILURES": "all",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
- "RUNTEST_ARGS": "",
+ "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
"TEST_ENV": "x86_64-linux-ubuntu22_04-validate",
"TEST_WAYS": ""
}
@@ -7797,7 +7797,7 @@
"CROSS_TARGET": "loongarch64-linux-gnu",
"IGNORE_PERF_FAILURES": "all",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
- "RUNTEST_ARGS": "-e config.timeout=900",
+ "RUNTEST_ARGS": "-e config.timeout=900 -e config.timeout+=config.timeout+config.timeout",
"TEST_ENV": "x86_64-linux-ubuntu24_04-loongarch-cross_loongarch64-linux-gnu-validate",
"TEST_WAYS": ""
}
@@ -7863,7 +7863,7 @@
"CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"IGNORE_PERF_FAILURES": "all",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
- "RUNTEST_ARGS": "",
+ "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
"TEST_ENV": "x86_64-linux-ubuntu24_04-validate",
"TEST_WAYS": ""
}
@@ -7929,7 +7929,7 @@
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"LANG": "en_US.UTF-8",
"MSYSTEM": "CLANG64",
- "RUNTEST_ARGS": "",
+ "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
"TEST_ENV": "x86_64-windows-int_native-validate",
"TEST_WAYS": ""
}
@@ -7995,7 +7995,7 @@
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"LANG": "en_US.UTF-8",
"MSYSTEM": "CLANG64",
- "RUNTEST_ARGS": "",
+ "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
"TEST_ENV": "x86_64-windows-validate",
"TEST_WAYS": ""
}
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/50a1abf9fd56809e361e7180685dbc…
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/50a1abf9fd56809e361e7180685dbc…
You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help
1
0
[Git][ghc/ghc] Pushed new branch wip/sjakobi/T18922-filecheck-sketch
by Simon Jakobi (@sjakobi) 18 Oct '26
by Simon Jakobi (@sjakobi) 18 Oct '26
18 Oct '26
Simon Jakobi pushed new branch wip/sjakobi/T18922-filecheck-sketch at Glasgow Haskell Compiler / GHC
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/wip/sjakobi/T18922-filecheck-sket…
You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help
1
0
[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 2 commits: Carefully implement coercion zapping
by Marge Bot (@marge-bot) 18 Oct '26
by Marge Bot (@marge-bot) 18 Oct '26
18 Oct '26
Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC
Commits:
a4c177e8 by sheaf at 2026-10-18T13:53:28-04:00
Carefully implement coercion zapping
This commit implements coercion zapping in the rewriter, controlled by
the -fzap-coercions flag (on by default). This significantly reduces
the size of coercions produced when rewriting type family applications,
resulting in much faster compilation. See Note [Coercion zapping]
in GHC.Tc.Solver.Rewrite for an explanation and further details.
The rewriter now keeps track of the `CoVar`s and `CoercionHole`s it uses
when rewriting, which allows computing the dependencies of a zapped
coercion without traversing the coercion the rewriter produced, as
explained in Note [Computing coercion dependencies] in GHC.Tc.Solver.Rewrite.
Accompanying changes:
- Rework how dependencies of 'UnivCo's are tracked, purely for
performance reasons.
We now use the 'UnivCoDeps' datatype instead of '[Coercion]', and
we now insist that 'uco_deps' also contains the CoVars that appear
in the LHS and RHS types of the UnivCo (as a caching mechanism).
- Several performance improvements to the rewriter (e.g. increased
strictness).
- Improvements to the family application cache, including:
- Better documentation.
- Only cache a whole chain of reduction steps.
- Don't put coercion holes in the cache, fixing #27518.
- Allow Core Lint to be called from within the typechecker (and from
within the coercion optimiser).
- Move out "annotation linting" from Core Lint into the general Core
pipeline, to avoid the dependency GHC.Core.Coercion.Opt->GHC.Core.Lint
causing a regression in CountDepsParser due to transitive
dependencies of GHC.Core.Opt.Monad and GHC.Unit.Module.ModGuts.
Fixes #8095 #27336 #27518
Summary of performance numbers
Compile-time byte allocated in GHC's testsuite (0 regressions)
CoOpt_Singletons(normal) ghc/alloc 634,040,332 595,448,728 -6.1% GOOD
FamAppCachePerf(normal) ghc/alloc 495,629,812 191,612,920 -61.3% GOOD
LargeRecord(normal) ghc/alloc 1,226,806,434 966,260,976 -21.2% GOOD
SimplCastPerf(normal) ghc/alloc 160,505,678 148,112,688 -7.7% GOOD
T12227(normal) ghc/alloc 244,668,982 233,037,216 -4.8% GOOD
T12545(normal) ghc/alloc 697,804,842 424,705,152 -39.1% GOOD
T13386(normal) ghc/alloc 422,871,076 35,213,656 -91.7% GOOD
T15703(normal) ghc/alloc 288,402,364 273,692,560 -5.1% GOOD
T26426(normal) ghc/alloc 86,002,052 78,152,104 -9.1% GOOD
T27336(normal) ghc/alloc 498,932,268 35,886,016 -92.8% GOOD
T5030(normal) ghc/alloc 117,057,706 88,785,648 -24.2% GOOD
T5321Fun(normal) ghc/alloc 252,552,628 243,820,176 -3.5% GOOD
T8095(normal) ghc/alloc 768,198,564 127,779,520 -83.4% GOOD
T9872a(normal) ghc/alloc 1,655,675,020 1,406,017,008 -15.1% GOOD
T9872b(normal) ghc/alloc 1,864,180,628 1,644,706,696 -11.8% GOOD
T9872b_defer(normal) ghc/alloc 2,834,585,468 1,657,729,760 -41.5% GOOD
T9872c(normal) ghc/alloc 1,572,573,116 1,354,055,424 -13.9% GOOD
T9872d(normal) ghc/alloc 351,516,004 331,071,424 -5.8% GOOD
TcPlugin_RewritePerf(normal) ghc/alloc 2,063,065,680 1,847,464,272 -10.5% GOOD
Chesskell (github.com/Proxymoron461/chesskell/issues)
Typechecking that the first N plies of kholmovVsBronsteinShort
are a valid chess game:
Plies | GHC 9.14 time/alloc | This commit time/alloc |
-----:|---------------------|------------------------|
2 | 41s/20GB | 0.2s/19MB |
4 | 95s/49GB | 0.3s/25MB |
6 | timed out | 0.6s/522MB |
8 | timed out | 7s/673MB |
10 | timed out | timed out |
Compilation of singletons-base: compile time -28%, allocations -25%
-------------------------
Metric Decrease:
CoOpt_Singletons
FamAppCachePerf
LargeRecord
SimplCastPerf
T12227
T12545
T13386
T15703
T24984
T26426
T27336
T5030
T5321Fun
T8095
T9872a
T9872b
T9872b_defer
T9872c
T9872d
TcPlugin_RewritePerf
-------------------------
Co-Authored-By: Sylvain Henry <sylvain(a)haskus.fr>
- - - - -
d50b2ff1 by Sylvain Henry at 2026-10-18T13:53:50-04:00
JS: fix stack corruption in h$ap_gen_fast's pushAllRegs (#27624)
The loop added in 9e46990976 ("JS: support more than 128 registers
(#26558)") pushed register N to stack[sp - N - 2] while the switch it
falls through into, and every reader of the h$ap_gen frame, uses
stack[sp - (N - 2)]. Registers >= R32 were therefore written 4 slots
too low: the slots the readers consult were left stale and the frame
below was silently corrupted.
Fix the loop to use the same slot formula as the switch, and add a
regression test: an unknown call to a thunk with 35 argument register
slots, which goes through the generic apply.
Co-Authored-By: Claude Fable 5 <noreply(a)anthropic.com>
- - - - -
54 changed files:
- + changelog.d/27624
- + changelog.d/zap-coercions
- compiler/GHC/Core/Coercion.hs
- compiler/GHC/Core/Coercion.hs-boot
- compiler/GHC/Core/Coercion/Opt.hs
- compiler/GHC/Core/FamInstEnv.hs
- compiler/GHC/Core/Lint.hs
- + compiler/GHC/Core/Lint.hs-boot
- compiler/GHC/Core/Opt/Pipeline.hs
- compiler/GHC/Core/Reduction.hs
- compiler/GHC/Core/SimpleOpt.hs
- compiler/GHC/Core/TyCo/FVs.hs
- compiler/GHC/Core/TyCo/FVs.hs-boot
- compiler/GHC/Core/TyCo/Make.hs
- compiler/GHC/Core/TyCo/Rep.hs
- compiler/GHC/Core/TyCo/Rep.hs-boot
- compiler/GHC/Core/TyCo/Subst.hs
- compiler/GHC/Core/TyCo/Tidy.hs
- compiler/GHC/Core/Utils.hs
- compiler/GHC/CoreToIface.hs
- compiler/GHC/Driver/Config.hs
- compiler/GHC/Driver/Config/Core/Lint.hs
- compiler/GHC/Driver/DynFlags.hs
- compiler/GHC/Driver/Flags.hs
- compiler/GHC/Driver/Session.hs
- compiler/GHC/Iface/Rename.hs
- compiler/GHC/Iface/Syntax.hs
- compiler/GHC/Iface/Type.hs
- compiler/GHC/IfaceToCore.hs
- compiler/GHC/Runtime/Eval/Types.hs
- compiler/GHC/StgToJS/Apply.hs
- compiler/GHC/Tc/Instance/Family.hs
- compiler/GHC/Tc/Solver/Default.hs
- compiler/GHC/Tc/Solver/Equality.hs
- compiler/GHC/Tc/Solver/InertSet.hs
- compiler/GHC/Tc/Solver/Monad.hs
- compiler/GHC/Tc/Solver/Rewrite.hs
- compiler/GHC/Tc/Solver/Solve.hs
- compiler/GHC/Tc/Types.hs
- compiler/GHC/Tc/Utils/TcMType.hs
- compiler/GHC/Types/Unique/DSet.hs
- compiler/GHC/Types/Var/Set.hs
- docs/users_guide/extending_ghc.rst
- docs/users_guide/exts/type_families.rst
- + testsuite/tests/codeGen/should_run/T27624.hs
- + testsuite/tests/codeGen/should_run/T27624.stdout
- testsuite/tests/codeGen/should_run/all.T
- testsuite/tests/corelint/T27374.hs
- testsuite/tests/count-deps/CountDepsParser.stdout
- testsuite/tests/dependent/should_compile/T14729.stderr
- + testsuite/tests/indexed-types/should_compile/ZapDeps.hs
- testsuite/tests/indexed-types/should_compile/all.T
- testsuite/tests/rep-poly/RepPolyRule3.stderr
- testsuite/tests/simplCore/should_compile/T26051.stderr
The diff was not included because it is too large.
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/0a01049ab7a4f46d2dd29d7cba0d38…
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/0a01049ab7a4f46d2dd29d7cba0d38…
You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help
1
0
[Git][ghc/ghc][wip/rafl/hpc-tixdir] 2 commits: Add a program to merge binary tix files
by Florian Ragwitz (@rafl) 18 Oct '26
by Florian Ragwitz (@rafl) 18 Oct '26
18 Oct '26
Florian Ragwitz pushed to branch wip/rafl/hpc-tixdir at Glasgow Haskell Compiler / GHC
Commits:
cff3da9e by Florian Ragwitz at 2026-10-18T09:00:27-07:00
Add a program to merge binary tix files
This is LLM slop.
- - - - -
50a1abf9 by Florian Ragwitz at 2026-10-18T09:04:08-07:00
Merge tix data
- - - - -
2 changed files:
- .gitlab/ci.sh
- + tix-rle-merge.c
Changes:
=====================================
.gitlab/ci.sh
=====================================
@@ -901,10 +901,13 @@ function save_test_output() {
function save_hpc_coverage() {
# Keep whatever has been generated even if the build or tests failed.
+ $GHC -o tix-rle-merge.o tix-rle-merge.c
+ $GHC -no-hs-main -o tix-rle-merge tix-rle-merge.o
+ ./tix-rle-merge _build/ghc-tix/ _build/ghc.tix
if [[ -d _build/ghc-hpc || -d _build/ghc-tix ]]; then
mkdir -p _build/ghc-hpc _build/ghc-tix
- du -sh _build/ghc-hpc _build/ghc-tix
- tar -czf ghc-hpc-coverage.tar.gz _build/ghc-hpc _build/ghc-tix
+ du -sh _build/ghc-hpc _build/ghc-tix _build/ghc.tix
+ tar -czf ghc-hpc-coverage.tar.gz _build/ghc-hpc _build/ghc.tix
ls -lh ghc-hpc-coverage.tar.gz
else
warn "No HPC coverage directories found"
=====================================
tix-rle-merge.c
=====================================
@@ -0,0 +1,316 @@
+/* Merge HPC prototype run-length-encoded .tix files (NOT part of GHC).
+ *
+ * Build: cc -O3 -std=c11 -Wall -Wextra -o tix-rle-merge tix-rle-merge.c
+ * Usage: ./tix-rle-merge RLE_DIRECTORY OUTPUT.tix
+ *
+ * Input and output format (HPCTIX\2):
+ * 7 bytes "HPCTIX\2", ULEB128 module count;
+ * for each module:
+ * ULEB128 name length, name bytes, little-endian uint32 hash,
+ * ULEB128 box count;
+ * repeated (ULEB128 zero-run length, ULEB128 nonzero-run length,
+ * that many positive ULEB128 Word64 counts)
+ * until exactly 'box count' counters are described.
+ *
+ * No terminator follows an RLE module. A trailing zero run is represented
+ * by (zero-run length, 0). Modules with zero boxes contain no run records.
+ *
+ * The accumulator is a dense uint64_t array per distinct module, as in
+ * tix-sparse-prototype.c. Checks counter overflow and malformed inputs.
+ */
+#define _POSIX_C_SOURCE 200809L
+#include <dirent.h>
+#include <errno.h>
+#include <inttypes.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+
+#define MAGIC "HPCTIX\0"
+#define BUCKETS 8192
+
+typedef struct { unsigned char *data; size_t len, cap; } Buffer;
+typedef struct { const unsigned char *p, *end; } Reader;
+typedef struct Module {
+ char *name;
+ uint32_t hash;
+ size_t n;
+ uint64_t *ticks;
+ uint64_t seen_epoch;
+ struct Module *next;
+} Module;
+typedef struct {
+ Module *buckets[BUCKETS];
+ Module **mods;
+ size_t len, cap;
+ uint64_t epoch, filecount, input_entries;
+} Acc;
+
+static const char *context;
+static void die(const char *msg) {
+ fprintf(stderr, "%s: %s\n", context ? context : "tix-rle-merge", msg);
+ exit(1);
+}
+static void *xmalloc(size_t n) {
+ void *p = malloc(n ? n : 1);
+ if (!p) die("out of memory");
+ return p;
+}
+static void *xrealloc(void *p, size_t n) {
+ void *q = realloc(p, n ? n : 1);
+ if (!q) die("out of memory");
+ return q;
+}
+static void reserve(Buffer *b, size_t add) {
+ if (add > SIZE_MAX - b->len) die("buffer too large");
+ size_t need = b->len + add;
+ if (need <= b->cap) return;
+ size_t cap = b->cap ? b->cap : 256;
+ while (cap < need) {
+ if (cap > SIZE_MAX / 2) { cap = need; break; }
+ cap *= 2;
+ }
+ b->data = xrealloc(b->data, cap);
+ b->cap = cap;
+}
+static void bytes(Buffer *b, const void *src, size_t n) {
+ reserve(b, n);
+ memcpy(b->data + b->len, src, n);
+ b->len += n;
+}
+static void byte(Buffer *b, unsigned char c) {
+ reserve(b, 1);
+ b->data[b->len++] = c;
+}
+static void putvar(Buffer *b, uint64_t x) {
+ while (x >= 128) {
+ byte(b, (unsigned char)((x & 127) | 128));
+ x >>= 7;
+ }
+ byte(b, (unsigned char)x);
+}
+static void put32(Buffer *b, uint32_t x) {
+ for (unsigned k = 0; k < 4; k++) byte(b, (unsigned char)(x >> (8*k)));
+}
+static uint64_t getvar(Reader *r) {
+ uint64_t x = 0;
+ for (unsigned k = 0; k < 10; k++) {
+ if (r->p == r->end) die("truncated variable-length integer");
+ unsigned c = *r->p++;
+ if (k == 9 && (c & 0xfe)) die("variable-length integer overflow");
+ x |= (uint64_t)(c & 127) << (7*k);
+ if (!(c & 128)) {
+ if (k && c == 0) die("noncanonical variable-length integer");
+ return x;
+ }
+ }
+ die("unterminated variable-length integer");
+ return 0;
+}
+static uint32_t get32(Reader *r) {
+ if ((size_t)(r->end - r->p) < 4) die("truncated hash");
+ uint32_t x = 0;
+ for (unsigned k = 0; k < 4; k++) x |= (uint32_t)(*r->p++) << (8*k);
+ return x;
+}
+static unsigned char *readfile(const char *path, size_t *size) {
+ FILE *f = fopen(path, "rb");
+ if (!f) { perror(path); exit(1); }
+ if (fseek(f, 0, SEEK_END)) die("seek failed");
+ long n = ftell(f);
+ if (n < 0 || fseek(f, 0, SEEK_SET)) die("size failed");
+ if ((uintmax_t)n > SIZE_MAX) die("file too large");
+ unsigned char *data = xmalloc((size_t)n);
+ if (fread(data, 1, (size_t)n, f) != (size_t)n) die("read failed");
+ if (fclose(f)) die("close failed");
+ *size = (size_t)n;
+ return data;
+}
+static void writefile(const char *path, const void *data, size_t n) {
+ FILE *f = fopen(path, "wb");
+ if (!f) { perror(path); exit(1); }
+ if (fwrite(data, 1, n, f) != n) die("write failed");
+ if (fclose(f)) die("close failed");
+}
+static uint64_t namehash(const char *s) {
+ uint64_t h = UINT64_C(14695981039346656037);
+ for (; *s; s++) { h ^= (unsigned char)*s; h *= UINT64_C(1099511628211); }
+ return h;
+}
+static Module *module(Acc *a, const char *name, uint32_t hash, size_t n) {
+ size_t bucket = namehash(name) % BUCKETS;
+ for (Module *m = a->buckets[bucket]; m; m = m->next) {
+ if (strcmp(m->name, name)) continue;
+ if (m->hash != hash || m->n != n) die("incompatible module hash/number of boxes");
+ return m;
+ }
+ if (n > SIZE_MAX / sizeof(uint64_t)) die("module too large");
+ Module *m = xmalloc(sizeof(*m));
+ m->name = strdup(name);
+ if (!m->name) die("out of memory");
+ m->hash = hash;
+ m->n = n;
+ m->ticks = calloc(n ? n : 1, sizeof(uint64_t));
+ if (!m->ticks) die("out of memory");
+ m->seen_epoch = 0;
+ m->next = a->buckets[bucket];
+ a->buckets[bucket] = m;
+ if (a->len == a->cap) {
+ if (a->cap > SIZE_MAX / (2 * sizeof(*a->mods))) die("too many modules");
+ a->cap = a->cap ? 2 * a->cap : 256;
+ a->mods = xrealloc(a->mods, a->cap * sizeof(*a->mods));
+ }
+ a->mods[a->len++] = m;
+ return m;
+}
+static void mergeone(Acc *a, const char *path) {
+ context = path;
+ size_t size;
+ unsigned char *data = readfile(path, &size);
+ Reader r = {data, data + size};
+ if (size < 7 || memcmp(r.p, MAGIC, 7)) die("wrong magic/version (expected HPCTIX\\2)");
+ r.p += 7;
+ uint64_t nmods = getvar(&r);
+ if (nmods > (uint64_t)(r.end - r.p)) die("invalid module count");
+ if (++a->epoch == 0) die("epoch overflow");
+
+ for (uint64_t j = 0; j < nmods; j++) {
+ uint64_t name_len = getvar(&r);
+ if (name_len > SIZE_MAX - 1 || name_len > (uint64_t)(r.end - r.p))
+ die("invalid name length");
+ char *name = xmalloc((size_t)name_len + 1);
+ memcpy(name, r.p, (size_t)name_len);
+ name[name_len] = 0;
+ if (memchr(name, 0, (size_t)name_len)) die("embedded NUL in module name");
+ r.p += (size_t)name_len;
+ uint32_t hash = get32(&r);
+ uint64_t boxes = getvar(&r);
+ if (boxes > SIZE_MAX / sizeof(uint64_t)) die("too many counters");
+ Module *m = module(a, name, hash, (size_t)boxes);
+ free(name);
+ if (m->seen_epoch == a->epoch) die("duplicate module");
+ m->seen_epoch = a->epoch;
+
+ /* RLE records account for exactly 'boxes' positions. */
+ size_t pos = 0;
+ while (pos < m->n) {
+ uint64_t zeros = getvar(&r);
+ if (zeros > m->n - pos) die("zero run exceeds module box count");
+ pos += (size_t)zeros;
+ uint64_t nonzeros = getvar(&r);
+ if (nonzeros > m->n - pos) die("nonzero run exceeds module box count");
+ if (!zeros && !nonzeros) die("empty RLE record");
+
+ size_t stop = pos + (size_t)nonzeros;
+ for (; pos < stop; pos++) {
+ uint64_t value = getvar(&r);
+ if (!value) die("zero value in nonzero run");
+ if (UINT64_MAX - m->ticks[pos] < value) die("counter overflow");
+ m->ticks[pos] += value;
+ }
+ if (UINT64_MAX - a->input_entries < nonzeros) die("entry count overflow");
+ a->input_entries += nonzeros;
+ }
+ }
+ if (r.p != r.end) die("unexpected trailing bytes");
+ free(data);
+ a->filecount++;
+}
+static int cmpmod(const void *a, const void *b) {
+ const Module *const *x = a, *const *y = b;
+ return strcmp((*x)->name, (*y)->name);
+}
+static Buffer serialise(const Acc *a) {
+ Buffer b = {0};
+ bytes(&b, MAGIC, 7);
+ putvar(&b, a->len);
+ for (size_t j = 0; j < a->len; j++) {
+ Module *m = a->mods[j];
+ size_t name_len = strlen(m->name);
+ putvar(&b, name_len);
+ bytes(&b, m->name, name_len);
+ put32(&b, m->hash);
+ putvar(&b, m->n);
+
+ size_t i = 0;
+ while (i < m->n) {
+ size_t start = i;
+ while (i < m->n && m->ticks[i] == 0) i++;
+ putvar(&b, i - start);
+ start = i;
+ while (i < m->n && m->ticks[i] != 0) i++;
+ putvar(&b, i - start);
+ for (size_t k = start; k < i; k++) putvar(&b, m->ticks[k]);
+ }
+ }
+ return b;
+}
+static int is_tix(const char *s) {
+ size_t n = strlen(s);
+ return n >= 4 && strcmp(s + n - 4, ".tix") == 0;
+}
+static int cmpstr(const void *a, const void *b) {
+ return strcmp(*(char *const *)a, *(char *const *)b);
+}
+static void merge_dir(const char *dir, const char *output) {
+ DIR *d = opendir(dir);
+ if (!d) { perror(dir); exit(1); }
+ char **paths = NULL;
+ size_t n = 0, cap = 0;
+ struct dirent *e;
+ struct stat outstat;
+ int output_exists = stat(output, &outstat) == 0;
+ while ((e = readdir(d))) {
+ if (!is_tix(e->d_name)) continue;
+ size_t dlen = strlen(dir), flen = strlen(e->d_name);
+ if (dlen > SIZE_MAX - flen - 2) die("path too long");
+ char *path = xmalloc(dlen + flen + 2);
+ snprintf(path, dlen + flen + 2, "%s/%s", dir, e->d_name);
+ struct stat st;
+ if (stat(path, &st) || !S_ISREG(st.st_mode)) { free(path); continue; }
+ if (!strcmp(path, output) ||
+ (output_exists && st.st_dev == outstat.st_dev && st.st_ino == outstat.st_ino))
+ die("output file is among input files");
+ if (n == cap) {
+ if (cap > SIZE_MAX / (2 * sizeof(*paths))) die("too many input files");
+ cap = cap ? 2 * cap : 256;
+ paths = xrealloc(paths, cap * sizeof(*paths));
+ }
+ paths[n++] = path;
+ }
+ closedir(d);
+ if (!n) die("no input .tix files");
+ qsort(paths, n, sizeof(*paths), cmpstr);
+ Acc a = {0};
+ for (size_t i = 0; i < n; i++) {
+ mergeone(&a, paths[i]);
+ free(paths[i]);
+ if (a.filecount % 1000 == 0)
+ fprintf(stderr, "Merged %" PRIu64 " files\n", a.filecount);
+ }
+ free(paths);
+ qsort(a.mods, a.len, sizeof(*a.mods), cmpmod);
+ Buffer out = serialise(&a);
+ context = output;
+ writefile(output, out.data, out.len);
+ fprintf(stderr, "Merged %" PRIu64 " files, %zu modules, %" PRIu64
+ " nonzero input counters; result %zu bytes\n",
+ a.filecount, a.len, a.input_entries, out.len);
+ free(out.data);
+ for (size_t i = 0; i < a.len; i++) {
+ free(a.mods[i]->ticks);
+ free(a.mods[i]->name);
+ free(a.mods[i]);
+ }
+ free(a.mods);
+}
+int main(int argc, char **argv) {
+ if (argc != 3) {
+ fprintf(stderr, "Usage: %s RLE_DIRECTORY OUTPUT.tix\n", argv[0]);
+ return 2;
+ }
+ merge_dir(argv[1], argv[2]);
+ return 0;
+}
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/39bb48f28069b6ff61b5cb33b56b2d…
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/39bb48f28069b6ff61b5cb33b56b2d…
You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help
1
0
[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 2 commits: Carefully implement coercion zapping
by Marge Bot (@marge-bot) 18 Oct '26
by Marge Bot (@marge-bot) 18 Oct '26
18 Oct '26
Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC
Commits:
3ed2cc13 by sheaf at 2026-10-18T10:14:26-04:00
Carefully implement coercion zapping
This commit implements coercion zapping in the rewriter, controlled by
the -fzap-coercions flag (on by default). This significantly reduces
the size of coercions produced when rewriting type family applications,
resulting in much faster compilation. See Note [Coercion zapping]
in GHC.Tc.Solver.Rewrite for an explanation and further details.
The rewriter now keeps track of the `CoVar`s and `CoercionHole`s it uses
when rewriting, which allows computing the dependencies of a zapped
coercion without traversing the coercion the rewriter produced, as
explained in Note [Computing coercion dependencies] in GHC.Tc.Solver.Rewrite.
Accompanying changes:
- Rework how dependencies of 'UnivCo's are tracked, purely for
performance reasons.
We now use the 'UnivCoDeps' datatype instead of '[Coercion]', and
we now insist that 'uco_deps' also contains the CoVars that appear
in the LHS and RHS types of the UnivCo (as a caching mechanism).
- Several performance improvements to the rewriter (e.g. increased
strictness).
- Improvements to the family application cache, including:
- Better documentation.
- Only cache a whole chain of reduction steps.
- Don't put coercion holes in the cache, fixing #27518.
- Allow Core Lint to be called from within the typechecker (and from
within the coercion optimiser).
- Move out "annotation linting" from Core Lint into the general Core
pipeline, to avoid the dependency GHC.Core.Coercion.Opt->GHC.Core.Lint
causing a regression in CountDepsParser due to transitive
dependencies of GHC.Core.Opt.Monad and GHC.Unit.Module.ModGuts.
Fixes #8095 #27336 #27518
Summary of performance numbers
Compile-time byte allocated in GHC's testsuite (0 regressions)
CoOpt_Singletons(normal) ghc/alloc 634,040,332 595,448,728 -6.1% GOOD
FamAppCachePerf(normal) ghc/alloc 495,629,812 191,612,920 -61.3% GOOD
LargeRecord(normal) ghc/alloc 1,226,806,434 966,260,976 -21.2% GOOD
SimplCastPerf(normal) ghc/alloc 160,505,678 148,112,688 -7.7% GOOD
T12227(normal) ghc/alloc 244,668,982 233,037,216 -4.8% GOOD
T12545(normal) ghc/alloc 697,804,842 424,705,152 -39.1% GOOD
T13386(normal) ghc/alloc 422,871,076 35,213,656 -91.7% GOOD
T15703(normal) ghc/alloc 288,402,364 273,692,560 -5.1% GOOD
T26426(normal) ghc/alloc 86,002,052 78,152,104 -9.1% GOOD
T27336(normal) ghc/alloc 498,932,268 35,886,016 -92.8% GOOD
T5030(normal) ghc/alloc 117,057,706 88,785,648 -24.2% GOOD
T5321Fun(normal) ghc/alloc 252,552,628 243,820,176 -3.5% GOOD
T8095(normal) ghc/alloc 768,198,564 127,779,520 -83.4% GOOD
T9872a(normal) ghc/alloc 1,655,675,020 1,406,017,008 -15.1% GOOD
T9872b(normal) ghc/alloc 1,864,180,628 1,644,706,696 -11.8% GOOD
T9872b_defer(normal) ghc/alloc 2,834,585,468 1,657,729,760 -41.5% GOOD
T9872c(normal) ghc/alloc 1,572,573,116 1,354,055,424 -13.9% GOOD
T9872d(normal) ghc/alloc 351,516,004 331,071,424 -5.8% GOOD
TcPlugin_RewritePerf(normal) ghc/alloc 2,063,065,680 1,847,464,272 -10.5% GOOD
Chesskell (github.com/Proxymoron461/chesskell/issues)
Typechecking that the first N plies of kholmovVsBronsteinShort
are a valid chess game:
Plies | GHC 9.14 time/alloc | This commit time/alloc |
-----:|---------------------|------------------------|
2 | 41s/20GB | 0.2s/19MB |
4 | 95s/49GB | 0.3s/25MB |
6 | timed out | 0.6s/522MB |
8 | timed out | 7s/673MB |
10 | timed out | timed out |
Compilation of singletons-base: compile time -28%, allocations -25%
-------------------------
Metric Decrease:
CoOpt_Singletons
FamAppCachePerf
LargeRecord
SimplCastPerf
T12227
T12545
T13386
T15703
T24984
T26426
T27336
T5030
T5321Fun
T8095
T9872a
T9872b
T9872b_defer
T9872c
T9872d
TcPlugin_RewritePerf
-------------------------
Co-Authored-By: Sylvain Henry <sylvain(a)haskus.fr>
- - - - -
0a01049a by Sylvain Henry at 2026-10-18T10:14:32-04:00
JS: fix stack corruption in h$ap_gen_fast's pushAllRegs (#27624)
The loop added in 9e46990976 ("JS: support more than 128 registers
(#26558)") pushed register N to stack[sp - N - 2] while the switch it
falls through into, and every reader of the h$ap_gen frame, uses
stack[sp - (N - 2)]. Registers >= R32 were therefore written 4 slots
too low: the slots the readers consult were left stale and the frame
below was silently corrupted.
Fix the loop to use the same slot formula as the switch, and add a
regression test: an unknown call to a thunk with 35 argument register
slots, which goes through the generic apply.
Co-Authored-By: Claude Fable 5 <noreply(a)anthropic.com>
- - - - -
54 changed files:
- + changelog.d/27624
- + changelog.d/zap-coercions
- compiler/GHC/Core/Coercion.hs
- compiler/GHC/Core/Coercion.hs-boot
- compiler/GHC/Core/Coercion/Opt.hs
- compiler/GHC/Core/FamInstEnv.hs
- compiler/GHC/Core/Lint.hs
- + compiler/GHC/Core/Lint.hs-boot
- compiler/GHC/Core/Opt/Pipeline.hs
- compiler/GHC/Core/Reduction.hs
- compiler/GHC/Core/SimpleOpt.hs
- compiler/GHC/Core/TyCo/FVs.hs
- compiler/GHC/Core/TyCo/FVs.hs-boot
- compiler/GHC/Core/TyCo/Make.hs
- compiler/GHC/Core/TyCo/Rep.hs
- compiler/GHC/Core/TyCo/Rep.hs-boot
- compiler/GHC/Core/TyCo/Subst.hs
- compiler/GHC/Core/TyCo/Tidy.hs
- compiler/GHC/Core/Utils.hs
- compiler/GHC/CoreToIface.hs
- compiler/GHC/Driver/Config.hs
- compiler/GHC/Driver/Config/Core/Lint.hs
- compiler/GHC/Driver/DynFlags.hs
- compiler/GHC/Driver/Flags.hs
- compiler/GHC/Driver/Session.hs
- compiler/GHC/Iface/Rename.hs
- compiler/GHC/Iface/Syntax.hs
- compiler/GHC/Iface/Type.hs
- compiler/GHC/IfaceToCore.hs
- compiler/GHC/Runtime/Eval/Types.hs
- compiler/GHC/StgToJS/Apply.hs
- compiler/GHC/Tc/Instance/Family.hs
- compiler/GHC/Tc/Solver/Default.hs
- compiler/GHC/Tc/Solver/Equality.hs
- compiler/GHC/Tc/Solver/InertSet.hs
- compiler/GHC/Tc/Solver/Monad.hs
- compiler/GHC/Tc/Solver/Rewrite.hs
- compiler/GHC/Tc/Solver/Solve.hs
- compiler/GHC/Tc/Types.hs
- compiler/GHC/Tc/Utils/TcMType.hs
- compiler/GHC/Types/Unique/DSet.hs
- compiler/GHC/Types/Var/Set.hs
- docs/users_guide/extending_ghc.rst
- docs/users_guide/exts/type_families.rst
- + testsuite/tests/codeGen/should_run/T27624.hs
- + testsuite/tests/codeGen/should_run/T27624.stdout
- testsuite/tests/codeGen/should_run/all.T
- testsuite/tests/corelint/T27374.hs
- testsuite/tests/count-deps/CountDepsParser.stdout
- testsuite/tests/dependent/should_compile/T14729.stderr
- + testsuite/tests/indexed-types/should_compile/ZapDeps.hs
- testsuite/tests/indexed-types/should_compile/all.T
- testsuite/tests/rep-poly/RepPolyRule3.stderr
- testsuite/tests/simplCore/should_compile/T26051.stderr
The diff was not included because it is too large.
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/89a7f9d5fc7b453df7a5e7c48341d0…
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/89a7f9d5fc7b453df7a5e7c48341d0…
You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help
1
0
[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 4 commits: EPA: Add TTG fields to FamilyInfo
by Marge Bot (@marge-bot) 18 Oct '26
by Marge Bot (@marge-bot) 18 Oct '26
18 Oct '26
Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC
Commits:
7dedcf13 by Alan Zimmerman at 2026-10-16T19:03:17-04:00
EPA: Add TTG fields to FamilyInfo
This commit is a simple add, with unused extension fields.
It lays the groundwork for using them for exact print annotations
- - - - -
26b9a8a0 by Arkissa at 2026-10-17T16:04:10+00:00
ghci: Prefer exact source spans in :type-at
Prefer expression types for identical source spans.
Fixes #27412.
- - - - -
a56479f5 by sheaf at 2026-10-18T04:41:34-04:00
Carefully implement coercion zapping
This commit implements coercion zapping in the rewriter, controlled by
the -fzap-coercions flag (on by default). This significantly reduces
the size of coercions produced when rewriting type family applications,
resulting in much faster compilation. See Note [Coercion zapping]
in GHC.Tc.Solver.Rewrite for an explanation and further details.
The rewriter now keeps track of the `CoVar`s and `CoercionHole`s it uses
when rewriting, which allows computing the dependencies of a zapped
coercion without traversing the coercion the rewriter produced, as
explained in Note [Computing coercion dependencies] in GHC.Tc.Solver.Rewrite.
Accompanying changes:
- Rework how dependencies of 'UnivCo's are tracked, purely for
performance reasons.
We now use the 'UnivCoDeps' datatype instead of '[Coercion]', and
we now insist that 'uco_deps' also contains the CoVars that appear
in the LHS and RHS types of the UnivCo (as a caching mechanism).
- Several performance improvements to the rewriter (e.g. increased
strictness).
- Improvements to the family application cache, including:
- Better documentation.
- Only cache a whole chain of reduction steps.
- Don't put coercion holes in the cache, fixing #27518.
- Allow Core Lint to be called from within the typechecker (and from
within the coercion optimiser).
- Move out "annotation linting" from Core Lint into the general Core
pipeline, to avoid the dependency GHC.Core.Coercion.Opt->GHC.Core.Lint
causing a regression in CountDepsParser due to transitive
dependencies of GHC.Core.Opt.Monad and GHC.Unit.Module.ModGuts.
Fixes #8095 #27336 #27518
Summary of performance numbers
Compile-time byte allocated in GHC's testsuite (0 regressions)
CoOpt_Singletons(normal) ghc/alloc 634,040,332 595,448,728 -6.1% GOOD
FamAppCachePerf(normal) ghc/alloc 495,629,812 191,612,920 -61.3% GOOD
LargeRecord(normal) ghc/alloc 1,226,806,434 966,260,976 -21.2% GOOD
SimplCastPerf(normal) ghc/alloc 160,505,678 148,112,688 -7.7% GOOD
T12227(normal) ghc/alloc 244,668,982 233,037,216 -4.8% GOOD
T12545(normal) ghc/alloc 697,804,842 424,705,152 -39.1% GOOD
T13386(normal) ghc/alloc 422,871,076 35,213,656 -91.7% GOOD
T15703(normal) ghc/alloc 288,402,364 273,692,560 -5.1% GOOD
T26426(normal) ghc/alloc 86,002,052 78,152,104 -9.1% GOOD
T27336(normal) ghc/alloc 498,932,268 35,886,016 -92.8% GOOD
T5030(normal) ghc/alloc 117,057,706 88,785,648 -24.2% GOOD
T5321Fun(normal) ghc/alloc 252,552,628 243,820,176 -3.5% GOOD
T8095(normal) ghc/alloc 768,198,564 127,779,520 -83.4% GOOD
T9872a(normal) ghc/alloc 1,655,675,020 1,406,017,008 -15.1% GOOD
T9872b(normal) ghc/alloc 1,864,180,628 1,644,706,696 -11.8% GOOD
T9872b_defer(normal) ghc/alloc 2,834,585,468 1,657,729,760 -41.5% GOOD
T9872c(normal) ghc/alloc 1,572,573,116 1,354,055,424 -13.9% GOOD
T9872d(normal) ghc/alloc 351,516,004 331,071,424 -5.8% GOOD
TcPlugin_RewritePerf(normal) ghc/alloc 2,063,065,680 1,847,464,272 -10.5% GOOD
Chesskell (github.com/Proxymoron461/chesskell/issues)
Typechecking that the first N plies of kholmovVsBronsteinShort
are a valid chess game:
Plies | GHC 9.14 time/alloc | This commit time/alloc |
-----:|---------------------|------------------------|
2 | 41s/20GB | 0.2s/19MB |
4 | 95s/49GB | 0.3s/25MB |
6 | timed out | 0.6s/522MB |
8 | timed out | 7s/673MB |
10 | timed out | timed out |
Compilation of singletons-base: compile time -28%, allocations -25%
-------------------------
Metric Decrease:
CoOpt_Singletons
FamAppCachePerf
LargeRecord
SimplCastPerf
T12227
T12545
T13386
T15703
T24984
T26426
T27336
T5030
T5321Fun
T8095
T9872a
T9872b
T9872b_defer
T9872c
T9872d
TcPlugin_RewritePerf
-------------------------
Co-Authored-By: Sylvain Henry <sylvain(a)haskus.fr>
- - - - -
89a7f9d5 by Sylvain Henry at 2026-10-18T04:41:55-04:00
JS: fix stack corruption in h$ap_gen_fast's pushAllRegs (#27624)
The loop added in 9e46990976 ("JS: support more than 128 registers
(#26558)") pushed register N to stack[sp - N - 2] while the switch it
falls through into, and every reader of the h$ap_gen frame, uses
stack[sp - (N - 2)]. Registers >= R32 were therefore written 4 slots
too low: the slots the readers consult were left stale and the frame
below was silently corrupted.
Fix the loop to use the same slot formula as the switch, and add a
regression test: an unknown call to a thunk with 35 argument register
slots, which goes through the generic apply.
Co-Authored-By: Claude Fable 5 <noreply(a)anthropic.com>
- - - - -
88 changed files:
- + changelog.d/27624
- + changelog.d/T27412
- + changelog.d/zap-coercions
- compiler/GHC/Core/Coercion.hs
- compiler/GHC/Core/Coercion.hs-boot
- compiler/GHC/Core/Coercion/Opt.hs
- compiler/GHC/Core/FamInstEnv.hs
- compiler/GHC/Core/Lint.hs
- + compiler/GHC/Core/Lint.hs-boot
- compiler/GHC/Core/Opt/Pipeline.hs
- compiler/GHC/Core/Reduction.hs
- compiler/GHC/Core/SimpleOpt.hs
- compiler/GHC/Core/TyCo/FVs.hs
- compiler/GHC/Core/TyCo/FVs.hs-boot
- compiler/GHC/Core/TyCo/Make.hs
- compiler/GHC/Core/TyCo/Rep.hs
- compiler/GHC/Core/TyCo/Rep.hs-boot
- compiler/GHC/Core/TyCo/Subst.hs
- compiler/GHC/Core/TyCo/Tidy.hs
- compiler/GHC/Core/Utils.hs
- compiler/GHC/CoreToIface.hs
- compiler/GHC/Driver/Config.hs
- compiler/GHC/Driver/Config/Core/Lint.hs
- compiler/GHC/Driver/DynFlags.hs
- compiler/GHC/Driver/Flags.hs
- compiler/GHC/Driver/Session.hs
- compiler/GHC/Hs/Decls.hs
- compiler/GHC/Hs/Utils.hs
- compiler/GHC/HsToCore/Quote.hs
- compiler/GHC/Iface/Ext/Ast.hs
- compiler/GHC/Iface/Rename.hs
- compiler/GHC/Iface/Syntax.hs
- compiler/GHC/Iface/Type.hs
- compiler/GHC/IfaceToCore.hs
- compiler/GHC/Parser.y
- compiler/GHC/Parser/PostProcess.hs
- compiler/GHC/Rename/Module.hs
- compiler/GHC/Runtime/Eval/Types.hs
- compiler/GHC/StgToJS/Apply.hs
- compiler/GHC/Tc/Instance/Family.hs
- compiler/GHC/Tc/Solver/Default.hs
- compiler/GHC/Tc/Solver/Equality.hs
- compiler/GHC/Tc/Solver/InertSet.hs
- compiler/GHC/Tc/Solver/Monad.hs
- compiler/GHC/Tc/Solver/Rewrite.hs
- compiler/GHC/Tc/Solver/Solve.hs
- compiler/GHC/Tc/TyCl.hs
- compiler/GHC/Tc/Types.hs
- compiler/GHC/Tc/Utils/TcMType.hs
- compiler/GHC/ThToHs.hs
- compiler/GHC/Types/Unique/DSet.hs
- compiler/GHC/Types/Var/Set.hs
- compiler/Language/Haskell/Syntax/Decls.hs
- compiler/Language/Haskell/Syntax/Extension.hs
- docs/users_guide/extending_ghc.rst
- docs/users_guide/exts/type_families.rst
- ghc/GHCi/UI/Info.hs
- + testsuite/tests/codeGen/should_run/T27624.hs
- + testsuite/tests/codeGen/should_run/T27624.stdout
- testsuite/tests/codeGen/should_run/all.T
- testsuite/tests/corelint/T27374.hs
- testsuite/tests/count-deps/CountDepsParser.stdout
- testsuite/tests/dependent/should_compile/T14729.stderr
- testsuite/tests/ghci/prog-mhu001/prog-mhu001c.stdout
- testsuite/tests/ghci/prog-mhu002/prog-mhu002d.stdout
- testsuite/tests/ghci/scripts/T16575.script
- testsuite/tests/ghci/scripts/T16575.stdout
- testsuite/tests/ghci/scripts/T16804.stdout
- testsuite/tests/ghci/scripts/T20150.stdout
- + testsuite/tests/ghci/scripts/T27412.hs
- + testsuite/tests/ghci/scripts/T27412.script
- + testsuite/tests/ghci/scripts/T27412.stdout
- testsuite/tests/ghci/scripts/all.T
- testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr
- + testsuite/tests/indexed-types/should_compile/ZapDeps.hs
- testsuite/tests/indexed-types/should_compile/all.T
- testsuite/tests/parser/should_compile/DumpParsedAst.stderr
- testsuite/tests/parser/should_compile/DumpRenamedAst.stderr
- testsuite/tests/parser/should_compile/KindSigs.stderr
- testsuite/tests/rep-poly/RepPolyRule3.stderr
- testsuite/tests/simplCore/should_compile/T26051.stderr
- utils/check-exact/ExactPrint.hs
- utils/haddock/haddock-api/src/Haddock/Backends/Hoogle.hs
- utils/haddock/haddock-api/src/Haddock/Backends/LaTeX.hs
- utils/haddock/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs
- utils/haddock/haddock-api/src/Haddock/Convert.hs
- utils/haddock/haddock-api/src/Haddock/Interface/Rename.hs
- utils/haddock/haddock-api/src/Haddock/Types.hs
The diff was not included because it is too large.
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/dd86b6a761f471da6c5c1df1e1dfc1…
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/dd86b6a761f471da6c5c1df1e1dfc1…
You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help
1
0
Florian Ragwitz pushed to branch wip/rafl/hpc-tixdir at Glasgow Haskell Compiler / GHC
Commits:
39bb48f2 by Florian Ragwitz at 2026-10-18T00:56:50-07:00
Print sizes
- - - - -
1 changed file:
- .gitlab/ci.sh
Changes:
=====================================
.gitlab/ci.sh
=====================================
@@ -903,7 +903,9 @@ function save_hpc_coverage() {
# Keep whatever has been generated even if the build or tests failed.
if [[ -d _build/ghc-hpc || -d _build/ghc-tix ]]; then
mkdir -p _build/ghc-hpc _build/ghc-tix
+ du -sh _build/ghc-hpc _build/ghc-tix
tar -czf ghc-hpc-coverage.tar.gz _build/ghc-hpc _build/ghc-tix
+ ls -lh ghc-hpc-coverage.tar.gz
else
warn "No HPC coverage directories found"
fi
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/39bb48f28069b6ff61b5cb33b56b2dc…
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/39bb48f28069b6ff61b5cb33b56b2dc…
You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help
1
0
18 Oct '26
Florian Ragwitz pushed to branch wip/rafl/hpc-tixdir at Glasgow Haskell Compiler / GHC
Commits:
cfee8588 by Florian Ragwitz at 2026-10-17T22:22:42-07:00
Fix coverage saving
- - - - -
1 changed file:
- .gitlab/ci.sh
Changes:
=====================================
.gitlab/ci.sh
=====================================
@@ -1152,6 +1152,7 @@ case ${1:-help} in
compare_interfaces_of) shift; compare_interfaces_of "$@" ;;
clean) clean ;;
save_test_output) save_test_output ;;
+ save_hpc_coverage) save_hpc_coverage ;;
save_cache) save_cache ;;
shell) shift; shell "$@" ;;
*) fail "unknown mode $1" ;;
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/cfee8588c9fe5069ec22416d130fefd…
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/cfee8588c9fe5069ec22416d130fefd…
You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help
1
0
18 Oct '26
Florian Ragwitz pushed to branch wip/rafl/hpc-tixdir at Glasgow Haskell Compiler / GHC
Commits:
056ed24f by Florian Ragwitz at 2026-10-17T20:11:37-07:00
Regenerate CI jobs
- - - - -
1 changed file:
- .gitlab/jobs.yaml
Changes:
=====================================
.gitlab/jobs.yaml
=====================================
@@ -2,6 +2,7 @@
{
"aarch64-darwin-validate": {
"after_script": [
+ ".gitlab/ci.sh save_hpc_coverage",
".gitlab/ci.sh save_cache",
".gitlab/ci.sh save_test_output",
".gitlab/ci.sh clean",
@@ -13,7 +14,8 @@
"paths": [
"ghc-aarch64-darwin-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "ghc-hpc-coverage.tar.gz"
],
"reports": {
"junit": "junit.xml"
@@ -55,7 +57,7 @@
"variables": {
"BIGNUM_BACKEND": "gmp",
"BIN_DIST_NAME": "ghc-aarch64-darwin-validate",
- "BUILD_FLAVOUR": "validate",
+ "BUILD_FLAVOUR": "validate+coverage",
"CONFIGURE_ARGS": "--with-intree-gmp --with-system-libffi --enable-strict-ghc-toolchain-check",
"HADRIAN_ARGS": "--docs=no-sphinx-pdfs",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
@@ -69,6 +71,7 @@
},
"aarch64-linux-alpine3_23-validate": {
"after_script": [
+ ".gitlab/ci.sh save_hpc_coverage",
".gitlab/ci.sh save_cache",
".gitlab/ci.sh save_test_output",
".gitlab/ci.sh clean",
@@ -80,7 +83,8 @@
"paths": [
"ghc-aarch64-linux-alpine3_23-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "ghc-hpc-coverage.tar.gz"
],
"reports": {
"junit": "junit.xml"
@@ -123,7 +127,7 @@
"BIGNUM_BACKEND": "gmp",
"BIN_DIST_NAME": "ghc-aarch64-linux-alpine3_23-validate",
"BROKEN_TESTS": "encoding004 T10458",
- "BUILD_FLAVOUR": "validate",
+ "BUILD_FLAVOUR": "validate+coverage",
"CONFIGURE_ARGS": "--disable-ld-override --enable-ignore-build-platform-mismatch --build=aarch64-unknown-linux --host=aarch64-unknown-linux --target=aarch64-unknown-linux --enable-strict-ghc-toolchain-check",
"INSTALL_CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
"RUNTEST_ARGS": "",
@@ -133,6 +137,7 @@
},
"aarch64-linux-deb11-validate": {
"after_script": [
+ ".gitlab/ci.sh save_hpc_coverage",
".gitlab/ci.sh save_cache",
".gitlab/ci.sh save_test_output",
".gitlab/ci.sh clean",
@@ -144,7 +149,8 @@
"paths": [
"ghc-aarch64-linux-deb11-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "ghc-hpc-coverage.tar.gz"
],
"reports": {
"junit": "junit.xml"
@@ -186,7 +192,7 @@
"variables": {
"BIGNUM_BACKEND": "gmp",
"BIN_DIST_NAME": "ghc-aarch64-linux-deb11-validate",
- "BUILD_FLAVOUR": "validate",
+ "BUILD_FLAVOUR": "validate+coverage",
"CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"RUNTEST_ARGS": "",
@@ -196,6 +202,7 @@
},
"aarch64-linux-deb12-validate": {
"after_script": [
+ ".gitlab/ci.sh save_hpc_coverage",
".gitlab/ci.sh save_cache",
".gitlab/ci.sh save_test_output",
".gitlab/ci.sh clean",
@@ -207,7 +214,8 @@
"paths": [
"ghc-aarch64-linux-deb12-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "ghc-hpc-coverage.tar.gz"
],
"reports": {
"junit": "junit.xml"
@@ -249,7 +257,7 @@
"variables": {
"BIGNUM_BACKEND": "gmp",
"BIN_DIST_NAME": "ghc-aarch64-linux-deb12-validate",
- "BUILD_FLAVOUR": "validate",
+ "BUILD_FLAVOUR": "validate+coverage",
"CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"RUNTEST_ARGS": "",
@@ -259,6 +267,7 @@
},
"aarch64-linux-deb12-wine-int_native-cross_aarch64-unknown-mingw32-validate": {
"after_script": [
+ ".gitlab/ci.sh save_hpc_coverage",
".gitlab/ci.sh save_cache",
".gitlab/ci.sh save_test_output",
".gitlab/ci.sh clean",
@@ -270,7 +279,8 @@
"paths": [
"ghc-aarch64-linux-deb12-wine-int_native-cross_aarch64-unknown-mingw32-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "ghc-hpc-coverage.tar.gz"
],
"reports": {
"junit": "junit.xml"
@@ -313,7 +323,7 @@
"AR": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-llvm-ar",
"BIGNUM_BACKEND": "native",
"BIN_DIST_NAME": "ghc-aarch64-linux-deb12-wine-int_native-cross_aarch64-unknown-mingw32-validate",
- "BUILD_FLAVOUR": "validate",
+ "BUILD_FLAVOUR": "validate+coverage",
"CC": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-clang",
"CFLAGS": "-fuse-ld=/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-ld --rtlib=compiler-rt",
"CONFIGURE_ARGS": "--with-intree-gmp --enable-strict-ghc-toolchain-check",
@@ -343,6 +353,7 @@
},
"aarch64-linux-deb12-wine-int_native-cross_aarch64-unknown-mingw32-validate+llvm": {
"after_script": [
+ ".gitlab/ci.sh save_hpc_coverage",
".gitlab/ci.sh save_cache",
".gitlab/ci.sh save_test_output",
".gitlab/ci.sh clean",
@@ -354,7 +365,8 @@
"paths": [
"ghc-aarch64-linux-deb12-wine-int_native-cross_aarch64-unknown-mingw32-validate+llvm.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "ghc-hpc-coverage.tar.gz"
],
"reports": {
"junit": "junit.xml"
@@ -397,7 +409,7 @@
"AR": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-llvm-ar",
"BIGNUM_BACKEND": "native",
"BIN_DIST_NAME": "ghc-aarch64-linux-deb12-wine-int_native-cross_aarch64-unknown-mingw32-validate+llvm",
- "BUILD_FLAVOUR": "validate+llvm",
+ "BUILD_FLAVOUR": "validate+llvm+coverage",
"CC": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-clang",
"CFLAGS": "-fuse-ld=/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-ld --rtlib=compiler-rt",
"CONFIGURE_ARGS": "--with-intree-gmp --enable-strict-ghc-toolchain-check",
@@ -427,6 +439,7 @@
},
"aarch64-linux-deb13-validate": {
"after_script": [
+ ".gitlab/ci.sh save_hpc_coverage",
".gitlab/ci.sh save_cache",
".gitlab/ci.sh save_test_output",
".gitlab/ci.sh clean",
@@ -438,7 +451,8 @@
"paths": [
"ghc-aarch64-linux-deb13-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "ghc-hpc-coverage.tar.gz"
],
"reports": {
"junit": "junit.xml"
@@ -480,7 +494,7 @@
"variables": {
"BIGNUM_BACKEND": "gmp",
"BIN_DIST_NAME": "ghc-aarch64-linux-deb13-validate",
- "BUILD_FLAVOUR": "validate",
+ "BUILD_FLAVOUR": "validate+coverage",
"CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"RUNTEST_ARGS": "",
@@ -490,6 +504,7 @@
},
"aarch64-linux-deb13-validate+llvm": {
"after_script": [
+ ".gitlab/ci.sh save_hpc_coverage",
".gitlab/ci.sh save_cache",
".gitlab/ci.sh save_test_output",
".gitlab/ci.sh clean",
@@ -501,7 +516,8 @@
"paths": [
"ghc-aarch64-linux-deb13-validate+llvm.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "ghc-hpc-coverage.tar.gz"
],
"reports": {
"junit": "junit.xml"
@@ -543,7 +559,7 @@
"variables": {
"BIGNUM_BACKEND": "gmp",
"BIN_DIST_NAME": "ghc-aarch64-linux-deb13-validate+llvm",
- "BUILD_FLAVOUR": "validate+llvm",
+ "BUILD_FLAVOUR": "validate+llvm+coverage",
"CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"RUNTEST_ARGS": "",
@@ -553,6 +569,7 @@
},
"i386-linux-alpine3_23-validate": {
"after_script": [
+ ".gitlab/ci.sh save_hpc_coverage",
".gitlab/ci.sh save_cache",
".gitlab/ci.sh save_test_output",
".gitlab/ci.sh clean",
@@ -564,7 +581,8 @@
"paths": [
"ghc-i386-linux-alpine3_23-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "ghc-hpc-coverage.tar.gz"
],
"reports": {
"junit": "junit.xml"
@@ -607,7 +625,7 @@
"BIGNUM_BACKEND": "gmp",
"BIN_DIST_NAME": "ghc-i386-linux-alpine3_23-validate",
"BROKEN_TESTS": "encoding004 T10458 simd009 T25169",
- "BUILD_FLAVOUR": "validate",
+ "BUILD_FLAVOUR": "validate+coverage",
"CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
"INSTALL_CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
"RUNTEST_ARGS": "",
@@ -617,6 +635,7 @@
},
"i386-linux-deb11-validate": {
"after_script": [
+ ".gitlab/ci.sh save_hpc_coverage",
".gitlab/ci.sh save_cache",
".gitlab/ci.sh save_test_output",
".gitlab/ci.sh clean",
@@ -628,7 +647,8 @@
"paths": [
"ghc-i386-linux-deb11-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "ghc-hpc-coverage.tar.gz"
],
"reports": {
"junit": "junit.xml"
@@ -670,7 +690,7 @@
"variables": {
"BIGNUM_BACKEND": "gmp",
"BIN_DIST_NAME": "ghc-i386-linux-deb11-validate",
- "BUILD_FLAVOUR": "validate",
+ "BUILD_FLAVOUR": "validate+coverage",
"CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"RUNTEST_ARGS": "",
@@ -680,6 +700,7 @@
},
"i386-linux-deb12-validate": {
"after_script": [
+ ".gitlab/ci.sh save_hpc_coverage",
".gitlab/ci.sh save_cache",
".gitlab/ci.sh save_test_output",
".gitlab/ci.sh clean",
@@ -691,7 +712,8 @@
"paths": [
"ghc-i386-linux-deb12-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "ghc-hpc-coverage.tar.gz"
],
"reports": {
"junit": "junit.xml"
@@ -733,7 +755,7 @@
"variables": {
"BIGNUM_BACKEND": "gmp",
"BIN_DIST_NAME": "ghc-i386-linux-deb12-validate",
- "BUILD_FLAVOUR": "validate",
+ "BUILD_FLAVOUR": "validate+coverage",
"CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"RUNTEST_ARGS": "",
@@ -743,6 +765,7 @@
},
"i386-linux-deb13-validate": {
"after_script": [
+ ".gitlab/ci.sh save_hpc_coverage",
".gitlab/ci.sh save_cache",
".gitlab/ci.sh save_test_output",
".gitlab/ci.sh clean",
@@ -754,7 +777,8 @@
"paths": [
"ghc-i386-linux-deb13-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "ghc-hpc-coverage.tar.gz"
],
"reports": {
"junit": "junit.xml"
@@ -796,7 +820,7 @@
"variables": {
"BIGNUM_BACKEND": "gmp",
"BIN_DIST_NAME": "ghc-i386-linux-deb13-validate",
- "BUILD_FLAVOUR": "validate",
+ "BUILD_FLAVOUR": "validate+coverage",
"CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"RUNTEST_ARGS": "",
@@ -5612,6 +5636,7 @@
},
"x86_64-darwin-validate": {
"after_script": [
+ ".gitlab/ci.sh save_hpc_coverage",
".gitlab/ci.sh save_cache",
".gitlab/ci.sh save_test_output",
".gitlab/ci.sh clean",
@@ -5623,7 +5648,8 @@
"paths": [
"ghc-x86_64-darwin-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "ghc-hpc-coverage.tar.gz"
],
"reports": {
"junit": "junit.xml"
@@ -5665,7 +5691,7 @@
"variables": {
"BIGNUM_BACKEND": "gmp",
"BIN_DIST_NAME": "ghc-x86_64-darwin-validate",
- "BUILD_FLAVOUR": "validate",
+ "BUILD_FLAVOUR": "validate+coverage",
"CONFIGURE_ARGS": "--with-intree-gmp --with-system-libffi --enable-strict-ghc-toolchain-check",
"HADRIAN_ARGS": "--docs=no-sphinx-pdfs",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
@@ -5682,6 +5708,7 @@
},
"x86_64-freebsd14-validate": {
"after_script": [
+ ".gitlab/ci.sh save_hpc_coverage",
".gitlab/ci.sh save_cache",
".gitlab/ci.sh save_test_output",
".gitlab/ci.sh clean",
@@ -5693,7 +5720,8 @@
"paths": [
"ghc-x86_64-freebsd14-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "ghc-hpc-coverage.tar.gz"
],
"reports": {
"junit": "junit.xml"
@@ -5734,7 +5762,7 @@
"variables": {
"BIGNUM_BACKEND": "gmp",
"BIN_DIST_NAME": "ghc-x86_64-freebsd14-validate",
- "BUILD_FLAVOUR": "validate",
+ "BUILD_FLAVOUR": "validate+coverage",
"CABAL_INSTALL_VERSION": "3.14.2.0",
"CC": "cc",
"CONFIGURE_ARGS": "--with-iconv-includes=/usr/local/include --with-iconv-libraries=/usr/local/lib --with-system-libffi --with-ffi-includes=/usr/local/include --with-ffi-libraries=/usr/local/lib --with-gmp-includes=/usr/local/include --with-gmp-libraries=/usr/local/lib --enable-strict-ghc-toolchain-check",
@@ -5748,6 +5776,7 @@
},
"x86_64-linux-alpine3_12-int_native-validate+fully_static": {
"after_script": [
+ ".gitlab/ci.sh save_hpc_coverage",
".gitlab/ci.sh save_cache",
".gitlab/ci.sh save_test_output",
".gitlab/ci.sh clean",
@@ -5759,7 +5788,8 @@
"paths": [
"ghc-x86_64-linux-alpine3_12-int_native-validate+fully_static.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "ghc-hpc-coverage.tar.gz"
],
"reports": {
"junit": "junit.xml"
@@ -5802,7 +5832,7 @@
"BIGNUM_BACKEND": "native",
"BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_12-int_native-validate+fully_static",
"BROKEN_TESTS": "ghcilink002 linker_unload_native encoding004 T10458",
- "BUILD_FLAVOUR": "validate+fully_static",
+ "BUILD_FLAVOUR": "validate+fully_static+coverage",
"CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
"INSTALL_CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
"RUNTEST_ARGS": "",
@@ -5812,6 +5842,7 @@
},
"x86_64-linux-alpine3_12-validate+fully_static": {
"after_script": [
+ ".gitlab/ci.sh save_hpc_coverage",
".gitlab/ci.sh save_cache",
".gitlab/ci.sh save_test_output",
".gitlab/ci.sh clean",
@@ -5823,7 +5854,8 @@
"paths": [
"ghc-x86_64-linux-alpine3_12-validate+fully_static.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "ghc-hpc-coverage.tar.gz"
],
"reports": {
"junit": "junit.xml"
@@ -5866,7 +5898,7 @@
"BIGNUM_BACKEND": "gmp",
"BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_12-validate+fully_static",
"BROKEN_TESTS": "ghcilink002 linker_unload_native encoding004 T10458",
- "BUILD_FLAVOUR": "validate+fully_static",
+ "BUILD_FLAVOUR": "validate+fully_static+coverage",
"CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
"INSTALL_CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
"RUNTEST_ARGS": "",
@@ -5876,6 +5908,7 @@
},
"x86_64-linux-alpine3_23-validate": {
"after_script": [
+ ".gitlab/ci.sh save_hpc_coverage",
".gitlab/ci.sh save_cache",
".gitlab/ci.sh save_test_output",
".gitlab/ci.sh clean",
@@ -5887,7 +5920,8 @@
"paths": [
"ghc-x86_64-linux-alpine3_23-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "ghc-hpc-coverage.tar.gz"
],
"reports": {
"junit": "junit.xml"
@@ -5930,7 +5964,7 @@
"BIGNUM_BACKEND": "gmp",
"BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_23-validate",
"BROKEN_TESTS": "encoding004 T10458",
- "BUILD_FLAVOUR": "validate",
+ "BUILD_FLAVOUR": "validate+coverage",
"CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
"INSTALL_CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
"RUNTEST_ARGS": "",
@@ -5940,6 +5974,7 @@
},
"x86_64-linux-alpine3_23-wasm-cross_wasm32-wasi-release+host_fully_static+text_simdutf": {
"after_script": [
+ ".gitlab/ci.sh save_hpc_coverage",
".gitlab/ci.sh save_cache",
".gitlab/ci.sh save_test_output",
".gitlab/ci.sh clean",
@@ -5951,7 +5986,8 @@
"paths": [
"ghc-x86_64-linux-alpine3_23-wasm-cross_wasm32-wasi-release+host_fully_static+text_simdutf.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "ghc-hpc-coverage.tar.gz"
],
"reports": {
"junit": "junit.xml"
@@ -5993,7 +6029,7 @@
"variables": {
"BIGNUM_BACKEND": "gmp",
"BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_23-wasm-cross_wasm32-wasi-release+host_fully_static+text_simdutf",
- "BUILD_FLAVOUR": "release+host_fully_static+text_simdutf",
+ "BUILD_FLAVOUR": "release+host_fully_static+text_simdutf+coverage",
"CONFIGURE_ARGS": "--with-intree-gmp --with-system-libffi --enable-strict-ghc-toolchain-check",
"CROSS_STAGE": "2",
"CROSS_TARGET": "wasm32-wasi",
@@ -6006,6 +6042,7 @@
},
"x86_64-linux-alpine3_23-wasm-int_native-cross_wasm32-wasi-release+host_fully_static+text_simdutf": {
"after_script": [
+ ".gitlab/ci.sh save_hpc_coverage",
".gitlab/ci.sh save_cache",
".gitlab/ci.sh save_test_output",
".gitlab/ci.sh clean",
@@ -6017,7 +6054,8 @@
"paths": [
"ghc-x86_64-linux-alpine3_23-wasm-int_native-cross_wasm32-wasi-release+host_fully_static+text_simdutf.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "ghc-hpc-coverage.tar.gz"
],
"reports": {
"junit": "junit.xml"
@@ -6060,7 +6098,7 @@
"variables": {
"BIGNUM_BACKEND": "native",
"BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_23-wasm-int_native-cross_wasm32-wasi-release+host_fully_static+text_simdutf",
- "BUILD_FLAVOUR": "release+host_fully_static+text_simdutf",
+ "BUILD_FLAVOUR": "release+host_fully_static+text_simdutf+coverage",
"CONFIGURE_ARGS": "--with-intree-gmp --with-system-libffi --enable-strict-ghc-toolchain-check",
"CROSS_STAGE": "2",
"CROSS_TARGET": "wasm32-wasi",
@@ -6073,6 +6111,7 @@
},
"x86_64-linux-alpine3_23-wasm-unreg-cross_wasm32-wasi-release+host_fully_static+text_simdutf": {
"after_script": [
+ ".gitlab/ci.sh save_hpc_coverage",
".gitlab/ci.sh save_cache",
".gitlab/ci.sh save_test_output",
".gitlab/ci.sh clean",
@@ -6084,7 +6123,8 @@
"paths": [
"ghc-x86_64-linux-alpine3_23-wasm-unreg-cross_wasm32-wasi-release+host_fully_static+text_simdutf.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "ghc-hpc-coverage.tar.gz"
],
"reports": {
"junit": "junit.xml"
@@ -6127,7 +6167,7 @@
"variables": {
"BIGNUM_BACKEND": "gmp",
"BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_23-wasm-unreg-cross_wasm32-wasi-release+host_fully_static+text_simdutf",
- "BUILD_FLAVOUR": "release+host_fully_static+text_simdutf",
+ "BUILD_FLAVOUR": "release+host_fully_static+text_simdutf+coverage",
"CONFIGURE_ARGS": "--enable-unregisterised --with-intree-gmp --with-system-libffi --enable-strict-ghc-toolchain-check",
"CROSS_STAGE": "2",
"CROSS_TARGET": "wasm32-wasi",
@@ -6140,6 +6180,7 @@
},
"x86_64-linux-deb11-emsdk-closure-int_native-cross_javascript-unknown-ghcjs-validate": {
"after_script": [
+ ".gitlab/ci.sh save_hpc_coverage",
".gitlab/ci.sh save_cache",
".gitlab/ci.sh save_test_output",
".gitlab/ci.sh clean",
@@ -6151,7 +6192,8 @@
"paths": [
"ghc-x86_64-linux-deb11-emsdk-closure-int_native-cross_javascript-unknown-ghcjs-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "ghc-hpc-coverage.tar.gz"
],
"reports": {
"junit": "junit.xml"
@@ -6193,7 +6235,7 @@
"variables": {
"BIGNUM_BACKEND": "native",
"BIN_DIST_NAME": "ghc-x86_64-linux-deb11-emsdk-closure-int_native-cross_javascript-unknown-ghcjs-validate",
- "BUILD_FLAVOUR": "validate",
+ "BUILD_FLAVOUR": "validate+coverage",
"CONFIGURE_ARGS": "--with-intree-gmp --enable-strict-ghc-toolchain-check",
"CONFIGURE_WRAPPER": "emconfigure",
"CROSS_STAGE": "2",
@@ -6206,6 +6248,7 @@
},
"x86_64-linux-deb11-validate": {
"after_script": [
+ ".gitlab/ci.sh save_hpc_coverage",
".gitlab/ci.sh save_cache",
".gitlab/ci.sh save_test_output",
".gitlab/ci.sh clean",
@@ -6217,7 +6260,8 @@
"paths": [
"ghc-x86_64-linux-deb11-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "ghc-hpc-coverage.tar.gz"
],
"reports": {
"junit": "junit.xml"
@@ -6259,7 +6303,7 @@
"variables": {
"BIGNUM_BACKEND": "gmp",
"BIN_DIST_NAME": "ghc-x86_64-linux-deb11-validate",
- "BUILD_FLAVOUR": "validate",
+ "BUILD_FLAVOUR": "validate+coverage",
"CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"RUNTEST_ARGS": "",
@@ -6269,6 +6313,7 @@
},
"x86_64-linux-deb11-validate+debug_info": {
"after_script": [
+ ".gitlab/ci.sh save_hpc_coverage",
".gitlab/ci.sh save_cache",
".gitlab/ci.sh save_test_output",
".gitlab/ci.sh clean",
@@ -6280,7 +6325,8 @@
"paths": [
"ghc-x86_64-linux-deb11-validate+debug_info.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "ghc-hpc-coverage.tar.gz"
],
"reports": {
"junit": "junit.xml"
@@ -6322,7 +6368,7 @@
"variables": {
"BIGNUM_BACKEND": "gmp",
"BIN_DIST_NAME": "ghc-x86_64-linux-deb11-validate+debug_info",
- "BUILD_FLAVOUR": "validate+debug_info",
+ "BUILD_FLAVOUR": "validate+debug_info+coverage",
"CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"RUNTEST_ARGS": "",
@@ -6332,6 +6378,7 @@
},
"x86_64-linux-deb12-validate": {
"after_script": [
+ ".gitlab/ci.sh save_hpc_coverage",
".gitlab/ci.sh save_cache",
".gitlab/ci.sh save_test_output",
".gitlab/ci.sh clean",
@@ -6343,7 +6390,8 @@
"paths": [
"ghc-x86_64-linux-deb12-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "ghc-hpc-coverage.tar.gz"
],
"reports": {
"junit": "junit.xml"
@@ -6385,7 +6433,7 @@
"variables": {
"BIGNUM_BACKEND": "gmp",
"BIN_DIST_NAME": "ghc-x86_64-linux-deb12-validate",
- "BUILD_FLAVOUR": "validate",
+ "BUILD_FLAVOUR": "validate+coverage",
"CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"RUNTEST_ARGS": "",
@@ -6395,6 +6443,7 @@
},
"x86_64-linux-deb13-cross_aarch64-linux-gnu-validate": {
"after_script": [
+ ".gitlab/ci.sh save_hpc_coverage",
".gitlab/ci.sh save_cache",
".gitlab/ci.sh save_test_output",
".gitlab/ci.sh clean",
@@ -6406,7 +6455,8 @@
"paths": [
"ghc-x86_64-linux-deb13-cross_aarch64-linux-gnu-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "ghc-hpc-coverage.tar.gz"
],
"reports": {
"junit": "junit.xml"
@@ -6448,7 +6498,7 @@
"variables": {
"BIGNUM_BACKEND": "gmp",
"BIN_DIST_NAME": "ghc-x86_64-linux-deb13-cross_aarch64-linux-gnu-validate",
- "BUILD_FLAVOUR": "validate",
+ "BUILD_FLAVOUR": "validate+coverage",
"CONFIGURE_ARGS": "--with-intree-gmp --enable-strict-ghc-toolchain-check",
"CROSS_EMULATOR": "qemu-aarch64 -L /usr/aarch64-linux-gnu",
"CROSS_STAGE": "2",
@@ -6461,6 +6511,7 @@
},
"x86_64-linux-deb13-int_native-validate": {
"after_script": [
+ ".gitlab/ci.sh save_hpc_coverage",
".gitlab/ci.sh save_cache",
".gitlab/ci.sh save_test_output",
".gitlab/ci.sh clean",
@@ -6472,7 +6523,8 @@
"paths": [
"ghc-x86_64-linux-deb13-int_native-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "ghc-hpc-coverage.tar.gz"
],
"reports": {
"junit": "junit.xml"
@@ -6514,7 +6566,7 @@
"variables": {
"BIGNUM_BACKEND": "native",
"BIN_DIST_NAME": "ghc-x86_64-linux-deb13-int_native-validate",
- "BUILD_FLAVOUR": "validate",
+ "BUILD_FLAVOUR": "validate+coverage",
"CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"RUNTEST_ARGS": "",
@@ -6524,6 +6576,7 @@
},
"x86_64-linux-deb13-no_tntc-validate": {
"after_script": [
+ ".gitlab/ci.sh save_hpc_coverage",
".gitlab/ci.sh save_cache",
".gitlab/ci.sh save_test_output",
".gitlab/ci.sh clean",
@@ -6535,7 +6588,8 @@
"paths": [
"ghc-x86_64-linux-deb13-no_tntc-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "ghc-hpc-coverage.tar.gz"
],
"reports": {
"junit": "junit.xml"
@@ -6578,7 +6632,7 @@
"variables": {
"BIGNUM_BACKEND": "gmp",
"BIN_DIST_NAME": "ghc-x86_64-linux-deb13-no_tntc-validate",
- "BUILD_FLAVOUR": "validate",
+ "BUILD_FLAVOUR": "validate+coverage",
"CONFIGURE_ARGS": "--disable-tables-next-to-code --enable-strict-ghc-toolchain-check",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"RUNTEST_ARGS": "",
@@ -6588,6 +6642,7 @@
},
"x86_64-linux-deb13-numa-slow-validate": {
"after_script": [
+ ".gitlab/ci.sh save_hpc_coverage",
".gitlab/ci.sh save_cache",
".gitlab/ci.sh save_test_output",
".gitlab/ci.sh clean",
@@ -6599,7 +6654,8 @@
"paths": [
"ghc-x86_64-linux-deb13-numa-slow-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "ghc-hpc-coverage.tar.gz"
],
"reports": {
"junit": "junit.xml"
@@ -6641,7 +6697,7 @@
"variables": {
"BIGNUM_BACKEND": "gmp",
"BIN_DIST_NAME": "ghc-x86_64-linux-deb13-numa-slow-validate",
- "BUILD_FLAVOUR": "slow-validate",
+ "BUILD_FLAVOUR": "slow-validate+coverage",
"CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"ENABLE_NUMA": "1",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
@@ -6652,6 +6708,7 @@
},
"x86_64-linux-deb13-release-perf": {
"after_script": [
+ ".gitlab/ci.sh save_hpc_coverage",
".gitlab/ci.sh save_cache",
".gitlab/ci.sh save_test_output",
".gitlab/ci.sh clean",
@@ -6663,7 +6720,8 @@
"paths": [
"ghc-x86_64-linux-deb13-release.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "ghc-hpc-coverage.tar.gz"
],
"reports": {
"junit": "junit.xml"
@@ -6705,7 +6763,7 @@
"variables": {
"BIGNUM_BACKEND": "gmp",
"BIN_DIST_NAME": "ghc-x86_64-linux-deb13-release",
- "BUILD_FLAVOUR": "release",
+ "BUILD_FLAVOUR": "release+coverage",
"CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"RUNTEST_ARGS": " --config perf_path=perf",
@@ -6715,6 +6773,7 @@
},
"x86_64-linux-deb13-riscv-cross_riscv64-linux-gnu-validate": {
"after_script": [
+ ".gitlab/ci.sh save_hpc_coverage",
".gitlab/ci.sh save_cache",
".gitlab/ci.sh save_test_output",
".gitlab/ci.sh clean",
@@ -6726,7 +6785,8 @@
"paths": [
"ghc-x86_64-linux-deb13-riscv-cross_riscv64-linux-gnu-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "ghc-hpc-coverage.tar.gz"
],
"reports": {
"junit": "junit.xml"
@@ -6768,7 +6828,7 @@
"variables": {
"BIGNUM_BACKEND": "gmp",
"BIN_DIST_NAME": "ghc-x86_64-linux-deb13-riscv-cross_riscv64-linux-gnu-validate",
- "BUILD_FLAVOUR": "validate",
+ "BUILD_FLAVOUR": "validate+coverage",
"CONFIGURE_ARGS": "--with-intree-gmp --enable-strict-ghc-toolchain-check",
"CROSS_EMULATOR": "qemu-riscv64 -L /usr/riscv64-linux-gnu",
"CROSS_STAGE": "2",
@@ -6781,6 +6841,7 @@
},
"x86_64-linux-deb13-unreg-validate": {
"after_script": [
+ ".gitlab/ci.sh save_hpc_coverage",
".gitlab/ci.sh save_cache",
".gitlab/ci.sh save_test_output",
".gitlab/ci.sh clean",
@@ -6792,7 +6853,8 @@
"paths": [
"ghc-x86_64-linux-deb13-unreg-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "ghc-hpc-coverage.tar.gz"
],
"reports": {
"junit": "junit.xml"
@@ -6834,7 +6896,7 @@
"variables": {
"BIGNUM_BACKEND": "gmp",
"BIN_DIST_NAME": "ghc-x86_64-linux-deb13-unreg-validate",
- "BUILD_FLAVOUR": "validate",
+ "BUILD_FLAVOUR": "validate+coverage",
"CONFIGURE_ARGS": "--enable-unregisterised --enable-strict-ghc-toolchain-check",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"RUNTEST_ARGS": "",
@@ -6844,6 +6906,7 @@
},
"x86_64-linux-deb13-validate": {
"after_script": [
+ ".gitlab/ci.sh save_hpc_coverage",
".gitlab/ci.sh save_cache",
".gitlab/ci.sh save_test_output",
".gitlab/ci.sh clean",
@@ -6855,7 +6918,8 @@
"paths": [
"ghc-x86_64-linux-deb13-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "ghc-hpc-coverage.tar.gz"
],
"reports": {
"junit": "junit.xml"
@@ -6897,7 +6961,7 @@
"variables": {
"BIGNUM_BACKEND": "gmp",
"BIN_DIST_NAME": "ghc-x86_64-linux-deb13-validate",
- "BUILD_FLAVOUR": "validate",
+ "BUILD_FLAVOUR": "validate+coverage",
"CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"RUNTEST_ARGS": "",
@@ -6907,6 +6971,7 @@
},
"x86_64-linux-deb13-validate+boot_nonmoving_gc": {
"after_script": [
+ ".gitlab/ci.sh save_hpc_coverage",
".gitlab/ci.sh save_cache",
".gitlab/ci.sh save_test_output",
".gitlab/ci.sh clean",
@@ -6918,7 +6983,8 @@
"paths": [
"ghc-x86_64-linux-deb13-validate+boot_nonmoving_gc.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "ghc-hpc-coverage.tar.gz"
],
"reports": {
"junit": "junit.xml"
@@ -6960,7 +7026,7 @@
"variables": {
"BIGNUM_BACKEND": "gmp",
"BIN_DIST_NAME": "ghc-x86_64-linux-deb13-validate+boot_nonmoving_gc",
- "BUILD_FLAVOUR": "validate+boot_nonmoving_gc",
+ "BUILD_FLAVOUR": "validate+boot_nonmoving_gc+coverage",
"CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"RUNTEST_ARGS": "--way=nonmoving --way=nonmoving_thr --way=nonmoving_thr_sanity",
@@ -6970,6 +7036,7 @@
},
"x86_64-linux-deb13-validate+llvm": {
"after_script": [
+ ".gitlab/ci.sh save_hpc_coverage",
".gitlab/ci.sh save_cache",
".gitlab/ci.sh save_test_output",
".gitlab/ci.sh clean",
@@ -6981,7 +7048,8 @@
"paths": [
"ghc-x86_64-linux-deb13-validate+llvm.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "ghc-hpc-coverage.tar.gz"
],
"reports": {
"junit": "junit.xml"
@@ -7023,7 +7091,7 @@
"variables": {
"BIGNUM_BACKEND": "gmp",
"BIN_DIST_NAME": "ghc-x86_64-linux-deb13-validate+llvm",
- "BUILD_FLAVOUR": "validate+llvm",
+ "BUILD_FLAVOUR": "validate+llvm+coverage",
"CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"RUNTEST_ARGS": "",
@@ -7033,6 +7101,7 @@
},
"x86_64-linux-deb13-validate+thread_sanitizer_cmm": {
"after_script": [
+ ".gitlab/ci.sh save_hpc_coverage",
".gitlab/ci.sh save_cache",
".gitlab/ci.sh save_test_output",
".gitlab/ci.sh clean",
@@ -7044,7 +7113,8 @@
"paths": [
"ghc-x86_64-linux-deb13-validate+thread_sanitizer_cmm.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "ghc-hpc-coverage.tar.gz"
],
"reports": {
"junit": "junit.xml"
@@ -7087,7 +7157,7 @@
"variables": {
"BIGNUM_BACKEND": "gmp",
"BIN_DIST_NAME": "ghc-x86_64-linux-deb13-validate+thread_sanitizer_cmm",
- "BUILD_FLAVOUR": "validate+thread_sanitizer_cmm",
+ "BUILD_FLAVOUR": "validate+thread_sanitizer_cmm+coverage",
"CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"HADRIAN_ARGS": "--docs=none",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
@@ -7099,6 +7169,7 @@
},
"x86_64-linux-deb13-zstd-validate": {
"after_script": [
+ ".gitlab/ci.sh save_hpc_coverage",
".gitlab/ci.sh save_cache",
".gitlab/ci.sh save_test_output",
".gitlab/ci.sh clean",
@@ -7110,7 +7181,8 @@
"paths": [
"ghc-x86_64-linux-deb13-zstd-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "ghc-hpc-coverage.tar.gz"
],
"reports": {
"junit": "junit.xml"
@@ -7152,7 +7224,7 @@
"variables": {
"BIGNUM_BACKEND": "gmp",
"BIN_DIST_NAME": "ghc-x86_64-linux-deb13-zstd-validate",
- "BUILD_FLAVOUR": "validate",
+ "BUILD_FLAVOUR": "validate+coverage",
"CONFIGURE_ARGS": "--enable-ipe-data-compression --enable-strict-ghc-toolchain-check",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"RUNTEST_ARGS": "",
@@ -7162,6 +7234,7 @@
},
"x86_64-linux-fedora43-release": {
"after_script": [
+ ".gitlab/ci.sh save_hpc_coverage",
".gitlab/ci.sh save_cache",
".gitlab/ci.sh save_test_output",
".gitlab/ci.sh clean",
@@ -7173,7 +7246,8 @@
"paths": [
"ghc-x86_64-linux-fedora43-release.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "ghc-hpc-coverage.tar.gz"
],
"reports": {
"junit": "junit.xml"
@@ -7215,7 +7289,7 @@
"variables": {
"BIGNUM_BACKEND": "gmp",
"BIN_DIST_NAME": "ghc-x86_64-linux-fedora43-release",
- "BUILD_FLAVOUR": "release",
+ "BUILD_FLAVOUR": "release+coverage",
"CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"RUNTEST_ARGS": "",
@@ -7225,6 +7299,7 @@
},
"x86_64-linux-fedora43-release-hackage": {
"after_script": [
+ ".gitlab/ci.sh save_hpc_coverage",
".gitlab/ci.sh save_cache",
".gitlab/ci.sh save_test_output",
".gitlab/ci.sh clean",
@@ -7236,7 +7311,8 @@
"paths": [
"ghc-x86_64-linux-fedora43-release.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "ghc-hpc-coverage.tar.gz"
],
"reports": {
"junit": "junit.xml"
@@ -7278,7 +7354,7 @@
"variables": {
"BIGNUM_BACKEND": "gmp",
"BIN_DIST_NAME": "ghc-x86_64-linux-fedora43-release",
- "BUILD_FLAVOUR": "release",
+ "BUILD_FLAVOUR": "release+coverage",
"CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"HADRIAN_ARGS": "--haddock-for-hackage",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
@@ -7289,6 +7365,7 @@
},
"x86_64-linux-fedora43-validate": {
"after_script": [
+ ".gitlab/ci.sh save_hpc_coverage",
".gitlab/ci.sh save_cache",
".gitlab/ci.sh save_test_output",
".gitlab/ci.sh clean",
@@ -7300,7 +7377,8 @@
"paths": [
"ghc-x86_64-linux-fedora43-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "ghc-hpc-coverage.tar.gz"
],
"reports": {
"junit": "junit.xml"
@@ -7342,7 +7420,7 @@
"variables": {
"BIGNUM_BACKEND": "gmp",
"BIN_DIST_NAME": "ghc-x86_64-linux-fedora43-validate",
- "BUILD_FLAVOUR": "validate",
+ "BUILD_FLAVOUR": "validate+coverage",
"CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"RUNTEST_ARGS": "",
@@ -7352,6 +7430,7 @@
},
"x86_64-linux-fedora43-validate+debug_info": {
"after_script": [
+ ".gitlab/ci.sh save_hpc_coverage",
".gitlab/ci.sh save_cache",
".gitlab/ci.sh save_test_output",
".gitlab/ci.sh clean",
@@ -7363,7 +7442,8 @@
"paths": [
"ghc-x86_64-linux-fedora43-validate+debug_info.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "ghc-hpc-coverage.tar.gz"
],
"reports": {
"junit": "junit.xml"
@@ -7405,7 +7485,7 @@
"variables": {
"BIGNUM_BACKEND": "gmp",
"BIN_DIST_NAME": "ghc-x86_64-linux-fedora43-validate+debug_info",
- "BUILD_FLAVOUR": "validate+debug_info",
+ "BUILD_FLAVOUR": "validate+debug_info+coverage",
"CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"RUNTEST_ARGS": "",
@@ -7415,6 +7495,7 @@
},
"x86_64-linux-fedora43-validate+debug_info+ubsan": {
"after_script": [
+ ".gitlab/ci.sh save_hpc_coverage",
".gitlab/ci.sh save_cache",
".gitlab/ci.sh save_test_output",
".gitlab/ci.sh clean",
@@ -7426,7 +7507,8 @@
"paths": [
"ghc-x86_64-linux-fedora43-validate+debug_info+ubsan.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "ghc-hpc-coverage.tar.gz"
],
"reports": {
"junit": "junit.xml"
@@ -7468,7 +7550,7 @@
"variables": {
"BIGNUM_BACKEND": "gmp",
"BIN_DIST_NAME": "ghc-x86_64-linux-fedora43-validate+debug_info+ubsan",
- "BUILD_FLAVOUR": "validate+debug_info+ubsan",
+ "BUILD_FLAVOUR": "validate+debug_info+ubsan+coverage",
"CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"HADRIAN_ARGS": "--docs=none",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
@@ -7480,6 +7562,7 @@
},
"x86_64-linux-rocky8-validate": {
"after_script": [
+ ".gitlab/ci.sh save_hpc_coverage",
".gitlab/ci.sh save_cache",
".gitlab/ci.sh save_test_output",
".gitlab/ci.sh clean",
@@ -7491,7 +7574,8 @@
"paths": [
"ghc-x86_64-linux-rocky8-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "ghc-hpc-coverage.tar.gz"
],
"reports": {
"junit": "junit.xml"
@@ -7533,7 +7617,7 @@
"variables": {
"BIGNUM_BACKEND": "gmp",
"BIN_DIST_NAME": "ghc-x86_64-linux-rocky8-validate",
- "BUILD_FLAVOUR": "validate",
+ "BUILD_FLAVOUR": "validate+coverage",
"CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"RUNTEST_ARGS": "",
@@ -7543,6 +7627,7 @@
},
"x86_64-linux-ubuntu22_04-validate": {
"after_script": [
+ ".gitlab/ci.sh save_hpc_coverage",
".gitlab/ci.sh save_cache",
".gitlab/ci.sh save_test_output",
".gitlab/ci.sh clean",
@@ -7554,7 +7639,8 @@
"paths": [
"ghc-x86_64-linux-ubuntu22_04-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "ghc-hpc-coverage.tar.gz"
],
"reports": {
"junit": "junit.xml"
@@ -7596,7 +7682,7 @@
"variables": {
"BIGNUM_BACKEND": "gmp",
"BIN_DIST_NAME": "ghc-x86_64-linux-ubuntu22_04-validate",
- "BUILD_FLAVOUR": "validate",
+ "BUILD_FLAVOUR": "validate+coverage",
"CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"RUNTEST_ARGS": "",
@@ -7606,6 +7692,7 @@
},
"x86_64-linux-ubuntu24_04-loongarch-cross_loongarch64-linux-gnu-validate": {
"after_script": [
+ ".gitlab/ci.sh save_hpc_coverage",
".gitlab/ci.sh save_cache",
".gitlab/ci.sh save_test_output",
".gitlab/ci.sh clean",
@@ -7617,7 +7704,8 @@
"paths": [
"ghc-x86_64-linux-ubuntu24_04-loongarch-cross_loongarch64-linux-gnu-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "ghc-hpc-coverage.tar.gz"
],
"reports": {
"junit": "junit.xml"
@@ -7659,7 +7747,7 @@
"variables": {
"BIGNUM_BACKEND": "gmp",
"BIN_DIST_NAME": "ghc-x86_64-linux-ubuntu24_04-loongarch-cross_loongarch64-linux-gnu-validate",
- "BUILD_FLAVOUR": "validate",
+ "BUILD_FLAVOUR": "validate+coverage",
"CONFIGURE_ARGS": "--with-intree-gmp --enable-strict-ghc-toolchain-check",
"CROSS_EMULATOR": "qemu-loongarch64 -L /usr/loongarch64-linux-gnu",
"CROSS_STAGE": "2",
@@ -7672,6 +7760,7 @@
},
"x86_64-linux-ubuntu24_04-validate": {
"after_script": [
+ ".gitlab/ci.sh save_hpc_coverage",
".gitlab/ci.sh save_cache",
".gitlab/ci.sh save_test_output",
".gitlab/ci.sh clean",
@@ -7683,7 +7772,8 @@
"paths": [
"ghc-x86_64-linux-ubuntu24_04-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "ghc-hpc-coverage.tar.gz"
],
"reports": {
"junit": "junit.xml"
@@ -7725,7 +7815,7 @@
"variables": {
"BIGNUM_BACKEND": "gmp",
"BIN_DIST_NAME": "ghc-x86_64-linux-ubuntu24_04-validate",
- "BUILD_FLAVOUR": "validate",
+ "BUILD_FLAVOUR": "validate+coverage",
"CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"RUNTEST_ARGS": "",
@@ -7735,6 +7825,7 @@
},
"x86_64-windows-int_native-validate": {
"after_script": [
+ "bash .gitlab/ci.sh save_hpc_coverage",
"bash .gitlab/ci.sh save_cache",
"bash .gitlab/ci.sh save_test_output",
"bash .gitlab/ci.sh clean"
@@ -7745,7 +7836,8 @@
"paths": [
"ghc-x86_64-windows-int_native-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "ghc-hpc-coverage.tar.gz"
],
"reports": {
"junit": "junit.xml"
@@ -7783,7 +7875,7 @@
"variables": {
"BIGNUM_BACKEND": "native",
"BIN_DIST_NAME": "ghc-x86_64-windows-int_native-validate",
- "BUILD_FLAVOUR": "validate",
+ "BUILD_FLAVOUR": "validate+coverage",
"CABAL_INSTALL_VERSION": "3.14.2.0",
"CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"FETCH_GHC_VERSION": "9.10.3",
@@ -7798,6 +7890,7 @@
},
"x86_64-windows-validate": {
"after_script": [
+ "bash .gitlab/ci.sh save_hpc_coverage",
"bash .gitlab/ci.sh save_cache",
"bash .gitlab/ci.sh save_test_output",
"bash .gitlab/ci.sh clean"
@@ -7808,7 +7901,8 @@
"paths": [
"ghc-x86_64-windows-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "ghc-hpc-coverage.tar.gz"
],
"reports": {
"junit": "junit.xml"
@@ -7846,7 +7940,7 @@
"variables": {
"BIGNUM_BACKEND": "gmp",
"BIN_DIST_NAME": "ghc-x86_64-windows-validate",
- "BUILD_FLAVOUR": "validate",
+ "BUILD_FLAVOUR": "validate+coverage",
"CABAL_INSTALL_VERSION": "3.14.2.0",
"CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
"FETCH_GHC_VERSION": "9.10.3",
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/056ed24f0d2794f377de86dce5c6f9c…
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/056ed24f0d2794f377de86dce5c6f9c…
You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help
1
0