0

[build] Unify ThinLTO -import-instr-limit= between Android and Linux+Win

Bug: 1101246, 1057737
Cq-Include-Trybots: luci.chromium.try:linux-official
Change-Id: Ifbbdcd1bcb615851130deff9fbe80b2a4d48a87a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2674930
Commit-Queue: Nico Weber <thakis@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#851324}
This commit is contained in:
Hans Wennborg
2021-02-05 23:00:50 +00:00
committed by Chromium LUCI CQ
parent b332c5609e
commit 7d556c3e8a

@ -628,8 +628,8 @@ config("compiler") {
# Experimentally determined to yield a reasonable trade-off between
# build time, run-time performance, and binary size.
# Keep this in sync with the Linux value below.
"-mllvm:-import-instr-limit=10",
# Keep this in sync with the Android/Linux value below.
"-mllvm:-import-instr-limit=5",
"/lldltocache:" +
rebase_path("$root_out_dir/thinlto-cache", root_build_dir),
@ -657,13 +657,9 @@ config("compiler") {
if (thin_lto_enable_optimizations) {
# TODO(gbiv): We ideally shouldn't need to specify this; ThinLTO
# should be able to better manage binary size increases on its own.
import_instr_limit = -1
if (is_linux) {
# Keep this in sync with the Windows value above.
import_instr_limit = 10
} else if (is_android) {
import_instr_limit = 5
} else if (is_chromeos_ash) {
import_instr_limit = 5
if (is_chromeos_ash) {
# Not much performance difference was noted between the default (100)
# and these. ARM was originally set lower than x86 to keep the size
# bloat of ThinLTO to <10%, but that's potentially no longer true.
@ -675,9 +671,7 @@ config("compiler") {
}
}
if (import_instr_limit != -1) {
ldflags += [ "-Wl,-mllvm,-import-instr-limit=$import_instr_limit" ]
}
ldflags += [ "-Wl,-mllvm,-import-instr-limit=$import_instr_limit" ]
}
}