This adds the "docker_installed=true" dimension for some tasks which are
currently using Docker but do not set the dimension.
Change-Id: I94ede7376e081b861bc691111b58eda37ccf6c41
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/276002
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
This removes the "work" cache from tasks which should not need it, and
adds the "git" cache to all tasks which use Git.
Change-Id: Ie3e5e964d77db44db869030ba195a50e27b75e70
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/275996
Reviewed-by: Ben Wagner aka dogben <benjaminwagner@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
Behavioral changes:
- CreateDockerImage and PushAppsFrom*DockerImage tasks no longer get go
or protoc assets and caches.
- Skpbench on desktop uses CIPD packages for [m]skp, rather than the
isolated versions.
Change-Id: I0532546be9a4a79434b2d2017061322884ba11fb
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/275956
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Reviewed-by: Ravi Mistry <rmistry@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
Change-Id: I4e662032c2f416a65b27145df547c4ff0245d255
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/275856
Reviewed-by: Eric Boren <borenet@google.com>
Reviewed-by: <skia-recreate-skps@skia-swarming-bots.iam.gserviceaccount.com>
Commit-Queue: Eric Boren <borenet@google.com>
Change-Id: I55e14b137d985fafd4e2c8fbc2cd76b27217699e
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/275217
Commit-Queue: Kevin Lubick <kjlubick@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
Bug: skia:9935
Change-Id: I6d9c14ac674dee89a5a8ba726d99b4423c40eb9b
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/274861
Reviewed-by: Eric Boren <borenet@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Jim Van Verth <jvanverth@google.com>
Change-Id: Ia37e0b9cd2f6b6c6e9a728741bec642cdba9f7b1
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/274555
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Ben Wagner aka dogben <benjaminwagner@google.com>
Pass dm_properties separate from dm_flags so that the recipe can check
for properties with empty values.
Aside: we should look into changing the way properties are passed into
DM (or not pass them at all).
Change-Id: I47268506e63939e7a75256616bce947ada5e7e9a
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/274540
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Reviewed-by: Ben Wagner aka dogben <benjaminwagner@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
Change-Id: I1a6410dc98deb0a0144118bdf52563115d91b75c
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/274539
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Change-Id: I3d82d78161373ec0536cbe6df196c753547501a8
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/274200
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Ben Wagner aka dogben <benjaminwagner@google.com>
This job currently does not build. Once fixed it will be added to the CQ.
Bug: skia:9939
Change-Id: I0f29292670554b43ba4518ba0d2d7593ef4beddf
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273481
Commit-Queue: Weston Tracey <westont@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Reviewed-by: Ben Wagner aka dogben <benjaminwagner@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
We lost 2 Pixel2XLs last week, so the remaining ones can't keep up.
Change-Id: I60e1e3070c5fc7ea2896ec34434c9c5b296b897e
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/272999
Auto-Submit: Weston Tracey <westont@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Merge commit 'refs/changes/95/272895/2' of https://skia.googlesource.com/skia
Update Go Deps
Change-Id: I8d56caafce1d21bd6bead373c96f57ed0c7d96a7
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273016
Auto-Submit: Weston Tracey <westont@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
They're not any faster than the debug ones.
Change-Id: I793706d36bd868277db2b6e39a53cb4e1075e0b1
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/271880
Auto-Submit: Mike Klein <mtklein@google.com>
Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com>
Reviewed-by: Ben Wagner aka dogben <benjaminwagner@google.com>
Change-Id: I9d9c1ee0aacba8598869fb702436a7c6bf668323
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/270838
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com>
The iPhone11 doesn't work with the old version, but our recipes don't
yet work on the new version, so I'm pinning the version in order to
stage the rollout of the new version.
Change-Id: I778c664aee7fbd33442d57d1b36607c8bc0f43e5
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/270443
Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com>
Reviewed-by: Weston Tracey <westont@google.com>
Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com>
If we need to support the Ultras, I vote we use taskdrivers instead of
these old recipes.
Bug: skia:9899
Change-Id: I9a3adedde5e7b28d90d3f836ccab0c7fe40abd38
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/270440
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Kevin Lubick <kjlubick@google.com>
Remove old Debug jobs that I added Release mirrors to
earlier today. The release jobs look fine and faster,
taking between 50-80% the time of the debug jobs.
Add SwiftShader release MSAN jobs to try the same there.
Change-Id: I2a40e079bc95edc318d4da02299273fb0dd736af
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/270537
Reviewed-by: Ben Wagner aka dogben <benjaminwagner@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
Wonder if these run faster?
Change-Id: I410a77e757398172bdcb01fcaea375aa2a900883
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/270390
Auto-Submit: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com>
Reviewed-by: Ben Wagner aka dogben <benjaminwagner@google.com>
never cared about these
Bug: skia:9899
Change-Id: I1d467da491365668cbd2cb2fc606af63247b11da
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/270102
Auto-Submit: Mike Klein <mtklein@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Also add pre and post build ccache stats reporting to provide insight for cache size, hit rate, etc.
Bug: skia:9887
Change-Id: I3786fb661ef9f14bdc9fcc7cbcecd1f1a588479f
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/269370
Commit-Queue: Weston Tracey <westont@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
Change-Id: Icf2dde726b7f7dfd9fd3b567650d670e0fceb1bf
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/269992
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: <skia-recreate-skps@skia-swarming-bots.iam.gserviceaccount.com>
std::call_once() will trigger false positive races without
a libc++ (specifically __call_once()) built with TSAN itself.
Interestingly, there's a built-in interceptor for this
use case, only on Mac: https://reviews.llvm.org/D24188.
Fixes: skia:9884
Change-Id: I7b2c031c15b78ec7302c42b4e4ac365d596c2c33
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/265567
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Ben Wagner aka dogben <benjaminwagner@google.com>
- add Mac PDF rasterizer
- create a mac pdf bot
- blacklist some GMs that CG takes forever to rasterize
- remove obsolete --dont_write pdf feature
This new Mac -PDF bot is now the _only_ bot running PDF code.
Obviously we can expand from here.
pdfium was looking like a pain to build and/or integrate
into our own build. pdftocairo looked promising, and is
already installed on the bots, but it is very slow and
prone to error. CG was the next thing I tried.
Change-Id: I82b04121f484e7dd78f60a648485a09218dd5279
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/267810
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Reviewed-by: Mike Reed <reed@google.com>
I'm hoping this fixes UpdateGoDeps.
Bug: skia:9505
Change-Id: I4493f61f0257176b0e90e50bd9456041dc398a51
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/266843
Reviewed-by: Ravi Mistry <rmistry@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
Leak sanitizer ought not to complain any more
now that I'm cleaning up my thread_local caches.
Add an MSAN bot for paranoia about bug.
Bug: skia:9819
Change-Id: I34600b7d40b6ecbc245d1b0acbca5b2fedf83b5d
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/266523
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
This should clear up the apparent leaks,
because Mac doesn't support leak sanitizer.
Change-Id: I688edd50265cfd15346f3fa2b8c1d06a2d3d8125
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/266368
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
I think this should catch the use-after-free when it runs
gm/lumafilter. Reassuring to have running... may also want
to add MSAN bots.
Change-Id: Ia8ed9acdb66b2e5fca02d91922d01dddbd7f2207
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/266359
Commit-Queue: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Auto-Submit: Mike Klein <mtklein@google.com>
Reviewed-by: Mike Reed <reed@google.com>
Change-Id: Id55d47c97102367face69bfaa32d82e7db4ce2e7
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/264500
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>
build_task_drivers was always syncing infra to tip-of-tree. Fix it to
use the pinned revision.
Change-Id: Iea6c54e4f62f30e986880d50b38ee0fb612a7a83
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/262217
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Ravi Mistry <rmistry@google.com>
Change-Id: Icf81d2fd50e060e9e9ca2876f5ed7192d0d18d7a
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/258885
Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com>
Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
These were a backstop to catch regressions in an area of code that we're
no longer actively developing (how we choose rasterization algorithms.)
Change-Id: If0b4bf71593fc9f895a69d6aa36c86ea4f8ac141
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/261844
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Remove any Debug bot that's not on the CQ and has a corresponding ASAN
bot (fudging it a little on one Mac bot that had a Metal-only ASAN bot.)
Change-Id: Ie82dce2c37ee1dfebb8686bb1774baaed80d8fd4
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/261842
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
There's little need to run a Release ASAN bot when we've an equivalent
Debug ASAN bot. This removes almost all Release ASAN bots and adds one
Debug ASAN bot.
The only Release ASAN bots I've kept are a bot on the CQ,
Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ASAN, and the
corresponding Build bot. We could leave that forever, replace it with
a Debug bot, or just take it off the CQ.
Change-Id: Ic0864fe2efdc39a95e204c7dfaaace238f2098ed
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/262087
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Reviewed-by: Ben Wagner aka dogben <benjaminwagner@google.com>
This logic that any GCE CPU *SAN bot is implicitly
a BonusConfigs bot is confusing... make it explicit.
This also means we can make BonusConfigs CPU bots
run disjoint work like the BonusConfigs GPU bots do.
No need to run the default configs redundantly.
Change-Id: I1219091f065a3d1135973bffea7c8774a8ca1ad6
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/262085
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Followup to https://skia-review.googlesource.com/c/skia/+/261933; Pixel
bots don't have enough capacity.
Change-Id: I3b3413c32170a31ba25a53cbbdc15b65b9c66f33
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/261996
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com>
Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com>
We've realized we'd like to have a few more Debug Perf bots, and it
seems like maybe a good way to satisfy that is to backfill anywhere
we've got a Release Perf ASAN bot but not a Debug one.
In net, this adds:
1) some Android ASAN Debug Build bots, both 32- and 64-bit ARM
2) some Android ASAN Debug _Test_ bots using those new builds
3) one CPU and one GPU Debug ASAN Perf bot
This CL originally was intended just to fulfill 3); I didn't anticipate
finding those testing gaps filled by 1) and 2), and if we find those new
bots to be a bother we can revert them. They seemed like glaring enough
holes to try to fix now.
Change-Id: I5714522db52bb5bde458b724091a227229e55fea
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/261933
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Change-Id: Ieb695288f2643a2959b76777d02af67ac49c245d
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/261544
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
This leaves the Win SDK at 10.0.17763.0 (I got errors when trying to
move to something newer).
It moves from VS 2017 to VS 2019 (14.16.27023), which fixes an internal
compiler error in recent ANGLE. We're also generally overdue for
switching to 2019, which has been released and stable for quite a while.
Docs-Preview: https://skia.org/?cl=261542
Change-Id: Iba15d52f558e92407866315681c2e99711c6d26a
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/261542
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
DM is already available and should have GL or Vulkan backends in it.
Change-Id: Ie1dad639d0d20aae86ed8d8435c0787e15880767
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/261148
Commit-Queue: Kevin Lubick <kjlubick@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
This probably makes very little difference, but it might be helpful in
certain situations to see the unbuffered raw output.
Change-Id: Id0adf77ab3a8d0221d6dc8b7aea39fe9785b03dd
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/261137
Commit-Queue: Eric Boren <borenet@google.com>
Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
This is a reland of 3bf8e40537
Original change's description:
> roll clang_win
>
> Change-Id: Ide83513b28ac982e24dcb73c9f5766df7531bc47
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/260810
> Reviewed-by: Brian Osman <brianosman@google.com>
> Commit-Queue: Mike Klein <mtklein@google.com>
Change-Id: I504db10e17e7b79284b1e222fb10a059801fedd4
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/260878
Reviewed-by: Mike Klein <mtklein@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
This reverts commit 3bf8e40537.
Reason for revert: -Werror in ANGLE.
Original change's description:
> roll clang_win
>
> Change-Id: Ide83513b28ac982e24dcb73c9f5766df7531bc47
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/260810
> Reviewed-by: Brian Osman <brianosman@google.com>
> Commit-Queue: Mike Klein <mtklein@google.com>
TBR=mtklein@google.com,bsalomon@google.com,brianosman@google.com
Change-Id: I9215e596cd7b33944f2c1364dfedd3049a6bcbb4
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/260877
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
Change-Id: Ide83513b28ac982e24dcb73c9f5766df7531bc47
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/260810
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
Bug: skia:9514
Change-Id: Ia76a2b233f87b4fc68010fdea8e942498b5986ed
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/260397
Reviewed-by: Joe Gregorio <jcgregorio@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Ravi Mistry <rmistry@google.com>
This reverts commit 706eb5788e.
Reason for revert: Bad skp causing crashes
Original change's description:
> Update SKP version
>
> Automatic commit by the RecreateSKPs bot.
>
> TBR=rmistry@google.com
> NO_MERGE_BUILDS
>
> Change-Id: Ic0889b3314f1d0c9853682da9de96e4fa574a7fc
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/260183
> Reviewed-by: <skia-recreate-skps@skia-swarming-bots.iam.gserviceaccount.com>
> Commit-Queue: <skia-recreate-skps@skia-swarming-bots.iam.gserviceaccount.com>
TBR=rmistry@google.com,skia-recreate-skps@skia-swarming-bots.iam.gserviceaccount.com
# Not skipping CQ checks because original CL landed > 1 day ago.
Change-Id: I30cf1f796d983b8bc5171cfc1112e0b7eded8f0f
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/260256
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
Change-Id: Idd54caf1a9688a5de2fba08e8ae834f209aefc1c
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/242879
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
Apparently some of our stdlibs are not even quite c++11 compliant.
Bug: skia:9700
Change-Id: I842c2dd2eba55d576aa60b2b3a4734dbace00f6b
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/259074
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
Add Perf testing for Metal on MacBookAir7,2 and MacMini7,1. Also run
Test Debug Metal on MacMini7,1.
Change-Id: Id1a457cd41dda1dee8fc6893e87a6701782b0b2e
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/258002
Commit-Queue: Jim Van Verth <jvanverth@google.com>
Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com>
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Change-Id: Ib4baeec7dc7247b81c7e4a1ef7f85ef378e4be19
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/257621
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Heather Miller <hcm@google.com>
Reviewed-by: Ben Wagner aka dogben <benjaminwagner@google.com>
Bug: skia:9675
Change-Id: Ie9fcd38a4d6c1e369bb2c3740de664a87d1a322c
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/256660
Reviewed-by: Herb Derby <herb@google.com>
Reviewed-by: Ben Wagner aka dogben <benjaminwagner@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
Also update some recipe expectations to use job names that currently
exist.
Bug: skia:9632
Change-Id: I35883474a91ffb9fb2ab3b16089c7c80b5df0bd6
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/255982
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com>
Also, create and use new service account for the G3 compile bots.
Interesting failure here refers to when the bot fails only because of
test failures and not:
* merge failures
* unknown failure reasons (eg: some flaky timeouts from the script running in borg)
* when the bot is not owned or approved by a Googler
NoTry: true
Bug: skia:9631
Change-Id: I964fd7874269116cca0e25d1b516283a00d5133f
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/254278
Commit-Queue: Ravi Mistry <rmistry@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
Since we've moved compilation to a Debian10 Docker container, the
resulting binaries won't run on Debian9 unless we also run them in a
Debian10 Docker container.
Test-Debian10-GCC-GCE-CPU-AVX2-x86-Debug-All-Docker failures are
tracked in skia:9664.
Bug: skia:9632, skia:9664
Change-Id: I97edc142cf558e30d11bd7bc3b5d1b423ba2418b
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/255152
Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com>
Commit-Queue: Kevin Lubick <kjlubick@google.com>
Reviewed-by: Kevin Lubick <kjlubick@google.com>
I had enough trouble merging that I've written a new CL.
This CL switches the Valgrind bots to Clang and resorts jobs.json.
Looks like we need to go back to limiting to SSE 4.1 when building with
Clang. (We're much more aggressive about using AVX+ with Clang than we
were GCC.)
Change-Id: Ifbd3126a6ceb9b1c5ed0cf676d0f80d5457fce7e
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/255537
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Ben Wagner aka dogben <benjaminwagner@google.com>
Bug: chromium:1023191
Bug: skia:8235
Chromium has detected a performance regression on the Nexus 5x when
switching to Wuffs. Benchmark Wuffs on Nexus 5x to help isolate and
fix the problem.
Change-Id: I36a13845ec83290d640263499ec4e5aca7b1239a
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/255080
Commit-Queue: Leon Scroggins <scroggo@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
Reviewed-by: Ben Wagner aka dogben <benjaminwagner@google.com>
I think we may not need this limit since 3.15.0 added f16c support.
Cq-Include-Trybots: skia.primary:Test-Ubuntu18-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_PreAbandonGpuContext,Perf-Ubuntu18-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind,Test-Ubuntu18-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind,Test-Ubuntu18-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext
Change-Id: I4de547069ca0c77f2208c86f995496880df75d36
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/255342
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Ben Wagner aka dogben <benjaminwagner@google.com>
Bug: skia:9632
Change-Id: Ide4a077fa9a4c2588e6c2561348b0bbb778e9f68
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/254976
Commit-Queue: Eric Boren <borenet@google.com>
Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
Bug: chromium:1023191
Bug: skia:8235
Chromium is showing a performance regression on this image when
switching to Wuffs. (It is checked into Chromium as
src/third_party/blink/perf_tests/image_decoder/resources/droids.gif.)
Test it on our bots to help us verify we've fixed it.
Change-Id: I9a02e6fe9bdcfa1704aefbc1ea2cd3f0e6ac4409
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/255081
Reviewed-by: Ben Wagner aka dogben <benjaminwagner@google.com>
Commit-Queue: Leon Scroggins <scroggo@google.com>
Now that assert_true() leads to different code generation
in Debug and Release builds, we should probably test both.
Cq-Include-Trybots: skia.primary:Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_SKVM_BLITTER,Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_USE_SKVM_BLITTER
Change-Id: Icd3b67f09d964becb595ce9c95e7ebadae8da9b2
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/253898
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
Auto-Submit: Mike Klein <mtklein@google.com>
Change-Id: I760cf53928ce81403359f7af1486312fb1236d08
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/252931
Reviewed-by: Joe Gregorio <jcgregorio@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
Bug: skia:9588
Change-Id: I8dc915f9cedd40b94f37f3d1ae89bb7d4767814f
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/252186
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Bug: skia:9588
Change-Id: Ie37eeae3a971d74edee50d87d96d452fad1b38a4
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/252476
Reviewed-by: Ravi Mistry <rmistry@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
Bug: skia:9588
Change-Id: Idb80f1714865c2aa81615b8fc26afd591c3f4b24
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/252179
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
These docker-based tests don't actually need a checkout, but removing it
is proving time consuming and syncs are timing out.
Probably related to skia:9588
Bug: skia:9588
Change-Id: I39532f1d9cd1f6116fab341e648a517b98a312c2
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/252156
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
Also, create and use new service account for the Android compile bots.
NoTry: true
Bug: skia:9568
Change-Id: I974229a87f8c00bf6e4d0d5e49bbfdde6ca84e19
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/250978
Commit-Queue: Ravi Mistry <rmistry@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
urllib_request was introduced in crrev.com/c/1866170 to add
python 3 compatibility.
Bug: 1009814
Change-Id: Iecc246d4f251983051bd0cf812903831ea7e0c2d
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/249588
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
Change-Id: I9f44062d43c8e6810247050521cdb4f450827d23
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/247961
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
This is a reland of 50b1248ed8
Fixes from the original are in PS2. Change several recipes to use the
shared 'is_trybot' variable, and explicitly check for 0 rather than
relying on patch_ref not being set.
Original change's description:
> Use integer patchset and issue variables.
>
> See https://skia-review.googlesource.com/c/buildbot/+/246397/
>
> Change-Id: I39dae809abdc63007f65bc05040809d1a870b118
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/246302
> Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com>
> Reviewed-by: Eric Boren <borenet@google.com>
Change-Id: Ibe1d4f0dc1dc61c39eee6c980bd7509fc260101b
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/246919
Commit-Queue: Eric Boren <borenet@google.com>
Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
IIUC, the flag is no longer used.
Bug: skia:9482
Change-Id: I6c4c327423f0a356151fe0a15c45c6923deac147
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/246316
Reviewed-by: Ravi Mistry <rmistry@google.com>
Commit-Queue: Ravi Mistry <rmistry@google.com>
Just like https://skia-review.googlesource.com/c/skia/+/118681/,
but one more, and...
- GCC now needs libisl19
- more warnings to stifle... disable warnings-as-errors.
Cq-Include-Trybots: skia.primary:Build-Debian9-GCC-mips64el-Debug,Build-Debian9-GCC-mips64el-Release
Change-Id: I35c2f71caebb47bd1bd253923cbddbe3f9b95477
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/245352
Reviewed-by: Ravi Mistry <rmistry@google.com>
Reviewed-by: Ben Wagner aka dogben <benjaminwagner@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
Bug: skia:8271
Change-Id: I51494eb84329b54a5429add74e2b7ded7731eb30
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/244637
Commit-Queue: Eric Boren <borenet@google.com>
Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
With Metal up and running these are no longer needed.
Change-Id: I79948707060afc3a9d2d3a4d531a7d3e5d08298d
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/243696
Commit-Queue: Jim Van Verth <jvanverth@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
The 5x vulkan driver is starting to show a lot of its bugs that are becoming
a pain to work around for testing. Since the driver will probably not be updated
on this device so we wouldn't ship vulkan on it, I am removing it from our test
pool.
Bug: skia:9124
Bug: skia:9027
Bug: skia:9271
Change-Id: I89166af19f77c3c00a1f877dc4fe78596bbfa9c9
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/243422
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Bug: skia:9194
Change-Id: I33acb878528c461f51989f2a65df7b33ea38f2a7
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/240277
Commit-Queue: Eric Boren <borenet@google.com>
Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
We've failed to get these bots to report where issues happen
any more finely than the name of the executable, which makes
them a real pain to fix when they go red.
We don't expect we'll be able to run cleanly in this mode for
long without bots enforcing it, so remove support from GN too.
Change-Id: Ie86f0cbf2f5f859ac2ddb869da7e5b8d31b33fa0
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/237195
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
- clang 3.9 -> clang "9" (pre-release)
- libstdc++ -> libc++ (pretty sure)
PS1 should fail to build... need to update
infra/bots/recipe_modules/build/chromecast.py too.
PS2 compiles but fails to link.
PS3 puts -Lchromebook_arm_gles/lib on the link line;
unclear to me how we're linking today...
PS4 removed a workaround for the older toolchain.
PS5+ tries to request the older glibc math symbols
that shipped with the devices we test on... we don't
seem to have glibc 2.27 there.
Cq-Include-Trybots: skia.primary:Test-Chromecast-Clang-Chorizo-CPU-Cortex_A7-arm-Debug-All,Perf-Chromecast-Clang-Chorizo-GPU-Cortex_A7-arm-Release-All,Test-Chromecast-Clang-Chorizo-GPU-Cortex_A7-arm-Release-All
Change-Id: I7a1ac2da646fb5b0cbdeb44310f1c0747013f3f0
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/234956
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Kevin Lubick <kjlubick@google.com>
The Nexus5 bots cover all the same things as these.
Change-Id: I2e4c685dd70c5fa75e745edacecdd3c1e1adb9ce
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/234376
Reviewed-by: Ben Wagner aka dogben <benjaminwagner@google.com>
Auto-Submit: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
Switch the guard define to SK_USE_SKVM_BLITTER to match the expectations
of setting up these easy-mode-defines bots (anything starting with SK_).
Change-Id: I7dafdb31a5b2147cac8428e49d4599e50d125ab6
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/233059
Auto-Submit: Mike Klein <mtklein@google.com>
Reviewed-by: Herb Derby <herb@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
New devices came with an updated OS.
Change-Id: I01ae0197d15f4249ea50169a449ec738b15c48d3
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/230476
Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com>
This reverts commit ad96b1c133.
Reason for revert: Upgraded bots not ready yet
Original change's description:
> [infra] Upgrade Win10 in Skolo. Use new Win dimension values.
>
> See
> https://chromium-review.googlesource.com/c/infra/luci/luci-py/+/1660974
> for more info about the new dimension values.
>
> Change-Id: Ie8f000553a342f2fcd65dcdeb9defe11b93ca012
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/229577
> Commit-Queue: Eric Boren <borenet@google.com>
> Reviewed-by: Eric Boren <borenet@google.com>
TBR=borenet@google.com,benjaminwagner@google.com
Change-Id: Ida8ae884559f492797e382eb7697761fcd828ff0
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/229757
Reviewed-by: Ben Wagner aka dogben <benjaminwagner@google.com>
Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com>
Added new "backend" flag to lottie-web-perf.js and created a new lottie-web-canvas-perf.html file.
Bug: skia:9237
Change-Id: Ibca2f121666daf25fbbccac48fed80eb12ccedf7
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/229420
Commit-Queue: Ravi Mistry <rmistry@google.com>
Reviewed-by: Florin Malita <fmalita@chromium.org>
- Stop testing Metal-MSAA on our Gen8 Mac. These GPUs are slow and buggy
with MSAA (we already have them disabled on other backends).
- Add Metal bots with the HD615 to get testing on a Gen9 GPU. This
should have better performance and more correct results. Also move the
DDL tests to those machines, to get testing on a newer/faster machine.
- Add MSAA configs to Vulkan and Metal perf bots (except for old Intel).
Bug: skia:9023 skia:8243
Change-Id: I214c6c4ef7b6e1401719e62e29fd5d2ad05b6aa1
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/229379
Reviewed-by: Greg Daniel <egdaniel@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Change-Id: I5fb08b64da127d88a32d8be35055565eb96b816d
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/224257
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Ben Wagner aka dogben <benjaminwagner@google.com>
Change-Id: I084645a46feda183747e9d7fc3b40b1aa56c5f78
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/211103
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Ben Wagner aka dogben <benjaminwagner@google.com>
Bug: skia:9253
Change-Id: I5055bb492fe10c35a4d593e4256874e872fc831d
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/227036
Reviewed-by: Ravi Mistry <rmistry@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
Change-Id: I1a75b211753ea5e097234dd4104d0906cfd04673
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/223916
Reviewed-by: Ben Wagner aka dogben <benjaminwagner@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
This reverts commit 326ad9e716.
Reason for revert: This was an outage of some kind, not intentional expiration of isolates.
Original change's description:
> [infra] No task deduplication
>
> Isolates are expiring despite the tasks which generate them being
> deduped. Hopefully this is temporary, and we can update the isolate
> server to expire based on last usage date rather than creation date.
>
> Change-Id: I7158612cd9b28c80268c54da9af88d2048e6aad1
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/226176
> Reviewed-by: Ravi Mistry <rmistry@google.com>
> Commit-Queue: Eric Boren <borenet@google.com>
TBR=borenet@google.com,rmistry@google.com
Change-Id: I3afc8e9e89174505d87d96d45ab6c9e44937bb29
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/226219
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
Isolates are expiring despite the tasks which generate them being
deduped. Hopefully this is temporary, and we can update the isolate
server to expire based on last usage date rather than creation date.
Change-Id: I7158612cd9b28c80268c54da9af88d2048e6aad1
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/226176
Reviewed-by: Ravi Mistry <rmistry@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
Change-Id: I961af6c2f143df6fd1109c2659df9424d1086705
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/225443
Auto-Submit: Mike Klein <mtklein@google.com>
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
Lately we're not sure they're worth running.
I'd remove Perf-Debian9-Clang-GCE-CPU-AVX2-x86-Debug-All
from the CQ too but I can't find where that's configured.
Change-Id: Ieb55d9d39a6d9cf775e6740b9b541d3ceee01896
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/225163
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Ben Wagner aka dogben <benjaminwagner@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
... as opposed to Skia Task Scheduler ID. The latter causes the command
to be different at every task invocation, which prevents deduplication.
Use the Swarming task ID from the environment instead.
Change-Id: Ied59bb0a0f45570f425cccd5ed707bfdd550893c
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/223976
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Ben Wagner aka dogben <benjaminwagner@google.com>
Change-Id: Ic6da2d71b4e45fe67bc32942a87d41426bc9d05b
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/224189
Reviewed-by: Ben Wagner aka dogben <benjaminwagner@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
Also remove "rack" dimension. The os dimension now aligns with the rack
dimension, so we don't need to worry about it.
Bug: chromium:919950
Change-Id: I6ec2dee501ebe7b34cd1a52b68141abb3b133c84
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/215087
Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
The majority of our gm testing has been disabling nvpr, which doesn't
match our real-world behavior where we use nvpr whenever available.
This CL fixes the issue by completely removing the explicit nvpr
configs. Now if we have nvpr, you get it.
This CL also lowers the nvpr priority in the path renderer chain and
adds a "NonNVPR" job on Quadro where we can continue to test our
non-nvpr codepaths on NVIDIA.
Bug: skia:
Change-Id: I6a36f1101c8218adcaaf10cab25d2c28e70371f0
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/223828
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>
This should save about a minute on most jobs.
Change-Id: Ida39672333f9e1ee13a1ab85388e7461b1684f8f
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/223796
Reviewed-by: Ravi Mistry <rmistry@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
Change-Id: I5dee0f9646b3ede65fcde5c246f48c5b742f00e8
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/223702
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Joe Gregorio <jcgregorio@google.com>
We have 14 Shields available, so move some of the "oddball" jobs there.
We have only two Nexus5x's left and Moto G4 is way over-capacity after
half of them overheated.
Also sort jobs.json.
This CL just adds the new jobs; old jobs are removed in
https://skia-review.googlesource.com/c/skia/+/223057
This provides some overlap for easier diagnosis of Gold and Perf diffs.
Change-Id: Ie2d0151a1c3f2097ae69a3f173178b239592e8fc
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/222792
Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com>
Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
* Added support for LottieWeb bots in perf_skottiewasm_lottieweb.py
* Adds a LOTTIE_WEB_BLACKLIST for lottie files that crash lottie-web as described in https://bugs.chromium.org/p/skia/issues/detail?id=9187#c4
NoTry: true
Bug: skia:9187
Change-Id: I8dbf485e7162e027cb4c4db2bf8f8e9c3ec4d966
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/222157
Reviewed-by: Joe Gregorio <jcgregorio@google.com>
Commit-Queue: Ravi Mistry <rmistry@google.com>
The lottieweb perf recipe will be very similar to the skottiewasm perf
recipe, so decided to eventually use the same one for both.
Bug: skia:9187
Change-Id: Id9da91c9cf79df7c01c61c7920f944bec974e9f8
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/222156
Reviewed-by: Joe Gregorio <jcgregorio@google.com>
Commit-Queue: Ravi Mistry <rmistry@google.com>
Also, removed the blacklist for skia:8706 since the tests are passing
before this CL.
Bug: skia:8587, skia:8659, skia:8706, skia:8961, skia:9023
Change-Id: Ib7bf3268b1981ba9860f77ea7e12673976105ef9
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/222041
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com>
NVIDIA's updates for the NVIDIA Shield use the same build number, so we
can only distinguish them by the build fingerprint number.
Change-Id: I750ce8c0c0a13519a8155dab49391f6bd1b4e35d
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/222103
Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com>
* Picked a GPU bot with 200+% capacity.
* Uses git from CIPD because some bots do not have git installed.
* Uses npm from node asset because some bots do not have npm installed.
NoTry: true
Bug: skia:9179
Change-Id: I75af7cd9f96b040481dcea85d65f95b29c11e3f7
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/221616
Commit-Queue: Ravi Mistry <rmistry@google.com>
Reviewed-by: Joe Gregorio <jcgregorio@google.com>
