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

Merge "Use rsp files to pass turbine inputs to RBE" into main

Browse Source
This commit is contained in:
Colin Cross
2024-08-16 20:18:09 +00:00
committed by Gerrit Code Review
parent dd00f2de3c 2fcc48e4a3
commit f330b3dc77
1 changed files with 54 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
java/builder.go
View File

@@ -156,7 +156,7 @@ var (
turbine, turbineRE = pctx.RemoteStaticRules("turbine", turbine, turbineRE = pctx.RemoteStaticRules("turbine",
blueprint.RuleParams{ blueprint.RuleParams{
Command: `$reTemplate${config.JavaCmd} ${config.JavaVmFlags} -jar ${config.TurbineJar} $outputFlags ` + Command: `$reTemplate${config.JavaCmd} ${config.JavaVmFlags} -jar ${config.TurbineJar} $outputFlags ` +
`--sources @$out.rsp --source_jars $srcJars ` + `--sources @$out.rsp ` +
`--javacopts ${config.CommonJdkFlags} ` + `--javacopts ${config.CommonJdkFlags} ` +
`$javacFlags -source $javaVersion -target $javaVersion -- $turbineFlags && ` + `$javacFlags -source $javaVersion -target $javaVersion -- $turbineFlags && ` +
`(for o in $outputs; do if cmp -s $${o}.tmp $${o} ; then rm $${o}.tmp ; else mv $${o}.tmp $${o} ; fi; done )`, `(for o in $outputs; do if cmp -s $${o}.tmp $${o} ; then rm $${o}.tmp ; else mv $${o}.tmp $${o} ; fi; done )`,
@@ -170,13 +170,13 @@ var (
}, },
&remoteexec.REParams{Labels: map[string]string{"type": "tool", "name": "turbine"}, &remoteexec.REParams{Labels: map[string]string{"type": "tool", "name": "turbine"},
ExecStrategy: "${config.RETurbineExecStrategy}", ExecStrategy: "${config.RETurbineExecStrategy}",
Inputs: []string{"${config.TurbineJar}", "${out}.rsp", "$implicits"}, Inputs: []string{"${config.TurbineJar}", "${out}.rsp", "$rbeInputs"},
RSPFiles: []string{"${out}.rsp"}, RSPFiles: []string{"$out.rsp", "$rspFiles"},
OutputFiles: []string{"$rbeOutputs"}, OutputFiles: []string{"$rbeOutputs"},
ToolchainInputs: []string{"${config.JavaCmd}"}, ToolchainInputs: []string{"${config.JavaCmd}"},
Platform: map[string]string{remoteexec.PoolKey: "${config.REJavaPool}"}, Platform: map[string]string{remoteexec.PoolKey: "${config.REJavaPool}"},
}, },
[]string{"javacFlags", "turbineFlags", "outputFlags", "javaVersion", "outputs", "rbeOutputs", "srcJars"}, []string{"implicits"}) []string{"javacFlags", "turbineFlags", "outputFlags", "javaVersion", "outputs", "rbeOutputs"}, []string{"rbeInputs", "rspFiles"})
jar, jarRE = pctx.RemoteStaticRules("jar", jar, jarRE = pctx.RemoteStaticRules("jar",
blueprint.RuleParams{ blueprint.RuleParams{
@@ -428,53 +428,72 @@ func emitXrefRule(ctx android.ModuleContext, xrefFile android.WritablePath, idx
}) })
} }
func turbineFlags(ctx android.ModuleContext, flags javaBuilderFlags, dir string) (string, android.Paths) { func turbineFlags(ctx android.ModuleContext, flags javaBuilderFlags, dir string, srcJars android.Paths) (string, android.Paths, android.Paths, android.Paths) {
var deps android.Paths var implicits android.Paths
var rbeInputs android.Paths
var rspFiles android.Paths
classpath := flags.classpath classpath := flags.classpath
var bootClasspath string srcJarArgs := strings.Join(srcJars.Strings(), " ")
implicits = append(implicits, srcJars...)
const srcJarArgsLimit = 32 * 1024
if len(srcJarArgs) > srcJarArgsLimit {
srcJarRspFile := android.PathForModuleOut(ctx, "turbine", "srcjars.rsp")
android.WriteFileRule(ctx, srcJarRspFile, srcJarArgs)
srcJarArgs = "@" + srcJarRspFile.String()
implicits = append(implicits, srcJarRspFile)
rbeInputs = append(rbeInputs, srcJarRspFile)
} else {
rbeInputs = append(rbeInputs, srcJars...)
}
var bootClasspathFlags string
if flags.javaVersion.usesJavaModules() { if flags.javaVersion.usesJavaModules() {
var systemModuleDeps android.Paths var systemModuleDeps android.Paths
bootClasspath, systemModuleDeps = flags.systemModules.FormTurbineSystemModulesPath(ctx.Device()) bootClasspathFlags, systemModuleDeps = flags.systemModules.FormTurbineSystemModulesPath(ctx.Device())
deps = append(deps, systemModuleDeps...) implicits = append(implicits, systemModuleDeps...)
rbeInputs = append(rbeInputs, systemModuleDeps...)
classpath = append(flags.java9Classpath, classpath...) classpath = append(flags.java9Classpath, classpath...)
} else { } else {
deps = append(deps, flags.bootClasspath...) implicits = append(implicits, flags.bootClasspath...)
rbeInputs = append(rbeInputs, flags.bootClasspath...)
if len(flags.bootClasspath) == 0 && ctx.Device() { if len(flags.bootClasspath) == 0 && ctx.Device() {
// explicitly specify -bootclasspath "" if the bootclasspath is empty to // explicitly specify -bootclasspath "" if the bootclasspath is empty to
// ensure turbine does not fall back to the default bootclasspath. // ensure turbine does not fall back to the default bootclasspath.
bootClasspath = `--bootclasspath ""` bootClasspathFlags = `--bootclasspath ""`
} else { } else {
bootClasspath = flags.bootClasspath.FormTurbineClassPath("--bootclasspath ") bootClasspathFlags = flags.bootClasspath.FormTurbineClassPath("--bootclasspath ")
} }
} }
deps = append(deps, classpath...) classpathFlags := classpath.FormTurbineClassPath("")
turbineFlags := bootClasspath + " " + classpath.FormTurbineClassPath("--classpath ") implicits = append(implicits, classpath...)
const classpathLimit = 32 * 1024
const flagsLimit = 32 * 1024 if len(classpathFlags) > classpathLimit {
if len(turbineFlags) > flagsLimit { classpathRspFile := android.PathForModuleOut(ctx, dir, "classpath.rsp")
flagsRspFile := android.PathForModuleOut(ctx, dir, "turbine-flags.rsp") android.WriteFileRule(ctx, classpathRspFile, classpathFlags)
android.WriteFileRule(ctx, flagsRspFile, turbineFlags) classpathFlags = "@" + classpathRspFile.String()
turbineFlags = "@" + flagsRspFile.String() implicits = append(implicits, classpathRspFile)
deps = append(deps, flagsRspFile) rspFiles = append(rspFiles, classpathRspFile)
rbeInputs = append(rbeInputs, classpathRspFile)
} else {
rbeInputs = append(rbeInputs, classpath...)
} }
return turbineFlags, deps turbineFlags := "--source_jars " + srcJarArgs + " " + bootClasspathFlags + " --classpath " + classpathFlags
return turbineFlags, implicits, rbeInputs, rspFiles
} }
func TransformJavaToHeaderClasses(ctx android.ModuleContext, outputFile android.WritablePath, func TransformJavaToHeaderClasses(ctx android.ModuleContext, outputFile android.WritablePath,
srcFiles, srcJars android.Paths, flags javaBuilderFlags) { srcFiles, srcJars android.Paths, flags javaBuilderFlags) {
turbineFlags, deps := turbineFlags(ctx, flags, "turbine") turbineFlags, implicits, rbeInputs, rspFiles := turbineFlags(ctx, flags, "turbine", srcJars)
deps = append(deps, srcJars...)
rule := turbine rule := turbine
args := map[string]string{ args := map[string]string{
"javacFlags": flags.javacFlags, "javacFlags": flags.javacFlags,
"srcJars": strings.Join(srcJars.Strings(), " "),
"javaVersion": flags.javaVersion.String(), "javaVersion": flags.javaVersion.String(),
"turbineFlags": turbineFlags, "turbineFlags": turbineFlags,
"outputFlags": "--output " + outputFile.String() + ".tmp", "outputFlags": "--output " + outputFile.String() + ".tmp",
@@ -482,15 +501,16 @@ func TransformJavaToHeaderClasses(ctx android.ModuleContext, outputFile android.
} }
if ctx.Config().UseRBE() && ctx.Config().IsEnvTrue("RBE_TURBINE") { if ctx.Config().UseRBE() && ctx.Config().IsEnvTrue("RBE_TURBINE") {
rule = turbineRE rule = turbineRE
args["implicits"] = strings.Join(deps.Strings(), ",") args["rbeInputs"] = strings.Join(rbeInputs.Strings(), ",")
args["rbeOutputs"] = outputFile.String() + ".tmp" args["rbeOutputs"] = outputFile.String() + ".tmp"
args["rspFiles"] = strings.Join(rspFiles.Strings(), ",")
} }
ctx.Build(pctx, android.BuildParams{ ctx.Build(pctx, android.BuildParams{
Rule: rule, Rule: rule,
Description: "turbine", Description: "turbine",
Output: outputFile, Output: outputFile,
Inputs: srcFiles, Inputs: srcFiles,
Implicits: deps, Implicits: implicits,
Args: args, Args: args,
}) })
} }
@@ -499,11 +519,10 @@ func TransformJavaToHeaderClasses(ctx android.ModuleContext, outputFile android.
func TurbineApt(ctx android.ModuleContext, outputSrcJar, outputResJar android.WritablePath, func TurbineApt(ctx android.ModuleContext, outputSrcJar, outputResJar android.WritablePath,
srcFiles, srcJars android.Paths, flags javaBuilderFlags) { srcFiles, srcJars android.Paths, flags javaBuilderFlags) {
turbineFlags, deps := turbineFlags(ctx, flags, "kapt") turbineFlags, implicits, rbeInputs, rspFiles := turbineFlags(ctx, flags, "turbine-apt", srcJars)
deps = append(deps, srcJars...) implicits = append(implicits, flags.processorPath...)
rbeInputs = append(rbeInputs, flags.processorPath...)
deps = append(deps, flags.processorPath...)
turbineFlags += " " + flags.processorPath.FormTurbineClassPath("--processorpath ") turbineFlags += " " + flags.processorPath.FormTurbineClassPath("--processorpath ")
turbineFlags += " --processors " + strings.Join(flags.processors, " ") turbineFlags += " --processors " + strings.Join(flags.processors, " ")
@@ -514,7 +533,6 @@ func TurbineApt(ctx android.ModuleContext, outputSrcJar, outputResJar android.Wr
rule := turbine rule := turbine
args := map[string]string{ args := map[string]string{
"javacFlags": flags.javacFlags, "javacFlags": flags.javacFlags,
"srcJars": strings.Join(srcJars.Strings(), " "),
"javaVersion": flags.javaVersion.String(), "javaVersion": flags.javaVersion.String(),
"turbineFlags": turbineFlags, "turbineFlags": turbineFlags,
"outputFlags": outputFlags, "outputFlags": outputFlags,
@@ -522,8 +540,9 @@ func TurbineApt(ctx android.ModuleContext, outputSrcJar, outputResJar android.Wr
} }
if ctx.Config().UseRBE() && ctx.Config().IsEnvTrue("RBE_TURBINE") { if ctx.Config().UseRBE() && ctx.Config().IsEnvTrue("RBE_TURBINE") {
rule = turbineRE rule = turbineRE
args["implicits"] = strings.Join(deps.Strings(), ",") args["rbeInputs"] = strings.Join(rbeInputs.Strings(), ",")
args["rbeOutputs"] = outputSrcJar.String() + ".tmp," + outputResJar.String() + ".tmp" args["rbeOutputs"] = outputSrcJar.String() + ".tmp," + outputResJar.String() + ".tmp"
args["rspFiles"] = strings.Join(rspFiles.Strings(), ",")
} }
ctx.Build(pctx, android.BuildParams{ ctx.Build(pctx, android.BuildParams{
Rule: rule, Rule: rule,
@@ -531,7 +550,7 @@ func TurbineApt(ctx android.ModuleContext, outputSrcJar, outputResJar android.Wr
Output: outputs[0], Output: outputs[0],
ImplicitOutputs: outputs[1:], ImplicitOutputs: outputs[1:],
Inputs: srcFiles, Inputs: srcFiles,
Implicits: deps, Implicits: implicits,
Args: args, Args: args,
}) })
} }