From 46ef1e83897f1b4031df2bb8a4f364e0a6bbbef7 Mon Sep 17 00:00:00 2001 From: Jesse Natalie Date: Fri, 10 Dec 2021 10:42:28 -0800 Subject: [PATCH] ci/windows: Remove line numbers from assertions in spirv2dxil tests Reviewed-by: Enrico Galli Part-of: --- .gitlab-ci/windows/spirv2dxil_check.ps1 | 3 ++- src/microsoft/ci/spirv2dxil_reference.txt | 28 ++++++++++++++-------------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/.gitlab-ci/windows/spirv2dxil_check.ps1 b/.gitlab-ci/windows/spirv2dxil_check.ps1 index 0ef61d8..f9c84ab 100644 --- a/.gitlab-ci/windows/spirv2dxil_check.ps1 +++ b/.gitlab-ci/windows/spirv2dxil_check.ps1 @@ -47,7 +47,8 @@ foreach ($spvasm in $spvasm_files) { } else { Write-Output "$subtest Fail" - Write-Output "$s2d_output`n" + $sanitized_output = $s2d_output -replace ', file .+, line \d+' + Write-Output "$sanitized_output`n" } } } diff --git a/src/microsoft/ci/spirv2dxil_reference.txt b/src/microsoft/ci/spirv2dxil_reference.txt index 744f3b9..1108d98 100644 --- a/src/microsoft/ci/spirv2dxil_reference.txt +++ b/src/microsoft/ci/spirv2dxil_reference.txt @@ -372,39 +372,39 @@ Failed to validate DXIL Test:SpvModuleScopeVarParserTest_BuiltinPointSize_ReadReplaced.spvasm:main|Vertex: Fail -Assertion failed: glsl_get_components(type) == 4, file ../src/microsoft/compiler/dxil_signature.c, line 254 +Assertion failed: glsl_get_components(type) == 4 Test:SpvModuleScopeVarParserTest_BuiltinPointSize_Write1_IsErased.spvasm:main|Vertex: Fail -Assertion failed: instr->deref_type == nir_deref_type_var || instr->deref_type == nir_deref_type_array, file ../src/microsoft/compiler/nir_to_dxil.c, line 3738 +Assertion failed: instr->deref_type == nir_deref_type_var || instr->deref_type == nir_deref_type_array Test:SpvModuleScopeVarParserTest_BuiltinPointSize_WriteViaCopyObjectPostAccessChainErased.spvasm:main|Vertex: Fail -Assertion failed: instr->deref_type == nir_deref_type_var || instr->deref_type == nir_deref_type_array, file ../src/microsoft/compiler/nir_to_dxil.c, line 3738 +Assertion failed: instr->deref_type == nir_deref_type_var || instr->deref_type == nir_deref_type_array Test:SpvModuleScopeVarParserTest_BuiltinPosition_BuiltIn_Position.spvasm:main|Vertex: Fail -Assertion failed: glsl_get_components(type) == 4, file ../src/microsoft/compiler/dxil_signature.c, line 254 +Assertion failed: glsl_get_components(type) == 4 Test:SpvModuleScopeVarParserTest_BuiltinPosition_BuiltIn_Position_Initializer.spvasm:main|Vertex: Fail -Assertion failed: instr->deref_type == nir_deref_type_var || instr->deref_type == nir_deref_type_array, file ../src/microsoft/compiler/nir_to_dxil.c, line 3738 +Assertion failed: instr->deref_type == nir_deref_type_var || instr->deref_type == nir_deref_type_array Test:SpvModuleScopeVarParserTest_BuiltinPosition_StorePosition.spvasm:main|Vertex: Fail -Assertion failed: instr->deref_type == nir_deref_type_var || instr->deref_type == nir_deref_type_array, file ../src/microsoft/compiler/nir_to_dxil.c, line 3738 +Assertion failed: instr->deref_type == nir_deref_type_var || instr->deref_type == nir_deref_type_array Test:SpvModuleScopeVarParserTest_BuiltinPosition_StorePosition_PerVertexStructOutOfOrderDecl.spvasm:main|Vertex: Fail -Assertion failed: instr->deref_type == nir_deref_type_var || instr->deref_type == nir_deref_type_array, file ../src/microsoft/compiler/nir_to_dxil.c, line 3738 +Assertion failed: instr->deref_type == nir_deref_type_var || instr->deref_type == nir_deref_type_array Test:SpvModuleScopeVarParserTest_BuiltinPosition_StorePositionMember_OneAccessChain.spvasm:main|Vertex: Fail -Assertion failed: instr->deref_type == nir_deref_type_var || instr->deref_type == nir_deref_type_array, file ../src/microsoft/compiler/nir_to_dxil.c, line 3738 +Assertion failed: instr->deref_type == nir_deref_type_var || instr->deref_type == nir_deref_type_array Test:SpvModuleScopeVarParserTest_BuiltinPosition_StorePositionMember_TwoAccessChain.spvasm:main|Vertex: Fail -Assertion failed: instr->deref_type == nir_deref_type_var || instr->deref_type == nir_deref_type_array, file ../src/microsoft/compiler/nir_to_dxil.c, line 3738 +Assertion failed: instr->deref_type == nir_deref_type_var || instr->deref_type == nir_deref_type_array Test:SpvModuleScopeVarParserTest_BuiltinVertexIndex.spvasm:main|Vertex: Fail @@ -449,15 +449,15 @@ Failed to validate DXIL Test:SpvModuleScopeVarParserTest_EntryPointWrapping_BuiltinVar_SampleMask_Out_Unsigned_Initializer.spvasm:main|Fragment: Pass Test:SpvModuleScopeVarParserTest_EntryPointWrapping_Flatten_Interpolation_Flat_Fragment_In.spvasm:main|Fragment: Fail -Assertion failed: !"unexpected glsl type", file ../src/microsoft/compiler/dxil_enums.c, line 73 +Assertion failed: !"unexpected glsl type" Test:SpvModuleScopeVarParserTest_EntryPointWrapping_Flatten_Interpolation_Floating_Fragment_In.spvasm:main|Fragment: Fail -Assertion failed: !"unexpected glsl type", file ../src/microsoft/compiler/dxil_enums.c, line 73 +Assertion failed: !"unexpected glsl type" Test:SpvModuleScopeVarParserTest_EntryPointWrapping_Flatten_Interpolation_Floating_Fragment_Out.spvasm:main|Fragment: Fail -Assertion failed: !"unexpected glsl type", file ../src/microsoft/compiler/dxil_enums.c, line 73 +Assertion failed: !"unexpected glsl type" Test:SpvModuleScopeVarParserTest_EntryPointWrapping_Interpolation_Flat_Vertex_In.spvasm:main|Vertex: Fail @@ -529,7 +529,7 @@ Failed to validate DXIL Test:SpvModuleScopeVarParserTest_Input_FlattenStruct_LocOnVariable.spvasm:main|Vertex: Fail -Assertion failed: !"unexpected glsl type", file ../src/microsoft/compiler/dxil_enums.c, line 73 +Assertion failed: !"unexpected glsl type" Test:SpvModuleScopeVarParserTest_InputVarsConvertedToPrivate.spvasm:main|Fragment: Pass @@ -611,7 +611,7 @@ Failed to validate DXIL Test:SpvModuleScopeVarParserTest_Output_FlattenStruct_LocOnVariable.spvasm:main|Vertex: Fail -Assertion failed: !"unexpected glsl type", file ../src/microsoft/compiler/dxil_enums.c, line 73 +Assertion failed: !"unexpected glsl type" Test:SpvModuleScopeVarParserTest_OutputVarsConvertedToPrivate.spvasm:main|Fragment: Pass -- 2.7.4