From 66b7798c751874fc8e8c354dab2d4f1476f5e5ae Mon Sep 17 00:00:00 2001 From: George Burgess IV Date: Tue, 28 May 2019 16:14:29 -0700 Subject: pgo_tools: update our merging script to point to the right bots https://chromium-review.googlesource.com/c/chromiumos/chromite/+/1633331 renames our buildbots for PGO profile generation. This CL makes us use the new name. BUG=None TEST=ran the script; complained that no artifacts existed for arm-pgo-generate-llvm-next-toolchain, which is true. :) Change-Id: I444c60fbfd2fbf8ab457e0fd17c4be617c888ab4 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/1633379 Reviewed-by: Manoj Gupta Tested-by: George Burgess Legacy-Commit-Queue: Commit Bot --- pgo_tools/merge_profdata_and_upload.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pgo_tools/merge_profdata_and_upload.py b/pgo_tools/merge_profdata_and_upload.py index 6cf526f8..7d43fbe8 100755 --- a/pgo_tools/merge_profdata_and_upload.py +++ b/pgo_tools/merge_profdata_and_upload.py @@ -36,10 +36,11 @@ def _fetch_gs_artifact(remote_name, local_name): def _find_latest_profdata(arch): - remote_latest = ('%schromeos-image-archive/%s-llvm-pgo-generate-toolchain/' - 'LATEST-master' % (_GS_PREFIX, arch)) + remote_latest = ( + '%schromeos-image-archive/' + '%s-pgo-generate-llvm-next-toolchain/LATEST-master' % (_GS_PREFIX, arch)) version = _get_gs_latest(remote_latest) - profdata = ('%s-llvm-pgo-generate-toolchain/%s/llvm_profdata.tar.xz' % + profdata = ('%s-pgo-generate-llvm-next-toolchain/%s/llvm_profdata.tar.xz' % (arch, version)) return profdata @@ -95,8 +96,9 @@ def main(): '--tryjob', default=[], action='append', - help='Extra pgo-generate-toolchain/tryjob results to be used. Format ' - 'should be {arch}-llvm-pgo-generate-toolchain(-tryjob)/{VERSION}.') + help='Extra pgo-generate-llvm-next-toolchain/tryjob results to be used. ' + 'Format should be ' + '{arch}-pgo-generate-llvm-next-toolchain(-tryjob)/{VERSION}.') parser.add_argument( '-o', '--output', -- cgit v1.2.3