diff options
author | Steve MacLean <sdmaclea.qdt@qualcommdatacenter.com> | 2017-06-15 02:35:49 -0400 |
---|---|---|
committer | Jan Kotas <jkotas@microsoft.com> | 2017-06-14 23:35:49 -0700 |
commit | b5914c8d1b20be898b8982a4dfcf9d8e9046b2ec (patch) | |
tree | 7bad2aa4dca92f78e509092bb5dea35668386208 /src/vm/arm64/asmhelpers.S | |
parent | 34320b9242f4e16eedcb9adc2f0901702b19deac (diff) | |
download | coreclr-b5914c8d1b20be898b8982a4dfcf9d8e9046b2ec.tar.gz coreclr-b5914c8d1b20be898b8982a4dfcf9d8e9046b2ec.tar.bz2 coreclr-b5914c8d1b20be898b8982a4dfcf9d8e9046b2ec.zip |
[Arm64] JIT_WriteBarrier optimization (#12227)
* [Arm64] JIT_WriteBarrier optimization
Add skipEphemeralCheck if gcServer=1
Copy all gc parameters into a literal pool which
fits in single cache line
Add dmb ishst on gcHeap changes
Reduce unpredictable branches
Remove unneeded instructiuons
Fixes #11374
Fixes #12197
* [Arm64] fix typo in asm
* Fixup asm
* [Arm64] Revise per comments
Nits - Whitespace, Labels to PascalCase
Fix state change order
Add Suspend/Resume to fix race
Fix errors in Windows arm64 assembly
* [Arm64] Remove SuspendEE/RestartEE in StompWriteBarrierResize
* Use Volatile<> for g_highest_address
* Revise synchronization per comments
Diffstat (limited to 'src/vm/arm64/asmhelpers.S')
-rw-r--r-- | src/vm/arm64/asmhelpers.S | 152 |
1 files changed, 116 insertions, 36 deletions
diff --git a/src/vm/arm64/asmhelpers.S b/src/vm/arm64/asmhelpers.S index 2e1d0299ed..d793ddb0ae 100644 --- a/src/vm/arm64/asmhelpers.S +++ b/src/vm/arm64/asmhelpers.S @@ -240,14 +240,11 @@ WRITE_BARRIER_END JIT_ByRefWriteBarrier // x17 : trashed (ip1) if FEATURE_USE_SOFTWARE_WRITE_WATCH_FOR_GC_HEAP // WRITE_BARRIER_ENTRY JIT_CheckedWriteBarrier - PREPARE_EXTERNAL_VAR g_lowest_address, x12 - ldr x12, [x12] + ldr x12, LOCAL_LABEL(wbs_lowest_address) cmp x14, x12 - blt LOCAL_LABEL(NotInHeap) - PREPARE_EXTERNAL_VAR g_highest_address, x12 - ldr x12, [x12] - cmp x14, x12 + ldr x12, LOCAL_LABEL(wbs_highest_address) + ccmp x14, x12, #0x0, ge blt C_FUNC(JIT_WriteBarrier) LOCAL_LABEL(NotInHeap): @@ -272,23 +269,24 @@ WRITE_BARRIER_ENTRY JIT_WriteBarrier #ifdef WRITE_BARRIER_CHECK // Update GC Shadow Heap - // need temporary registers. Save them before using. - stp x12, x13, [sp, #-16]! + // Do not perform the work if g_GCShadow is 0 + ldr x12, LOCAL_LABEL(wbs_GCShadow) + cbz x12, LOCAL_LABEL(ShadowUpdateDisabled) + + // need temporary register. Save before using. + str x13, [sp, #-16]! // Compute address of shadow heap location: // pShadow = g_GCShadow + (x14 - g_lowest_address) - PREPARE_EXTERNAL_VAR g_lowest_address, x12 - ldr x12, [x12] - sub x12, x14, x12 - PREPARE_EXTERNAL_VAR g_GCShadow, x13 - ldr x13, [x13] + ldr x13, LOCAL_LABEL(wbs_lowest_address) + sub x13, x14, x13 add x12, x13, x12 // if (pShadow >= g_GCShadowEnd) goto end PREPARE_EXTERNAL_VAR g_GCShadowEnd, x13 ldr x13, [x13] cmp x12, x13 - bhs LOCAL_LABEL(shadowupdateend) + bhs LOCAL_LABEL(ShadowUpdateEnd) // *pShadow = x15 str x15, [x12] @@ -300,25 +298,22 @@ WRITE_BARRIER_ENTRY JIT_WriteBarrier // if ([x14] == x15) goto end ldr x13, [x14] cmp x13, x15 - beq LOCAL_LABEL(shadowupdateend) + beq LOCAL_LABEL(ShadowUpdateEnd) // *pShadow = INVALIDGCVALUE (0xcccccccd) - mov x13, #0 - movk x13, #0xcccd + movz x13, #0xcccd movk x13, #0xcccc, LSL #16 str x13, [x12] -LOCAL_LABEL(shadowupdateend): - ldp x12, x13, [sp],#16 +LOCAL_LABEL(ShadowUpdateEnd): + ldr x13, [sp], #16 +LOCAL_LABEL(ShadowUpdateDisabled): #endif #ifdef FEATURE_USE_SOFTWARE_WRITE_WATCH_FOR_GC_HEAP // Update the write watch table if necessary - PREPARE_EXTERNAL_VAR g_sw_ww_enabled_for_gc_heap, x12 - ldrb w12, [x12] + ldr x12, LOCAL_LABEL(wbs_sw_ww_table) cbz x12, LOCAL_LABEL(CheckCardTable) - PREPARE_EXTERNAL_VAR g_sw_ww_table, x12 - ldr x12, [x12] add x12, x12, x14, lsr #0xc // SoftwareWriteWatch::AddressToTableByteIndexShift ldrb w17, [x12] cbnz x17, LOCAL_LABEL(CheckCardTable) @@ -329,20 +324,18 @@ LOCAL_LABEL(shadowupdateend): LOCAL_LABEL(CheckCardTable): // Branch to Exit if the reference is not in the Gen0 heap // - PREPARE_EXTERNAL_VAR g_ephemeral_low, x12 - ldr x12, [x12] + ldr x12, LOCAL_LABEL(wbs_ephemeral_low) + cbz x12, LOCAL_LABEL(SkipEphemeralCheck) cmp x15, x12 - blt LOCAL_LABEL(Exit) - PREPARE_EXTERNAL_VAR g_ephemeral_high, x12 - ldr x12, [x12] - cmp x15, x12 + ldr x12, LOCAL_LABEL(wbs_ephemeral_high) + ccmp x15, x12, 0x0, ge bgt LOCAL_LABEL(Exit) +LOCAL_LABEL(SkipEphemeralCheck): // Check if we need to update the card table - PREPARE_EXTERNAL_VAR g_card_table, x12 - ldr x12, [x12] - add x15, x12, x14, lsr #11 + ldr x12, LOCAL_LABEL(wbs_card_table) + add x15, x12, x14, lsr #11 ldrb w12, [x15] cmp x12, 0xFF beq LOCAL_LABEL(Exit) @@ -352,10 +345,9 @@ LOCAL_LABEL(UpdateCardTable): strb w12, [x15] #ifdef FEATURE_MANUALLY_MANAGED_CARD_BUNDLES - // Check if we need to update the card table - PREPARE_EXTERNAL_VAR g_card_bundle_table, x12 - ldr x12, [x12] - add x15, x12, x14, lsr #21 + // Check if we need to update the card bundle table + ldr x12, LOCAL_LABEL(wbs_card_bundle_table) + add x15, x12, x14, lsr #21 ldrb w12, [x15] cmp x12, 0xFF beq LOCAL_LABEL(Exit) @@ -376,6 +368,94 @@ LEAF_ENTRY JIT_PatchedCodeStart, _TEXT ret lr LEAF_END JIT_PatchedCodeStart, _TEXT +// void JIT_UpdateWriteBarrierState(bool skipEphemeralCheck) +// +// Update shadow copies of the various state info required for barrier +// +// State info is contained in a literal pool at the end of the function +// Placed in text section so that it is close enough to use ldr literal and still +// be relocatable. Eliminates need for PREPARE_EXTERNAL_VAR in hot code. +// +// Align and group state info together so it fits in a single cache line +// and each entry can be written atomically +// +WRITE_BARRIER_ENTRY JIT_UpdateWriteBarrierState + PROLOG_SAVE_REG_PAIR_INDEXED fp, lr, -16 + + // x0-x7 will contain intended new state + // x8 will preserve skipEphemeralCheck + // x12 will be used for pointers + + mov x8, x0 + + PREPARE_EXTERNAL_VAR g_card_table, x12 + ldr x0, [x12] + +#ifdef FEATURE_MANUALLY_MANAGED_CARD_BUNDLES + PREPARE_EXTERNAL_VAR g_card_bundle_table, x12 + ldr x1, [x12] +#endif + +#ifdef WRITE_BARRIER_CHECK + PREPARE_EXTERNAL_VAR g_GCShadow, x12 + ldr x2, [x12] +#endif + +#ifdef FEATURE_USE_SOFTWARE_WRITE_WATCH_FOR_GC_HEAP + PREPARE_EXTERNAL_VAR g_sw_ww_table, x12 + ldr x3, [x12] +#endif + + PREPARE_EXTERNAL_VAR g_ephemeral_low, x12 + ldr x4, [x12] + + PREPARE_EXTERNAL_VAR g_ephemeral_high, x12 + ldr x5, [x12] + + cbz x8, LOCAL_LABEL(EphemeralCheckEnabled) + movz x4, #0 + movn x5, #0 +LOCAL_LABEL(EphemeralCheckEnabled): + + PREPARE_EXTERNAL_VAR g_lowest_address, x12 + ldr x6, [x12] + + PREPARE_EXTERNAL_VAR g_highest_address, x12 + ldr x7, [x12] + + // Update wbs state + adr x12, LOCAL_LABEL(wbs_begin) + + stp x0, x1, [x12], 16 + stp x2, x3, [x12], 16 + stp x4, x5, [x12], 16 + stp x6, x7, [x12], 16 + + EPILOG_RESTORE_REG_PAIR_INDEXED fp, lr, 16 + EPILOG_RETURN + + // Begin patchable literal pool + .balign 64 // Align to power of two at least as big as patchable literal pool so that it fits optimally in cache line +LOCAL_LABEL(wbs_begin): +LOCAL_LABEL(wbs_card_table): + .quad 0 +LOCAL_LABEL(wbs_card_bundle_table): + .quad 0 +LOCAL_LABEL(wbs_GCShadow): + .quad 0 +LOCAL_LABEL(wbs_sw_ww_table): + .quad 0 +LOCAL_LABEL(wbs_ephemeral_low): + .quad 0 +LOCAL_LABEL(wbs_ephemeral_high): + .quad 0 +LOCAL_LABEL(wbs_lowest_address): + .quad 0 +LOCAL_LABEL(wbs_highest_address): + .quad 0 +WRITE_BARRIER_END JIT_UpdateWriteBarrierState + + // ------------------------------------------------------------------ // End of the writeable code region LEAF_ENTRY JIT_PatchedCodeLast, _TEXT |