Skip to content

Commit 25bbb69

Browse files
committed
runtime: optimize storing new keys in mapassign_fastNN
Prior to this change, we use typedmemmove to write the key value to its new location in mapassign_fast32 and mapassign_fast64. (The use of typedmemmove was a last-minute fix in the 1.9 cycle; see #21297 and CL 53414.) This is significantly less inefficient than direct assignment or calling writebarrierptr directly. Fortunately, there aren't many cases to consider. On systems with 32 bit pointers: * A 32 bit AMEM value either is a single pointer or has no pointers. * A 64 bit AMEM value may contain a pointer at the beginning, a pointer at 32 bits, or two pointers. On systems with 64 bit pointers: * A 32 bit AMEM value contains no pointers. * A 64 bit AMEM value either is a single pointer or has no pointers. All combinations except the 32 bit pointers / 64 bit AMEM value are cheap and easy to handle, and the problematic case is likely rare. The most popular map keys appear to be ints and pointers. So we handle them exhaustively. The sys.PtrSize checks are constant branches and are eliminated by the compiler. An alternative fix would be to return a pointer to the key, and have the calling code do the assignment, at which point the compiler would have full type information. Initial tests suggest that the performance difference between these strategies is negligible, and this fix is considerably simpler, and has much less impact on binary size. Fixes #21321 Change-Id: Ib03200e89e2324dd3c76d041131447df66f22bfe Reviewed-on: https://go-review.googlesource.com/59110 Run-TryBot: Josh Bleecher Snyder <[email protected]> Reviewed-by: Austin Clements <[email protected]> TryBot-Result: Gobot Gobot <[email protected]>
1 parent a45d685 commit 25bbb69

File tree

1 file changed

+20
-5
lines changed

1 file changed

+20
-5
lines changed

src/runtime/hashmap_fast.go

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -419,8 +419,12 @@ again:
419419
val = add(insertk, bucketCnt*4)
420420
}
421421

422-
// store new key/value at insert position
423-
typedmemmove(t.key, insertk, unsafe.Pointer(&key))
422+
// store new key at insert position
423+
if sys.PtrSize == 4 && t.key.kind&kindNoPointers == 0 && writeBarrier.enabled {
424+
writebarrierptr((*uintptr)(insertk), uintptr(key))
425+
} else {
426+
*(*uint32)(insertk) = key
427+
}
424428
*inserti = top
425429
h.count++
426430

@@ -504,8 +508,19 @@ again:
504508
val = add(insertk, bucketCnt*8)
505509
}
506510

507-
// store new key/value at insert position
508-
typedmemmove(t.key, insertk, unsafe.Pointer(&key))
511+
// store new key at insert position
512+
if t.key.kind&kindNoPointers == 0 && writeBarrier.enabled {
513+
if sys.PtrSize == 8 {
514+
writebarrierptr((*uintptr)(insertk), uintptr(key))
515+
} else {
516+
// There are three ways to squeeze at least one 32 bit pointer into 64 bits.
517+
// Give up and call typedmemmove.
518+
typedmemmove(t.key, insertk, unsafe.Pointer(&key))
519+
}
520+
} else {
521+
*(*uint64)(insertk) = key
522+
}
523+
509524
*inserti = top
510525
h.count++
511526

@@ -594,7 +609,7 @@ again:
594609
val = add(insertk, bucketCnt*2*sys.PtrSize)
595610
}
596611

597-
// store new key/value at insert position
612+
// store new key at insert position
598613
*((*stringStruct)(insertk)) = *key
599614
*inserti = top
600615
h.count++

0 commit comments

Comments
 (0)