commit bf46de42ad63a5910ae68ad29380d4dffda41af8
author dan sinclair <dsinclair@chromium.org> Thu Mar 26 15:49:06 2020 +0000
committer dan sinclair <dsinclair@google.com> Thu Mar 26 15:49:06 2020 +0000
tree 9e185cfead4ff253f86681202cfc6c94c6ffa790
parent 989cee6d3352ca7ecea91e25580be43a69c54115

[spirv-writer] Emit struct names

This CL changes the struct generation to emit the `OpName` for the
struct instead of doing it in a separate type alias pass. The struct
name was the only thing that needed to be output in the type alias pass
and this makes sure it's only emitted if used.

Bug: tint:5
Change-Id: I7389a3cd61812171fceeaae99253610152aa523d
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/17860
Reviewed-by: Ryan Harrison <rharrison@chromium.org>

src/writer/spirv/builder.cc

diff --git a/src/writer/spirv/builder.cc b/src/writer/spirv/builder.cc
index 7d511ee..f9c1584 100644
--- a/src/writer/spirv/builder.cc
+++ b/src/writer/spirv/builder.cc
@@ -274,6 +274,11 @@
   auto struct_id = result.to_i();
   auto impl = struct_type->impl();
 
+  if (!struct_type->name().empty()) {
+    push_debug(spv::Op::OpName,
+               {Operand::Int(struct_id), Operand::String(struct_type->name())});
+  }
+
   std::vector<Operand> ops;
   ops.push_back(result);
 

src/writer/spirv/builder_type_test.cc

diff --git a/src/writer/spirv/builder_type_test.cc b/src/writer/spirv/builder_type_test.cc
index ccace3b..10f960d 100644
--- a/src/writer/spirv/builder_type_test.cc
+++ b/src/writer/spirv/builder_type_test.cc
@@ -186,6 +186,7 @@
   EXPECT_EQ(id, 1);
 
   EXPECT_EQ(b.types().size(), 1);
+  EXPECT_EQ(DumpInstructions(b.debug()), "");
   EXPECT_EQ(DumpInstructions(b.types()), R"(%1 = OpTypeStruct
 )");
 }
@@ -201,6 +202,7 @@
   auto s = std::make_unique<ast::Struct>(ast::StructDecoration::kNone,
                                          std::move(members));
   ast::type::StructType s_type(std::move(s));
+  s_type.set_name("my_struct");
 
   Builder b;
   auto id = b.GenerateTypeIfNeeded(&s_type);
@@ -210,7 +212,8 @@
   EXPECT_EQ(DumpInstructions(b.types()), R"(%2 = OpTypeFloat 32
 %1 = OpTypeStruct %2
 )");
-  EXPECT_EQ(DumpInstructions(b.debug()), R"(OpMemberName %1 0 "a"
+  EXPECT_EQ(DumpInstructions(b.debug()), R"(OpName %1 "my_struct"
+OpMemberName %1 0 "a"
 )");
 }
 
@@ -225,6 +228,7 @@
   auto s = std::make_unique<ast::Struct>(ast::StructDecoration::kBlock,
                                          std::move(members));
   ast::type::StructType s_type(std::move(s));
+  s_type.set_name("my_struct");
 
   Builder b;
   auto id = b.GenerateTypeIfNeeded(&s_type);
@@ -234,7 +238,8 @@
   EXPECT_EQ(DumpInstructions(b.types()), R"(%2 = OpTypeFloat 32
 %1 = OpTypeStruct %2
 )");
-  EXPECT_EQ(DumpInstructions(b.debug()), R"(OpMemberName %1 0 "a"
+  EXPECT_EQ(DumpInstructions(b.debug()), R"(OpName %1 "my_struct"
+OpMemberName %1 0 "a"
 )");
   EXPECT_EQ(DumpInstructions(b.annots()), R"(OpDecorate %1 Block
 )");