Update (base update)

[ghstack-poisoned]

Author: JCNTH

backends/webgpu/runtime/WebGPUGraph.cpp

@@ -18,9 +18,7 @@
 #include <cstring>
 #include <stdexcept>
 
-namespace executorch {
-namespace backends {
-namespace webgpu {
+namespace executorch::backends::webgpu {
 
 // vkgraph namespace is declared at global scope in the generated FlatBuffer
 // header
@@ -396,21 +394,20 @@ void WebGPUGraph::execute() {
     WGPUCommandEncoder encoder =
         wgpuDeviceCreateCommandEncoder(device_, &enc_desc);
 
-    WGPUComputePassDescriptor pass_desc = {};
-    WGPUComputePassEncoder pass =
-        wgpuCommandEncoderBeginComputePass(encoder, &pass_desc);
-
+    // One pass per dispatch: enforces storage RAW ordering across deps.
     for (const auto& dispatch : dispatches_) {
+      WGPUComputePassDescriptor pass_desc = {};
+      WGPUComputePassEncoder pass =
+          wgpuCommandEncoderBeginComputePass(encoder, &pass_desc);
       wgpuComputePassEncoderSetPipeline(pass, dispatch.pipeline);
       wgpuComputePassEncoderSetBindGroup(
           pass, 0, dispatch.bind_group, 0, nullptr);
       wgpuComputePassEncoderDispatchWorkgroups(
           pass, dispatch.workgroup_count_x, 1, 1);
+      wgpuComputePassEncoderEnd(pass);
+      wgpuComputePassEncoderRelease(pass);
     }
 
-    wgpuComputePassEncoderEnd(pass);
-    wgpuComputePassEncoderRelease(pass);
-
     for (const auto& copy : output_copies_) {
       wgpuCommandEncoderCopyBufferToBuffer(
           encoder, copy.src_buffer, 0, copy.staging_buffer, 0, copy.nbytes);
@@ -439,21 +436,19 @@ void WebGPUGraph::execute() {
     WGPUCommandEncoder encoder =
         wgpuDeviceCreateCommandEncoder(device_, &enc_desc);
 
-    WGPUComputePassDescriptor pass_desc = {};
-    WGPUComputePassEncoder pass =
-        wgpuCommandEncoderBeginComputePass(encoder, &pass_desc);
-
     for (size_t i = start; i < end; i++) {
+      WGPUComputePassDescriptor pass_desc = {};
+      WGPUComputePassEncoder pass =
+          wgpuCommandEncoderBeginComputePass(encoder, &pass_desc);
       wgpuComputePassEncoderSetPipeline(pass, dispatches_[i].pipeline);
       wgpuComputePassEncoderSetBindGroup(
           pass, 0, dispatches_[i].bind_group, 0, nullptr);
       wgpuComputePassEncoderDispatchWorkgroups(
           pass, dispatches_[i].workgroup_count_x, 1, 1);
+      wgpuComputePassEncoderEnd(pass);
+      wgpuComputePassEncoderRelease(pass);
     }
 
-    wgpuComputePassEncoderEnd(pass);
-    wgpuComputePassEncoderRelease(pass);
-
     if (end == n) {
       for (const auto& copy : output_copies_) {
         wgpuCommandEncoderCopyBufferToBuffer(
@@ -561,6 +556,4 @@ WebGPUMemoryStats WebGPUGraph::memory_stats() const {
   return stats;
 }
 
-} // namespace webgpu
-} // namespace backends
-} // namespace executorch
+} // namespace executorch::backends::webgpu

backends/webgpu/runtime/WebGPUGraph.h

@@ -17,9 +17,7 @@
 
 #include <executorch/runtime/core/named_data_map.h>
 
-namespace executorch {
-namespace backends {
-namespace webgpu {
+namespace executorch::backends::webgpu {
 
 struct WebGPUTensor {
   WGPUBuffer buffer = nullptr;
@@ -199,6 +197,4 @@ class WebGPUGraph {
   size_t uniform_buffer_bytes_ = 0;
 };
 
-} // namespace webgpu
-} // namespace backends
-} // namespace executorch
+} // namespace executorch::backends::webgpu