Commit 393e7114 authored by Andrew Grieve's avatar Andrew Grieve Committed by Commit Bot

Reduce link pool to stop android-archive-rel OOM'ing

I'd like to still work on a fix that doesn't reduce the size for bots
with less RAM, but need something quick'ish to fix bot.

Bug: 1098333
Change-Id: Ifdfe8f07712e5073419ea0c0c0eb89092c31a1de
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2347384
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Dirk Pranke <dpranke@google.com>
Auto-Submit: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: default avatarDirk Pranke <dpranke@google.com>
Cr-Commit-Position: refs/heads/master@{#796585}
parent 092c72a9
...@@ -45,21 +45,30 @@ if (concurrent_links == -1) { ...@@ -45,21 +45,30 @@ if (concurrent_links == -1) {
} else { } else {
_args = [ "--mem_per_link_gb=4" ] _args = [ "--mem_per_link_gb=4" ]
} }
} else if (is_android && !is_component_build && symbol_level == 2) { } else if (is_android) {
# Full debug symbols require large memory for link.
_args = [ "--mem_per_link_gb=25" ]
} else if (is_android && !is_debug && !using_sanitizer && is_java_debug &&
disable_android_lint && symbol_level < 2) {
# The link pool is also shared with: # The link pool is also shared with:
# * ProGuard / R8 # * R8
# * 10gb per run for 72-core machine MonochromePublic.apk, Aug 2020.
# * 4.5gb per run for 8-core machine MonochromePublic.apk, Aug 2020.
# * Android Lint # * Android Lint
# Increase the number of concurrent links for release bots that have # * 2gb per run for MonochromePublic.apk, Aug 2020.
# ProGuard and Lint disabled, and that do not enable sanitizers (which use a if (!is_component_build && symbol_level == 2) {
# lot of RAM). # Full debug symbols require large memory for link.
if (symbol_level == 1) { _args = [ "--mem_per_link_gb=25" ]
_args = [ "--mem_per_link_gb=6" ] } else if (!is_java_debug) {
# R8 requires more ram than linker.
# TODO(crbug.com/1098333): Do not decrease on bots with low CPU counts.
_args = [ "--mem_per_link_gb=10" ]
} else if (!is_debug && !using_sanitizer && symbol_level < 2) {
# Increase the number of concurrent links for release bots that have
# ProGuard and sanitizers disabled (which use a lot of RAM).
if (symbol_level == 1) {
_args = [ "--mem_per_link_gb=6" ]
} else {
_args = [ "--mem_per_link_gb=4" ]
}
} else { } else {
_args = [ "--mem_per_link_gb=4" ] _args = []
} }
} else if (is_linux && !is_chromeos && symbol_level == 0) { } else if (is_linux && !is_chromeos && symbol_level == 0) {
# Memory consumption on link without debug symbols is low on linux. # Memory consumption on link without debug symbols is low on linux.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment