X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=ghc%2Fcompiler%2Fstranal%2FWwLib.lhs;h=1bcf59bef674e470f56bdc494874f6da3c12f361;hb=b4775e5e760111e2d71fba3c44882dce390edfb2;hp=4eefd47a1907025389f319a27ccba8f84b887244;hpb=9d38678ea60ff32f756390a30c659daa22c98c93;p=ghc-hetmet.git diff --git a/ghc/compiler/stranal/WwLib.lhs b/ghc/compiler/stranal/WwLib.lhs index 4eefd47..1bcf59b 100644 --- a/ghc/compiler/stranal/WwLib.lhs +++ b/ghc/compiler/stranal/WwLib.lhs @@ -5,65 +5,36 @@ \begin{code} module WwLib ( - WwBinding(..), - - worthSplitting, setUnpackStrategy, - mkWwBodies, mkWrapper + mkWwBodies, + worthSplitting, setUnpackStrategy ) where #include "HsVersions.h" import CoreSyn -import Id ( Id, idType, mkSysLocal, getIdDemandInfo, setIdDemandInfo, - mkWildId, setIdInfo +import CoreUtils ( exprType ) +import Id ( Id, idType, mkSysLocal, idDemandInfo, setIdDemandInfo, + isOneShotLambda, setOneShotLambda, + setIdInfo ) -import IdInfo ( CprInfo(..), noCprInfo, vanillaIdInfo ) -import Const ( Con(..), DataCon ) -import DataCon ( dataConArgTys ) -import Demand ( Demand(..) ) +import IdInfo ( CprInfo(..), vanillaIdInfo ) +import DataCon ( splitProductType ) +import Demand ( Demand(..), wwLazy, wwPrim ) import PrelInfo ( realWorldPrimId, aBSENT_ERROR_ID ) import TysPrim ( realWorldStatePrimTy ) -import TysWiredIn ( unboxedTupleCon, unboxedTupleTyCon ) -import Type ( isUnLiftedType, mkTyVarTys, mkTyVarTy, mkFunTys, - splitForAllTys, splitFunTys, splitFunTysN, - splitAlgTyConApp_maybe, splitAlgTyConApp, - mkTyConApp, newTypeRep, isNewType, - Type +import TysWiredIn ( tupleCon ) +import Type ( Type, isUnLiftedType, + splitForAllTys, splitFunTys, isAlgType, + splitNewType_maybe, mkFunTys ) -import TyCon ( isNewTyCon, - TyCon ) -import BasicTypes ( NewOrData(..) ) -import Var ( TyVar ) -import UniqSupply ( returnUs, thenUs, getUniqueUs, getUniquesUs, - mapUs, UniqSM ) -import Util ( zipWithEqual, zipEqual ) +import BasicTypes ( NewOrData(..), 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 [CoreBind] - | 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} %************************************************************************ %* * @@ -209,10 +180,16 @@ nonAbsentArgs (d : ds) = 1 + nonAbsentArgs ds worthSplitting :: [Demand] -> Bool -- Result is bottom -> Bool -- True <=> the wrapper would not be an identity function -worthSplitting ds result_bot = not result_bot && any worth_it ds - -- Don't split if the result is bottom; there's no efficiency to - -- be gained, and (worse) the wrapper body may not look like a wrapper - -- body to getWorkerIdAndCons +worthSplitting ds result_bot = any worth_it ds + -- We used not to split if the result is bottom. + -- [Justification: there's no efficiency to be gained.] + -- But it's sometimes bad not to make a wrapper. Consider + -- fw = \x# -> let x = I# x# in case e of + -- p1 -> error_fn x + -- p2 -> error_fn x + -- p3 -> the real stuff + -- The re-boxing code won't go away unless error_fn gets a wrapper too. + where worth_it (WwLazy True) = True -- Absent arg worth_it (WwUnpack _ True _) = True -- Arg to unpack @@ -234,64 +211,48 @@ allAbsent ds = all absent ds %* * %************************************************************************ -@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 - -> Int -- Arity - -> [Demand] -- Wrapper strictness info - -> CprInfo -- Wrapper cpr info - -> UniqSM (Id -> CoreExpr) -- Wrapper body, missing worker Id - -mkWrapper fun_ty arity demands cpr_info - = getUniquesUs arity `thenUs` \ wrap_uniqs -> - let - (tyvars, tau_ty) = splitForAllTys fun_ty - (arg_tys, body_ty) = splitFunTysN "mkWrapper" arity 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 = zipWith mk_ww_local wrap_uniqs arg_tys - in - mkWwBodies tyvars wrap_args body_ty demands cpr_info `thenUs` \ (wrap_fn, _, _) -> - returnUs wrap_fn -\end{code} - @mkWwBodies@ is called when doing the worker/wrapper split inside a module. \begin{code} -mkWwBodies :: [TyVar] -> [Id] -> Type -- Original fn args and body type - -> [Demand] -- Strictness info for original fn; corresp 1-1 with args +mkWwBodies :: Type -- Type of original function + -> Arity -- Arity of original function + -> [Demand] -- Strictness of original function + -> Bool -- True <=> function returns bottom + -> [Bool] -- One-shot-ness of the function -> CprInfo -- Result of CPR analysis - -> 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 wrap_args body_ty demands cpr_info - = let - -- demands may be longer than number of args. If we aren't doing w/w - -- for strictness then demands is an infinite list of 'lazy' args. - wrap_args_w_demands = zipWith setIdDemandInfo wrap_args demands - (wrap_fn_coerce, work_fn_coerce) = mkWWcoerce body_ty - in - mkWWstr body_ty wrap_args_w_demands `thenUs` \ (work_args_w_demands, wrap_fn_str, work_fn_str) -> - - mkWWcpr body_ty cpr_info `thenUs` \ (wrap_fn_cpr, work_fn_cpr) -> - - returnUs (\ work_id -> Note InlineMe $ - mkLams tyvars $ mkLams wrap_args_w_demands $ - (wrap_fn_coerce . wrap_fn_str . wrap_fn_cpr) $ - mkVarApps (Var work_id) (tyvars ++ work_args_w_demands), - - \ work_body -> mkLams tyvars $ mkLams work_args_w_demands $ - (work_fn_coerce . work_fn_str . work_fn_cpr) - work_body, - - map getIdDemandInfo work_args_w_demands) + -> 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 arity demands res_bot one_shots cpr_info + = mkWWargs fun_ty arity demands' res_bot one_shots' `thenUs` \ (wrap_args, wrap_fn_args, work_fn_args, res_ty) -> + mkWWcpr res_ty cpr_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 + demands' = demands ++ repeat wwLazy + one_shots' = one_shots ++ repeat False \end{code} @@ -301,29 +262,95 @@ mkWwBodies tyvars wrap_args body_ty demands cpr_info %* * %************************************************************************ -The "coerce" transformation is - f :: T1 -> T2 -> R - f = \xy -> e -===> - f = \xy -> coerce R R' (fw x y) - fw = \xy -> coerce R' R e -where R' is the representation type for R. +We really want to "look through" coerces. +Reason: I've seen this situation: -\begin{code} -mkWWcoerce body_ty - | not (isNewType body_ty) - = (id, id) + let f = coerce T (\s -> E) + in \x -> case x of + p -> coerce T' f + q -> \s -> E2 + r -> coerce T' f - | otherwise - = (wrap_fn . mkNote (Coerce body_ty rep_ty), - mkNote (Coerce rep_ty body_ty) . work_fn) - where - (tycon, args, _) = splitAlgTyConApp body_ty - rep_ty = newTypeRep tycon args - (wrap_fn, work_fn) = mkWWcoerce rep_ty -\end{code} +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 -> Arity + -> [Demand] -> Bool -> [Bool] -- Both these will in due course be derived + -- from the type. The [Bool] is True for a one-shot arg. + -- ** Both are infinite, extended with neutral values if necy ** + -> UniqSM ([Var], -- Wrapper args + CoreExpr -> CoreExpr, -- Wrapper fn + CoreExpr -> CoreExpr, -- Worker fn + Type) -- Type of wrapper body + +mkWWargs fun_ty arity demands res_bot one_shots + | (res_bot || arity > 0) && (not (null tyvars) || n_arg_tys > 0) + -- If the function returns bottom, we feel free to + -- build lots of wrapper args: + -- \x. let v=E in \y. bottom + -- = \xy. let v=E in bottom + = getUniquesUs `thenUs` \ wrap_uniqs -> + let + val_args = zipWith4 mk_wrap_arg wrap_uniqs arg_tys demands one_shots + wrap_args = tyvars ++ val_args + in + mkWWargs new_fun_ty + (arity - n_args) + (drop n_args demands) + res_bot + (drop n_args 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) + where + (tyvars, tau) = splitForAllTys fun_ty + (arg_tys, body_ty) = splitFunTys tau + n_arg_tys = length arg_tys + n_args | res_bot = n_arg_tys + | otherwise = arity `min` n_arg_tys + new_fun_ty | n_args == n_arg_tys = body_ty + | otherwise = mkFunTys (drop n_args arg_tys) body_ty + +mkWWargs fun_ty arity demands res_bot one_shots + = case splitNewType_maybe fun_ty of + Nothing -> returnUs ([], id, id, fun_ty) + Just rep_ty -> mkWWargs rep_ty arity demands res_bot 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) + + +applyToVars :: [Var] -> CoreExpr -> CoreExpr +applyToVars vars fn = mkVarApps fn vars + +mk_wrap_arg uniq ty dmd one_shot + = set_one_shot one_shot (setIdDemandInfo (mkSysLocal SLIT("w") uniq ty) dmd) + where + set_one_shot True id = setOneShotLambda id + set_one_shot False id = id +\end{code} %************************************************************************ @@ -332,23 +359,30 @@ mkWWcoerce body_ty %* * %************************************************************************ - \begin{code} -mkWWstr :: Type -- Body type - -> [Id] -- Wrapper args; have their demand info on them - -> UniqSM ([Id], -- Worker args; have their demand info on them - - CoreExpr -> CoreExpr, -- Wrapper body, lacking the inner call to the worker +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 - -- At the call site, the worker args are bound + -- This fn adds the unboxing, and makes the + -- call passing the unboxed things CoreExpr -> CoreExpr) -- Worker body, lacking the original body of the function, - -- and without its lambdas + -- but *with* lambdas -mkWWstr body_ty wrap_args - = mk_ww wrap_args `thenUs` \ (work_args, wrap_fn, work_fn) -> - - if null work_args && isUnLiftedType body_ty then +mkWWstr res_ty wrap_args + = mk_ww_str wrap_args `thenUs` \ (work_args, take_apart, put_together) -> + let + work_dmds = [idDemandInfo 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 . apply_to 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: @@ -357,65 +391,60 @@ mkWWstr body_ty wrap_args -- fw = /\abc. \v. body -- -- We use the state-token type which generates no code - getUniqueUs `thenUs` \ void_arg_uniq -> - let - void_arg = mk_ww_local void_arg_uniq realWorldStatePrimTy - in - returnUs ([void_arg], - wrap_fn . Let (NonRec void_arg (Var realWorldPrimId)), - work_fn) - else - returnUs (work_args, wrap_fn, work_fn) - - + getUniqueUs `thenUs` \ void_arg_uniq -> + let + void_arg = mk_ww_local void_arg_uniq realWorldStatePrimTy + in + returnUs ([wwPrim], + take_apart . apply_to [realWorldPrimId] . apply_to work_args, + mkLams work_args . Lam void_arg . put_together) -- Empty case -mk_ww [] +mk_ww_str [] = returnUs ([], \ wrapper_body -> wrapper_body, \ worker_body -> worker_body) -mk_ww (arg : ds) - = case getIdDemandInfo arg of +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) + + | otherwise + = case idDemandInfo arg of -- Absent case WwLazy True -> - mk_ww ds `thenUs` \ (worker_args, wrap_fn, work_fn) -> + mk_ww_str ds `thenUs` \ (worker_args, wrap_fn, work_fn) -> returnUs (worker_args, wrap_fn, mk_absent_let arg . work_fn) -- Unpack case WwUnpack new_or_data True cs -> - getUniquesUs (length inst_con_arg_tys) `thenUs` \ uniqs -> + getUniquesUs `thenUs` \ uniqs -> let unpk_args = zipWith mk_ww_local uniqs inst_con_arg_tys - unpk_args_w_ds = zipWithEqual "mk_ww" setIdDemandInfo unpk_args cs + unpk_args_w_ds = zipWithEqual "mk_ww_str" set_worker_arg_info unpk_args cs in - mk_ww (unpk_args_w_ds ++ ds) `thenUs` \ (worker_args, wrap_fn, work_fn) -> + mk_ww_str (unpk_args_w_ds ++ ds) `thenUs` \ (worker_args, wrap_fn, work_fn) -> returnUs (worker_args, mk_unpk_case new_or_data arg unpk_args data_con arg_tycon . wrap_fn, work_fn . mk_pk_let new_or_data arg data_con tycon_arg_tys unpk_args) where - inst_con_arg_tys = dataConArgTys data_con tycon_arg_tys - (arg_tycon, tycon_arg_tys, data_con) - = case (splitAlgTyConApp_maybe (idType arg)) of - - Just (arg_tycon, tycon_arg_tys, [data_con]) -> - -- The main event: a single-constructor data type - (arg_tycon, tycon_arg_tys, data_con) - - Just (_, _, data_cons) -> - pprPanic "mk_ww_arg_processing:" - (text "not one constr (interface files not consistent/up to date?)" - $$ (ppr arg <+> ppr (idType arg))) - - Nothing -> - panic "mk_ww_arg_processing: not datatype" + (arg_tycon, tycon_arg_tys, data_con, inst_con_arg_tys) = splitProductType "mk_ww_str" (idType arg) -- Other cases other_demand -> - mk_ww ds `thenUs` \ (worker_args, wrap_fn, work_fn) -> + mk_ww_str ds `thenUs` \ (worker_args, wrap_fn, work_fn) -> returnUs (arg : worker_args, wrap_fn, work_fn) + where + -- 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 (setIdDemandInfo worker_arg demand) + + set_one_shot | isOneShotLambda arg = setOneShotLambda + | otherwise = \x -> x \end{code} @@ -439,160 +468,59 @@ left-to-right traversal of the result structure. mkWWcpr :: Type -- function body type -> CprInfo -- CPR analysis results -> UniqSM (CoreExpr -> CoreExpr, -- New wrapper - CoreExpr -> CoreExpr) -- New worker + CoreExpr -> CoreExpr, -- New worker + Type) -- Type of worker's body mkWWcpr body_ty NoCPRInfo - = returnUs (id, id) -- Must be just the strictness transf. -mkWWcpr body_ty (CPRInfo cpr_args) - = getUniqueUs `thenUs` \ body_arg_uniq -> - let - body_var = mk_ww_local body_arg_uniq body_ty - in - cpr_reconstruct body_ty cpr_info' `thenUs` \reconst_fn -> - cpr_flatten body_ty cpr_info' `thenUs` \flatten_fn -> - returnUs (reconst_fn, flatten_fn) - where - -- We only make use of the outer level of CprInfo, otherwise we - -- may lose laziness. :-( Hopefully, we will find a use for the - -- extra info some day (e.g. creating versions specialized to - -- the use made of the components of the result by the callee) - cpr_info' = CPRInfo (map (const NoCPRInfo) cpr_args) -\end{code} + = returnUs (id, id, body_ty) -- Must be just the strictness transf. +mkWWcpr body_ty ReturnsCPR + | not (isAlgType body_ty) + = WARN( True, text "mkWWcpr: non-algebraic body type" <+> ppr body_ty ) + returnUs (id, id, body_ty) -@cpr_flatten@ takes the result type produced by the body and the info -from the CPR analysis and flattens the constructed product components. -These are returned in an unboxed tuple. - -\begin{code} -cpr_flatten :: Type -> CprInfo -> UniqSM (CoreExpr -> CoreExpr) -cpr_flatten ty cpr_info - = mk_cpr_case (ty, cpr_info) `thenUs` \(res_id, tup_ids, flatten_exp) -> - returnUs (\body -> Case body res_id - [(DEFAULT, [], flatten_exp (fst $ mk_unboxed_tuple tup_ids))]) - - - -mk_cpr_case :: (Type, CprInfo) -> - UniqSM (CoreBndr, -- Name of binder for this part of result - [(CoreExpr, Type)], -- expressions for flattened result - CoreExpr -> CoreExpr) -- add in code to flatten result - -mk_cpr_case (ty, NoCPRInfo) - -- this component must be returned as a component of the unboxed tuple result - = getUniqueUs `thenUs` \id_uniq -> - let id_id = mk_ww_local id_uniq ty in - returnUs (id_id, [(Var id_id, ty)], id) -mk_cpr_case (ty, cpr_info@(CPRInfo ci_args)) - | isNewTyCon tycon -- a new type: under the coercions must be a - -- constructed product - = ASSERT ( null $ tail inst_con_arg_tys ) - mk_cpr_case (target_of_from_type, cpr_info) - `thenUs` \(arg, tup, exp) -> - getUniqueUs `thenUs` \id_uniq -> - let id_id = mk_ww_local id_uniq ty - new_exp_case = \var -> Case (Note (Coerce (idType arg) ty) (Var id_id)) - arg - [(DEFAULT,[], exp var)] - in - returnUs (id_id, tup, new_exp_case) - - | otherwise -- a data type - -- flatten components - = mapUs mk_cpr_case (zip inst_con_arg_tys ci_args) - `thenUs` \sub_builds -> - getUniqueUs `thenUs` \id_uniq -> - let id_id = mk_ww_local id_uniq ty - (args, tup, exp) = unzip3 sub_builds - con_app = mkConApp data_con (map Var args) - new_tup = concat tup - new_exp_case = \var -> Case (Var id_id) (mkWildId ty) - [(DataCon data_con, args, - foldl (\e f -> f e) var exp)] + | 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 (id_id, new_tup, new_exp_case) - where - (data_con, tycon, tycon_arg_tys, inst_con_arg_tys) = splitType "mk_cpr_case" ty - from_type = head inst_con_arg_tys - -- if coerced from a function 'look through' to find result type - target_of_from_type = (snd.splitFunTys.snd.splitForAllTys) from_type - -\end{code} - -@cpr_reconstruct@ does the opposite of @cpr_flatten@. It takes the unboxed -tuple produced by the worker and reconstructs the structured result. - -\begin{code} -cpr_reconstruct :: Type -> CprInfo -> UniqSM (CoreExpr -> CoreExpr) -cpr_reconstruct ty cpr_info - = mk_cpr_let (ty,cpr_info) `thenUs` \(res_id, tup_ids, reconstruct_exp) -> - returnUs (\worker -> Case worker (mkWildId $ worker_type tup_ids) - [(DataCon $ unboxedTupleCon $ length tup_ids, - tup_ids, reconstruct_exp $ Var res_id)]) - - where - worker_type ids = mkTyConApp (unboxedTupleTyCon (length ids)) (map idType ids) - + 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) -mk_cpr_let :: (Type, CprInfo) -> - UniqSM (CoreBndr, -- Binder for this component of result - [CoreBndr], -- Binders which will appear in worker's result - CoreExpr -> CoreExpr) -- Code to produce structured result. -mk_cpr_let (ty, NoCPRInfo) - -- this component will appear explicitly in the unboxed tuple. - = getUniqueUs `thenUs` \id_uniq -> + | otherwise -- The general case + = getUniquesUs `thenUs` \ uniqs -> let - id_id = mk_ww_local id_uniq ty - in - returnUs (id_id, [id_id], id) - -mk_cpr_let (ty, cpr_info@(CPRInfo ci_args)) - | isNewTyCon tycon -- a new type: must coerce the argument to this type - = ASSERT ( null $ tail inst_con_arg_tys ) - mk_cpr_let (target_of_from_type, cpr_info) - `thenUs` \(arg, tup, exp) -> - getUniqueUs `thenUs` \id_uniq -> - let id_id = mk_ww_local id_uniq ty - new_exp = \var -> exp (Let (NonRec id_id (Note (Coerce ty (idType arg)) (Var arg))) var) - in - returnUs (id_id, tup, new_exp) - - | otherwise -- a data type - -- reconstruct components then apply data con - = mapUs mk_cpr_let (zip inst_con_arg_tys ci_args) - `thenUs` \sub_builds -> - getUniqueUs `thenUs` \id_uniq -> - let id_id = mk_ww_local id_uniq ty - (args, tup, exp) = unzip3 sub_builds - con_app = mkConApp data_con $ (map Type tycon_arg_tys) ++ (map Var args) - new_tup = concat tup - new_exp = \var -> foldl (\e f -> f e) (Let (NonRec id_id con_app) var) exp + (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 (id_id, new_tup, new_exp) + 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 - (data_con, tycon, tycon_arg_tys, inst_con_arg_tys) = splitType "mk_cpr_let" ty - from_type = head inst_con_arg_tys - -- if coerced from a function 'look through' to find result type - target_of_from_type = (snd.splitFunTys.snd.splitForAllTys) from_type - - -splitType :: String -> Type -> (DataCon, TyCon, [Type], [Type]) -splitType fname ty = (data_con, tycon, tycon_arg_tys, dataConArgTys data_con tycon_arg_tys) - where - (data_con, tycon, tycon_arg_tys) - = case (splitAlgTyConApp_maybe ty) of - Just (arg_tycon, tycon_arg_tys, [data_con]) -> - -- The main event: a single-constructor data type - (data_con, arg_tycon, tycon_arg_tys) - - Just (_, _, data_cons) -> - pprPanic (fname ++ ":") - (text "not one constr (interface files not consistent/up to date?)" - $$ ppr ty) - - Nothing -> - pprPanic (fname ++ ":") - (text "not a datatype" $$ ppr ty) + (_, 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 + +-- 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} @@ -625,7 +553,7 @@ mk_unpk_case DataType arg unpk_args boxing_con boxing_tycon body -- A data type = Case (Var arg) (sanitiseCaseBndr arg) - [(DataCon boxing_con, unpk_args, body)] + [(DataAlt boxing_con, unpk_args, body)] sanitiseCaseBndr :: Id -> Id -- The argument we are scrutinising has the right type to be @@ -645,19 +573,11 @@ mk_pk_let NewType arg boxing_con con_tys unpk_args body (unpk_arg:other_args) = unpk_args mk_pk_let DataType arg boxing_con con_tys unpk_args body - = Let (NonRec arg (Con (DataCon boxing_con) con_args)) body + = Let (NonRec arg (mkConApp boxing_con con_args)) body where con_args = map Type con_tys ++ map Var unpk_args mk_ww_local uniq ty = mkSysLocal SLIT("ww") uniq ty - -mk_unboxed_tuple :: [(CoreExpr, Type)] -> (CoreExpr, Type) -mk_unboxed_tuple contents - = (mkConApp (unboxedTupleCon (length contents)) - (map (Type . snd) contents ++ - map fst contents), - mkTyConApp (unboxedTupleTyCon (length contents)) - (map snd contents)) \end{code}