mirror of
https://github.com/golang/go
synced 2024-11-12 00:30:22 -07:00
cmd/compile/internal/gc: remove redundant Nod(OXXX, ...) pattern
The pattern
n := Nod(OXXX, nil, nil)
Nodconst(n, ...)
was a leftover from the C days where n must be heap allocated.
No change in benchmarks, none expected as n escapes anyway.
name old time/op new time/op delta
Template 391ms ± 6% 388ms ± 5% ~ (p=0.659 n=20+20)
GoTypes 1.27s ± 1% 1.27s ± 2% ~ (p=0.828 n=18+20)
Compiler 6.16s ± 2% 6.15s ± 1% ~ (p=0.947 n=20+20)
name old alloc/op new alloc/op delta
Template 63.7MB ± 0% 63.7MB ± 0% ~ (p=0.414 n=20+20)
GoTypes 219MB ± 0% 219MB ± 0% ~ (p=0.904 n=20+20)
Compiler 980MB ± 0% 980MB ± 0% +0.00% (p=0.007 n=20+19)
name old allocs/op new allocs/op delta
Template 586k ± 0% 586k ± 0% ~ (p=0.564 n=19+20)
GoTypes 1.80M ± 0% 1.80M ± 0% ~ (p=0.718 n=20+20)
Compiler 7.74M ± 0% 7.74M ± 0% ~ (p=0.358 n=20+20)
The reuse of nc in multiple overlapping scopes in walk.go is the worst.
Change-Id: I4ed6a63f7ffbfff68124ad609f6e3a68d95cbbba
Reviewed-on: https://go-review.googlesource.com/21015
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
This commit is contained in:
Dave Cheney
parent
1374515a1c
commit
a4be24cbe6
@ -1405,10 +1405,10 @@ OpSwitch:
|
|||||||
switch t.Etype {
|
switch t.Etype {
|
||||||
case TSTRING:
|
case TSTRING:
|
||||||
if Isconst(l, CTSTR) {
|
if Isconst(l, CTSTR) {
|
||||||
r := Nod(OXXX, nil, nil)
|
var r Node
|
||||||
Nodconst(r, Types[TINT], int64(len(l.Val().U.(string))))
|
Nodconst(&r, Types[TINT], int64(len(l.Val().U.(string))))
|
||||||
r.Orig = n
|
r.Orig = n
|
||||||
n = r
|
n = &r
|
||||||
}
|
}
|
||||||
|
|
||||||
case TARRAY:
|
case TARRAY:
|
||||||
@ -1418,10 +1418,10 @@ OpSwitch:
|
|||||||
if callrecv(l) { // has call or receive
|
if callrecv(l) { // has call or receive
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
r := Nod(OXXX, nil, nil)
|
var r Node
|
||||||
Nodconst(r, Types[TINT], t.Bound)
|
Nodconst(&r, Types[TINT], t.Bound)
|
||||||
r.Orig = n
|
r.Orig = n
|
||||||
n = r
|
n = &r
|
||||||
}
|
}
|
||||||
|
|
||||||
n.Type = Types[TINT]
|
n.Type = Types[TINT]
|
||||||
|
|||||||
@ -3509,10 +3509,10 @@ func walkdiv(n *Node, init *Nodes) *Node {
|
|||||||
|
|
||||||
// n1 = nl * magic >> w (HMUL)
|
// n1 = nl * magic >> w (HMUL)
|
||||||
case TUINT8, TUINT16, TUINT32:
|
case TUINT8, TUINT16, TUINT32:
|
||||||
nc := Nod(OXXX, nil, nil)
|
var nc Node
|
||||||
|
|
||||||
Nodconst(nc, nl.Type, int64(m.Um))
|
Nodconst(&nc, nl.Type, int64(m.Um))
|
||||||
n1 := Nod(OHMUL, nl, nc)
|
n1 := Nod(OHMUL, nl, &nc)
|
||||||
n1 = typecheck(n1, Erv)
|
n1 = typecheck(n1, Erv)
|
||||||
if m.Ua != 0 {
|
if m.Ua != 0 {
|
||||||
// Select a Go type with (at least) twice the width.
|
// Select a Go type with (at least) twice the width.
|
||||||
@ -3539,24 +3539,24 @@ func walkdiv(n *Node, init *Nodes) *Node {
|
|||||||
n2 := Nod(OADD, conv(n1, twide), conv(nl, twide))
|
n2 := Nod(OADD, conv(n1, twide), conv(nl, twide))
|
||||||
|
|
||||||
// shift by m.s
|
// shift by m.s
|
||||||
nc := Nod(OXXX, nil, nil)
|
var nc Node
|
||||||
|
|
||||||
Nodconst(nc, Types[TUINT], int64(m.S))
|
Nodconst(&nc, Types[TUINT], int64(m.S))
|
||||||
n = conv(Nod(ORSH, n2, nc), nl.Type)
|
n = conv(Nod(ORSH, n2, &nc), nl.Type)
|
||||||
} else {
|
} else {
|
||||||
// n = n1 >> m.s
|
// n = n1 >> m.s
|
||||||
nc := Nod(OXXX, nil, nil)
|
var nc Node
|
||||||
|
|
||||||
Nodconst(nc, Types[TUINT], int64(m.S))
|
Nodconst(&nc, Types[TUINT], int64(m.S))
|
||||||
n = Nod(ORSH, n1, nc)
|
n = Nod(ORSH, n1, &nc)
|
||||||
}
|
}
|
||||||
|
|
||||||
// n1 = nl * magic >> w
|
// n1 = nl * magic >> w
|
||||||
case TINT8, TINT16, TINT32:
|
case TINT8, TINT16, TINT32:
|
||||||
nc := Nod(OXXX, nil, nil)
|
var nc Node
|
||||||
|
|
||||||
Nodconst(nc, nl.Type, m.Sm)
|
Nodconst(&nc, nl.Type, m.Sm)
|
||||||
n1 := Nod(OHMUL, nl, nc)
|
n1 := Nod(OHMUL, nl, &nc)
|
||||||
n1 = typecheck(n1, Erv)
|
n1 = typecheck(n1, Erv)
|
||||||
if m.Sm < 0 {
|
if m.Sm < 0 {
|
||||||
// add the numerator.
|
// add the numerator.
|
||||||
@ -3564,16 +3564,16 @@ func walkdiv(n *Node, init *Nodes) *Node {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// shift by m.s
|
// shift by m.s
|
||||||
nc = Nod(OXXX, nil, nil)
|
var ns Node
|
||||||
|
|
||||||
Nodconst(nc, Types[TUINT], int64(m.S))
|
Nodconst(&ns, Types[TUINT], int64(m.S))
|
||||||
n2 := conv(Nod(ORSH, n1, nc), nl.Type)
|
n2 := conv(Nod(ORSH, n1, &ns), nl.Type)
|
||||||
|
|
||||||
// add 1 iff n1 is negative.
|
// add 1 iff n1 is negative.
|
||||||
nc = Nod(OXXX, nil, nil)
|
var nneg Node
|
||||||
|
|
||||||
Nodconst(nc, Types[TUINT], int64(w)-1)
|
Nodconst(&nneg, Types[TUINT], int64(w)-1)
|
||||||
n3 := Nod(ORSH, nl, nc) // n4 = -1 iff n1 is negative.
|
n3 := Nod(ORSH, nl, &nneg) // n4 = -1 iff n1 is negative.
|
||||||
n = Nod(OSUB, n2, n3)
|
n = Nod(OSUB, n2, n3)
|
||||||
|
|
||||||
// apply sign.
|
// apply sign.
|
||||||
@ -3606,10 +3606,10 @@ func walkdiv(n *Node, init *Nodes) *Node {
|
|||||||
// signed modulo 2^pow is like ANDing
|
// signed modulo 2^pow is like ANDing
|
||||||
// with the last pow bits, but if nl < 0,
|
// with the last pow bits, but if nl < 0,
|
||||||
// nl & (2^pow-1) is (nl+1)%2^pow - 1.
|
// nl & (2^pow-1) is (nl+1)%2^pow - 1.
|
||||||
nc := Nod(OXXX, nil, nil)
|
var nc Node
|
||||||
|
|
||||||
Nodconst(nc, Types[Simtype[TUINT]], int64(w)-1)
|
Nodconst(&nc, Types[Simtype[TUINT]], int64(w)-1)
|
||||||
n1 := Nod(ORSH, nl, nc) // n1 = -1 iff nl < 0.
|
n1 := Nod(ORSH, nl, &nc) // n1 = -1 iff nl < 0.
|
||||||
if pow == 1 {
|
if pow == 1 {
|
||||||
n1 = typecheck(n1, Erv)
|
n1 = typecheck(n1, Erv)
|
||||||
n1 = cheapexpr(n1, init)
|
n1 = cheapexpr(n1, init)
|
||||||
@ -3617,21 +3617,21 @@ func walkdiv(n *Node, init *Nodes) *Node {
|
|||||||
// n = (nl+ε)&1 -ε where ε=1 iff nl<0.
|
// n = (nl+ε)&1 -ε where ε=1 iff nl<0.
|
||||||
n2 := Nod(OSUB, nl, n1)
|
n2 := Nod(OSUB, nl, n1)
|
||||||
|
|
||||||
nc := Nod(OXXX, nil, nil)
|
var nc Node
|
||||||
Nodconst(nc, nl.Type, 1)
|
Nodconst(&nc, nl.Type, 1)
|
||||||
n3 := Nod(OAND, n2, nc)
|
n3 := Nod(OAND, n2, &nc)
|
||||||
n = Nod(OADD, n3, n1)
|
n = Nod(OADD, n3, n1)
|
||||||
} else {
|
} else {
|
||||||
// n = (nl+ε)&(nr-1) - ε where ε=2^pow-1 iff nl<0.
|
// n = (nl+ε)&(nr-1) - ε where ε=2^pow-1 iff nl<0.
|
||||||
nc := Nod(OXXX, nil, nil)
|
var nc Node
|
||||||
|
|
||||||
Nodconst(nc, nl.Type, (1<<uint(pow))-1)
|
Nodconst(&nc, nl.Type, (1<<uint(pow))-1)
|
||||||
n2 := Nod(OAND, n1, nc) // n2 = 2^pow-1 iff nl<0.
|
n2 := Nod(OAND, n1, &nc) // n2 = 2^pow-1 iff nl<0.
|
||||||
n2 = typecheck(n2, Erv)
|
n2 = typecheck(n2, Erv)
|
||||||
n2 = cheapexpr(n2, init)
|
n2 = cheapexpr(n2, init)
|
||||||
|
|
||||||
n3 := Nod(OADD, nl, n2)
|
n3 := Nod(OADD, nl, n2)
|
||||||
n4 := Nod(OAND, n3, nc)
|
n4 := Nod(OAND, n3, &nc)
|
||||||
n = Nod(OSUB, n4, n2)
|
n = Nod(OSUB, n4, n2)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -3640,28 +3640,28 @@ func walkdiv(n *Node, init *Nodes) *Node {
|
|||||||
// arithmetic right shift does not give the correct rounding.
|
// arithmetic right shift does not give the correct rounding.
|
||||||
// if nl >= 0, nl >> n == nl / nr
|
// if nl >= 0, nl >> n == nl / nr
|
||||||
// if nl < 0, we want to add 2^n-1 first.
|
// if nl < 0, we want to add 2^n-1 first.
|
||||||
nc := Nod(OXXX, nil, nil)
|
var nc Node
|
||||||
|
|
||||||
Nodconst(nc, Types[Simtype[TUINT]], int64(w)-1)
|
Nodconst(&nc, Types[Simtype[TUINT]], int64(w)-1)
|
||||||
n1 := Nod(ORSH, nl, nc) // n1 = -1 iff nl < 0.
|
n1 := Nod(ORSH, nl, &nc) // n1 = -1 iff nl < 0.
|
||||||
if pow == 1 {
|
if pow == 1 {
|
||||||
// nl+1 is nl-(-1)
|
// nl+1 is nl-(-1)
|
||||||
n.Left = Nod(OSUB, nl, n1)
|
n.Left = Nod(OSUB, nl, n1)
|
||||||
} else {
|
} else {
|
||||||
// Do a logical right right on -1 to keep pow bits.
|
// Do a logical right right on -1 to keep pow bits.
|
||||||
nc := Nod(OXXX, nil, nil)
|
var nc Node
|
||||||
|
|
||||||
Nodconst(nc, Types[Simtype[TUINT]], int64(w)-int64(pow))
|
Nodconst(&nc, Types[Simtype[TUINT]], int64(w)-int64(pow))
|
||||||
n2 := Nod(ORSH, conv(n1, tounsigned(nl.Type)), nc)
|
n2 := Nod(ORSH, conv(n1, tounsigned(nl.Type)), &nc)
|
||||||
n.Left = Nod(OADD, nl, conv(n2, nl.Type))
|
n.Left = Nod(OADD, nl, conv(n2, nl.Type))
|
||||||
}
|
}
|
||||||
|
|
||||||
// n = (nl + 2^pow-1) >> pow
|
// n = (nl + 2^pow-1) >> pow
|
||||||
n.Op = ORSH
|
n.Op = ORSH
|
||||||
|
|
||||||
nc = Nod(OXXX, nil, nil)
|
var n2 Node
|
||||||
Nodconst(nc, Types[Simtype[TUINT]], int64(pow))
|
Nodconst(&n2, Types[Simtype[TUINT]], int64(pow))
|
||||||
n.Right = nc
|
n.Right = &n2
|
||||||
n.Typecheck = 0
|
n.Typecheck = 0
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -3671,21 +3671,21 @@ func walkdiv(n *Node, init *Nodes) *Node {
|
|||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
|
||||||
nc := Nod(OXXX, nil, nil)
|
var nc Node
|
||||||
if n.Op == OMOD {
|
if n.Op == OMOD {
|
||||||
// n = nl & (nr-1)
|
// n = nl & (nr-1)
|
||||||
n.Op = OAND
|
n.Op = OAND
|
||||||
|
|
||||||
Nodconst(nc, nl.Type, nr.Val().U.(*Mpint).Int64()-1)
|
Nodconst(&nc, nl.Type, nr.Val().U.(*Mpint).Int64()-1)
|
||||||
} else {
|
} else {
|
||||||
// n = nl >> pow
|
// n = nl >> pow
|
||||||
n.Op = ORSH
|
n.Op = ORSH
|
||||||
|
|
||||||
Nodconst(nc, Types[Simtype[TUINT]], int64(pow))
|
Nodconst(&nc, Types[Simtype[TUINT]], int64(pow))
|
||||||
}
|
}
|
||||||
|
|
||||||
n.Typecheck = 0
|
n.Typecheck = 0
|
||||||
n.Right = nc
|
n.Right = &nc
|
||||||
}
|
}
|
||||||
|
|
||||||
goto ret
|
goto ret
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user