diff options
author | Pirama Arumuga Nainar <pirama@google.com> | 2020-10-21 14:13:12 -0700 |
---|---|---|
committer | Pirama Arumuga Nainar <pirama@google.com> | 2020-10-21 14:13:12 -0700 |
commit | 1e576757bc040ab78407dea41218ed640277fc11 (patch) | |
tree | 073e9e403bc6e2290b2b5b005a5cfdabadde1e42 /crosperf/label.py | |
parent | 740c99ffa8d6b5197e1bd99af4863a7ac810f8a0 (diff) | |
parent | efb75cffd4a6bf629a4a374f2c1039dc37750dca (diff) | |
download | toolchain-utils-1e576757bc040ab78407dea41218ed640277fc11.tar.gz |
Merging 84 commit(s) from Chromium's toolchain-utils
Merged commit digest:
efb75cf Handle clangPostFlags for Android
356e7cf afdo_metadata: Publish the new kernel profiles
8373fd4 Revert "compiler_wrapper: enable -mharden-sls=all on aarch64"
5672f28 crosperf: refactor chrome src search
aac9c23 toolchain_utils: replace gsutil with gsutil.py
2159420 llvm_tools: add exist_ok=True to state dir creation
fd598ff rust_uprev: emerge rust instead of ebuilding it
8ecb53f rust_uprev: emerge arm-none-eabi-gcc & do it in parallel
6868239 rust_uprev: check for files in gs:// before downloading them
a874714 rust_uprev: support -rN ebuilds
7624e2d llvm_tools: use gsutil.py instead of gsutil
44e5787 rust_tools: Fix the tool using real Rust uprev experiences.
fff1c26 afdo_metadata: Publish the new kernel profiles
6d9e457 llvm_tools: add a lexan crash autouploader
92d7005 toolchain-utils: create pending_archives if needed
d8187c7 toolchain-utils: Sync compiler wrapper changes with llvm changes.
d184b9a crosperf: Update path search for chrome sources
b9a4299 llvm_tools: abandon CLs after completing LLVM bisection.
fb8fd5b compiler_wrapper: enable -mharden-sls=all on aarch64
089db67 llvm_tools: refactor LLVM bisection tool
ab646e1 afdo_metadata: Update kernel AFDO profiles
8223d16 fix formatting/lint issues pointed out by repohooks
4f7eb71 rephrase some language in code and comments
8a9125c toolchain-utils: Update compiler wrapper to disable warning.
e2cbc18 add unblocked_terms.txt to automatically check language
780b6e4 llvm_tools: add a script to fetch uploaded versions of LLVM
9ba2a4f compiler_wrapper: search compiler executable in $PATH
7b73dcd crosperf: Add verification of per-process profiles
18422a4 bisection: exit after updating kernel
4edc81e crosperf: Add support to run tests with ssh forwarding
38df970 toolchain-utils: Update README.md for llvm_tools.
563cdd9 llvm_tools: save intermediate state even if a step fails
c1e7b46 llvm_tools: tweak script verbosity
29a3f18 afdo_metadata: Publish the new kernel profiles.
2e734a5 crosperf: replace statistics stdev with pstdev
5d21b27 afdo_metadata: Publish the new kernel profiles
eaed177 afdo_tools: Update update_kernel_afdo to check previous branch
4d7093d cros_utils: clean up naming
98de93b afdo_metadata: Publish the new kernel profiles
40733c3 rust_tools: Provide a big hammer to do everything to uprev Rust
243ce37 compiler_wrapper: remove some flags from unsupport clang flags
20f7df6 crosperf: remove uses of numpy
7c7161d rust_tools: Refactor to create and remove Rust versions independently
59defeb afdo_metadata: Publish the new kernel profiles
0b767f9 pgo_tools: Add a monitor for LLVM PGO profile freshness
3dac9fa rust_tools: Add a tool to automatically generate a Rust uprev
1713d25 compiler_wrapper: use crashArtifactsDir to apply clang opts
0a377f4 compiler_wrapper: dump tricium clang-tidy crash information
2953a41 Update cleanup script to get chrome temp files too.
811b580 Update cleanup script to get chrome temp files too.
9f99023 afdo_metadata: Publish the new kernel profiles.
9726f50 llvm_tools: add a tool to bisect clang crashes
f30ddd4 default_remotes: Update toolchain DUT names
d1a9a25 compiler_wrapper: add -fexperimental-new-pass-manager
e1db855 llvm_tools: clarify that syncing all of llvm is only done once
0869ed0 llvm_tools: check for uncommited changes before cherry-picks
d81dc93 afdo_tools: Update script to sort profiles by timestamp
9259683 afdo_metadata: Update kernel AFDO profiles
4f29d44 llvm_tools: remove future import
e8ef273 compiler_wrapper: Updated instructions for updating the wrapper
120da3f rust_tools: add a monitor for upstream gentoo commits + rust releases
cb46500 compiler_wrapper: add -clang-tidy-flag support
6c2e5c4 afdo_metadata: Publish the new kernel profiles
7b9d2ba Put reference filters on 'git ls-remote'.
916add2 compiler_wrapper: rename update_compiler_wrapper.sh
94fd622 compiler_wrapper: remove -grecord-gcc-switches
6cfbb3d afdo_metadata: Update kernel AFDO profiles
8caccf6 afdo_metadata: Update kernel AFDO profiles
edc59f7 presubmits: respect CHROMEOS_ROOT_DIRECTORY when entering the chroot
d6f4dfa presubmits: add types to check-presubmit.py.
cab4264 Update AFDO kernel profiles.
f226ba1 Update owners file
fab4f3c cros_util: fix up naming
8078daa cros_utils: clean up unused file/code
dc996b9 compiler_wrapper: redirect clang crash dignoses
0c1730a debug_info_test: fix up naming
ad5e320 debug_info_test: replace whitelist with allowlist
536aff5 llvm_tools: fix up naming
efb96d1 android_merge_from_upstream: fix up naming
74a6b09 afdo_tools: add update_kernel_afdo script
163efaa wrapper: add support for Tricium clang-tidy
5cbe70b afdo_metadata: Publish the new kernel profiles
647df11 crosperf: Save cpuinfo and top logs
83785c3 wrapper: fork() before exec()ing
Change-Id: Ib885bb07621423f91584f6a4fd02fe998bf45141
Diffstat (limited to 'crosperf/label.py')
-rw-r--r-- | crosperf/label.py | 36 |
1 files changed, 25 insertions, 11 deletions
diff --git a/crosperf/label.py b/crosperf/label.py index b8122613..a55d663c 100644 --- a/crosperf/label.py +++ b/crosperf/label.py @@ -61,9 +61,9 @@ class Label(object): if self.image_type == 'local': chromeos_root = FileUtils().ChromeOSRootFromImage(chromeos_image) if not chromeos_root: - raise RuntimeError( - "No ChromeOS root given for label '%s' and could " - "not determine one from image path: '%s'." % (name, chromeos_image)) + raise RuntimeError("No ChromeOS root given for label '%s' and could " + "not determine one from image path: '%s'." % + (name, chromeos_image)) else: chromeos_root = FileUtils().CanonicalizeChromeOSRoot(chromeos_root) if not chromeos_root: @@ -72,17 +72,31 @@ class Label(object): self.chromeos_root = chromeos_root if not chrome_src: - self.chrome_src = os.path.join( - self.chromeos_root, '.cache/distfiles/target/chrome-src-internal') - if not os.path.exists(self.chrome_src): - self.chrome_src = os.path.join(self.chromeos_root, - '.cache/distfiles/target/chrome-src') + # Old and new chroots may have different chrome src locations. + # The path also depends on the chrome build flags. + # Give priority to chrome-src-internal. + chrome_src_rel_paths = [ + '.cache/distfiles/target/chrome-src-internal', + '.cache/distfiles/chrome-src-internal', + '.cache/distfiles/target/chrome-src', + '.cache/distfiles/chrome-src', + ] + for chrome_src_rel_path in chrome_src_rel_paths: + chrome_src_abs_path = os.path.join(self.chromeos_root, + chrome_src_rel_path) + if os.path.exists(chrome_src_abs_path): + chrome_src = chrome_src_abs_path + break + if not chrome_src: + raise RuntimeError('Can not find location of Chrome sources.\n' + f'Checked paths: {chrome_src_rel_paths}') else: - chromeos_src = misc.CanonicalizePath(chrome_src) - if not chromeos_src: + chrome_src = misc.CanonicalizePath(chrome_src) + # Make sure the path exists. + if not os.path.exists(chrome_src): raise RuntimeError("Invalid Chrome src given for label '%s': '%s'." % (name, chrome_src)) - self.chrome_src = chromeos_src + self.chrome_src = chrome_src self._SetupChecksum() |