X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FcoreSyn%2FCorePrep.lhs;h=88fa8b7612901a6f98229e9732955afc91e0c51b;hb=2b80dae352da3a5a65a05d213b19adeb6baddf48;hp=3b8f5778cd800354b78e520e5e9960d5328f27a0;hpb=49c98d143c382a1341e1046f5ca00819a25691ba;p=ghc-hetmet.git

diff --git a/compiler/coreSyn/CorePrep.lhs b/compiler/coreSyn/CorePrep.lhs
index 3b8f577..88fa8b7 100644
--- a/compiler/coreSyn/CorePrep.lhs
+++ b/compiler/coreSyn/CorePrep.lhs
@@ -23,6 +23,7 @@ import Var
 import VarSet
 import VarEnv
 import Id
+import IdInfo
 import DataCon
 import PrimOp
 import BasicTypes
@@ -33,6 +34,9 @@ import ErrUtils
 import DynFlags
 import Util
 import Outputable
+import TysWiredIn
+import MkId
+import TysPrim
 \end{code}
 
 -- ---------------------------------------------------------------------------
@@ -380,6 +384,36 @@ corePrepExprFloat env (Note n@(SCC _) expr)
     deLamFloat expr1			`thenUs` \ (floats, expr2) ->
     returnUs (floats, Note n expr2)
 
+corePrepExprFloat env (Case (Var id) bndr ty [(DEFAULT,[],expr)])
+  | Just (TickBox {}) <- isTickBoxOp_maybe id
+  = corePrepAnExpr env expr            `thenUs` \ expr1 ->
+    deLamFloat expr1                   `thenUs` \ (floats, expr2) ->
+    return (floats, Case (Var id) bndr ty [(DEFAULT,[],expr2)])
+
+-- Translate Binary tickBox into standard tickBox
+corePrepExprFloat env (App (Var id) expr)
+  | Just (BinaryTickBox m t e) <- isTickBoxOp_maybe id
+  = corePrepAnExpr env expr            `thenUs` \ expr1 ->
+    deLamFloat expr1                   `thenUs` \ (floats, expr2) ->
+    getUniqueUs                        `thenUs` \ u1 ->
+    getUniqueUs                        `thenUs` \ u2 ->
+    getUniqueUs                        `thenUs` \ u3 ->
+    getUniqueUs                        `thenUs` \ u4 ->
+    getUniqueUs                        `thenUs` \ u5 ->
+    let bndr1 = mkSysLocal FSLIT("t1") u1 boolTy in
+    let bndr2 = mkSysLocal FSLIT("t2") u2 realWorldStatePrimTy in
+    let bndr3 = mkSysLocal FSLIT("t3") u3 realWorldStatePrimTy in
+    let tick_e  = mkTickBoxOpId u4 m e in
+    let tick_t  = mkTickBoxOpId u5 m t in
+    return (floats, Case expr2
+                       bndr1
+                       boolTy
+                       [ (DataAlt falseDataCon, [], 
+			  Case (Var tick_e) bndr2 boolTy [(DEFAULT,[],Var falseDataConId)])
+                       , (DataAlt trueDataCon,  [], 
+			  Case (Var tick_t) bndr3 boolTy [(DEFAULT,[],Var trueDataConId)])
+                       ])
+
 corePrepExprFloat env (Note other_note expr)
   = corePrepExprFloat env expr		`thenUs` \ (floats, expr') ->
     returnUs (floats, Note other_note expr')
@@ -395,6 +429,38 @@ corePrepExprFloat env expr@(Lam _ _)
   where
     (bndrs,body) = collectBinders expr
 
+-- This is an (important) optimization.
+-- case <btick,A,B>  e of { T -> e1 ; F -> e2 }
+--  ==> case e of { T -> <tick,A> e1 ; F -> <tick,B> e2 }
+-- This could move into the simplifier.
+
+corePrepExprFloat env (Case (App (Var id) expr) bndr ty alts)
+  | Just (BinaryTickBox m t e) <- isTickBoxOp_maybe id
+  = getUniqueUs                        `thenUs` \ u1 ->
+    getUniqueUs                        `thenUs` \ u2 ->
+    getUniqueUs                        `thenUs` \ u3 ->
+    getUniqueUs                        `thenUs` \ u4 ->
+    getUniqueUs                        `thenUs` \ u5 ->
+    let bndr1 = mkSysLocal FSLIT("t1") u1 boolTy in
+    let bndr2 = mkSysLocal FSLIT("t2") u2 realWorldStatePrimTy in
+    let bndr3 = mkSysLocal FSLIT("t3") u3 realWorldStatePrimTy in
+    let tick_e  = mkTickBoxOpId u4 m e in
+    let tick_t  = mkTickBoxOpId u5 m t in
+    ASSERT (exprType expr `coreEqType` boolTy)
+    corePrepExprFloat env $
+		Case expr
+                       bndr1
+                       ty
+                       [ (DataAlt falseDataCon, [], 
+			  Case (Var tick_e) bndr2 ty [(DEFAULT,[],falseBranch)])
+                       , (DataAlt trueDataCon,  [], 
+			  Case (Var tick_t) bndr3 ty [(DEFAULT,[],trueBranch)])
+                       ]
+
+   where
+       (_,_,trueBranch)  = findAlt (DataAlt trueDataCon) alts
+       (_,_,falseBranch) = findAlt (DataAlt falseDataCon) alts
+
 corePrepExprFloat env (Case scrut bndr ty alts)
   = corePrepExprFloat env scrut		`thenUs` \ (floats1, scrut1) ->
     deLamFloat scrut1			`thenUs` \ (floats2, scrut2) ->