Keep names

microsoft · Feb 7, 2025 · 9501966 · 9501966
1 parent 8b0bccb
commit 9501966
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 26 deletions.
diff --git a/onnxruntime/core/providers/webgpu/compute_context.cc b/onnxruntime/core/providers/webgpu/compute_context.cc
@@ -14,11 +14,16 @@ ComputeContext::ComputeContext(OpKernelContext& kernel_context)
 }
 
 void ComputeContext::PushErrorScope() {
-  webgpu_context_.PushErrorScopeIfNoLowerThan(ValidationMode::Full);
+  if (webgpu_context_.ValidationMode() >= ValidationMode::Full) {
+    webgpu_context_.PushErrorScope();
+  }
 }
 
 Status ComputeContext::PopErrorScope() {
-  return webgpu_context_.PopErrorScopeIfNoLowerThan(ValidationMode::Full);
+  if (webgpu_context_.ValidationMode() >= ValidationMode::Full) {
+    return webgpu_context_.PopErrorScope();
+  }
+  return Status::OK();
 }
 
 }  // namespace webgpu

diff --git a/onnxruntime/core/providers/webgpu/webgpu_context.cc b/onnxruntime/core/providers/webgpu/webgpu_context.cc
@@ -616,26 +616,20 @@ void WebGpuContext::EndProfiling(TimePoint /* tp */, profiling::Events& events,
   }
 }
 
-void WebGpuContext::PushErrorScopeIfNoLowerThan(webgpu::ValidationMode validation_mode) {
-  if (ValidationMode() >= validation_mode) {
-    device_.PushErrorScope(wgpu::ErrorFilter::Validation);
-  }
-}
+void WebGpuContext::PushErrorScope() { device_.PushErrorScope(wgpu::ErrorFilter::Validation); }
 
-Status WebGpuContext::PopErrorScopeIfNoLowerThan(webgpu::ValidationMode validation_mode) {
+Status WebGpuContext::PopErrorScope() {
   Status status{};
-  if (ValidationMode() >= validation_mode) {
-    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)));
-  }
+  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;
 }
 

diff --git a/onnxruntime/core/providers/webgpu/webgpu_context.h b/onnxruntime/core/providers/webgpu/webgpu_context.h
@@ -122,18 +122,18 @@ class WebGpuContext final {
   void EndProfiling(TimePoint, profiling::Events& events, profiling::Events& cached_events);
 
   //
-  // Push error scope if the context's validation mode is no lower than the given mode.
+  // Push error scope.
   //
   // This is useful only when "skip_validation" is not set.
   //
-  void PushErrorScopeIfNoLowerThan(webgpu::ValidationMode validation_mode);
+  void PushErrorScope();
 
   //
-  // Pop error scope if the context's validation mode is no lower than the given mode.
+  // Pop error scope.
   //
   // This is useful only when "skip_validation" is not set.
   //
-  Status PopErrorScopeIfNoLowerThan(webgpu::ValidationMode validation_mode);
+  Status PopErrorScope();
 
   Status Run(ComputeContext& context, const ProgramBase& program);
 

diff --git a/onnxruntime/core/providers/webgpu/webgpu_execution_provider.cc b/onnxruntime/core/providers/webgpu/webgpu_execution_provider.cc
@@ -832,7 +832,9 @@ std::unique_ptr<profiling::EpProfiler> WebGpuExecutionProvider::GetProfiler() {
 }
 
 Status WebGpuExecutionProvider::OnRunStart(const onnxruntime::RunOptions& /*run_options*/) {
-  context_.PushErrorScopeIfNoLowerThan(ValidationMode::Basic);
+  if (context_.ValidationMode() >= ValidationMode::Basic) {
+    context_.PushErrorScope();
+  }
 
   if (profiler_->Enabled()) {
     context_.StartProfiling();
@@ -860,7 +862,11 @@ Status WebGpuExecutionProvider::OnRunEnd(bool /* sync_stream */, const onnxrunti
     context_.CollectProfilingData(profiler_->Events());
   }
 
-  return context_.PopErrorScopeIfNoLowerThan(ValidationMode::Basic);
+  if (context_.ValidationMode() >= ValidationMode::Basic) {
+    return context_.PopErrorScope();
+  }
+
+  return Status::OK();
 }
 
 bool WebGpuExecutionProvider::IsGraphCaptureEnabled() const {