From a9f5d30ea1e7157854d20ad3eeb760eec9360aab Mon Sep 17 00:00:00 2001
From: James Price <jrprice@google.com>
Date: Thu, 25 Jan 2024 17:31:11 -0500
Subject: [PATCH] shader/validation: Add tests for barrier builtins (#3324)

Test that they can only be called from compute shaders, and that they
have no return value.
---
 src/webgpu/listing_meta.json                  |   2 +
 .../expression/call/builtin/barriers.spec.ts  | 109 ++++++++++++++++++
 2 files changed, 111 insertions(+)
 create mode 100644 src/webgpu/shader/validation/expression/call/builtin/barriers.spec.ts

diff --git a/src/webgpu/listing_meta.json b/src/webgpu/listing_meta.json
index 23207a3bfdb7..d7cb40c0596c 100644
--- a/src/webgpu/listing_meta.json
+++ b/src/webgpu/listing_meta.json
@@ -1752,6 +1752,8 @@
   "webgpu:shader,validation,expression,call,builtin,atanh:integer_argument:*": { "subcaseMS": 0.912 },
   "webgpu:shader,validation,expression,call,builtin,atanh:values:*": { "subcaseMS": 0.231 },
   "webgpu:shader,validation,expression,call,builtin,atomics:stage:*": { "subcaseMS": 1.346 },
+  "webgpu:shader,validation,expression,call,builtin,barriers:only_in_compute:*": { "subcaseMS": 1.500 },
+  "webgpu:shader,validation,expression,call,builtin,barriers:no_return_value:*": { "subcaseMS": 1.500 },
   "webgpu:shader,validation,expression,call,builtin,bitcast:bad_const_to_f16:*": { "subcaseMS": 0.753 },
   "webgpu:shader,validation,expression,call,builtin,bitcast:bad_const_to_f32:*": { "subcaseMS": 0.844 },
   "webgpu:shader,validation,expression,call,builtin,bitcast:bad_to_f16:*": { "subcaseMS": 8.518 },
diff --git a/src/webgpu/shader/validation/expression/call/builtin/barriers.spec.ts b/src/webgpu/shader/validation/expression/call/builtin/barriers.spec.ts
new file mode 100644
index 000000000000..5a4ef1465742
--- /dev/null
+++ b/src/webgpu/shader/validation/expression/call/builtin/barriers.spec.ts
@@ -0,0 +1,109 @@
+export const description = `
+Validation tests for {storage,texture,workgroup}Barrier() builtins.
+`;
+
+import { makeTestGroup } from '../../../../../../common/framework/test_group.js';
+import { keysOf } from '../../../../../../common/util/data_tables.js';
+import { ShaderValidationTest } from '../../../shader_validation_test.js';
+
+export const g = makeTestGroup(ShaderValidationTest);
+
+const kEntryPoints = {
+  none: { supportsBarrier: true, code: `` },
+  compute: {
+    supportsBarrier: true,
+    code: `@compute @workgroup_size(1)
+fn main() {
+  foo();
+}`,
+  },
+  vertex: {
+    supportsBarrier: false,
+    code: `@vertex
+fn main() -> @builtin(position) vec4f {
+  foo();
+  return vec4f();
+}`,
+  },
+  fragment: {
+    supportsBarrier: false,
+    code: `@fragment
+fn main() {
+  foo();
+}`,
+  },
+  compute_and_fragment: {
+    supportsBarrier: false,
+    code: `@compute @workgroup_size(1)
+fn main1() {
+  foo();
+}
+
+@fragment
+fn main2() {
+  foo();
+}
+`,
+  },
+  fragment_without_call: {
+    supportsBarrier: true,
+    code: `@fragment
+fn main() {
+}
+`,
+  },
+};
+
+g.test('only_in_compute')
+  .specURL('https://www.w3.org/TR/WGSL/#sync-builtin-functions')
+  .desc(
+    `
+Synchronization functions must only be used in the compute shader stage.
+`
+  )
+  .params(u =>
+    u
+      .combine('entry_point', keysOf(kEntryPoints))
+      .combine('call', ['bar', 'storageBarrier', 'textureBarrier', 'workgroupBarrier'])
+  )
+  .fn(t => {
+    if (t.params.call.startsWith('textureBarrier')) {
+      t.skipIfLanguageFeatureNotSupported('readonly_and_readwrite_storage_textures');
+    }
+
+    const config = kEntryPoints[t.params.entry_point];
+    const code = `
+${config.code}
+fn bar() {}
+
+fn foo() {
+  ${t.params.call}();
+}`;
+    t.expectCompileResult(t.params.call === 'bar' || config.supportsBarrier, code);
+  });
+
+g.test('no_return_value')
+  .specURL('https://www.w3.org/TR/WGSL/#sync-builtin-functions')
+  .desc(
+    `
+Barrier functions do not return a value.
+`
+  )
+  .params(u =>
+    u
+      .combine('assign', [false, true])
+      .combine('rhs', ['bar', 'storageBarrier', 'textureBarrier', 'workgroupBarrier'])
+  )
+  .fn(t => {
+    if (t.params.rhs.startsWith('textureBarrier')) {
+      t.skipIfLanguageFeatureNotSupported('readonly_and_readwrite_storage_textures');
+    }
+
+    const code = `
+fn bar() {}
+
+fn foo() {
+  ${t.params.assign ? '_ = ' : ''} ${t.params.rhs}();
+}`;
+    t.expectCompileResult(!t.params.assign || t.params.rhs === 'bar()', code);
+  });