[spirv-reader][ir] Convert num workgroups when needed.
In SPIR-V the num workgroups can be a vec3<i32 or u32>. In WGSL it must
be a vec3<u32>. Make sure we do any required conversions to match types.
Bug: 42250952
Change-Id: I6ee537f119721b7c567be327ce7ab074ac088aea
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/245754
Commit-Queue: dan sinclair <dsinclair@chromium.org>
Reviewed-by: David Neto <dneto@google.com>
diff --git a/src/tint/lang/spirv/reader/lower/shader_io.cc b/src/tint/lang/spirv/reader/lower/shader_io.cc
index ac6fc11..e75e9c2 100644
--- a/src/tint/lang/spirv/reader/lower/shader_io.cc
+++ b/src/tint/lang/spirv/reader/lower/shader_io.cc
@@ -424,7 +424,8 @@
}
case core::BuiltinValue::kLocalInvocationId:
case core::BuiltinValue::kGlobalInvocationId:
- case core::BuiltinValue::kWorkgroupId: {
+ case core::BuiltinValue::kWorkgroupId:
+ case core::BuiltinValue::kNumWorkgroups: {
var_type = ty.vec3<u32>();
break;
}
@@ -498,7 +499,8 @@
}
case core::BuiltinValue::kLocalInvocationId:
case core::BuiltinValue::kGlobalInvocationId:
- case core::BuiltinValue::kWorkgroupId: {
+ case core::BuiltinValue::kWorkgroupId:
+ case core::BuiltinValue::kNumWorkgroups: {
auto* idx_ty = var->Result()->Type()->UnwrapPtr();
auto* elem_ty = idx_ty->DeepestElement();
if (elem_ty->IsSignedIntegerScalar()) {
diff --git a/src/tint/lang/spirv/reader/lower/shader_io_test.cc b/src/tint/lang/spirv/reader/lower/shader_io_test.cc
index 416726e..2481cd4 100644
--- a/src/tint/lang/spirv/reader/lower/shader_io_test.cc
+++ b/src/tint/lang/spirv/reader/lower/shader_io_test.cc
@@ -2662,6 +2662,96 @@
EXPECT_EQ(expect, str());
}
+TEST_F(SpirvReader_ShaderIOTest, NumWorkgroups_i32) {
+ auto* idx = b.Var("idx", ty.ptr(core::AddressSpace::kIn, ty.vec3<i32>()));
+ idx->SetBuiltin(core::BuiltinValue::kNumWorkgroups);
+ mod.root_block->Append(idx);
+
+ auto* ep = b.Function("foo", ty.void_(), core::ir::Function::PipelineStage::kCompute);
+ ep->SetWorkgroupSize(b.Constant(1_u), b.Constant(1_u), b.Constant(1_u));
+ b.Append(ep->Block(), [&] {
+ auto* idx_value = b.Load(idx);
+ b.Let("a", b.Multiply(ty.vec3<i32>(), idx_value, b.Splat(ty.vec3<i32>(), 2_i)));
+ b.Return(ep);
+ });
+
+ auto* src = R"(
+$B1: { # root
+ %idx:ptr<__in, vec3<i32>, read> = var undef @builtin(num_workgroups)
+}
+
+%foo = @compute @workgroup_size(1u, 1u, 1u) func():void {
+ $B2: {
+ %3:vec3<i32> = load %idx
+ %4:vec3<i32> = mul %3, vec3<i32>(2i)
+ %a:vec3<i32> = let %4
+ ret
+ }
+}
+)";
+ EXPECT_EQ(src, str());
+
+ auto* expect = R"(
+%foo = @compute @workgroup_size(1u, 1u, 1u) func(%idx:vec3<u32> [@num_workgroups]):void {
+ $B1: {
+ %3:vec3<i32> = convert %idx
+ %4:vec3<i32> = mul %3, vec3<i32>(2i)
+ %a:vec3<i32> = let %4
+ ret
+ }
+}
+)";
+
+ Run(ShaderIO);
+
+ EXPECT_EQ(expect, str());
+}
+
+TEST_F(SpirvReader_ShaderIOTest, NumWorkgroups_u32) {
+ auto* idx = b.Var("idx", ty.ptr(core::AddressSpace::kIn, ty.vec3<u32>()));
+ idx->SetBuiltin(core::BuiltinValue::kNumWorkgroups);
+ mod.root_block->Append(idx);
+
+ auto* ep = b.Function("foo", ty.void_(), core::ir::Function::PipelineStage::kCompute);
+ ep->SetWorkgroupSize(b.Constant(1_u), b.Constant(1_u), b.Constant(1_u));
+ b.Append(ep->Block(), [&] {
+ auto* idx_value = b.Load(idx);
+ b.Let("a", b.Multiply(ty.vec3<u32>(), idx_value, b.Splat(ty.vec3<u32>(), 2_u)));
+
+ b.Return(ep);
+ });
+
+ auto* src = R"(
+$B1: { # root
+ %idx:ptr<__in, vec3<u32>, read> = var undef @builtin(num_workgroups)
+}
+
+%foo = @compute @workgroup_size(1u, 1u, 1u) func():void {
+ $B2: {
+ %3:vec3<u32> = load %idx
+ %4:vec3<u32> = mul %3, vec3<u32>(2u)
+ %a:vec3<u32> = let %4
+ ret
+ }
+}
+)";
+ EXPECT_EQ(src, str());
+
+ auto* expect = R"(
+%foo = @compute @workgroup_size(1u, 1u, 1u) func(%idx:vec3<u32> [@num_workgroups]):void {
+ $B1: {
+ %3:vec3<u32> = mul %idx, vec3<u32>(2u)
+ %a:vec3<u32> = let %3
+ ret
+ }
+}
+)";
+
+ Run(ShaderIO);
+
+ EXPECT_EQ(expect, str());
+}
+
TEST_F(SpirvReader_ShaderIOTest, SampleIndex_i32) {
auto* idx = b.Var("idx", ty.ptr(core::AddressSpace::kIn, ty.i32()));
idx->SetBuiltin(core::BuiltinValue::kSampleIndex);
