6126fe8067
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
462 lines
12 KiB
Go
462 lines
12 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 (
|
|
"errors"
|
|
"fmt"
|
|
"sort"
|
|
"strconv"
|
|
"strings"
|
|
)
|
|
|
|
// A Deps value indicates the dependency file format that Ninja should expect to
|
|
// be output by a compiler.
|
|
type Deps int
|
|
|
|
const (
|
|
DepsNone Deps = iota
|
|
DepsGCC
|
|
DepsMSVC
|
|
)
|
|
|
|
func (d Deps) String() string {
|
|
switch d {
|
|
case DepsNone:
|
|
return "none"
|
|
case DepsGCC:
|
|
return "gcc"
|
|
case DepsMSVC:
|
|
return "msvc"
|
|
default:
|
|
panic(fmt.Sprintf("unknown deps value: %d", d))
|
|
}
|
|
}
|
|
|
|
// A PoolParams object contains the set of parameters that make up a Ninja pool
|
|
// definition.
|
|
type PoolParams struct {
|
|
Comment string // The comment that will appear above the definition.
|
|
Depth int // The Ninja pool depth.
|
|
}
|
|
|
|
// A RuleParams object contains the set of parameters that make up a Ninja rule
|
|
// definition.
|
|
type RuleParams struct {
|
|
// These fields correspond to a Ninja variable of the same name.
|
|
Command string // The command that Ninja will run for the rule.
|
|
Depfile string // The dependency file name.
|
|
Deps Deps // The format of the dependency file.
|
|
Description string // The description that Ninja will print for the rule.
|
|
Generator bool // Whether the rule generates the Ninja manifest file.
|
|
Pool Pool // The Ninja pool to which the rule belongs.
|
|
Restat bool // Whether Ninja should re-stat the rule's outputs.
|
|
Rspfile string // The response file.
|
|
RspfileContent string // The response file content.
|
|
SymlinkOutputs []string // The list of Outputs or ImplicitOutputs that are symlinks.
|
|
|
|
// These fields are used internally in Blueprint
|
|
CommandDeps []string // Command-specific implicit dependencies to prepend to builds
|
|
CommandOrderOnly []string // Command-specific order-only dependencies to prepend to builds
|
|
Comment string // The comment that will appear above the definition.
|
|
}
|
|
|
|
// A BuildParams object contains the set of parameters that make up a Ninja
|
|
// build statement. Each field except for Args corresponds with a part of the
|
|
// Ninja build statement. The Args field contains variable names and values
|
|
// that are set within the build statement's scope in the Ninja file.
|
|
type BuildParams struct {
|
|
Comment string // The comment that will appear above the definition.
|
|
Depfile string // The dependency file name.
|
|
Deps Deps // The format of the dependency file.
|
|
Description string // The description that Ninja will print for the build.
|
|
Rule Rule // The rule to invoke.
|
|
Outputs []string // The list of explicit output targets.
|
|
ImplicitOutputs []string // The list of implicit output targets.
|
|
SymlinkOutputs []string // The list of Outputs or ImplicitOutputs that are symlinks.
|
|
Inputs []string // The list of explicit input dependencies.
|
|
Implicits []string // The list of implicit input dependencies.
|
|
OrderOnly []string // The list of order-only dependencies.
|
|
Validations []string // The list of validations to run when this rule runs.
|
|
Args map[string]string // The variable/value pairs to set.
|
|
Optional bool // Skip outputting a default statement
|
|
}
|
|
|
|
// A poolDef describes a pool definition. It does not include the name of the
|
|
// pool.
|
|
type poolDef struct {
|
|
Comment string
|
|
Depth int
|
|
}
|
|
|
|
func parsePoolParams(scope scope, params *PoolParams) (*poolDef,
|
|
error) {
|
|
|
|
def := &poolDef{
|
|
Comment: params.Comment,
|
|
Depth: params.Depth,
|
|
}
|
|
|
|
return def, nil
|
|
}
|
|
|
|
func (p *poolDef) WriteTo(nw *ninjaWriter, name string) error {
|
|
if p.Comment != "" {
|
|
err := nw.Comment(p.Comment)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
err := nw.Pool(name)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
return nw.ScopedAssign("depth", strconv.Itoa(p.Depth))
|
|
}
|
|
|
|
// A ruleDef describes a rule definition. It does not include the name of the
|
|
// rule.
|
|
type ruleDef struct {
|
|
CommandDeps []*ninjaString
|
|
CommandOrderOnly []*ninjaString
|
|
Comment string
|
|
Pool Pool
|
|
Variables map[string]*ninjaString
|
|
}
|
|
|
|
func parseRuleParams(scope scope, params *RuleParams) (*ruleDef,
|
|
error) {
|
|
|
|
r := &ruleDef{
|
|
Comment: params.Comment,
|
|
Pool: params.Pool,
|
|
Variables: make(map[string]*ninjaString),
|
|
}
|
|
|
|
if params.Command == "" {
|
|
return nil, fmt.Errorf("encountered rule params with no command " +
|
|
"specified")
|
|
}
|
|
|
|
if r.Pool != nil && !scope.IsPoolVisible(r.Pool) {
|
|
return nil, fmt.Errorf("Pool %s is not visible in this scope", r.Pool)
|
|
}
|
|
|
|
value, err := parseNinjaString(scope, params.Command)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error parsing Command param: %s", err)
|
|
}
|
|
r.Variables["command"] = value
|
|
|
|
if params.Depfile != "" {
|
|
value, err = parseNinjaString(scope, params.Depfile)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error parsing Depfile param: %s", err)
|
|
}
|
|
r.Variables["depfile"] = value
|
|
}
|
|
|
|
if params.Deps != DepsNone {
|
|
r.Variables["deps"] = simpleNinjaString(params.Deps.String())
|
|
}
|
|
|
|
if params.Description != "" {
|
|
value, err = parseNinjaString(scope, params.Description)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error parsing Description param: %s", err)
|
|
}
|
|
r.Variables["description"] = value
|
|
}
|
|
|
|
if params.Generator {
|
|
r.Variables["generator"] = simpleNinjaString("true")
|
|
}
|
|
|
|
if params.Restat {
|
|
r.Variables["restat"] = simpleNinjaString("true")
|
|
}
|
|
|
|
if params.Rspfile != "" {
|
|
value, err = parseNinjaString(scope, params.Rspfile)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error parsing Rspfile param: %s", err)
|
|
}
|
|
r.Variables["rspfile"] = value
|
|
}
|
|
|
|
if params.RspfileContent != "" {
|
|
value, err = parseNinjaString(scope, params.RspfileContent)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error parsing RspfileContent param: %s",
|
|
err)
|
|
}
|
|
r.Variables["rspfile_content"] = value
|
|
}
|
|
|
|
if len(params.SymlinkOutputs) > 0 {
|
|
value, err = parseNinjaString(scope, strings.Join(params.SymlinkOutputs, " "))
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error parsing SymlinkOutputs param: %s",
|
|
err)
|
|
}
|
|
r.Variables["symlink_outputs"] = value
|
|
}
|
|
|
|
r.CommandDeps, err = parseNinjaStrings(scope, params.CommandDeps)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error parsing CommandDeps param: %s", err)
|
|
}
|
|
|
|
r.CommandOrderOnly, err = parseNinjaStrings(scope, params.CommandOrderOnly)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error parsing CommandDeps param: %s", err)
|
|
}
|
|
|
|
return r, nil
|
|
}
|
|
|
|
func (r *ruleDef) WriteTo(nw *ninjaWriter, name string,
|
|
pkgNames map[*packageContext]string) error {
|
|
|
|
if r.Comment != "" {
|
|
err := nw.Comment(r.Comment)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
err := nw.Rule(name)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
if r.Pool != nil {
|
|
err = nw.ScopedAssign("pool", r.Pool.fullName(pkgNames))
|
|
if err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
err = writeVariables(nw, r.Variables, pkgNames)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// A buildDef describes a build target definition.
|
|
type buildDef struct {
|
|
Comment string
|
|
Rule Rule
|
|
RuleDef *ruleDef
|
|
Outputs []*ninjaString
|
|
ImplicitOutputs []*ninjaString
|
|
Inputs []*ninjaString
|
|
Implicits []*ninjaString
|
|
OrderOnly []*ninjaString
|
|
Validations []*ninjaString
|
|
Args map[Variable]*ninjaString
|
|
Variables map[string]*ninjaString
|
|
Optional bool
|
|
}
|
|
|
|
func parseBuildParams(scope scope, params *BuildParams) (*buildDef,
|
|
error) {
|
|
|
|
comment := params.Comment
|
|
rule := params.Rule
|
|
|
|
b := &buildDef{
|
|
Comment: comment,
|
|
Rule: rule,
|
|
}
|
|
|
|
setVariable := func(name string, value *ninjaString) {
|
|
if b.Variables == nil {
|
|
b.Variables = make(map[string]*ninjaString)
|
|
}
|
|
b.Variables[name] = value
|
|
}
|
|
|
|
if !scope.IsRuleVisible(rule) {
|
|
return nil, fmt.Errorf("Rule %s is not visible in this scope", rule)
|
|
}
|
|
|
|
if len(params.Outputs) == 0 {
|
|
return nil, errors.New("Outputs param has no elements")
|
|
}
|
|
|
|
var err error
|
|
b.Outputs, err = parseNinjaStrings(scope, params.Outputs)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error parsing Outputs param: %s", err)
|
|
}
|
|
|
|
b.ImplicitOutputs, err = parseNinjaStrings(scope, params.ImplicitOutputs)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error parsing ImplicitOutputs param: %s", err)
|
|
}
|
|
|
|
b.Inputs, err = parseNinjaStrings(scope, params.Inputs)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error parsing Inputs param: %s", err)
|
|
}
|
|
|
|
b.Implicits, err = parseNinjaStrings(scope, params.Implicits)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error parsing Implicits param: %s", err)
|
|
}
|
|
|
|
b.OrderOnly, err = parseNinjaStrings(scope, params.OrderOnly)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error parsing OrderOnly param: %s", err)
|
|
}
|
|
|
|
b.Validations, err = parseNinjaStrings(scope, params.Validations)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error parsing Validations param: %s", err)
|
|
}
|
|
|
|
b.Optional = params.Optional
|
|
|
|
if params.Depfile != "" {
|
|
value, err := parseNinjaString(scope, params.Depfile)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error parsing Depfile param: %s", err)
|
|
}
|
|
setVariable("depfile", value)
|
|
}
|
|
|
|
if params.Deps != DepsNone {
|
|
setVariable("deps", simpleNinjaString(params.Deps.String()))
|
|
}
|
|
|
|
if params.Description != "" {
|
|
value, err := parseNinjaString(scope, params.Description)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error parsing Description param: %s", err)
|
|
}
|
|
setVariable("description", value)
|
|
}
|
|
|
|
if len(params.SymlinkOutputs) > 0 {
|
|
setVariable(
|
|
"symlink_outputs",
|
|
simpleNinjaString(strings.Join(params.SymlinkOutputs, " ")))
|
|
}
|
|
|
|
argNameScope := rule.scope()
|
|
|
|
if len(params.Args) > 0 {
|
|
b.Args = make(map[Variable]*ninjaString)
|
|
for name, value := range params.Args {
|
|
if !rule.isArg(name) {
|
|
return nil, fmt.Errorf("unknown argument %q", name)
|
|
}
|
|
|
|
argVar, err := argNameScope.LookupVariable(name)
|
|
if err != nil {
|
|
// This shouldn't happen.
|
|
return nil, fmt.Errorf("argument lookup error: %s", err)
|
|
}
|
|
|
|
ninjaValue, err := parseNinjaString(scope, value)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error parsing variable %q: %s", name,
|
|
err)
|
|
}
|
|
|
|
b.Args[argVar] = ninjaValue
|
|
}
|
|
}
|
|
|
|
return b, nil
|
|
}
|
|
|
|
func (b *buildDef) WriteTo(nw *ninjaWriter, pkgNames map[*packageContext]string) error {
|
|
var (
|
|
comment = b.Comment
|
|
rule = b.Rule.fullName(pkgNames)
|
|
outputs = b.Outputs
|
|
implicitOuts = b.ImplicitOutputs
|
|
explicitDeps = b.Inputs
|
|
implicitDeps = b.Implicits
|
|
orderOnlyDeps = b.OrderOnly
|
|
validations = b.Validations
|
|
)
|
|
|
|
if b.RuleDef != nil {
|
|
implicitDeps = append(b.RuleDef.CommandDeps, implicitDeps...)
|
|
orderOnlyDeps = append(b.RuleDef.CommandOrderOnly, orderOnlyDeps...)
|
|
}
|
|
|
|
err := nw.Build(comment, rule, outputs, implicitOuts, explicitDeps, implicitDeps, orderOnlyDeps, validations, pkgNames)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
err = writeVariables(nw, b.Variables, pkgNames)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
type nameValuePair struct {
|
|
name, value string
|
|
}
|
|
|
|
args := make([]nameValuePair, 0, len(b.Args))
|
|
|
|
for argVar, value := range b.Args {
|
|
fullName := argVar.fullName(pkgNames)
|
|
args = append(args, nameValuePair{fullName, value.Value(pkgNames)})
|
|
}
|
|
sort.Slice(args, func(i, j int) bool { return args[i].name < args[j].name })
|
|
|
|
for _, pair := range args {
|
|
err = nw.ScopedAssign(pair.name, pair.value)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
if !b.Optional {
|
|
err = nw.Default(pkgNames, outputs...)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
return nw.BlankLine()
|
|
}
|
|
|
|
func writeVariables(nw *ninjaWriter, variables map[string]*ninjaString,
|
|
pkgNames map[*packageContext]string) error {
|
|
var keys []string
|
|
for k := range variables {
|
|
keys = append(keys, k)
|
|
}
|
|
sort.Strings(keys)
|
|
|
|
for _, name := range keys {
|
|
err := nw.ScopedAssign(name, variables[name].Value(pkgNames))
|
|
if err != nil {
|
|
return err
|
|
}
|
|
}
|
|
return nil
|
|
}
|