import CmdLineOpts ( opt_AutoSccsOnIndividualCafs )
import CostCentre -- lots of things
-import Const ( Con(..) )
-import Id ( Id, mkSysLocal, idType, idName )
+import Id ( Id )
import Module ( Module )
import UniqSupply ( uniqFromSupply, splitUniqSupply, UniqSupply )
import Unique ( Unique )
-import Type ( splitForAllTys, splitTyConApp_maybe )
-import TyCon ( isFunTyCon )
import VarSet
-import UniqSet
-import Name ( isLocallyDefinedName )
-import Util ( removeDups )
+import ListSetOps ( removeDups )
import Outputable
infixr 9 `thenMM`, `thenMM_`
\end{code}
\begin{code}
-type CollectedCCs = ([CostCentre], -- locally defined ones
- [CostCentre], -- ones needing "extern" decls
- [CostCentreStack]) -- singleton stacks (for CAFs)
-
stgMassageForProfiling
- :: Module -> FAST_STRING -- module name, group name
+ :: Module -- module name
-> UniqSupply -- unique supply
-> [StgBinding] -- input
-> (CollectedCCs, [StgBinding])
-stgMassageForProfiling mod_name grp_name us stg_binds
+stgMassageForProfiling mod_name us stg_binds
= let
((local_ccs, extern_ccs, cc_stacks),
stg_binds2)
fixed_cc_stacks ++ cc_stacks), stg_binds2)
where
- all_cafs_cc = mkAllCafsCC mod_name grp_name
+ all_cafs_cc = mkAllCafsCC mod_name
all_cafs_ccs = mkSingletonCCS all_cafs_cc
----------
do_top_bindings [] = returnMM []
- do_top_bindings (StgNonRec b rhs : bs)
+ do_top_bindings (StgNonRec srt b rhs : bs)
= do_top_rhs b rhs `thenMM` \ rhs' ->
addTopLevelIshId b (
do_top_bindings bs `thenMM` \bs' ->
- returnMM (StgNonRec b rhs' : bs')
+ returnMM (StgNonRec srt b rhs' : bs')
)
- do_top_bindings (StgRec pairs : bs)
+ do_top_bindings (StgRec srt pairs : bs)
= addTopLevelIshIds binders (
mapMM do_pair pairs `thenMM` \ pairs2 ->
do_top_bindings bs `thenMM` \ bs' ->
- returnMM (StgRec pairs2 : bs')
+ returnMM (StgRec srt pairs2 : bs')
)
where
binders = map fst pairs
----------
do_top_rhs :: Id -> StgRhs -> MassageM StgRhs
- do_top_rhs binder (StgRhsClosure _ bi srt fv u [] (StgSCC cc (StgCon (DataCon con) args _)))
- | not (isSccCountCostCentre cc)
+ do_top_rhs binder (StgRhsClosure _ bi fv u [] (StgSCC cc (StgConApp con args)))
+ | not (isSccCountCostCentre cc) && not (isDllConApp con args)
-- Trivial _scc_ around nothing but static data
-- Eliminate _scc_ ... and turn into StgRhsCon
+
+ -- isDllConApp checks for LitLit args too
= returnMM (StgRhsCon dontCareCCS con args)
{- Can't do this one with cost-centre stacks: --SDM
- do_top_rhs binder (StgRhsClosure no_cc bi srt fv u [] (StgSCC ty cc expr))
+ do_top_rhs binder (StgRhsClosure no_cc bi fv u [] (StgSCC ty cc expr))
| (noCCSAttached no_cc || currentOrSubsumedCCS no_cc)
&& not (isSccCountCostCentre cc)
-- Top level CAF without a cost centre attached
-- Attach and collect cc of trivial _scc_ in body
= collectCC cc `thenMM_`
set_prevailing_cc cc (do_expr expr) `thenMM` \ expr' ->
- returnMM (StgRhsClosure cc bi srt fv u [] expr')
+ returnMM (StgRhsClosure cc bi fv u [] expr')
-}
- do_top_rhs binder (StgRhsClosure no_cc bi srt fv u [] body)
+ do_top_rhs binder (StgRhsClosure no_cc bi fv u [] body)
| noCCSAttached no_cc || currentOrSubsumedCCS no_cc
-- Top level CAF without a cost centre attached
-- Attach CAF cc (collect if individual CAF ccs)
= (if opt_AutoSccsOnIndividualCafs
- then let cc = mkAutoCC binder mod_name grp_name CafCC
+ then let cc = mkAutoCC binder mod_name CafCC
ccs = mkSingletonCCS cc
in
collectCC cc `thenMM_`
else
returnMM all_cafs_ccs) `thenMM` \ caf_ccs ->
set_prevailing_cc caf_ccs (do_expr body) `thenMM` \ body' ->
- returnMM (StgRhsClosure caf_ccs bi srt fv u [] body')
+ returnMM (StgRhsClosure caf_ccs bi fv u [] body')
- do_top_rhs binder (StgRhsClosure cc bi srt fv u [] body)
+ do_top_rhs binder (StgRhsClosure cc bi fv u [] body)
-- Top level CAF with cost centre attached
-- Should this be a CAF cc ??? Does this ever occur ???
= pprPanic "SCCfinal: CAF with cc:" (ppr cc)
-{- can't do this with cost-centre stacks: --SDM
- do_top_rhs binder (StgRhsClosure _ bi srt fv u args (StgSCC cc expr))
- | not (isSccCountCostCentre cc)
- -- Top level function with trivial _scc_ in body
- -- Attach and collect cc of trivial _scc_
- = collectCC cc `thenMM_`
- set_prevailing_cc cc (do_expr expr) `thenMM` \ expr' ->
- returnMM (StgRhsClosure cc bi srt fv u args expr')
--}
-
- do_top_rhs binder (StgRhsClosure no_ccs bi srt fv u args body)
+ do_top_rhs binder (StgRhsClosure no_ccs bi fv u args body)
-- Top level function, probably subsumed
| noCCSAttached no_ccs
= set_lambda_cc (do_expr body) `thenMM` \ body' ->
- returnMM (StgRhsClosure subsumedCCS bi srt fv u args body')
+ returnMM (StgRhsClosure subsumedCCS bi fv u args body')
| otherwise
= pprPanic "SCCfinal: CAF with cc:" (ppr no_ccs)
------
do_expr :: StgExpr -> MassageM StgExpr
+ do_expr (StgLit l) = returnMM (StgLit l)
+
do_expr (StgApp fn args)
= boxHigherOrderArgs (StgApp fn) args
- do_expr (StgCon con args res_ty)
- = boxHigherOrderArgs (\args -> StgCon con args res_ty) args
+ do_expr (StgConApp con args)
+ = boxHigherOrderArgs (\args -> StgConApp con args) args
+
+ do_expr (StgOpApp con args res_ty)
+ = boxHigherOrderArgs (\args -> StgOpApp con args res_ty) args
do_expr (StgSCC cc expr) -- Ha, we found a cost centre!
= collectCC cc `thenMM_`
do_alts alts `thenMM` \ alts' ->
returnMM (StgCase expr' fv1 fv2 bndr srt alts')
where
- do_alts (StgAlgAlts ty alts def)
+ do_alts (StgAlgAlts tycon alts def)
= mapMM do_alt alts `thenMM` \ alts' ->
do_deflt def `thenMM` \ def' ->
- returnMM (StgAlgAlts ty alts' def')
+ returnMM (StgAlgAlts tycon alts' def')
where
do_alt (id, bs, use_mask, e)
= do_expr e `thenMM` \ e' ->
returnMM (id, bs, use_mask, e')
- do_alts (StgPrimAlts ty alts def)
+ do_alts (StgPrimAlts tycon alts def)
= mapMM do_alt alts `thenMM` \ alts' ->
do_deflt def `thenMM` \ def' ->
- returnMM (StgPrimAlts ty alts' def')
+ returnMM (StgPrimAlts tycon alts' def')
where
do_alt (l,e)
= do_expr e `thenMM` \ e' ->
= do_let b e `thenMM` \ (b,e) ->
returnMM (StgLetNoEscape lvs1 lvs2 b e)
+#ifdef DEBUG
+ do_expr other = pprPanic "SCCfinal.do_expr" (ppr other)
+#endif
+
----------------------------------
- do_let (StgNonRec b rhs) e
+ do_let (StgNonRec srt b rhs) e
= do_rhs rhs `thenMM` \ rhs' ->
addTopLevelIshId b (
do_expr e `thenMM` \ e' ->
- returnMM (StgNonRec b rhs',e')
+ returnMM (StgNonRec srt b rhs',e')
)
- do_let (StgRec pairs) e
+ do_let (StgRec srt pairs) e
= addTopLevelIshIds binders (
mapMM do_pair pairs `thenMM` \ pairs' ->
do_expr e `thenMM` \ e' ->
- returnMM (StgRec pairs', e')
+ returnMM (StgRec srt pairs', e')
)
where
binders = map fst pairs
-- but we don't have to worry about cafs etc.
{-
- do_rhs (StgRhsClosure closure_cc bi srt fv u [] (StgSCC ty cc (StgCon (DataCon con) args _)))
+ do_rhs (StgRhsClosure closure_cc bi fv u [] (StgSCC ty cc (StgCon (DataCon con) args _)))
| not (isSccCountCostCentre cc)
= collectCC cc `thenMM_`
returnMM (StgRhsCon cc con args)
-}
-{-
- do_rhs (StgRhsClosure _ bi srt fv u args (StgSCC ty cc expr))
- | not (isSccCountCostCentre cc)
- = collectCC cc `thenMM_`
- set_prevailing_cc cc (do_expr expr) `thenMM` \ expr' ->
- returnMM (StgRhsClosure cc bi srt fv u args expr')
--}
-
- do_rhs (StgRhsClosure cc bi srt fv u [] body)
- = do_expr body `thenMM` \ body' ->
- returnMM (StgRhsClosure currentCCS bi srt fv u [] body')
-
- do_rhs (StgRhsClosure cc bi srt fv u args body)
- = set_lambda_cc (do_expr body) `thenMM` \ body' ->
- get_prevailing_cc `thenMM` \ prev_ccs ->
- returnMM (StgRhsClosure currentCCS bi srt fv u args body')
+ do_rhs (StgRhsClosure _ bi fv u args expr)
+ = slurpSCCs currentCCS expr `thenMM` \ (expr', ccs) ->
+ do_expr expr' `thenMM` \ expr'' ->
+ returnMM (StgRhsClosure ccs bi fv u args expr'')
+ where
+ slurpSCCs ccs (StgSCC cc e)
+ = collectCC cc `thenMM_`
+ slurpSCCs ccs e `thenMM` \ (e', ccs') ->
+ returnMM (e', pushCCOnCCS cc ccs')
+ slurpSCCs ccs e
+ = returnMM (e, ccs)
do_rhs (StgRhsCon cc con args)
= returnMM (StgRhsCon currentCCS con args)
%* *
%************************************************************************
+Boxing is *turned off* at the moment, until we can figure out how to
+do it properly in general.
+
\begin{code}
boxHigherOrderArgs
:: ([StgArg] -> StgExpr)
-> [StgArg] -- arguments which we might box
-> MassageM StgExpr
+#ifndef PROF_DO_BOXING
+boxHigherOrderArgs almost_expr args
+ = returnMM (almost_expr args)
+#else
boxHigherOrderArgs almost_expr args
= getTopLevelIshIds `thenMM` \ ids ->
mapAccumMM (do_arg ids) [] args `thenMM` \ (let_bindings, new_args) ->
returnMM (foldr (mk_stg_let currentCCS) (almost_expr new_args) let_bindings)
where
---------------
- do_arg ids bindings atom@(StgConArg _) = returnMM (bindings, atom)
- do_arg ids bindings atom@(StgVarArg old_var)
- = let
- var_type = idType old_var
+ do_arg ids bindings arg@(StgVarArg old_var)
+ | (not (isLocalVar old_var) || elemVarSet old_var ids)
+ && isFunTy (dropForAlls var_type)
+ = -- make a trivial let-binding for the top-level function
+ getUniqueMM `thenMM` \ uniq ->
+ let
+ new_var = mkSysLocal FSLIT("sf") uniq var_type
in
- if ( not (isLocallyDefinedName (idName old_var)) ||
- elemVarSet old_var ids ) && isFunType var_type
- then
- -- make a trivial let-binding for the top-level function
- getUniqueMM `thenMM` \ uniq ->
- let
- new_var = mkSysLocal SLIT("sf") uniq var_type
- in
- returnMM ( (new_var, old_var) : bindings, StgVarArg new_var )
- else
- returnMM (bindings, atom)
+ returnMM ( (new_var, old_var) : bindings, StgVarArg new_var )
+ where
+ var_type = idType old_var
+
+ do_arg ids bindings arg = returnMM (bindings, arg)
---------------
mk_stg_let :: CostCentreStack -> (Id, Id) -> StgExpr -> StgExpr
mk_stg_let cc (new_var, old_var) body
= let
rhs_body = StgApp old_var [{-args-}]
- rhs_closure = StgRhsClosure cc stgArgOcc NoSRT [{-fvs-}] ReEntrant [{-args-}] rhs_body
+ rhs_closure = StgRhsClosure cc stgArgOcc [{-fvs-}] ReEntrant [{-args-}] rhs_body
in
- StgLet (StgNonRec new_var rhs_closure) body
+ StgLet (StgNonRec NoSRT{-eeek!!!-} new_var rhs_closure) body
where
bOGUS_LVs = emptyUniqSet -- easier to print than: panic "mk_stg_let: LVs"
-
-isFunType var_type
- = case splitForAllTys var_type of
- (_, ty) -> case splitTyConApp_maybe ty of
- Just (tycon,_) | isFunTyCon tycon -> True
- _ -> False
-
+#endif
\end{code}
%************************************************************************
= Module -- module name
-> CostCentreStack -- prevailing CostCentre
-- if none, subsumedCosts at top-level
- -- useCurrentCostCentre at nested levels
+ -- currentCostCentre at nested levels
-> UniqSupply
-> VarSet -- toplevel-ish Ids for boxing
-> CollectedCCs
-> (CollectedCCs, result)
--- the initUs function also returns the final UniqueSupply and CollectedCCs
+-- the initMM function also returns the final CollectedCCs
initMM :: Module -- module name, which we may consult
-> UniqSupply
projects / ghc-hetmet.git / blobdiff