diff options
author | Nicolas Frisby <nicolas.frisby@gmail.com> | 2013-03-06 21:46:14 +0000 |
---|---|---|
committer | Nicolas Frisby <nicolas.frisby@gmail.com> | 2013-03-29 15:20:50 +0000 |
commit | 460abd75c4f99d813ed226d2ff6aa592d62fafd4 (patch) | |
tree | 9e602d6733d90c1b26fccb2509497454bf619766 /rts/Exception.cmm | |
parent | c7d80c6524390551b64e9c1d651e1a03ed3c7617 (diff) | |
download | haskell-460abd75c4f99d813ed226d2ff6aa592d62fafd4.tar.gz |
ticky enhancements
* the new StgCmmArgRep module breaks a dependency cycle; I also
untabified it, but made no real changes
* updated the documentation in the wiki and change the user guide to
point there
* moved the allocation enters for ticky and CCS to after the heap check
* I left LDV where it was, which was before the heap check at least
once, since I have no idea what it is
* standardized all (active?) ticky alloc totals to bytes
* in order to avoid double counting StgCmmLayout.adjustHpBackwards
no longer bumps ALLOC_HEAP_ctr
* I resurrected the SLOW_CALL counters
* the new module StgCmmArgRep breaks cyclic dependency between
Layout and Ticky (which the SLOW_CALL counters cause)
* renamed them SLOW_CALL_fast_<pattern> and VERY_SLOW_CALL
* added ALLOC_RTS_ctr and _tot ticky counters
* eg allocation by Storage.c:allocate or a BUILD_PAP in stg_ap_*_info
* resurrected ticky counters for ALLOC_THK, ALLOC_PAP, and
ALLOC_PRIM
* added -ticky and -DTICKY_TICKY in ways.mk for debug ways
* added a ticky counter for total LNE entries
* new flags for ticky: -ticky-allocd -ticky-dyn-thunk -ticky-LNE
* all off by default
* -ticky-allocd: tracks allocation *of* closure in addition to
allocation *by* that closure
* -ticky-dyn-thunk tracks dynamic thunks as if they were functions
* -ticky-LNE tracks LNEs as if they were functions
* updated the ticky report format, including making the argument
categories (more?) accurate again
* the printed name for things in the report include the unique of
their ticky parent as well as if they are not top-level
Diffstat (limited to 'rts/Exception.cmm')
-rw-r--r-- | rts/Exception.cmm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/rts/Exception.cmm b/rts/Exception.cmm index 5b656fab5c..25da0d6d80 100644 --- a/rts/Exception.cmm +++ b/rts/Exception.cmm @@ -150,7 +150,7 @@ stg_maskAsyncExceptionszh /* explicit stack */ TO_W_(StgTSO_flags(CurrentTSO)) | TSO_BLOCKEX | TSO_INTERRUPTIBLE); TICK_UNKNOWN_CALL(); - TICK_SLOW_CALL_v(); + TICK_SLOW_CALL_fast_v(); jump stg_ap_v_fast [R1]; } @@ -178,7 +178,7 @@ stg_maskUninterruptiblezh /* explicit stack */ (TO_W_(StgTSO_flags(CurrentTSO)) | TSO_BLOCKEX) & ~TSO_INTERRUPTIBLE); TICK_UNKNOWN_CALL(); - TICK_SLOW_CALL_v(); + TICK_SLOW_CALL_fast_v(); jump stg_ap_v_fast [R1]; } @@ -253,7 +253,7 @@ stg_unmaskAsyncExceptionszh /* explicit stack */ } TICK_UNKNOWN_CALL(); - TICK_SLOW_CALL_v(); + TICK_SLOW_CALL_fast_v(); R1 = io; jump stg_ap_v_fast [R1]; } @@ -394,7 +394,7 @@ stg_catchzh ( P_ io, /* :: IO a */ /* Apply R1 to the realworld token */ TICK_UNKNOWN_CALL(); - TICK_SLOW_CALL_v(); + TICK_SLOW_CALL_fast_v(); jump stg_ap_v_fast (CATCH_FRAME_FIELDS(,,stg_catch_frame_info, CCCS, 0, @@ -612,7 +612,7 @@ retry_pop_stack: R1 = handler; Sp_adj(-1); TICK_UNKNOWN_CALL(); - TICK_SLOW_CALL_pv(); + TICK_SLOW_CALL_fast_pv(); jump RET_LBL(stg_ap_pv) [R1]; } |