X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FdeSugar%2FDsBinds.lhs;h=97c844ed456dac8502e4115062ba4f67ba6eb675;hb=e0445ffa5a89632b542e7d7bc2ad46d944716453;hp=bfd4634dc88249842e91c0bfa2c09648672e0494;hpb=d6de1c958fd66c94fc6a7dca59402983be8d7408;p=ghc-hetmet.git diff --git a/ghc/compiler/deSugar/DsBinds.lhs b/ghc/compiler/deSugar/DsBinds.lhs index bfd4634..97c844e 100644 --- a/ghc/compiler/deSugar/DsBinds.lhs +++ b/ghc/compiler/deSugar/DsBinds.lhs @@ -1,5 +1,5 @@ % -% (c) The GRASP/AQUA Project, Glasgow University, 1992-1996 +% (c) The GRASP/AQUA Project, Glasgow University, 1992-1998 % \section[DsBinds]{Pattern-matching bindings (HsBinds and MonoBinds)} @@ -8,76 +8,34 @@ in that the @Rec@/@NonRec@/etc structure is thrown away (whereas at lower levels it is preserved with @let@/@letrec@s). \begin{code} -#include "HsVersions.h" +module DsBinds ( dsMonoBinds, AutoScc(..) ) where -module DsBinds ( dsBinds, dsMonoBinds ) where +#include "HsVersions.h" -IMP_Ubiq() -#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ <= 201 -IMPORT_DELOOPER(DsLoop) -- break dsExpr-ish loop -#else -import {-# SOURCE #-} DsExpr -#endif -import HsSyn -- lots of things -import CoreSyn -- lots of things -import CoreUtils ( coreExprType ) -import TcHsSyn ( SYN_IE(TypecheckedHsBinds), SYN_IE(TypecheckedHsExpr), - SYN_IE(TypecheckedMonoBinds), - SYN_IE(TypecheckedPat) - ) +import {-# SOURCE #-} DsExpr( dsExpr ) import DsMonad import DsGRHSs ( dsGuarded ) import DsUtils -import Match ( matchWrapper ) -import BasicTypes ( SYN_IE(Module) ) -import CmdLineOpts ( opt_SccProfilingOn, opt_AutoSccsOnAllToplevs, - opt_AutoSccsOnExportedToplevs - ) -import CostCentre ( mkAutoCC, IsCafCC(..), mkAllDictsCC, preludeDictsCostCentre ) -import Id ( idType, SYN_IE(DictVar), GenId, SYN_IE(Id) ) ---ToDo: rm import ListSetOps ( minusList, intersectLists ) -import Name ( isExported ) -import PprType ( GenType ) -import Outputable ( PprStyle(..) ) -import Type ( mkTyVarTy, isDictTy, instantiateTy - ) -import TyVar ( tyVarSetToList, GenTyVar{-instance Eq-} ) -import TysPrim ( voidTy ) -import Util ( isIn, panic, assertPanic ) -\end{code} - -%************************************************************************ -%* * -\subsection[toplevel-and-regular-DsBinds]{Regular and top-level @dsBinds@} -%* * -%************************************************************************ - -Like @dsBinds@, @dsBind@ returns a @[CoreBinding]@, but it may be -that some of the binders are of unboxed type. This is sorted out when -the caller wraps the bindings round an expression. - -\begin{code} +import HsSyn -- lots of things +import CoreSyn -- lots of things +import CoreUtils ( exprType, mkInlineMe, mkSCC ) +import TcHsSyn ( TypecheckedMonoBinds ) +import Match ( matchWrapper ) -dsBinds :: Bool -- if candidate, auto add scc's on toplevs ? - -> TypecheckedHsBinds - -> DsM [CoreBinding] - -dsBinds _ EmptyBinds = returnDs [] -dsBinds auto_scc (ThenBinds binds_1 binds_2) - = andDs (++) (dsBinds auto_scc binds_1) (dsBinds auto_scc binds_2) - -dsBinds auto_scc (MonoBind binds sigs is_rec) - = dsMonoBinds auto_scc is_rec binds [] `thenDs` \ prs -> - returnDs (if is_rec then - [Rec prs] - else - [NonRec binder rhs | (binder,rhs) <- prs] - ) +import CmdLineOpts ( opt_AutoSccsOnAllToplevs, opt_AutoSccsOnExportedToplevs ) +import CostCentre ( mkAutoCC, IsCafCC(..) ) +import Id ( idType, idName, isExportedId, isSpecPragmaId, Id ) +import NameSet +import VarSet +import TcType ( mkTyVarTy ) +import Subst ( substTyWith ) +import TysWiredIn ( voidTy ) +import Outputable +import Maybe ( isJust ) \end{code} - %************************************************************************ %* * \subsection[dsMonoBinds]{Desugaring a @MonoBinds@} @@ -85,95 +43,133 @@ dsBinds auto_scc (MonoBind binds sigs is_rec) %************************************************************************ \begin{code} -dsMonoBinds :: Bool -- False => don't (auto-)annotate scc on toplevs. - -> RecFlag +dsMonoBinds :: AutoScc -- scc annotation policy (see below) -> TypecheckedMonoBinds -> [(Id,CoreExpr)] -- Put this on the end (avoid quadratic append) -> DsM [(Id,CoreExpr)] -- Result -dsMonoBinds _ is_rec EmptyMonoBinds rest = returnDs rest - -dsMonoBinds auto_scc is_rec (AndMonoBinds binds_1 binds_2) rest - = dsMonoBinds auto_scc is_rec binds_2 rest `thenDs` \ rest' -> - dsMonoBinds auto_scc is_rec binds_1 rest' +dsMonoBinds _ EmptyMonoBinds rest = returnDs rest -dsMonoBinds _ is_rec (CoreMonoBind var core_expr) rest - = returnDs ((var, core_expr) : rest) +dsMonoBinds auto_scc (AndMonoBinds binds_1 binds_2) rest + = dsMonoBinds auto_scc binds_2 rest `thenDs` \ rest' -> + dsMonoBinds auto_scc binds_1 rest' -dsMonoBinds _ is_rec (VarMonoBind var expr) rest +dsMonoBinds _ (VarMonoBind var expr) rest = dsExpr expr `thenDs` \ core_expr -> -- Dictionary bindings are always VarMonoBinds, so -- we only need do this here addDictScc var core_expr `thenDs` \ core_expr' -> - returnDs ((var, core_expr') : rest) - -dsMonoBinds auto_scc is_rec (FunMonoBind fun _ matches locn) 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 $ - matchWrapper (FunMatch fun) matches error_string `thenDs` \ (args, body) -> - addAutoScc auto_scc (fun, mkValLam args body) `thenDs` \ pair -> + matchWrapper (FunRhs (idName fun)) matches `thenDs` \ (args, body) -> + addAutoScc auto_scc (fun, mkLams args body) `thenDs` \ pair -> returnDs (pair : rest) - where - error_string = "function " ++ showForErr fun -dsMonoBinds _ is_rec (PatMonoBind pat grhss_and_binds locn) rest +dsMonoBinds auto_scc (PatMonoBind pat grhss locn) rest = putSrcLocDs locn $ - dsGuarded grhss_and_binds `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 is_rec (AbsBinds [] [] exports binds) rest - = mapDs (addAutoScc auto_scc) [(global, Var local) | (_, global, local) <- exports] `thenDs` \ exports' -> - dsMonoBinds False is_rec binds (exports' ++ rest) + -- For the (rare) case when there are some mixed-up + -- dictionary bindings (for which a Rec is convenient) + -- we reply on the enclosing dsBind to wrap a Rec around. +dsMonoBinds auto_scc (AbsBinds [] [] exports inlines binds) rest + = dsMonoBinds (addSccs auto_scc exports) binds []`thenDs` \ core_prs -> + let + core_prs' = addLocalInlines exports inlines core_prs + exports' = [(global, Var local) | (_, global, local) <- exports] + in + returnDs (core_prs' ++ exports' ++ rest) -- Another common case: one exported variable - -- All non-recursive bindings come through this way -dsMonoBinds auto_scc is_rec (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 is_rec binds [] `thenDs` \ core_prs -> + dsMonoBinds (addSccs auto_scc exps) binds [] `thenDs` \ core_prs -> let - core_binds | is_rec = [Rec core_prs] - | otherwise = [NonRec b e | (b,e) <- core_prs] + -- Always treat the binds as recursive, because the typechecker + -- makes rather mixed-up dictionary bindings + core_bind = Rec core_prs + + -- The mkInline does directly what the + -- addLocalInlines do in the other cases + export' = (global, mkInline (idName global `elemNameSet` inlines) $ + mkLams tyvars $ mkLams dicts $ + Let core_bind (Var local)) in - addAutoScc auto_scc (global, mkLam tyvars dicts $ - mkCoLetsAny core_binds (Var local)) `thenDs` \ global' -> - returnDs (global' : rest) + returnDs (export' : rest) -dsMonoBinds auto_scc is_rec (AbsBinds all_tyvars dicts exports binds) rest - = dsMonoBinds False is_rec 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 | is_rec = [Rec core_prs] - | otherwise = [NonRec b e | (b,e) <- core_prs] - - tup_expr = mkLam all_tyvars dicts $ - mkCoLetsAny core_binds $ - mkTupleExpr locals - locals = [local | (_, _, local) <- exports] - local_tys = map idType locals + -- Rec because of mixed-up dictionary bindings + core_bind = Rec (addLocalInlines exports inlines core_prs) + + tup_expr = mkTupleExpr locals + tup_ty = exprType tup_expr + poly_tup_expr = mkLams all_tyvars $ mkLams dicts $ + Let core_bind tup_expr + locals = [local | (_, _, local) <- exports] + local_tys = map idType locals in - newSysLocalDs (coreExprType tup_expr) `thenDs` \ tup_id -> + newSysLocalDs (exprType poly_tup_expr) `thenDs` \ poly_tup_id -> let - dict_args = map VarArg dicts + dict_args = map Var dicts mk_bind (tyvars, global, local) n -- locals !! n == local = -- Need to make fresh locals to bind in the selector, because -- some of the tyvars will be bound to voidTy - newSysLocalsDs (map (instantiateTy env) local_tys) `thenDs` \ locals' -> - addAutoScc auto_scc - (global, mkLam tyvars dicts $ - mkTupleSelector locals' (locals' !! n) $ - mkValApp (mkTyApp (Var tup_id) ty_args) dict_args) + newSysLocalsDs (map substitute local_tys) `thenDs` \ locals' -> + newSysLocalDs (substitute tup_ty) `thenDs` \ tup_id -> + 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 `zip` ty_args + ty_args = map mk_ty_arg all_tyvars + substitute = substTyWith all_tyvars ty_args in zipWithDs mk_bind exports [0..] `thenDs` \ export_binds -> -- don't scc (auto-)annotate the tuple itself. - returnDs ((tup_id, tup_expr) : (export_binds ++ rest)) + returnDs ((poly_tup_id, poly_tup_expr) : (export_binds ++ rest)) +\end{code} + + +%************************************************************************ +%* * +\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} @@ -184,44 +180,52 @@ dsMonoBinds auto_scc is_rec (AbsBinds all_tyvars dicts exports binds) rest %************************************************************************ \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, SCC (mkAutoCC bndr mod grp IsNotCafCC) 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 (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 -{- - | opt_CompilingGhcInternals - = returnDs (SCC prel_dicts_cc rhs) --} - | otherwise = getModuleAndGroupDs `thenDs` \ (mod, grp) -> - -- ToDo: do -dicts-all flag (mark dict things with individual CCs) - returnDs (SCC (mkAllDictsCC mod grp False) rhs) - -{- UNUSED: -prel_dicts_cc = preludeDictsCostCentre False{-not dupd-} -- ditto + returnDs (Note (SCC (mkAllDictsCC mod grp False)) rhs) -} \end{code}