[GPU Process] [Filters] Cache the SVGFilter applying results in RemoteResourceCache #13814

shallawa · 2023-05-12T17:22:42Z

`b686ba4`

[GPU Process] [Filters] Cache the SVGFilter applying results in RemoteResourceCache
https://bugs.webkit.org/show_bug.cgi?id=232845
rdar://85426641

Reviewed by Simon Fraser.

This allows caching the results of applying an SVGFilter to a source ImageBuffer
in GPU Process. We should be able to use the cached result if the Filter was not
changed. We should be also able to clear some of the result FilterImages if a
FilterEffect was changed.

* Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp:
(WebCore::RenderSVGResourceFilter::applyResource):
* Source/WebCore/svg/graphics/filters/SVGFilter.cpp:
(WebCore::SVGFilter::mergeEffects):
* Source/WebCore/svg/graphics/filters/SVGFilter.h:
* Source/WebKit/GPUProcess/graphics/RemoteDisplayListRecorder.cpp:
(WebKit::RemoteDisplayListRecorder::drawFilteredImageBufferInternal):
(WebKit::RemoteDisplayListRecorder::drawFilteredImageBuffer):
* Source/WebKit/GPUProcess/graphics/RemoteDisplayListRecorder.h:
* Source/WebKit/WebProcess/GPU/graphics/RemoteDisplayListRecorderProxy.cpp:
(WebKit::RemoteDisplayListRecorderProxy::recordDrawFilteredImageBuffer):

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

48a0df2

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	~~🛠 wincairo~~
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	~~🧪 wpe-wk2~~
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🛠 gtk
	~~🧪 ios-wk2-wpt~~	✅ 🧪 mac-wk1	~~🧪 gtk-wk2~~
	~~🧪 api-ios~~	✅ 🧪 mac-wk2	✅ 🧪 api-gtk
	✅ 🛠 tv	✅ 🧪 mac-AS-debug-wk2
	✅ 🛠 tv-sim
❌ 🛠 🧪 merge	✅ 🛠 watch
	~~🛠 watch-sim~~

smfr · 2023-05-12T17:24:09Z

[GPU Process] [Filters 22/23] Cache the SVGFilter applying results in RemoteResourceCache

I don't think the "22/23" is useful.

webkit-early-warning-system · 2023-05-12T17:25:33Z

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

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	~~🛠 mac~~	~~🛠 wpe~~	⏳ 🛠 wincairo
~~🧪 bindings~~	⏳ 🛠 ios-sim	✅ 🛠 mac-AS-debug	~~🧪 wpe-wk2~~
~~🧪 webkitperl~~	⏳ 🧪 ios-wk2	~~🧪 api-mac~~	~~🛠 gtk~~
⏳ 🧪 webkitpy	⏳ 🧪 ios-wk2-wpt	~~🧪 mac-wk1~~	~~🧪 gtk-wk2~~
⏳ 🛠 🧪 jsc	⏳ 🧪 api-ios	~~🧪 mac-wk2~~	~~🧪 api-gtk~~
	⏳ 🛠 tv	⏳ 🧪 mac-AS-debug-wk2
	⏳ 🛠 tv-sim	~~🧪 mac-wk2-stress~~
	⏳ 🛠 watch
	✅ 🛠 watch-sim

webkit-early-warning-system · 2023-05-12T17:25:35Z

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

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
⏳ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	~~🛠 wpe~~	⏳ 🛠 wincairo
~~🧪 bindings~~	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	~~🧪 wpe-wk2~~
~~🧪 webkitperl~~	~~🧪 ios-wk2~~	~~🧪 api-mac~~	✅ 🛠 gtk
~~🧪 webkitpy~~	~~🧪 ios-wk2-wpt~~	~~🧪 mac-wk1~~	~~🧪 gtk-wk2~~
⏳ 🛠 🧪 jsc	⏳ 🧪 api-ios	~~🧪 mac-wk2~~	~~🧪 api-gtk~~
	✅ 🛠 tv	⏳ 🧪 mac-AS-debug-wk2
⏳ 🧪 services	✅ 🛠 tv-sim
	✅ 🛠 watch
	✅ 🛠 watch-sim

webkit-early-warning-system · 2023-05-12T17:28:01Z

EWS run on previous version of this PR (hash 0df44f4)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	❌ 🛠 wpe	❌ 🛠 wincairo
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	❌ 🧪 wpe-wk2
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	❌ 🛠 gtk
✅ 🧪 webkitpy	✅ 🧪 ios-wk2-wpt	✅ 🧪 mac-wk1	❌ 🧪 gtk-wk2
	✅ 🧪 api-ios	✅ 🧪 mac-wk2	❌ 🧪 api-gtk
	✅ 🛠 tv	✅ 🧪 mac-AS-debug-wk2
	✅ 🛠 tv-sim
	✅ 🛠 watch
	✅ 🛠 watch-sim

smfr · 2023-05-12T17:33:03Z

Source/WebCore/svg/graphics/filters/SVGFilterTransaction.h

+class FilterEffect;
+
+struct SVGFilterTransactionItem {
+    unsigned index;


Index into what? This isn't the index in this Vector<>, right?

It's a bit confusing to use these vectors for SVG filters, where the filter structure is a graph, and more confusing to have this standalone structure that contains indexes into something else.

It is an index to the SVGFilter::m_effects which is a Vector of the unique effects in the SVGFilter graph. The order of the effects in WebProcess and GPUProcess is the same. This is why when a certain FilterEffect changes in WebProcess we lookup its index in SVGFilter::m_effects and send it with this index to GPUProcess in SVGFilterTransaction. Using this index, GPUProcess will replace this effect in SVGFilter::m_effects and delete its FilterImage along with the result of all the dependent FilterEffects.

SVGFilterExpression represents the graph of the SVGFilter. It is a Vector of SVGFilterExpressionTerm. Each SVGFilterExpressionTerm has an index pointing to the SVGFilter::m_effects.

Is there a way we can package up SVGFilterExpression and SVGFilterTransaction into one struct, so we don't have these dangling indexes?

Yes we can send the whole SVGFilter to GPUP and merge the new effects with the old cached one. If an effect does not match its cached corresponding one, we replace the old with the new and we clear the result and all the dependent results of this effect.

webkit-early-warning-system · 2023-05-13T09:06:50Z

EWS run on previous version of this PR (hash 35b38f0)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 wincairo
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🛠 gtk
	✅ 🧪 ios-wk2-wpt	✅ 🧪 mac-wk1	✅ 🧪 gtk-wk2
	✅ 🧪 api-ios	✅ 🧪 mac-wk2	✅ 🧪 api-gtk
	✅ 🛠 tv	✅ 🧪 mac-AS-debug-wk2
	✅ 🛠 tv-sim
	✅ 🛠 watch
	✅ 🛠 watch-sim

webkit-early-warning-system · 2023-05-14T17:19:35Z

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

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
⏳ 🧪 style	🛠 ios	🛠 mac	🛠 wpe	🛠 wincairo
🧪 bindings	⏳ 🛠 ios-sim	🛠 mac-AS-debug	🧪 wpe-wk2
🧪 webkitperl	⏳ 🧪 ios-wk2	🧪 api-mac	🛠 gtk
	⏳ 🧪 ios-wk2-wpt	🧪 mac-wk1	🧪 gtk-wk2
	⏳ 🧪 api-ios	🧪 mac-wk2	🧪 api-gtk
	🛠 tv	🧪 mac-AS-debug-wk2
	🛠 tv-sim	🧪 mac-wk2-stress
	🛠 watch
	🛠 watch-sim

webkit-early-warning-system · 2023-05-14T17:19:38Z

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

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 wincairo
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🛠 gtk
	~~🧪 ios-wk2-wpt~~	✅ 🧪 mac-wk1	✅ 🧪 gtk-wk2
	~~🧪 api-ios~~	✅ 🧪 mac-wk2	✅ 🧪 api-gtk
	✅ 🛠 tv	✅ 🧪 mac-AS-debug-wk2
	✅ 🛠 tv-sim
	✅ 🛠 watch
	✅ 🛠 watch-sim

smfr · 2023-05-15T21:08:03Z

Source/WebKit/GPUProcess/graphics/RemoteDisplayListRecorder.cpp

+        return;
+    }
+
+    RefPtr cahcedFilter = resourceCache().cachedFilter({ filter->renderingResourceIdentifier(), m_webProcessIdentifier });


"cahcedFilter"

smfr · 2023-05-15T21:08:24Z

Source/WebKit/GPUProcess/graphics/RemoteDisplayListRecorder.cpp

+    }
+
+    RefPtr cahcedFilter = resourceCache().cachedFilter({ filter->renderingResourceIdentifier(), m_webProcessIdentifier });
+    if (!cahcedFilter || !is<SVGFilter>(*cahcedFilter)) {


This could be a single dynamicDowncast<>

webkit-early-warning-system · 2023-05-15T22:13:33Z

EWS run on current version of this PR (hash 48a0df2)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	~~🛠 wincairo~~
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	~~🧪 wpe-wk2~~
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🛠 gtk
	~~🧪 ios-wk2-wpt~~	✅ 🧪 mac-wk1	~~🧪 gtk-wk2~~
	~~🧪 api-ios~~	✅ 🧪 mac-wk2	✅ 🧪 api-gtk
	✅ 🛠 tv	✅ 🧪 mac-AS-debug-wk2
	✅ 🛠 tv-sim
❌ 🛠 🧪 merge	✅ 🛠 watch
	~~🛠 watch-sim~~

…eResourceCache https://bugs.webkit.org/show_bug.cgi?id=232845 rdar://85426641 Reviewed by Simon Fraser. This allows caching the results of applying an SVGFilter to a source ImageBuffer in GPU Process. We should be able to use the cached result if the Filter was not changed. We should be also able to clear some of the result FilterImages if a FilterEffect was changed. * Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp: (WebCore::RenderSVGResourceFilter::applyResource): * Source/WebCore/svg/graphics/filters/SVGFilter.cpp: (WebCore::SVGFilter::mergeEffects): * Source/WebCore/svg/graphics/filters/SVGFilter.h: * Source/WebKit/GPUProcess/graphics/RemoteDisplayListRecorder.cpp: (WebKit::RemoteDisplayListRecorder::drawFilteredImageBufferInternal): (WebKit::RemoteDisplayListRecorder::drawFilteredImageBuffer): * Source/WebKit/GPUProcess/graphics/RemoteDisplayListRecorder.h: * Source/WebKit/WebProcess/GPU/graphics/RemoteDisplayListRecorderProxy.cpp: (WebKit::RemoteDisplayListRecorderProxy::recordDrawFilteredImageBuffer): Canonical link: https://commits.webkit.org/264087@main

webkit-commit-queue · 2023-05-15T23:10:23Z

Committed 264087@main (b686ba4): https://commits.webkit.org/264087@main

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

shallawa requested a review from cdumez as a code owner May 12, 2023 17:22

shallawa self-assigned this May 12, 2023

shallawa force-pushed the eng/GPU-Process-Filters-2223-Cache-the-filter-applying-results-in-RemoteResourceCache branch from a59ad65 to cb8d4f1 Compare May 12, 2023 17:22

shallawa added the Layout and Rendering For bugs with layout and rendering of Web pages. label May 12, 2023

shallawa force-pushed the eng/GPU-Process-Filters-2223-Cache-the-filter-applying-results-in-RemoteResourceCache branch from cb8d4f1 to 3e2cdfb Compare May 12, 2023 17:25

shallawa changed the title ~~[GPU Process] [Filters 22/23] Cache the SVGFilter applying results in RemoteResourceCache~~ [GPU Process] [Filters] Cache the SVGFilter applying results in RemoteResourceCache May 12, 2023

shallawa force-pushed the eng/GPU-Process-Filters-2223-Cache-the-filter-applying-results-in-RemoteResourceCache branch from 3e2cdfb to 0df44f4 Compare May 12, 2023 17:26

shallawa requested a review from smfr May 12, 2023 17:26

smfr reviewed May 12, 2023

View reviewed changes

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label May 12, 2023

shallawa removed the merging-blocked Applied to prevent a change from being merged label May 13, 2023

shallawa force-pushed the eng/GPU-Process-Filters-2223-Cache-the-filter-applying-results-in-RemoteResourceCache branch from 0df44f4 to 35b38f0 Compare May 13, 2023 09:06

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label May 13, 2023

shallawa removed the merging-blocked Applied to prevent a change from being merged label May 14, 2023

shallawa changed the title ~~[GPU Process] [Filters] Cache the SVGFilter applying results in RemoteResourceCache~~ `[GPU Process] [Filters] Cache the SVGFilter applying results in RemoteResourceCache May 14, 2023

shallawa force-pushed the eng/GPU-Process-Filters-2223-Cache-the-filter-applying-results-in-RemoteResourceCache branch from 35b38f0 to cd149b1 Compare May 14, 2023 17:19

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label May 14, 2023

shallawa changed the title ~~`[GPU Process] [Filters] Cache the SVGFilter applying results in RemoteResourceCache~~ [GPU Process] [Filters] Cache the SVGFilter applying results in RemoteResourceCache May 14, 2023

smfr approved these changes May 15, 2023

View reviewed changes

shallawa removed the merging-blocked Applied to prevent a change from being merged label May 15, 2023

shallawa force-pushed the eng/GPU-Process-Filters-2223-Cache-the-filter-applying-results-in-RemoteResourceCache branch from cd149b1 to 48a0df2 Compare May 15, 2023 22:11

shallawa added the merge-queue Applied to send a pull request to merge-queue label May 15, 2023

webkit-commit-queue force-pushed the eng/GPU-Process-Filters-2223-Cache-the-filter-applying-results-in-RemoteResourceCache branch from 48a0df2 to 8e47cee Compare May 15, 2023 23:07

webkit-commit-queue force-pushed the eng/GPU-Process-Filters-2223-Cache-the-filter-applying-results-in-RemoteResourceCache branch from 8e47cee to b686ba4 Compare May 15, 2023 23:10

webkit-commit-queue merged commit b686ba4 into WebKit:main May 15, 2023

webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label May 15, 2023

shallawa deleted the eng/GPU-Process-Filters-2223-Cache-the-filter-applying-results-in-RemoteResourceCache branch May 17, 2023 01:41

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[GPU Process] [Filters] Cache the SVGFilter applying results in RemoteResourceCache #13814

[GPU Process] [Filters] Cache the SVGFilter applying results in RemoteResourceCache #13814

shallawa commented May 12, 2023 •

edited by webkit-early-warning-system

smfr commented May 12, 2023

webkit-early-warning-system commented May 12, 2023 •

edited

webkit-early-warning-system commented May 12, 2023 •

edited

webkit-early-warning-system commented May 12, 2023 •

edited

smfr May 12, 2023

shallawa May 12, 2023

shallawa May 12, 2023

smfr May 12, 2023

shallawa May 15, 2023

webkit-early-warning-system commented May 13, 2023 •

edited

webkit-early-warning-system commented May 14, 2023 •

edited

webkit-early-warning-system commented May 14, 2023 •

edited

smfr May 15, 2023

smfr May 15, 2023

webkit-early-warning-system commented May 15, 2023 •

edited

webkit-commit-queue commented May 15, 2023

[GPU Process] [Filters] Cache the SVGFilter applying results in RemoteResourceCache #13814

[GPU Process] [Filters] Cache the SVGFilter applying results in RemoteResourceCache #13814

Conversation

shallawa commented May 12, 2023 • edited by webkit-early-warning-system

smfr commented May 12, 2023

webkit-early-warning-system commented May 12, 2023 • edited

webkit-early-warning-system commented May 12, 2023 • edited

webkit-early-warning-system commented May 12, 2023 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

webkit-early-warning-system commented May 13, 2023 • edited

webkit-early-warning-system commented May 14, 2023 • edited

webkit-early-warning-system commented May 14, 2023 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

webkit-early-warning-system commented May 15, 2023 • edited

webkit-commit-queue commented May 15, 2023

shallawa commented May 12, 2023 •

edited by webkit-early-warning-system

webkit-early-warning-system commented May 12, 2023 •

edited

webkit-early-warning-system commented May 12, 2023 •

edited

webkit-early-warning-system commented May 12, 2023 •

edited

webkit-early-warning-system commented May 13, 2023 •

edited

webkit-early-warning-system commented May 14, 2023 •

edited

webkit-early-warning-system commented May 14, 2023 •

edited

webkit-early-warning-system commented May 15, 2023 •

edited