mirror of
https://github.com/golang/go.git
synced 2025-12-08 06:10:04 +00:00
cmd/compile: enable constant-time CFG editing
Provide indexes along with block pointers for Preds and Succs arrays. This allows us to splice edges in and out of those arrays in constant time. Fixes worst-case O(n^2) behavior in deadcode and fuse. benchmark old ns/op new ns/op delta BenchmarkFuse1-8 2065 2057 -0.39% BenchmarkFuse10-8 9408 9073 -3.56% BenchmarkFuse100-8 105238 76277 -27.52% BenchmarkFuse1000-8 3982562 1026750 -74.22% BenchmarkFuse10000-8 301220329 12824005 -95.74% BenchmarkDeadCode1-8 1588 1566 -1.39% BenchmarkDeadCode10-8 4333 4250 -1.92% BenchmarkDeadCode100-8 32031 32574 +1.70% BenchmarkDeadCode1000-8 590407 468275 -20.69% BenchmarkDeadCode10000-8 17822890 5000818 -71.94% BenchmarkDeadCode100000-8 1388706640 78021127 -94.38% BenchmarkDeadCode200000-8 5372518479 168598762 -96.86% Change-Id: Iccabdbb9343fd1c921ba07bbf673330a1c36ee17 Reviewed-on: https://go-review.googlesource.com/22589 Reviewed-by: Josh Bleecher Snyder <josharian@gmail.com> Run-TryBot: Keith Randall <khr@golang.org> TryBot-Result: Gobot Gobot <gobot@golang.org>
This commit is contained in:
parent
bcd4b84bc5
commit
4fa050024f
33 changed files with 642 additions and 566 deletions
|
|
@ -488,11 +488,12 @@ func (s *regAllocState) init(f *Func) {
|
|||
s.primary = make([]int32, f.NumBlocks())
|
||||
for _, b := range f.Blocks {
|
||||
best := -1
|
||||
for i, p := range b.Preds {
|
||||
for i, e := range b.Preds {
|
||||
p := e.b
|
||||
if blockOrder[p.ID] >= blockOrder[b.ID] {
|
||||
continue // backward edge
|
||||
}
|
||||
if best == -1 || blockOrder[p.ID] > blockOrder[b.Preds[best].ID] {
|
||||
if best == -1 || blockOrder[p.ID] > blockOrder[b.Preds[best].b.ID] {
|
||||
best = i
|
||||
}
|
||||
}
|
||||
|
|
@ -706,7 +707,7 @@ func (s *regAllocState) regalloc(f *Func) {
|
|||
}
|
||||
} else if len(b.Preds) == 1 {
|
||||
// Start regalloc state with the end state of the previous block.
|
||||
s.setState(s.endRegs[b.Preds[0].ID])
|
||||
s.setState(s.endRegs[b.Preds[0].b.ID])
|
||||
if nphi > 0 {
|
||||
f.Fatalf("phis in single-predecessor block")
|
||||
}
|
||||
|
|
@ -731,7 +732,7 @@ func (s *regAllocState) regalloc(f *Func) {
|
|||
if idx < 0 {
|
||||
f.Fatalf("block with no primary predecessor %s", b)
|
||||
}
|
||||
p := b.Preds[idx]
|
||||
p := b.Preds[idx].b
|
||||
s.setState(s.endRegs[p.ID])
|
||||
|
||||
if s.f.pass.debug > regDebug {
|
||||
|
|
@ -859,13 +860,14 @@ func (s *regAllocState) regalloc(f *Func) {
|
|||
// desired registers computed during liveness analysis.
|
||||
// Note that we do this phase after startRegs is set above, so that
|
||||
// we get the right behavior for a block which branches to itself.
|
||||
for _, succ := range b.Succs {
|
||||
for _, e := range b.Succs {
|
||||
succ := e.b
|
||||
// TODO: prioritize likely successor?
|
||||
for _, x := range s.startRegs[succ.ID] {
|
||||
desired.add(x.vid, x.r)
|
||||
}
|
||||
// Process phi ops in succ.
|
||||
pidx := predIdx(succ, b)
|
||||
pidx := e.i
|
||||
for _, v := range succ.Values {
|
||||
if v.Op != OpPhi {
|
||||
break
|
||||
|
|
@ -1194,7 +1196,7 @@ func (s *regAllocState) regalloc(f *Func) {
|
|||
// the merge point and promote them to registers now.
|
||||
if len(b.Succs) == 1 {
|
||||
// For this to be worthwhile, the loop must have no calls in it.
|
||||
top := b.Succs[0]
|
||||
top := b.Succs[0].b
|
||||
loop := s.loopnest.b2l[top.ID]
|
||||
if loop == nil || loop.header != top || loop.containsCall {
|
||||
goto badloop
|
||||
|
|
@ -1452,7 +1454,7 @@ sinking:
|
|||
if len(d.Preds) > 1 {
|
||||
panic("Should be impossible given critical edges removed")
|
||||
}
|
||||
p := d.Preds[0] // block in loop exiting to d.
|
||||
p := d.Preds[0].b // block in loop exiting to d.
|
||||
|
||||
endregs := s.endRegs[p.ID]
|
||||
for _, regrec := range endregs {
|
||||
|
|
@ -1570,7 +1572,8 @@ func (s *regAllocState) shuffle(stacklive [][]ID) {
|
|||
continue
|
||||
}
|
||||
e.b = b
|
||||
for i, p := range b.Preds {
|
||||
for i, edge := range b.Preds {
|
||||
p := edge.b
|
||||
e.p = p
|
||||
e.setup(i, s.endRegs[p.ID], s.startRegs[b.ID], stacklive[p.ID])
|
||||
e.process()
|
||||
|
|
@ -2112,18 +2115,19 @@ func (s *regAllocState) computeLive() {
|
|||
|
||||
// For each predecessor of b, expand its list of live-at-end values.
|
||||
// invariant: live contains the values live at the start of b (excluding phi inputs)
|
||||
for i, p := range b.Preds {
|
||||
for i, e := range b.Preds {
|
||||
p := e.b
|
||||
// Compute additional distance for the edge.
|
||||
// Note: delta must be at least 1 to distinguish the control
|
||||
// value use from the first user in a successor block.
|
||||
delta := int32(normalDistance)
|
||||
if len(p.Succs) == 2 {
|
||||
if p.Succs[0] == b && p.Likely == BranchLikely ||
|
||||
p.Succs[1] == b && p.Likely == BranchUnlikely {
|
||||
if p.Succs[0].b == b && p.Likely == BranchLikely ||
|
||||
p.Succs[1].b == b && p.Likely == BranchUnlikely {
|
||||
delta = likelyDistance
|
||||
}
|
||||
if p.Succs[0] == b && p.Likely == BranchUnlikely ||
|
||||
p.Succs[1] == b && p.Likely == BranchLikely {
|
||||
if p.Succs[0].b == b && p.Likely == BranchUnlikely ||
|
||||
p.Succs[1].b == b && p.Likely == BranchLikely {
|
||||
delta = unlikelyDistance
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue