[Git][ghc/ghc][wip/refactor-demand] More accepted test outputs
Sebastian Graf
gitlab at gitlab.haskell.org
Thu Oct 29 17:11:07 UTC 2020
Sebastian Graf pushed to branch wip/refactor-demand at Glasgow Haskell Compiler / GHC
Commits:
a2fbe3c9 by Sebastian Graf at 2020-10-29T18:09:22+01:00
More accepted test outputs
- - - - -
12 changed files:
- testsuite/tests/deSugar/should_compile/T2431.stderr
- testsuite/tests/simplCore/should_compile/T13143.stderr
- testsuite/tests/simplCore/should_compile/T13543.stderr
- testsuite/tests/simplCore/should_compile/T18013.stderr
- testsuite/tests/simplCore/should_compile/T18328.stderr
- testsuite/tests/simplCore/should_compile/noinline01.stderr
- testsuite/tests/simplCore/should_compile/spec-inline.stderr
- testsuite/tests/stranal/should_compile/T10694.stderr
- testsuite/tests/stranal/sigs/CaseBinderCPR.stderr
- testsuite/tests/stranal/sigs/DmdAnalGADTs.stderr
- testsuite/tests/stranal/sigs/HyperStrUse.stderr
- testsuite/tests/stranal/sigs/T13380f.stderr
Changes:
=====================================
testsuite/tests/deSugar/should_compile/T2431.stderr
=====================================
@@ -17,7 +17,7 @@ T2431.$WRefl
-- RHS size: {terms: 4, types: 8, coercions: 0, joins: 0/0}
absurd :: forall a. (Int :~: Bool) -> a
-[GblId, Arity=1, Str=<L,U>b, Cpr=b, Unf=OtherCon []]
+[GblId, Arity=1, Str=<U>b, Cpr=b, Unf=OtherCon []]
absurd = \ (@a) (x :: Int :~: Bool) -> case x of { }
-- RHS size: {terms: 1, types: 0, coercions: 0, joins: 0/0}
=====================================
testsuite/tests/simplCore/should_compile/T13143.stderr
=====================================
@@ -65,43 +65,47 @@ lvl :: Int
lvl = T13143.$wf @Int GHC.Prim.(##)
Rec {
--- RHS size: {terms: 31, types: 9, coercions: 0, joins: 0/0}
+-- RHS size: {terms: 28, types: 7, coercions: 0, joins: 0/0}
T13143.$wg [InlPrag=[2], Occ=LoopBreaker]
- :: Bool -> Bool -> Int -> GHC.Prim.Int#
-[GblId, Arity=3, Str=<SU><U><U(U)>, Unf=OtherCon []]
+ :: Bool -> Bool -> GHC.Prim.Int# -> GHC.Prim.Int#
+[GblId, Arity=3, Str=<SU><SU><U>, Unf=OtherCon []]
T13143.$wg
- = \ (w :: Bool) (w1 :: Bool) (w2 :: Int) ->
+ = \ (w :: Bool) (w1 :: Bool) (ww :: GHC.Prim.Int#) ->
case w of {
False ->
case w1 of {
- False -> T13143.$wg GHC.Types.False GHC.Types.True w2;
- True -> case w2 of { GHC.Types.I# x -> GHC.Prim.+# x 1# }
+ False -> T13143.$wg GHC.Types.False GHC.Types.True ww;
+ True -> GHC.Prim.+# ww 1#
};
True ->
case w1 of {
- False -> T13143.$wg GHC.Types.True GHC.Types.True w2;
+ False -> T13143.$wg GHC.Types.True GHC.Types.True ww;
True -> case lvl of wild2 { }
}
}
end Rec }
--- RHS size: {terms: 11, types: 4, coercions: 0, joins: 0/0}
+-- RHS size: {terms: 14, types: 6, coercions: 0, joins: 0/0}
g [InlPrag=[2]] :: Bool -> Bool -> Int -> Int
[GblId,
Arity=3,
- Str=<SU><U><U(U)>,
+ Str=<SU><SU><S(U)>,
Cpr=m1,
Unf=Unf{Src=InlineStable, TopLvl=True, Value=True, ConLike=True,
WorkFree=True, Expandable=True,
Guidance=ALWAYS_IF(arity=3,unsat_ok=True,boring_ok=False)
Tmpl= \ (w [Occ=Once1] :: Bool)
(w1 [Occ=Once1] :: Bool)
- (w2 [Occ=Once1] :: Int) ->
- case T13143.$wg w w1 w2 of ww [Occ=Once1] { __DEFAULT ->
- GHC.Types.I# ww
+ (w2 [Occ=Once1!] :: Int) ->
+ case w2 of { GHC.Types.I# ww1 [Occ=Once1] ->
+ case T13143.$wg w w1 ww1 of ww2 [Occ=Once1] { __DEFAULT ->
+ GHC.Types.I# ww2
+ }
}}]
g = \ (w :: Bool) (w1 :: Bool) (w2 :: Int) ->
- case T13143.$wg w w1 w2 of ww { __DEFAULT -> GHC.Types.I# ww }
+ case w2 of { GHC.Types.I# ww1 ->
+ case T13143.$wg w w1 ww1 of ww2 { __DEFAULT -> GHC.Types.I# ww2 }
+ }
=====================================
testsuite/tests/simplCore/should_compile/T13543.stderr
=====================================
@@ -1,8 +1,8 @@
==================== Strictness signatures ====================
Foo.$trModule:
-Foo.f: <S(S),1*U(1*U)><S,1*U(U)><S,1*U(U)>
-Foo.g: <S(SS),1*U(1*U(U),1*U(U))>
+Foo.f: <S(SU)><U(U)><U(U)>
+Foo.g: <S(S(U),S(U))>
@@ -15,7 +15,7 @@ Foo.g: m1
==================== Strictness signatures ====================
Foo.$trModule:
-Foo.f: <S(S),1*U(1*U)><S,1*U(U)><S,1*U(U)>
-Foo.g: <S(SS),1*U(1*U(U),1*U(U))>
+Foo.f: <S(SU)><S(U)><S(U)>
+Foo.g: <S(S(U),S(U))>
=====================================
testsuite/tests/simplCore/should_compile/T18013.stderr
=====================================
@@ -136,7 +136,7 @@ mapMaybeRule
:: forall a b. Rule IO a b -> Rule IO (Maybe a) (Maybe b)
[GblId,
Arity=1,
- Str=<S,1*U>,
+ Str=<SU>,
Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
WorkFree=True, Expandable=True, Guidance=IF_ARGS [20] 150 10}]
mapMaybeRule
=====================================
testsuite/tests/simplCore/should_compile/T18328.stderr
=====================================
@@ -4,19 +4,18 @@ Result size of Tidy Core
= {terms: 69, types: 61, coercions: 0, joins: 1/1}
-- RHS size: {terms: 42, types: 28, coercions: 0, joins: 1/1}
-T18328.$wf [InlPrag=NOUSERINLINE[2]]
+T18328.$wf [InlPrag=[2]]
:: forall {a}. GHC.Prim.Int# -> [a] -> [a] -> [a]
[GblId,
Arity=3,
- Str=<S,U><S,U><L,1*U>,
+ Str=<SU><U><U>,
Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
WorkFree=True, Expandable=True, Guidance=IF_ARGS [182 0 0] 312 0}]
T18328.$wf
= \ (@a) (ww :: GHC.Prim.Int#) (w :: [a]) (w1 :: [a]) ->
join {
- $wj [InlPrag=NOINLINE, Dmd=<L,1*C1(U)>]
- :: forall {p}. GHC.Prim.Void# -> [a]
- [LclId[JoinId(2)], Arity=1, Str=<L,A>, Unf=OtherCon []]
+ $wj [InlPrag=NOINLINE, Dmd=1C1(U)] :: forall {p}. (# #) -> [a]
+ [LclId[JoinId(2)], Arity=1, Str=<A>, Unf=OtherCon []]
$wj (@p) _ [Occ=Dead, OS=OneShot]
= case ww of {
__DEFAULT -> ++ @a w (++ @a w (++ @a w w1));
@@ -24,24 +23,24 @@ T18328.$wf
} } in
case ww of {
__DEFAULT -> ++ @a w w1;
- 1# -> jump $wj @Integer GHC.Prim.void#;
- 2# -> jump $wj @Integer GHC.Prim.void#;
- 3# -> jump $wj @Integer GHC.Prim.void#
+ 1# -> jump $wj @Integer GHC.Prim.(##);
+ 2# -> jump $wj @Integer GHC.Prim.(##);
+ 3# -> jump $wj @Integer GHC.Prim.(##)
}
-- RHS size: {terms: 11, types: 10, coercions: 0, joins: 0/0}
-f [InlPrag=NOUSERINLINE[2]] :: forall a. Int -> [a] -> [a] -> [a]
+f [InlPrag=[2]] :: forall a. Int -> [a] -> [a] -> [a]
[GblId,
Arity=3,
- Str=<S(S),1*U(U)><S,U><L,1*U>,
+ Str=<S(SU)><U><U>,
Unf=Unf{Src=InlineStable, TopLvl=True, Value=True, ConLike=True,
WorkFree=True, Expandable=True,
Guidance=ALWAYS_IF(arity=3,unsat_ok=True,boring_ok=False)
Tmpl= \ (@a)
- (w [Occ=Once!] :: Int)
- (w1 [Occ=Once] :: [a])
- (w2 [Occ=Once] :: [a]) ->
- case w of { GHC.Types.I# ww1 [Occ=Once] ->
+ (w [Occ=Once1!] :: Int)
+ (w1 [Occ=Once1] :: [a])
+ (w2 [Occ=Once1] :: [a]) ->
+ case w of { GHC.Types.I# ww1 [Occ=Once1] ->
T18328.$wf @a ww1 w1 w2
}}]
f = \ (@a) (w :: Int) (w1 :: [a]) (w2 :: [a]) ->
@@ -58,7 +57,7 @@ T18328.$trModule4 = "main"#
T18328.$trModule3 :: GHC.Types.TrName
[GblId,
Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
- WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 20}]
+ WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 10}]
T18328.$trModule3 = GHC.Types.TrNameS T18328.$trModule4
-- RHS size: {terms: 1, types: 0, coercions: 0, joins: 0/0}
@@ -72,14 +71,14 @@ T18328.$trModule2 = "T18328"#
T18328.$trModule1 :: GHC.Types.TrName
[GblId,
Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
- WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 20}]
+ WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 10}]
T18328.$trModule1 = GHC.Types.TrNameS T18328.$trModule2
-- RHS size: {terms: 3, types: 0, coercions: 0, joins: 0/0}
T18328.$trModule :: GHC.Types.Module
[GblId,
Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
- WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 30}]
+ WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 10}]
T18328.$trModule
= GHC.Types.Module T18328.$trModule3 T18328.$trModule1
=====================================
testsuite/tests/simplCore/should_compile/noinline01.stderr
=====================================
@@ -2,7 +2,7 @@
==================== Initial STG: ====================
Noinline01.f [InlPrag=INLINE (sat-args=1)]
:: forall {p}. p -> GHC.Types.Bool
-[GblId, Arity=1, Str=<L,A>, Unf=OtherCon []] =
+[GblId, Arity=1, Str=<A>, Unf=OtherCon []] =
\r [eta] GHC.Types.True [];
Noinline01.g :: GHC.Types.Bool
=====================================
testsuite/tests/simplCore/should_compile/spec-inline.stderr
=====================================
@@ -54,7 +54,7 @@ Rec {
-- RHS size: {terms: 40, types: 5, coercions: 0, joins: 0/0}
Roman.foo_$s$wgo [Occ=LoopBreaker]
:: GHC.Prim.Int# -> GHC.Prim.Int# -> GHC.Prim.Int#
-[GblId, Arity=2, Str=<U><U>, Unf=OtherCon []]
+[GblId, Arity=2, Str=<A><U>, Unf=OtherCon []]
Roman.foo_$s$wgo
= \ (sc :: GHC.Prim.Int#) (sc1 :: GHC.Prim.Int#) ->
case GHC.Prim.<=# sc1 0# of {
=====================================
testsuite/tests/stranal/should_compile/T10694.stderr
=====================================
@@ -4,47 +4,47 @@ Result size of Tidy Core = {terms: 74, types: 65, coercions: 0, joins: 0/4}
-- RHS size: {terms: 39, types: 25, coercions: 0, joins: 0/4}
T10694.$wpm [InlPrag=NOINLINE] :: Int -> Int -> (# Int, Int #)
-[GblId, Arity=2, Str=<L,U(U)><L,U(U)>, Unf=OtherCon []]
+[GblId, Arity=2, Str=<U(U)><U(U)>, Unf=OtherCon []]
T10694.$wpm
= \ (w :: Int) (w1 :: Int) ->
let {
- l :: Int
+ lvl :: Int
[LclId]
- l = case w of { GHC.Types.I# x -> case w1 of { GHC.Types.I# y -> GHC.Types.I# (GHC.Prim.+# x y) } } } in
+ lvl = case w of { GHC.Types.I# x -> case w1 of { GHC.Types.I# y -> GHC.Types.I# (GHC.Prim.+# x y) } } } in
let {
- l1 :: Int
+ lvl1 :: Int
[LclId]
- l1 = case w of { GHC.Types.I# x -> case w1 of { GHC.Types.I# y -> GHC.Types.I# (GHC.Prim.-# x y) } } } in
+ lvl1 = case w of { GHC.Types.I# x -> case w1 of { GHC.Types.I# y -> GHC.Types.I# (GHC.Prim.-# x y) } } } in
let {
- l2 :: [Int]
+ l :: [Int]
[LclId, Unf=OtherCon []]
- l2 = GHC.Types.: @Int l1 (GHC.Types.[] @Int) } in
+ l = GHC.Types.: @Int lvl1 (GHC.Types.[] @Int) } in
let {
- l3 :: [Int]
+ l1 :: [Int]
[LclId, Unf=OtherCon []]
- l3 = GHC.Types.: @Int l l2 } in
- (# GHC.List.$w!! @Int l3 0#, GHC.List.$w!! @Int l3 1# #)
+ l1 = GHC.Types.: @Int lvl l } in
+ (# GHC.List.$w!! @Int l1 0#, GHC.List.$w!! @Int l1 1# #)
-- RHS size: {terms: 10, types: 11, coercions: 0, joins: 0/0}
-pm [InlPrag=NOUSERINLINE[0]] :: Int -> Int -> (Int, Int)
+pm [InlPrag=[final]] :: Int -> Int -> (Int, Int)
[GblId,
Arity=2,
- Str=<L,U(U)><L,U(U)>,
+ Str=<U(U)><U(U)>,
Cpr=m1,
Unf=Unf{Src=InlineStable, TopLvl=True, Value=True, ConLike=True, WorkFree=True, Expandable=True,
Guidance=ALWAYS_IF(arity=2,unsat_ok=True,boring_ok=False)
- Tmpl= \ (w [Occ=Once] :: Int) (w1 [Occ=Once] :: Int) ->
- case T10694.$wpm w w1 of { (# ww1 [Occ=Once], ww2 [Occ=Once] #) -> (ww1, ww2) }}]
+ Tmpl= \ (w [Occ=Once1] :: Int) (w1 [Occ=Once1] :: Int) ->
+ case T10694.$wpm w w1 of { (# ww1 [Occ=Once1], ww2 [Occ=Once1] #) -> (ww1, ww2) }}]
pm = \ (w :: Int) (w1 :: Int) -> case T10694.$wpm w w1 of { (# ww1, ww2 #) -> (ww1, ww2) }
-- RHS size: {terms: 8, types: 9, coercions: 0, joins: 0/0}
m :: Int -> Int -> Int
[GblId,
Arity=2,
- Str=<L,U(U)><L,U(U)>,
+ Str=<U(U)><U(U)>,
Unf=Unf{Src=InlineStable, TopLvl=True, Value=True, ConLike=True, WorkFree=True, Expandable=True,
Guidance=ALWAYS_IF(arity=2,unsat_ok=True,boring_ok=False)
- Tmpl= \ (x [Occ=Once] :: Int) (y [Occ=Once] :: Int) -> case pm x y of { (_ [Occ=Dead], mr [Occ=Once]) -> mr }}]
+ Tmpl= \ (x [Occ=Once1] :: Int) (y [Occ=Once1] :: Int) -> case pm x y of { (_ [Occ=Dead], mr [Occ=Once1]) -> mr }}]
m = \ (x :: Int) (y :: Int) -> case T10694.$wpm x y of { (# ww1, ww2 #) -> ww2 }
-- RHS size: {terms: 1, types: 0, coercions: 0, joins: 0/0}
@@ -54,7 +54,7 @@ T10694.$trModule4 = "main"#
-- RHS size: {terms: 2, types: 0, coercions: 0, joins: 0/0}
T10694.$trModule3 :: GHC.Types.TrName
-[GblId, Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True, WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 20}]
+[GblId, Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True, WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 10}]
T10694.$trModule3 = GHC.Types.TrNameS T10694.$trModule4
-- RHS size: {terms: 1, types: 0, coercions: 0, joins: 0/0}
@@ -64,12 +64,12 @@ T10694.$trModule2 = "T10694"#
-- RHS size: {terms: 2, types: 0, coercions: 0, joins: 0/0}
T10694.$trModule1 :: GHC.Types.TrName
-[GblId, Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True, WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 20}]
+[GblId, Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True, WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 10}]
T10694.$trModule1 = GHC.Types.TrNameS T10694.$trModule2
-- RHS size: {terms: 3, types: 0, coercions: 0, joins: 0/0}
T10694.$trModule :: GHC.Types.Module
-[GblId, Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True, WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 30}]
+[GblId, Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True, WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 10}]
T10694.$trModule = GHC.Types.Module T10694.$trModule3 T10694.$trModule1
=====================================
testsuite/tests/stranal/sigs/CaseBinderCPR.stderr
=====================================
@@ -1,7 +1,7 @@
==================== Strictness signatures ====================
CaseBinderCPR.$trModule:
-CaseBinderCPR.f_list_cmp: <L,C(C1(U(U)))><S,1*U><S,1*U>
+CaseBinderCPR.f_list_cmp: <UCU(C1((U)))><SU><SU>
@@ -13,6 +13,6 @@ CaseBinderCPR.f_list_cmp: m1
==================== Strictness signatures ====================
CaseBinderCPR.$trModule:
-CaseBinderCPR.f_list_cmp: <L,C(C1(U(1*U)))><S,1*U><S,1*U>
+CaseBinderCPR.f_list_cmp: <UCU(C1((1U)))><SU><SU>
=====================================
testsuite/tests/stranal/sigs/DmdAnalGADTs.stderr
=====================================
@@ -5,11 +5,11 @@ DmdAnalGADTs.$tc'B:
DmdAnalGADTs.$tcD:
DmdAnalGADTs.$trModule:
DmdAnalGADTs.diverges: b
-DmdAnalGADTs.f: <S,1*U>
-DmdAnalGADTs.f': <S,1*U>
-DmdAnalGADTs.g: <S,1*U>
+DmdAnalGADTs.f: <SU>
+DmdAnalGADTs.f': <SU>
+DmdAnalGADTs.g: <SU>
DmdAnalGADTs.hasCPR:
-DmdAnalGADTs.hasStrSig: <S,1*U(U)>
+DmdAnalGADTs.hasStrSig: <S(U)>
@@ -33,10 +33,10 @@ DmdAnalGADTs.$tc'B:
DmdAnalGADTs.$tcD:
DmdAnalGADTs.$trModule:
DmdAnalGADTs.diverges: b
-DmdAnalGADTs.f: <S,1*U>
-DmdAnalGADTs.f': <S,1*U>
-DmdAnalGADTs.g: <S,1*U>
+DmdAnalGADTs.f: <SU>
+DmdAnalGADTs.f': <SU>
+DmdAnalGADTs.g: <SU>
DmdAnalGADTs.hasCPR:
-DmdAnalGADTs.hasStrSig: <S,1*U(U)>
+DmdAnalGADTs.hasStrSig: <S(U)>
=====================================
testsuite/tests/stranal/sigs/HyperStrUse.stderr
=====================================
@@ -1,7 +1,7 @@
==================== Strictness signatures ====================
HyperStrUse.$trModule:
-HyperStrUse.f: <S(SL),1*U(1*U(U),A)><S,1*U>
+HyperStrUse.f: <S(S(U),A)><SU>
@@ -13,6 +13,6 @@ HyperStrUse.f: m1
==================== Strictness signatures ====================
HyperStrUse.$trModule:
-HyperStrUse.f: <S(SL),1*U(1*U(U),A)><S,1*U>
+HyperStrUse.f: <S(S(U),A)><SU>
=====================================
testsuite/tests/stranal/sigs/T13380f.stderr
=====================================
@@ -1,12 +1,12 @@
==================== Strictness signatures ====================
T13380f.$trModule:
-T13380f.f: <S,1*U(U)><S,1*U(U)><L,U>
-T13380f.g: <S,1*U(U)><L,1*U(U)><L,U>
-T13380f.h: <S,1*U(U)><L,1*U(U)><L,U>
-T13380f.interruptibleCall: <L,U>
-T13380f.safeCall: <L,U>
-T13380f.unsafeCall: <L,U>
+T13380f.f: <S(U)><S(U)><U>
+T13380f.g: <S(U)><1(U)><U>
+T13380f.h: <S(U)><1(U)><U>
+T13380f.interruptibleCall: <U>
+T13380f.safeCall: <U>
+T13380f.unsafeCall: <U>
@@ -23,11 +23,11 @@ T13380f.unsafeCall:
==================== Strictness signatures ====================
T13380f.$trModule:
-T13380f.f: <S,1*U(U)><S,1*U(U)><L,U>
-T13380f.g: <S,1*U(U)><L,1*U(U)><L,U>
-T13380f.h: <S,1*U(U)><L,1*U(U)><L,U>
-T13380f.interruptibleCall: <L,U>
-T13380f.safeCall: <L,U>
-T13380f.unsafeCall: <L,U>
+T13380f.f: <S(U)><S(U)><U>
+T13380f.g: <S(U)><1(U)><U>
+T13380f.h: <S(U)><1(U)><U>
+T13380f.interruptibleCall: <U>
+T13380f.safeCall: <U>
+T13380f.unsafeCall: <U>
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/a2fbe3c9f949e3fc8635fa99f5bf1a9085b113ff
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/a2fbe3c9f949e3fc8635fa99f5bf1a9085b113ff
You're receiving this email because of your account on gitlab.haskell.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20201029/fbb4dd26/attachment-0001.html>
More information about the ghc-commits
mailing list