[WebGPU] webgpu.github.io/webgpu-samples/?sample=renderBundles uses excessive memory by mwyrzykowski · Pull Request #35809 · WebKit/WebKit

mwyrzykowski · 2024-10-28T18:56:16Z

`31d96d6`

[WebGPU] webgpu.github.io/webgpu-samples/?sample=renderBundles uses excessive memory
https://bugs.webkit.org/show_bug.cgi?id=282153
rdar://138726891

Reviewed by Dan Glastonbury.

Command encoders were stored in a WeakHashSet, but
we only need to store the valid ones and not invalid ones.

Remove invalid encoders to avoid a retain cycle.

* Source/WebGPU/WebGPU/Buffer.mm:
(WebGPU::Buffer::setCommandEncoder const):
* Source/WebGPU/WebGPU/CommandEncoder.h:
* Source/WebGPU/WebGPU/CommandEncoder.mm:
(WebGPU::CommandEncoder::removeInvalidEncoders):
* Source/WebGPU/WebGPU/ExternalTexture.mm:
(WebGPU::ExternalTexture::setCommandEncoder const):
* Source/WebGPU/WebGPU/QuerySet.mm:
(WebGPU::QuerySet::setCommandEncoder const):
* Source/WebGPU/WebGPU/Texture.mm:
(WebGPU::Texture::setCommandEncoder const):
* Source/WebGPU/WebGPU/TextureView.mm:
(WebGPU::TextureView::setCommandEncoder const):

Canonical link: https://commits.webkit.org/285968@main

abd58ed

Misc	iOS, visionOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 win
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2	✅ 🧪 win-tests
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🧪 api-wpe
	✅ 🧪 ios-wk2-wpt	✅ 🧪 mac-wk1	✅ 🛠 wpe-cairo
	✅ 🧪 api-ios	✅ 🧪 mac-wk2	✅ 🛠 gtk
	✅ 🛠 vision	✅ 🧪 mac-AS-debug-wk2	✅ 🧪 gtk-wk2
	✅ 🛠 vision-sim	✅ 🧪 mac-wk2-stress	✅ 🧪 api-gtk
✅ 🛠 🧪 merge	✅ 🧪 vision-wk2	✅ 🧪 mac-intel-wk2
	✅ 🛠 tv	~~🛠 mac-safer-cpp~~
	✅ 🛠 tv-sim
	✅ 🛠 watch
	✅ 🛠 watch-sim

webkit-early-warning-system · 2024-10-28T18:56:22Z

EWS run on previous version of this PR (hash b3617ec)

Details

Misc	iOS, visionOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 win
	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2	✅ 🧪 win-tests
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🧪 api-wpe
	✅ 🧪 ios-wk2-wpt		✅ 🛠 wpe-cairo
	✅ 🧪 api-ios	✅ 🧪 mac-wk2	✅ 🛠 gtk
	✅ 🛠 vision	❌ 🧪 mac-AS-debug-wk2	✅ 🧪 gtk-wk2
	✅ 🛠 vision-sim	✅ 🧪 mac-wk2-stress	✅ 🧪 api-gtk
	✅ 🧪 vision-wk2	✅ 🧪 mac-intel-wk2
	✅ 🛠 tv
	✅ 🛠 tv-sim
	✅ 🛠 watch
	✅ 🛠 watch-sim

webkit-early-warning-system · 2024-10-29T19:15:21Z

EWS run on previous version of this PR (hash e87c9bc)

Details

Misc	iOS, visionOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 win
	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2	✅ 🧪 win-tests
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🧪 api-wpe
	✅ 🧪 ios-wk2-wpt		✅ 🛠 wpe-cairo
	✅ 🧪 api-ios	✅ 🧪 mac-wk2	✅ 🛠 gtk
	✅ 🛠 vision	✅ 🧪 mac-AS-debug-wk2	✅ 🧪 gtk-wk2
	✅ 🛠 vision-sim	✅ 🧪 mac-wk2-stress	✅ 🧪 api-gtk
	✅ 🧪 vision-wk2	✅ 🧪 mac-intel-wk2
	✅ 🛠 tv
	✅ 🛠 tv-sim
	✅ 🛠 watch
	✅ 🛠 watch-sim

djg

webkit-early-warning-system · 2024-10-30T22:04:04Z

EWS run on previous version of this PR (hash 6e4093f)

Details

Misc	iOS, visionOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 win
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	~~🧪 wpe-wk2~~	✅ 🧪 win-tests
✅ 🧪 webkitperl	~~🧪 ios-wk2~~	~~🧪 api-mac~~	✅ 🧪 api-wpe
	~~🧪 ios-wk2-wpt~~	✅ 🧪 mac-wk1	✅ 🛠 wpe-cairo
	~~🧪 api-ios~~	~~🧪 mac-wk2~~	✅ 🛠 gtk
	✅ 🛠 vision	~~🧪 mac-AS-debug-wk2~~	~~🧪 gtk-wk2~~
	✅ 🛠 vision-sim	✅ 🧪 mac-wk2-stress	~~🧪 api-gtk~~
	✅ 🧪 vision-wk2	⏳ 🧪 mac-intel-wk2
	✅ 🛠 tv	~~🛠 mac-safer-cpp~~
	✅ 🛠 tv-sim
	~~🛠 watch~~
	✅ 🛠 watch-sim

webkit-early-warning-system · 2024-10-30T23:01:19Z

EWS run on previous version of this PR (hash 3af59b2)

Details

Misc	iOS, visionOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 win
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2	✅ 🧪 win-tests
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🧪 api-wpe
	✅ 🧪 ios-wk2-wpt	✅ 🧪 mac-wk1	✅ 🛠 wpe-cairo
	✅ 🧪 api-ios	❌ 🧪 mac-wk2	✅ 🛠 gtk
	✅ 🛠 vision	❌ 🧪 mac-AS-debug-wk2	✅ 🧪 gtk-wk2
	✅ 🛠 vision-sim	✅ 🧪 mac-wk2-stress	✅ 🧪 api-gtk
	✅ 🧪 vision-wk2	❌ 🧪 mac-intel-wk2
	✅ 🛠 tv	❌ 🛠 mac-safer-cpp
	✅ 🛠 tv-sim
	✅ 🛠 watch
	✅ 🛠 watch-sim

mwyrzykowski · 2024-10-30T23:02:53Z

@djg I had to make a few more additions to get this actually working. Still ok to merge?

webkit-early-warning-system · 2024-10-31T04:52:48Z

EWS run on previous version of this PR (hash 8dac693)

Details

Misc	iOS, visionOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 win
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	~~🧪 wpe-wk2~~	✅ 🧪 win-tests
✅ 🧪 webkitperl	~~🧪 ios-wk2~~	~~🧪 api-mac~~	~~🧪 api-wpe~~
	~~🧪 ios-wk2-wpt~~	~~🧪 mac-wk1~~	✅ 🛠 wpe-cairo
	~~🧪 api-ios~~	~~🧪 mac-wk2~~	✅ 🛠 gtk
	✅ 🛠 vision	~~🧪 mac-AS-debug-wk2~~	~~🧪 gtk-wk2~~
	✅ 🛠 vision-sim	~~🧪 mac-wk2-stress~~	~~🧪 api-gtk~~
	~~🧪 vision-wk2~~	~~🧪 mac-intel-wk2~~
	✅ 🛠 tv	~~🛠 mac-safer-cpp~~
	✅ 🛠 tv-sim
	✅ 🛠 watch
	✅ 🛠 watch-sim

webkit-ews-buildbot · 2024-10-31T05:12:24Z

Safer C++ Build #4301

❌ Found 5 new failures. Please address these issues before landing. See WebKit Guidelines for Safer C++ Programming.
(cc @rniwa)

webkit-early-warning-system · 2024-10-31T05:16:24Z

EWS run on previous version of this PR (hash 84013ac)

Details

Misc	iOS, visionOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 win
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2	✅ 🧪 win-tests
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🧪 api-wpe
	✅ 🧪 ios-wk2-wpt	✅ 🧪 mac-wk1	✅ 🛠 wpe-cairo
	⏳ 🧪 api-ios	❌ 🧪 mac-wk2	✅ 🛠 gtk
	✅ 🛠 vision	❌ 🧪 mac-AS-debug-wk2	✅ 🧪 gtk-wk2
	✅ 🛠 vision-sim	✅ 🧪 mac-wk2-stress	✅ 🧪 api-gtk
	✅ 🧪 vision-wk2	❌ 🧪 mac-intel-wk2
	✅ 🛠 tv	❌ 🛠 mac-safer-cpp
	✅ 🛠 tv-sim
	✅ 🛠 watch
	✅ 🛠 watch-sim

webkit-ews-buildbot · 2024-10-31T11:08:48Z

Safer C++ Build #4346

❌ Found 1 new failure. Please address these issues before landing. See WebKit Guidelines for Safer C++ Programming.
(cc @rniwa)

webkit-early-warning-system · 2024-10-31T15:10:59Z

EWS run on current version of this PR (hash abd58ed)

Details

Misc	iOS, visionOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 win
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2	✅ 🧪 win-tests
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🧪 api-wpe
	✅ 🧪 ios-wk2-wpt	✅ 🧪 mac-wk1	✅ 🛠 wpe-cairo
	✅ 🧪 api-ios	✅ 🧪 mac-wk2	✅ 🛠 gtk
	✅ 🛠 vision	✅ 🧪 mac-AS-debug-wk2	✅ 🧪 gtk-wk2
	✅ 🛠 vision-sim	✅ 🧪 mac-wk2-stress	✅ 🧪 api-gtk
✅ 🛠 🧪 merge	✅ 🧪 vision-wk2	✅ 🧪 mac-intel-wk2
	✅ 🛠 tv	~~🛠 mac-safer-cpp~~
	✅ 🛠 tv-sim
	✅ 🛠 watch
	✅ 🛠 watch-sim

webkit-ews-buildbot · 2024-10-31T18:26:43Z

Safe-Merge-Queue: Build #37114.

…xcessive memory https://bugs.webkit.org/show_bug.cgi?id=282153 rdar://138726891 Reviewed by Dan Glastonbury. Command encoders were stored in a WeakHashSet, but we only need to store the valid ones and not invalid ones. Remove invalid encoders to avoid a retain cycle. * Source/WebGPU/WebGPU/Buffer.mm: (WebGPU::Buffer::setCommandEncoder const): * Source/WebGPU/WebGPU/CommandEncoder.h: * Source/WebGPU/WebGPU/CommandEncoder.mm: (WebGPU::CommandEncoder::removeInvalidEncoders): * Source/WebGPU/WebGPU/ExternalTexture.mm: (WebGPU::ExternalTexture::setCommandEncoder const): * Source/WebGPU/WebGPU/QuerySet.mm: (WebGPU::QuerySet::setCommandEncoder const): * Source/WebGPU/WebGPU/Texture.mm: (WebGPU::Texture::setCommandEncoder const): * Source/WebGPU/WebGPU/TextureView.mm: (WebGPU::TextureView::setCommandEncoder const): Canonical link: https://commits.webkit.org/285968@main

webkit-commit-queue · 2024-10-31T18:55:12Z

Committed 285968@main (31d96d6): https://commits.webkit.org/285968@main

Reviewed commits have been landed. Closing PR #35809 and removing active labels.

mwyrzykowski requested a review from tadeuzagallo as a code owner October 28, 2024 18:56

mwyrzykowski self-assigned this Oct 28, 2024

mwyrzykowski added the WebGPU For bugs in WebGPU label Oct 28, 2024

mwyrzykowski requested a review from djg October 28, 2024 18:57

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Oct 28, 2024

mwyrzykowski removed the merging-blocked Applied to prevent a change from being merged label Oct 28, 2024

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Oct 29, 2024

mwyrzykowski removed the merging-blocked Applied to prevent a change from being merged label Oct 29, 2024

mwyrzykowski force-pushed the eng/WebGPU-webgpu-github-iowebgpu-samplessamplerenderBundles-uses-excessive-memory branch from b3617ec to e87c9bc Compare October 29, 2024 19:15

djg approved these changes Oct 30, 2024

View reviewed changes

Comment thread Source/WebGPU/WebGPU/ExternalTexture.mm Outdated

mwyrzykowski force-pushed the eng/WebGPU-webgpu-github-iowebgpu-samplessamplerenderBundles-uses-excessive-memory branch from e87c9bc to 6e4093f Compare October 30, 2024 22:03

mwyrzykowski force-pushed the eng/WebGPU-webgpu-github-iowebgpu-samplessamplerenderBundles-uses-excessive-memory branch from 6e4093f to 3af59b2 Compare October 30, 2024 23:01

mwyrzykowski requested a review from djg October 30, 2024 23:02

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Oct 31, 2024

mwyrzykowski removed the merging-blocked Applied to prevent a change from being merged label Oct 31, 2024

mwyrzykowski force-pushed the eng/WebGPU-webgpu-github-iowebgpu-samplessamplerenderBundles-uses-excessive-memory branch from 3af59b2 to 8dac693 Compare October 31, 2024 04:52

mwyrzykowski force-pushed the eng/WebGPU-webgpu-github-iowebgpu-samplessamplerenderBundles-uses-excessive-memory branch from 8dac693 to 84013ac Compare October 31, 2024 05:16

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Oct 31, 2024

mwyrzykowski removed the merging-blocked Applied to prevent a change from being merged label Oct 31, 2024

mwyrzykowski force-pushed the eng/WebGPU-webgpu-github-iowebgpu-samplessamplerenderBundles-uses-excessive-memory branch from 84013ac to abd58ed Compare October 31, 2024 15:10

mwyrzykowski added the safe-merge-queue Applied to automatically send a pull-request to merge-queue after passing EWS checks label Oct 31, 2024

webkit-ews-buildbot added merge-queue Applied to send a pull request to merge-queue and removed safe-merge-queue Applied to automatically send a pull-request to merge-queue after passing EWS checks labels Oct 31, 2024

webkit-commit-queue force-pushed the eng/WebGPU-webgpu-github-iowebgpu-samplessamplerenderBundles-uses-excessive-memory branch from abd58ed to 31d96d6 Compare October 31, 2024 18:55

webkit-commit-queue merged commit 31d96d6 into WebKit:main Oct 31, 2024

webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label Oct 31, 2024

Conversation

mwyrzykowski commented Oct 28, 2024 • edited by webkit-early-warning-system Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

31d96d6

Uh oh!

webkit-early-warning-system commented Oct 28, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

webkit-early-warning-system commented Oct 29, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

djg left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

webkit-early-warning-system commented Oct 30, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

webkit-early-warning-system commented Oct 30, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mwyrzykowski commented Oct 30, 2024

Uh oh!

webkit-early-warning-system commented Oct 31, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

webkit-ews-buildbot commented Oct 31, 2024

Safer C++ Build #4301

Uh oh!

webkit-early-warning-system commented Oct 31, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

webkit-ews-buildbot commented Oct 31, 2024

Safer C++ Build #4346

Uh oh!

webkit-early-warning-system commented Oct 31, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

webkit-ews-buildbot commented Oct 31, 2024

Uh oh!

webkit-commit-queue commented Oct 31, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

mwyrzykowski commented Oct 28, 2024 •

edited by webkit-early-warning-system

Loading

`31d96d6`

webkit-early-warning-system commented Oct 28, 2024 •

edited

Loading

webkit-early-warning-system commented Oct 29, 2024 •

edited

Loading

webkit-early-warning-system commented Oct 30, 2024 •

edited

Loading

webkit-early-warning-system commented Oct 30, 2024 •

edited

Loading

webkit-early-warning-system commented Oct 31, 2024 •

edited

Loading

webkit-early-warning-system commented Oct 31, 2024 •

edited

Loading

webkit-early-warning-system commented Oct 31, 2024 •

edited

Loading