Skip to content
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

[webgpu] Use pushErrorScope()/popErrorScope() once for an inference run #23438

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

[webgpu] Use pushErrorScope()/popErrorScope() once for an inference run #23438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2ec9d76
[webgpu] Only capture validation errors in Debug build
jchen10 Jan 21, 2025
5139aee
Use pushErrorScope()/popErrorScope() once for an inference run
jchen10 Feb 4, 2025
8b0bccb
Keep the per Op validation in case of full mode
jchen10 Feb 5, 2025
9501966
Keep names
jchen10 Feb 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 5 additions & 16 deletions onnxruntime/core/providers/webgpu/compute_context.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,27 +14,16 @@ ComputeContext::ComputeContext(OpKernelContext& kernel_context)
}

void ComputeContext::PushErrorScope() {
if (webgpu_context_.ValidationMode() >= ValidationMode::Basic) {
webgpu_context_.Device().PushErrorScope(wgpu::ErrorFilter::Validation);
if (webgpu_context_.ValidationMode() >= ValidationMode::Full) {
webgpu_context_.PushErrorScope();
}
}

Status ComputeContext::PopErrorScope() {
Status status{};

if (webgpu_context_.ValidationMode() >= ValidationMode::Basic) {
ORT_RETURN_IF_ERROR(webgpu_context_.Wait(
webgpu_context_.Device().PopErrorScope(
wgpu::CallbackMode::WaitAnyOnly, [](wgpu::PopErrorScopeStatus pop_status, wgpu::ErrorType error_type, char const* message, Status* status) {
ORT_ENFORCE(pop_status == wgpu::PopErrorScopeStatus::Success, "Instance dropped.");
if (error_type == wgpu::ErrorType::NoError) {
return;
}
*status = ORT_MAKE_STATUS(ONNXRUNTIME, FAIL, "WebGPU validation failed. ", message);
},
&status)));
if (webgpu_context_.ValidationMode() >= ValidationMode::Full) {
return webgpu_context_.PopErrorScope();
}
return status;
return Status::OK();
}

} // namespace webgpu
Expand Down
17 changes: 17 additions & 0 deletions onnxruntime/core/providers/webgpu/webgpu_context.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,6 +616,23 @@ void WebGpuContext::EndProfiling(TimePoint /* tp */, profiling::Events& events,
}
}

void WebGpuContext::PushErrorScope() { device_.PushErrorScope(wgpu::ErrorFilter::Validation); }

Status WebGpuContext::PopErrorScope() {
Status status{};
ORT_RETURN_IF_ERROR(Wait(device_.PopErrorScope(
wgpu::CallbackMode::WaitAnyOnly,
[](wgpu::PopErrorScopeStatus pop_status, wgpu::ErrorType error_type, char const* message, Status* status) {
ORT_ENFORCE(pop_status == wgpu::PopErrorScopeStatus::Success, "Instance dropped.");
if (error_type == wgpu::ErrorType::NoError) {
return;
}
*status = ORT_MAKE_STATUS(ONNXRUNTIME, FAIL, "WebGPU validation failed. ", message);
},
&status)));
return status;
}

void WebGpuContext::Flush() {
if (!current_command_encoder_) {
return;
Expand Down
14 changes: 14 additions & 0 deletions onnxruntime/core/providers/webgpu/webgpu_context.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,20 @@ class WebGpuContext final {
void CollectProfilingData(profiling::Events& events);
void EndProfiling(TimePoint, profiling::Events& events, profiling::Events& cached_events);

//
// Push error scope.
//
// This is useful only when "skip_validation" is not set.
//
void PushErrorScope();

//
// Pop error scope.
//
// This is useful only when "skip_validation" is not set.
//
Status PopErrorScope();

Status Run(ComputeContext& context, const ProgramBase& program);

private:
Expand Down
8 changes: 8 additions & 0 deletions onnxruntime/core/providers/webgpu/webgpu_execution_provider.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -832,6 +832,10 @@ std::unique_ptr<profiling::EpProfiler> WebGpuExecutionProvider::GetProfiler() {
}

Status WebGpuExecutionProvider::OnRunStart(const onnxruntime::RunOptions& /*run_options*/) {
if (context_.ValidationMode() >= ValidationMode::Basic) {
context_.PushErrorScope();
}

if (profiler_->Enabled()) {
context_.StartProfiling();
}
Expand All @@ -858,6 +862,10 @@ Status WebGpuExecutionProvider::OnRunEnd(bool /* sync_stream */, const onnxrunti
context_.CollectProfilingData(profiler_->Events());
}

if (context_.ValidationMode() >= ValidationMode::Basic) {
return context_.PopErrorScope();
}

return Status::OK();
}

Expand Down
Loading