Skip to content

[WebGPU] Support PIX Capture for WebGPU EP #23192

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 10 commits into from
Feb 8, 2025
Merged

[WebGPU] Support PIX Capture for WebGPU EP #23192

merged 10 commits into from
Feb 8, 2025

Conversation

shaoboyan091
Copy link
Contributor

PIX Capture tool requires 'present' to end a frame capture. ORT doesn't have rendering work so no 'present' happens.

To avoid endless waiting for PIX capture tool, this PR added a blank surface and 'present' on it in each session run.

The surface is created in WebGPU ep constructor and closed in WebGPU ep destructor.

Description

Motivation and Context

@shaoboyan091
Copy link
Contributor Author

@qjia7 @fs-eire PTAL, thanks!

@shaoboyan091
Copy link
Contributor Author

@microsoft-github-policy-service agree [company="Microsoft"]

@shaoboyan091
Copy link
Contributor Author

@microsoft-github-policy-service agree

@shaoboyan091 shaoboyan091 changed the title Support PIX Capture for WebGPU EP [WebGPU] Support PIX Capture for WebGPU EP Dec 26, 2024
@snnn snnn added the ep:WebGPU ort-web webgpu provider label Dec 30, 2024
fs-eire
fs-eire reviewed Jan 2, 2025
View reviewed changes
fs-eire
fs-eire reviewed Jan 2, 2025
View reviewed changes
fs-eire
fs-eire reviewed Jan 2, 2025
View reviewed changes
@shaoboyan091 shaoboyan091 requested a review from fs-eire January 2, 2025 08:04
@shaoboyan091
Copy link
Contributor Author

@fs-eire Please take another look, thanks!

@guschmue guschmue requested a review from Copilot January 6, 2025 19:15
Copilot
Copilot AI reviewed Jan 6, 2025
View reviewed changes
Copy link
Contributor

@Copilot Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot reviewed 1 out of 9 changed files in this pull request and generated no comments.

Files not reviewed (8)
  • cmake/CMakeLists.txt: Language not supported
  • cmake/external/onnxruntime_external_deps.cmake: Language not supported
  • onnxruntime/core/providers/webgpu/webgpu_context.cc: Language not supported
  • onnxruntime/core/providers/webgpu/webgpu_context.h: Language not supported
  • onnxruntime/core/providers/webgpu/webgpu_execution_provider.cc: Language not supported
  • onnxruntime/core/providers/webgpu/webgpu_execution_provider.h: Language not supported
  • onnxruntime/core/providers/webgpu/webgpu_provider_factory.cc: Language not supported
  • onnxruntime/core/providers/webgpu/webgpu_provider_options.h: Language not supported

@guschmue
Copy link
Contributor

guschmue commented Jan 6, 2025

lint is not happy

@shaoboyan091
Copy link
Contributor Author

@guschmue Ok, I thought it was bots error when I see 403 state instead of lint error. So run lint -A seems not handle all things right. Thanks for the info.

@shaoboyan091
Copy link
Contributor Author

Turns out the lintrunner doesn't work correctly because it cannot find clang-format.exe(Maybe due to I have a depot_tools? The error message seems related). However, after I fixed it locally, the lintrunner works.

fs-eire
fs-eire reviewed Jan 8, 2025
View reviewed changes
fs-eire
fs-eire reviewed Jan 8, 2025
View reviewed changes
fs-eire
fs-eire reviewed Jan 8, 2025
View reviewed changes
fs-eire
fs-eire reviewed Jan 8, 2025
View reviewed changes
fs-eire
fs-eire reviewed Jan 8, 2025
View reviewed changes
fs-eire
fs-eire reviewed Jan 8, 2025
View reviewed changes
fs-eire
fs-eire reviewed Jan 8, 2025
View reviewed changes
fs-eire
fs-eire reviewed Jan 8, 2025
View reviewed changes
fs-eire
fs-eire reviewed Jan 8, 2025
View reviewed changes
@shaoboyan091 shaoboyan091 requested a review from fs-eire January 8, 2025 09:05
@shaoboyan091
Copy link
Contributor Author

@fs-eire PTAL again, thanks!

fs-eire
fs-eire reviewed Jan 16, 2025
View reviewed changes
fs-eire
fs-eire reviewed Jan 16, 2025
View reviewed changes
@shaoboyan091 shaoboyan091 requested a review from fs-eire January 16, 2025 04:50
@shaoboyan091
Copy link
Contributor Author

@fs-eire PTAL again, thanks!

@shaoboyan091
Support PIX Capture for WebGPU EP
0f3fe0c 
PIX Capture tool requires 'present' to end a frame capture. ORT doesn't
have rendering work so no 'present' happens.

To avoid endless waiting for PIX capture tool, this PR added a blank
surface and 'present' on it in each session run.

The surface is created in WebGPU ep constructor and closed in WebGPU ep
destructor.
@shaoboyan091
Remove dirty code
0702a13
@shaoboyan091
Address Comments
3cb8de1
@shaoboyan091
Fix lint issue
028e876
@shaoboyan091
Address copilot comments
71158c7
@shaoboyan091
Address comments
b0b6817
@shaoboyan091
Address comments
2e669cf
@shaoboyan091
Remove unused header and revert submodule changes
49f52e8
@shaoboyan091
Fix werror
aeeb278
@shaoboyan091 shaoboyan091 requested review from a team as code owners February 8, 2025 02:32
fs-eire
fs-eire reviewed Feb 8, 2025
View reviewed changes
fs-eire
fs-eire reviewed Feb 8, 2025
View reviewed changes
@fs-eire
Copy link
Contributor

fs-eire commented Feb 8, 2025

/azp run Windows ARM64 QNN CI Pipeline,Windows x64 QNN CI Pipeline,Windows CPU CI Pipeline,Windows GPU CUDA CI Pipeline,Windows GPU DML CI Pipeline,Windows GPU Doc Gen CI Pipeline,Windows GPU TensorRT CI Pipeline,ONNX Runtime Web CI Pipeline,Linux CPU CI Pipeline,Linux CPU Minimal Build E2E CI Pipeline

@fs-eire
Copy link
Contributor

fs-eire commented Feb 8, 2025

/azp run Linux GPU CI Pipeline,Linux GPU TensorRT CI Pipeline,Linux OpenVINO CI Pipeline,Linux QNN CI Pipeline,MacOS CI Pipeline,orttraining-linux-ci-pipeline,orttraining-linux-gpu-ci-pipeline,onnxruntime-binary-size-checks-ci-pipeline,Big Models,Linux Android Emulator QNN CI Pipeline

@fs-eire
Copy link
Contributor

fs-eire commented Feb 8, 2025

/azp run Android CI Pipeline,iOS CI Pipeline,ONNX Runtime React Native CI Pipeline,CoreML CI Pipeline,Linux DNNL CI Pipeline,Linux MIGraphX CI Pipeline,Linux ROCm CI Pipeline

@azure-pipelines Azure Pipelines
Copy link

Azure Pipelines successfully started running 7 pipeline(s).

@azure-pipelines Azure Pipelines
Copy link

Azure Pipelines successfully started running 8 pipeline(s).

@azure-pipelines Azure Pipelines
Copy link

Azure Pipelines successfully started running 10 pipeline(s).

@fs-eire
Copy link
Contributor

fs-eire commented Feb 8, 2025

/azp run Win_TRT_Minimal_CUDA_Test_CI

@azure-pipelines Azure Pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@fs-eire fs-eire merged commit 5ef1832 into microsoft:main Feb 8, 2025
90 of 92 checks passed
ashrit-ms pushed a commit that referenced this pull request Feb 11, 2025
@shaoboyan091 @ashrit-ms
[WebGPU] Support PIX Capture for WebGPU EP (#23192)
f887b27 
PIX Capture tool requires 'present' to end a frame capture. ORT doesn't
have rendering work so no 'present' happens.

To avoid endless waiting for PIX capture tool, this PR added a blank
surface and 'present' on it in each session run.

The surface is created in WebGPU ep constructor and closed in WebGPU ep
destructor.

### Description
<!-- Describe your changes. -->



### Motivation and Context
<!-- - Why is this change required? What problem does it solve?
- If it fixes an open issue, please link to the issue here. -->
@ashrit-ms ashrit-ms mentioned this pull request Feb 11, 2025
Merged
ashrit-ms added a commit that referenced this pull request Feb 11, 2025
@ashrit-ms @adrianlizarraga
@titaiwangms @carzh @verdie-g @fajin-corp @snnn @toothache @michaelgsharp @dependabot @smuzaffar @fs-eire @yuslepukhin @cocotdf @jchen351 @karim-vad @jslhcl @github-actions @HectorSVC @TedThemistokleous @edgchen1 @take-cheeze @xadupre @justinchuby @tianleiwu @kunal-vaishnavi @sushraja-msft @luncliff @jywu-msft @bachelor-dou @jambayk @yf711 @ms-gavinkinsey @prathikr @satyajandhyala @xenova @ankitm3k @jatinwadhwa921 @saurabhkale17 @TejalKhade28 @sfatimar @javier-intel @preetha-intel @ericcraw @microsoft-github-policy-service @jchen10 @shaoboyan091 @dimbleby @guschmue @egalli
Update win-ort-main to tip main 250211 (#23646)
0420687 
### Description
This PR is to update the win-ort-main branch to the tip main branch as
of 2025-02-11.

### PR List
74c778e [WebNN EP] Automatically move input CPU tensors to ml-tensor
(#23073)
3775057 use correct total length to fix static kv_cache performance
(#23615)
3901e96 remove --use_vcpkg flag for Python-CUDA-Packaging-Pipeline
(#23631)
c610df5 Add python_requires to package metadata (#23604)
2d27d68 [QNN EP] Add QNN EP to ARM64X build targets (#23635)
e666503 [webgpu] no longer need pass-in gpu adapter for custom
context (#23593)
af679a0 Fix logic for selecting alternate name for blob (#23617)
e206950 [ARM CPU] Add fp16 mlas kernels for exp, tanh, softmax,
logsoftmax, softcap (#23597)
9ba5619 Update pybind and json to the latest (#23589)
c54736c Migrate iOS release pipeline to 1 ES (#23606)
3981326 Increase timeout for Windows TensorRT CI (#23625)
0274b7b fix on trtCudaVersion (#23616)
740e9ab update run CI script (#23621)
5ef1832 [WebGPU] Support PIX Capture for WebGPU EP (#23192)
0114551 Fix for C4267 warning (#23610)
002916a Validate the context_file_path before EP compile graphs
(#23611)
0887e36 [webgpu] Use pushErrorScope()/popErrorScope() once for an
inference run (#23438)
65008cb Auto-generated baselines by 1ES Pipeline Templates (#23603)
09e5724 [CUDA] Fix beam search of num_beams > 32 (#23599)
82840f6 Implement Flash Attention 2 for webgpu EP (#23576)
a6ea57b OpenVINO EP Weights Sharing Feature (#23553)
2c2ff4a [CUDA] Fix BeamSearchTest.DummyT5WithSequenceInputIds test
failure in Windows (#23596)
d981b15 [webgpu/js] Optimize resize webgpu op & fix precision issues
(#23591)
328a13c Enable VCPKG in more pipelines (#23590)
6728d60 [TensorRT EP] support TensorRT 10.8-GA (#23592)
d1fb58b Quantization tool: Allow user to override calibrator's
session EP (#23559)
649ced4 Enable user loading model with external data from memory
buffer (#23557)
544bdd6 Fix ConvTranspose for certain attribute combinations (#23488)
8f6ddf3 Delete extra cgmanifest entries and files (#23583)
5f6a315 Enable VCPKG in CI build (#23426)
e1e3f62 Bump lintrunner from 0.12.5 to 0.12.7 (#23326)
cd8775f Fix Node JS Samples (#23581)
6b4f9c4 [WebGPU EP] Batch Norm Implementation (#23525)
1fce51b Fix all instances of 4244 and 4267 warnings in OV EP code
(#23567)
c29ca1c Update QNN default version to 2.31 (#23573)
2fc75a4 [mobile] Add Android BrowserStack test project back (#23551)
9e18b6a [CUDA] Update nvcc flags (#23572)
b47e1e6 [QNN EP] Make offloading graph input/output quantization (to
CPU) the default (#23368)
75a9b40 [ROCm] Update CI to use rocm 6.3.2 (#23577)
26ff2b6 Bump ruff from 0.9.3 to 0.9.4 (#23563)
b2560a7 Update react-native to 0.72 (#23509)
faee912 [js] update JavaScript API to support QNN EP options (#23486)
816e8cb [EP Perf] Update env to ubuntu 22.04 (#23570)
cddc271 Use Eigen in Round implementation (#23571)
e8b0bdb Shape inference: ReduceMean dispatcher, quant_pre_process:
skip_symbolic_shape bugfix (#23558)
267b493 delete the supported domain version upper bounds (#23237)
bb7f961 remove log spam from cpuinfo (#23548)
169917b Use latest vcpkg commit in configuration, sync manifest with
deps.txt (#23554)
a9d4d08 Add of ReduceMax Gradient (#23501)
6bbf1bd [js/web] upgrade version of flatbuffers (#23545)
271c509 DP4AMatMul perf refinements (#23539)
cb69c59 Add fusions for SigLIP and Conformer-Encoder (#23528)
61fae9b Remove "--enable_pybind" from webgpu pipeline (#23550)
0bb4ea6 Update BiasGelu fusion and related ops (#23518)
4dde74a Add more details to BrowserStack script failure (#23520)
ead9d5c Set ANDROID_USE_LEGACY_TOOLCHAIN_FILE to false (#23544)
7e24088 Enable dlpack by default (#23110)
dc2f7a9 Add overload of `TryParseStringWithClassicLocale()` that uses
`std::from_chars()` (#23541)
5407c69 Fix the issue that the new generated EP context model not
able to find external data (#23537)
fbae88f [js/web] use the recommended workaround for Vite (#23531)
d5338da Fix tensor external data info length parsing issue. (#23526)
e3e4173 [ROCm EP] Fix transpose helper for gfx gridsize constraints
(#23527)
80bc1d2 Enable Ep context with external data for CPU nodes (#23498)
bf023ab [js/web] allow import .mjs/.wasm file (#23487)
655a23f [onnxruntime/build] Add new flag enable_generic_interface to
build primary EPs by default (#23342)
a770a8d Update RN to 0.71.19 (#23381)
1cf0ebd Delete Prefast workflow until the build failure is fixed
(#23510)
d2c5e24 Add of GlobalMaxPool Gradient (#23502)
ded8730 Remove thrust::unary_function (#23506)
8db97a6 [webgpu] Bump version of Dawn to b9b4a370 (#23494)
fdde2e2 Fix for gcc 13.3.1: Avoid creating a copy (#23500)
96ec1dd Bump ruff from 0.9.2 to 0.9.3 (#23496)
42f0c00 Adds the new System.Numerics.Tensors as an input/output type
when using dotnet 8.0 and up. (#23261)
97c2bbe Fix shape infer of onnx GroupNorm (#23477)
1fc9c48 Enable coremltools for Linux build (#23481)
13348c5 [ARM CPU] hgemm optimized for gqa (#23107)
c89a798 Enable opti on Microsoft.ML.OnnxRuntime with RelWithDebInfo
config (#23463)
d00ae32 Revert "[Mobile] Add BrowserStack Android MAUI Test (#23383)"
(#23474)
8b1d3b3 Align AvgPool ceil_mode on last value to torch (#16752)
06fc73b [TRT EP Perf Tool] Add annotations import to python script to
support annotations on Python 3.8 (#23466)

### Motivation and Context
This update includes the change to add QNN EP to ARM64X build targets.

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Adrian Lizarraga <adlizarraga@microsoft.com>
Co-authored-by: Ti-Tai Wang <titaiwang@microsoft.com>
Co-authored-by: Caroline Zhu <wolfivyaura@gmail.com>
Co-authored-by: Grégoire <gregoire.verdier@gmail.com>
Co-authored-by: Jing Fang <126209182+fajin-corp@users.noreply.github.com>
Co-authored-by: Changming Sun <chasun@microsoft.com>
Co-authored-by: Yateng Hong <yatengh@microsoft.com>
Co-authored-by: Michael Sharp <51342856+michaelgsharp@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Malik Shahzad Muzaffar <shahzad.malik.muzaffar@cern.ch>
Co-authored-by: Yulong Wang <7679871+fs-eire@users.noreply.github.com>
Co-authored-by: Dmitri Smirnov <yuslepukhin@users.noreply.github.com>
Co-authored-by: Corentin Maravat <101636442+cocotdf@users.noreply.github.com>
Co-authored-by: Jian Chen <cjian@microsoft.com>
Co-authored-by: Karim Vadsariya <karim.vadsariya@microsoft.com>
Co-authored-by: Lei Cao <jslhcl@gmail.com>
Co-authored-by: Karim Vadsariya <kvadsariya@microsoft.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Hector Li <hecli@microsoft.com>
Co-authored-by: Ted Themistokleous <107195283+TedThemistokleous@users.noreply.github.com>
Co-authored-by: Ted Themistokleous <tedthemistokleous@amd.com>
Co-authored-by: Edward Chen <18449977+edgchen1@users.noreply.github.com>
Co-authored-by: Takeshi Watanabe <take-cheeze@users.noreply.github.com>
Co-authored-by: Xavier Dupré <xadupre@users.noreply.github.com>
Co-authored-by: Justin Chu <justinchuby@users.noreply.github.com>
Co-authored-by: Tianlei Wu <tlwu@microsoft.com>
Co-authored-by: kunal-vaishnavi <115581922+kunal-vaishnavi@users.noreply.github.com>
Co-authored-by: Sushanth Rajasankar <44513542+sushraja-msft@users.noreply.github.com>
Co-authored-by: PARK DongHa <luncliff@gmail.com>
Co-authored-by: George Wu <jywu@microsoft.com>
Co-authored-by: Xinpeng Dou <15529241576@163.com>
Co-authored-by: Jambay Kinley <jambaykinley@microsoft.com>
Co-authored-by: Yifan Li <109183385+yf711@users.noreply.github.com>
Co-authored-by: Gavin Kinsey <98115505+ms-gavinkinsey@users.noreply.github.com>
Co-authored-by: Prathik Rao <prathik.rao@gmail.com>
Co-authored-by: Jon Campbell <jcampbell@cephable.com>
Co-authored-by: Satya Kumar Jandhyala <satya.k.jandhyala@gmail.com>
Co-authored-by: Joshua Lochner <admin@xenova.com>
Co-authored-by: Ankit Maheshkar <ankit.maheshkar@intel.com>
Co-authored-by: jatinwadhwa921 <jatin.wadhwa@intel.com>
Co-authored-by: jatinwadhwa921 <110383850+jatinwadhwa921@users.noreply.github.com>
Co-authored-by: saurabh <saurabh1.kale@intel.com>
Co-authored-by: TejalKhade28 <tejal.khade@intel.com>
Co-authored-by: sfatimar <sahar.fatima@intel.com>
Co-authored-by: Javier E. Martinez <javier.e.martinez@intel.com>
Co-authored-by: Preetha Veeramalai <preetha.veeramalai@intel.com>
Co-authored-by: Eric Crawford <eric.r.crawford@intel.com>
Co-authored-by: microsoft-github-policy-service[bot] <77245923+microsoft-github-policy-service[bot]@users.noreply.github.com>
Co-authored-by: Jie Chen <jie.a.chen@intel.com>
Co-authored-by: shaoboyan091 <shaoboyan@microsoft.com>
Co-authored-by: David Hotham <david.hotham@microsoft.com>
Co-authored-by: Guenther Schmuelling <guschmue@microsoft.com>
Co-authored-by: Enrico Galli <enrico.galli@intel.com>
guschmue pushed a commit that referenced this pull request Mar 6, 2025
@shaoboyan091 @guschmue
[WebGPU] Support PIX Capture for WebGPU EP (#23192)
0ae8396 
PIX Capture tool requires 'present' to end a frame capture. ORT doesn't
have rendering work so no 'present' happens.

To avoid endless waiting for PIX capture tool, this PR added a blank
surface and 'present' on it in each session run.

The surface is created in WebGPU ep constructor and closed in WebGPU ep
destructor.

### Description
<!-- Describe your changes. -->



### Motivation and Context
<!-- - Why is this change required? What problem does it solve?
- If it fixes an open issue, please link to the issue here. -->
ashrit-ms pushed a commit that referenced this pull request Mar 17, 2025
@shaoboyan091 @ashrit-ms
[WebGPU] Support PIX Capture for WebGPU EP (#23192)
a9fcc75 
PIX Capture tool requires 'present' to end a frame capture. ORT doesn't
have rendering work so no 'present' happens.

To avoid endless waiting for PIX capture tool, this PR added a blank
surface and 'present' on it in each session run.

The surface is created in WebGPU ep constructor and closed in WebGPU ep
destructor.

### Description
<!-- Describe your changes. -->



### Motivation and Context
<!-- - Why is this change required? What problem does it solve?
- If it fixes an open issue, please link to the issue here. -->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

Copilot code review Copilot Copilot left review comments

@fs-eire fs-eire fs-eire approved these changes

Assignees
No one assigned
Labels
ep:WebGPU ort-web webgpu provider
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@shaoboyan091 @guschmue @fs-eire @snnn