mirror of
https://github.com/golang/go
synced 2024-11-17 23:44:48 -07:00
c12b185a6e
Currently rvalue m[k] is transformed during walk into:
tmp1 := *mapaccess(m, k)
tmp2 := append(tmp1, ...)
*mapassign(m, k) = tmp2
However, this is suboptimal, as we could instead produce just:
tmp := mapassign(m, k)
*tmp := append(*tmp, ...)
Optimization is possible only if during Order it may tell that m[k] is
exactly the same at left and right part of assignment. It doesn't work:
1) m[f(k)] = append(m[f(k)], ...)
2) sink, m[k] = sink, append(m[k]...)
3) m[k] = append(..., m[k],...)
Benchmark:
name old time/op new time/op delta
MapAppendAssign/Int32/256-8 33.5ns ± 3% 22.4ns ±10% -33.24% (p=0.000 n=16+18)
MapAppendAssign/Int32/65536-8 68.2ns ± 6% 48.5ns ±29% -28.90% (p=0.000 n=20+20)
MapAppendAssign/Int64/256-8 34.3ns ± 4% 23.3ns ± 5% -32.23% (p=0.000 n=17+18)
MapAppendAssign/Int64/65536-8 65.9ns ± 7% 61.2ns ±19% -7.06% (p=0.002 n=18+20)
MapAppendAssign/Str/256-8 116ns ±12% 79ns ±16% -31.70% (p=0.000 n=20+19)
MapAppendAssign/Str/65536-8 134ns ±15% 111ns ±45% -16.95% (p=0.000 n=19+20)
name old alloc/op new alloc/op delta
MapAppendAssign/Int32/256-8 47.0B ± 0% 46.0B ± 0% -2.13% (p=0.000 n=19+18)
MapAppendAssign/Int32/65536-8 27.0B ± 0% 20.7B ±30% -23.33% (p=0.000 n=20+20)
MapAppendAssign/Int64/256-8 47.0B ± 0% 46.0B ± 0% -2.13% (p=0.000 n=20+17)
MapAppendAssign/Int64/65536-8 27.0B ± 0% 27.0B ± 0% ~ (all equal)
MapAppendAssign/Str/256-8 94.0B ± 0% 78.0B ± 0% -17.02% (p=0.000 n=20+16)
MapAppendAssign/Str/65536-8 54.0B ± 0% 54.0B ± 0% ~ (all equal)
Fixes #24364
Updates #5147
Change-Id: Id257d052b75b9a445b4885dc571bf06ce6f6b409
Reviewed-on: https://go-review.googlesource.com/100838
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
Run-TryBot: Matthew Dempsky <mdempsky@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
92 lines
1.9 KiB
Go
92 lines
1.9 KiB
Go
// run
|
|
|
|
// Copyright 2017 The Go Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
package main
|
|
|
|
import "fmt"
|
|
|
|
func set(m map[interface{}]interface{}, key interface{}) (err error) {
|
|
defer func() {
|
|
if r := recover(); r != nil {
|
|
err = fmt.Errorf("set failed: %v", r)
|
|
}
|
|
}()
|
|
m[key] = nil
|
|
return nil
|
|
}
|
|
|
|
func del(m map[interface{}]interface{}, key interface{}) (err error) {
|
|
defer func() {
|
|
if r := recover(); r != nil {
|
|
err = fmt.Errorf("del failed: %v", r)
|
|
}
|
|
}()
|
|
delete(m, key)
|
|
return nil
|
|
}
|
|
|
|
func addInt(m map[interface{}]int, key interface{}) (err error) {
|
|
defer func() {
|
|
if r := recover(); r != nil {
|
|
err = fmt.Errorf("addInt failed: %v", r)
|
|
}
|
|
}()
|
|
m[key] += 2018
|
|
return nil
|
|
}
|
|
|
|
func addStr(m map[interface{}]string, key interface{}) (err error) {
|
|
defer func() {
|
|
if r := recover(); r != nil {
|
|
err = fmt.Errorf("addStr failed: %v", r)
|
|
}
|
|
}()
|
|
m[key] += "hello, go"
|
|
return nil
|
|
}
|
|
|
|
func appendInt(m map[interface{}][]int, key interface{}) (err error) {
|
|
defer func() {
|
|
if r := recover(); r != nil {
|
|
err = fmt.Errorf("appendInt failed: %v", r)
|
|
}
|
|
}()
|
|
m[key] = append(m[key], 2018)
|
|
return nil
|
|
}
|
|
|
|
func appendStr(m map[interface{}][]string, key interface{}) (err error) {
|
|
defer func() {
|
|
if r := recover(); r != nil {
|
|
err = fmt.Errorf("addStr failed: %v", r)
|
|
}
|
|
}()
|
|
m[key] = append(m[key], "hello, go")
|
|
return nil
|
|
}
|
|
|
|
func main() {
|
|
m := make(map[interface{}]interface{})
|
|
set(m, []int{1, 2, 3})
|
|
set(m, "abc") // used to throw
|
|
del(m, []int{1, 2, 3})
|
|
del(m, "abc") // used to throw
|
|
|
|
mi := make(map[interface{}]int)
|
|
addInt(mi, []int{1, 2, 3})
|
|
addInt(mi, "abc") // used to throw
|
|
|
|
ms := make(map[interface{}]string)
|
|
addStr(ms, []int{1, 2, 3})
|
|
addStr(ms, "abc") // used to throw
|
|
|
|
mia := make(map[interface{}][]int)
|
|
appendInt(mia, []int{1, 2, 3})
|
|
|
|
msa := make(map[interface{}][]string)
|
|
appendStr(msa, "abc") // used to throw
|
|
}
|