X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FdeSugar%2FDsBinds.lhs;h=9cb09ed73e5b83af7475646a631cd3e3a9b1ef42;hb=490cba33825083f8e785aeb35b5ac1667fc3954b;hp=c0d1f772d57333c837b024f21f3d557b97bf16f9;hpb=1739ba3ce432e640139764596ca453e58aef3016;p=ghc-hetmet.git diff --git a/ghc/compiler/deSugar/DsBinds.lhs b/ghc/compiler/deSugar/DsBinds.lhs index c0d1f77..9cb09ed 100644 --- a/ghc/compiler/deSugar/DsBinds.lhs +++ b/ghc/compiler/deSugar/DsBinds.lhs @@ -8,7 +8,7 @@ in that the @Rec@/@NonRec@/etc structure is thrown away (whereas at lower levels it is preserved with @let@/@letrec@s). \begin{code} -module DsBinds ( dsMonoBinds ) where +module DsBinds ( dsMonoBinds, AutoScc(..) ) where #include "HsVersions.h" @@ -17,25 +17,23 @@ import {-# SOURCE #-} DsExpr( dsExpr ) import HsSyn -- lots of things import CoreSyn -- lots of things -import CoreUtils ( coreExprType ) +import CoreUtils ( exprType, mkInlineMe, mkSCC ) import TcHsSyn ( TypecheckedMonoBinds ) import DsMonad import DsGRHSs ( dsGuarded ) import DsUtils import Match ( matchWrapper ) -import BasicTypes ( RecFlag(..) ) -import CmdLineOpts ( opt_SccProfilingOn, opt_AutoSccsOnAllToplevs, - opt_AutoSccsOnExportedToplevs - ) -import CostCentre ( mkAutoCC, IsCafCC(..), mkAllDictsCC ) -import Id ( idType, Id ) -import VarEnv -import Name ( isExported ) -import Type ( mkTyVarTy, isDictTy, substTy - ) +import CmdLineOpts ( opt_AutoSccsOnAllToplevs, opt_AutoSccsOnExportedToplevs ) +import CostCentre ( mkAutoCC, IsCafCC(..) ) +import Id ( idType, idName, isExportedId, isSpecPragmaId, Id ) +import NameSet +import VarSet +import Type ( mkTyVarTy ) +import Subst ( mkTyVarSubst, substTy ) import TysWiredIn ( voidTy ) import Outputable +import Maybe ( isJust ) \end{code} %************************************************************************ @@ -45,7 +43,7 @@ import Outputable %************************************************************************ \begin{code} -dsMonoBinds :: Bool -- False => don't (auto-)annotate scc on toplevs. +dsMonoBinds :: AutoScc -- scc annotation policy (see below) -> TypecheckedMonoBinds -> [(Id,CoreExpr)] -- Put this on the end (avoid quadratic append) -> DsM [(Id,CoreExpr)] -- Result @@ -66,7 +64,17 @@ dsMonoBinds _ (VarMonoBind var expr) rest -- we only need do this here addDictScc var core_expr `thenDs` \ core_expr' -> - returnDs ((var, core_expr') : rest) + let + -- Gross hack to prevent inlining into SpecPragmaId rhss + -- Consider fromIntegral = fromInteger . toInteger + -- spec1 = fromIntegral Int Float + -- Even though fromIntegral is small we don't want to inline + -- it inside spec1, so that we collect the specialised call + -- Solution: make spec1 an INLINE thing. + core_expr'' = mkInline (isSpecPragmaId var) core_expr' + in + + returnDs ((var, core_expr'') : rest) dsMonoBinds auto_scc (FunMonoBind fun _ matches locn) rest = putSrcLocDs locn $ @@ -76,44 +84,50 @@ dsMonoBinds auto_scc (FunMonoBind fun _ matches locn) rest where error_string = "function " ++ showSDoc (ppr fun) -dsMonoBinds _ (PatMonoBind pat grhss locn) rest +dsMonoBinds auto_scc (PatMonoBind pat grhss locn) rest = putSrcLocDs locn $ - dsGuarded grhss `thenDs` \ body_expr -> - mkSelectorBinds pat body_expr `thenDs` \ sel_binds -> + dsGuarded grhss `thenDs` \ body_expr -> + mkSelectorBinds pat body_expr `thenDs` \ sel_binds -> + mapDs (addAutoScc auto_scc) sel_binds `thenDs` \ sel_binds -> returnDs (sel_binds ++ rest) -- Common special case: no type or dictionary abstraction -dsMonoBinds auto_scc (AbsBinds [] [] exports binds) rest - = mapDs (addAutoScc auto_scc) [(global, Var local) | (_, global, local) <- exports] `thenDs` \ exports' -> - dsMonoBinds False binds (exports' ++ rest) +dsMonoBinds auto_scc (AbsBinds [] [] exports inlines binds) rest + = dsMonoBinds (addSccs auto_scc exports) binds []`thenDs` \ core_prs -> + let + exports' = [(global, Var local) | (_, global, local) <- exports] + in + returnDs (addLocalInlines exports inlines core_prs ++ exports' ++ rest) -- Another common case: one exported variable - -- All non-recursive bindings come through this way -dsMonoBinds auto_scc (AbsBinds all_tyvars dicts [(tyvars, global, local)] binds) rest + -- Non-recursive bindings come through this way +dsMonoBinds auto_scc + (AbsBinds all_tyvars dicts exps@[(tyvars, global, local)] inlines binds) rest = ASSERT( all (`elem` tyvars) all_tyvars ) - dsMonoBinds False binds [] `thenDs` \ core_prs -> + dsMonoBinds (addSccs auto_scc exps) binds [] `thenDs` \ core_prs -> let -- Always treat the binds as recursive, because the typechecker -- makes rather mixed-up dictionary bindings core_binds = [Rec core_prs] + global' = (global, mkInline (idName global `elemNameSet` inlines) $ + mkLams tyvars $ mkLams dicts $ + mkDsLets core_binds (Var local)) in - addAutoScc auto_scc (global, mkLams tyvars $ mkLams dicts $ - mkLets core_binds (Var local)) `thenDs` \ global' -> returnDs (global' : rest) -dsMonoBinds auto_scc (AbsBinds all_tyvars dicts exports binds) rest - = dsMonoBinds False binds [] `thenDs` \ core_prs -> +dsMonoBinds auto_scc (AbsBinds all_tyvars dicts exports inlines binds) rest + = dsMonoBinds (addSccs auto_scc exports) binds []`thenDs` \ core_prs -> let - core_binds = [Rec core_prs] + core_binds = [Rec (addLocalInlines exports inlines core_prs)] tup_expr = mkTupleExpr locals - tup_ty = coreExprType tup_expr + tup_ty = exprType tup_expr poly_tup_expr = mkLams all_tyvars $ mkLams dicts $ - mkLets core_binds tup_expr + mkDsLets core_binds tup_expr locals = [local | (_, _, local) <- exports] local_tys = map idType locals in - newSysLocalDs (coreExprType poly_tup_expr) `thenDs` \ poly_tup_id -> + newSysLocalDs (exprType poly_tup_expr) `thenDs` \ poly_tup_id -> let dict_args = map Var dicts @@ -122,15 +136,14 @@ dsMonoBinds auto_scc (AbsBinds all_tyvars dicts exports binds) rest -- some of the tyvars will be bound to voidTy newSysLocalsDs (map (substTy env) local_tys) `thenDs` \ locals' -> newSysLocalDs (substTy env tup_ty) `thenDs` \ tup_id -> - addAutoScc auto_scc - (global, mkLams tyvars $ mkLams dicts $ - mkTupleSelector locals' (locals' !! n) tup_id $ - mkApps (mkTyApps (Var poly_tup_id) ty_args) dict_args) + returnDs (global, mkLams tyvars $ mkLams dicts $ + mkTupleSelector locals' (locals' !! n) tup_id $ + mkApps (mkTyApps (Var poly_tup_id) ty_args) dict_args) where mk_ty_arg all_tyvar | all_tyvar `elem` tyvars = mkTyVarTy all_tyvar | otherwise = voidTy ty_args = map mk_ty_arg all_tyvars - env = all_tyvars `zipVarEnv` ty_args + env = mkTyVarSubst all_tyvars ty_args in zipWithDs mk_bind exports [0..] `thenDs` \ export_binds -> -- don't scc (auto-)annotate the tuple itself. @@ -140,40 +153,76 @@ dsMonoBinds auto_scc (AbsBinds all_tyvars dicts exports binds) rest %************************************************************************ %* * +\subsection{Adding inline pragmas} +%* * +%************************************************************************ + +\begin{code} +mkInline :: Bool -> CoreExpr -> CoreExpr +mkInline True body = mkInlineMe body +mkInline False body = body + +addLocalInlines :: [(a, Id, Id)] -> NameSet -> [(Id,CoreExpr)] -> [(Id,CoreExpr)] +addLocalInlines exports inlines pairs + = [(bndr, mkInline (bndr `elemVarSet` local_inlines) rhs) | (bndr,rhs) <- pairs] + where + local_inlines = mkVarSet [l | (_,g,l) <- exports, idName g `elemNameSet` inlines] +\end{code} + + +%************************************************************************ +%* * \subsection[addAutoScc]{Adding automatic sccs} %* * %************************************************************************ \begin{code} -addAutoScc :: Bool -- if needs be, decorate toplevs? +data AutoScc + = TopLevel + | TopLevelAddSccs (Id -> Maybe Id) + | NoSccs + +addSccs :: AutoScc -> [(a,Id,Id)] -> AutoScc +addSccs auto_scc@(TopLevelAddSccs _) exports = auto_scc +addSccs NoSccs exports = NoSccs +addSccs TopLevel exports + = TopLevelAddSccs (\id -> case [ exp | (_,exp,loc) <- exports, loc == id ] of + (exp:_) | opt_AutoSccsOnAllToplevs || + (isExportedId exp && + opt_AutoSccsOnExportedToplevs) + -> Just exp + _ -> Nothing) + +addAutoScc :: AutoScc -- if needs be, decorate toplevs? -> (Id, CoreExpr) -> DsM (Id, CoreExpr) -addAutoScc auto_scc_candidate pair@(bndr, core_expr) - | auto_scc_candidate && worthSCC core_expr && - (opt_AutoSccsOnAllToplevs || (isExported bndr && opt_AutoSccsOnExportedToplevs)) - = getModuleAndGroupDs `thenDs` \ (mod,grp) -> - returnDs (bndr, Note (SCC (mkAutoCC bndr mod grp NotCafCC)) core_expr) - | otherwise - = returnDs pair +addAutoScc (TopLevelAddSccs auto_scc_fn) pair@(bndr, core_expr) + | do_auto_scc + = getModuleDs `thenDs` \ mod -> + returnDs (bndr, mkSCC (mkAutoCC top_bndr mod NotCafCC) core_expr) + where do_auto_scc = isJust maybe_auto_scc + maybe_auto_scc = auto_scc_fn bndr + (Just top_bndr) = maybe_auto_scc -worthSCC (Note (SCC _) _) = False -worthSCC (Con _ _) = False -worthSCC core_expr = True +addAutoScc _ pair + = returnDs pair \end{code} -If profiling and dealing with a dict binding, wrap the dict in "_scc_ DICT ": +If profiling and dealing with a dict binding, +wrap the dict in @_scc_ DICT @: \begin{code} -addDictScc var rhs - | not ( opt_SccProfilingOn || opt_AutoSccsOnAllToplevs) - -- the latter is so that -unprof-auto-scc-all adds dict sccs +addDictScc var rhs = returnDs rhs + +{- DISABLED for now (need to somehow make up a name for the scc) -- SDM + | not ( opt_SccProfilingOn && opt_AutoSccsOnDicts) || not (isDictTy (idType var)) = returnDs rhs -- That's easy: do nothing | otherwise = getModuleAndGroupDs `thenDs` \ (mod, grp) -> - -- ToDo: do -dicts-all flag (mark dict things with individual CCs) returnDs (Note (SCC (mkAllDictsCC mod grp False)) rhs) +-} \end{code}