95bec3331c
Storing every string without ninja variable references through simpleNinjaString costs 24 bytes and a heap allocation. 16 bytes is used for the ninjaString.str string, 8 bytes for the ninjaString.variables *[]variableReference. An additional 8 bytes is used for the resulting pointer into the heap. The vast majority of calls to simpleNinjaString originate in blueprint.parseBuildParams, which converts all of the parameters passed to ctx.Build into ninjaStrings. All together this was allocating 1.575 GB of *ninjaString objects. Add a parseNinjaOrSimpleStrings function that converts input strings into ninjaStrings if they have ninja variable references, but also returns a slice of plain strings for input strings without any ninja variable references. That still results in 1.39 GB of allocations just for the output string slice, so also add an optimization that reuses the input string slice as the output slice if all of the strings had no variable references. Plumb the resulting strings through everywhere that the []*ninjaStrings were used. This reduces the total memory allocations inside blueprint.parseBuildParams in my AOSP aosp_cf_x86_64_phone-userdebug build from 3.337 GB to 1.786 GB. Test: ninja_strings_test.go Change-Id: I51bc138a2a6b1cc7383c7df0a483ccb067ffa02b
149 lines
3.7 KiB
Go
149 lines
3.7 KiB
Go
// Copyright 2014 Google Inc. All rights reserved.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package blueprint
|
|
|
|
import (
|
|
"bytes"
|
|
"strings"
|
|
"testing"
|
|
)
|
|
|
|
func ck(err error) {
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
}
|
|
|
|
var ninjaWriterTestCases = []struct {
|
|
input func(w *ninjaWriter)
|
|
output string
|
|
}{
|
|
{
|
|
input: func(w *ninjaWriter) {
|
|
ck(w.Comment("foo"))
|
|
},
|
|
output: "# foo\n",
|
|
},
|
|
{
|
|
input: func(w *ninjaWriter) {
|
|
ck(w.Pool("foo"))
|
|
},
|
|
output: "pool foo\n",
|
|
},
|
|
{
|
|
input: func(w *ninjaWriter) {
|
|
ck(w.Rule("foo"))
|
|
},
|
|
output: "rule foo\n",
|
|
},
|
|
{
|
|
input: func(w *ninjaWriter) {
|
|
ck(w.Build("foo comment", "foo", testNinjaStrings("o3", "o4"),
|
|
testNinjaStrings("io3", "io4"), testNinjaStrings("e3", "e4"),
|
|
testNinjaStrings("i3", "i4"), testNinjaStrings("oo3", "oo4"),
|
|
testNinjaStrings("v3", "v4"), []string{"o1", "o2"},
|
|
[]string{"io1", "io2"}, []string{"e1", "e2"},
|
|
[]string{"i1", "i2"}, []string{"oo1", "oo2"},
|
|
[]string{"v1", "v2"}, nil))
|
|
},
|
|
output: "# foo comment\nbuild o1 o2 o3 o4 | io1 io2 io3 io4: foo e1 e2 e3 e4 | i1 i2 i3 i4 || oo1 oo2 $\n oo3 oo4 |@ v1 v2 v3 v4\n",
|
|
},
|
|
{
|
|
input: func(w *ninjaWriter) {
|
|
ck(w.Build("foo comment", "foo",
|
|
testNinjaStrings(strings.Repeat("o", lineWidth)),
|
|
nil,
|
|
testNinjaStrings(strings.Repeat("i", lineWidth)),
|
|
nil, nil, nil, nil, nil, nil, nil, nil, nil, nil))
|
|
},
|
|
output: "# foo comment\nbuild $\n " + strings.Repeat("o", lineWidth) + ": $\n foo $\n " + strings.Repeat("i", lineWidth) + "\n",
|
|
},
|
|
{
|
|
input: func(w *ninjaWriter) {
|
|
ck(w.Default(nil, testNinjaStrings("foo"), []string{"bar"}))
|
|
},
|
|
output: "default bar foo\n",
|
|
},
|
|
{
|
|
input: func(w *ninjaWriter) {
|
|
ck(w.Assign("foo", "bar"))
|
|
},
|
|
output: "foo = bar\n",
|
|
},
|
|
{
|
|
input: func(w *ninjaWriter) {
|
|
ck(w.ScopedAssign("foo", "bar"))
|
|
},
|
|
output: " foo = bar\n",
|
|
},
|
|
{
|
|
input: func(w *ninjaWriter) {
|
|
ck(w.Subninja("build.ninja"))
|
|
},
|
|
output: "subninja build.ninja\n",
|
|
},
|
|
{
|
|
input: func(w *ninjaWriter) {
|
|
ck(w.BlankLine())
|
|
},
|
|
output: "\n",
|
|
},
|
|
{
|
|
input: func(w *ninjaWriter) {
|
|
ck(w.Pool("p"))
|
|
ck(w.ScopedAssign("depth", "3"))
|
|
ck(w.BlankLine())
|
|
ck(w.Comment("here comes a rule"))
|
|
ck(w.Rule("r"))
|
|
ck(w.ScopedAssign("command", "echo out: $out in: $in _arg: $_arg"))
|
|
ck(w.ScopedAssign("pool", "p"))
|
|
ck(w.BlankLine())
|
|
ck(w.Build("r comment", "r", testNinjaStrings("foo.o"),
|
|
nil, testNinjaStrings("foo.in"), nil, nil, nil, nil,
|
|
nil, nil, nil, nil, nil, nil))
|
|
ck(w.ScopedAssign("_arg", "arg value"))
|
|
},
|
|
output: `pool p
|
|
depth = 3
|
|
|
|
# here comes a rule
|
|
rule r
|
|
command = echo out: $out in: $in _arg: $_arg
|
|
pool = p
|
|
|
|
# r comment
|
|
build foo.o: r foo.in
|
|
_arg = arg value
|
|
`,
|
|
},
|
|
}
|
|
|
|
func TestNinjaWriter(t *testing.T) {
|
|
for i, testCase := range ninjaWriterTestCases {
|
|
buf := bytes.NewBuffer(nil)
|
|
w := newNinjaWriter(buf)
|
|
testCase.input(w)
|
|
if buf.String() != testCase.output {
|
|
t.Errorf("incorrect output for test case %d", i)
|
|
t.Errorf(" expected: %q", testCase.output)
|
|
t.Errorf(" got: %q", buf.String())
|
|
}
|
|
}
|
|
}
|
|
|
|
func testNinjaStrings(s ...string) []*ninjaString {
|
|
ret, _ := parseNinjaStrings(nil, s)
|
|
return ret
|
|
}
|