1
0
mirror of https://github.com/golang/go synced 2024-11-17 05:35:00 -07:00

cmd/link: linker portion of dead map removal

This patch contains the linker changes needed to enable deadcoding of
large unreferenced map variables, in combination with a previous
compiler change. We add a new cleanup function that runs just after
deadcode that looks for relocations in "init" funcs that are weak, of
type R_CALL (and siblings), and are targeting an unreachable function.
If we find such a relocation, after checking to make sure it targets a
map.init.XXX helper, we redirect the relocation to a point to a no-op
routine ("mapinitnoop") in the runtime.

Compilebench results for this change:

			  │ out.base.txt │            out.wrap.txt            │
			  │    sec/op    │   sec/op     vs base               │
 Template                   218.6m ±  2%   221.1m ± 1%       ~ (p=0.129 n=39)
 Unicode                    180.5m ±  1%   178.9m ± 1%  -0.93% (p=0.006 n=39)
 GoTypes                     1.162 ±  1%    1.156 ± 1%       ~ (p=0.850 n=39)
 Compiler                   143.6m ±  1%   142.6m ± 1%       ~ (p=0.743 n=39)
 SSA                         8.698 ±  1%    8.719 ± 1%       ~ (p=0.145 n=39)
 Flate                      142.6m ±  1%   143.9m ± 3%       ~ (p=0.287 n=39)
 GoParser                   247.7m ±  1%   248.8m ± 1%       ~ (p=0.265 n=39)
 Reflect                    588.0m ±  1%   590.4m ± 1%       ~ (p=0.269 n=39)
 Tar                        198.5m ±  1%   201.3m ± 1%  +1.38% (p=0.005 n=39)
 XML                        259.1m ±  1%   260.0m ± 1%       ~ (p=0.376 n=39)
 LinkCompiler               746.8m ±  2%   747.8m ± 1%       ~ (p=0.706 n=39)
 ExternalLinkCompiler        1.906 ±  0%    1.902 ± 1%       ~ (p=0.207 n=40)
 LinkWithoutDebugCompiler   522.4m ± 21%   471.1m ± 1%  -9.81% (p=0.000 n=40)
 StdCmd                      21.32 ±  0%    21.39 ± 0%  +0.32% (p=0.035 n=40)
 geomean                    609.2m         606.0m       -0.53%

			  │ out.base.txt │            out.wrap.txt            │
			  │ user-sec/op  │ user-sec/op  vs base               │
 Template                    401.9m ± 3%   406.9m ± 2%       ~ (p=0.291 n=39)
 Unicode                     191.9m ± 6%   196.1m ± 3%       ~ (p=0.052 n=39)
 GoTypes                      3.967 ± 3%    4.056 ± 1%       ~ (p=0.099 n=39)
 Compiler                    171.1m ± 3%   173.4m ± 3%       ~ (p=0.415 n=39)
 SSA                          30.04 ± 4%    30.25 ± 4%       ~ (p=0.106 n=39)
 Flate                       246.3m ± 3%   248.9m ± 4%       ~ (p=0.499 n=39)
 GoParser                    518.7m ± 1%   520.6m ± 2%       ~ (p=0.531 n=39)
 Reflect                      1.670 ± 1%    1.656 ± 2%       ~ (p=0.137 n=39)
 Tar                         352.7m ± 2%   360.3m ± 2%       ~ (p=0.117 n=39)
 XML                         528.8m ± 2%   521.1m ± 2%       ~ (p=0.296 n=39)
 LinkCompiler                 1.128 ± 2%    1.140 ± 2%       ~ (p=0.324 n=39)
 ExternalLinkCompiler         2.165 ± 2%    2.147 ± 2%       ~ (p=0.537 n=40)
 LinkWithoutDebugCompiler    484.2m ± 4%   490.7m ± 3%       ~ (p=0.897 n=40)
 geomean                     818.5m        825.1m       +0.80%

	   │ out.base.txt │             out.wrap.txt              │
	   │  text-bytes  │  text-bytes   vs base                 │
 HelloSize   766.0Ki ± 0%   766.0Ki ± 0%       ~ (p=1.000 n=40) ¹
 CmdGoSize   10.02Mi ± 0%   10.02Mi ± 0%  -0.03% (n=40)
 geomean     2.738Mi        2.738Mi       -0.01%
 ¹ all samples are equal

	   │ out.base.txt │             out.wrap.txt              │
	   │  data-bytes  │  data-bytes   vs base                 │
 HelloSize   14.17Ki ± 0%   14.17Ki ± 0%       ~ (p=1.000 n=40) ¹
 CmdGoSize   308.3Ki ± 0%   298.5Ki ± 0%  -3.19% (n=40)
 geomean     66.10Ki        65.04Ki       -1.61%
 ¹ all samples are equal

	   │ out.base.txt │             out.wrap.txt              │
	   │  bss-bytes   │  bss-bytes    vs base                 │
 HelloSize   197.3Ki ± 0%   197.3Ki ± 0%       ~ (p=1.000 n=40) ¹
 CmdGoSize   228.2Ki ± 0%   228.1Ki ± 0%  -0.01% (n=40)
 geomean     212.2Ki        212.1Ki       -0.01%
 ¹ all samples are equal

	   │ out.base.txt │            out.wrap.txt             │
	   │  exe-bytes   │  exe-bytes    vs base               │
 HelloSize   1.192Mi ± 0%   1.192Mi ± 0%  +0.00% (p=0.000 n=40)
 CmdGoSize   14.85Mi ± 0%   14.83Mi ± 0%  -0.09% (n=40)
 geomean     4.207Mi        4.205Mi       -0.05%

Also tested for any linker changes by benchmarking relink of k8s
"kubelet"; no changes to speak of there.

Updates #2559.
Updates #36021.
Updates #14840.

Change-Id: I4cc5370b3f20679a1065aaaf87bdf2881e257631
Reviewed-on: https://go-review.googlesource.com/c/go/+/463395
Run-TryBot: Than McIntosh <thanm@google.com>
Reviewed-by: Cherry Mui <cherryyz@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
This commit is contained in:
Than McIntosh 2023-01-25 10:46:08 -05:00
parent b46e44a399
commit e2ca417ee7
7 changed files with 103 additions and 15 deletions

View File

@ -240,10 +240,6 @@ func RegisterMapInitLsym(s *obj.LSym) {
// outlined global map initializer functions; if it finds any such // outlined global map initializer functions; if it finds any such
// relocs, it flags them as R_WEAK. // relocs, it flags them as R_WEAK.
func weakenGlobalMapInitRelocs(fn *ir.Func) { func weakenGlobalMapInitRelocs(fn *ir.Func) {
// Disabled until next patch.
if true {
return
}
if globalMapInitLsyms == nil { if globalMapInitLsyms == nil {
return return
} }

View File

@ -12,6 +12,7 @@ import (
"cmd/link/internal/sym" "cmd/link/internal/sym"
"fmt" "fmt"
"internal/buildcfg" "internal/buildcfg"
"strings"
"unicode" "unicode"
) )
@ -29,6 +30,8 @@ type deadcodePass struct {
dynlink bool dynlink bool
methodsigstmp []methodsig // scratch buffer for decoding method signatures methodsigstmp []methodsig // scratch buffer for decoding method signatures
pkginits []loader.Sym
mapinitnoop loader.Sym
} }
func (d *deadcodePass) init() { func (d *deadcodePass) init() {
@ -105,6 +108,11 @@ func (d *deadcodePass) init() {
} }
d.mark(s, 0) d.mark(s, 0)
} }
d.mapinitnoop = d.ldr.Lookup("runtime.mapinitnoop", abiInternalVer)
if d.mapinitnoop == 0 {
panic("could not look up runtime.mapinitnoop")
}
} }
func (d *deadcodePass) flood() { func (d *deadcodePass) flood() {
@ -229,6 +237,12 @@ func (d *deadcodePass) flood() {
} }
d.mark(a.Sym(), symIdx) d.mark(a.Sym(), symIdx)
} }
// Record sym if package init func (here naux != 0 is a cheap way
// to check first if it is a function symbol).
if naux != 0 && d.ldr.IsPkgInit(symIdx) {
d.pkginits = append(d.pkginits, symIdx)
}
// Some host object symbols have an outer object, which acts like a // Some host object symbols have an outer object, which acts like a
// "carrier" symbol, or it holds all the symbols for a particular // "carrier" symbol, or it holds all the symbols for a particular
// section. We need to mark all "referenced" symbols from that carrier, // section. We need to mark all "referenced" symbols from that carrier,
@ -262,6 +276,37 @@ func (d *deadcodePass) flood() {
} }
} }
// mapinitcleanup walks all pkg init functions and looks for weak relocations
// to mapinit symbols that are no longer reachable. It rewrites
// the relocs to target a new no-op routine in the runtime.
func (d *deadcodePass) mapinitcleanup() {
for _, idx := range d.pkginits {
relocs := d.ldr.Relocs(idx)
var su *loader.SymbolBuilder
for i := 0; i < relocs.Count(); i++ {
r := relocs.At(i)
rs := r.Sym()
if r.Weak() && r.Type().IsDirectCall() && !d.ldr.AttrReachable(rs) {
// double check to make sure target is indeed map.init
rsn := d.ldr.SymName(rs)
if !strings.Contains(rsn, "map.init") {
panic(fmt.Sprintf("internal error: expected map.init sym for weak call reloc, got %s -> %s", d.ldr.SymName(idx), rsn))
}
d.ldr.SetAttrReachable(d.mapinitnoop, true)
if d.ctxt.Debugvlog > 1 {
d.ctxt.Logf("deadcode: %s rewrite %s ref to %s\n",
d.ldr.SymName(idx), rsn,
d.ldr.SymName(d.mapinitnoop))
}
if su == nil {
su = d.ldr.MakeSymbolUpdater(idx)
}
su.SetRelocSym(i, d.mapinitnoop)
}
}
}
}
func (d *deadcodePass) mark(symIdx, parent loader.Sym) { func (d *deadcodePass) mark(symIdx, parent loader.Sym) {
if symIdx != 0 && !d.ldr.AttrReachable(symIdx) { if symIdx != 0 && !d.ldr.AttrReachable(symIdx) {
d.wq.push(symIdx) d.wq.push(symIdx)
@ -370,6 +415,9 @@ func deadcode(ctxt *Link) {
} }
d.flood() d.flood()
} }
if *flagPruneWeakMap {
d.mapinitcleanup()
}
} }
// methodsig is a typed method signature (name + type). // methodsig is a typed method signature (name + type).

View File

@ -19,14 +19,16 @@ func TestDeadcode(t *testing.T) {
tests := []struct { tests := []struct {
src string src string
pos, neg string // positive and negative patterns pos, neg []string // positive and negative patterns
}{ }{
{"reflectcall", "", "main.T.M"}, {"reflectcall", nil, []string{"main.T.M"}},
{"typedesc", "", "type:main.T"}, {"typedesc", nil, []string{"type:main.T"}},
{"ifacemethod", "", "main.T.M"}, {"ifacemethod", nil, []string{"main.T.M"}},
{"ifacemethod2", "main.T.M", ""}, {"ifacemethod2", []string{"main.T.M"}, nil},
{"ifacemethod3", "main.S.M", ""}, {"ifacemethod3", []string{"main.S.M"}, nil},
{"ifacemethod4", "", "main.T.M"}, {"ifacemethod4", nil, []string{"main.T.M"}},
{"globalmap", []string{"main.small", "main.effect"},
[]string{"main.large"}},
} }
for _, test := range tests { for _, test := range tests {
test := test test := test
@ -39,11 +41,15 @@ func TestDeadcode(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("%v: %v:\n%s", cmd.Args, err, out) t.Fatalf("%v: %v:\n%s", cmd.Args, err, out)
} }
if test.pos != "" && !bytes.Contains(out, []byte(test.pos+"\n")) { for _, pos := range test.pos {
t.Errorf("%s should be reachable. Output:\n%s", test.pos, out) if !bytes.Contains(out, []byte(pos+"\n")) {
t.Errorf("%s should be reachable. Output:\n%s", pos, out)
}
} }
if test.neg != "" && bytes.Contains(out, []byte(test.neg+"\n")) { for _, neg := range test.neg {
t.Errorf("%s should not be reachable. Output:\n%s", test.neg, out) if bytes.Contains(out, []byte(neg+"\n")) {
t.Errorf("%s should not be reachable. Output:\n%s", neg, out)
}
} }
}) })
} }

View File

@ -100,6 +100,7 @@ var (
FlagRound = flag.Int("R", -1, "set address rounding `quantum`") FlagRound = flag.Int("R", -1, "set address rounding `quantum`")
FlagTextAddr = flag.Int64("T", -1, "set text segment `address`") FlagTextAddr = flag.Int64("T", -1, "set text segment `address`")
flagEntrySymbol = flag.String("E", "", "set `entry` symbol name") flagEntrySymbol = flag.String("E", "", "set `entry` symbol name")
flagPruneWeakMap = flag.Bool("pruneweakmap", true, "prune weak mapinit refs")
cpuprofile = flag.String("cpuprofile", "", "write cpu profile to `file`") cpuprofile = flag.String("cpuprofile", "", "write cpu profile to `file`")
memprofile = flag.String("memprofile", "", "write memory profile to `file`") memprofile = flag.String("memprofile", "", "write memory profile to `file`")
memprofilerate = flag.Int64("memprofilerate", 0, "set runtime.MemProfileRate to `rate`") memprofilerate = flag.Int64("memprofilerate", 0, "set runtime.MemProfileRate to `rate`")

View File

@ -0,0 +1,26 @@
package main
import "os"
// Too small to trigger deadcode (currently)
var small = map[string]int{"foo": 1}
// Has side effects, which prevent deadcode
var effect = map[string]int{"foo": os.Getpid()}
// Large and side-effect free
var large = map[string]int{
"11": 1, "12": 2, "13": 3, "14": 4, "15": 5, "16": 6, "17": 7, "18": 8, "19": 9, "110": 10,
"21": 1, "22": 2, "23": 3, "24": 4, "25": 5, "26": 6, "27": 7, "28": 8, "29": 9, "210": 10,
"31": 1, "32": 2, "33": 3, "34": 4, "35": 5, "36": 6, "37": 7, "38": 8, "39": 9, "310": 10,
"41": 1, "42": 2, "43": 3, "44": 4, "45": 5, "46": 6, "47": 7, "48": 8, "49": 9, "410": 10,
"51": 1, "52": 2, "53": 3, "54": 4, "55": 5, "56": 6, "57": 7, "58": 8, "59": 9, "510": 10,
"61": 1, "62": 2, "63": 3, "64": 4, "65": 5, "66": 6, "67": 7, "68": 8, "69": 9, "610": 10,
"71": 1, "72": 2, "73": 3, "74": 4, "75": 5, "76": 6, "77": 7, "78": 8, "79": 9, "710": 10,
"81": 1, "82": 2, "83": 3, "84": 4, "85": 5, "86": 6, "87": 7, "88": 8, "89": 9, "810": 10,
"91": 1, "92": 2, "93": 3, "94": 4, "95": 5, "96": 6, "97": 7, "98": 8, "99": 9, "910": 10,
"101": 1, "102": 2, "103": 3, "104": 4, "105": 5, "106": 6, "107": 7, "108": 8, "109": 9, "1010": 10, "1021": 2,
}
func main() {
}

View File

@ -8,3 +8,7 @@
TEXT ·sigpanic0(SB),NOSPLIT,$0-0 TEXT ·sigpanic0(SB),NOSPLIT,$0-0
JMP ·sigpanic<ABIInternal>(SB) JMP ·sigpanic<ABIInternal>(SB)
#endif #endif
// See map.go comment on the need for this routine.
TEXT ·mapinitnoop<ABIInternal>(SB),NOSPLIT,$0-0
RET

View File

@ -1422,3 +1422,10 @@ func reflectlite_maplen(h *hmap) int {
const maxZero = 1024 // must match value in reflect/value.go:maxZero cmd/compile/internal/gc/walk.go:zeroValSize const maxZero = 1024 // must match value in reflect/value.go:maxZero cmd/compile/internal/gc/walk.go:zeroValSize
var zeroVal [maxZero]byte var zeroVal [maxZero]byte
// mapinitnoop is a no-op function known the Go linker; if a given global
// map (of the right size) is determined to be dead, the linker will
// rewrite the relocation (from the package init func) from the outlined
// map init function to this symbol. Defined in assembly so as to avoid
// complications with instrumentation (coverage, etc).
func mapinitnoop()