[pull] main from gpuweb:main

Gruntfile.js

@@ -24,7 +24,10 @@ module.exports = function (grunt) {
     pkg: grunt.file.readJSON('package.json'),
 
     clean: {
-      out: ['gen/', 'out/', 'out-wpt/', 'out-node/'],
+      gen: ['gen/'],
+      out: ['out/'],
+      'out-wpt': ['out-wpt/'],
+      'out-node': ['out-node/'],
     },
 
     run: {
@@ -246,17 +249,20 @@ module.exports = function (grunt) {
   });
 
   grunt.registerTask('generate-common', 'Generate files into gen/ and src/', [
+    'clean:gen',
     'run:generate-version',
     'run:generate-listings-and-webworkers',
     'run:generate-cache',
   ]);
   grunt.registerTask('build-standalone', 'Build out/ (no checks; run after generate-common)', [
+    'clean:out',
     'run:build-out',
     'run:copy-assets',
     'copy:gen-to-out',
     'copy:htmlfiles-to-out',
   ]);
   grunt.registerTask('build-wpt', 'Build out-wpt/ (no checks; run after generate-common)', [
+    'clean:out-wpt',
     'run:build-out-wpt',
     'run:copy-assets-wpt',
     'copy:gen-to-out-wpt',
@@ -265,6 +271,7 @@ module.exports = function (grunt) {
     'run:autoformat-out-wpt',
   ]);
   grunt.registerTask('build-node', 'Build out-node/ (no checks; run after generate-common)', [
+    'clean:out-node',
     'run:build-out-node',
     'run:copy-assets-node',
   ]);
@@ -282,7 +289,6 @@ module.exports = function (grunt) {
   grunt.registerTask('pre', ['all']);
 
   registerTaskAndAddToHelp('all', 'Run all builds and checks', [
-    'clean',
     'generate-common',
     'concurrent:all-builds-and-checks',
   ]);

package.json

@@ -50,7 +50,7 @@
     "@types/w3c-image-capture": "^1.0.10",
     "@typescript-eslint/eslint-plugin": "^6.9.1",
     "@typescript-eslint/parser": "^6.9.1",
-    "@webgpu/types": "^0.1.43",
+    "@webgpu/types": "^0.1.49",
     "ansi-colors": "4.1.3",
     "babel-plugin-add-header-comment": "^1.0.3",
     "babel-plugin-const-enum": "^1.2.0",

src/common/framework/test_config.ts

@@ -4,8 +4,20 @@ export type TestConfig = {
    */
   enableDebugLogs: boolean;
 
+  /**
+   * Maximum number of subcases in flight at once, within a case. Once this many
+   * are in flight, wait for a subcase to finish before starting the next one.
+   */
   maxSubcasesInFlight: number;
+
+  /**
+   * Every `subcasesBetweenAttemptingGC` subcases, run `attemptGarbageCollection()`.
+   * Setting to `Infinity` disables this. Setting to 1 attempts GC every time (slow!).
+   */
+  subcasesBetweenAttemptingGC: number;
+
   testHeartbeatCallback: () => void;
+
   noRaceWithRejectOnTimeout: boolean;
 
   /**
@@ -40,7 +52,8 @@ export type TestConfig = {
 
 export const globalTestConfig: TestConfig = {
   enableDebugLogs: false,
-  maxSubcasesInFlight: 500,
+  maxSubcasesInFlight: 100,
+  subcasesBetweenAttemptingGC: 5000,
   testHeartbeatCallback: () => {},
   noRaceWithRejectOnTimeout: false,
   unrollConstEvalLoops: false,

src/common/internal/logging/test_case_recorder.ts

@@ -44,7 +44,7 @@ export class TestCaseRecorder {
   private startTime = -1;
   private logs: LogMessageWithStack[] = [];
   private logLinesAtCurrentSeverity = 0;
-  private debugging = false;
+  public debugging = false;
 
   constructor(result: LiveTestCaseResult, debugging: boolean) {
     this.result = result;

src/common/internal/test_group.ts

@@ -31,6 +31,7 @@ import {
   stringifyPublicParamsUniquely,
 } from '../internal/query/stringify_params.js';
 import { validQueryPart } from '../internal/query/validQueryPart.js';
+import { attemptGarbageCollection } from '../util/collect_garbage.js';
 import { DeepReadonly } from '../util/types.js';
 import { assert, unreachable } from '../util/util.js';
 
@@ -620,7 +621,7 @@ class RunCaseSpecific implements RunCase {
             const subcasePrefix = 'subcase: ' + stringifyPublicParams(subParams);
             const subRec = new Proxy(rec, {
               get: (target, k: keyof TestCaseRecorder) => {
-                const prop = TestCaseRecorder.prototype[k];
+                const prop = rec[k] ?? TestCaseRecorder.prototype[k];
                 if (typeof prop === 'function') {
                   testHeartbeatCallback();
                   return function (...args: Parameters<typeof prop>) {
@@ -696,6 +697,7 @@ class RunCaseSpecific implements RunCase {
                   subRec.threw(ex);
                 }
               })
+              .finally(attemptGarbageCollectionIfDue)
               .finally(subcaseFinishedCallback);
 
             allPreviousSubcasesFinalizedPromise = allPreviousSubcasesFinalizedPromise.then(
@@ -711,13 +713,17 @@ class RunCaseSpecific implements RunCase {
             rec.skipped(new SkipTestCase('all subcases were skipped'));
           }
         } else {
-          await this.runTest(
-            rec,
-            sharedState,
-            this.params,
-            /* throwSkip */ false,
-            getExpectedStatus(selfQuery)
-          );
+          try {
+            await this.runTest(
+              rec,
+              sharedState,
+              this.params,
+              /* throwSkip */ false,
+              getExpectedStatus(selfQuery)
+            );
+          } finally {
+            await attemptGarbageCollectionIfDue();
+          }
         }
       } finally {
         testHeartbeatCallback();
@@ -754,3 +760,17 @@ export type CaseTimingLogLine = {
    */
   nonskippedSubcaseCount: number;
 };
+
+/** Every `subcasesBetweenAttemptingGC` calls to this function will `attemptGarbageCollection()`. */
+const attemptGarbageCollectionIfDue: () => Promise<void> = (() => {
+  // This state is global because garbage is global.
+  let subcasesSinceLastGC = 0;
+
+  return async function attemptGarbageCollectionIfDue() {
+    subcasesSinceLastGC++;
+    if (subcasesSinceLastGC >= globalTestConfig.subcasesBetweenAttemptingGC) {
+      subcasesSinceLastGC = 0;
+      return attemptGarbageCollection();
+    }
+  };
+})();

src/common/runtime/standalone.ts

@@ -369,6 +369,9 @@ function makeSubtreeChildrenHTML(
   const runMySubtree = async () => {
     const results: SubtreeResult[] = [];
     for (const { runSubtree } of childFns) {
+      if (stopRequested) {
+        break;
+      }
       results.push(await runSubtree());
     }
     return mergeSubtreeResults(...results);

src/common/tools/dev_server.ts

@@ -106,10 +106,6 @@ const app = express();
 
 // Send Chrome Origin Trial tokens
 app.use((_req, res, next) => {
-  res.header('Origin-Trial', [
-    // Token for http://localhost:8080
-    'AvyDIV+RJoYs8fn3W6kIrBhWw0te0klraoz04mw/nPb8VTus3w5HCdy+vXqsSzomIH745CT6B5j1naHgWqt/tw8AAABJeyJvcmlnaW4iOiJodHRwOi8vbG9jYWxob3N0OjgwODAiLCJmZWF0dXJlIjoiV2ViR1BVIiwiZXhwaXJ5IjoxNjYzNzE4Mzk5fQ==',
-  ]);
   next();
 });
 

src/common/tools/gen_wpt_cts_html.ts

@@ -9,6 +9,8 @@ import {
 } from '../internal/query/query.js';
 import { assert } from '../util/util.js';
 
+const kMaxQueryLength = 184;
+
 function printUsageAndExit(rc: number): never {
   console.error(`\
 Usage (simple, for webgpu:* suite only):
@@ -193,6 +195,7 @@ let config: Config;
 
   const loader = new DefaultTestFileLoader();
   const lines = [];
+  const tooLongQueries = [];
   for (const prefix of config.argumentsPrefixes) {
     const rootQuery = new TestQueryMultiFile(config.suite, []);
     const tree = await loader.loadTree(rootQuery, {
@@ -219,15 +222,9 @@ let config: Config;
         // Check for a safe-ish path length limit. Filename must be <= 255, and on Windows the whole
         // path must be <= 259. Leave room for e.g.:
         // 'c:\b\s\w\xxxxxxxx\layout-test-results\external\wpt\webgpu\cts_worker=0_q=...-actual.txt'
-        assert(
-          queryString.length < 185,
-          `Generated test variant would produce too-long -actual.txt filename. Possible solutions:
-- Reduce the length of the parts of the test query
-- Reduce the parameterization of the test
-- Make the test function faster and regenerate the listing_meta entry
-- Reduce the specificity of test expectations (if you're using them)
-${queryString}`
-        );
+        if (queryString.length > kMaxQueryLength) {
+          tooLongQueries.push(queryString);
+        }
       }
 
       lines.push({
@@ -243,6 +240,29 @@ ${queryString}`
     }
     prefixComment.comment += `; ${variantCount} variants generated from ${testsSeen.size} tests in ${filesSeen.size} files`;
   }
+
+  if (tooLongQueries.length > 0) {
+    // Try to show some representation of failures. We show one entry from each
+    // test that is different length. Without this the logger cuts off the error
+    // messages and you end up not being told about which tests have issues.
+    const queryStrings = new Map<string, string>();
+    tooLongQueries.forEach(s => {
+      const colonNdx = s.lastIndexOf(':');
+      const prefix = s.substring(0, colonNdx + 1);
+      const id = `${prefix}:${s.length}`;
+      queryStrings.set(id, s);
+    });
+    throw new Error(
+      `Generated test variant would produce too-long -actual.txt filename. Possible solutions:
+  - Reduce the length of the parts of the test query
+  - Reduce the parameterization of the test
+  - Make the test function faster and regenerate the listing_meta entry
+  - Reduce the specificity of test expectations (if you're using them)
+|<${''.padEnd(kMaxQueryLength - 4, '-')}>|
+${[...queryStrings.values()].join('\n')}`
+    );
+  }
+
   await generateFile(lines);
 })().catch(ex => {
   console.log(ex.stack ?? ex.toString());

src/common/util/navigator_gpu.ts

@@ -68,12 +68,11 @@ export function getGPU(recorder: TestCaseRecorder | null): GPU {
     ): Promise<GPUAdapter | null> {
       const promise = oldFn.call(this, { ...defaultRequestAdapterOptions, ...options });
       if (recorder) {
-        void promise.then(async adapter => {
+        void promise.then(adapter => {
           if (adapter) {
-            // MAINTENANCE_TODO: Remove requestAdapterInfo when info is implemented.
-            const info = adapter.info || (await adapter.requestAdapterInfo());
-            const infoString = `Adapter: ${info.vendor} / ${info.architecture} / ${info.device}`;
-            recorder.debug(new ErrorWithExtra(infoString, () => ({ adapterInfo: info })));
+            const adapterInfo = adapter.info;
+            const infoString = `Adapter: ${adapterInfo.vendor} / ${adapterInfo.architecture} / ${adapterInfo.device}`;
+            recorder.debug(new ErrorWithExtra(infoString, () => ({ adapterInfo })));
           }
         });
       }