Open
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR fixes a crash-on-exit issue in the WebGPU execution provider caused by DLL unload ordering. When WebGpuContextFactory::Cleanup() runs, dependent DLLs like dxcompiler.dll may have already been unloaded, leading to crashes during resource destruction.
Changes:
- Explicitly loads and holds references to
dxil.dllanddxcompiler.dllto prevent premature unloading. - Changes
default_instance_fromwgpu::Instance(C++ RAII wrapper) to rawWGPUInstancefor explicit lifetime control. - Reorders cleanup in
WebGpuContextFactory::Cleanup()to ensure resources are released before DLL handles.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 5 comments.
| File | Description |
|---|---|
| onnxruntime/core/providers/webgpu/webgpu_context.h | Reorders static members, changes default_instance_ to raw WGPUInstance, adds modules_ and modules_dxc_loaded_ fields. |
| onnxruntime/core/providers/webgpu/webgpu_context.cc | Moves context map allocation inside instance creation block, adds DXC DLL loading logic, implements explicit cleanup with correct ordering. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Contributor
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Fixes crash on exit in some scenario.
When
onnxruntime::webgpu::WebGpuContextFactory::Cleanup()is called:This is when:
OrtEnv::~OrtEnv()is called (for embedded WebGPU EP), orReleaseEpFactory()is called (for WebGPU plugin EP)This will cause:
onnxruntime::webgpu::WebGpuContextFactorywill be called, so that:WebGpuContextwill be destructedSolution
onnxruntime::webgpu::WebGpuContextFactoryto ensure resources release in the expected orderWhen
onnxruntime::webgpu::WebGpuContextFactory::Cleanup()is NOT called:onnxruntime::webgpu::WebGpuContextFactory