mirror of
https://github.com/golang/go
synced 2024-09-06 00:19:45 +00:00
![Hugues Bruant](/assets/img/avatar_default.png)
When inlining a closure with captured variables, walk up the param chain to find the one that is defined inside the scope into which the function is being inlined, and map occurrences of the captures to temporary inlvars, similarly to what is done for function parameters. No noticeable impact on compilation speed and binary size. Minor improvements to go1 benchmarks on darwin/amd64 name old time/op new time/op delta BinaryTree17-4 2.59s ± 3% 2.58s ± 1% ~ (p=0.470 n=19+19) Fannkuch11-4 3.15s ± 2% 3.15s ± 1% ~ (p=0.647 n=20+19) FmtFprintfEmpty-4 43.7ns ± 3% 43.4ns ± 4% ~ (p=0.178 n=18+20) FmtFprintfString-4 74.0ns ± 2% 77.1ns ± 7% +4.13% (p=0.000 n=20+20) FmtFprintfInt-4 77.2ns ± 3% 79.2ns ± 6% +2.53% (p=0.000 n=20+20) FmtFprintfIntInt-4 112ns ± 4% 112ns ± 2% ~ (p=0.672 n=20+19) FmtFprintfPrefixedInt-4 136ns ± 1% 135ns ± 2% ~ (p=0.827 n=16+20) FmtFprintfFloat-4 232ns ± 2% 233ns ± 1% ~ (p=0.194 n=20+20) FmtManyArgs-4 490ns ± 2% 484ns ± 2% -1.28% (p=0.001 n=20+20) GobDecode-4 6.68ms ± 2% 6.72ms ± 2% ~ (p=0.113 n=20+19) GobEncode-4 5.62ms ± 2% 5.71ms ± 2% +1.64% (p=0.000 n=20+19) Gzip-4 235ms ± 3% 236ms ± 2% ~ (p=0.607 n=20+19) Gunzip-4 37.1ms ± 2% 36.8ms ± 3% ~ (p=0.060 n=20+20) HTTPClientServer-4 61.9µs ± 2% 62.7µs ± 4% +1.24% (p=0.007 n=18+19) JSONEncode-4 12.5ms ± 2% 12.4ms ± 3% ~ (p=0.192 n=20+20) JSONDecode-4 51.6ms ± 3% 51.0ms ± 3% -1.19% (p=0.008 n=20+19) Mandelbrot200-4 4.12ms ± 6% 4.06ms ± 5% ~ (p=0.063 n=20+20) GoParse-4 3.12ms ± 5% 3.10ms ± 2% ~ (p=0.402 n=19+19) RegexpMatchEasy0_32-4 80.7ns ± 2% 75.1ns ± 9% -6.94% (p=0.000 n=17+20) RegexpMatchEasy0_1K-4 197ns ± 2% 186ns ± 2% -5.43% (p=0.000 n=20+20) RegexpMatchEasy1_32-4 77.5ns ± 4% 71.9ns ± 7% -7.25% (p=0.000 n=20+18) RegexpMatchEasy1_1K-4 341ns ± 3% 341ns ± 3% ~ (p=0.732 n=20+20) RegexpMatchMedium_32-4 113ns ± 2% 112ns ± 3% ~ (p=0.102 n=20+20) RegexpMatchMedium_1K-4 36.6µs ± 2% 35.8µs ± 2% -2.26% (p=0.000 n=18+20) RegexpMatchHard_32-4 1.75µs ± 3% 1.74µs ± 2% ~ (p=0.473 n=20+19) RegexpMatchHard_1K-4 52.6µs ± 2% 52.0µs ± 3% -1.15% (p=0.005 n=20+20) Revcomp-4 381ms ± 4% 377ms ± 2% ~ (p=0.067 n=20+18) Template-4 57.3ms ± 2% 57.7ms ± 2% ~ (p=0.108 n=20+20) TimeParse-4 291ns ± 3% 292ns ± 2% ~ (p=0.585 n=20+20) TimeFormat-4 314ns ± 3% 315ns ± 1% ~ (p=0.681 n=20+20) [Geo mean] 47.4µs 47.1µs -0.73% name old speed new speed delta GobDecode-4 115MB/s ± 2% 114MB/s ± 2% ~ (p=0.115 n=20+19) GobEncode-4 137MB/s ± 2% 134MB/s ± 2% -1.63% (p=0.000 n=20+19) Gzip-4 82.5MB/s ± 3% 82.4MB/s ± 2% ~ (p=0.612 n=20+19) Gunzip-4 523MB/s ± 2% 528MB/s ± 3% ~ (p=0.060 n=20+20) JSONEncode-4 155MB/s ± 2% 156MB/s ± 3% ~ (p=0.192 n=20+20) JSONDecode-4 37.6MB/s ± 3% 38.1MB/s ± 3% +1.21% (p=0.007 n=20+19) GoParse-4 18.6MB/s ± 4% 18.7MB/s ± 2% ~ (p=0.405 n=19+19) RegexpMatchEasy0_32-4 396MB/s ± 2% 426MB/s ± 8% +7.56% (p=0.000 n=17+20) RegexpMatchEasy0_1K-4 5.18GB/s ± 2% 5.48GB/s ± 2% +5.79% (p=0.000 n=20+20) RegexpMatchEasy1_32-4 413MB/s ± 4% 444MB/s ± 6% +7.46% (p=0.000 n=20+19) RegexpMatchEasy1_1K-4 3.00GB/s ± 3% 3.00GB/s ± 3% ~ (p=0.678 n=20+20) RegexpMatchMedium_32-4 8.82MB/s ± 2% 8.90MB/s ± 3% +0.99% (p=0.044 n=20+20) RegexpMatchMedium_1K-4 28.0MB/s ± 2% 28.6MB/s ± 2% +2.32% (p=0.000 n=18+20) RegexpMatchHard_32-4 18.3MB/s ± 3% 18.4MB/s ± 2% ~ (p=0.482 n=20+19) RegexpMatchHard_1K-4 19.5MB/s ± 2% 19.7MB/s ± 3% +1.18% (p=0.004 n=20+20) Revcomp-4 668MB/s ± 4% 674MB/s ± 2% ~ (p=0.066 n=20+18) Template-4 33.8MB/s ± 2% 33.6MB/s ± 2% ~ (p=0.104 n=20+20) [Geo mean] 124MB/s 126MB/s +1.54% Updates #15561 Updates #18270 Change-Id: I980086efe28b36aa27f81577065e2a729ff03d4e Reviewed-on: https://go-review.googlesource.com/72490 Reviewed-by: Hugues Bruant <hugues.bruant@gmail.com> Reviewed-by: Matthew Dempsky <mdempsky@google.com> Run-TryBot: Daniel Martí <mvdan@mvdan.cc> TryBot-Result: Gobot Gobot <gobot@golang.org>
165 lines
4.1 KiB
Go
165 lines
4.1 KiB
Go
// errorcheck -0 -m
|
|
|
|
// Copyright 2015 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.
|
|
|
|
// Test, using compiler diagnostic flags, that inlining is working.
|
|
// Compiles but does not run.
|
|
|
|
package foo
|
|
|
|
import (
|
|
"errors"
|
|
"unsafe"
|
|
)
|
|
|
|
func add2(p *byte, n uintptr) *byte { // ERROR "can inline add2" "leaking param: p to result"
|
|
return (*byte)(add1(unsafe.Pointer(p), n)) // ERROR "inlining call to add1"
|
|
}
|
|
|
|
func add1(p unsafe.Pointer, x uintptr) unsafe.Pointer { // ERROR "can inline add1" "leaking param: p to result"
|
|
return unsafe.Pointer(uintptr(p) + x)
|
|
}
|
|
|
|
func f(x *byte) *byte { // ERROR "can inline f" "leaking param: x to result"
|
|
return add2(x, 1) // ERROR "inlining call to add2" "inlining call to add1"
|
|
}
|
|
|
|
//go:noinline
|
|
func g(x int) int {
|
|
return x + 1
|
|
}
|
|
|
|
func h(x int) int { // ERROR "can inline h"
|
|
return x + 2
|
|
}
|
|
|
|
func i(x int) int { // ERROR "can inline i"
|
|
const y = 2
|
|
return x + y
|
|
}
|
|
|
|
func j(x int) int { // ERROR "can inline j"
|
|
switch {
|
|
case x > 0:
|
|
return x + 2
|
|
default:
|
|
return x + 1
|
|
}
|
|
}
|
|
|
|
var somethingWrong error = errors.New("something went wrong")
|
|
|
|
// local closures can be inlined
|
|
func l(x, y int) (int, int, error) {
|
|
e := func(err error) (int, int, error) { // ERROR "can inline l.func1" "func literal does not escape" "leaking param: err to result"
|
|
return 0, 0, err
|
|
}
|
|
if x == y {
|
|
e(somethingWrong) // ERROR "inlining call to l.func1"
|
|
}
|
|
return y, x, nil
|
|
}
|
|
|
|
// any re-assignment prevents closure inlining
|
|
func m() int {
|
|
foo := func() int { return 1 } // ERROR "can inline m.func1" "func literal does not escape"
|
|
x := foo()
|
|
foo = func() int { return 2 } // ERROR "can inline m.func2" "func literal does not escape"
|
|
return x + foo()
|
|
}
|
|
|
|
// address taking prevents closure inlining
|
|
func n() int {
|
|
foo := func() int { return 1 } // ERROR "can inline n.func1" "func literal does not escape"
|
|
bar := &foo // ERROR "&foo does not escape"
|
|
x := (*bar)() + foo()
|
|
return x
|
|
}
|
|
|
|
// make sure assignment inside closure is detected
|
|
func o() int {
|
|
foo := func() int { return 1 } // ERROR "can inline o.func1" "func literal does not escape"
|
|
func(x int) { // ERROR "func literal does not escape"
|
|
if x > 10 {
|
|
foo = func() int { return 2 } // ERROR "can inline o.func2" "func literal escapes"
|
|
}
|
|
}(11)
|
|
return foo()
|
|
}
|
|
|
|
func p() int {
|
|
return func() int { return 42 }() // ERROR "can inline p.func1" "inlining call to p.func1"
|
|
}
|
|
|
|
func q(x int) int {
|
|
foo := func() int { return x * 2 } // ERROR "can inline q.func1" "q func literal does not escape"
|
|
return foo() // ERROR "inlining call to q.func1"
|
|
}
|
|
|
|
func r(z int) int {
|
|
foo := func(x int) int { // ERROR "can inline r.func1" "r func literal does not escape"
|
|
return x + z
|
|
}
|
|
bar := func(x int) int { // ERROR "r func literal does not escape"
|
|
return x + func(y int) int { // ERROR "can inline r.func2.1"
|
|
return 2*y + x*z
|
|
}(x) // ERROR "inlining call to r.func2.1"
|
|
}
|
|
return foo(42) + bar(42) // ERROR "inlining call to r.func1"
|
|
}
|
|
|
|
func s0(x int) int {
|
|
foo := func() { // ERROR "can inline s0.func1" "s0 func literal does not escape"
|
|
x = x + 1
|
|
}
|
|
foo() // ERROR "inlining call to s0.func1" "&x does not escape"
|
|
return x
|
|
}
|
|
|
|
func s1(x int) int {
|
|
foo := func() int { // ERROR "can inline s1.func1" "s1 func literal does not escape"
|
|
return x
|
|
}
|
|
x = x + 1
|
|
return foo() // ERROR "inlining call to s1.func1" "&x does not escape"
|
|
}
|
|
|
|
// can't currently inline functions with a break statement
|
|
func switchBreak(x, y int) int {
|
|
var n int
|
|
switch x {
|
|
case 0:
|
|
n = 1
|
|
Done:
|
|
switch y {
|
|
case 0:
|
|
n += 10
|
|
break Done
|
|
}
|
|
n = 2
|
|
}
|
|
return n
|
|
}
|
|
|
|
// can't currently inline functions with a type switch
|
|
func switchType(x interface{}) int { // ERROR "switchType x does not escape"
|
|
switch x.(type) {
|
|
case int:
|
|
return x.(int)
|
|
default:
|
|
return 0
|
|
}
|
|
}
|
|
|
|
type T struct{}
|
|
|
|
func (T) meth(int, int) {} // ERROR "can inline T.meth"
|
|
|
|
func k() (T, int, int) { return T{}, 0, 0 } // ERROR "can inline k"
|
|
|
|
func _() { // ERROR "can inline _"
|
|
T.meth(k()) // ERROR "inlining call to k" "inlining call to T.meth"
|
|
}
|