commit 8f4784006e18b558b1649389f2d2dd4928e30b89
author Ben Clayton <bclayton@google.com> Tue Jan 12 21:52:50 2021 +0000
committer Commit Bot service account <commit-bot@chromium.org> Tue Jan 12 21:52:50 2021 +0000
tree 8e7a402cd805457c8557d15b9bf3989c6b845b4a
parent 72114bd61ba3aeac55f9c99e59ffdba2121e0a6f

writer/spirv: Validate SPIRV for all texture intrinsic functions

Finds brokenness.

Change-Id: I1280d456dfe0e4296100e40eef4fb0a17d3d047a
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/37450
Commit-Queue: Ben Clayton <bclayton@google.com>
Reviewed-by: David Neto <dneto@google.com>

src/writer/spirv/builder_intrinsic_texture_test.cc

diff --git a/src/writer/spirv/builder_intrinsic_texture_test.cc b/src/writer/spirv/builder_intrinsic_texture_test.cc
index c4379a4..d9e648e 100644
--- a/src/writer/spirv/builder_intrinsic_texture_test.cc
+++ b/src/writer/spirv/builder_intrinsic_texture_test.cc
@@ -15,13 +15,17 @@
 #include <memory>
 
 #include "gmock/gmock.h"
+#include "spirv-tools/libspirv.hpp"
 #include "src/ast/builder.h"
+#include "src/ast/call_statement.h"
 #include "src/ast/intrinsic_texture_helper_test.h"
+#include "src/ast/stage_decoration.h"
 #include "src/ast/type/depth_texture_type.h"
 #include "src/ast/type/multisampled_texture_type.h"
 #include "src/ast/type/sampled_texture_type.h"
 #include "src/ast/type/storage_texture_type.h"
 #include "src/type_determiner.h"
+#include "src/writer/spirv/binary_writer.h"
 #include "src/writer/spirv/builder.h"
 #include "src/writer/spirv/spv_dump.h"
 
@@ -3779,6 +3783,65 @@
   EXPECT_EQ(expected.capabilities, "\n" + DumpInstructions(b.capabilities()));
 }
 
+// Check the SPIRV generated passes validation
+TEST_P(IntrinsicTextureTest, ValidateSPIRV) {
+  auto param = GetParam();
+
+  mod->AddGlobalVariable(param.buildTextureVariable(this));
+  mod->AddGlobalVariable(param.buildSamplerVariable(this));
+
+  auto* call =
+      create<ast::CallExpression>(Expr(param.function), param.args(this));
+
+  auto* main =
+      Func("main", ast::VariableList{}, ty.void_,
+           ast::StatementList{
+               create<ast::CallStatement>(call),
+           },
+           ast::FunctionDecorationList{
+               create<ast::StageDecoration>(ast::PipelineStage::kFragment),
+           });
+
+  mod->AddFunction(main);
+
+  ASSERT_TRUE(td.Determine()) << td.error();
+
+  ASSERT_TRUE(b.Build()) << td.error();
+
+  BinaryWriter writer;
+  writer.WriteHeader(b.id_bound());
+  writer.WriteBuilder(&b);
+  auto binary = writer.result();
+
+  std::string spv_errors;
+  auto msg_consumer = [&spv_errors](spv_message_level_t level, const char*,
+                                    const spv_position_t& position,
+                                    const char* message) {
+    switch (level) {
+      case SPV_MSG_FATAL:
+      case SPV_MSG_INTERNAL_ERROR:
+      case SPV_MSG_ERROR:
+        spv_errors += "error: line " + std::to_string(position.index) + ": " +
+                      message + "\n";
+        break;
+      case SPV_MSG_WARNING:
+        spv_errors += "warning: line " + std::to_string(position.index) + ": " +
+                      message + "\n";
+        break;
+      case SPV_MSG_INFO:
+        spv_errors += "info: line " + std::to_string(position.index) + ": " +
+                      message + "\n";
+        break;
+      case SPV_MSG_DEBUG:
+        break;
+    }
+  };
+
+  spvtools::SpirvTools tools(SPV_ENV_VULKAN_1_2);
+  tools.SetMessageConsumer(msg_consumer);
+  ASSERT_TRUE(tools.Validate(binary)) << spv_errors;
+}
+
 TEST_P(IntrinsicTextureTest, OutsideFunction_IsError) {
   auto param = GetParam();