commit c306cda4db40d61e4833498cdcfce122a750b366
author James Price <jrprice@google.com> Mon Sep 13 17:11:58 2021 +0000
committer James Price <jrprice@google.com> Mon Sep 13 17:11:58 2021 +0000
tree e15425d63cb2e741ce039c833ea56ed648efbd69
parent 922fce729576109e157cf6777b763f972b296e28

inspector: reflect num_workgroups builtin usage

Dawn needs to know if a given entry point uses this builtin, so that
it can pass this information via a root constant for HLSL.

Bug: tint:752
Change-Id: I8bcd3a343db16774ffedd9db9813451f97f10aba
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/64040
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>

src/inspector/entry_point.h

diff --git a/src/inspector/entry_point.h b/src/inspector/entry_point.h
index a97cc67..ca72cca 100644
--- a/src/inspector/entry_point.h
+++ b/src/inspector/entry_point.h
@@ -135,6 +135,8 @@
   bool front_facing_used = false;
   /// Does the entry point use the sample_index builtin
   bool sample_index_used = false;
+  /// Does the entry point use the num_workgroups builtin
+  bool num_workgroups_used = false;
 
   /// @returns the size of the workgroup in {x,y,z} format
   std::tuple<uint32_t, uint32_t, uint32_t> workgroup_size() {

src/inspector/inspector.cc

diff --git a/src/inspector/inspector.cc b/src/inspector/inspector.cc
index 54da3c3..1c1906e 100644
--- a/src/inspector/inspector.cc
+++ b/src/inspector/inspector.cc
@@ -173,6 +173,9 @@
       entry_point.input_sample_mask_used |=
           ContainsBuiltin(ast::Builtin::kSampleMask, param->Type(),
                           param->Declaration()->decorations());
+      entry_point.num_workgroups_used |=
+          ContainsBuiltin(ast::Builtin::kNumWorkgroups, param->Type(),
+                          param->Declaration()->decorations());
     }
 
     if (!sem->ReturnType()->Is<sem::Void>()) {

src/inspector/inspector_test.cc

diff --git a/src/inspector/inspector_test.cc b/src/inspector/inspector_test.cc
index 488d928..9854f40 100644
--- a/src/inspector/inspector_test.cc
+++ b/src/inspector/inspector_test.cc
@@ -642,6 +642,7 @@
   EXPECT_FALSE(result[0].input_position_used);
   EXPECT_FALSE(result[0].front_facing_used);
   EXPECT_FALSE(result[0].sample_index_used);
+  EXPECT_FALSE(result[0].num_workgroups_used);
 }
 
 TEST_F(InspectorGetEntryPointTest, InputSampleMaskSimpleReferenced) {
@@ -805,6 +806,38 @@
   EXPECT_TRUE(result[0].sample_index_used);
 }
 
+TEST_F(InspectorGetEntryPointTest, NumWorkgroupsSimpleReferenced) {
+  auto* in_var =
+      Param("in_var", ty.vec3<u32>(), {Builtin(ast::Builtin::kNumWorkgroups)});
+  Func("ep_func", {in_var}, ty.void_(), {Return()},
+       {Stage(ast::PipelineStage::kCompute), WorkgroupSize(1)}, {});
+
+  Inspector& inspector = Build();
+
+  auto result = inspector.GetEntryPoints();
+
+  ASSERT_EQ(1u, result.size());
+  EXPECT_TRUE(result[0].num_workgroups_used);
+}
+
+TEST_F(InspectorGetEntryPointTest, NumWorkgroupsStructReferenced) {
+  ast::StructMemberList members;
+  members.push_back(Member("inner_position", ty.vec3<u32>(),
+                           {Builtin(ast::Builtin::kNumWorkgroups)}));
+  Structure("in_struct", members, {});
+  auto* in_var = Param("in_var", ty.type_name("in_struct"), {});
+
+  Func("ep_func", {in_var}, ty.void_(), {Return()},
+       {Stage(ast::PipelineStage::kCompute), WorkgroupSize(1)}, {});
+
+  Inspector& inspector = Build();
+
+  auto result = inspector.GetEntryPoints();
+
+  ASSERT_EQ(1u, result.size());
+  EXPECT_TRUE(result[0].num_workgroups_used);
+}
+
 TEST_F(InspectorGetEntryPointTest, ImplicitInterpolate) {
   ast::StructMemberList members;
   members.push_back(Member("struct_inner", ty.f32(), {Location(0)}));