summaryrefslogtreecommitdiff
path: root/rts/Apply.cmm
diff options
context:
space:
mode:
authorSimon Marlow <marlowsd@gmail.com>2011-10-27 13:47:27 +0100
committerSimon Marlow <marlowsd@gmail.com>2011-11-02 16:34:05 +0000
commit7bb0447df9a783c222c2a077e35e5013c7c68d91 (patch)
tree78d6d2a14f7e42df5cda32199c71ced973f169ef /rts/Apply.cmm
parentbd72eeb184a95ae0ae79ccad19c8ccc2b45a12e0 (diff)
downloadhaskell-7bb0447df9a783c222c2a077e35e5013c7c68d91.tar.gz
Overhaul of infrastructure for profiling, coverage (HPC) and breakpoints
User visible changes ==================== Profilng -------- Flags renamed (the old ones are still accepted for now): OLD NEW --------- ------------ -auto-all -fprof-auto -auto -fprof-exported -caf-all -fprof-cafs New flags: -fprof-auto Annotates all bindings (not just top-level ones) with SCCs -fprof-top Annotates just top-level bindings with SCCs -fprof-exported Annotates just exported bindings with SCCs -fprof-no-count-entries Do not maintain entry counts when profiling (can make profiled code go faster; useful with heap profiling where entry counts are not used) Cost-centre stacks have a new semantics, which should in most cases result in more useful and intuitive profiles. If you find this not to be the case, please let me know. This is the area where I have been experimenting most, and the current solution is probably not the final version, however it does address all the outstanding bugs and seems to be better than GHC 7.2. Stack traces ------------ +RTS -xc now gives more information. If the exception originates from a CAF (as is common, because GHC tends to lift exceptions out to the top-level), then the RTS walks up the stack and reports the stack in the enclosing update frame(s). Result: +RTS -xc is much more useful now - but you still have to compile for profiling to get it. I've played around a little with adding 'head []' to GHC itself, and +RTS -xc does pinpoint the problem quite accurately. I plan to add more facilities for stack tracing (e.g. in GHCi) in the future. Coverage (HPC) -------------- * derived instances are now coloured yellow if they weren't used * likewise record field names * entry counts are more accurate (hpc --fun-entry-count) * tab width is now correct (markup was previously off in source with tabs) Internal changes ================ In Core, the Note constructor has been replaced by Tick (Tickish b) (Expr b) which is used to represent all the kinds of source annotation we support: profiling SCCs, HPC ticks, and GHCi breakpoints. Depending on the properties of the Tickish, different transformations apply to Tick. See CoreUtils.mkTick for details. Tickets ======= This commit closes the following tickets, test cases to follow: - Close #2552: not a bug, but the behaviour is now more intuitive (test is T2552) - Close #680 (test is T680) - Close #1531 (test is result001) - Close #949 (test is T949) - Close #2466: test case has bitrotted (doesn't compile against current version of vector-space package)
Diffstat (limited to 'rts/Apply.cmm')
-rw-r--r--rts/Apply.cmm25
1 files changed, 9 insertions, 16 deletions
diff --git a/rts/Apply.cmm b/rts/Apply.cmm
index f9ac3b353c..5397fc55df 100644
--- a/rts/Apply.cmm
+++ b/rts/Apply.cmm
@@ -85,8 +85,9 @@ stg_PAP_apply
// profiling
TICK_ENT_PAP();
LDV_ENTER(pap);
- // Enter PAP cost centre
- ENTER_CCS_PAP_CL(pap);
+#ifdef PROFILING
+ foreign "C" enterFunCCS(StgHeader_ccs(pap));
+#endif
// Reload the stack
W_ i;
@@ -175,11 +176,9 @@ INFO_TABLE(stg_AP,/*special layout*/0,0,AP,"AP","AP")
TICK_ENT_AP();
LDV_ENTER(ap);
+ ENTER_CCS_THUNK(ap);
- // Enter PAP cost centre
- ENTER_CCS_PAP_CL(ap); // ToDo: ENTER_CC_AP_CL
-
- // Reload the stack
+ // Reload the stack
W_ i;
W_ p;
p = ap + SIZEOF_StgHeader + OFFSET_StgAP_payload;
@@ -245,11 +244,9 @@ INFO_TABLE(stg_AP_NOUPD,/*special layout*/0,0,AP,"AP_NOUPD","AP_NOUPD")
TICK_ENT_AP();
LDV_ENTER(ap);
+ ENTER_CCS_THUNK(ap);
- // Enter PAP cost centre
- ENTER_CCS_PAP_CL(ap); // ToDo: ENTER_CC_AP_CL
-
- // Reload the stack
+ // Reload the stack
W_ i;
W_ p;
p = ap + SIZEOF_StgHeader + OFFSET_StgAP_payload;
@@ -326,9 +323,7 @@ INFO_TABLE(stg_AP_STACK,/*special layout*/0,0,AP_STACK,"AP_STACK","AP_STACK")
TICK_ENT_AP();
LDV_ENTER(ap);
-
- // Enter PAP cost centre
- ENTER_CCS_PAP_CL(ap); // ToDo: ENTER_CC_AP_CL
+ ENTER_CCS_THUNK(ap);
// Reload the stack
W_ i;
@@ -379,9 +374,7 @@ INFO_TABLE(stg_AP_STACK_NOUPD,/*special layout*/0,0,AP_STACK,
TICK_ENT_AP();
LDV_ENTER(ap);
-
- // Enter PAP cost centre
- ENTER_CCS_PAP_CL(ap); // ToDo: ENTER_CC_AP_CL
+ ENTER_CCS_THUNK(ap);
// Reload the stack
W_ i;