From 667bc2d929bd3e5c0bf30d6b6b3c95a1496f6b7c Mon Sep 17 00:00:00 2001 From: David Neto Date: Fri, 17 Dec 2021 20:45:22 +0000 Subject: [PATCH] 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 Auto-Submit: David Neto Kokoro: Kokoro Commit-Queue: David Neto --- DEPS | 4 ++-- ...uleScopeVarParserTest_BuiltinPointSize_ReadReplaced.spvasm | 1 + ...ScopeVarParserTest_BuiltinPointSize_Write1_IsErased.spvasm | 1 + ...inPointSize_WriteViaCopyObjectPostAccessChainErased.spvasm | 1 + ...ScopeVarParserTest_BuiltinPosition_BuiltIn_Position.spvasm | 1 + ...erTest_BuiltinPosition_BuiltIn_Position_Initializer.spvasm | 1 + ...uleScopeVarParserTest_BuiltinPosition_StorePosition.spvasm | 1 + ..._BuiltinPosition_StorePositionMember_OneAccessChain.spvasm | 1 + ..._BuiltinPosition_StorePositionMember_TwoAccessChain.spvasm | 1 + ...osition_StorePosition_PerVertexStructOutOfOrderDecl.spvasm | 1 + 10 files changed, 11 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index 217d9abcec..c7b1cb1d77 100644 --- a/DEPS +++ b/DEPS @@ -13,8 +13,8 @@ vars = { '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 71c0143050..5a348b47bf 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 abff3dbed5..03daf4f7f2 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 38405c5f49..cee37b4b9d 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 5b3b6650ac..e39c013e9c 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 af425d1838..8e19057775 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 6ef0c06fb9..9d3e90b98a 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 762230533d..a2913f7ff6 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 65b6be07c0..3755a475e0 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 c1bffe56b9..60387b0691 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