diff options
| -rw-r--r-- | compiler/cmm/CLabel.hs | 2 | ||||
| -rw-r--r-- | compiler/codeGen/StgCmmHeap.hs | 7 | ||||
| -rw-r--r-- | includes/stg/SMP.h | 7 | ||||
| -rw-r--r-- | rts/StgMiscClosures.cmm | 43 |
4 files changed, 57 insertions, 2 deletions
diff --git a/compiler/cmm/CLabel.hs b/compiler/cmm/CLabel.hs index 40b4e70aa0..ef3a567580 100644 --- a/compiler/cmm/CLabel.hs +++ b/compiler/cmm/CLabel.hs @@ -54,6 +54,7 @@ module CLabel ( mkBadAlignmentLabel, mkArrWords_infoLabel, mkSRTInfoLabel, + mkNO_INDIRECTEELabel, mkTopTickyCtrLabel, mkCAFBlackHoleInfoTableLabel, @@ -511,6 +512,7 @@ mkSMAP_FROZEN_CLEAN_infoLabel = CmmLabel rtsUnitId (fsLit "stg_SMALL_MUT_ARR_P mkSMAP_FROZEN_DIRTY_infoLabel = CmmLabel rtsUnitId (fsLit "stg_SMALL_MUT_ARR_PTRS_FROZEN_DIRTY") CmmInfo mkSMAP_DIRTY_infoLabel = CmmLabel rtsUnitId (fsLit "stg_SMALL_MUT_ARR_PTRS_DIRTY") CmmInfo mkBadAlignmentLabel = CmmLabel rtsUnitId (fsLit "stg_badAlignment") CmmEntry +mkNO_INDIRECTEELabel = CmmLabel rtsUnitId (fsLit "stg_NO_INDIRECTEE") CmmEntry mkSRTInfoLabel :: Int -> CLabel mkSRTInfoLabel n = CmmLabel rtsUnitId lbl CmmInfo diff --git a/compiler/codeGen/StgCmmHeap.hs b/compiler/codeGen/StgCmmHeap.hs index 3b170eb3a1..2ea0831794 100644 --- a/compiler/codeGen/StgCmmHeap.hs +++ b/compiler/codeGen/StgCmmHeap.hs @@ -144,9 +144,12 @@ emitSetDynHdr base info_ptr ccs hpStore base (zip (header dflags) [0, wORD_SIZE dflags ..]) where header :: DynFlags -> [CmmExpr] - header dflags = [info_ptr] ++ dynProfHdr dflags ccs - -- ToDo: Parallel stuff + header dflags = [info_ptr] ++ dynProfHdr dflags ccs ++ indirectee -- No ticky header + indirectee + -- TODO: Make this dependent upon TSO + | True = [CmmLit (CmmLabel mkNO_INDIRECTEELabel)] + | otherwise = [] -- Store the item (expr,off) in base[off] hpStore :: CmmExpr -> [(CmmExpr, ByteOff)] -> FCode () diff --git a/includes/stg/SMP.h b/includes/stg/SMP.h index 4020aef0d9..9fc5389e0e 100644 --- a/includes/stg/SMP.h +++ b/includes/stg/SMP.h @@ -18,6 +18,13 @@ void arm_atomic_spin_lock(void); void arm_atomic_spin_unlock(void); #endif +/* Does the platform maintain ordering of stores by a single core? */ +#if !defined(THREADED_RTS) || defined(x86_64_HOST_ARCH) || defined(i386_HOST_ARCH) +#define ARCH_TOTAL_STORE_ORDER 1 +#else +#define ARCH_TOTAL_STORE_ORDER 0 +#endif + #if defined(THREADED_RTS) /* ---------------------------------------------------------------------------- diff --git a/rts/StgMiscClosures.cmm b/rts/StgMiscClosures.cmm index fdd9f1565e..44746c5471 100644 --- a/rts/StgMiscClosures.cmm +++ b/rts/StgMiscClosures.cmm @@ -242,7 +242,14 @@ INFO_TABLE(stg_IND,1,0,IND,"IND","IND") (P_ node) { TICK_ENT_DYN_IND(); /* tick */ +retry: node = UNTAG(StgInd_indirectee(node)); +#if !ARCH_TOTAL_STORE_ORDER + if (node == stg_NO_INDIRECTEE_info) { + // See Note [Write barrier on thunk updates] + goto retry; + } +#endif TICK_ENT_VIA_NODE(); jump %GET_ENTRY(node) (node); } @@ -250,7 +257,14 @@ INFO_TABLE(stg_IND,1,0,IND,"IND","IND") /* explicit stack */ { TICK_ENT_DYN_IND(); /* tick */ +retry: R1 = UNTAG(StgInd_indirectee(R1)); +#if !ARCH_TOTAL_STORE_ORDER + if (R1 == stg_NO_INDIRECTEE_info) { + // See Note [Write barrier on thunk updates] + goto retry; + } +#endif TICK_ENT_VIA_NODE(); jump %GET_ENTRY(R1) [R1]; } @@ -260,7 +274,14 @@ INFO_TABLE(stg_IND_direct,1,0,IND,"IND","IND") (P_ node) { TICK_ENT_DYN_IND(); /* tick */ +retry: node = StgInd_indirectee(node); +#if !ARCH_TOTAL_STORE_ORDER + if (node == stg_NO_INDIRECTEE_info) { + // See Note [Write barrier on thunk updates] + goto retry; + } +#endif TICK_ENT_VIA_NODE(); jump %ENTRY_CODE(Sp(0)) (node); } @@ -269,7 +290,14 @@ INFO_TABLE(stg_IND_STATIC,1,0,IND_STATIC,"IND_STATIC","IND_STATIC") /* explicit stack */ { TICK_ENT_STATIC_IND(); /* tick */ +retry: R1 = UNTAG(StgInd_indirectee(R1)); +#if !ARCH_TOTAL_STORE_ORDER + if (node == stg_NO_INDIRECTEE_info) { + // See Note [Write barrier on thunk updates] + goto retry; + } +#endif TICK_ENT_VIA_NODE(); jump %GET_ENTRY(R1) [R1]; } @@ -297,7 +325,15 @@ retry: return (p); } +#if !ARCH_TOTAL_STORE_ORDER + if (p == stg_NO_INDIRECTEE) { + // See Note [Write barrier on thunk updates] + goto retry; + } +#endif + info = StgHeader_info(p); + if (info == stg_IND_info) { // This could happen, if e.g. we got a BLOCKING_QUEUE that has // just been replaced with an IND by another thread in @@ -360,6 +396,13 @@ INFO_TABLE(stg_BLOCKING_QUEUE_CLEAN,4,0,BLOCKING_QUEUE,"BLOCKING_QUEUE","BLOCKIN INFO_TABLE(stg_BLOCKING_QUEUE_DIRTY,4,0,BLOCKING_QUEUE,"BLOCKING_QUEUE","BLOCKING_QUEUE") { foreign "C" barf("BLOCKING_QUEUE_DIRTY object (%p) entered!", R1) never returns; } +// We initialize the SMP header indirectee field to this value to avoid needing +// two write barriers during thunk updates. +INFO_TABLE_CONSTR(stg_NO_INDIRECTEE,0,0,0,CONSTR_NOCAF,"NO_INDIRECTEE","NO_INDIRECTEE") +{ foreign "C" barf("NO_INDIRECTEE object (%p) entered!", R1) never returns; } + +CLOSURE(stg_NO_INDIRECTEE_closure,stg_NO_INDIRECTEE); + /* ---------------------------------------------------------------------------- Whiteholes are used for the "locked" state of a closure (see lockClosure()) |