X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fstranal%2FWwLib.lhs;h=e44e521c83b6dd09dd8e5782331743372a076862;hb=5f6ed0dad13261fd14e5edb4147d1e8f732c3969;hp=2d60dd21b984c82d266fa7294026ee9e9464d9ae;hpb=d8af6b8ce9d241a8f8d6878e2400aa8577f552bc;p=ghc-hetmet.git diff --git a/ghc/compiler/stranal/WwLib.lhs b/ghc/compiler/stranal/WwLib.lhs index 2d60dd2..e44e521 100644 --- a/ghc/compiler/stranal/WwLib.lhs +++ b/ghc/compiler/stranal/WwLib.lhs @@ -17,18 +17,15 @@ import Id ( Id, idType, mkSysLocal, idNewDemandInfo, setIdNewDemandInfo, import IdInfo ( vanillaIdInfo ) import DataCon ( splitProductType_maybe, splitProductType ) import NewDemand ( Demand(..), DmdResult(..), Demands(..) ) -import DmdAnal ( both ) -import MkId ( realWorldPrimId, voidArgId, eRROR_CSTRING_ID ) -import TysPrim ( realWorldStatePrimTy ) +import MkId ( realWorldPrimId, voidArgId, mkRuntimeErrorApp, rUNTIME_ERROR_ID ) import TysWiredIn ( tupleCon ) import Type ( Type, isUnLiftedType, mkFunTys, - splitForAllTys, splitFunTys, splitNewType_maybe, isAlgType + splitForAllTys, splitFunTys, splitRecNewType_maybe, isAlgType ) -import Literal ( Literal(MachStr) ) import BasicTypes ( Boxity(..) ) import Var ( Var, isId ) -import UniqSupply ( returnUs, thenUs, getUniqueUs, getUniquesUs, UniqSM ) -import Util ( zipWithEqual ) +import UniqSupply ( returnUs, thenUs, getUniquesUs, UniqSM ) +import Util ( zipWithEqual, notNull ) import Outputable import List ( zipWith4 ) \end{code} @@ -123,14 +120,21 @@ mkWwBodies :: Type -- Type of original function 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 wrap_args `thenUs` \ (work_args, wrap_fn_str, work_fn_str) -> let - (work_lam_args, work_call_args) = mkWorkerArgs work_args cpr_res_ty + (work_lam_args, work_call_args) = mkWorkerArgs work_args res_ty in + -- Don't do CPR if the worker doesn't have any value arguments + -- Then the worker is just a constant, so we don't want to unbox it. + (if any isId work_args then + mkWWcpr res_ty res_info + else + returnUs (id, id, res_ty) + ) `thenUs` \ (wrap_fn_cpr, work_fn_cpr, cpr_res_ty) -> + returnUs ([idNewDemandInfo v | v <- work_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) + 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 -- something trivial like -- fw = ... @@ -153,7 +157,7 @@ During worker-wrapper stuff we may end up with an unlifted thing which we want to let-bind without losing laziness. So we add a void argument. E.g. - f = /\a -> \x y z -> E::Int# -- E does not mentione x,y,z + f = /\a -> \x y z -> E::Int# -- E does not mention x,y,z ==> fw = /\ a -> \void -> E f = /\ a -> \x y z -> fw realworld @@ -219,7 +223,7 @@ mkWWargs :: Type Type) -- Type of wrapper body mkWWargs fun_ty demands one_shots - | Just rep_ty <- splitNewType_maybe fun_ty + | Just rep_ty <- splitRecNewType_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 @@ -236,11 +240,11 @@ mkWWargs fun_ty demands one_shots work_fn_args . Note (Coerce rep_ty fun_ty), res_ty) - | not (null demands) + | notNull demands = getUniquesUs `thenUs` \ wrap_uniqs -> let - (tyvars, tau) = splitForAllTys fun_ty - (arg_tys, body_ty) = splitFunTys tau + (tyvars, tau) = splitForAllTys fun_ty + (arg_tys, body_ty) = splitFunTys tau n_demands = length demands n_arg_tys = length arg_tys @@ -253,7 +257,7 @@ mkWWargs fun_ty demands one_shots val_args = zipWith4 mk_wrap_arg wrap_uniqs arg_tys demands one_shots wrap_args = tyvars ++ val_args in -{- ASSERT( not (null tyvars) || not (null arg_tys) ) -} +{- ASSERT( notNull tyvars || notNull arg_tys ) -} if (null tyvars) && (null arg_tys) then pprTrace "mkWWargs" (ppr fun_ty $$ ppr demands) returnUs ([], id, id, fun_ty) @@ -276,7 +280,7 @@ 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) + = set_one_shot one_shot (setIdNewDemandInfo (mkSysLocal FSLIT("w") uniq ty) dmd) where set_one_shot True id = setOneShotLambda id set_one_shot False id = id @@ -291,7 +295,7 @@ mk_wrap_arg uniq ty dmd one_shot \begin{code} mkWWstr :: [Var] -- Wrapper args; have their demand info on them - -- *Includes type variables* + -- *Includes type variables* -> UniqSM ([Var], -- Worker args CoreExpr -> CoreExpr, -- Wrapper body, lacking the worker call -- and without its lambdas @@ -354,7 +358,7 @@ mkWWstr_one arg -- of dropping seqs in the worker Eval (Poly Abs) -> let - arg_w_unf = arg `setIdUnfolding` mkOtherCon [] + arg_w_unf = arg `setIdUnfolding` evaldUnfolding -- Tell the worker arg that it's sure to be evaluated -- so that internal seqs can be dropped in @@ -362,7 +366,7 @@ mkWWstr_one arg -- Pass the arg, anyway, even if it is in theory discarded -- Consider -- f x y = x `seq` y - -- x gets a (Seq Drop []) demand, but if we fail to pass it to the worker + -- x gets a (Eval (Poly Abs)) demand, but if we fail to pass it to the worker -- we ABSOLUTELY MUST record that x is evaluated in the wrapper. -- Something like: -- f x y = x `seq` fw y @@ -416,16 +420,22 @@ mkWWcpr body_ty RetCPR | n_con_args == 1 && isUnLiftedType con_arg_ty1 -- Special case when there is a single result of unlifted type + -- + -- Wrapper: case (..call worker..) of x -> C x + -- Worker: case ( ..body.. ) of C x -> x = 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 + con_app = mkConApp data_con (map Type tycon_arg_tys ++ [Var arg]) 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)], + 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)], con_arg_ty1) | otherwise -- The general case + -- Wrapper: case (..call worker..) of (# a, b #) -> C a b + -- Worker: case ( ...body... ) of C a b -> (# a, b #) = getUniquesUs `thenUs` \ uniqs -> let (wrap_wild : work_wild : args) = zipWith mk_ww_local uniqs (ubx_tup_ty : body_ty : con_arg_tys) @@ -435,8 +445,8 @@ mkWWcpr body_ty RetCPR 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)], + 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)], ubx_tup_ty) where (_, tycon_arg_tys, data_con, con_arg_tys) = splitProductType "mkWWcpr" body_ty @@ -457,8 +467,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 alts = Note (SCC cc) (Case e arg alts) -workerCase e arg alts = Case e arg alts +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 \end{code} @@ -477,17 +487,17 @@ mk_absent_let arg body = 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))] + 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) [(DEFAULT, [], body)] +mk_seq_case arg body = Case (Var arg) (sanitiseCaseBndr arg) (exprType body) [(DEFAULT, [], body)] sanitiseCaseBndr :: Id -> Id -- The argument we are scrutinising has the right type to be @@ -500,5 +510,5 @@ sanitiseCaseBndr :: Id -> Id -- like (x+y) `seq` .... sanitiseCaseBndr id = id `setIdInfo` vanillaIdInfo -mk_ww_local uniq ty = mkSysLocal SLIT("ww") uniq ty +mk_ww_local uniq ty = mkSysLocal FSLIT("ww") uniq ty \end{code}