import StgSyn
-import CmdLineOpts ( opt_AutoSccsOnIndividualCafs )
+import Packages ( HomeModules )
+import StaticFlags ( opt_AutoSccsOnIndividualCafs )
import CostCentre -- lots of things
import Id ( Id )
import Module ( Module )
\end{code}
\begin{code}
-type CollectedCCs = ([CostCentre], -- locally defined ones
- [CostCentre], -- ones needing "extern" decls
- [CostCentreStack]) -- singleton stacks (for CAFs)
-
stgMassageForProfiling
- :: Module -- module name
+ :: HomeModules
+ -> Module -- module name
-> UniqSupply -- unique supply
-> [StgBinding] -- input
-> (CollectedCCs, [StgBinding])
-stgMassageForProfiling mod_name us stg_binds
+stgMassageForProfiling pdeps mod_name us stg_binds
= let
((local_ccs, extern_ccs, cc_stacks),
stg_binds2)
do_top_bindings [] = returnMM []
- do_top_bindings (StgNonRec srt b rhs : bs)
+ do_top_bindings (StgNonRec b rhs : bs)
= do_top_rhs b rhs `thenMM` \ rhs' ->
addTopLevelIshId b (
do_top_bindings bs `thenMM` \bs' ->
- returnMM (StgNonRec srt b rhs' : bs')
+ returnMM (StgNonRec b rhs' : bs')
)
- do_top_bindings (StgRec srt pairs : bs)
+ do_top_bindings (StgRec pairs : bs)
= addTopLevelIshIds binders (
mapMM do_pair pairs `thenMM` \ pairs2 ->
do_top_bindings bs `thenMM` \ bs' ->
- returnMM (StgRec srt pairs2 : bs')
+ returnMM (StgRec pairs2 : bs')
)
where
binders = map fst pairs
----------
do_top_rhs :: Id -> StgRhs -> MassageM StgRhs
- do_top_rhs binder (StgRhsClosure _ bi fv u [] (StgSCC cc (StgConApp con args)))
- | not (isSccCountCostCentre cc) && not (isDllConApp con args)
+ do_top_rhs binder (StgRhsClosure _ bi fv u srt [] (StgSCC cc (StgConApp con args)))
+ | not (isSccCountCostCentre cc) && not (isDllConApp pdeps con args)
-- Trivial _scc_ around nothing but static data
-- Eliminate _scc_ ... and turn into StgRhsCon
returnMM (StgRhsClosure cc bi fv u [] expr')
-}
- do_top_rhs binder (StgRhsClosure no_cc bi fv u [] body)
+ do_top_rhs binder (StgRhsClosure no_cc bi fv u srt [] body)
| noCCSAttached no_cc || currentOrSubsumedCCS no_cc
-- Top level CAF without a cost centre attached
-- Attach CAF cc (collect if individual CAF ccs)
else
returnMM all_cafs_ccs) `thenMM` \ caf_ccs ->
set_prevailing_cc caf_ccs (do_expr body) `thenMM` \ body' ->
- returnMM (StgRhsClosure caf_ccs bi fv u [] body')
+ returnMM (StgRhsClosure caf_ccs bi fv u srt [] body')
- do_top_rhs binder (StgRhsClosure cc bi fv u [] body)
+ do_top_rhs binder (StgRhsClosure cc bi fv u srt [] 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)
- do_top_rhs binder (StgRhsClosure no_ccs bi fv u args body)
+ do_top_rhs binder (StgRhsClosure no_ccs bi fv u srt args body)
-- Top level function, probably subsumed
| noCCSAttached no_ccs
= set_lambda_cc (do_expr body) `thenMM` \ body' ->
- returnMM (StgRhsClosure subsumedCCS bi fv u args body')
+ returnMM (StgRhsClosure subsumedCCS bi fv u srt args body')
| otherwise
= pprPanic "SCCfinal: CAF with cc:" (ppr no_ccs)
do_expr (StgConApp con args)
= boxHigherOrderArgs (\args -> StgConApp con args) args
- do_expr (StgPrimApp con args res_ty)
- = boxHigherOrderArgs (\args -> StgPrimApp con args res_ty) 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_expr expr `thenMM` \ expr' ->
returnMM (StgSCC cc expr')
- do_expr (StgCase expr fv1 fv2 bndr srt alts)
+ do_expr (StgCase expr fv1 fv2 bndr srt alt_type alts)
= do_expr expr `thenMM` \ expr' ->
- do_alts alts `thenMM` \ alts' ->
- returnMM (StgCase expr' fv1 fv2 bndr srt alts')
+ mapMM do_alt alts `thenMM` \ alts' ->
+ returnMM (StgCase expr' fv1 fv2 bndr srt alt_type alts')
where
- do_alts (StgAlgAlts tycon alts def)
- = mapMM do_alt alts `thenMM` \ alts' ->
- do_deflt def `thenMM` \ 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 tycon alts def)
- = mapMM do_alt alts `thenMM` \ alts' ->
- do_deflt def `thenMM` \ def' ->
- returnMM (StgPrimAlts tycon alts' def')
- where
- do_alt (l,e)
- = do_expr e `thenMM` \ e' ->
- returnMM (l,e')
-
- do_deflt StgNoDefault = returnMM StgNoDefault
- do_deflt (StgBindDefault e)
- = do_expr e `thenMM` \ e' ->
- returnMM (StgBindDefault e')
+ do_alt (id, bs, use_mask, e)
+ = do_expr e `thenMM` \ e' ->
+ returnMM (id, bs, use_mask, e')
do_expr (StgLet b e)
= do_let b e `thenMM` \ (b,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 srt b rhs) e
+ do_let (StgNonRec b rhs) e
= do_rhs rhs `thenMM` \ rhs' ->
addTopLevelIshId b (
do_expr e `thenMM` \ e' ->
- returnMM (StgNonRec srt b rhs',e')
+ returnMM (StgNonRec b rhs',e')
)
- do_let (StgRec srt pairs) e
+ do_let (StgRec pairs) e
= addTopLevelIshIds binders (
mapMM do_pair pairs `thenMM` \ pairs' ->
do_expr e `thenMM` \ e' ->
- returnMM (StgRec srt pairs', e')
+ returnMM (StgRec pairs', e')
)
where
binders = map fst pairs
returnMM (StgRhsCon cc con args)
-}
-{-
- do_rhs (StgRhsClosure _ bi 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 fv u args expr')
--}
-
- do_rhs (StgRhsClosure cc bi fv u [] body)
- = do_expr body `thenMM` \ body' ->
- returnMM (StgRhsClosure currentCCS bi fv u [] body')
-
- do_rhs (StgRhsClosure cc bi fv u args body)
- = set_lambda_cc (do_expr body) `thenMM` \ body' ->
- get_prevailing_cc `thenMM` \ prev_ccs ->
- returnMM (StgRhsClosure currentCCS bi fv u args body')
+ do_rhs (StgRhsClosure _ bi fv u srt args expr)
+ = slurpSCCs currentCCS expr `thenMM` \ (expr', ccs) ->
+ do_expr expr' `thenMM` \ expr'' ->
+ returnMM (StgRhsClosure ccs bi fv u srt args expr'')
+ where
+ slurpSCCs ccs (StgSCC cc e)
+ = collectCC cc `thenMM_`
+ slurpSCCs (cc `pushCCOnCCS` ccs) e
+ slurpSCCs ccs e
+ = returnMM (e, ccs)
do_rhs (StgRhsCon cc con args)
= returnMM (StgRhsCon currentCCS con args)
do_arg ids bindings arg@(StgVarArg old_var)
| (not (isLocalVar old_var) || elemVarSet old_var ids)
- && isFunType var_type
+ && isFunTy (dropForAlls var_type)
= -- make a trivial let-binding for the top-level function
getUniqueMM `thenMM` \ uniq ->
let
- new_var = mkSysLocal SLIT("sf") uniq var_type
+ new_var = mkSysLocal FSLIT("sf") uniq var_type
in
returnMM ( (new_var, old_var) : bindings, StgVarArg new_var )
where
mk_stg_let cc (new_var, old_var) body
= let
rhs_body = StgApp old_var [{-args-}]
- rhs_closure = StgRhsClosure cc stgArgOcc [{-fvs-}] ReEntrant [{-args-}] rhs_body
+ rhs_closure = StgRhsClosure cc stgArgOcc [{-fvs-}] ReEntrant NoSRT{-eeek!!!-} [{-args-}] rhs_body
in
- StgLet (StgNonRec NoSRT{-eeek!!!-} new_var rhs_closure) body
+ StgLet (StgNonRec 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
projects / ghc-hetmet.git / blobdiff