DmdAnal: Better syntax for demand signatures (#19016)

The update of the Outputable instance resulted in a slew of
documentation changes within Notes that used the old syntax.
The most important doc changes are to `Note [Demand notation]`
and the user's guide.

Fixes #19016.

21 files changed, 135 insertions, 135 deletions

diff --git a/testsuite/tests/stranal/should_compile/T10694.stderr b/testsuite/tests/stranal/should_compile/T10694.stderr
index 45060226c1..29b6e9e816 100644
--- a/testsuite/tests/stranal/should_compile/T10694.stderr
+++ b/testsuite/tests/stranal/should_compile/T10694.stderr
@@ -4,7 +4,7 @@ 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=<UP(U)><UP(U)>, Unf=OtherCon []]
+[GblId, Arity=2, Str=<LP(L)><LP(L)>, Unf=OtherCon []]
 T10694.$wpm
   = \ (w :: Int) (w1 :: Int) ->
       let {
@@ -29,7 +29,7 @@ T10694.$wpm
 pm [InlPrag=[final]] :: Int -> Int -> (Int, Int)
 [GblId,
  Arity=2,
- Str=<UP(U)><UP(U)>,
+ Str=<LP(L)><LP(L)>,
  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)
@@ -41,7 +41,7 @@ pm = \ (w :: Int) (w1 :: Int) -> case T10694.$wpm w w1 of { (# ww1, ww2 #) -> (w
 m :: Int -> Int -> Int
 [GblId,
  Arity=2,
- Str=<UP(U)><UP(U)>,
+ Str=<LP(L)><LP(L)>,
  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=Once1] :: Int) (y [Occ=Once1] :: Int) -> case pm x y of { (_ [Occ=Dead], mr [Occ=Once1]) -> mr }}]
diff --git a/testsuite/tests/stranal/should_compile/T13031.stdout b/testsuite/tests/stranal/should_compile/T13031.stdout
index 0b40ec8eeb..748452f733 100644
--- a/testsuite/tests/stranal/should_compile/T13031.stdout
+++ b/testsuite/tests/stranal/should_compile/T13031.stdout
@@ -1,2 +1,2 @@
 hello
-[GblId, Arity=3, Str=<U><U><U>b, Cpr=b, Unf=OtherCon []]
+[GblId, Arity=3, Str=<L><L><L>b, Cpr=b, Unf=OtherCon []]
diff --git a/testsuite/tests/stranal/should_compile/T18894.stderr b/testsuite/tests/stranal/should_compile/T18894.stderr
index ee2df2f667..cb5b344d4e 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: 97, coercions: 0, joins: 0/0}
+  = {terms: 177, types: 95, coercions: 0, joins: 0/0}
 
 -- RHS size: {terms: 1, types: 0, coercions: 0, joins: 0/0}
 $trModule :: GHC.Prim.Addr#
@@ -45,18 +45,18 @@ lvl :: Int
          WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 10}]
 lvl = GHC.Types.I# 0#
 
--- RHS size: {terms: 36, types: 16, coercions: 0, joins: 0/0}
-g2 [InlPrag=NOINLINE, Dmd=UCU(CS(P(1P(U),SP(U))))]
+-- RHS size: {terms: 36, types: 15, coercions: 0, joins: 0/0}
+g2 [InlPrag=NOINLINE, Dmd=LCL(C1(P(MP(L),1P(L))))]
   :: Int -> Int -> (Int, Int)
 [LclId,
  Arity=2,
- Str=<UP(U)><SP(SU)>,
+ 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}]
 g2
-  = \ (m [Dmd=UP(U)] :: Int) (ds [Dmd=SP(SU)] :: Int) ->
-      case ds of { GHC.Types.I# ds [Dmd=SU] ->
-      case ds of ds [Dmd=1U] {
+  = \ (m [Dmd=LP(L)] :: Int) (ds [Dmd=1P(1L)] :: Int) ->
+      case ds of { GHC.Types.I# ds [Dmd=1L] ->
+      case ds of ds [Dmd=ML] {
         __DEFAULT ->
           (case m of { GHC.Types.I# y -> GHC.Types.I# (GHC.Prim.*# 2# y) },
            case ds of wild {
@@ -96,19 +96,19 @@ lvl = GHC.Types.I# 0#
 h2 :: Int -> Int
 [LclIdX,
  Arity=1,
- Str=<SP(MU)>,
+ Str=<1P(SL)>,
  Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True, Guidance=IF_ARGS [20] 162 10}]
 h2
-  = \ (ds [Dmd=SP(MU)] :: Int) ->
-      case ds of wild [Dmd=UP(U)] { GHC.Types.I# ds [Dmd=MU] ->
+  = \ (ds [Dmd=1P(SL)] :: Int) ->
+      case ds of wild [Dmd=LP(L)] { GHC.Types.I# ds [Dmd=SL] ->
       case ds of ds {
         __DEFAULT ->
           case GHC.Prim.remInt# ds 2# of {
             __DEFAULT ->
-              case g2 wild lvl of { (ds1 [Dmd=A], y [Dmd=SU]) -> y };
+              case g2 wild lvl of { (ds1 [Dmd=A], y [Dmd=1L]) -> y };
             0# ->
-              case g2 lvl wild of { (x [Dmd=SP(U)], ds [Dmd=SP(U)]) ->
+              case g2 lvl wild of { (x [Dmd=1P(L)], ds [Dmd=1P(L)]) ->
               case x of { GHC.Types.I# x ->
               case ds of { GHC.Types.I# y -> GHC.Types.I# (GHC.Prim.+# x y) }
               }
@@ -139,16 +139,16 @@ lvl :: (Int, Int)
          WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 10}]
 lvl = (lvl, lvl)
 
--- RHS size: {terms: 30, types: 11, coercions: 0, joins: 0/0}
-g1 [InlPrag=NOINLINE, Dmd=UCU(P(UP(U),UP(U)))] :: Int -> (Int, Int)
+-- RHS size: {terms: 30, types: 10, coercions: 0, joins: 0/0}
+g1 [InlPrag=NOINLINE, Dmd=LCL(P(LP(L),LP(L)))] :: Int -> (Int, Int)
 [LclId,
  Arity=1,
- Str=<SP(SU)>,
+ Str=<1P(1L)>,
  Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True, Guidance=IF_ARGS [20] 141 10}]
 g1
-  = \ (ds [Dmd=SP(SU)] :: Int) ->
-      case ds of { GHC.Types.I# ds [Dmd=SU] ->
+  = \ (ds [Dmd=1P(1L)] :: Int) ->
+      case ds of { GHC.Types.I# ds [Dmd=1L] ->
       case ds of ds {
         __DEFAULT ->
           (GHC.Types.I# (GHC.Prim.*# 2# ds),
@@ -182,21 +182,21 @@ lvl = g1 (GHC.Types.I# 2#)
 h1 :: Int -> Int
 [LclIdX,
  Arity=1,
- Str=<SP(MU)>,
+ Str=<1P(SL)>,
  Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True, Guidance=IF_ARGS [20] 111 10}]
 h1
-  = \ (ds [Dmd=SP(MU)] :: Int) ->
-      case ds of wild [Dmd=1P(1U)] { GHC.Types.I# ds [Dmd=MU] ->
+  = \ (ds [Dmd=1P(SL)] :: Int) ->
+      case ds of wild [Dmd=MP(ML)] { GHC.Types.I# ds [Dmd=SL] ->
       case ds of {
         __DEFAULT ->
-          case g1 wild of { (x [Dmd=SP(U)], ds [Dmd=SP(U)]) ->
+          case g1 wild of { (x [Dmd=1P(L)], ds [Dmd=1P(L)]) ->
           case x of { GHC.Types.I# x ->
           case ds of { GHC.Types.I# y -> GHC.Types.I# (GHC.Prim.+# x y) }
           }
           };
         1# -> lvl;
-        2# -> case lvl of { (ds1 [Dmd=A], y [Dmd=SU]) -> y }
+        2# -> case lvl of { (ds1 [Dmd=A], y [Dmd=1L]) -> y }
       }
       }
 
@@ -205,7 +205,7 @@ h1
 
 ==================== Demand analysis ====================
 Result size of Demand analysis
-  = {terms: 171, types: 120, coercions: 0, joins: 0/0}
+  = {terms: 171, types: 118, coercions: 0, joins: 0/0}
 
 -- RHS size: {terms: 1, types: 0, coercions: 0, joins: 0/0}
 $trModule :: GHC.Prim.Addr#
@@ -256,16 +256,16 @@ lvl :: Int
          WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 10}]
 lvl = GHC.Types.I# -2#
 
--- RHS size: {terms: 32, types: 18, coercions: 0, joins: 0/0}
-$wg2 [InlPrag=NOINLINE, Dmd=UCU(CS(P(1P(U),SP(U))))]
+-- RHS size: {terms: 32, types: 17, coercions: 0, joins: 0/0}
+$wg2 [InlPrag=NOINLINE, Dmd=LCL(C1(P(MP(L),1P(L))))]
   :: Int -> GHC.Prim.Int# -> (# Int, Int #)
 [LclId,
  Arity=2,
- Str=<UP(U)><SU>,
+ 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}]
 $wg2
-  = \ (w [Dmd=UP(U)] :: Int) (ww [Dmd=SU] :: GHC.Prim.Int#) ->
+  = \ (w [Dmd=LP(L)] :: Int) (ww [Dmd=1L] :: GHC.Prim.Int#) ->
       case ww of ds {
         __DEFAULT ->
           (# case w of { GHC.Types.I# y -> GHC.Types.I# (GHC.Prim.*# 2# y) },
@@ -291,21 +291,21 @@ lvl = GHC.Types.I# 2#
 $wh2 [InlPrag=[2]] :: GHC.Prim.Int# -> Int
 [LclId,
  Arity=1,
- Str=<SU>,
+ Str=<1L>,
  Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True, Guidance=IF_ARGS [30] 162 10}]
 $wh2
-  = \ (ww [Dmd=SU] :: GHC.Prim.Int#) ->
+  = \ (ww [Dmd=1L] :: GHC.Prim.Int#) ->
       case ww of ds {
         __DEFAULT ->
           case GHC.Prim.remInt# ds 2# of {
             __DEFAULT ->
               case $wg2 (GHC.Types.I# ds) 2# of
-              { (# ww [Dmd=A], ww [Dmd=SU] #) ->
+              { (# ww [Dmd=A], ww [Dmd=1L] #) ->
               ww
               };
             0# ->
-              case $wg2 lvl ds of { (# ww [Dmd=SP(U)], ww [Dmd=SP(U)] #) ->
+              case $wg2 lvl 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) }
               }
@@ -318,15 +318,15 @@ $wh2
 h2 [InlPrag=[2]] :: Int -> Int
 [LclIdX,
  Arity=1,
- Str=<SP(SU)>,
+ Str=<1P(1L)>,
  Unf=Unf{Src=InlineStable, TopLvl=True, Value=True, ConLike=True,
          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# ww [Occ=Once1, Dmd=MU] -> $wh2 ww }}]
+         Tmpl= \ (w [Occ=Once1!, Dmd=1P(SL)] :: Int) ->
+                 case w of { GHC.Types.I# ww [Occ=Once1, Dmd=SL] -> $wh2 ww }}]
 h2
-  = \ (w [Dmd=SP(SU)] :: Int) ->
-      case w of { GHC.Types.I# ww [Dmd=SU] -> $wh2 ww }
+  = \ (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
@@ -335,16 +335,16 @@ lvl :: Int
          WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 10}]
 lvl = GHC.Types.I# 15#
 
--- RHS size: {terms: 28, types: 15, coercions: 0, joins: 0/0}
-$wg1 [InlPrag=NOINLINE, Dmd=UCU(P(UP(U),UP(U)))]
+-- 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 #)
 [LclId,
  Arity=1,
- Str=<SU>,
+ Str=<1L>,
  Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True, Guidance=IF_ARGS [30] 111 20}]
 $wg1
-  = \ (ww [Dmd=SU] :: GHC.Prim.Int#) ->
+  = \ (ww [Dmd=1L] :: GHC.Prim.Int#) ->
       case ww of ds {
         __DEFAULT ->
           (# GHC.Types.I# (GHC.Prim.*# 2# ds),
@@ -370,35 +370,35 @@ lvl = case $wg1 2# of { (# ww, ww #) -> (ww, ww) }
 $wh1 [InlPrag=[2]] :: GHC.Prim.Int# -> Int
 [LclId,
  Arity=1,
- Str=<SU>,
+ Str=<1L>,
  Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True, Guidance=IF_ARGS [50] 101 10}]
 $wh1
-  = \ (ww [Dmd=SU] :: GHC.Prim.Int#) ->
-      case ww of ds [Dmd=1U] {
+  = \ (ww [Dmd=1L] :: GHC.Prim.Int#) ->
+      case ww of ds [Dmd=ML] {
         __DEFAULT ->
-          case $wg1 ds of { (# ww [Dmd=SP(U)], ww [Dmd=SP(U)] #) ->
+          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) }
           }
           };
         1# -> lvl;
-        2# -> case lvl of { (ds1 [Dmd=A], y [Dmd=SU]) -> y }
+        2# -> case lvl of { (ds1 [Dmd=A], y [Dmd=1L]) -> y }
       }
 
 -- RHS size: {terms: 6, types: 3, coercions: 0, joins: 0/0}
 h1 [InlPrag=[2]] :: Int -> Int
 [LclIdX,
  Arity=1,
- Str=<SP(SU)>,
+ Str=<1P(1L)>,
  Unf=Unf{Src=InlineStable, TopLvl=True, Value=True, ConLike=True,
          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# ww [Occ=Once1, Dmd=MU] -> $wh1 ww }}]
+         Tmpl= \ (w [Occ=Once1!, Dmd=1P(SL)] :: Int) ->
+                 case w of { GHC.Types.I# ww [Occ=Once1, Dmd=SL] -> $wh1 ww }}]
 h1
-  = \ (w [Dmd=SP(SU)] :: Int) ->
-      case w of { GHC.Types.I# ww [Dmd=SU] -> $wh1 ww }
+  = \ (w [Dmd=1P(1L)] :: Int) ->
+      case w of { GHC.Types.I# ww [Dmd=1L] -> $wh1 ww }
 
 
 
diff --git a/testsuite/tests/stranal/should_compile/T18903.stderr b/testsuite/tests/stranal/should_compile/T18903.stderr
index 4adbdd566c..c909bd0e0e 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: 55, coercions: 0, joins: 0/1}
+  = {terms: 84, types: 54, coercions: 0, joins: 0/1}
 
 -- RHS size: {terms: 1, types: 0, coercions: 0, joins: 0/0}
 T18903.$trModule4 :: GHC.Prim.Addr#
@@ -53,19 +53,19 @@ T18903.h2 :: Int
          WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 10}]
 T18903.h2 = GHC.Types.I# -2#
 
--- RHS size: {terms: 56, types: 41, coercions: 0, joins: 0/1}
+-- RHS size: {terms: 56, types: 40, coercions: 0, joins: 0/1}
 T18903.$wh [InlPrag=[2]] :: GHC.Prim.Int# -> Int
 [GblId,
  Arity=1,
- Str=<MU>,
+ Str=<SL>,
  Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True, Guidance=IF_ARGS [70] 262 10}]
 T18903.$wh
   = \ (ww :: GHC.Prim.Int#) ->
       let {
-        $wg [InlPrag=NOINLINE, Dmd=1C1(P(1P(U),SP(U)))]
+        $wg [InlPrag=NOINLINE, Dmd=MCM(P(MP(L),1P(L)))]
           :: GHC.Prim.Int# -> (# Int, Int #)
-        [LclId, Arity=1, Str=<SU>, Unf=OtherCon []]
+        [LclId, Arity=1, Str=<1L>, Unf=OtherCon []]
         $wg
           = \ (ww1 [OS=OneShot] :: GHC.Prim.Int#) ->
               case ww1 of ds {
@@ -96,7 +96,7 @@ T18903.$wh
 h [InlPrag=[2]] :: Int -> Int
 [GblId,
  Arity=1,
- Str=<SP(MU)>,
+ Str=<1P(SL)>,
  Unf=Unf{Src=InlineStable, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True,
          Guidance=ALWAYS_IF(arity=1,unsat_ok=True,boring_ok=False)
diff --git a/testsuite/tests/stranal/sigs/BottomFromInnerLambda.hs b/testsuite/tests/stranal/sigs/BottomFromInnerLambda.hs
index 8d3b77f832..b7453934f4 100644
--- a/testsuite/tests/stranal/sigs/BottomFromInnerLambda.hs
+++ b/testsuite/tests/stranal/sigs/BottomFromInnerLambda.hs
@@ -5,8 +5,8 @@ expensive 0 = 0
 expensive n = expensive n
 {-# NOINLINE expensive #-}
 
--- We could be saying "<S(S),1*(U(U))><L,A>b"
--- but we are saying "<S(S),1*(U(U))>"
--- We should not be saying "<S(S),1*(U(U))>b"
+-- We could be saying "<1P(1)><A>b"
+-- but we are saying "<1P(1)>"
+-- We should not be saying "<1P(1)>b"
 f :: Int -> Int -> Int
 f x = expensive x `seq` (\y -> error (show y))
diff --git a/testsuite/tests/stranal/sigs/BottomFromInnerLambda.stderr b/testsuite/tests/stranal/sigs/BottomFromInnerLambda.stderr
index a2dade38df..7b954564a7 100644
--- a/testsuite/tests/stranal/sigs/BottomFromInnerLambda.stderr
+++ b/testsuite/tests/stranal/sigs/BottomFromInnerLambda.stderr
@@ -1,8 +1,8 @@
 
 ==================== Strictness signatures ====================
 BottomFromInnerLambda.$trModule:
-BottomFromInnerLambda.expensive: <SP(MU)>
-BottomFromInnerLambda.f: <SP(MU)>
+BottomFromInnerLambda.expensive: <1P(SL)>
+BottomFromInnerLambda.f: <1P(SL)>
 
 
 
@@ -15,7 +15,7 @@ BottomFromInnerLambda.f:
 
 ==================== Strictness signatures ====================
 BottomFromInnerLambda.$trModule:
-BottomFromInnerLambda.expensive: <SP(SU)>
-BottomFromInnerLambda.f: <SP(SU)>
+BottomFromInnerLambda.expensive: <1P(1L)>
+BottomFromInnerLambda.f: <1P(1L)>
 
 
diff --git a/testsuite/tests/stranal/sigs/DmdAnalGADTs.hs b/testsuite/tests/stranal/sigs/DmdAnalGADTs.hs
index 1a6d68a3b2..2bdd2a679e 100644
--- a/testsuite/tests/stranal/sigs/DmdAnalGADTs.hs
+++ b/testsuite/tests/stranal/sigs/DmdAnalGADTs.hs
@@ -19,7 +19,7 @@ diverges :: Int
 diverges = diverges
 
 -- The result should not have a CPR property
--- Because we are lub’ing "m" and "<S,U>m" in the case expression.
+-- Because we are lub’ing "m" and "<L>m" in the case expression.
 f :: D x -> x
 f x = case x of
     A -> hasCPR
diff --git a/testsuite/tests/stranal/sigs/DmdAnalGADTs.stderr b/testsuite/tests/stranal/sigs/DmdAnalGADTs.stderr
index 41fae8f5ce..8f70d7d5e0 100644
--- a/testsuite/tests/stranal/sigs/DmdAnalGADTs.stderr
+++ b/testsuite/tests/stranal/sigs/DmdAnalGADTs.stderr
@@ -5,11 +5,11 @@ DmdAnalGADTs.$tc'B:
 DmdAnalGADTs.$tcD:
 DmdAnalGADTs.$trModule:
 DmdAnalGADTs.diverges: b
-DmdAnalGADTs.f: <SU>
-DmdAnalGADTs.f': <SU>
-DmdAnalGADTs.g: <SU>
+DmdAnalGADTs.f: <1L>
+DmdAnalGADTs.f': <1L>
+DmdAnalGADTs.g: <1L>
 DmdAnalGADTs.hasCPR:
-DmdAnalGADTs.hasStrSig: <SP(U)>
+DmdAnalGADTs.hasStrSig: <1P(L)>
 
 
 
@@ -33,10 +33,10 @@ DmdAnalGADTs.$tc'B:
 DmdAnalGADTs.$tcD:
 DmdAnalGADTs.$trModule:
 DmdAnalGADTs.diverges: b
-DmdAnalGADTs.f: <SU>
-DmdAnalGADTs.f': <SU>
-DmdAnalGADTs.g: <SU>
+DmdAnalGADTs.f: <1L>
+DmdAnalGADTs.f': <1L>
+DmdAnalGADTs.g: <1L>
 DmdAnalGADTs.hasCPR:
-DmdAnalGADTs.hasStrSig: <SP(U)>
+DmdAnalGADTs.hasStrSig: <1P(L)>
 
 
diff --git a/testsuite/tests/stranal/sigs/HyperStrUse.stderr b/testsuite/tests/stranal/sigs/HyperStrUse.stderr
index dc26e84381..e8a806e4ad 100644
--- a/testsuite/tests/stranal/sigs/HyperStrUse.stderr
+++ b/testsuite/tests/stranal/sigs/HyperStrUse.stderr
@@ -1,7 +1,7 @@
 
 ==================== Strictness signatures ====================
 HyperStrUse.$trModule:
-HyperStrUse.f: <SP(SP(U),A)><SU>
+HyperStrUse.f: <1P(1P(L),A)><1L>
 
 
 
@@ -13,6 +13,6 @@ HyperStrUse.f: m1
 
 ==================== Strictness signatures ====================
 HyperStrUse.$trModule:
-HyperStrUse.f: <SP(SP(U),A)><SU>
+HyperStrUse.f: <1P(1P(L),A)><1L>
 
 
diff --git a/testsuite/tests/stranal/sigs/NewtypeArity.stderr b/testsuite/tests/stranal/sigs/NewtypeArity.stderr
index ebbbbc0c30..5a73b53524 100644
--- a/testsuite/tests/stranal/sigs/NewtypeArity.stderr
+++ b/testsuite/tests/stranal/sigs/NewtypeArity.stderr
@@ -3,8 +3,8 @@
 Test.$tc'MkT:
 Test.$tcT:
 Test.$trModule:
-Test.t: <SP(U)><SP(U)>
-Test.t2: <SP(U)><SP(U)>
+Test.t: <1P(L)><1P(L)>
+Test.t2: <1P(L)><1P(L)>
 
 
 
@@ -21,7 +21,7 @@ Test.t2: m1
 Test.$tc'MkT:
 Test.$tcT:
 Test.$trModule:
-Test.t: <SP(U)><SP(U)>
-Test.t2: <SP(U)><SP(U)>
+Test.t: <1P(L)><1P(L)>
+Test.t2: <1P(L)><1P(L)>
 
 
diff --git a/testsuite/tests/stranal/sigs/StrAnalExample.stderr b/testsuite/tests/stranal/sigs/StrAnalExample.stderr
index e9ac8bab6a..80855b392e 100644
--- a/testsuite/tests/stranal/sigs/StrAnalExample.stderr
+++ b/testsuite/tests/stranal/sigs/StrAnalExample.stderr
@@ -1,7 +1,7 @@
 
 ==================== Strictness signatures ====================
 StrAnalExample.$trModule:
-StrAnalExample.foo: <SU>
+StrAnalExample.foo: <1L>
 
 
 
@@ -13,6 +13,6 @@ StrAnalExample.foo:
 
 ==================== Strictness signatures ====================
 StrAnalExample.$trModule:
-StrAnalExample.foo: <SU>
+StrAnalExample.foo: <1L>
 
 
diff --git a/testsuite/tests/stranal/sigs/T12370.stderr b/testsuite/tests/stranal/sigs/T12370.stderr
index 44a90106cf..d557b437b1 100644
--- a/testsuite/tests/stranal/sigs/T12370.stderr
+++ b/testsuite/tests/stranal/sigs/T12370.stderr
@@ -1,8 +1,8 @@
 
 ==================== Strictness signatures ====================
 T12370.$trModule:
-T12370.bar: <SP(U)><SP(U)>
-T12370.foo: <SP(SP(U),SP(U))>
+T12370.bar: <1P(L)><1P(L)>
+T12370.foo: <1P(1P(L),1P(L))>
 
 
 
@@ -15,7 +15,7 @@ T12370.foo: m1
 
 ==================== Strictness signatures ====================
 T12370.$trModule:
-T12370.bar: <SP(U)><SP(U)>
-T12370.foo: <SP(SP(U),SP(U))>
+T12370.bar: <1P(L)><1P(L)>
+T12370.foo: <1P(1P(L),1P(L))>
 
 
diff --git a/testsuite/tests/stranal/sigs/T13380f.stderr b/testsuite/tests/stranal/sigs/T13380f.stderr
index a856a1794b..e1b6597223 100644
--- a/testsuite/tests/stranal/sigs/T13380f.stderr
+++ b/testsuite/tests/stranal/sigs/T13380f.stderr
@@ -1,12 +1,12 @@
 
 ==================== Strictness signatures ====================
 T13380f.$trModule:
-T13380f.f: <SP(U)><SP(U)><U>
-T13380f.g: <SP(U)><1P(U)><U>
-T13380f.h: <SP(U)><1P(U)><U>
-T13380f.interruptibleCall: <U>
-T13380f.safeCall: <U>
-T13380f.unsafeCall: <U>
+T13380f.f: <1P(L)><1P(L)><L>
+T13380f.g: <1P(L)><MP(L)><L>
+T13380f.h: <1P(L)><MP(L)><L>
+T13380f.interruptibleCall: <L>
+T13380f.safeCall: <L>
+T13380f.unsafeCall: <L>
 
 
 
@@ -23,11 +23,11 @@ T13380f.unsafeCall:
 
 ==================== Strictness signatures ====================
 T13380f.$trModule:
-T13380f.f: <SP(U)><SP(U)><U>
-T13380f.g: <SP(U)><1P(U)><U>
-T13380f.h: <SP(U)><1P(U)><U>
-T13380f.interruptibleCall: <U>
-T13380f.safeCall: <U>
-T13380f.unsafeCall: <U>
+T13380f.f: <1P(L)><1P(L)><L>
+T13380f.g: <1P(L)><MP(L)><L>
+T13380f.h: <1P(L)><MP(L)><L>
+T13380f.interruptibleCall: <L>
+T13380f.safeCall: <L>
+T13380f.unsafeCall: <L>
 
 
diff --git a/testsuite/tests/stranal/sigs/T17932.stderr b/testsuite/tests/stranal/sigs/T17932.stderr
index 072af8d45e..0875f5844e 100644
--- a/testsuite/tests/stranal/sigs/T17932.stderr
+++ b/testsuite/tests/stranal/sigs/T17932.stderr
@@ -5,7 +5,7 @@ T17932.$tc'X:
 T17932.$tcOptions:
 T17932.$tcX:
 T17932.$trModule:
-T17932.flags: <SP(SU,SU)>
+T17932.flags: <1P(1L,1L)>
 
 
 
@@ -25,6 +25,6 @@ T17932.$tc'X:
 T17932.$tcOptions:
 T17932.$tcX:
 T17932.$trModule:
-T17932.flags: <SP(SU,SU)>
+T17932.flags: <1P(1L,1L)>
 
 
diff --git a/testsuite/tests/stranal/sigs/T18086.hs b/testsuite/tests/stranal/sigs/T18086.hs
index 9a6f67c6d1..9a23062f5a 100644
--- a/testsuite/tests/stranal/sigs/T18086.hs
+++ b/testsuite/tests/stranal/sigs/T18086.hs
@@ -6,7 +6,7 @@ import GHC.Utils.Panic.Plain
 import Control.Exception
 import System.IO.Unsafe
 
--- Should have strictness signature <L,U>x, emphasis on the exceptional
+-- Should have strictness signature <L>x, emphasis on the exceptional
 -- divergence result.
 m :: IO ()
 m = do
diff --git a/testsuite/tests/stranal/sigs/T18086.stderr b/testsuite/tests/stranal/sigs/T18086.stderr
index 0ac4c846ee..43266ad0da 100644
--- a/testsuite/tests/stranal/sigs/T18086.stderr
+++ b/testsuite/tests/stranal/sigs/T18086.stderr
@@ -1,8 +1,8 @@
 
 ==================== Strictness signatures ====================
 T18086.$trModule:
-T18086.m: <U>x
-T18086.panic: <U>x
+T18086.m: <L>x
+T18086.panic: <L>x
 
 
 
@@ -15,7 +15,7 @@ T18086.panic:
 
 ==================== Strictness signatures ====================
 T18086.$trModule:
-T18086.m: <U>x
-T18086.panic: <U>x
+T18086.m: <L>x
+T18086.panic: <L>x
 
 
diff --git a/testsuite/tests/stranal/sigs/T18957.stderr b/testsuite/tests/stranal/sigs/T18957.stderr
index c536410e0a..2beea34dfb 100644
--- a/testsuite/tests/stranal/sigs/T18957.stderr
+++ b/testsuite/tests/stranal/sigs/T18957.stderr
@@ -1,11 +1,11 @@
 
 ==================== Strictness signatures ====================
 T18957.$trModule:
-T18957.g: <1C1(U)><SP(U)>
-T18957.h1: <MC1(U)><SP(U)>
-T18957.h2: <SC1(U)><SP(U)>
-T18957.h3: <UCU(P(U))><SP(U)>
-T18957.seq': <SA><SU>
+T18957.g: <MCM(L)><1P(L)>
+T18957.h1: <SCM(L)><1P(L)>
+T18957.h2: <1CM(L)><1P(L)>
+T18957.h3: <LCL(P(L))><1P(L)>
+T18957.seq': <1A><1L>
 
 
 
@@ -21,10 +21,10 @@ T18957.seq':
 
 ==================== Strictness signatures ====================
 T18957.$trModule:
-T18957.g: <1C1(U)><SP(U)>
-T18957.h1: <MC1(U)><SP(U)>
-T18957.h2: <SC1(U)><SP(U)>
-T18957.h3: <UCU(P(U))><SP(U)>
-T18957.seq': <SA><SU>
+T18957.g: <MCM(L)><1P(L)>
+T18957.h1: <SCM(L)><1P(L)>
+T18957.h2: <1CM(L)><1P(L)>
+T18957.h3: <LCL(P(L))><1P(L)>
+T18957.seq': <1A><1L>
 
 
diff --git a/testsuite/tests/stranal/sigs/T5075.stderr b/testsuite/tests/stranal/sigs/T5075.stderr
index a918028c82..e17d5e7c5c 100644
--- a/testsuite/tests/stranal/sigs/T5075.stderr
+++ b/testsuite/tests/stranal/sigs/T5075.stderr
@@ -1,7 +1,7 @@
 
 ==================== Strictness signatures ====================
 T5075.$trModule:
-T5075.loop: <MP(A,A,MCM(CS(U)),A,A,A,A,A)><UP(A,A,UCU(CS(U)),A,A,A,U)><U>
+T5075.loop: <SP(A,A,SCS(C1(L)),A,A,A,A,A)><LP(A,A,LCL(C1(L)),A,A,A,L)><L>
 
 
 
@@ -13,6 +13,6 @@ T5075.loop:
 
 ==================== Strictness signatures ====================
 T5075.$trModule:
-T5075.loop: <SP(A,A,MCM(CS(U)),A,A,A,A,A)><UP(A,A,UCU(CS(U)),A,A,A,U)><U>
+T5075.loop: <1P(A,A,SCS(C1(L)),A,A,A,A,A)><LP(A,A,LCL(C1(L)),A,A,A,L)><L>
 
 
diff --git a/testsuite/tests/stranal/sigs/T8569.stderr b/testsuite/tests/stranal/sigs/T8569.stderr
index cc7a5e9fb0..187047e612 100644
--- a/testsuite/tests/stranal/sigs/T8569.stderr
+++ b/testsuite/tests/stranal/sigs/T8569.stderr
@@ -4,7 +4,7 @@ T8569.$tc'Rdata:
 T8569.$tc'Rint:
 T8569.$tcRep:
 T8569.$trModule:
-T8569.addUp: <SU><U>
+T8569.addUp: <1L><L>
 
 
 
@@ -22,6 +22,6 @@ T8569.$tc'Rdata:
 T8569.$tc'Rint:
 T8569.$tcRep:
 T8569.$trModule:
-T8569.addUp: <SU><U>
+T8569.addUp: <1L><L>
 
 
diff --git a/testsuite/tests/stranal/sigs/T8598.stderr b/testsuite/tests/stranal/sigs/T8598.stderr
index 7e68094018..9f49534945 100644
--- a/testsuite/tests/stranal/sigs/T8598.stderr
+++ b/testsuite/tests/stranal/sigs/T8598.stderr
@@ -1,7 +1,7 @@
 
 ==================== Strictness signatures ====================
 T8598.$trModule:
-T8598.fun: <SP(U)>
+T8598.fun: <1P(L)>
 
 
 
@@ -13,6 +13,6 @@ T8598.fun: m1
 
 ==================== Strictness signatures ====================
 T8598.$trModule:
-T8598.fun: <SP(U)>
+T8598.fun: <1P(L)>
 
 
diff --git a/testsuite/tests/stranal/sigs/UnsatFun.stderr b/testsuite/tests/stranal/sigs/UnsatFun.stderr
index 18723bad40..691fe21c98 100644
--- a/testsuite/tests/stranal/sigs/UnsatFun.stderr
+++ b/testsuite/tests/stranal/sigs/UnsatFun.stderr
@@ -1,13 +1,13 @@
 
 ==================== Strictness signatures ====================
 UnsatFun.$trModule:
-UnsatFun.f: <SP(M)><B>b
-UnsatFun.g: <SP(M)>b
-UnsatFun.g': <1P(U)>
+UnsatFun.f: <1P(S)><B>b
+UnsatFun.g: <1P(S)>b
+UnsatFun.g': <MP(L)>
 UnsatFun.g3: <A>
-UnsatFun.h: <SCS(U)>
-UnsatFun.h2: <SU><1C1(U)>
-UnsatFun.h3: <SCS(A)>
+UnsatFun.h: <1C1(L)>
+UnsatFun.h2: <1L><MCM(L)>
+UnsatFun.h3: <1C1(A)>
 
 
 
@@ -25,12 +25,12 @@ UnsatFun.h3: m1
 
 ==================== Strictness signatures ====================
 UnsatFun.$trModule:
-UnsatFun.f: <SP(M)><B>b
-UnsatFun.g: <SP(M)>b
-UnsatFun.g': <1P(U)>
+UnsatFun.f: <1P(S)><B>b
+UnsatFun.g: <1P(S)>b
+UnsatFun.g': <MP(L)>
 UnsatFun.g3: <A>
-UnsatFun.h: <SCS(U)>
-UnsatFun.h2: <SU><1C1(U)>
-UnsatFun.h3: <SCS(A)>
+UnsatFun.h: <1C1(L)>
+UnsatFun.h2: <1L><MCM(L)>
+UnsatFun.h3: <1C1(A)>