Don't identify sample points for texture builtin (gpuweb#3937)

unless the debug option is passed in to the tests.
greggman · Sep 6, 2024 · eca9b0d · eca9b0d
1 parent ccab92d
commit eca9b0d
Show file tree

Hide file tree

Showing 4 changed files with 148 additions and 145 deletions.
diff --git a/src/common/internal/logging/test_case_recorder.ts b/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;

diff --git a/src/resources/cache/hashes.json b/src/resources/cache/hashes.json
diff --git a/src/resources/cache/webgpu/shader/execution/bitcast.bin b/src/resources/cache/webgpu/shader/execution/bitcast.bin
diff --git a/src/webgpu/shader/execution/expression/call/builtin/texture_utils.ts b/src/webgpu/shader/execution/expression/call/builtin/texture_utils.ts
@@ -1431,41 +1431,44 @@ export async function checkCallResults<T extends Dimensionality>(
 `);
 
       if (sampler) {
-        const expectedSamplePoints = [
-          'expected:',
-          ...(await identifySamplePoints(texture, call, (texels: TexelView[]) => {
-            return Promise.resolve(
-              softwareTextureReadLevel(
-                t,
-                call,
-                {
-                  texels,
-                  descriptor: texture.descriptor,
-                  viewDescriptor: texture.viewDescriptor,
-                },
-                sampler,
-                call.mipLevel ?? 0
-              )
-            );
-          })),
-        ];
-        const gotSamplePoints = [
-          'got:',
-          ...(await identifySamplePoints(texture, call, async (texels: TexelView[]) => {
-            const gpuTexture = createTextureFromTexelViewsLocal(t, texels, texture.descriptor);
-            const result = (await results.run(gpuTexture))[callIdx];
-            gpuTexture.destroy();
-            return result;
-          })),
-        ];
-        errs.push('  sample points:');
-        errs.push(layoutTwoColumns(expectedSamplePoints, gotSamplePoints).join('\n'));
-        errs.push('', '');
-
-        // This path is slow so if we took it, don't report the other errors. One is enough
-        // to fail the test.
-        break;
+        if (t.rec.debugging) {
+          const expectedSamplePoints = [
+            'expected:',
+            ...(await identifySamplePoints(texture, call, (texels: TexelView[]) => {
+              return Promise.resolve(
+                softwareTextureReadLevel(
+                  t,
+                  call,
+                  {
+                    texels,
+                    descriptor: texture.descriptor,
+                    viewDescriptor: texture.viewDescriptor,
+                  },
+                  sampler,
+                  call.mipLevel ?? 0
+                )
+              );
+            })),
+          ];
+          const gotSamplePoints = [
+            'got:',
+            ...(await identifySamplePoints(texture, call, async (texels: TexelView[]) => {
+              const gpuTexture = createTextureFromTexelViewsLocal(t, texels, texture.descriptor);
+              const result = (await results.run(gpuTexture))[callIdx];
+              gpuTexture.destroy();
+              return result;
+            })),
+          ];
+          errs.push('  sample points:');
+          errs.push(layoutTwoColumns(expectedSamplePoints, gotSamplePoints).join('\n'));
+          errs.push('', '');
+        }
       } // if (sampler)
+
+      // Don't report the other errors. There 50 sample points per subcase and
+      // 50-100 subcases so the log would get enormous if all 50 fail. One
+      // report per subcase is enough.
+      break;
     } // if (bad)
   } // for cellNdx