Allow tests to extend endTestScope timeout (#4560)

* Allow tests to extend endTestScope timeout

Added a per-test endTestScope timeout function so heavy cases can extend
the time without slowing down the rest of the suite, and used it to give
the 64K timestamp-query stress test run extra headroom, avoiding flakes
while leaving the default 5000ms limit untouched elsewhere.

* Wrap the test body with pushErrorScope and popErrorScope

* review nits

---------

Co-authored-by: Kai Ninomiya <kainino@chromium.org>

Author: haoxli

src/webgpu/api/operation/command_buffer/queries/timestampQuery.spec.ts

@@ -35,55 +35,64 @@ and prevent pages from running.
       .combine('numQuerySets', [8, 16, 32, 64, 256, 65536] as const)
       .combine('stage', ['compute', 'render'] as const)
   )
-  .fn(t => {
+  .fn(async t => {
     const { stage, numQuerySets } = t.params;
 
     t.skipIfDeviceDoesNotHaveFeature('timestamp-query');
 
-    const view = t
-      .createTextureTracked({
-        size: [1, 1, 1],
-        format: 'rgba8unorm',
-        usage: GPUTextureUsage.RENDER_ATTACHMENT,
-      })
-      .createView();
-    const encoder = t.device.createCommandEncoder();
-
-    for (let i = 0; i < numQuerySets; ++i) {
-      const querySet = t.createQuerySetTracked({
-        type: 'timestamp',
-        count: 2,
-      });
-
-      switch (stage) {
-        case 'compute': {
-          const pass = encoder.beginComputePass({
-            timestampWrites: {
-              querySet,
-              beginningOfPassWriteIndex: 0,
-              endOfPassWriteIndex: 1,
-            },
-          });
-          pass.end();
-          break;
-        }
-        case 'render': {
-          const pass = encoder.beginRenderPass({
-            colorAttachments: [{ view, loadOp: 'load', storeOp: 'store' }],
-            timestampWrites: {
-              querySet,
-              beginningOfPassWriteIndex: 0,
-              endOfPassWriteIndex: 1,
-            },
-          });
-          pass.end();
-          break;
+    // At large numQuerySets, this test incurs a lot of validation, which can take several seconds.
+    // Explicitly wrap the test in its own error scope to avoid triggering timeouts in test-cleanup.
+    t.device.pushErrorScope('validation');
+    try {
+      const view = t
+        .createTextureTracked({
+          size: [1, 1, 1],
+          format: 'rgba8unorm',
+          usage: GPUTextureUsage.RENDER_ATTACHMENT,
+        })
+        .createView();
+      const encoder = t.device.createCommandEncoder();
+
+      for (let i = 0; i < numQuerySets; ++i) {
+        const querySet = t.createQuerySetTracked({
+          type: 'timestamp',
+          count: 2,
+        });
+
+        switch (stage) {
+          case 'compute': {
+            const pass = encoder.beginComputePass({
+              timestampWrites: {
+                querySet,
+                beginningOfPassWriteIndex: 0,
+                endOfPassWriteIndex: 1,
+              },
+            });
+            pass.end();
+            break;
+          }
+          case 'render': {
+            const pass = encoder.beginRenderPass({
+              colorAttachments: [{ view, loadOp: 'load', storeOp: 'store' }],
+              timestampWrites: {
+                querySet,
+                beginningOfPassWriteIndex: 0,
+                endOfPassWriteIndex: 1,
+              },
+            });
+            pass.end();
+            break;
+          }
         }
       }
-    }
 
-    const shouldError = false; // just expect no error
-    t.expectValidationError(() => t.device.queue.submit([encoder.finish()]), shouldError);
+      const shouldError = false; // just expect no error
+      t.expectValidationError(() => t.device.queue.submit([encoder.finish()]), shouldError);
+    } finally {
+      const error = await t.device.popErrorScope();
+      // Make sure there weren't any unexpected validation errors caught by the scope.
+      t.expect(error === null, error?.message);
+    }
   });
 
 g.test('many_slots')