summaryrefslogtreecommitdiff
path: root/testsuite/tests/stranal
diff options
context:
space:
mode:
authorSebastian Graf <sebastian.graf@kit.edu>2021-05-04 23:00:02 +0200
committerMarge Bot <ben+marge-bot@smart-cactus.org>2021-09-30 00:56:30 -0400
commitc261f2207cf85c8770dc46fcfc46e9b1ddb49589 (patch)
tree8da18607d7f16ec3c2d0a79e24637bea80956fc4 /testsuite/tests/stranal
parent594ee2f48f5b8affc85462543c54612ad45802bf (diff)
downloadhaskell-c261f2207cf85c8770dc46fcfc46e9b1ddb49589.tar.gz
Nested CPR light unleashed (#18174)
This patch enables worker/wrapper for nested constructed products, as described in `Note [Nested CPR]`. The machinery for expressing Nested CPR was already there, since !5054. Worker/wrapper is equipped to exploit Nested CPR annotations since !5338. CPR analysis already handles applications in batches since !5753. This patch just needs to flip a few more switches: 1. In `cprTransformDataConWork`, we need to look at the field expressions and their `CprType`s to see whether the evaluation of the expressions terminates quickly (= is in HNF) or if they are put in strict fields. If that is the case, then we retain their CPR info and may unbox nestedly later on. More details in `Note [Nested CPR]`. 2. Enable nested `ConCPR` signatures in `GHC.Types.Cpr`. 3. In the `asConCpr` call in `GHC.Core.Opt.WorkWrap.Utils`, pass CPR info of fields to the `Unbox`. 4. Instead of giving CPR signatures to DataCon workers and wrappers, we now have `cprTransformDataConWork` for workers and treat wrappers by analysing their unfolding. As a result, the code from GHC.Types.Id.Make went away completely. 5. I deactivated worker/wrappering for recursive DataCons and wrote a function `isRecDataCon` to detect them. We really don't want to give `repeat` or `replicate` the Nested CPR property. See Note [CPR for recursive data structures] for which kind of recursive DataCons we target. 6. Fix a couple of tests and their outputs. I also documented that CPR can destroy sharing and lead to asymptotic increase in allocations (which is tracked by #13331/#19326) in `Note [CPR for data structures can destroy sharing]`. Nofib results: ``` -------------------------------------------------------------------------------- Program Allocs Instrs -------------------------------------------------------------------------------- ben-raytrace -3.1% -0.4% binary-trees +0.8% -2.9% digits-of-e2 +5.8% +1.2% event +0.8% -2.1% fannkuch-redux +0.0% -1.4% fish 0.0% -1.5% gamteb -1.4% -0.3% mkhprog +1.4% +0.8% multiplier +0.0% -1.9% pic -0.6% -0.1% reptile -20.9% -17.8% wave4main +4.8% +0.4% x2n1 -100.0% -7.6% -------------------------------------------------------------------------------- Min -95.0% -17.8% Max +5.8% +1.2% Geometric Mean -2.9% -0.4% ``` The huge wins in x2n1 (loopy list) and reptile (see #19970) are due to refraining from unboxing (:). Other benchmarks like digits-of-e2 or wave4main regress because of that. Ultimately there are no great improvements due to Nested CPR alone, but at least it's a win. Binary sizes decrease by 0.6%. There are a significant number of metric decreases. The most notable ones (>1%): ``` ManyAlternatives(normal) ghc/alloc 771656002.7 762187472.0 -1.2% ManyConstructors(normal) ghc/alloc 4191073418.7 4114369216.0 -1.8% MultiLayerModules(normal) ghc/alloc 3095678333.3 3128720704.0 +1.1% PmSeriesG(normal) ghc/alloc 50096429.3 51495664.0 +2.8% PmSeriesS(normal) ghc/alloc 63512989.3 64681600.0 +1.8% PmSeriesV(normal) ghc/alloc 62575424.0 63767208.0 +1.9% T10547(normal) ghc/alloc 29347469.3 29944240.0 +2.0% T11303b(normal) ghc/alloc 46018752.0 47367576.0 +2.9% T12150(optasm) ghc/alloc 81660890.7 82547696.0 +1.1% T12234(optasm) ghc/alloc 59451253.3 60357952.0 +1.5% T12545(normal) ghc/alloc 1705216250.7 1751278952.0 +2.7% T12707(normal) ghc/alloc 981000472.0 968489800.0 -1.3% GOOD T13056(optasm) ghc/alloc 389322664.0 372495160.0 -4.3% GOOD T13253(normal) ghc/alloc 337174229.3 341954576.0 +1.4% T13701(normal) ghc/alloc 2381455173.3 2439790328.0 +2.4% BAD T14052(ghci) ghc/alloc 2162530642.7 2139108784.0 -1.1% T14683(normal) ghc/alloc 3049744728.0 2977535064.0 -2.4% GOOD T14697(normal) ghc/alloc 362980213.3 369304512.0 +1.7% T15164(normal) ghc/alloc 1323102752.0 1307480600.0 -1.2% T15304(normal) ghc/alloc 1304607429.3 1291024568.0 -1.0% T16190(normal) ghc/alloc 281450410.7 284878048.0 +1.2% T16577(normal) ghc/alloc 7984960789.3 7811668768.0 -2.2% GOOD T17516(normal) ghc/alloc 1171051192.0 1153649664.0 -1.5% T17836(normal) ghc/alloc 1115569746.7 1098197592.0 -1.6% T17836b(normal) ghc/alloc 54322597.3 55518216.0 +2.2% T17977(normal) ghc/alloc 47071754.7 48403408.0 +2.8% T17977b(normal) ghc/alloc 42579133.3 43977392.0 +3.3% T18923(normal) ghc/alloc 71764237.3 72566240.0 +1.1% T1969(normal) ghc/alloc 784821002.7 773971776.0 -1.4% GOOD T3294(normal) ghc/alloc 1634913973.3 1614323584.0 -1.3% GOOD T4801(normal) ghc/alloc 295619648.0 292776440.0 -1.0% T5321FD(normal) ghc/alloc 278827858.7 276067280.0 -1.0% T5631(normal) ghc/alloc 586618202.7 577579960.0 -1.5% T5642(normal) ghc/alloc 494923048.0 487927208.0 -1.4% T5837(normal) ghc/alloc 37758061.3 39261608.0 +4.0% T9020(optasm) ghc/alloc 257362077.3 254672416.0 -1.0% T9198(normal) ghc/alloc 49313365.3 50603936.0 +2.6% BAD T9233(normal) ghc/alloc 704944258.7 685692712.0 -2.7% GOOD T9630(normal) ghc/alloc 1476621560.0 1455192784.0 -1.5% T9675(optasm) ghc/alloc 443183173.3 433859696.0 -2.1% GOOD T9872a(normal) ghc/alloc 1720926653.3 1693190072.0 -1.6% GOOD T9872b(normal) ghc/alloc 2185618061.3 2162277568.0 -1.1% GOOD T9872c(normal) ghc/alloc 1765842405.3 1733618088.0 -1.8% GOOD TcPlugin_RewritePerf(normal) ghc/alloc 2388882730.7 2365504696.0 -1.0% WWRec(normal) ghc/alloc 607073186.7 597512216.0 -1.6% T9203(normal) run/alloc 107284064.0 102881832.0 -4.1% haddock.Cabal(normal) run/alloc 24025329589.3 23768382560.0 -1.1% haddock.base(normal) run/alloc 25660521653.3 25370321824.0 -1.1% haddock.compiler(normal) run/alloc 74064171706.7 73358712280.0 -1.0% ``` The biggest exception to the rule is T13701 which seems to fluctuate as usual (not unlike T12545). T14697 has a similar quality, being a generated multi-module test. T5837 is small enough that it similarly doesn't measure anything significant besides module loading overhead. T13253 simply does one additional round of Simplification due to Nested CPR. There are also some apparent regressions in T9198, T12234 and PmSeriesG that we (@mpickering and I) were simply unable to reproduce locally. @mpickering tried to run the CI script in a local Docker container and actually found that T9198 and PmSeriesG *improved*. In MRs that were rebased on top this one, like !4229, I did not experience such increases. Let's not get hung up on these regression tests, they were meant to test for asymptotic regressions. The build-cabal test improves by 1.2% in -O0. Metric Increase: T10421 T12234 T12545 T13035 T13056 T13701 T14697 T18923 T5837 T9198 Metric Decrease: ManyConstructors T12545 T12707 T13056 T14683 T16577 T18223 T1969 T3294 T9203 T9233 T9675 T9872a T9872b T9872c T9961 TcPlugin_RewritePerf
Diffstat (limited to 'testsuite/tests/stranal')
-rw-r--r--testsuite/tests/stranal/should_compile/T18894.stderr109
-rw-r--r--testsuite/tests/stranal/should_compile/T18903.stderr40
-rw-r--r--testsuite/tests/stranal/sigs/T13380f.stderr12
3 files changed, 91 insertions, 70 deletions
diff --git a/testsuite/tests/stranal/should_compile/T18894.stderr b/testsuite/tests/stranal/should_compile/T18894.stderr
index cb5b344d4e..3d3ff81440 100644
--- a/testsuite/tests/stranal/should_compile/T18894.stderr
+++ b/testsuite/tests/stranal/should_compile/T18894.stderr
@@ -1,7 +1,7 @@
==================== Demand analysis ====================
Result size of Demand analysis
- = {terms: 177, types: 95, coercions: 0, joins: 0/0}
+ = {terms: 195, types: 95, coercions: 0, joins: 0/2}
-- RHS size: {terms: 1, types: 0, coercions: 0, joins: 0/0}
$trModule :: GHC.Prim.Addr#
@@ -45,14 +45,14 @@ lvl :: Int
WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 10}]
lvl = GHC.Types.I# 0#
--- RHS size: {terms: 36, types: 15, coercions: 0, joins: 0/0}
+-- RHS size: {terms: 45, types: 15, coercions: 0, joins: 0/1}
g2 [InlPrag=NOINLINE, Dmd=LCL(C1(P(MP(L),1P(L))))]
:: Int -> Int -> (Int, Int)
[LclId,
Arity=2,
Str=<LP(L)><1P(1L)>,
Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
- WorkFree=True, Expandable=True, Guidance=IF_ARGS [20 20] 161 20}]
+ WorkFree=True, Expandable=True, Guidance=IF_ARGS [20 20] 126 20}]
g2
= \ (m [Dmd=LP(L)] :: Int) (ds [Dmd=1P(1L)] :: Int) ->
case ds of { GHC.Types.I# ds [Dmd=1L] ->
@@ -61,11 +61,18 @@ g2
(case m of { GHC.Types.I# y -> GHC.Types.I# (GHC.Prim.*# 2# y) },
case ds of wild {
__DEFAULT ->
- case GHC.Classes.divInt# 2# wild of ww4 { __DEFAULT ->
- GHC.Types.I# ww4
+ let {
+ c1# :: GHC.Prim.Int#
+ [LclId,
+ Unf=Unf{Src=<vanilla>, TopLvl=False, Value=False, ConLike=False,
+ WorkFree=False, Expandable=False, Guidance=IF_ARGS [] 2 0}]
+ c1# = GHC.Prim.andI# 1# (GHC.Prim.<# wild 0#) } in
+ case GHC.Prim.quotInt# (GHC.Prim.-# 2# c1#) wild of wild
+ { __DEFAULT ->
+ GHC.Types.I# (GHC.Prim.-# wild c1#)
};
-1# -> GHC.Types.I# -2#;
- 0# -> case GHC.Real.divZeroError of wild [Dmd=B] { }
+ 0# -> GHC.Real.divZeroError @Int
});
1# -> (m, lvl)
}
@@ -139,13 +146,13 @@ lvl :: (Int, Int)
WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 10}]
lvl = (lvl, lvl)
--- RHS size: {terms: 30, types: 10, coercions: 0, joins: 0/0}
+-- RHS size: {terms: 39, types: 10, coercions: 0, joins: 0/1}
g1 [InlPrag=NOINLINE, Dmd=LCL(P(LP(L),LP(L)))] :: Int -> (Int, Int)
[LclId,
Arity=1,
Str=<1P(1L)>,
Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
- WorkFree=True, Expandable=True, Guidance=IF_ARGS [20] 141 10}]
+ WorkFree=True, Expandable=True, Guidance=IF_ARGS [20] 106 10}]
g1
= \ (ds [Dmd=1P(1L)] :: Int) ->
case ds of { GHC.Types.I# ds [Dmd=1L] ->
@@ -154,11 +161,18 @@ g1
(GHC.Types.I# (GHC.Prim.*# 2# ds),
case ds of wild {
__DEFAULT ->
- case GHC.Classes.divInt# 2# wild of ww4 { __DEFAULT ->
- GHC.Types.I# ww4
+ let {
+ c1# :: GHC.Prim.Int#
+ [LclId,
+ Unf=Unf{Src=<vanilla>, TopLvl=False, Value=False, ConLike=False,
+ WorkFree=False, Expandable=False, Guidance=IF_ARGS [] 2 0}]
+ c1# = GHC.Prim.andI# 1# (GHC.Prim.<# wild 0#) } in
+ case GHC.Prim.quotInt# (GHC.Prim.-# 2# c1#) wild of wild
+ { __DEFAULT ->
+ GHC.Types.I# (GHC.Prim.-# wild c1#)
};
-1# -> GHC.Types.I# -2#;
- 0# -> case GHC.Real.divZeroError of wild [Dmd=B] { }
+ 0# -> GHC.Real.divZeroError @Int
});
1# -> lvl
}
@@ -205,7 +219,7 @@ h1
==================== Demand analysis ====================
Result size of Demand analysis
- = {terms: 171, types: 118, coercions: 0, joins: 0/0}
+ = {terms: 183, types: 115, coercions: 0, joins: 0/2}
-- RHS size: {terms: 1, types: 0, coercions: 0, joins: 0/0}
$trModule :: GHC.Prim.Addr#
@@ -256,26 +270,33 @@ lvl :: Int
WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 10}]
lvl = GHC.Types.I# -2#
--- RHS size: {terms: 32, types: 17, coercions: 0, joins: 0/0}
+-- RHS size: {terms: 41, types: 17, coercions: 0, joins: 0/1}
$wg2 [InlPrag=NOINLINE, Dmd=LCL(C1(P(MP(L),1P(L))))]
:: Int -> GHC.Prim.Int# -> (# Int, Int #)
[LclId,
Arity=2,
Str=<LP(L)><1L>,
Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
- WorkFree=True, Expandable=True, Guidance=IF_ARGS [20 30] 121 20}]
+ WorkFree=True, Expandable=True, Guidance=IF_ARGS [20 30] 86 20}]
$wg2
= \ (w [Dmd=LP(L)] :: Int) (ww [Dmd=1L] :: GHC.Prim.Int#) ->
- case ww of ds {
+ case ww of ds [Dmd=ML] {
__DEFAULT ->
(# case w of { GHC.Types.I# y -> GHC.Types.I# (GHC.Prim.*# 2# y) },
- case ds of {
+ case ds of wild {
__DEFAULT ->
- case GHC.Classes.divInt# 2# ds of ww4 { __DEFAULT ->
- GHC.Types.I# ww4
+ let {
+ c1# :: GHC.Prim.Int#
+ [LclId,
+ Unf=Unf{Src=<vanilla>, TopLvl=False, Value=False, ConLike=False,
+ WorkFree=False, Expandable=False, Guidance=IF_ARGS [] 2 0}]
+ c1# = GHC.Prim.andI# 1# (GHC.Prim.<# wild 0#) } in
+ case GHC.Prim.quotInt# (GHC.Prim.-# 2# c1#) wild of wild
+ { __DEFAULT ->
+ GHC.Types.I# (GHC.Prim.-# wild c1#)
};
-1# -> lvl;
- 0# -> case GHC.Real.divZeroError of wild [Dmd=B] { }
+ 0# -> GHC.Real.divZeroError @Int
} #);
1# -> (# w, lvl #)
}
@@ -328,59 +349,57 @@ h2
= \ (w [Dmd=1P(1L)] :: Int) ->
case w of { GHC.Types.I# ww [Dmd=1L] -> $wh2 ww }
--- RHS size: {terms: 2, types: 0, coercions: 0, joins: 0/0}
-lvl :: Int
-[LclId,
- Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
- WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 10}]
-lvl = GHC.Types.I# 15#
-
--- RHS size: {terms: 28, types: 14, coercions: 0, joins: 0/0}
-$wg1 [InlPrag=NOINLINE, Dmd=LCL(P(LP(L),LP(L)))]
- :: GHC.Prim.Int# -> (# Int, Int #)
+-- RHS size: {terms: 36, types: 14, coercions: 0, joins: 0/1}
+$wg1 [InlPrag=NOINLINE, Dmd=LCL(P(L,LP(L)))]
+ :: GHC.Prim.Int# -> (# GHC.Prim.Int#, Int #)
[LclId,
Arity=1,
Str=<1L>,
Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
- WorkFree=True, Expandable=True, Guidance=IF_ARGS [30] 111 20}]
+ WorkFree=True, Expandable=True, Guidance=IF_ARGS [30] 66 20}]
$wg1
= \ (ww [Dmd=1L] :: GHC.Prim.Int#) ->
case ww of ds {
__DEFAULT ->
- (# GHC.Types.I# (GHC.Prim.*# 2# ds),
- case ds of {
+ (# GHC.Prim.*# 2# ds,
+ case ds of wild {
__DEFAULT ->
- case GHC.Classes.divInt# 2# ds of ww4 { __DEFAULT ->
- GHC.Types.I# ww4
+ let {
+ c1# :: GHC.Prim.Int#
+ [LclId,
+ Unf=Unf{Src=<vanilla>, TopLvl=False, Value=False, ConLike=False,
+ WorkFree=False, Expandable=False, Guidance=IF_ARGS [] 2 0}]
+ c1# = GHC.Prim.andI# 1# (GHC.Prim.<# wild 0#) } in
+ case GHC.Prim.quotInt# (GHC.Prim.-# 2# c1#) wild of wild
+ { __DEFAULT ->
+ GHC.Types.I# (GHC.Prim.-# wild c1#)
};
-1# -> lvl;
- 0# -> case GHC.Real.divZeroError of wild [Dmd=B] { }
+ 0# -> GHC.Real.divZeroError @Int
} #);
- 1# -> (# lvl, lvl #)
+ 1# -> (# 15#, lvl #)
}
--- RHS size: {terms: 7, types: 9, coercions: 0, joins: 0/0}
+-- RHS size: {terms: 8, types: 9, coercions: 0, joins: 0/0}
lvl :: (Int, Int)
[LclId,
Unf=Unf{Src=<vanilla>, TopLvl=True, Value=False, ConLike=False,
- WorkFree=False, Expandable=False, Guidance=IF_ARGS [] 40 10}]
-lvl = case $wg1 2# of { (# ww, ww #) -> (ww, ww) }
+ WorkFree=False, Expandable=False, Guidance=IF_ARGS [] 50 10}]
+lvl = case $wg1 2# of { (# ww, ww #) -> (GHC.Types.I# ww, ww) }
--- RHS size: {terms: 25, types: 18, coercions: 0, joins: 0/0}
+-- RHS size: {terms: 22, types: 16, coercions: 0, joins: 0/0}
$wh1 [InlPrag=[2]] :: GHC.Prim.Int# -> Int
[LclId,
Arity=1,
Str=<1L>,
Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
- WorkFree=True, Expandable=True, Guidance=IF_ARGS [50] 101 10}]
+ WorkFree=True, Expandable=True, Guidance=IF_ARGS [50] 91 10}]
$wh1
= \ (ww [Dmd=1L] :: GHC.Prim.Int#) ->
case ww of ds [Dmd=ML] {
__DEFAULT ->
- case $wg1 ds of { (# ww [Dmd=1P(L)], ww [Dmd=1P(L)] #) ->
- case ww of { GHC.Types.I# x ->
- case ww of { GHC.Types.I# y -> GHC.Types.I# (GHC.Prim.+# x y) }
- }
+ case $wg1 ds of { (# ww, ww [Dmd=1P(L)] #) ->
+ case ww of { GHC.Types.I# y -> GHC.Types.I# (GHC.Prim.+# ww y) }
};
1# -> lvl;
2# -> case lvl of { (ds1 [Dmd=A], y [Dmd=1L]) -> y }
diff --git a/testsuite/tests/stranal/should_compile/T18903.stderr b/testsuite/tests/stranal/should_compile/T18903.stderr
index c909bd0e0e..63e95ea124 100644
--- a/testsuite/tests/stranal/should_compile/T18903.stderr
+++ b/testsuite/tests/stranal/should_compile/T18903.stderr
@@ -1,7 +1,7 @@
==================== Tidy Core ====================
Result size of Tidy Core
- = {terms: 84, types: 54, coercions: 0, joins: 0/1}
+ = {terms: 88, types: 52, coercions: 0, joins: 0/2}
-- RHS size: {terms: 1, types: 0, coercions: 0, joins: 0/0}
T18903.$trModule4 :: GHC.Prim.Addr#
@@ -53,43 +53,46 @@ T18903.h2 :: Int
WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 10}]
T18903.h2 = GHC.Types.I# -2#
--- RHS size: {terms: 56, types: 40, coercions: 0, joins: 0/1}
+-- RHS size: {terms: 60, types: 38, coercions: 0, joins: 0/2}
T18903.$wh [InlPrag=[2]] :: GHC.Prim.Int# -> Int
[GblId,
Arity=1,
Str=<SL>,
Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
- WorkFree=True, Expandable=True, Guidance=IF_ARGS [70] 262 10}]
+ WorkFree=True, Expandable=True, Guidance=IF_ARGS [70] 197 10}]
T18903.$wh
= \ (ww :: GHC.Prim.Int#) ->
let {
- $wg [InlPrag=NOINLINE, Dmd=MCM(P(MP(L),1P(L)))]
- :: GHC.Prim.Int# -> (# Int, Int #)
+ $wg [InlPrag=NOINLINE, Dmd=MCM(P(L,1P(L)))]
+ :: GHC.Prim.Int# -> (# GHC.Prim.Int#, Int #)
[LclId, Arity=1, Str=<1L>, Unf=OtherCon []]
$wg
= \ (ww1 [OS=OneShot] :: GHC.Prim.Int#) ->
case ww1 of ds {
__DEFAULT ->
- (# GHC.Types.I# (GHC.Prim.*# 2# ds),
- case ds of {
+ (# GHC.Prim.*# 2# ds,
+ case ds of wild {
__DEFAULT ->
- case GHC.Classes.divInt# 2# ds of ww4 { __DEFAULT ->
- GHC.Types.I# ww4
+ let {
+ c1# :: GHC.Prim.Int#
+ [LclId]
+ c1# = GHC.Prim.andI# 1# (GHC.Prim.<# wild 0#) } in
+ case GHC.Prim.quotInt# (GHC.Prim.-# 2# c1#) wild of wild1
+ { __DEFAULT ->
+ GHC.Types.I# (GHC.Prim.-# wild1 c1#)
};
-1# -> T18903.h2;
- 0# -> case GHC.Real.divZeroError of wild1 { }
+ 0# -> GHC.Real.divZeroError @Int
} #);
- 1# -> (# GHC.Types.I# ww, T18903.h1 #)
+ 1# -> (# ww, T18903.h1 #)
} } in
case ww of ds {
__DEFAULT ->
- case $wg ds of { (# ww2, ww3 #) ->
- case ww2 of { GHC.Types.I# x ->
- case ww3 of { GHC.Types.I# y -> GHC.Types.I# (GHC.Prim.+# x y) }
- }
+ case $wg ds of { (# ww1, ww2 #) ->
+ case ww2 of { GHC.Types.I# y -> GHC.Types.I# (GHC.Prim.+# ww1 y) }
};
1# -> T18903.h1;
- 2# -> case $wg 2# of { (# ww2, ww3 #) -> ww3 }
+ 2# -> case $wg 2# of { (# ww1, ww2 #) -> ww2 }
}
-- RHS size: {terms: 6, types: 3, coercions: 0, joins: 0/0}
@@ -101,9 +104,8 @@ h [InlPrag=[2]] :: Int -> Int
WorkFree=True, Expandable=True,
Guidance=ALWAYS_IF(arity=1,unsat_ok=True,boring_ok=False)
Tmpl= \ (w [Occ=Once1!] :: Int) ->
- case w of { GHC.Types.I# ww1 [Occ=Once1] -> T18903.$wh ww1 }}]
-h = \ (w :: Int) ->
- case w of { GHC.Types.I# ww1 -> T18903.$wh ww1 }
+ case w of { GHC.Types.I# ww [Occ=Once1] -> T18903.$wh ww }}]
+h = \ (w :: Int) -> case w of { GHC.Types.I# ww -> T18903.$wh ww }
diff --git a/testsuite/tests/stranal/sigs/T13380f.stderr b/testsuite/tests/stranal/sigs/T13380f.stderr
index e1b6597223..f4caa18a11 100644
--- a/testsuite/tests/stranal/sigs/T13380f.stderr
+++ b/testsuite/tests/stranal/sigs/T13380f.stderr
@@ -12,12 +12,12 @@ T13380f.unsafeCall: <L>
==================== Cpr signatures ====================
T13380f.$trModule:
-T13380f.f:
-T13380f.g:
-T13380f.h:
-T13380f.interruptibleCall:
-T13380f.safeCall:
-T13380f.unsafeCall:
+T13380f.f: 1(, 1)
+T13380f.g: 1(, 1)
+T13380f.h: 1(, 1)
+T13380f.interruptibleCall: 1(, 1)
+T13380f.safeCall: 1(, 1)
+T13380f.unsafeCall: 1(, 1)