diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2020-03-05 18:42:18 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@well-typed.com> | 2020-05-14 12:52:57 -0400 |
| commit | aab6735ed2840b96e284e75234bf65a34d7c1288 (patch) | |
| tree | 92679e0a8942429f9bbb5b17544eb55b5acf68fc | |
| parent | e9c0110ce9e753360d7e6523114109b7616f2f08 (diff) | |
| download | haskell-wip/gc/opt-barrier.tar.gz | |
nonmoving: Optimise the write barrierwip/gc/opt-barrier
| -rw-r--r-- | rts/Updates.h | 39 |
1 files changed, 18 insertions, 21 deletions
diff --git a/rts/Updates.h b/rts/Updates.h index 91d1b0b1cb..608aaff524 100644 --- a/rts/Updates.h +++ b/rts/Updates.h @@ -50,22 +50,21 @@ \ prim_write_barrier; \ OVERWRITING_CLOSURE(p1); \ - IF_NONMOVING_WRITE_BARRIER_ENABLED { \ - ccall updateRemembSetPushThunk_(BaseReg, p1 "ptr"); \ - } \ - StgInd_indirectee(p1) = p2; \ - prim_write_barrier; \ - SET_INFO(p1, stg_BLACKHOLE_info); \ - LDV_RECORD_CREATE(p1); \ bd = Bdescr(p1); \ if (bdescr_gen_no(bd) != 0 :: bits16) { \ + IF_NONMOVING_WRITE_BARRIER_ENABLED { \ + ccall updateRemembSetPushThunk_(BaseReg, p1 "ptr"); \ + } \ recordMutableCap(p1, TO_W_(bdescr_gen_no(bd))); \ TICK_UPD_OLD_IND(); \ - and_then; \ } else { \ TICK_UPD_NEW_IND(); \ - and_then; \ - } + } \ + StgInd_indirectee(p1) = p2; \ + prim_write_barrier; \ + SET_INFO(p1, stg_BLACKHOLE_info); \ + LDV_RECORD_CREATE(p1); \ + and_then; #else /* !CMINUSMINUS */ @@ -73,28 +72,26 @@ INLINE_HEADER void updateWithIndirection (Capability *cap, StgClosure *p1, StgClosure *p2) { - bdescr *bd; - ASSERT( (P_)p1 != (P_)p2 ); /* not necessarily true: ASSERT( !closure_IND(p1) ); */ /* occurs in RaiseAsync.c:raiseAsync() */ /* See Note [Heap memory barriers] in SMP.h */ write_barrier(); - OVERWRITING_CLOSURE(p1); - IF_NONMOVING_WRITE_BARRIER_ENABLED { - updateRemembSetPushThunk(cap, (StgThunk*)p1); - } - ((StgInd *)p1)->indirectee = p2; - write_barrier(); - SET_INFO(p1, &stg_BLACKHOLE_info); - LDV_RECORD_CREATE(p1); - bd = Bdescr((StgPtr)p1); + bdescr *bd = Bdescr((StgPtr)p1); if (bd->gen_no != 0) { + IF_NONMOVING_WRITE_BARRIER_ENABLED { + updateRemembSetPushThunk(cap, (StgThunk*)p1); + } recordMutableCap(p1, cap, bd->gen_no); TICK_UPD_OLD_IND(); } else { TICK_UPD_NEW_IND(); } + OVERWRITING_CLOSURE(p1); + ((StgInd *)p1)->indirectee = p2; + write_barrier(); + SET_INFO(p1, &stg_BLACKHOLE_info); + LDV_RECORD_CREATE(p1); } #endif /* CMINUSMINUS */ |