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

NINJA_LOG option uses usesninjalogasweightlist

Browse Source 
As-is: Even with NINJA_LOG option, ninja weight list is copied from
ninja log
To-be: uses usesninjalogasweightlist to uses ninja log file directly

If weight list is large(more than 100,000 lines), reading the whole list
spends a few seconds(1-3s). It is ignorable in full build, but it might
be considerable in small build or m nothing scenario.

If weight list comes from ninja log, we can just directly read ninja log
data instead of writing weight list from ninja log outside, and read the
weight list. It doesn't spend additional time because ninja log is
loaded by default.

Bug: 271527305
Test: build with NINJA_LOG
Change-Id: Id7a4cca95898ce439d0a682f9bfd954b462f1849
This commit is contained in:
Jeongik Cha
2023-05-20 00:49:39 +09:00
parent 5050a55b18
commit d55347133f
1 changed files with 1 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
ui/build/ninja.go
View File

@@ -35,48 +35,6 @@ const (
ninjaWeightListFileName = ".ninja_weight_list"
)
func useNinjaBuildLog(ctx Context, config Config, cmd *Cmd) {
ninjaLogFile := filepath.Join(config.OutDir(), ninjaLogFileName)
data, err := os.ReadFile(ninjaLogFile)
var outputBuilder strings.Builder
if err == nil {
lines := strings.Split(strings.TrimSpace(string(data)), "\n")
// ninja log: <start> <end> <restat> <name> <cmdhash>
// ninja weight list: <name>,<end-start+1>
for _, line := range lines {
if strings.HasPrefix(line, "#") {
continue
}
fields := strings.Split(line, "\t")
path := fields[3]
start, err := strconv.Atoi(fields[0])
if err != nil {
continue
}
end, err := strconv.Atoi(fields[1])
if err != nil {
continue
}
outputBuilder.WriteString(path)
outputBuilder.WriteString(",")
outputBuilder.WriteString(strconv.Itoa(end-start+1) + "\n")
}
} else {
// If there is no ninja log file, just pass empty ninja weight list.
// Because it is still efficient with critical path calculation logic even without weight.
ctx.Verbosef("There is an error during reading ninja log, so ninja will use empty weight list: %s", err)
}
weightListFile := filepath.Join(config.OutDir(), ninjaWeightListFileName)
err = os.WriteFile(weightListFile, []byte(outputBuilder.String()), 0644)
if err == nil {
cmd.Args = append(cmd.Args, "-o", "usesweightlist="+weightListFile)
} else {
ctx.Panicf("Could not write ninja weight list file %s", err)
}
}
// Constructs and runs the Ninja command line with a restricted set of
// environment variables. It's important to restrict the environment Ninja runs
// for hermeticity reasons, and to avoid spurious rebuilds.
@@ -131,7 +89,7 @@ func runNinjaForBuild(ctx Context, config Config) {
switch config.NinjaWeightListSource() {
case NINJA_LOG:
useNinjaBuildLog(ctx, config, cmd)
cmd.Args = append(cmd.Args, "-o", "usesninjalogasweightlist=yes")
case EVENLY_DISTRIBUTED:
// pass empty weight list means ninja considers every tasks's weight as 1(default value).
cmd.Args = append(cmd.Args, "-o", "usesweightlist=/dev/null")