X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fstranal%2FWwLib.lhs;h=54248a706443980a2688c412a1062ee5dccf31ae;hb=2d11beb698945ebfe472885def09fefa2f0d423e;hp=ed3710aaa4d6c10a13aa823aebeaa21d092558f6;hpb=2c8f04b5b883db74f449dfc8c224929fe28b027d;p=ghc-hetmet.git diff --git a/ghc/compiler/stranal/WwLib.lhs b/ghc/compiler/stranal/WwLib.lhs index ed3710a..54248a7 100644 --- a/ghc/compiler/stranal/WwLib.lhs +++ b/ghc/compiler/stranal/WwLib.lhs @@ -1,62 +1,37 @@ % -% (c) The GRASP/AQUA Project, Glasgow University, 1993-1996 +% (c) The GRASP/AQUA Project, Glasgow University, 1993-1998 % \section[WwLib]{A library for the ``worker/wrapper'' back-end to the strictness analyser} \begin{code} -module WwLib ( - WwBinding(..), - - worthSplitting, setUnpackStrategy, - mkWwBodies, mkWrapper - ) where +module WwLib ( mkWwBodies ) where #include "HsVersions.h" import CoreSyn -import MkId ( mkSysLocal ) -import Id ( idType, dataConArgTys, isDataCon, isNewCon, Id ) -import IdInfo ( Demand(..) ) -import PrelVals ( aBSENT_ERROR_ID, voidId ) -import TysPrim ( voidTy ) -import SrcLoc ( noSrcLoc ) -import Type ( isUnpointedType, mkTyVarTys, mkFunTys, - splitForAllTys, splitFunTys, - splitAlgTyConApp_maybe, - Type +import CoreUtils ( exprType ) +import Id ( Id, idType, mkSysLocal, idNewDemandInfo, setIdNewDemandInfo, + isOneShotLambda, setOneShotLambda, + setIdInfo + ) +import IdInfo ( vanillaIdInfo ) +import DataCon ( splitProductType_maybe, splitProductType ) +import NewDemand ( Demand(..), Keepity(..), DmdResult(..) ) +import PrelInfo ( realWorldPrimId, aBSENT_ERROR_ID, eRROR_CSTRING_ID ) +import TysPrim ( realWorldStatePrimTy ) +import TysWiredIn ( tupleCon ) +import Type ( Type, isUnLiftedType, mkFunTys, + splitForAllTys, splitFunTys, splitNewType_maybe, isAlgType ) -import TyCon ( isNewTyCon, isDataTyCon ) -import BasicTypes ( NewOrData(..) ) -import TyVar ( TyVar ) -import UniqSupply ( returnUs, thenUs, getUniques, getUnique, UniqSM ) -import Util ( zipEqual, zipWithEqual ) +import Literal ( Literal(MachStr) ) +import BasicTypes ( Arity, Boxity(..) ) +import Var ( Var, isId ) +import UniqSupply ( returnUs, thenUs, getUniqueUs, getUniquesUs, UniqSM ) +import Util ( zipWithEqual ) import Outputable +import List ( zipWith4 ) \end{code} -%************************************************************************ -%* * -\subsection[datatype-WwLib]{@WwBinding@: a datatype for worker/wrapper-ing} -%* * -%************************************************************************ - -In the worker/wrapper stuff, we want to carry around @CoreBindings@ in -an ``intermediate form'' that can later be turned into a \tr{let} or -\tr{case} (depending on strictness info). - -\begin{code} -data WwBinding - = WwLet [CoreBinding] - | WwCase (CoreExpr -> CoreExpr) - -- the "case" will be a "strict let" of the form: - -- - -- case rhs of - -- -> body - -- - -- (instead of "let = rhs in body") - -- - -- The expr you pass to the function is "body" (the - -- expression that goes "in the corner"). -\end{code} %************************************************************************ %* * @@ -64,54 +39,8 @@ data WwBinding %* * %************************************************************************ - ************ WARNING ****************** - these comments are rather out of date - ***************************************** - -@mkWrapperAndWorker@ is given: -\begin{enumerate} -\item -The {\em original function} \tr{f}, of the form: -\begin{verbatim} -f = /\ tyvars -> \ args -> body -\end{verbatim} -The original-binder \tr{f}, the \tr{tyvars}, \tr{args}, and \tr{body} -are given separately. - -We use the Id \tr{f} mostly to get its type. - -\item -Strictness information about \tr{f}, in the form of a list of -@Demands@. - -\item -A @UniqueSupply@. -\end{enumerate} - -@mkWrapperAndWorker@ produces (A BIT OUT-OF-DATE...): -\begin{enumerate} -\item -Maybe @Nothing@: no worker/wrappering going on in this case. This can -happen (a)~if the strictness info says that there is nothing -interesting to do or (b)~if *any* of the argument types corresponding -to ``active'' arg postitions is abstract or will be to the outside -world (i.e., {\em this} module can see the constructors, but nobody -else will be able to). An ``active'' arg position is one which the -wrapper has to unpack. An importing module can't do this unpacking, -so it simply has to give up and call the wrapper only. - -\item -Maybe \tr{Just (wrapper_Id, wrapper_body, worker_Id, worker_body)}. - -The @wrapper_Id@ is just the one that was passed in, with its -strictness IdInfo updated. -\end{enumerate} - -The \tr{body} of the original function may not be given (i.e., it's -BOTTOM), in which case you'd jolly well better not tug on the -worker-body output! - Here's an example. The original function is: + \begin{verbatim} g :: forall a . Int -> [a] -> a @@ -128,13 +57,13 @@ g :: forall a . Int -> [a] -> a g = /\ a -> \ x ys -> case x of - I# x# -> g.wrk a x# ys + I# x# -> $wg a x# ys -- call the worker; don't forget the type args! -- worker -g.wrk :: forall a . Int# -> [a] -> a +$wg :: forall a . Int# -> [a] -> a -g.wrk = /\ a -> \ x# ys -> +$wg = /\ a -> \ x# ys -> let x = I# x# in @@ -144,12 +73,14 @@ g.wrk = /\ a -> \ x# ys -> \end{verbatim} Something we have to be careful about: Here's an example: + \begin{verbatim} -- "f" strictness: U(P)U(P) f (I# a) (I# b) = a +# b g = f -- "g" strictness same as "f" \end{verbatim} + \tr{f} will get a worker all nice and friendly-like; that's good. {\em But we don't want a worker for \tr{g}}, even though it has the same strictness as \tr{f}. Doing so could break laziness, at best. @@ -163,189 +94,351 @@ the unusable strictness-info into the interfaces. %************************************************************************ %* * -\subsection{Functions over Demands} +\subsection{The worker wrapper core} %* * %************************************************************************ -\begin{code} -mAX_WORKER_ARGS :: Int -- ToDo: set via flag -mAX_WORKER_ARGS = 6 +@mkWwBodies@ is called when doing the worker/wrapper split inside a module. -setUnpackStrategy :: [Demand] -> [Demand] -setUnpackStrategy ds - = snd (go (mAX_WORKER_ARGS - nonAbsentArgs ds) ds) +\begin{code} +mkWwBodies :: Type -- Type of original function + -> [Demand] -- Strictness of original function + -> DmdResult -- Info about function result + -> [Bool] -- One-shot-ness of the function + -> UniqSM ([Demand], -- Demands for worker (value) args + Id -> CoreExpr, -- Wrapper body, lacking only the worker Id + CoreExpr -> CoreExpr) -- Worker body, lacking the original function rhs + +-- wrap_fn_args E = \x y -> E +-- work_fn_args E = E x y + +-- wrap_fn_str E = case x of { (a,b) -> +-- case a of { (a1,a2) -> +-- E a1 a2 b y }} +-- work_fn_str E = \a2 a2 b y -> +-- let a = (a1,a2) in +-- let x = (a,b) in +-- E + +mkWwBodies fun_ty demands res_info one_shots + = mkWWargs fun_ty demands one_shots' `thenUs` \ (wrap_args, wrap_fn_args, work_fn_args, res_ty) -> + mkWWcpr res_ty res_info `thenUs` \ (wrap_fn_cpr, work_fn_cpr, cpr_res_ty) -> + mkWWstr cpr_res_ty wrap_args `thenUs` \ (work_dmds, wrap_fn_str, work_fn_str) -> + + returnUs (work_dmds, + Note InlineMe . wrap_fn_args . wrap_fn_cpr . wrap_fn_str . Var, + work_fn_str . work_fn_cpr . work_fn_args) + -- We use an INLINE unconditionally, even if the wrapper turns out to be + -- something trivial like + -- fw = ... + -- f = __inline__ (coerce T fw) + -- The point is to propagate the coerce to f's call sites, so even though + -- f's RHS is now trivial (size 1) we still want the __inline__ to prevent + -- fw from being inlined into f's RHS where - go :: Int -- Max number of args available for sub-components of [Demand] - -> [Demand] - -> (Int, [Demand]) -- Args remaining after subcomponents of [Demand] are unpacked - - go n (WwUnpack nd _ cs : ds) | n' >= 0 - = WwUnpack nd True cs' `cons` go n'' ds - | otherwise - = WwUnpack nd False cs `cons` go n ds - where - n' = n + 1 - nonAbsentArgs cs - -- Add one because we don't pass the top-level arg any more - -- Delete # of non-absent args to which we'll now be committed - (n'',cs') = go n' cs - - go n (d:ds) = d `cons` go n ds - go n [] = (n,[]) - - cons d (n,ds) = (n, d:ds) - -nonAbsentArgs :: [Demand] -> Int -nonAbsentArgs [] = 0 -nonAbsentArgs (WwLazy True : ds) = nonAbsentArgs ds -nonAbsentArgs (d : ds) = 1 + nonAbsentArgs ds - -worthSplitting :: [Demand] -> Bool -- True <=> the wrapper would not be an identity function -worthSplitting [] = False -worthSplitting (WwLazy True : ds) = True -- Absent arg -worthSplitting (WwUnpack _ True _ : ds) = True -- Arg to unpack -worthSplitting (d : ds) = worthSplitting ds - -allAbsent :: [Demand] -> Bool -allAbsent (WwLazy True : ds) = allAbsent ds -allAbsent (WwUnpack _ True cs : ds) = allAbsent cs && allAbsent ds -allAbsent (d : ds) = False -allAbsent [] = True + one_shots' = one_shots ++ repeat False \end{code} %************************************************************************ %* * -\subsection{The worker wrapper core} +\subsection{Coercion stuff} %* * %************************************************************************ -@mkWrapper@ is called when importing a function. We have the type of -the function and the name of its worker, and we want to make its body (the wrapper). -\begin{code} -mkWrapper :: Type -- Wrapper type - -> [Demand] -- Wrapper strictness info - -> UniqSM (Id -> CoreExpr) -- Wrapper body, missing worker Id +We really want to "look through" coerces. +Reason: I've seen this situation: -mkWrapper fun_ty demands - = let - n_wrap_args = length demands - in - getUniques n_wrap_args `thenUs` \ wrap_uniqs -> + let f = coerce T (\s -> E) + in \x -> case x of + p -> coerce T' f + q -> \s -> E2 + r -> coerce T' f + +If only we w/w'd f, we'd get + let f = coerce T (\s -> fw s) + fw = \s -> E + in ... + +Now we'll inline f to get + + let fw = \s -> E + in \x -> case x of + p -> fw + q -> \s -> E2 + r -> fw + +Now we'll see that fw has arity 1, and will arity expand +the \x to get what we want. + +\begin{code} +-- mkWWargs is driven off the function type and arity. +-- It chomps bites off foralls, arrows, newtypes +-- and keeps repeating that until it's satisfied the supplied arity + +mkWWargs :: Type + -> [Demand] + -> [Bool] -- True for a one-shot arg; ** may be infinite ** + -> UniqSM ([Var], -- Wrapper args + CoreExpr -> CoreExpr, -- Wrapper fn + CoreExpr -> CoreExpr, -- Worker fn + Type) -- Type of wrapper body + +mkWWargs fun_ty demands one_shots + | Just rep_ty <- splitNewType_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 + -- of a function whose type is, in effect, infinite + -- [Arity is driven by looking at the term, not just the type.] + -- + -- It's also important when we have a function returning (say) a pair + -- wrapped in a recursive newtype, at least if CPR analysis can look + -- through such newtypes, which it probably can since they are + -- simply coerces. + = mkWWargs rep_ty demands one_shots `thenUs` \ (wrap_args, wrap_fn_args, work_fn_args, res_ty) -> + returnUs (wrap_args, + Note (Coerce fun_ty rep_ty) . wrap_fn_args, + work_fn_args . Note (Coerce rep_ty fun_ty), + res_ty) + + | not (null demands) + = getUniquesUs `thenUs` \ wrap_uniqs -> let - (tyvars, tau_ty) = splitForAllTys fun_ty - (arg_tys, body_ty) = splitFunTys tau_ty - -- The "expanding dicts" part here is important, even for the splitForAll - -- The imported thing might be a dictionary, such as Functor Foo - -- But Functor Foo = forall a b. (a->b) -> Foo a -> Foo b - -- and as such might have some strictness info attached. - -- Then we need to have enough args to zip to the strictness info - - wrap_args = ASSERT( n_wrap_args <= length arg_tys ) - zipWith mk_ww_local wrap_uniqs arg_tys - - leftover_arg_tys = drop n_wrap_args arg_tys - final_body_ty = mkFunTys leftover_arg_tys body_ty + (tyvars, tau) = splitForAllTys fun_ty + (arg_tys, body_ty) = splitFunTys tau + + n_demands = length demands + n_arg_tys = length arg_tys + n_args = n_demands `min` n_arg_tys + + new_fun_ty = mkFunTys (drop n_demands arg_tys) body_ty + new_demands = drop n_arg_tys demands + new_one_shots = drop n_args one_shots + + val_args = zipWith4 mk_wrap_arg wrap_uniqs arg_tys demands one_shots + wrap_args = tyvars ++ val_args in - mkWwBodies tyvars wrap_args final_body_ty demands `thenUs` \ (wrap_fn, _, _) -> - returnUs wrap_fn +{- ASSERT( not (null tyvars) || not (null arg_tys) ) -} + if (null tyvars) && (null arg_tys) then + pprTrace "mkWWargs" (ppr fun_ty $$ ppr demands) + returnUs ([], id, id, fun_ty) + else + + mkWWargs new_fun_ty + new_demands + new_one_shots `thenUs` \ (more_wrap_args, wrap_fn_args, work_fn_args, res_ty) -> + + returnUs (wrap_args ++ more_wrap_args, + mkLams wrap_args . wrap_fn_args, + work_fn_args . applyToVars wrap_args, + res_ty) + + | otherwise + = returnUs ([], id, id, fun_ty) + + +applyToVars :: [Var] -> CoreExpr -> CoreExpr +applyToVars vars fn = mkVarApps fn vars + +mk_wrap_arg uniq ty dmd one_shot + = set_one_shot one_shot (setIdNewDemandInfo (mkSysLocal SLIT("w") uniq ty) dmd) + where + set_one_shot True id = setOneShotLambda id + set_one_shot False id = id \end{code} -@mkWwBodies@ is called when doing the worker/wrapper split inside a module. + +%************************************************************************ +%* * +\subsection{Strictness stuff} +%* * +%************************************************************************ \begin{code} -mkWwBodies :: [TyVar] -> [Id] -> Type -- Original fn args and body type - -> [Demand] -- Strictness info for original fn; corresp 1-1 with args - -> UniqSM (Id -> CoreExpr, -- Wrapper body, lacking only the worker Id - CoreExpr -> CoreExpr, -- Worker body, lacking the original function body - [Demand]) -- Strictness info for worker - -mkWwBodies tyvars args body_ty demands - | allAbsent demands && - isUnpointedType body_ty - = -- Horrid special case. If the worker would have no arguments, and the +mkWWstr :: Type -- Result type + -> [Var] -- Wrapper args; have their demand info on them + -- *Includes type variables* + -> UniqSM ([Demand], -- Demand on worker (value) args + CoreExpr -> CoreExpr, -- Wrapper body, lacking the worker call + -- and without its lambdas + -- This fn adds the unboxing, and makes the + -- call passing the unboxed things + + CoreExpr -> CoreExpr) -- Worker body, lacking the original body of the function, + -- but *with* lambdas + +mkWWstr res_ty wrap_args + = mk_ww_str wrap_args `thenUs` \ (work_args, take_apart, put_together) -> + let + work_dmds = [idNewDemandInfo v | v <- work_args, isId v] + apply_to args fn = mkVarApps fn args + in + if not (null work_dmds && isUnLiftedType res_ty) then + returnUs ( work_dmds, + take_apart . applyToVars work_args, + mkLams work_args . put_together) + else + -- Horrid special case. If the worker would have no arguments, and the -- function returns a primitive type value, that would make the worker into -- an unboxed value. We box it by passing a dummy void argument, thus: -- -- f = /\abc. \xyz. fw abc void -- fw = /\abc. \v. body -- - getUnique `thenUs` \ void_arg_uniq -> + -- We use the state-token type which generates no code + getUniqueUs `thenUs` \ void_arg_uniq -> let - void_arg = mk_ww_local void_arg_uniq voidTy + void_arg = mk_ww_local void_arg_uniq realWorldStatePrimTy in - returnUs (\ work_id -> mkLam tyvars args (App (mkTyApp (Var work_id) (mkTyVarTys tyvars)) (VarArg voidId)), - \ body -> mkLam tyvars [void_arg] body, - [WwLazy True]) - -mkWwBodies tyvars args body_ty demands - | otherwise - = let - args_w_demands = zipEqual "mkWwBodies" args demands - in - mkWW args_w_demands `thenUs` \ (wrap_fn, work_args_w_demands, work_fn) -> - let - (work_args, work_demands) = unzip work_args_w_demands - in - returnUs (\ work_id -> mkLam tyvars args (wrap_fn (mkTyApp (Var work_id) (mkTyVarTys tyvars))), - \ body -> mkLam tyvars work_args (work_fn body), - work_demands) -\end{code} + returnUs ([Lazy], + take_apart . applyToVars [realWorldPrimId] . apply_to work_args, + mkLams work_args . Lam void_arg . put_together) + -- Empty case +mk_ww_str [] + = returnUs ([], + \ wrapper_body -> wrapper_body, + \ worker_body -> worker_body) -\begin{code} -mkWW :: [(Id,Demand)] - -> UniqSM (CoreExpr -> CoreExpr, -- Wrapper body, lacking the inner call to the worker - -- and without its lambdas - [(Id,Demand)], -- Worker args and their demand infos - CoreExpr -> CoreExpr) -- Worker body, lacking the original body of the function +mk_ww_str (arg : ds) + | isTyVar arg + = mk_ww_str ds `thenUs` \ (worker_args, wrap_fn, work_fn) -> + returnUs (arg : worker_args, wrap_fn, work_fn) - -- Empty case -mkWW [] - = returnUs (\ wrapper_body -> wrapper_body, - [], - \ worker_body -> worker_body) + | otherwise + = case idNewDemandInfo arg of + -- Absent case. We don't deal with absence for unlifted types, + -- though, because it's not so easy to manufacture a placeholder + -- We'll see if this turns out to be a problem + Abs | not (isUnLiftedType (idType arg)) -> + mk_ww_str ds `thenUs` \ (worker_args, wrap_fn, work_fn) -> + returnUs (worker_args, wrap_fn, mk_absent_let arg . work_fn) - -- Absent case -mkWW ((arg,WwLazy True) : ds) - = mkWW ds `thenUs` \ (wrap_fn, worker_args, work_fn) -> - returnUs (\ wrapper_body -> wrap_fn wrapper_body, - worker_args, - \ worker_body -> mk_absent_let arg (work_fn worker_body)) + -- Seq and keep + Seq Keep _ [] -> mk_ww_str ds `thenUs` \ (worker_args, wrap_fn, work_fn) -> + returnUs (arg : worker_args, mk_seq_case arg . wrap_fn, work_fn) + -- Pass the arg, no need to rebox + -- Seq and discard + Seq Drop _ [] -> mk_ww_str ds `thenUs` \ (worker_args, wrap_fn, work_fn) -> + returnUs (worker_args, mk_seq_case arg . wrap_fn, mk_absent_let arg . work_fn) + -- Don't pass the arg, build absent arg -- Unpack case -mkWW ((arg,WwUnpack new_or_data True cs) : ds) - = getUniques (length inst_con_arg_tys) `thenUs` \ uniqs -> - let - unpk_args = zipWith mk_ww_local uniqs inst_con_arg_tys - unpk_args_w_ds = zipEqual "mkWW" unpk_args cs - in - mkWW (unpk_args_w_ds ++ ds) `thenUs` \ (wrap_fn, worker_args, work_fn) -> - returnUs (\ wrapper_body -> mk_unpk_case new_or_data arg unpk_args data_con arg_tycon (wrap_fn wrapper_body), - worker_args, - \ worker_body -> work_fn (mk_pk_let new_or_data arg data_con tycon_arg_tys unpk_args worker_body)) + Seq keep _ cs + | Just (arg_tycon, tycon_arg_tys, data_con, inst_con_arg_tys) + <- splitProductType_maybe (idType arg) + -> getUniquesUs `thenUs` \ uniqs -> + let + unpk_args = zipWith mk_ww_local uniqs inst_con_arg_tys + unpk_args_w_ds = zipWithEqual "mk_ww_str" set_worker_arg_info unpk_args cs + unbox_fn = mk_unpk_case arg unpk_args data_con arg_tycon + rebox_fn = mk_pk_let arg data_con tycon_arg_tys unpk_args + in + mk_ww_str (unpk_args_w_ds ++ ds) `thenUs` \ (worker_args, wrap_fn, work_fn) -> + case keep of + Keep -> returnUs (arg : worker_args, unbox_fn . wrap_fn, work_fn) + -- Pass the arg, no need to rebox + Drop -> returnUs (worker_args, unbox_fn . wrap_fn, work_fn . rebox_fn) + -- Don't pass the arg, rebox instead + + | otherwise -> + WARN( True, ppr arg ) + mk_ww_str ds `thenUs` \ (worker_args, wrap_fn, work_fn) -> + returnUs (arg : worker_args, wrap_fn, work_fn) + + -- Other cases + other_demand -> + mk_ww_str ds `thenUs` \ (worker_args, wrap_fn, work_fn) -> + returnUs (arg : worker_args, wrap_fn, work_fn) where - inst_con_arg_tys = dataConArgTys data_con tycon_arg_tys - (arg_tycon, tycon_arg_tys, data_con) - = case (splitAlgTyConApp_maybe (idType arg)) of + -- If the wrapper argument is a one-shot lambda, then + -- so should (all) the corresponding worker arguments be + -- This bites when we do w/w on a case join point + set_worker_arg_info worker_arg demand = set_one_shot (setIdNewDemandInfo worker_arg demand) - Just (arg_tycon, tycon_arg_tys, [data_con]) -> - -- The main event: a single-constructor data type - (arg_tycon, tycon_arg_tys, data_con) + set_one_shot | isOneShotLambda arg = setOneShotLambda + | otherwise = \x -> x +\end{code} - Just (_, _, data_cons) -> pprPanic "mk_ww_arg_processing: not one constr (interface files not consistent/up to date ?)" ((ppr arg) <+> (ppr (idType arg))) - Nothing -> panic "mk_ww_arg_processing: not datatype" +%************************************************************************ +%* * +\subsection{CPR stuff} +%* * +%************************************************************************ - -- Other cases -mkWW ((arg,other_demand) : ds) - = mkWW ds `thenUs` \ (wrap_fn, worker_args, work_fn) -> - returnUs (\ wrapper_body -> wrap_fn (App wrapper_body (VarArg arg)), - (arg,other_demand) : worker_args, - work_fn) + +@mkWWcpr@ takes the worker/wrapper pair produced from the strictness +info and adds in the CPR transformation. The worker returns an +unboxed tuple containing non-CPR components. The wrapper takes this +tuple and re-produces the correct structured output. + +The non-CPR results appear ordered in the unboxed tuple as if by a +left-to-right traversal of the result structure. + + +\begin{code} +mkWWcpr :: Type -- function body type + -> DmdResult -- CPR analysis results + -> UniqSM (CoreExpr -> CoreExpr, -- New wrapper + CoreExpr -> CoreExpr, -- New worker + Type) -- Type of worker's body + +mkWWcpr body_ty RetCPR + | not (isAlgType body_ty) + = WARN( True, text "mkWWcpr: non-algebraic body type" <+> ppr body_ty ) + returnUs (id, id, body_ty) + + | n_con_args == 1 && isUnLiftedType con_arg_ty1 + -- Special case when there is a single result of unlifted type + = getUniquesUs `thenUs` \ (work_uniq : arg_uniq : _) -> + let + work_wild = mk_ww_local work_uniq body_ty + arg = mk_ww_local arg_uniq con_arg_ty1 + in + returnUs (\ wkr_call -> Case wkr_call arg [(DEFAULT, [], mkConApp data_con (map Type tycon_arg_tys ++ [Var arg]))], + \ body -> workerCase body work_wild [(DataAlt data_con, [arg], Var arg)], + con_arg_ty1) + + | otherwise -- The general case + = getUniquesUs `thenUs` \ uniqs -> + let + (wrap_wild : work_wild : args) = zipWith mk_ww_local uniqs (ubx_tup_ty : body_ty : con_arg_tys) + arg_vars = map Var args + 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) + in + returnUs (\ wkr_call -> Case wkr_call wrap_wild [(DataAlt ubx_tup_con, args, con_app)], + \ body -> workerCase body work_wild [(DataAlt data_con, args, ubx_tup_app)], + ubx_tup_ty) + where + (_, tycon_arg_tys, data_con, con_arg_tys) = splitProductType "mkWWcpr" body_ty + n_con_args = length con_arg_tys + con_arg_ty1 = head con_arg_tys + +mkWWcpr body_ty other -- No CPR info + = returnUs (id, id, body_ty) + +-- If the original function looked like +-- f = \ x -> _scc_ "foo" E +-- +-- then we want the CPR'd worker to look like +-- \ x -> _scc_ "foo" (case E of I# x -> x) +-- and definitely not +-- \ x -> case (_scc_ "foo" E) of I# x -> x) +-- +-- This transform doesn't move work or allocation +-- from one cost centre to another + +workerCase (Note (SCC cc) e) arg alts = Note (SCC cc) (Case e arg alts) +workerCase e arg alts = Case e arg alts \end{code} @@ -358,42 +451,39 @@ mkWW ((arg,other_demand) : ds) \begin{code} mk_absent_let arg body - | not (isUnpointedType arg_ty) - = Let (NonRec arg (mkTyApp (Var aBSENT_ERROR_ID) [arg_ty])) body + | not (isUnLiftedType arg_ty) + = Let (NonRec arg abs_rhs) body | otherwise = panic "WwLib: haven't done mk_absent_let for primitives yet" where arg_ty = idType arg +-- abs_rhs = mkTyApps (Var aBSENT_ERROR_ID) [arg_ty] + abs_rhs = mkApps (Var eRROR_CSTRING_ID) [Type arg_ty, Lit (MachStr (_PK_ msg))] + msg = "Oops! Entered absent arg " ++ showSDocDebug (ppr arg <+> ppr (idType arg)) -mk_unpk_case NewType arg unpk_args boxing_con boxing_tycon body - -- A newtype! Use a coercion not a case - = ASSERT( null other_args && isNewTyCon boxing_tycon ) - Let (NonRec unpk_arg (Note (Coerce (idType unpk_arg) (idType arg)) (Var arg))) - body - where - (unpk_arg:other_args) = unpk_args - -mk_unpk_case DataType arg unpk_args boxing_con boxing_tycon body +mk_unpk_case arg unpk_args boxing_con boxing_tycon body -- A data type - = ASSERT( isDataTyCon boxing_tycon ) - Case (Var arg) - (AlgAlts [(boxing_con, unpk_args, body)] - NoDefault - ) - -mk_pk_let NewType arg boxing_con con_tys unpk_args body - = ASSERT( null other_args && isNewCon boxing_con ) - Let (NonRec arg (Note (Coerce (idType arg) (idType unpk_arg)) (Var unpk_arg))) body + = Case (Var arg) + (sanitiseCaseBndr arg) + [(DataAlt boxing_con, unpk_args, body)] + +mk_seq_case arg body = Case (Var arg) (sanitiseCaseBndr arg) [(DEFAULT, [], body)] + +sanitiseCaseBndr :: Id -> Id +-- The argument we are scrutinising has the right type to be +-- a case binder, so it's convenient to re-use it for that purpose. +-- But we *must* throw away all its IdInfo. In particular, the argument +-- will have demand info on it, and that demand info may be incorrect for +-- the case binder. e.g. case ww_arg of ww_arg { I# x -> ... } +-- Quite likely ww_arg isn't used in '...'. The case may get discarded +-- if the case binder says "I'm demanded". This happened in a situation +-- like (x+y) `seq` .... +sanitiseCaseBndr id = id `setIdInfo` vanillaIdInfo + +mk_pk_let arg boxing_con con_tys unpk_args body + = Let (NonRec arg (mkConApp boxing_con con_args)) body where - (unpk_arg:other_args) = unpk_args - -mk_pk_let DataType arg boxing_con con_tys unpk_args body - = ASSERT( isDataCon boxing_con ) - Let (NonRec arg (Con boxing_con con_args)) body - where - con_args = map TyArg con_tys ++ map VarArg unpk_args - + con_args = map Type con_tys ++ map Var unpk_args -mk_ww_local uniq ty - = mkSysLocal SLIT("ww") uniq ty noSrcLoc +mk_ww_local uniq ty = mkSysLocal SLIT("ww") uniq ty \end{code}