From 0da5e8b35df46012dfaa49225db55865ae890480 Mon Sep 17 00:00:00 2001 From: Antonio Maiorano Date: Thu, 28 Apr 2022 15:11:03 +0000 Subject: [PATCH] tint: regen skips for hlsl files that were missing error message in the output Also mark all the skips for time out the same way for easier grepping. Change-Id: Ie071df30431bded7838205c3a18483a5233687c7 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/88341 Reviewed-by: Ben Clayton Commit-Queue: Antonio Maiorano Kokoro: Kokoro --- ...CFGEdges_LoopBreak_FromLoopBodyDirect.spvasm.expected.hlsl | 1 + ...t_ComputeBlockOrder_Loop_BodyHasBreak.spvasm.expected.hlsl | 1 + ...nversionTest_ConvertFToU_HoistedValue.spvasm.expected.hlsl | 1 + .../0-opt.spvasm.expected.hlsl | 2 +- .../0-opt.wgsl.expected.hlsl | 2 +- .../0-opt.spvasm.expected.hlsl | 4 +--- .../0-opt.wgsl.expected.hlsl | 4 +--- .../1.spvasm.expected.hlsl | 2 +- .../1.wgsl.expected.hlsl | 4 +--- 9 files changed, 9 insertions(+), 12 deletions(-) diff --git a/test/tint/unittest/reader/spirv/SpvParserCFGTest_ClassifyCFGEdges_LoopBreak_FromLoopBodyDirect.spvasm.expected.hlsl b/test/tint/unittest/reader/spirv/SpvParserCFGTest_ClassifyCFGEdges_LoopBreak_FromLoopBodyDirect.spvasm.expected.hlsl index 1c29d0b728..6454419ee0 100644 --- a/test/tint/unittest/reader/spirv/SpvParserCFGTest_ClassifyCFGEdges_LoopBreak_FromLoopBodyDirect.spvasm.expected.hlsl +++ b/test/tint/unittest/reader/spirv/SpvParserCFGTest_ClassifyCFGEdges_LoopBreak_FromLoopBodyDirect.spvasm.expected.hlsl @@ -17,4 +17,5 @@ void main() { main_1(); return; } +Internal compiler error: access violation. Attempted to read from address 0x0000000000000048 diff --git a/test/tint/unittest/reader/spirv/SpvParserCFGTest_ComputeBlockOrder_Loop_BodyHasBreak.spvasm.expected.hlsl b/test/tint/unittest/reader/spirv/SpvParserCFGTest_ComputeBlockOrder_Loop_BodyHasBreak.spvasm.expected.hlsl index 1c29d0b728..6454419ee0 100644 --- a/test/tint/unittest/reader/spirv/SpvParserCFGTest_ComputeBlockOrder_Loop_BodyHasBreak.spvasm.expected.hlsl +++ b/test/tint/unittest/reader/spirv/SpvParserCFGTest_ComputeBlockOrder_Loop_BodyHasBreak.spvasm.expected.hlsl @@ -17,4 +17,5 @@ void main() { main_1(); return; } +Internal compiler error: access violation. Attempted to read from address 0x0000000000000048 diff --git a/test/tint/unittest/reader/spirv/SpvUnaryConversionTest_ConvertFToU_HoistedValue.spvasm.expected.hlsl b/test/tint/unittest/reader/spirv/SpvUnaryConversionTest_ConvertFToU_HoistedValue.spvasm.expected.hlsl index e327721779..6236cea8ea 100644 --- a/test/tint/unittest/reader/spirv/SpvUnaryConversionTest_ConvertFToU_HoistedValue.spvasm.expected.hlsl +++ b/test/tint/unittest/reader/spirv/SpvUnaryConversionTest_ConvertFToU_HoistedValue.spvasm.expected.hlsl @@ -21,4 +21,5 @@ void main() { main_1(); return; } +Internal compiler error: access violation. Attempted to read from address 0x0000000000000048 diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-multiple-one-iteration-loops-global-counter-write-matrices/0-opt.spvasm.expected.hlsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-multiple-one-iteration-loops-global-counter-write-matrices/0-opt.spvasm.expected.hlsl index abefd0ce5b..15932bf3f7 100644 --- a/test/tint/vk-gl-cts/graphicsfuzz/cov-multiple-one-iteration-loops-global-counter-write-matrices/0-opt.spvasm.expected.hlsl +++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-multiple-one-iteration-loops-global-counter-write-matrices/0-opt.spvasm.expected.hlsl @@ -1,4 +1,4 @@ -SKIP: flaky test with FXC, often times out +SKIP: test times out after 30s with FXC void set_scalar_float2x3(inout float2x3 mat, int col, int row, float val) { switch (col) { diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-multiple-one-iteration-loops-global-counter-write-matrices/0-opt.wgsl.expected.hlsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-multiple-one-iteration-loops-global-counter-write-matrices/0-opt.wgsl.expected.hlsl index abefd0ce5b..15932bf3f7 100644 --- a/test/tint/vk-gl-cts/graphicsfuzz/cov-multiple-one-iteration-loops-global-counter-write-matrices/0-opt.wgsl.expected.hlsl +++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-multiple-one-iteration-loops-global-counter-write-matrices/0-opt.wgsl.expected.hlsl @@ -1,4 +1,4 @@ -SKIP: flaky test with FXC, often times out +SKIP: test times out after 30s with FXC void set_scalar_float2x3(inout float2x3 mat, int col, int row, float val) { switch (col) { diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-nested-loops-global-loop-counter-do-while-accumulate-float/0-opt.spvasm.expected.hlsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-nested-loops-global-loop-counter-do-while-accumulate-float/0-opt.spvasm.expected.hlsl index 20ec5cde7a..46f7ae79e3 100644 --- a/test/tint/vk-gl-cts/graphicsfuzz/cov-nested-loops-global-loop-counter-do-while-accumulate-float/0-opt.spvasm.expected.hlsl +++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-nested-loops-global-loop-counter-do-while-accumulate-float/0-opt.spvasm.expected.hlsl @@ -1,3 +1 @@ -SKIP: FAILED - -test timed out after 30s \ No newline at end of file +SKIP: test times out after 30s with FXC \ No newline at end of file diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-nested-loops-global-loop-counter-do-while-accumulate-float/0-opt.wgsl.expected.hlsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-nested-loops-global-loop-counter-do-while-accumulate-float/0-opt.wgsl.expected.hlsl index 20ec5cde7a..46f7ae79e3 100644 --- a/test/tint/vk-gl-cts/graphicsfuzz/cov-nested-loops-global-loop-counter-do-while-accumulate-float/0-opt.wgsl.expected.hlsl +++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-nested-loops-global-loop-counter-do-while-accumulate-float/0-opt.wgsl.expected.hlsl @@ -1,3 +1 @@ -SKIP: FAILED - -test timed out after 30s \ No newline at end of file +SKIP: test times out after 30s with FXC \ No newline at end of file diff --git a/test/tint/vk-gl-cts/graphicsfuzz/spv-stable-maze-flatten-copy-composite/1.spvasm.expected.hlsl b/test/tint/vk-gl-cts/graphicsfuzz/spv-stable-maze-flatten-copy-composite/1.spvasm.expected.hlsl index 07c0d4077f..6aa974e4fe 100644 --- a/test/tint/vk-gl-cts/graphicsfuzz/spv-stable-maze-flatten-copy-composite/1.spvasm.expected.hlsl +++ b/test/tint/vk-gl-cts/graphicsfuzz/spv-stable-maze-flatten-copy-composite/1.spvasm.expected.hlsl @@ -1 +1 @@ -SKIP: flaky test that takes ~25s and often times out with FXC. +SKIP: test times out after 30s with FXC diff --git a/test/tint/vk-gl-cts/graphicsfuzz/spv-stable-maze-flatten-copy-composite/1.wgsl.expected.hlsl b/test/tint/vk-gl-cts/graphicsfuzz/spv-stable-maze-flatten-copy-composite/1.wgsl.expected.hlsl index 20ec5cde7a..6aa974e4fe 100644 --- a/test/tint/vk-gl-cts/graphicsfuzz/spv-stable-maze-flatten-copy-composite/1.wgsl.expected.hlsl +++ b/test/tint/vk-gl-cts/graphicsfuzz/spv-stable-maze-flatten-copy-composite/1.wgsl.expected.hlsl @@ -1,3 +1 @@ -SKIP: FAILED - -test timed out after 30s \ No newline at end of file +SKIP: test times out after 30s with FXC