2015-01-23 23:15:10 +01:00
|
|
|
// 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.
|
|
|
|
|
2014-05-28 01:34:41 +02:00
|
|
|
package blueprint
|
|
|
|
|
|
|
|
import (
|
|
|
|
"bytes"
|
2021-01-22 03:27:14 +01:00
|
|
|
"strings"
|
2014-05-28 01:34:41 +02:00
|
|
|
"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) {
|
2023-10-31 23:15:30 +01:00
|
|
|
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))
|
2014-05-28 01:34:41 +02:00
|
|
|
},
|
2023-10-31 23:15:30 +01:00
|
|
|
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",
|
2014-05-28 01:34:41 +02:00
|
|
|
},
|
|
|
|
{
|
|
|
|
input: func(w *ninjaWriter) {
|
2021-01-22 03:27:14 +01:00
|
|
|
ck(w.Build("foo comment", "foo",
|
|
|
|
testNinjaStrings(strings.Repeat("o", lineWidth)),
|
|
|
|
nil,
|
|
|
|
testNinjaStrings(strings.Repeat("i", lineWidth)),
|
2023-10-31 23:15:30 +01:00
|
|
|
nil, nil, nil, nil, nil, nil, nil, nil, nil, nil))
|
2021-01-22 03:27:14 +01:00
|
|
|
},
|
2023-10-31 23:15:30 +01:00
|
|
|
output: "# foo comment\nbuild $\n " + strings.Repeat("o", lineWidth) + ": $\n foo $\n " + strings.Repeat("i", lineWidth) + "\n",
|
2021-01-22 03:27:14 +01:00
|
|
|
},
|
|
|
|
{
|
|
|
|
input: func(w *ninjaWriter) {
|
2023-10-31 23:15:30 +01:00
|
|
|
ck(w.Default(nil, testNinjaStrings("foo"), []string{"bar"}))
|
2014-05-28 01:34:41 +02:00
|
|
|
},
|
2023-10-31 23:15:30 +01:00
|
|
|
output: "default bar foo\n",
|
2014-05-28 01:34:41 +02:00
|
|
|
},
|
|
|
|
{
|
|
|
|
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",
|
|
|
|
},
|
Run globs during earlier bootstrap phases
Instead of sometimes re-running minibp/the primary builder during the
next phase, run bpglob earlier to check dependencies.
We've run into issues where the environment is slightly different
between bootstrapping phase and the main build phase. It's also a
problem because our primary builder (Soong) exports information used by
another tool (Kati) that runs in between the bootstrapping phases and
the main phase. When Soong would run in the main phase, it could get out
of sync, and would require the build to be run again.
To do this, add a "subninja" include a build-globs.ninja file to each
build.ninja file. The first time, this will be an empty file, but we'll
always run minibp / the primary builder anyway. When the builder runs,
in addition to writing a dependency file, write out the
build-globs.ninja file with the rules to run bpglob.
Since bpglob may need to be run very early, before it would normally be
built, build it with microfactory.
Change-Id: I89fcd849a8729e892f163d40060ab90b5d4dfa5d
2018-07-06 06:56:59 +02:00
|
|
|
{
|
|
|
|
input: func(w *ninjaWriter) {
|
|
|
|
ck(w.Subninja("build.ninja"))
|
|
|
|
},
|
|
|
|
output: "subninja build.ninja\n",
|
|
|
|
},
|
2014-05-28 01:34:41 +02:00
|
|
|
{
|
|
|
|
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())
|
2021-01-22 03:27:14 +01:00
|
|
|
ck(w.Build("r comment", "r", testNinjaStrings("foo.o"),
|
2023-10-31 23:15:30 +01:00
|
|
|
nil, testNinjaStrings("foo.in"), nil, nil, nil, nil,
|
|
|
|
nil, nil, nil, nil, nil, nil))
|
2014-05-28 01:34:41 +02:00
|
|
|
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
|
|
|
|
|
2015-11-08 21:21:58 +01:00
|
|
|
# r comment
|
2014-05-28 01:34:41 +02:00
|
|
|
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())
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2021-01-22 03:27:14 +01:00
|
|
|
|
Optimize memory usage of ninjaString
ninjaString is an interface, which uses 16 bytes of memory on top
of the size of the concrete type. A literalNinjaString is a string,
which is another 16 bytes for the string header for a total of 32
bytes. A varNinjaString is two slices, which are 24 bytes each
for the slice headers, for a total of 64 bytes. The slices contain
the first constant string, and then altenrating variable and string
parts of the ninjaString, resulting in 16 bytes plus 32 bytes per
variable.
This patch replaces the ninjaString interface with a *ninjaString
concrete struct type. The ninjaString struct is a string and a
pointer to a slice of variable references, for a total of 24 bytes.
ninjaStrings with no variable references (the equivalent of the old
literalNinjaString) have a nil slice, and now use 24 bytes instead
of 32 bytes.
ninjaStrings with variable references allocate a slice of variable
references that contain 32-bit start and end offsets and a Variable
interface, but reuse the original string and so avoid the extra
string headers, resulting in 24 bytes for the slice header, and
24 bytes per variable.
These savings reduce the peak memory usage averaged across 10 runs of
/bin/time -v build/soong/soong_ui.bash --make-mode nothing
on the internal master branch cf_x86_64_phone-userdebug build
from 50114842kB to 45577638kB, a savings of 4537204kB or 9%.
The new Benchmark_parseNinjaString shows savings in both time and
memory. Before:
Benchmark_parseNinjaString/constant/1-128 594251787 2.006 ns/op 0 B/op 0 allocs/op
Benchmark_parseNinjaString/constant/10-128 21191347 65.57 ns/op 16 B/op 1 allocs/op
Benchmark_parseNinjaString/constant/100-128 9983748 130.2 ns/op 112 B/op 1 allocs/op
Benchmark_parseNinjaString/constant/1000-128 2632527 445.1 ns/op 1024 B/op 1 allocs/op
Benchmark_parseNinjaString/variable/1-128 2964896 419.4 ns/op 176 B/op 4 allocs/op
Benchmark_parseNinjaString/variable/10-128 1807341 670.6 ns/op 192 B/op 7 allocs/op
Benchmark_parseNinjaString/variable/100-128 1000000 1092 ns/op 352 B/op 7 allocs/op
Benchmark_parseNinjaString/variable/1000-128 300649 3773 ns/op 1584 B/op 7 allocs/op
Benchmark_parseNinjaString/variables/1-128 2858432 441.6 ns/op 176 B/op 4 allocs/op
Benchmark_parseNinjaString/variables/2-128 2360505 513.4 ns/op 208 B/op 4 allocs/op
Benchmark_parseNinjaString/variables/3-128 1867136 635.6 ns/op 240 B/op 4 allocs/op
Benchmark_parseNinjaString/variables/4-128 1584045 752.1 ns/op 272 B/op 4 allocs/op
Benchmark_parseNinjaString/variables/5-128 1338189 885.8 ns/op 304 B/op 4 allocs/op
Benchmark_parseNinjaString/variables/10-128 1000000 1468 ns/op 464 B/op 4 allocs/op
Benchmark_parseNinjaString/variables/100-128 88768 12895 ns/op 3712 B/op 4 allocs/op
Benchmark_parseNinjaString/variables/1000-128 8972 133627 ns/op 32896 B/op 4 allocs/op
After:
Benchmark_parseNinjaString/constant/1-128 584600864 2.004 ns/op 0 B/op 0 allocs/op
Benchmark_parseNinjaString/constant/10-128 19274581 64.84 ns/op 16 B/op 1 allocs/op
Benchmark_parseNinjaString/constant/100-128 9017640 127.6 ns/op 112 B/op 1 allocs/op
Benchmark_parseNinjaString/constant/1000-128 2630797 453.0 ns/op 1024 B/op 1 allocs/op
Benchmark_parseNinjaString/variable/1-128 3460422 347.0 ns/op 136 B/op 4 allocs/op
Benchmark_parseNinjaString/variable/10-128 2103404 519.9 ns/op 152 B/op 7 allocs/op
Benchmark_parseNinjaString/variable/100-128 1315778 906.5 ns/op 312 B/op 7 allocs/op
Benchmark_parseNinjaString/variable/1000-128 354812 3284 ns/op 1544 B/op 7 allocs/op
Benchmark_parseNinjaString/variables/1-128 3386868 361.5 ns/op 136 B/op 4 allocs/op
Benchmark_parseNinjaString/variables/2-128 2675594 456.9 ns/op 160 B/op 4 allocs/op
Benchmark_parseNinjaString/variables/3-128 2344670 520.0 ns/op 192 B/op 4 allocs/op
Benchmark_parseNinjaString/variables/4-128 1919482 648.1 ns/op 208 B/op 4 allocs/op
Benchmark_parseNinjaString/variables/5-128 1560556 723.9 ns/op 240 B/op 4 allocs/op
Benchmark_parseNinjaString/variables/10-128 1000000 1169 ns/op 352 B/op 4 allocs/op
Benchmark_parseNinjaString/variables/100-128 116738 10168 ns/op 2800 B/op 4 allocs/op
Benchmark_parseNinjaString/variables/1000-128 10000 105646 ns/op 24688 B/op 4 allocs/op
Bug: 286423944
Test: ninja_strings_test.go
Test: out/soong/build*.ninja is the same before and after this change
Change-Id: I1ecffbaccb0d0469a41fa31255c1b17311e01687
2023-06-15 01:14:10 +02:00
|
|
|
func testNinjaStrings(s ...string) []*ninjaString {
|
2021-01-22 03:27:14 +01:00
|
|
|
ret, _ := parseNinjaStrings(nil, s)
|
|
|
|
return ret
|
|
|
|
}
|