Commit 4a7acfe8 authored by chak@cse.unsw.edu.au.'s avatar chak@cse.unsw.edu.au.
Browse files

finished product unboxing through newtypes and proper demand analysis of newtypes

Mon Sep 18 14:48:02 EDT 2006  Manuel M T Chakravarty <chak@cse.unsw.edu.au>
  * finished product unboxing through newtypes and proper demand analysis of newtypes
  Sat Aug  5 21:45:32 EDT 2006  Manuel M T Chakravarty <chak@cse.unsw.edu.au>
    * finished product unboxing through newtypes and proper demand analysis of newtypes
    Mon Jul 17 06:52:11 EDT 2006  kevind@bu.edu
parent a6cbfa87
......@@ -26,7 +26,7 @@ module MkId (
-- And some particular Ids; see below for why they are wired in
wiredInIds, ghcPrimIds,
unsafeCoerceId, realWorldPrimId, voidArgId, nullAddrId, seqId,
lazyId, lazyIdUnfolding, lazyIdKey,
lazyId, lazyIdUnfolding, lazyIdKey,
mkRuntimeErrorApp,
rEC_CON_ERROR_ID, iRREFUT_PAT_ERROR_ID, rUNTIME_ERROR_ID,
......@@ -46,7 +46,7 @@ import TysPrim ( openAlphaTyVars, alphaTyVar, alphaTy,
)
import TysWiredIn ( charTy, mkListTy )
import PrelRules ( primOpRules )
import Type ( TyThing(..), mkForAllTy, tyVarsOfTypes, newTyConInstRhs )
import Type ( TyThing(..), mkForAllTy, tyVarsOfTypes, newTyConInstRhs, coreEqType )
import Coercion ( mkSymCoercion, mkUnsafeCoercion,
splitRecNewTypeCo_maybe )
import TcType ( Type, ThetaType, mkDictTy, mkPredTys, mkPredTy,
......@@ -62,7 +62,7 @@ import TyCon ( TyCon, isNewTyCon, tyConDataCons, FieldLabel,
tyConStupidTheta, isProductTyCon, isDataTyCon, isRecursiveTyCon,
newTyConCo, tyConArity )
import Class ( Class, classTyCon, classSelIds )
import Var ( Id, TyVar, Var )
import Var ( Id, TyVar, Var, setIdType )
import VarSet ( isEmptyVarSet, subVarSet, varSetElems )
import Name ( mkFCallName, mkWiredInName, Name, BuiltInSyntax(..) )
import OccName ( mkOccNameFS, varName )
......@@ -579,27 +579,30 @@ mkRecordSelId tycon field_label
-- The Ints passed around are just for creating fresh locals
unboxProduct :: Int -> CoreExpr -> Type -> (Int -> [Id] -> CoreExpr) -> Type -> CoreExpr
unboxProduct i arg arg_ty body res_ty
= mkUnpackCase the_id arg con_args boxing_con rhs
= result
where
(_, _, boxing_con, tys) = deepSplitProductType "unboxProduct" arg_ty
result = mkUnpackCase the_id arg arg_ty con_args boxing_con rhs
(tycon, tycon_args, boxing_con, tys) = deepSplitProductType "unboxProduct" arg_ty
([the_id], i') = mkLocals i [arg_ty]
(con_args, i'') = mkLocals i' tys
rhs = body i'' con_args
mkUnpackCase :: Id -> CoreExpr -> [Id] -> DataCon -> CoreExpr -> CoreExpr
mkUnpackCase :: Id -> CoreExpr -> Type -> [Id] -> DataCon -> CoreExpr -> CoreExpr
-- (mkUnpackCase x e args Con body)
-- returns
-- case (e `cast` ...) of bndr { Con args -> body }
mkUnpackCase bndr arg unpk_args boxing_con body
= Case cast_arg bndr (exprType body) [(DataAlt boxing_con, unpk_args, body)]
--
-- the type of the bndr passed in is irrelevent
mkUnpackCase bndr arg arg_ty unpk_args boxing_con body
= Case cast_arg (setIdType bndr bndr_ty) (exprType body) [(DataAlt boxing_con, unpk_args, body)]
where
cast_arg = go (idType bndr) arg
(cast_arg, bndr_ty) = go (idType bndr) arg
go ty arg
| res@(tycon, tycon_args, _, _) <- splitProductType "mkUnpackCase" ty
, isNewTyCon tycon && not (isRecursiveTyCon tycon)
= go (newTyConInstRhs tycon tycon_args)
(unwrapNewTypeBody tycon tycon_args arg)
| otherwise = arg
| otherwise = (arg, ty)
-- ...and the dual
reboxProduct :: [Unique] -- uniques to create new local binders
......
......@@ -15,7 +15,7 @@ import Id ( Id, idType, mkSysLocal, idNewDemandInfo, setIdNewDemandInfo,
setIdInfo
)
import IdInfo ( vanillaIdInfo )
import DataCon ( deepSplitProductType_maybe, splitProductType )
import DataCon ( deepSplitProductType_maybe, deepSplitProductType )
import NewDemand ( Demand(..), DmdResult(..), Demands(..) )
import MkId ( realWorldPrimId, voidArgId, mkRuntimeErrorApp, rUNTIME_ERROR_ID,
mkUnpackCase, mkProductBox )
......@@ -347,7 +347,7 @@ mkWWstr_one arg
let
unpk_args = zipWith mk_ww_local uniqs inst_con_arg_tys
unpk_args_w_ds = zipWithEqual "mkWWstr" set_worker_arg_info unpk_args cs
unbox_fn = mkUnpackCase (sanitiseCaseBndr arg) (Var arg) unpk_args data_con
unbox_fn = mkUnpackCase (sanitiseCaseBndr arg) (Var arg) (idType arg) unpk_args data_con
rebox_fn = Let (NonRec arg con_app)
con_app = mkProductBox unpk_args (idType arg)
in
......@@ -428,10 +428,10 @@ mkWWcpr body_ty RetCPR
let
work_wild = mk_ww_local work_uniq body_ty
arg = mk_ww_local arg_uniq con_arg_ty1
con_app = mkConApp data_con (map Type tycon_arg_tys ++ [Var arg])
con_app = mkProductBox [arg] body_ty
in
returnUs (\ wkr_call -> Case wkr_call arg (exprType con_app) [(DEFAULT, [], con_app)],
\ body -> workerCase body work_wild con_arg_ty1 [(DataAlt data_con, [arg], Var arg)],
returnUs (\ wkr_call -> Case wkr_call (arg) (exprType con_app) [(DEFAULT, [], con_app)],
\ body -> workerCase (work_wild) body body_ty [arg] data_con (Var arg),
con_arg_ty1)
| otherwise -- The general case
......@@ -444,10 +444,10 @@ mkWWcpr body_ty RetCPR
ubx_tup_con = tupleCon Unboxed n_con_args
ubx_tup_ty = exprType ubx_tup_app
ubx_tup_app = mkConApp ubx_tup_con (map Type con_arg_tys ++ arg_vars)
con_app = mkProductBox arg_vars body_ty
con_app = mkProductBox args body_ty
in
returnUs (\ wkr_call -> Case wkr_call wrap_wild (exprType con_app) [(DataAlt ubx_tup_con, args, con_app)],
\ body -> workerCase body work_wild ubx_tup_ty [(DataAlt data_con, args, ubx_tup_app)],
returnUs (\ wkr_call -> Case wkr_call (wrap_wild) (exprType con_app) [(DataAlt ubx_tup_con, args, con_app)],
\ body -> workerCase (work_wild) body body_ty args data_con ubx_tup_app,
ubx_tup_ty)
where
(_, tycon_arg_tys, data_con, con_arg_tys) = deepSplitProductType "mkWWcpr" body_ty
......@@ -468,8 +468,8 @@ mkWWcpr body_ty other -- No CPR info
-- This transform doesn't move work or allocation
-- from one cost centre to another
workerCase (Note (SCC cc) e) arg ty alts = Note (SCC cc) (Case e arg ty alts)
workerCase e arg ty alts = Case e arg ty alts
workerCase bndr (Note (SCC cc) e) ty args con body = Note (SCC cc) (mkUnpackCase bndr e ty args con body)
workerCase bndr e ty args con body = mkUnpackCase bndr e ty args con body
\end{code}
......@@ -491,13 +491,6 @@ mk_absent_let arg body
abs_rhs = mkRuntimeErrorApp rUNTIME_ERROR_ID arg_ty msg
msg = "Oops! Entered absent arg " ++ showSDocDebug (ppr arg <+> ppr (idType arg))
mk_unpk_case arg unpk_args boxing_con boxing_tycon body
-- A data type
= Case (Var arg)
(sanitiseCaseBndr arg)
(exprType body)
[(DataAlt boxing_con, unpk_args, body) ]
mk_seq_case arg body = Case (Var arg) (sanitiseCaseBndr arg) (exprType body) [(DEFAULT, [], body)]
sanitiseCaseBndr :: Id -> Id
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment