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
422 lines
9.9 KiB
Go
422 lines
9.9 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 (
|
|
"fmt"
|
|
"strings"
|
|
"unicode"
|
|
"unicode/utf8"
|
|
)
|
|
|
|
// A Variable represents a global Ninja variable definition that will be written
|
|
// to the output .ninja file. A variable may contain references to other global
|
|
// Ninja variables, but circular variable references are not allowed.
|
|
type Variable interface {
|
|
packageContext() *packageContext
|
|
name() string // "foo"
|
|
fullName(pkgNames map[*packageContext]string) string // "pkg.foo" or "path.to.pkg.foo"
|
|
memoizeFullName(pkgNames map[*packageContext]string) // precompute fullName if desired
|
|
value(ctx VariableFuncContext, config interface{}) (*ninjaString, error)
|
|
String() string
|
|
}
|
|
|
|
// A Pool represents a Ninja pool that will be written to the output .ninja
|
|
// file.
|
|
type Pool interface {
|
|
packageContext() *packageContext
|
|
name() string // "foo"
|
|
fullName(pkgNames map[*packageContext]string) string // "pkg.foo" or "path.to.pkg.foo"
|
|
memoizeFullName(pkgNames map[*packageContext]string) // precompute fullName if desired
|
|
def(config interface{}) (*poolDef, error)
|
|
String() string
|
|
}
|
|
|
|
// A Rule represents a Ninja build rule that will be written to the output
|
|
// .ninja file.
|
|
type Rule interface {
|
|
packageContext() *packageContext
|
|
name() string // "foo"
|
|
fullName(pkgNames map[*packageContext]string) string // "pkg.foo" or "path.to.pkg.foo"
|
|
memoizeFullName(pkgNames map[*packageContext]string) // precompute fullName if desired
|
|
def(config interface{}) (*ruleDef, error)
|
|
scope() *basicScope
|
|
isArg(argName string) bool
|
|
String() string
|
|
}
|
|
|
|
type basicScope struct {
|
|
parent *basicScope
|
|
variables map[string]Variable
|
|
pools map[string]Pool
|
|
rules map[string]Rule
|
|
imports map[string]*basicScope
|
|
}
|
|
|
|
func newScope(parent *basicScope) *basicScope {
|
|
return &basicScope{
|
|
parent: parent,
|
|
variables: make(map[string]Variable),
|
|
pools: make(map[string]Pool),
|
|
rules: make(map[string]Rule),
|
|
imports: make(map[string]*basicScope),
|
|
}
|
|
}
|
|
|
|
func makeRuleScope(parent *basicScope, argNames map[string]bool) *basicScope {
|
|
scope := newScope(parent)
|
|
for argName := range argNames {
|
|
_, err := scope.LookupVariable(argName)
|
|
if err != nil {
|
|
arg := &argVariable{argName}
|
|
err = scope.AddVariable(arg)
|
|
if err != nil {
|
|
// This should not happen. We should have already checked that
|
|
// the name is valid and that the scope doesn't have a variable
|
|
// with this name.
|
|
panic(err)
|
|
}
|
|
}
|
|
}
|
|
|
|
// We treat built-in variables like arguments for the purpose of this scope.
|
|
for _, builtin := range builtinRuleArgs {
|
|
arg := &argVariable{builtin}
|
|
err := scope.AddVariable(arg)
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
}
|
|
|
|
return scope
|
|
}
|
|
|
|
func (s *basicScope) LookupVariable(name string) (Variable, error) {
|
|
dotIndex := strings.IndexRune(name, '.')
|
|
if dotIndex >= 0 {
|
|
// The variable name looks like "pkg.var"
|
|
if dotIndex+1 == len(name) {
|
|
return nil, fmt.Errorf("variable name %q ends with a '.'", name)
|
|
}
|
|
if strings.ContainsRune(name[dotIndex+1:], '.') {
|
|
return nil, fmt.Errorf("variable name %q contains multiple '.' "+
|
|
"characters", name)
|
|
}
|
|
|
|
pkgName := name[:dotIndex]
|
|
varName := name[dotIndex+1:]
|
|
|
|
first, _ := utf8.DecodeRuneInString(varName)
|
|
if !unicode.IsUpper(first) {
|
|
return nil, fmt.Errorf("cannot refer to unexported name %q", name)
|
|
}
|
|
|
|
importedScope, err := s.lookupImportedScope(pkgName)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
v, ok := importedScope.variables[varName]
|
|
if !ok {
|
|
return nil, fmt.Errorf("package %q does not contain variable %q",
|
|
pkgName, varName)
|
|
}
|
|
|
|
return v, nil
|
|
} else {
|
|
// The variable name has no package part; just "var"
|
|
for ; s != nil; s = s.parent {
|
|
v, ok := s.variables[name]
|
|
if ok {
|
|
return v, nil
|
|
}
|
|
}
|
|
return nil, fmt.Errorf("undefined variable %q", name)
|
|
}
|
|
}
|
|
|
|
func (s *basicScope) IsRuleVisible(rule Rule) bool {
|
|
_, isBuiltin := rule.(*builtinRule)
|
|
if isBuiltin {
|
|
return true
|
|
}
|
|
|
|
name := rule.name()
|
|
|
|
for s != nil {
|
|
if s.rules[name] == rule {
|
|
return true
|
|
}
|
|
|
|
for _, import_ := range s.imports {
|
|
if import_.rules[name] == rule {
|
|
return true
|
|
}
|
|
}
|
|
|
|
s = s.parent
|
|
}
|
|
|
|
return false
|
|
}
|
|
|
|
func (s *basicScope) IsPoolVisible(pool Pool) bool {
|
|
_, isBuiltin := pool.(*builtinPool)
|
|
if isBuiltin {
|
|
return true
|
|
}
|
|
|
|
name := pool.name()
|
|
|
|
for s != nil {
|
|
if s.pools[name] == pool {
|
|
return true
|
|
}
|
|
|
|
for _, import_ := range s.imports {
|
|
if import_.pools[name] == pool {
|
|
return true
|
|
}
|
|
}
|
|
|
|
s = s.parent
|
|
}
|
|
|
|
return false
|
|
}
|
|
|
|
func (s *basicScope) lookupImportedScope(pkgName string) (*basicScope, error) {
|
|
for ; s != nil; s = s.parent {
|
|
importedScope, ok := s.imports[pkgName]
|
|
if ok {
|
|
return importedScope, nil
|
|
}
|
|
}
|
|
return nil, fmt.Errorf("unknown imported package %q (missing call to "+
|
|
"blueprint.Import()?)", pkgName)
|
|
}
|
|
|
|
func (s *basicScope) AddImport(name string, importedScope *basicScope) error {
|
|
_, present := s.imports[name]
|
|
if present {
|
|
return fmt.Errorf("import %q is already defined in this scope", name)
|
|
}
|
|
s.imports[name] = importedScope
|
|
return nil
|
|
}
|
|
|
|
func (s *basicScope) AddVariable(v Variable) error {
|
|
name := v.name()
|
|
_, present := s.variables[name]
|
|
if present {
|
|
return fmt.Errorf("variable %q is already defined in this scope", name)
|
|
}
|
|
s.variables[name] = v
|
|
return nil
|
|
}
|
|
|
|
func (s *basicScope) AddPool(p Pool) error {
|
|
name := p.name()
|
|
_, present := s.pools[name]
|
|
if present {
|
|
return fmt.Errorf("pool %q is already defined in this scope", name)
|
|
}
|
|
s.pools[name] = p
|
|
return nil
|
|
}
|
|
|
|
func (s *basicScope) AddRule(r Rule) error {
|
|
name := r.name()
|
|
_, present := s.rules[name]
|
|
if present {
|
|
return fmt.Errorf("rule %q is already defined in this scope", name)
|
|
}
|
|
s.rules[name] = r
|
|
return nil
|
|
}
|
|
|
|
type localScope struct {
|
|
namePrefix string
|
|
scope *basicScope
|
|
}
|
|
|
|
func newLocalScope(parent *basicScope, namePrefix string) *localScope {
|
|
return &localScope{
|
|
namePrefix: namePrefix,
|
|
scope: newScope(parent),
|
|
}
|
|
}
|
|
|
|
// ReparentTo sets the localScope's parent scope to the scope of the given
|
|
// package context. This allows a ModuleContext and SingletonContext to call
|
|
// a function defined in a different Go package and have that function retain
|
|
// access to all of the package-scoped variables of its own package.
|
|
func (s *localScope) ReparentTo(pctx PackageContext) {
|
|
s.scope.parent = pctx.getScope()
|
|
}
|
|
|
|
func (s *localScope) LookupVariable(name string) (Variable, error) {
|
|
return s.scope.LookupVariable(name)
|
|
}
|
|
|
|
func (s *localScope) IsRuleVisible(rule Rule) bool {
|
|
return s.scope.IsRuleVisible(rule)
|
|
}
|
|
|
|
func (s *localScope) IsPoolVisible(pool Pool) bool {
|
|
return s.scope.IsPoolVisible(pool)
|
|
}
|
|
|
|
func (s *localScope) AddLocalVariable(name, value string) (*localVariable,
|
|
error) {
|
|
|
|
err := validateNinjaName(name)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
if strings.ContainsRune(name, '.') {
|
|
return nil, fmt.Errorf("local variable name %q contains '.'", name)
|
|
}
|
|
|
|
ninjaValue, err := parseNinjaString(s.scope, value)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
v := &localVariable{
|
|
fullName_: s.namePrefix + name,
|
|
name_: name,
|
|
value_: ninjaValue,
|
|
}
|
|
|
|
err = s.scope.AddVariable(v)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return v, nil
|
|
}
|
|
|
|
func (s *localScope) AddLocalRule(name string, params *RuleParams,
|
|
argNames ...string) (*localRule, error) {
|
|
|
|
err := validateNinjaName(name)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
err = validateArgNames(argNames)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("invalid argument name: %s", err)
|
|
}
|
|
|
|
argNamesSet := make(map[string]bool)
|
|
for _, argName := range argNames {
|
|
argNamesSet[argName] = true
|
|
}
|
|
|
|
ruleScope := makeRuleScope(s.scope, argNamesSet)
|
|
|
|
def, err := parseRuleParams(ruleScope, params)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
r := &localRule{
|
|
fullName_: s.namePrefix + name,
|
|
name_: name,
|
|
def_: def,
|
|
argNames: argNamesSet,
|
|
scope_: ruleScope,
|
|
}
|
|
|
|
err = s.scope.AddRule(r)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return r, nil
|
|
}
|
|
|
|
type localVariable struct {
|
|
fullName_ string
|
|
name_ string
|
|
value_ *ninjaString
|
|
}
|
|
|
|
func (l *localVariable) packageContext() *packageContext {
|
|
return nil
|
|
}
|
|
|
|
func (l *localVariable) name() string {
|
|
return l.name_
|
|
}
|
|
|
|
func (l *localVariable) fullName(pkgNames map[*packageContext]string) string {
|
|
return l.fullName_
|
|
}
|
|
|
|
func (l *localVariable) memoizeFullName(pkgNames map[*packageContext]string) {
|
|
// Nothing to do, full name is known at initialization.
|
|
}
|
|
|
|
func (l *localVariable) value(VariableFuncContext, interface{}) (*ninjaString, error) {
|
|
return l.value_, nil
|
|
}
|
|
|
|
func (l *localVariable) String() string {
|
|
return "<local var>:" + l.fullName_
|
|
}
|
|
|
|
type localRule struct {
|
|
fullName_ string
|
|
name_ string
|
|
def_ *ruleDef
|
|
argNames map[string]bool
|
|
scope_ *basicScope
|
|
}
|
|
|
|
func (l *localRule) packageContext() *packageContext {
|
|
return nil
|
|
}
|
|
|
|
func (l *localRule) name() string {
|
|
return l.name_
|
|
}
|
|
|
|
func (l *localRule) fullName(pkgNames map[*packageContext]string) string {
|
|
return l.fullName_
|
|
}
|
|
|
|
func (l *localRule) memoizeFullName(pkgNames map[*packageContext]string) {
|
|
// Nothing to do, full name is known at initialization.
|
|
}
|
|
|
|
func (l *localRule) def(interface{}) (*ruleDef, error) {
|
|
return l.def_, nil
|
|
}
|
|
|
|
func (r *localRule) scope() *basicScope {
|
|
return r.scope_
|
|
}
|
|
|
|
func (r *localRule) isArg(argName string) bool {
|
|
return r.argNames[argName]
|
|
}
|
|
|
|
func (r *localRule) String() string {
|
|
return "<local rule>:" + r.fullName_
|
|
}
|