From feb14eb7613436bf5fe5ff46ae312523ebf23e85 Mon Sep 17 00:00:00 2001 From: dawn-autoroll Date: Thu, 29 Sep 2022 21:58:20 +0000 Subject: [PATCH] tint: update spirv-tools and fix unittests This should fix vulkan-deps roll into Dawn. Change-Id: I3c6685fa140a5e7f6313c7420109864d7783ffed Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/104280 Commit-Queue: Antonio Maiorano Reviewed-by: Dan Sinclair Kokoro: Kokoro --- DEPS | 2 +- src/tint/reader/spirv/function_cfg_test.cc | 4 ++-- src/tint/reader/spirv/parser_impl_module_var_test.cc | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/DEPS b/DEPS index 086d49e2e4..8ae5dac0ef 100644 --- a/DEPS +++ b/DEPS @@ -139,7 +139,7 @@ deps = { }, 'third_party/vulkan-deps': { - 'url': '{chromium_git}/vulkan-deps@ee327d70a015f2d56c9d8634bf820273738cb983', + 'url': '{chromium_git}/vulkan-deps@cce3d29fab2be8318c2753a014c0a2a7d477daad', 'condition': 'dawn_standalone', }, diff --git a/src/tint/reader/spirv/function_cfg_test.cc b/src/tint/reader/spirv/function_cfg_test.cc index fb5aff77db..68c3448dd1 100644 --- a/src/tint/reader/spirv/function_cfg_test.cc +++ b/src/tint/reader/spirv/function_cfg_test.cc @@ -13028,8 +13028,8 @@ TEST_F(SpvParserCFGTest, EmitBody_ContinueFromSingleBlockLoopToOuterLoop_IsError auto p = parser(test::Assemble(assembly)); EXPECT_FALSE(p->Parse()); EXPECT_FALSE(p->success()); - EXPECT_THAT(p->error(), HasSubstr("block 20[%20] exits the continue headed by " - "20[%20], but not via a structured exit")) + EXPECT_THAT(p->error(), HasSubstr("block '20[%20]' exits the continue headed by " + "'20[%20]', but not via a structured exit")) << p->error(); } diff --git a/src/tint/reader/spirv/parser_impl_module_var_test.cc b/src/tint/reader/spirv/parser_impl_module_var_test.cc index 8eb506b8bd..c761af7e6c 100644 --- a/src/tint/reader/spirv/parser_impl_module_var_test.cc +++ b/src/tint/reader/spirv/parser_impl_module_var_test.cc @@ -1794,7 +1794,7 @@ TEST_F(SpvModuleScopeVarParserTest, SampleId_I32_FunctParam) { // as a function parameter. EXPECT_FALSE(p->Parse()); EXPECT_FALSE(p->success()); - EXPECT_THAT(p->error(), HasSubstr("Invalid storage class for pointer operand 1")); + EXPECT_THAT(p->error(), HasSubstr("Invalid storage class for pointer operand '1")); } TEST_F(SpvModuleScopeVarParserTest, SampleId_U32_Load_Direct) { @@ -1904,7 +1904,7 @@ TEST_F(SpvModuleScopeVarParserTest, SampleId_U32_FunctParam) { // This example is invalid because you can't pass pointer-to-Input // as a function parameter. EXPECT_FALSE(p->Parse()); - EXPECT_THAT(p->error(), HasSubstr("Invalid storage class for pointer operand 1")); + EXPECT_THAT(p->error(), HasSubstr("Invalid storage class for pointer operand '1")); } // Returns the start of a shader for testing SampleMask @@ -2806,7 +2806,7 @@ TEST_F(SpvModuleScopeVarParserTest, VertexIndex_U32_FunctParam) { // This example is invalid because you can't pass pointer-to-Input // as a function parameter. EXPECT_FALSE(p->Parse()); - EXPECT_THAT(p->error(), HasSubstr("Invalid storage class for pointer operand 1")); + EXPECT_THAT(p->error(), HasSubstr("Invalid storage class for pointer operand '1")); } // Returns the start of a shader for testing InstanceIndex, @@ -2964,7 +2964,7 @@ TEST_F(SpvModuleScopeVarParserTest, InstanceIndex_I32_FunctParam) { // This example is invalid because you can't pass pointer-to-Input // as a function parameter. EXPECT_FALSE(p->Parse()); - EXPECT_THAT(p->error(), HasSubstr("Invalid storage class for pointer operand 1")); + EXPECT_THAT(p->error(), HasSubstr("Invalid storage class for pointer operand '1")); } TEST_F(SpvModuleScopeVarParserTest, InstanceIndex_U32_Load_Direct) { @@ -3098,7 +3098,7 @@ TEST_F(SpvModuleScopeVarParserTest, InstanceIndex_U32_FunctParam) { // This example is invalid because you can't pass pointer-to-Input // as a function parameter. EXPECT_FALSE(p->Parse()); - EXPECT_THAT(p->error(), HasSubstr("Invalid storage class for pointer operand 1")); + EXPECT_THAT(p->error(), HasSubstr("Invalid storage class for pointer operand '1")); } // Returns the start of a shader for testing LocalInvocationIndex,