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

Merge "Only enable MLGO for ARM64 ThinLTO targets" into main am: 6a8eb37d90

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2817703

Change-Id: I7e49577418fdf4f564534f73b15e064318585df2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-11-08 03:32:00 +00:00
committed by Automerger Merge Worker
parent 0b7bebe722 6a8eb37d90
commit 9865ce419b
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cc/config/global.go
View File

@@ -174,9 +174,6 @@ var (
"-Werror=format-security", "-Werror=format-security",
"-nostdlibinc", "-nostdlibinc",
// Enable MLGO for register allocation.
"-mllvm -regalloc-enable-advisor=release",
// Emit additional debug info for AutoFDO // Emit additional debug info for AutoFDO
"-fdebug-info-for-profiling", "-fdebug-info-for-profiling",
} }
@@ -205,8 +202,6 @@ var (
"-Wl,--exclude-libs,libgcc_stripped.a", "-Wl,--exclude-libs,libgcc_stripped.a",
"-Wl,--exclude-libs,libunwind_llvm.a", "-Wl,--exclude-libs,libunwind_llvm.a",
"-Wl,--exclude-libs,libunwind.a", "-Wl,--exclude-libs,libunwind.a",
// Enable MLGO for register allocation.
"-Wl,-mllvm,-regalloc-enable-advisor=release",
} }
deviceGlobalLldflags = append(append(deviceGlobalLdflags, commonGlobalLldflags...), deviceGlobalLldflags = append(append(deviceGlobalLdflags, commonGlobalLldflags...),

13
cc/lto.go
View File

@@ -147,10 +147,15 @@ func (lto *lto) flags(ctx BaseModuleContext, flags Flags) Flags {
} }
} }
// For ML training // Register allocation MLGO flags for ARM64.
if ctx.Config().IsEnvTrue("THINLTO_EMIT_INDEXES_AND_IMPORTS") { if ctx.Arch().ArchType == android.Arm64 {
ltoLdFlags = append(ltoLdFlags, "-Wl,--save-temps=import") ltoCFlags = append(ltoCFlags, "-mllvm -regalloc-enable-advisor=release")
ltoLdFlags = append(ltoLdFlags, "-Wl,--thinlto-emit-index-files") ltoLdFlags = append(ltoLdFlags, "-Wl,-mllvm,-regalloc-enable-advisor=release")
// Flags for training MLGO model.
if ctx.Config().IsEnvTrue("THINLTO_EMIT_INDEXES_AND_IMPORTS") {
ltoLdFlags = append(ltoLdFlags, "-Wl,--save-temps=import")
ltoLdFlags = append(ltoLdFlags, "-Wl,--thinlto-emit-index-files")
}
} }
flags.Local.CFlags = append(flags.Local.CFlags, ltoCFlags...) flags.Local.CFlags = append(flags.Local.CFlags, ltoCFlags...)