Roll SPIRV-Tools and SPIRV-Headers, fix spvasm
This picks up validation to ensure a struct of builtins on
the input or output interface is also decorated with Block.
See https://github.com/KhronosGroup/SPIRV-Tools/pull/4665
Fix SPIR-V in end2end tests that was breaking the rule.
Change-Id: Ic0e9c8936eb6b3f086b084d86b649e9e237fc3b3
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/73242
Reviewed-by: James Price <jrprice@google.com>
Auto-Submit: David Neto <dneto@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>
Commit-Queue: David Neto <dneto@google.com>
diff --git a/DEPS b/DEPS
index 217d9ab..c7b1cb1 100644
--- a/DEPS
+++ b/DEPS
@@ -13,8 +13,8 @@
'googletest_revision': '1a3e2a265f35e604378156cd675b11ef0a184627',
'gpuweb_cts_revision': 'b0291fd966b55a5efc496772555b94842bde1085',
'protobuf_revision': 'fde7cf7358ec7cd69e8db9be4f1fa6a5c431386a',
- 'spirv_headers_revision': 'ae217c17809fadb232ec94b29304b4afcd417bb4',
- 'spirv_tools_revision': 'ba4b390c367e09edaad36f0376a87aa03620fd4b',
+ 'spirv_headers_revision': 'eddd4dfc930f1374a70797460240a501c7d333f7',
+ 'spirv_tools_revision': 'df2aad68b98279412494a6d449bd71b6756e699b',
'testing_revision': '2691851e49de541c3fe42fa8692ddcdee938162f',
}
diff --git a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_BuiltinPointSize_ReadReplaced.spvasm b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_BuiltinPointSize_ReadReplaced.spvasm
index 71c0143..5a348b4 100644
--- a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_BuiltinPointSize_ReadReplaced.spvasm
+++ b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_BuiltinPointSize_ReadReplaced.spvasm
@@ -7,6 +7,7 @@
OpCapability Shader
OpMemoryModel Logical Simple
OpEntryPoint Vertex %2 "main" %1
+OpDecorate %_struct_10 Block
OpMemberDecorate %_struct_10 0 BuiltIn Position
OpMemberDecorate %_struct_10 1 BuiltIn PointSize
OpMemberDecorate %_struct_10 2 BuiltIn ClipDistance
diff --git a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_BuiltinPointSize_Write1_IsErased.spvasm b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_BuiltinPointSize_Write1_IsErased.spvasm
index abff3db..03daf4f 100644
--- a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_BuiltinPointSize_Write1_IsErased.spvasm
+++ b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_BuiltinPointSize_Write1_IsErased.spvasm
@@ -7,6 +7,7 @@
OpCapability Shader
OpMemoryModel Logical Simple
OpEntryPoint Vertex %2 "main" %1
+OpDecorate %_struct_10 Block
OpMemberDecorate %_struct_10 0 BuiltIn Position
OpMemberDecorate %_struct_10 1 BuiltIn PointSize
OpMemberDecorate %_struct_10 2 BuiltIn ClipDistance
diff --git a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_BuiltinPointSize_WriteViaCopyObjectPostAccessChainErased.spvasm b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_BuiltinPointSize_WriteViaCopyObjectPostAccessChainErased.spvasm
index 38405c5..cee37b4 100644
--- a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_BuiltinPointSize_WriteViaCopyObjectPostAccessChainErased.spvasm
+++ b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_BuiltinPointSize_WriteViaCopyObjectPostAccessChainErased.spvasm
@@ -7,6 +7,7 @@
OpCapability Shader
OpMemoryModel Logical Simple
OpEntryPoint Vertex %2 "main" %1
+OpDecorate %_struct_10 Block
OpMemberDecorate %_struct_10 0 BuiltIn Position
OpMemberDecorate %_struct_10 1 BuiltIn PointSize
OpMemberDecorate %_struct_10 2 BuiltIn ClipDistance
diff --git a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_BuiltinPosition_BuiltIn_Position.spvasm b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_BuiltinPosition_BuiltIn_Position.spvasm
index 5b3b665..e39c013 100644
--- a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_BuiltinPosition_BuiltIn_Position.spvasm
+++ b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_BuiltinPosition_BuiltIn_Position.spvasm
@@ -7,6 +7,7 @@
OpCapability Shader
OpMemoryModel Logical Simple
OpEntryPoint Vertex %2 "main" %1
+OpDecorate %_struct_10 Block
OpMemberDecorate %_struct_10 0 BuiltIn Position
OpMemberDecorate %_struct_10 1 BuiltIn PointSize
OpMemberDecorate %_struct_10 2 BuiltIn ClipDistance
diff --git a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_BuiltinPosition_BuiltIn_Position_Initializer.spvasm b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_BuiltinPosition_BuiltIn_Position_Initializer.spvasm
index af425d1..8e19057 100644
--- a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_BuiltinPosition_BuiltIn_Position_Initializer.spvasm
+++ b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_BuiltinPosition_BuiltIn_Position_Initializer.spvasm
@@ -7,6 +7,7 @@
OpCapability Shader
OpMemoryModel Logical Simple
OpEntryPoint Vertex %2 "main" %1
+OpDecorate %_struct_10 Block
OpMemberDecorate %_struct_10 0 BuiltIn Position
OpMemberDecorate %_struct_10 1 BuiltIn PointSize
OpMemberDecorate %_struct_10 2 BuiltIn ClipDistance
diff --git a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_BuiltinPosition_StorePosition.spvasm b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_BuiltinPosition_StorePosition.spvasm
index 6ef0c06..9d3e90b 100644
--- a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_BuiltinPosition_StorePosition.spvasm
+++ b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_BuiltinPosition_StorePosition.spvasm
@@ -7,6 +7,7 @@
OpCapability Shader
OpMemoryModel Logical Simple
OpEntryPoint Vertex %2 "main" %1
+OpDecorate %_struct_10 Block
OpMemberDecorate %_struct_10 0 BuiltIn Position
OpMemberDecorate %_struct_10 1 BuiltIn PointSize
OpMemberDecorate %_struct_10 2 BuiltIn ClipDistance
diff --git a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_BuiltinPosition_StorePositionMember_OneAccessChain.spvasm b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_BuiltinPosition_StorePositionMember_OneAccessChain.spvasm
index 7622305..a2913f7 100644
--- a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_BuiltinPosition_StorePositionMember_OneAccessChain.spvasm
+++ b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_BuiltinPosition_StorePositionMember_OneAccessChain.spvasm
@@ -7,6 +7,7 @@
OpCapability Shader
OpMemoryModel Logical Simple
OpEntryPoint Vertex %2 "main" %1
+OpDecorate %_struct_10 Block
OpMemberDecorate %_struct_10 0 BuiltIn Position
OpMemberDecorate %_struct_10 1 BuiltIn PointSize
OpMemberDecorate %_struct_10 2 BuiltIn ClipDistance
diff --git a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_BuiltinPosition_StorePositionMember_TwoAccessChain.spvasm b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_BuiltinPosition_StorePositionMember_TwoAccessChain.spvasm
index 65b6be0..3755a47 100644
--- a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_BuiltinPosition_StorePositionMember_TwoAccessChain.spvasm
+++ b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_BuiltinPosition_StorePositionMember_TwoAccessChain.spvasm
@@ -7,6 +7,7 @@
OpCapability Shader
OpMemoryModel Logical Simple
OpEntryPoint Vertex %2 "main" %1
+OpDecorate %_struct_10 Block
OpMemberDecorate %_struct_10 0 BuiltIn Position
OpMemberDecorate %_struct_10 1 BuiltIn PointSize
OpMemberDecorate %_struct_10 2 BuiltIn ClipDistance
diff --git a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_BuiltinPosition_StorePosition_PerVertexStructOutOfOrderDecl.spvasm b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_BuiltinPosition_StorePosition_PerVertexStructOutOfOrderDecl.spvasm
index c1bffe5..60387b0 100644
--- a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_BuiltinPosition_StorePosition_PerVertexStructOutOfOrderDecl.spvasm
+++ b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_BuiltinPosition_StorePosition_PerVertexStructOutOfOrderDecl.spvasm
@@ -7,6 +7,7 @@
OpCapability Shader
OpMemoryModel Logical Simple
OpEntryPoint Vertex %2 "main" %1
+OpDecorate %_struct_10 Block
OpMemberDecorate %_struct_10 0 BuiltIn ClipDistance
OpMemberDecorate %_struct_10 1 BuiltIn CullDistance
OpMemberDecorate %_struct_10 2 BuiltIn Position
