X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fstranal%2FWwLib.lhs;h=31d09901ec9fdaa2a1f9ffe3778964c65a719d75;hp=f3af6f0395797e0c7caaed4997f462e94876d025;hb=7fc749a43b4b6b85d234fa95d4928648259584f4;hpb=f3c4792fad3bf46e5ee500a909287718324c45d1 diff --git a/compiler/stranal/WwLib.lhs b/compiler/stranal/WwLib.lhs index f3af6f0..31d0990 100644 --- a/compiler/stranal/WwLib.lhs +++ b/compiler/stranal/WwLib.lhs @@ -4,6 +4,13 @@ \section[WwLib]{A library for the ``worker/wrapper'' back-end to the strictness analyser} \begin{code} +{-# OPTIONS -w #-} +-- The above warning supression flag is a temporary kludge. +-- While working on this module you are encouraged to remove it and fix +-- any warnings in the module. See +-- http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings +-- for details + module WwLib ( mkWwBodies, mkWWstr, mkWorkerArgs ) where #include "HsVersions.h" @@ -15,14 +22,15 @@ import Id ( Id, idType, mkSysLocal, idNewDemandInfo, setIdNewDemandInfo, setIdInfo ) import IdInfo ( vanillaIdInfo ) -import DataCon ( splitProductType_maybe, splitProductType ) +import DataCon ( deepSplitProductType_maybe, deepSplitProductType ) import NewDemand ( Demand(..), DmdResult(..), Demands(..) ) -import MkId ( realWorldPrimId, voidArgId, mkRuntimeErrorApp, rUNTIME_ERROR_ID ) +import MkId ( realWorldPrimId, voidArgId, mkRuntimeErrorApp, rUNTIME_ERROR_ID, + mkUnpackCase, mkProductBox ) import TysWiredIn ( tupleCon ) import Type ( Type, isUnLiftedType, mkFunTys, - splitForAllTys, splitFunTys, splitRecNewType_maybe, isAlgType + splitForAllTys, splitFunTys, isAlgType ) -import Coercion ( Coercion, mkSymCoercion, splitRecNewTypeCo_maybe ) +import Coercion ( mkSymCoercion, splitNewTypeRepCo_maybe ) import BasicTypes ( Boxity(..) ) import Var ( Var, isId ) import UniqSupply ( returnUs, thenUs, getUniquesUs, UniqSM ) @@ -131,9 +139,9 @@ mkWwBodies fun_ty demands res_info one_shots mkWWcpr res_ty res_info else returnUs (id, id, res_ty) - ) `thenUs` \ (wrap_fn_cpr, work_fn_cpr, cpr_res_ty) -> + ) `thenUs` \ (wrap_fn_cpr, work_fn_cpr, _cpr_res_ty) -> - returnUs ([idNewDemandInfo v | v <- work_args, isId v], + returnUs ([idNewDemandInfo v | v <- work_call_args, isId v], Note InlineMe . wrap_fn_args . wrap_fn_cpr . wrap_fn_str . applyToVars work_call_args . Var, mkLams work_lam_args. work_fn_str . work_fn_cpr . work_fn_args) -- We use an INLINE unconditionally, even if the wrapper turns out to be @@ -224,7 +232,7 @@ mkWWargs :: Type Type) -- Type of wrapper body mkWWargs fun_ty demands one_shots - | Just (rep_ty, co) <- splitRecNewTypeCo_maybe fun_ty + | Just (rep_ty, co) <- splitNewTypeRepCo_maybe fun_ty -- The newtype case is for when the function has -- a recursive newtype after the arrow (rare) -- We check for arity >= 0 to avoid looping in the case @@ -237,10 +245,9 @@ mkWWargs fun_ty demands one_shots -- simply coerces. = mkWWargs rep_ty demands one_shots `thenUs` \ (wrap_args, wrap_fn_args, work_fn_args, res_ty) -> returnUs (wrap_args, - \ e -> Cast (wrap_fn_args e) co, - \ e -> work_fn_args (Cast e (mkSymCoercion co)), + \ e -> Cast (wrap_fn_args e) (mkSymCoercion co), + \ e -> work_fn_args (Cast e co), res_ty) - | notNull demands = getUniquesUs `thenUs` \ wrap_uniqs -> let @@ -341,18 +348,18 @@ mkWWstr_one arg -- Unpack case Eval (Prod cs) - | Just (arg_tycon, tycon_arg_tys, data_con, inst_con_arg_tys) - <- splitProductType_maybe (idType arg) + | Just (_arg_tycon, _tycon_arg_tys, data_con, inst_con_arg_tys) + <- deepSplitProductType_maybe (idType arg) -> getUniquesUs `thenUs` \ uniqs -> 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 = mk_unpk_case arg unpk_args data_con arg_tycon + unbox_fn = mkUnpackCase (sanitiseCaseBndr arg) (Var arg) unpk_args data_con rebox_fn = Let (NonRec arg con_app) - con_app = mkConApp data_con (map Type tycon_arg_tys ++ map Var unpk_args) + con_app = mkProductBox unpk_args (idType arg) in mkWWstr unpk_args_w_ds `thenUs` \ (worker_args, wrap_fn, work_fn) -> - returnUs (worker_args, unbox_fn . wrap_fn, work_fn . rebox_fn) + returnUs (worker_args, unbox_fn . wrap_fn, work_fn . rebox_fn) -- Don't pass the arg, rebox instead -- `seq` demand; evaluate in wrapper in the hope @@ -428,10 +435,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 [arg] data_con (Var arg), con_arg_ty1) | otherwise -- The general case @@ -444,13 +451,13 @@ 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 = mkConApp data_con (map Type tycon_arg_tys ++ arg_vars) + 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 args data_con ubx_tup_app, ubx_tup_ty) where - (_, tycon_arg_tys, data_con, con_arg_tys) = splitProductType "mkWWcpr" body_ty + (_arg_tycon, _tycon_arg_tys, data_con, con_arg_tys) = deepSplitProductType "mkWWcpr" body_ty n_con_args = length con_arg_tys con_arg_ty1 = head con_arg_tys @@ -468,8 +475,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) args con body = Note (SCC cc) (mkUnpackCase bndr e args con body) +workerCase bndr e args con body = mkUnpackCase bndr e args con body \end{code} @@ -491,13 +498,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