Clean up standalone texture cache eviction #3269

bholley · 2018-11-05T01:17:32Z

https://bugzilla.mozilla.org/show_bug.cgi?id=1504115

This change is


        Track the total number of GPU bytes allocated by WebRender.

This is useful for sanity-checking memory reports, and we'll also use it for our texture eviction heuristic. Differential Revision: https://phabricator.services.mozilla.com/D10672


        Switch GpuCache frame_id tracking from device::FrameId to render_back…

…end::FrameId. It should really be using the latter, so that it can avoid hand-rolling the frame increments and just use the one already available on frame_builder. In the next patch, we rename the types to make the difference clearer. Differential Revision: https://phabricator.services.mozilla.com/D10673


        Rename device::FrameId to device::GpuFrameId.

This type identified frames as sequenced by the device layer, whereas render_backend::FrameId identifies frames as sequenced by the render backend. I'm not sure whether there are known cases where these will diverge, but it seems plausible that they might, and so we should more clearly distinguish the types. Differential Revision: https://phabricator.services.mozilla.com/D10674

bholley · 2018-11-05T01:17:53Z

@bors-servo r=gw3583

bors-servo · 2018-11-05T01:17:54Z

📌 Commit 1181592 has been approved by gw3583

bors-servo · 2018-11-05T01:17:58Z

⌛ Testing commit 1181592 with merge bba6da6...


        Auto merge of #3269 - bholley:standalone_eviction, r=gw3583

Clean up standalone texture cache eviction https://bugzilla.mozilla.org/show_bug.cgi?id=1504115  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/webrender/3269)

bholley · 2018-11-05T01:19:56Z

@staktrace FYI, there are some unexpected passes corresponding to annotations that need to be fixed when merging this:

https://treeherder.mozilla.org/#/jobs?repo=try&revision=f918178b21ad388502acf0256d941831b187e042

bors-servo · 2018-11-05T01:24:27Z

💔 Test failed - status-appveyor


        Clean up semantics around render_backend::FrameId.

Differential Revision: https://phabricator.services.mozilla.com/D10675


        Improve some documentation.

Differential Revision: https://phabricator.services.mozilla.com/D10676


        Support always-invalid WeakFreeListHandle and eliminate Option from T…

…extureCacheHandle. This simplifies the texture cache code. Differential Revision: https://phabricator.services.mozilla.com/D10677


        Properly handle entries moving between shared and standalone.

We also switch the boolean from 'in_shared_cache' to 'standalone', since the latter is a bit shorter. Differential Revision: https://phabricator.services.mozilla.com/D10678


        Fix standalone texture eviction.

Differential Revision: https://phabricator.services.mozilla.com/D10679

bholley · 2018-11-05T01:28:37Z

@bors-servo r=gw3583

bors-servo · 2018-11-05T01:28:37Z

📌 Commit 231b522 has been approved by gw3583

bors-servo · 2018-11-05T01:28:41Z

⌛ Testing commit 231b522 with merge 854dee6...


        Auto merge of #3269 - bholley:standalone_eviction, r=gw3583

Clean up standalone texture cache eviction https://bugzilla.mozilla.org/show_bug.cgi?id=1504115  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/webrender/3269)

bors-servo · 2018-11-05T02:48:51Z

☀️ Test successful - status-appveyor, status-taskcluster
Approved by: gw3583
Pushing 854dee6 to master...

staktrace · 2018-11-05T13:29:53Z

@staktrace FYI, there are some unexpected passes corresponding to annotations that need to be fixed when merging this:

https://treeherder.mozilla.org/#/jobs?repo=try&revision=f918178b21ad388502acf0256d941831b187e042

This try push shows intermittent failures on all platforms. On Linux layout/reftests/bugs/836844-1.html seems to UNEXPECTED-PASS but not always. On macOS, layout/reftests/svg/filters/css-filters/blur-cap-large-radius-on-software.html was UNEXPECTED-PASS on opt but not debug, and on windows layout/reftests/bugs/501627-1.html was also intermittent. I've retriggered some jobs to make sure, but I don't think this PR should have gotten merged without (a) a patch to actually annotate these failures and (b) ensuring that said patch produces a green try run.

staktrace · 2018-11-05T14:23:55Z

Definitely seems intermittent. @bholley please take a look

bholley · 2018-11-05T16:37:07Z

Per IRC discussion - we're going to do the wr-update, mark the handful of tests that are now intermittently passing as random-if, and I'll investigate in a followup.

staktrace · 2018-11-05T18:47:39Z

For the record, additional try pushes didn't show the same intermittents or reftest changes that the try push earlier in this thread showed. Not sure what happened, but there appears to be no need to mark anything random-if or change any annotations.

bholley added 3 commits Oct 30, 2018

Track the total number of GPU bytes allocated by WebRender.

196d6c0

This is useful for sanity-checking memory reports, and we'll also use it for our texture eviction heuristic. Differential Revision: https://phabricator.services.mozilla.com/D10672

bholley added 5 commits Oct 31, 2018

Clean up semantics around render_backend::FrameId.

80ddfc3

Differential Revision: https://phabricator.services.mozilla.com/D10675

Improve some documentation.

a0fb358

Differential Revision: https://phabricator.services.mozilla.com/D10676

Support always-invalid WeakFreeListHandle and eliminate Option from T…

2b0604e

…extureCacheHandle. This simplifies the texture cache code. Differential Revision: https://phabricator.services.mozilla.com/D10677

Properly handle entries moving between shared and standalone.

95cf638

We also switch the boolean from 'in_shared_cache' to 'standalone', since the latter is a bit shorter. Differential Revision: https://phabricator.services.mozilla.com/D10678

Fix standalone texture eviction.

Loading status checks…

231b522

Differential Revision: https://phabricator.services.mozilla.com/D10679

bholley force-pushed the bholley:standalone_eviction branch from 1181592 to 231b522 Nov 5, 2018

bors-servo merged commit 231b522 into servo:master Nov 5, 2018
3 checks passed

3 checks passed

Taskcluster (pull_request) TaskGroup: success
Details

continuous-integration/appveyor/pr AppVeyor build succeeded
Details

homu Test successful
Details

bors-servo mentioned this pull request Nov 5, 2018

Crash when allocating unreasonable amounts of texture memory #3210

Closed

servo / webrender

Clean up standalone texture cache eviction #3269

Clean up standalone texture cache eviction #3269

bholley commented Nov 5, 2018 •

edited by larsbergstrom

bholley commented Nov 5, 2018

bors-servo commented Nov 5, 2018

bors-servo commented Nov 5, 2018

bholley commented Nov 5, 2018 •

edited

bors-servo commented Nov 5, 2018

bholley commented Nov 5, 2018

bors-servo commented Nov 5, 2018

bors-servo commented Nov 5, 2018

bors-servo commented Nov 5, 2018

staktrace commented Nov 5, 2018

staktrace commented Nov 5, 2018

bholley commented Nov 5, 2018

staktrace commented Nov 5, 2018

servo / webrender

Join GitHub today

Clean up standalone texture cache eviction #3269

Clean up standalone texture cache eviction #3269

Conversation

bholley commented Nov 5, 2018 • edited by larsbergstrom

bholley commented Nov 5, 2018

bors-servo commented Nov 5, 2018

bors-servo commented Nov 5, 2018

bholley commented Nov 5, 2018 • edited

bors-servo commented Nov 5, 2018

bholley commented Nov 5, 2018

bors-servo commented Nov 5, 2018

bors-servo commented Nov 5, 2018

bors-servo commented Nov 5, 2018

staktrace commented Nov 5, 2018

staktrace commented Nov 5, 2018

bholley commented Nov 5, 2018

staktrace commented Nov 5, 2018

bholley commented Nov 5, 2018 •

edited by larsbergstrom

bholley commented Nov 5, 2018 •

edited