X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FsimplCore%2FSimplUtils.lhs;h=060d346bd3f0e2ed46b4faf953a2d571abddc7f0;hb=6febb616f1ff46942434e9df39c6e4977b07cc6f;hp=cff659d55696d563f73b9c8a6f2c6daefe1ba78e;hpb=87e82c15b1ab2eb3dd37c681f6615ec47b476f9f;p=ghc-hetmet.git diff --git a/compiler/simplCore/SimplUtils.lhs b/compiler/simplCore/SimplUtils.lhs index cff659d..060d346 100644 --- a/compiler/simplCore/SimplUtils.lhs +++ b/compiler/simplCore/SimplUtils.lhs @@ -20,7 +20,7 @@ module SimplUtils ( activeInline, activeRule, inlineMode, -- The continuation type - SimplCont(..), DupFlag(..), LetRhsFlag(..), + SimplCont(..), DupFlag(..), ArgInfo(..), contIsDupable, contResultType, contIsTrivial, contArgs, dropArgs, countValArgs, countArgs, splitInlineCont, mkBoringStop, mkLazyArgStop, mkRhsStop, contIsRhsOrArg, @@ -56,7 +56,9 @@ import Unify ( dataConCannotMatch ) import VarSet import BasicTypes import Util +import MonadUtils import Outputable + import List( nub ) \end{code} @@ -91,14 +93,11 @@ Key points: data SimplCont = Stop -- An empty context, or hole, [] OutType -- Type of the result - LetRhsFlag - Bool -- True <=> There is something interesting about + CallCtxt -- True <=> There is something interesting about -- the context, and hence the inliner -- should be a bit keener (see interestingCallContext) - -- Two cases: - -- (a) This is the RHS of a thunk whose type suggests - -- that update-in-place would be possible - -- (b) This is an argument of a function that has RULES + -- Specifically: + -- This is an argument of a function that has RULES -- Inlining the call might allow the rule to fire | CoerceIt -- C `cast` co @@ -123,22 +122,28 @@ data SimplCont | StrictArg -- e C OutExpr OutType -- e and its type - (Bool,[Bool]) -- Whether the function at the head of e has rules, - SimplCont -- plus strictness flags for further args - -data LetRhsFlag = AnArg -- It's just an argument not a let RHS - | AnRhs -- It's the RHS of a let (so please float lets out of big lambdas) - -instance Outputable LetRhsFlag where - ppr AnArg = ptext SLIT("arg") - ppr AnRhs = ptext SLIT("rhs") + CallCtxt -- Whether *this* argument position is interesting + ArgInfo -- Whether the function at the head of e has rules, etc + SimplCont -- plus strictness flags for *further* args + +data ArgInfo + = ArgInfo { + ai_rules :: Bool, -- Function has rules (recursively) + -- => be keener to inline in all args + ai_strs :: [Bool], -- Strictness of arguments + -- Usually infinite, but if it is finite it guarantees + -- that the function diverges after being given + -- that number of args + ai_discs :: [Int] -- Discounts for arguments; non-zero => be keener to inline + -- Always infinite + } instance Outputable SimplCont where - ppr (Stop ty is_rhs _) = ptext SLIT("Stop") <> brackets (ppr is_rhs) <+> ppr ty + ppr (Stop ty _) = ptext SLIT("Stop") <+> ppr ty ppr (ApplyTo dup arg se cont) = ((ptext SLIT("ApplyTo") <+> ppr dup <+> pprParendExpr arg) {- $$ nest 2 (pprSimplEnv se) -}) $$ ppr cont ppr (StrictBind b _ _ _ cont) = (ptext SLIT("StrictBind") <+> ppr b) $$ ppr cont - ppr (StrictArg f _ _ cont) = (ptext SLIT("StrictArg") <+> ppr f) $$ ppr cont + ppr (StrictArg f _ _ _ cont) = (ptext SLIT("StrictArg") <+> ppr f) $$ ppr cont ppr (Select dup bndr alts se cont) = (ptext SLIT("Select") <+> ppr dup <+> ppr bndr) $$ (nest 4 (ppr alts)) $$ ppr cont ppr (CoerceIt co cont) = (ptext SLIT("CoerceIt") <+> ppr co) $$ ppr cont @@ -153,13 +158,13 @@ instance Outputable DupFlag where ------------------- mkBoringStop :: OutType -> SimplCont -mkBoringStop ty = Stop ty AnArg False +mkBoringStop ty = Stop ty BoringCtxt -mkLazyArgStop :: OutType -> Bool -> SimplCont -mkLazyArgStop ty has_rules = Stop ty AnArg (canUpdateInPlace ty || has_rules) +mkLazyArgStop :: OutType -> CallCtxt -> SimplCont +mkLazyArgStop ty cci = Stop ty cci mkRhsStop :: OutType -> SimplCont -mkRhsStop ty = Stop ty AnRhs (canUpdateInPlace ty) +mkRhsStop ty = Stop ty BoringCtxt ------------------- contIsRhsOrArg (Stop {}) = True @@ -184,8 +189,8 @@ contIsTrivial other = False ------------------- contResultType :: SimplCont -> OutType -contResultType (Stop to_ty _ _) = to_ty -contResultType (StrictArg _ _ _ cont) = contResultType cont +contResultType (Stop to_ty _) = to_ty +contResultType (StrictArg _ _ _ _ cont) = contResultType cont contResultType (StrictBind _ _ _ _ cont) = contResultType cont contResultType (ApplyTo _ _ _ cont) = contResultType cont contResultType (CoerceIt _ cont) = contResultType cont @@ -226,9 +231,9 @@ splitInlineCont :: SimplCont -> Maybe (SimplCont, SimplCont) splitInlineCont (ApplyTo dup (Type ty) se c) | Just (c1, c2) <- splitInlineCont c = Just (ApplyTo dup (Type ty) se c1, c2) -splitInlineCont cont@(Stop ty _ _) = Just (mkBoringStop ty, cont) +splitInlineCont cont@(Stop ty _) = Just (mkBoringStop ty, cont) splitInlineCont cont@(StrictBind bndr _ _ se _) = Just (mkBoringStop (substTy se (idType bndr)), cont) -splitInlineCont cont@(StrictArg _ fun_ty _ _) = Just (mkBoringStop (funArgTy fun_ty), cont) +splitInlineCont cont@(StrictArg _ fun_ty _ _ _) = Just (mkBoringStop (funArgTy fun_ty), cont) splitInlineCont other = Nothing -- NB: the calculation of the type for mkBoringStop is an annoying -- duplication of the same calucation in mkDupableCont @@ -304,23 +309,26 @@ default case. \begin{code} -interestingCallContext :: SimplCont -> CallContInfo +interestingCallContext :: SimplCont -> CallCtxt interestingCallContext cont = interesting cont where + interestingCtxt = ArgCtxt False 2 -- Give *some* incentive! + interesting (Select _ bndr _ _ _) - | isDeadBinder bndr = CaseCont - | otherwise = InterestingCont + | isDeadBinder bndr = CaseCtxt + | otherwise = interestingCtxt - interesting (ApplyTo {}) = InterestingCont - -- Can happen if we have (coerce t (f x)) y - -- Perhaps True is a bit over-keen, but I've - -- seen (coerce f) x, where f has an INLINE prag, - -- So we have to give some motivation for inlining it - interesting (StrictArg {}) = InterestingCont - interesting (StrictBind {}) = InterestingCont - interesting (Stop ty _ yes) = if yes then InterestingCont else BoringCont - interesting (CoerceIt _ cont) = interesting cont + interesting (ApplyTo {}) = interestingCtxt + -- Can happen if we have (coerce t (f x)) y + -- Perhaps interestingCtxt is a bit over-keen, but I've + -- seen (coerce f) x, where f has an INLINE prag, + -- So we have to give some motivation for inlining it + + interesting (StrictArg _ _ cci _ _) = cci + interesting (StrictBind {}) = BoringCtxt + interesting (Stop ty cci) = cci + interesting (CoerceIt _ cont) = interesting cont -- If this call is the arg of a strict function, the context -- is a bit interesting. If we inline here, we may get useful -- evaluation information to avoid repeated evals: e.g. @@ -341,21 +349,24 @@ interestingCallContext cont mkArgInfo :: Id -> Int -- Number of value args -> SimplCont -- Context of the cal - -> (Bool, [Bool]) -- Arg info --- The arg info consists of --- * A Bool indicating if the function has rules (recursively) --- * A [Bool] indicating strictness for each arg --- The [Bool] is usually infinite, but if it is finite it --- guarantees that the function diverges after being given --- that number of args + -> ArgInfo mkArgInfo fun n_val_args call_cont - = (interestingArgContext fun call_cont, fun_stricts) + = ArgInfo { ai_rules = interestingArgContext fun call_cont + , ai_strs = arg_stricts + , ai_discs = arg_discounts } where - vanilla_stricts, fun_stricts :: [Bool] + vanilla_discounts, arg_discounts :: [Int] + vanilla_discounts = repeat 0 + arg_discounts = case idUnfolding fun of + CoreUnfolding _ _ _ _ (UnfoldIfGoodArgs _ discounts _ _) + -> discounts ++ vanilla_discounts + other -> vanilla_discounts + + vanilla_stricts, arg_stricts :: [Bool] vanilla_stricts = repeat False - fun_stricts + arg_stricts = case splitStrictSig (idNewStrictness fun) of (demands, result_info) | not (demands `lengthExceeds` n_val_args) @@ -394,33 +405,15 @@ interestingArgContext :: Id -> SimplCont -> Bool interestingArgContext fn call_cont = idHasRules fn || go call_cont where - go (Select {}) = False - go (ApplyTo {}) = False - go (StrictArg {}) = True - go (StrictBind {}) = False -- ?? - go (CoerceIt _ c) = go c - go (Stop _ _ interesting) = interesting - -------------------- -canUpdateInPlace :: Type -> Bool --- Consider let x = in ... --- If returns an explicit constructor, we might be able --- to do update in place. So we treat even a thunk RHS context --- as interesting if update in place is possible. We approximate --- this by seeing if the type has a single constructor with a --- small arity. But arity zero isn't good -- we share the single copy --- for that case, so no point in sharing. - -canUpdateInPlace ty - | not opt_UF_UpdateInPlace = False - | otherwise - = case splitTyConApp_maybe ty of - Nothing -> False - Just (tycon, _) -> case tyConDataCons_maybe tycon of - Just [dc] -> arity == 1 || arity == 2 - where - arity = dataConRepArity dc - other -> False + go (Select {}) = False + go (ApplyTo {}) = False + go (StrictArg _ _ cci _ _) = interesting cci + go (StrictBind {}) = False -- ?? + go (CoerceIt _ c) = go c + go (Stop _ cci) = interesting cci + + interesting (ArgCtxt rules _) = rules + interesting other = False \end{code} @@ -440,7 +433,7 @@ settings: (d) Simplifying a GHCi expression or Template Haskell splice - SimplPhase n Used at all other times + SimplPhase n _ Used at all other times The key thing about SimplGently is that it does no call-site inlining. Before full laziness we must be careful not to inline wrappers, @@ -589,8 +582,8 @@ preInlineUnconditionally env top_lvl bndr rhs where phase = getMode env active = case phase of - SimplGently -> isAlwaysActive prag - SimplPhase n -> isActive n prag + SimplGently -> isAlwaysActive prag + SimplPhase n _ -> isActive n prag prag = idInlinePragma bndr try_once in_lam int_cxt -- There's one textual occurrence @@ -624,8 +617,8 @@ preInlineUnconditionally env top_lvl bndr rhs canInlineInLam _ = False early_phase = case phase of - SimplPhase 0 -> False - other -> True + SimplPhase 0 _ -> False + other -> True -- If we don't have this early_phase test, consider -- x = length [1,2,3] -- The full laziness pass carefully floats all the cons cells to @@ -745,8 +738,8 @@ postInlineUnconditionally env top_lvl bndr occ_info rhs unfolding where active = case getMode env of - SimplGently -> isAlwaysActive prag - SimplPhase n -> isActive n prag + SimplGently -> isAlwaysActive prag + SimplPhase n _ -> isActive n prag prag = idInlinePragma bndr activeInline :: SimplEnv -> OutId -> Bool @@ -768,7 +761,7 @@ activeInline env id -- and they are now constructed as Compulsory unfoldings (in MkId) -- so they'll happen anyway. - SimplPhase n -> isActive n prag + SimplPhase n _ -> isActive n prag where prag = idInlinePragma id @@ -779,13 +772,13 @@ activeRule dflags env = Nothing -- Rewriting is off | otherwise = case getMode env of - SimplGently -> Just isAlwaysActive + SimplGently -> Just isAlwaysActive -- Used to be Nothing (no rules in gentle mode) -- Main motivation for changing is that I wanted -- lift String ===> ... -- to work in Template Haskell when simplifying -- splices, so we get simpler code for literal strings - SimplPhase n -> Just (isActive n) + SimplPhase n _ -> Just (isActive n) \end{code} @@ -829,7 +822,7 @@ mkLam bndrs body ; return (mkLams bndrs body') } | otherwise - = returnSmpl (mkLams bndrs body) + = return (mkLams bndrs body) \end{code} Note [Casts and lambdas] @@ -875,8 +868,8 @@ because the latter is not well-kinded. -- if this is indeed a right-hand side; otherwise -- we end up floating the thing out, only for float-in -- to float it right back in again! - = tryRhsTyLam env bndrs body `thenSmpl` \ (floats, body') -> - returnSmpl (floats, mkLams bndrs body') + = do (floats, body') <- tryRhsTyLam env bndrs body + return (floats, mkLams bndrs body') -} @@ -998,9 +991,9 @@ actually computing the expansion. \begin{code} tryEtaExpansion :: DynFlags -> OutExpr -> SimplM OutExpr -- There is at least one runtime binder in the binders -tryEtaExpansion dflags body - = getUniquesSmpl `thenSmpl` \ us -> - returnSmpl (etaExpand fun_arity us body (exprType body)) +tryEtaExpansion dflags body = do + us <- getUniquesM + return (etaExpand fun_arity us body (exprType body)) where fun_arity = exprEtaExpandArity dflags body \end{code} @@ -1092,7 +1085,7 @@ it is guarded by the doFloatFromRhs call in simplLazyBind. abstractFloats :: [OutTyVar] -> SimplEnv -> OutExpr -> SimplM ([OutBind], OutExpr) abstractFloats main_tvs body_env body = ASSERT( notNull body_floats ) - do { (subst, float_binds) <- mapAccumLSmpl abstract empty_subst body_floats + do { (subst, float_binds) <- mapAccumLM abstract empty_subst body_floats ; return (float_binds, CoreSubst.substExpr subst body) } where main_tv_set = mkVarSet main_tvs @@ -1128,7 +1121,7 @@ abstractFloats main_tvs body_env body -- gives rise to problems. SLPJ June 98 abstract subst (Rec prs) - = do { (poly_ids, poly_apps) <- mapAndUnzipSmpl (mk_poly tvs_here) ids + = do { (poly_ids, poly_apps) <- mapAndUnzipM (mk_poly tvs_here) ids ; let subst' = CoreSubst.extendSubstList subst (ids `zip` poly_apps) poly_rhss = [mkLams tvs_here (CoreSubst.substExpr subst' rhs) | rhs <- rhss] ; return (subst', Rec (poly_ids `zip` poly_rhss)) } @@ -1150,7 +1143,7 @@ abstractFloats main_tvs body_env body tvs_here = main_tvs mk_poly tvs_here var - = do { uniq <- getUniqueSmpl + = do { uniq <- getUniqueM ; let poly_name = setNameUnique (idName var) uniq -- Keep same name poly_ty = mkForAllTys tvs_here (idType var) -- But new type of course poly_id = mkLocalId poly_name poly_ty @@ -1394,7 +1387,7 @@ prepareDefault dflags env case_bndr (Just (tycon, inst_tys)) imposs_cons (Just d [con] -> -- It matches exactly one constructor, so fill it in do { tick (FillInCaseDefault case_bndr) - ; us <- getUniquesSmpl + ; us <- getUniquesM ; let (ex_tvs, co_tvs, arg_ids) = dataConRepInstPat us con inst_tys ; return [(DataAlt con, ex_tvs ++ co_tvs ++ arg_ids, deflt_rhs)] } @@ -1451,8 +1444,8 @@ mkCase scrut case_bndr ty [] mkCase scrut case_bndr ty alts -- Identity case | all identity_alt alts - = tick (CaseIdentity case_bndr) `thenSmpl_` - returnSmpl (re_cast scrut) + = do tick (CaseIdentity case_bndr) + return (re_cast scrut) where identity_alt (con, args, rhs) = check_eq con args (de_cast rhs) @@ -1485,7 +1478,7 @@ mkCase scrut case_bndr ty alts -- Identity case -------------------------------------------------- -- Catch-all -------------------------------------------------- -mkCase scrut bndr ty alts = returnSmpl (Case scrut bndr ty alts) +mkCase scrut bndr ty alts = return (Case scrut bndr ty alts) \end{code}