StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove SourcePath.srcDir

Browse Source 
This was always set to "." after aosp/1652613 and
aosp/1796650. While doing some rudimentary performance
profiling of soong, it turned out that SourcePath.String()
was taking 600+MB of memory joining the "." to the rest
of the path. Remove it for performance gains.

Bug: 262629589
Test: Verfied ninja files didn't change with this cl on aosp_arm64-userdebug
Change-Id: Id6b552ab8defe37e0c2b58e813fb1dbae427ae96
This commit is contained in:
Cole Faust
2023-01-09 14:35:27 -08:00
parent 64b0fbd151
commit 483d1f7a6b
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
android/paths.go
View File

@@ -1033,9 +1033,6 @@ func (p basePath) withRel(rel string) basePath {
// SourcePath is a Path representing a file path rooted from SrcDir // SourcePath is a Path representing a file path rooted from SrcDir
type SourcePath struct { type SourcePath struct {
basePath basePath
// The sources root, i.e. Config.SrcDir()
srcDir string
} }
func (p SourcePath) RelativeToTop() Path { func (p SourcePath) RelativeToTop() Path {
@@ -1054,7 +1051,7 @@ func (p SourcePath) withRel(rel string) SourcePath {
// code that is embedding ninja variables in paths // code that is embedding ninja variables in paths
func safePathForSource(ctx PathContext, pathComponents ...string) (SourcePath, error) { func safePathForSource(ctx PathContext, pathComponents ...string) (SourcePath, error) {
p, err := validateSafePath(pathComponents...) p, err := validateSafePath(pathComponents...)
ret := SourcePath{basePath{p, ""}, "."} ret := SourcePath{basePath{p, ""}}
if err != nil { if err != nil {
return ret, err return ret, err
} }
@@ -1071,7 +1068,7 @@ func safePathForSource(ctx PathContext, pathComponents ...string) (SourcePath, e
// pathForSource creates a SourcePath from pathComponents, but does not check that it exists. // pathForSource creates a SourcePath from pathComponents, but does not check that it exists.
func pathForSource(ctx PathContext, pathComponents ...string) (SourcePath, error) { func pathForSource(ctx PathContext, pathComponents ...string) (SourcePath, error) {
p, err := validatePath(pathComponents...) p, err := validatePath(pathComponents...)
ret := SourcePath{basePath{p, ""}, "."} ret := SourcePath{basePath{p, ""}}
if err != nil { if err != nil {
return ret, err return ret, err
} }
@@ -1174,7 +1171,10 @@ func ExistentPathForSource(ctx PathGlobContext, pathComponents ...string) Option
} }
func (p SourcePath) String() string { func (p SourcePath) String() string {
return filepath.Join(p.srcDir, p.path) if p.path == "" {
return "."
}
return p.path
} }
// Join creates a new SourcePath with paths... joined with the current path. The // Join creates a new SourcePath with paths... joined with the current path. The
@@ -1207,7 +1207,7 @@ func (p SourcePath) OverlayPath(ctx ModuleMissingDepsPathContext, path Path) Opt
// No need to put the error message into the returned path since it has been reported already. // No need to put the error message into the returned path since it has been reported already.
return OptionalPath{} return OptionalPath{}
} }
dir := filepath.Join(p.srcDir, p.path, relDir) dir := filepath.Join(p.path, relDir)
// Use Glob so that we are run again if the directory is added. // Use Glob so that we are run again if the directory is added.
if pathtools.IsGlob(dir) { if pathtools.IsGlob(dir) {
ReportPathErrorf(ctx, "Path may not contain a glob: %s", dir) ReportPathErrorf(ctx, "Path may not contain a glob: %s", dir)
@@ -1220,8 +1220,7 @@ func (p SourcePath) OverlayPath(ctx ModuleMissingDepsPathContext, path Path) Opt
if len(paths) == 0 { if len(paths) == 0 {
return InvalidOptionalPath(dir + " does not exist") return InvalidOptionalPath(dir + " does not exist")
} }
relPath := Rel(ctx, p.srcDir, paths[0]) return OptionalPathForPath(PathForSource(ctx, paths[0]))
return OptionalPathForPath(PathForSource(ctx, relPath))
} }
// OutputPath is a Path representing an intermediates file path rooted from the build directory // OutputPath is a Path representing an intermediates file path rooted from the build directory