Fragment shader tests for subgroup add and mul

src/webgpu/shader/execution/expression/call/builtin/subgroupAdd.spec.ts

@@ -10,7 +10,6 @@ local_invocation_index. Tests should avoid assuming there is.
 import { makeTestGroup } from '../../../../../../common/framework/test_group.js';
 import { keysOf, objectsToRecord } from '../../../../../../common/util/data_tables.js';
 import { iterRange } from '../../../../../../common/util/util.js';
-import { GPUTest } from '../../../../../gpu_test.js';
 import {
   kConcreteNumericScalarsAndVectors,
   Type,
@@ -31,15 +30,21 @@ import {
   kPredicateCases,
   runAccuracyTest,
   runComputeTest,
+  SubgroupTest,
+  runFragmentTest,
+  getUintsPerFramebuffer,
+  kFramebufferSizes,
 } from './subgroup_util.js';
 
-export const g = makeTestGroup(GPUTest);
+export const g = makeTestGroup(SubgroupTest);
 
 const kIdentity = 0;
 
 const kDataTypes = objectsToRecord(kConcreteNumericScalarsAndVectors);
 
-const kOperations = ['subgroupAdd', 'subgroupExclusiveAdd', 'subgroupInclusiveAdd'] as const;
+type Op = 'subgroupAdd' | 'subgroupInclusiveAdd' | 'subgroupExclusiveAdd';
+
+const kOperations: Op[] = ['subgroupAdd', 'subgroupExclusiveAdd', 'subgroupInclusiveAdd'];
 
 g.test('fp_accuracy')
   .desc(
@@ -98,7 +103,7 @@ function checkAddition(
   metadata: Uint32Array,
   output: Uint32Array,
   type: Type,
-  operation: 'subgroupAdd' | 'subgroupExclusiveAdd' | 'subgroupInclusiveAdd',
+  operation: Op,
   expectedfillValue: number
 ): undefined | Error {
   let numEles = 1;
@@ -245,8 +250,6 @@ fn main(
     );
   });
 
-g.test('fragment').unimplemented();
-
 /**
  * Performs correctness checking for predicated additions
  *
@@ -261,7 +264,7 @@ g.test('fragment').unimplemented();
 function checkPredicatedAddition(
   metadata: Uint32Array,
   output: Uint32Array,
-  operation: 'subgroupAdd' | 'subgroupExclusiveAdd' | 'subgroupInclusiveAdd',
+  operation: Op,
   filter: (id: number, size: number) => boolean
 ): Error | undefined {
   for (let i = 0; i < output.length; i++) {
@@ -364,3 +367,180 @@ fn main(
       }
     );
   });
+
+// Max subgroup size is 128.
+const kMaxSize = 128;
+
+/**
+ * Checks subgroup addition results in fragment shaders
+ *
+ * Avoid subgroups with invocations in the last row or column to avoid helper invocations.
+ * @param data The framebuffer results
+ *             * Component 0 is the addition result
+ *             * Component 1 is the subgroup_invocation_id
+ *             * Component 2 is a unique generated subgroup_id
+ * @param op The type of subgroup addition
+ * @param format The framebuffer format
+ * @param width The framebuffer width
+ * @param height The framebuffer height
+ */
+function checkFragment(
+  data: Uint32Array,
+  op: Op,
+  format: GPUTextureFormat,
+  width: number,
+  height: number
+): Error | undefined {
+  const { uintsPerRow, uintsPerTexel } = getUintsPerFramebuffer(format, width, height);
+
+  // Determine if the subgroup should be included in the checks.
+  const inBounds = new Map<number, boolean>();
+  for (let row = 0; row < height; row++) {
+    for (let col = 0; col < width; col++) {
+      const offset = uintsPerRow * row + col * uintsPerTexel;
+      const subgroup_id = data[offset + 2];
+      if (subgroup_id === 0) {
+        return new Error(`Internal error: helper invocation at (${col}, ${row})`);
+      }
+
+      let ok = inBounds.get(subgroup_id) ?? true;
+      ok = ok && row !== height - 1 && col !== width - 1;
+      inBounds.set(subgroup_id, ok);
+    }
+  }
+
+  let anyInBounds = false;
+  for (const [_, value] of inBounds) {
+    const ok = Boolean(value);
+    anyInBounds = anyInBounds || ok;
+  }
+  if (!anyInBounds) {
+    // This variant would not reliably test behavior.
+    return undefined;
+  }
+
+  // Iteration skips subgroups in the last row or column to avoid helper
+  // invocations because it is not guaranteed whether or not they participate
+  // in the subgroup operation.
+  const expected = new Map<number, Uint32Array>();
+  for (let row = 0; row < height; row++) {
+    for (let col = 0; col < width; col++) {
+      const offset = uintsPerRow * row + col * uintsPerTexel;
+      const subgroup_id = data[offset + 2];
+
+      if (subgroup_id === 0) {
+        return new Error(`Internal error: helper invocation at (${col}, ${row})`);
+      }
+
+      const subgroupInBounds = inBounds.get(subgroup_id) ?? true;
+      if (!subgroupInBounds) {
+        continue;
+      }
+
+      const id = data[offset + 1];
+      const v =
+        expected.get(subgroup_id) ?? new Uint32Array([...iterRange(kMaxSize, x => kIdentity)]);
+      v[id] = row * width + col;
+      expected.set(subgroup_id, v);
+    }
+  }
+
+  for (let row = 0; row < height; row++) {
+    for (let col = 0; col < width; col++) {
+      const offset = uintsPerRow * row + col * uintsPerTexel;
+      const subgroup_id = data[offset + 2];
+
+      if (subgroup_id === 0) {
+        return new Error(`Internal error: helper invocation at (${col}, ${row})`);
+      }
+
+      const subgroupInBounds = inBounds.get(subgroup_id) ?? true;
+      if (!subgroupInBounds) {
+        continue;
+      }
+
+      const res = data[offset];
+      const id = data[offset + 1];
+      const v =
+        expected.get(subgroup_id) ?? new Uint32Array([...iterRange(kMaxSize, x => kIdentity)]);
+      const bound = op === 'subgroupAdd' ? kMaxSize : op === 'subgroupInclusiveAdd' ? id + 1 : id;
+      let expect = kIdentity;
+      for (let i = 0; i < bound; i++) {
+        expect += v[i];
+      }
+
+      if (res !== expect) {
+        return new Error(`Row ${row}, col ${col}: incorrect results
+- expected: ${expect}
+-      got: ${res}`);
+      }
+    }
+  }
+
+  return undefined;
+}
+
+g.test('fragment')
+  .desc('Test subgroup additions in fragment shaders')
+  .params(u =>
+    u
+      .combine('op', kOperations)
+      .combine('size', kFramebufferSizes)
+      .beginSubcases()
+      .combineWithParams([{ format: 'rgba32uint' }] as const)
+  )
+  .beforeAllSubcases(t => {
+    t.selectDeviceOrSkipTestCase('subgroups' as GPUFeatureName);
+  })
+  .fn(async t => {
+    interface SubgroupProperties extends GPUAdapterInfo {
+      subgroupMinSize: number;
+    }
+    const { subgroupMinSize } = t.device.adapterInfo as SubgroupProperties;
+    const innerTexels = (t.params.size[0] - 1) * (t.params.size[1] - 1);
+    t.skipIf(innerTexels < subgroupMinSize, 'Too few texels to be reliable');
+
+    const fsShader = `
+enable subgroups;
+
+@group(0) @binding(0)
+var<storage> inputs : array<u32>;
+
+@fragment
+fn main(
+  @builtin(position) pos : vec4f,
+  @builtin(subgroup_invocation_id) id : u32
+) -> @location(0) vec4u {
+  // Force usage
+  _ = inputs[0];
+
+  let linear = u32(pos.x) + u32(pos.y) * ${t.params.size[0]};
+  let subgroup_id = subgroupBroadcastFirst(linear + 1);
+
+  // Filter out possible helper invocations.
+  let x_in_range = u32(pos.x) < (${t.params.size[0]} - 1);
+  let y_in_range = u32(pos.y) < (${t.params.size[1]} - 1);
+  let in_range = x_in_range && y_in_range;
+
+  let value = select(${kIdentity}, linear, in_range);
+  return vec4u(${t.params.op}(value), id, subgroup_id, 0);
+};`;
+
+    await runFragmentTest(
+      t,
+      t.params.format,
+      fsShader,
+      t.params.size[0],
+      t.params.size[1],
+      new Uint32Array([0]), // unused
+      (data: Uint32Array) => {
+        return checkFragment(
+          data,
+          t.params.op,
+          t.params.format,
+          t.params.size[0],
+          t.params.size[1]
+        );
+      }
+    );
+  });