Test pass but not encoder ended in encoder_open_state

Author: andyleiserson

src/webgpu/api/validation/encoding/encoder_open_state.spec.ts

@@ -274,15 +274,13 @@ g.test('render_pass_commands')
     `
     Test that functions of GPURenderPassEncoder generate a validation error if the encoder or the
     pass is already finished.
-
-    - TODO: Consider testing: nothing before command, end before command, end+finish before command.
   `
   )
   .params(u =>
     u
       .combine('command', kRenderPassEncoderCommands)
       .beginSubcases()
-      .combine('finishBeforeCommand', [false, true])
+      .combine('finishBeforeCommand', ['no', 'pass', 'encoder'])
   )
   .fn(t => {
     const { command, finishBeforeCommand } = t.params;
@@ -305,8 +303,10 @@ g.test('render_pass_commands')
 
     const bindGroup = t.createBindGroupForTest();
 
-    if (finishBeforeCommand) {
+    if (finishBeforeCommand !== 'no') {
       renderPass.end();
+    }
+    if (finishBeforeCommand === 'encoder') {
       encoder.finish();
     }
 
@@ -404,23 +404,25 @@ g.test('render_pass_commands')
           break;
         case 'pushDebugGroup':
           {
-            encoder.pushDebugGroup('group');
+            renderPass.pushDebugGroup('group');
           }
           break;
         case 'popDebugGroup':
           {
-            encoder.popDebugGroup();
+            renderPass.popDebugGroup();
           }
           break;
         case 'insertDebugMarker':
           {
-            encoder.insertDebugMarker('marker');
+            renderPass.insertDebugMarker('marker');
           }
           break;
         default:
           unreachable();
       }
-    }, finishBeforeCommand);
+    }, finishBeforeCommand !== 'no');
+    // TODO(https://github.com/gpuweb/gpuweb/issues/5207): resolve whether this
+    // is correct or should be changed to `finishBeforeCommand === 'encoder'`.
   });
 
 g.test('render_bundle_commands')
@@ -524,15 +526,13 @@ g.test('compute_pass_commands')
     `
     Test that functions of GPUComputePassEncoder generate a validation error if the encoder or the
     pass is already finished.
-
-    - TODO: Consider testing: nothing before command, end before command, end+finish before command.
   `
   )
   .params(u =>
     u
       .combine('command', kComputePassEncoderCommands)
       .beginSubcases()
-      .combine('finishBeforeCommand', [false, true])
+      .combine('finishBeforeCommand', ['no', 'pass', 'encoder'])
   )
   .fn(t => {
     const { command, finishBeforeCommand } = t.params;
@@ -549,8 +549,10 @@ g.test('compute_pass_commands')
 
     const bindGroup = t.createBindGroupForTest();
 
-    if (finishBeforeCommand) {
+    if (finishBeforeCommand !== 'no') {
       computePass.end();
+    }
+    if (finishBeforeCommand === 'encoder') {
       encoder.finish();
     }
 
@@ -594,5 +596,7 @@ g.test('compute_pass_commands')
         default:
           unreachable();
       }
-    }, finishBeforeCommand);
+    }, finishBeforeCommand !== 'no');
+    // TODO(https://github.com/gpuweb/gpuweb/issues/5207): resolve whether this
+    // is correct or should be changed to `finishBeforeCommand === 'encoder'`.
   });

src/webgpu/api/validation/encoding/encoder_state.spec.ts

@@ -81,6 +81,8 @@ g.test('pass_end_invalid_order')
 
     const passes = [firstPass, secondPass];
     for (const index of endPasses) {
+      // TODO(https://github.com/gpuweb/gpuweb/issues/5207): should a validation error
+      // be raised here if `!firstPassEnd && endPasses = [1, 0]`?
       passes[index].end();
     }
 
@@ -275,7 +277,7 @@ g.test('pass_begin_invalid_encoder')
     const querySet = t.trackForCleanup(
       t.device.createQuerySet({
         type: 'timestamp',
-        count: 1,
+        count: 2,
       })
     );
 
@@ -291,7 +293,7 @@ g.test('pass_begin_invalid_encoder')
     const mismatchedQuerySet = t.trackForCleanup(
       t.mismatchedDevice.createQuerySet({
         type: 'timestamp',
-        count: 1,
+        count: 2,
       })
     );