commit 771e562dbc78709232694c78e11fb8ec8e8b01e3
author dan sinclair <dsinclair@chromium.org> Wed Sep 24 13:38:41 2025 -0700
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Sep 24 13:38:41 2025 -0700
tree 88db91f767b3f13c6ae1ba9ece2362046253ac78
parent e9c59a47ba8357d45a556bc4c7e9b39d3717fdf7

Error on unknown workgroup_size instruction.

If the workgroup size instruction is not a Constant or InstructionResult
add an error.

Fixed: 446986761
Change-Id: I05e4cc69ab20080caa0232d58ed750c31ac67b7f
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/263334
Reviewed-by: James Price <jrprice@google.com>
Auto-Submit: dan sinclair <dsinclair@chromium.org>
Commit-Queue: dan sinclair <dsinclair@chromium.org>
Commit-Queue: James Price <jrprice@google.com>

src/tint/lang/core/ir/validator.cc

diff --git a/src/tint/lang/core/ir/validator.cc b/src/tint/lang/core/ir/validator.cc
index 949cc55..dc1ceec 100644
--- a/src/tint/lang/core/ir/validator.cc
+++ b/src/tint/lang/core/ir/validator.cc
@@ -2683,7 +2683,11 @@
             //        if  not constant expression && not override expression:
             //            fail
             //    pass
+
+            continue;
         }
+
+        AddError(func) << "@workgroup_size must be an InstructionResult or a Constant";
     }
 
     constexpr uint64_t kMaxGridSize = 0xffffffff;

src/tint/lang/core/ir/validator_function_test.cc

diff --git a/src/tint/lang/core/ir/validator_function_test.cc b/src/tint/lang/core/ir/validator_function_test.cc
index 81891e4..6faeed4 100644
--- a/src/tint/lang/core/ir/validator_function_test.cc
+++ b/src/tint/lang/core/ir/validator_function_test.cc
@@ -1227,6 +1227,22 @@
 )")) << res.Failure();
 }
 
+TEST_F(IR_ValidatorTest, Function_WorkgroupSize_InvalidValueKind) {
+    auto* f = ComputeEntryPoint();
+    f->SetWorkgroupSize({b.Constant(1_u), b.FunctionParam("p", ty.u32()), b.Constant(3_u)});
+
+    b.Append(f->Block(), [&] { b.Unreachable(); });
+
+    auto res = ir::Validate(mod, Capabilities{Capability::kAllowOverrides});
+    ASSERT_NE(res, Success);
+    EXPECT_THAT(
+        res.Failure().reason,
+        testing::HasSubstr(R"(:1:1 error: @workgroup_size must be an InstructionResult or a Constant
+%f = @compute @workgroup_size(1u, %p, 3u) func():void {
+^^
+)")) << res.Failure();
+}
+
 TEST_F(IR_ValidatorTest, Function_WorkgroupSize_ParamsTooSmall) {
     auto* f = ComputeEntryPoint();
     f->SetWorkgroupSize({b.Constant(-1_i), b.Constant(2_i), b.Constant(3_i)});