Webgl profiling #22130

cbrewster · 2018-11-06T22:06:47Z

This adds additional profiling for WebGL commands and some WebGL DOM APIs using the existing profiling infrastructure.

I don't really like adding a ton of new profiling category variants, but it seemed like the simplest approach given how signpost works with repr[u32] and using a bitwise shift for the event category and how characterize.py works.

./mach build -d does not report any errors
./mach test-tidy does not report any errors
These changes fix #21150 (github issue number if applicable).

There are tests for these changes OR
These changes do not require tests because it adds additional profiling

This change is

highfive · 2018-11-06T22:06:52Z

Heads up! This PR modifies the following files:

@asajeffrey: components/script/dom/webglrenderingcontext.rs
@paulrouget: components/servo/lib.rs
@KiChjang: components/script/dom/webglrenderingcontext.rs

highfive · 2018-11-06T22:06:54Z

Warning

These commits modify unsafe code. Please review it carefully!
These commits modify script code, but no tests are modified. Please consider adding a test!

bors-servo · 2018-11-07T15:15:18Z

☔ The latest upstream changes (presumably #22126) made this pull request unmergeable. Please resolve the merge conflicts.

jdm · 2018-11-19T16:54:00Z

r? @nox

bors-servo · 2018-11-21T16:36:03Z

☔ The latest upstream changes (presumably #22225) made this pull request unmergeable. Please resolve the merge conflicts.

nox · 2018-11-21T16:41:04Z

Is there really no way to avoid all those new categories?

nox · 2018-11-21T16:42:09Z

components/canvas/webgl_thread.rs

@@ -1703,3 +1711,147 @@ fn map_dot_separated<F: Fn(&str, &mut String)>(s: &str, f: F) -> String {
    }
    mapped
 }
+
+fn profiler_category(webgl_command: &WebGLCommand) -> ProfilerCategory {


This could be generated with a macro wrapping this function and the definition of WebGLCommand.

cbrewster · 2018-11-21T17:24:41Z

There’s no good way to avoid adding new categories since we have to strip away any associated data from the WebGLCommand. I suppose we could use a macro to generate a new enum that is the same as WebGLCommand but without any associated data


        Add WebGL commands to profiler categories


        Profile WebGL Commands


        Profile synchronous WebGl DOM API methods


        Fix tidy issues


        Rebase


        Generate conversion between WebGLCommand and ProfilerCategory

cbrewster · 2018-12-11T00:13:19Z

Sorry had some git issues...
I added a macro that automatically generates the conversion code between a WebGLCommand and ProfilerCategory. I wasn't sure how to do it via a macro_rules so I made a custom derive. I've not written many macros, so it may need some improvement.

Manishearth · 2019-02-11T21:10:49Z

components/profile/time.rs

@@ -157,6 +157,145 @@ impl Formattable for ProfilerCategory {
            ProfilerCategory::IpcReceiver => "Blocked at IPC Receive",
            ProfilerCategory::IpcBytesReceiver => "Blocked at IPC Bytes Receive",
            ProfilerCategory::ApplicationHeartbeat => "Application Heartbeat",
+            ProfilerCategory::WebGlGetContextAttributes => "WebGlGetContextAttributes",


can we (proc?)macro-generate all of these to avoid clutter?

We could just do a Derive(Debug) here, but we would lose the + and | + formatting for subcategories. Although we could just derive debug, and then just manually add the prefix to the few categories that need them. The output would be like IpcReceiver rather than Blocked at IPC Receive though.

Manishearth · 2019-02-11T21:10:49Z

components/profile_derive/lib.rs

+use syn::{Data, DeriveInput, Fields, Ident, Lit, Meta, MetaNameValue};
+
+#[proc_macro_derive(ToProfile, attributes(profile_prefix))]
+pub fn derive_to_profile(item: proc_macro::TokenStream) -> proc_macro::TokenStream {


please add some comments explaining the transformation being made here

bors-servo · 2019-02-27T09:07:37Z

☔ The latest upstream changes (presumably #22938) made this pull request unmergeable. Please resolve the merge conflicts.


        Auto merge of #23299 - jdm:minimize-mozjs-deps, r=Manishearth

Remove mozjs dep from malloc_size_of. This makes making local changes to mozjs_sys much more frustrating than it should be, and blocks merging #22130. --- - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23299)


        Auto merge of #23299 - jdm:minimize-mozjs-deps, r=Manishearth

Remove mozjs dep from malloc_size_of. This makes making local changes to mozjs_sys much more frustrating than it should be, and blocks merging #22130. --- - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23299)

cbrewster · 2019-06-25T05:29:49Z

I don't have the time at the moment to fix this up, sorry for blocking this so long

highfive assigned ferjm Nov 6, 2018

highfive added the S-awaiting-review label Nov 6, 2018

highfive added the S-needs-rebase label Nov 7, 2018

cbrewster force-pushed the cbrewster:webgl_profile branch 2 times, most recently from 0f0bd72 to 0898440 Nov 19, 2018

cbrewster removed the S-needs-rebase label Nov 19, 2018

cbrewster changed the title ~~[WIP] Webgl profiling~~ Webgl profiling Nov 19, 2018

highfive added the S-needs-rebase label Nov 21, 2018

nox reviewed Nov 21, 2018

View changes

Add WebGL commands to profiler categories

f6d0615

cbrewster force-pushed the cbrewster:webgl_profile branch 2 times, most recently from 2336380 to 8cf7313 Dec 10, 2018

cbrewster added 3 commits Nov 5, 2018

Profile WebGL Commands

a0b84b5

Profile synchronous WebGl DOM API methods

542e055

Fix tidy issues

0407642

cbrewster force-pushed the cbrewster:webgl_profile branch from 8cf7313 to 746578c Dec 11, 2018

Rebase

8539b70

cbrewster force-pushed the cbrewster:webgl_profile branch 3 times, most recently from 2168060 to 142256b Dec 11, 2018

Generate conversion between WebGLCommand and ProfilerCategory

Loading status checks…

1097e7f

cbrewster force-pushed the cbrewster:webgl_profile branch from 142256b to 1097e7f Dec 11, 2018

cbrewster removed the S-needs-rebase label Dec 11, 2018

cbrewster assigned nox and unassigned ferjm Dec 11, 2018

Manishearth approved these changes Feb 11, 2019

View changes

jdm assigned Manishearth and unassigned nox Feb 11, 2019

jdm added S-needs-code-changes and removed S-awaiting-review labels Feb 11, 2019

highfive added the S-needs-rebase label Feb 27, 2019

jdm mentioned this pull request May 1, 2019

Remove mozjs dep from malloc_size_of. #23299

Merged

2 of 2 tasks complete

cbrewster closed this Jun 25, 2019

cbrewster mentioned this pull request Jun 25, 2019

Build a webgl profiler #21150

Open

servo / servo

Webgl profiling #22130

Webgl profiling #22130

cbrewster commented Nov 6, 2018 •

edited by SimonSapin

highfive commented Nov 6, 2018

highfive commented Nov 6, 2018

bors-servo commented Nov 7, 2018

jdm commented Nov 19, 2018

bors-servo commented Nov 21, 2018

nox commented Nov 21, 2018

This comment has been minimized.

cbrewster commented Nov 21, 2018

cbrewster commented Dec 11, 2018

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

bors-servo commented Feb 27, 2019

cbrewster commented Jun 25, 2019

servo / servo

Join GitHub today

Webgl profiling #22130

Webgl profiling #22130

Conversation

cbrewster commented Nov 6, 2018 • edited by SimonSapin

highfive commented Nov 6, 2018

highfive commented Nov 6, 2018

bors-servo commented Nov 7, 2018

jdm commented Nov 19, 2018

bors-servo commented Nov 21, 2018

nox commented Nov 21, 2018

This comment has been minimized.

nox Nov 21, 2018

cbrewster commented Nov 21, 2018

cbrewster commented Dec 11, 2018

This comment has been minimized.

Manishearth Feb 11, 2019

This comment has been minimized.

cbrewster Feb 15, 2019

This comment has been minimized.

Manishearth Feb 11, 2019

bors-servo commented Feb 27, 2019

cbrewster commented Jun 25, 2019

cbrewster commented Nov 6, 2018 •

edited by SimonSapin