Commit 1150e0fd authored by Tiancong Wang's avatar Tiancong Wang Committed by Commit Bot

Rename Chrome OS AFDO profiles.

For the efforts to use generalized names for Chrome OS, we will
rename them to atom and bigcore. This patch will add the support
for those two first, but not remove the old names. It's because
we need those to pass uprev Chrome in Chrome OS first, and then
make changes in Chrome OS to remove the old broadwell/airmont,
and then we can clean it up.

Bug: 1135245
Test: gclient sync

Change-Id: I83c27e827d4950d43c37dc9c78b7bbe62ce62f47
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2250820
Commit-Queue: Dirk Pranke <dpranke@google.com>
Reviewed-by: default avatarGeorge Burgess <gbiv@chromium.org>
Reviewed-by: default avatarDirk Pranke <dpranke@google.com>
Auto-Submit: Tiancong Wang <tcwang@google.com>
Cr-Commit-Position: refs/heads/master@{#816322}
parent 3b53b545
...@@ -4884,6 +4884,7 @@ hooks = [ ...@@ -4884,6 +4884,7 @@ hooks = [
], ],
}, },
# Download AFDO profiles for Chrome OS for each architecture. # Download AFDO profiles for Chrome OS for each architecture.
# TODO(crbug/1135245): silvermont, airmont, broadwell to be replaced by atom and bigcore
{ {
'name': 'Fetch Chrome OS AFDO profiles (silvermont)', 'name': 'Fetch Chrome OS AFDO profiles (silvermont)',
'pattern': '.', 'pattern': '.',
...@@ -4920,6 +4921,30 @@ hooks = [ ...@@ -4920,6 +4921,30 @@ hooks = [
'--gs_url_base=chromeos-prebuilt/afdo-job/vetted/release', '--gs_url_base=chromeos-prebuilt/afdo-job/vetted/release',
], ],
}, },
{
'name': 'Fetch Chrome OS AFDO profiles (from Intel Atom cores)',
'pattern': '.',
'condition': 'checkout_chromeos or checkout_simplechrome',
'action': [ 'vpython',
'src/tools/download_optimization_profile.py',
'--newest_state=src/chromeos/profiles/atom.afdo.newest.txt',
'--local_state=src/chromeos/profiles/atom.afdo.local.txt',
'--output_name=src/chromeos/profiles/atom.afdo.prof',
'--gs_url_base=chromeos-prebuilt/afdo-job/vetted/release',
],
},
{
'name': 'Fetch Chrome OS AFDO profiles (from Intel big cores)',
'pattern': '.',
'condition': 'checkout_chromeos or checkout_simplechrome',
'action': [ 'vpython',
'src/tools/download_optimization_profile.py',
'--newest_state=src/chromeos/profiles/bigcore.afdo.newest.txt',
'--local_state=src/chromeos/profiles/bigcore.afdo.local.txt',
'--output_name=src/chromeos/profiles/bigcore.afdo.prof',
'--gs_url_base=chromeos-prebuilt/afdo-job/vetted/release',
],
},
{ {
# Pull doclava binaries if building for Android. # Pull doclava binaries if building for Android.
'name': 'doclava', 'name': 'doclava',
......
...@@ -96,7 +96,7 @@ declare_args() { ...@@ -96,7 +96,7 @@ declare_args() {
# the microarchitectures we are using. This is only used if # the microarchitectures we are using. This is only used if
# clang_use_default_sample_profile is true and clang_sample_profile_path is # clang_use_default_sample_profile is true and clang_sample_profile_path is
# empty. # empty.
chromeos_afdo_platform = "silvermont" chromeos_afdo_platform = "atom"
# Emit debug information for profiling wile building with clang. # Emit debug information for profiling wile building with clang.
clang_emit_debug_info_for_profiling = false clang_emit_debug_info_for_profiling = false
...@@ -2203,10 +2203,14 @@ if (is_clang && is_a_target_toolchain) { ...@@ -2203,10 +2203,14 @@ if (is_clang && is_a_target_toolchain) {
if (is_android) { if (is_android) {
_clang_sample_profile = "//chrome/android/profiles/afdo.prof" _clang_sample_profile = "//chrome/android/profiles/afdo.prof"
} else { } else {
# TODO(crbug/1135245): Remove silvermont, airmont and broadwell after
# the change atom and bigcore reaches Chrome OS.
assert( assert(
chromeos_afdo_platform == "silvermont" || chromeos_afdo_platform == "silvermont" ||
chromeos_afdo_platform == "airmont" || chromeos_afdo_platform == "airmont" ||
chromeos_afdo_platform == "broadwell", chromeos_afdo_platform == "broadwell" ||
chromeos_afdo_platform == "atom" ||
chromeos_afdo_platform == "bigcore",
"Only silvermont, airmont and broadwell are valid Chrome OS profiles.") "Only silvermont, airmont and broadwell are valid Chrome OS profiles.")
_clang_sample_profile = _clang_sample_profile =
"//chromeos/profiles/${chromeos_afdo_platform}.afdo.prof" "//chromeos/profiles/${chromeos_afdo_platform}.afdo.prof"
......
chromeos-chrome-amd64-atom-88-4277.0-1602497703-benchmark-88.0.4288.0-r1-redacted.afdo.xz
chromeos-chrome-amd64-bigcore-88-4277.0-1602498827-benchmark-88.0.4288.0-r1-redacted.afdo.xz
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