From c6ef4047d00564d05714149146b582722f2bce57 Mon Sep 17 00:00:00 2001 From: Charlie Turner Date: Thu, 22 Apr 2021 16:17:28 +0100 Subject: [PATCH] radv: Merge dEQP default skips into all generation-specific skip lists https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8147 obsoleted https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4656 so the default skips are not being used. Instead, merge the defaults into each generation's skip list. Also remove the "Fixed by CTS 3dddaeca8 ("Fix source blit image size")", since the VK-GL-CTS has been updated to vulkan-cts-1.2.6.0 already, which includes 3dddaeca8 Nowadays, the only option is to have default skips per GPU version (c.f. GPU_VERSION variable in deqp-runner), since the runner doesn't have a "skip list merge" feature. v2. - Removed deqp-radv-polaris10-skips.txt in response to Samuel's feedback. v3. - Add review tags. Reviewed-by: Samuel Pitoiset Part-of: --- src/amd/ci/deqp-radv-default-skips.txt | 26 ---------------- src/amd/ci/deqp-radv-fiji-aco-skips.txt | 9 ++++++ src/amd/ci/deqp-radv-navi10-aco-skips.txt | 9 ++++++ src/amd/ci/deqp-radv-navi14-aco-skips.txt | 9 ++++++ src/amd/ci/deqp-radv-oland-aco-skips.txt | 9 ++++++ src/amd/ci/deqp-radv-pitcairn-aco-skips.txt | 9 ++++++ src/amd/ci/deqp-radv-polaris10-skips.txt | 31 ------------------- src/amd/ci/deqp-radv-raven-aco-skips.txt | 17 ---------- .../ci/deqp-radv-sienna_cichlid-aco-skips.txt | 9 ++++++ src/amd/ci/deqp-radv-vega10-aco-skips.txt | 9 ++++++ 10 files changed, 63 insertions(+), 74 deletions(-) delete mode 100644 src/amd/ci/deqp-radv-default-skips.txt create mode 100644 src/amd/ci/deqp-radv-fiji-aco-skips.txt create mode 100644 src/amd/ci/deqp-radv-navi10-aco-skips.txt create mode 100644 src/amd/ci/deqp-radv-navi14-aco-skips.txt create mode 100644 src/amd/ci/deqp-radv-oland-aco-skips.txt create mode 100644 src/amd/ci/deqp-radv-pitcairn-aco-skips.txt delete mode 100644 src/amd/ci/deqp-radv-polaris10-skips.txt create mode 100644 src/amd/ci/deqp-radv-sienna_cichlid-aco-skips.txt create mode 100644 src/amd/ci/deqp-radv-vega10-aco-skips.txt diff --git a/src/amd/ci/deqp-radv-default-skips.txt b/src/amd/ci/deqp-radv-default-skips.txt deleted file mode 100644 index 141ea53a878..00000000000 --- a/src/amd/ci/deqp-radv-default-skips.txt +++ /dev/null @@ -1,26 +0,0 @@ -# Exclude this test which might fail when a new extension is implemented. -dEQP-VK.info.device_extensions - -# Exclude WSI related tests. -dEQP-VK.image.swapchain_mutable.* -dEQP-VK.wsi.* - -# Exclude this test which timeout most of the time. -dEQP-VK.memory.pipeline_barrier.transfer_src_transfer_dst.1048576 - -# Fixed by CTS 3dddaeca8 ("Fix source blit image size") -dEQP-VK.memory.pipeline_barrier.all.1024_vertex_buffer_stride_2 -dEQP-VK.memory.pipeline_barrier.all.1024_vertex_buffer_stride_4 -dEQP-VK.memory.pipeline_barrier.all_device.1024_vertex_buffer_stride_2 -dEQP-VK.memory.pipeline_barrier.all_device.1024_vertex_buffer_stride_4 -dEQP-VK.memory.pipeline_barrier.host_read_transfer_dst.1024 -dEQP-VK.memory.pipeline_barrier.transfer_dst_image_sampled.1024 -dEQP-VK.memory.pipeline_barrier.transfer_dst_index_buffer.1024 -dEQP-VK.memory.pipeline_barrier.transfer_dst_storage_buffer.1024 -dEQP-VK.memory.pipeline_barrier.transfer_dst_storage_image.1024 -dEQP-VK.memory.pipeline_barrier.transfer_dst_storage_texel_buffer.1024 -dEQP-VK.memory.pipeline_barrier.transfer_dst_uniform_buffer.1024 -dEQP-VK.memory.pipeline_barrier.transfer_dst_uniform_texel_buffer.1024 -dEQP-VK.memory.pipeline_barrier.transfer_dst_vertex_buffer.1024_vertex_buffer_stride_2 -dEQP-VK.memory.pipeline_barrier.transfer_dst_vertex_buffer.1024_vertex_buffer_stride_4 -dEQP-VK.memory.pipeline_barrier.transfer_src_transfer_dst.1024 diff --git a/src/amd/ci/deqp-radv-fiji-aco-skips.txt b/src/amd/ci/deqp-radv-fiji-aco-skips.txt new file mode 100644 index 00000000000..521123c7738 --- /dev/null +++ b/src/amd/ci/deqp-radv-fiji-aco-skips.txt @@ -0,0 +1,9 @@ +# Exclude this test which might fail when a new extension is implemented. +dEQP-VK.info.device_extensions + +# Exclude WSI related tests. +dEQP-VK.image.swapchain_mutable.* +dEQP-VK.wsi.* + +# Exclude this test which timeout most of the time. +dEQP-VK.memory.pipeline_barrier.transfer_src_transfer_dst.1048576 diff --git a/src/amd/ci/deqp-radv-navi10-aco-skips.txt b/src/amd/ci/deqp-radv-navi10-aco-skips.txt new file mode 100644 index 00000000000..521123c7738 --- /dev/null +++ b/src/amd/ci/deqp-radv-navi10-aco-skips.txt @@ -0,0 +1,9 @@ +# Exclude this test which might fail when a new extension is implemented. +dEQP-VK.info.device_extensions + +# Exclude WSI related tests. +dEQP-VK.image.swapchain_mutable.* +dEQP-VK.wsi.* + +# Exclude this test which timeout most of the time. +dEQP-VK.memory.pipeline_barrier.transfer_src_transfer_dst.1048576 diff --git a/src/amd/ci/deqp-radv-navi14-aco-skips.txt b/src/amd/ci/deqp-radv-navi14-aco-skips.txt new file mode 100644 index 00000000000..521123c7738 --- /dev/null +++ b/src/amd/ci/deqp-radv-navi14-aco-skips.txt @@ -0,0 +1,9 @@ +# Exclude this test which might fail when a new extension is implemented. +dEQP-VK.info.device_extensions + +# Exclude WSI related tests. +dEQP-VK.image.swapchain_mutable.* +dEQP-VK.wsi.* + +# Exclude this test which timeout most of the time. +dEQP-VK.memory.pipeline_barrier.transfer_src_transfer_dst.1048576 diff --git a/src/amd/ci/deqp-radv-oland-aco-skips.txt b/src/amd/ci/deqp-radv-oland-aco-skips.txt new file mode 100644 index 00000000000..521123c7738 --- /dev/null +++ b/src/amd/ci/deqp-radv-oland-aco-skips.txt @@ -0,0 +1,9 @@ +# Exclude this test which might fail when a new extension is implemented. +dEQP-VK.info.device_extensions + +# Exclude WSI related tests. +dEQP-VK.image.swapchain_mutable.* +dEQP-VK.wsi.* + +# Exclude this test which timeout most of the time. +dEQP-VK.memory.pipeline_barrier.transfer_src_transfer_dst.1048576 diff --git a/src/amd/ci/deqp-radv-pitcairn-aco-skips.txt b/src/amd/ci/deqp-radv-pitcairn-aco-skips.txt new file mode 100644 index 00000000000..521123c7738 --- /dev/null +++ b/src/amd/ci/deqp-radv-pitcairn-aco-skips.txt @@ -0,0 +1,9 @@ +# Exclude this test which might fail when a new extension is implemented. +dEQP-VK.info.device_extensions + +# Exclude WSI related tests. +dEQP-VK.image.swapchain_mutable.* +dEQP-VK.wsi.* + +# Exclude this test which timeout most of the time. +dEQP-VK.memory.pipeline_barrier.transfer_src_transfer_dst.1048576 diff --git a/src/amd/ci/deqp-radv-polaris10-skips.txt b/src/amd/ci/deqp-radv-polaris10-skips.txt deleted file mode 100644 index d44343fe466..00000000000 --- a/src/amd/ci/deqp-radv-polaris10-skips.txt +++ /dev/null @@ -1,31 +0,0 @@ -# Disable a TON of tests to keep the run around 5-10 minutes because my runner is -# slow. -dEQP-VK.api.* -dEQP-VK.binding_model.* -dEQP-VK.clipping.* -dEQP-VK.compute.* -dEQP-VK.conditional_rendering.* -dEQP-VK.descriptor_indexing.* -dEQP-VK.device_group.* -dEQP-VK.fragment_operations.* -dEQP-VK.fragment_shader_interlock.* -dEQP-VK.graphicsfuzz.* -dEQP-VK.image.* -dEQP-VK.imageless_framebuffer.* -dEQP-VK.info.* -dEQP-VK.memory.* -dEQP-VK.memory_model.* -dEQP-VK.multiview.* -dEQP-VK.pipeline.* -dEQP-VK.protected_memory.* -dEQP-VK.query_pool.* -dEQP-VK.robustness.* -dEQP-VK.sparse_resources.* -dEQP-VK.spirv_assembly.* -dEQP-VK.subgroups.* -dEQP-VK.synchronization.* -dEQP-VK.texture.* -dEQP-VK.transform_feedback.* -dEQP-VK.ubo.* -dEQP-VK.wsi.* -dEQP-VK.ycbcr.* diff --git a/src/amd/ci/deqp-radv-raven-aco-skips.txt b/src/amd/ci/deqp-radv-raven-aco-skips.txt index 0155e91c82e..77f7620934f 100644 --- a/src/amd/ci/deqp-radv-raven-aco-skips.txt +++ b/src/amd/ci/deqp-radv-raven-aco-skips.txt @@ -11,20 +11,3 @@ dEQP-VK.synchronization.* # Exclude this test which timeout most of the time. dEQP-VK.memory.pipeline_barrier.transfer_src_transfer_dst.1048576 - -# Fixed by CTS 3dddaeca8 ("Fix source blit image size") -dEQP-VK.memory.pipeline_barrier.all.1024_vertex_buffer_stride_2 -dEQP-VK.memory.pipeline_barrier.all.1024_vertex_buffer_stride_4 -dEQP-VK.memory.pipeline_barrier.all_device.1024_vertex_buffer_stride_2 -dEQP-VK.memory.pipeline_barrier.all_device.1024_vertex_buffer_stride_4 -dEQP-VK.memory.pipeline_barrier.host_read_transfer_dst.1024 -dEQP-VK.memory.pipeline_barrier.transfer_dst_image_sampled.1024 -dEQP-VK.memory.pipeline_barrier.transfer_dst_index_buffer.1024 -dEQP-VK.memory.pipeline_barrier.transfer_dst_storage_buffer.1024 -dEQP-VK.memory.pipeline_barrier.transfer_dst_storage_image.1024 -dEQP-VK.memory.pipeline_barrier.transfer_dst_storage_texel_buffer.1024 -dEQP-VK.memory.pipeline_barrier.transfer_dst_uniform_buffer.1024 -dEQP-VK.memory.pipeline_barrier.transfer_dst_uniform_texel_buffer.1024 -dEQP-VK.memory.pipeline_barrier.transfer_dst_vertex_buffer.1024_vertex_buffer_stride_2 -dEQP-VK.memory.pipeline_barrier.transfer_dst_vertex_buffer.1024_vertex_buffer_stride_4 -dEQP-VK.memory.pipeline_barrier.transfer_src_transfer_dst.1024 diff --git a/src/amd/ci/deqp-radv-sienna_cichlid-aco-skips.txt b/src/amd/ci/deqp-radv-sienna_cichlid-aco-skips.txt new file mode 100644 index 00000000000..521123c7738 --- /dev/null +++ b/src/amd/ci/deqp-radv-sienna_cichlid-aco-skips.txt @@ -0,0 +1,9 @@ +# Exclude this test which might fail when a new extension is implemented. +dEQP-VK.info.device_extensions + +# Exclude WSI related tests. +dEQP-VK.image.swapchain_mutable.* +dEQP-VK.wsi.* + +# Exclude this test which timeout most of the time. +dEQP-VK.memory.pipeline_barrier.transfer_src_transfer_dst.1048576 diff --git a/src/amd/ci/deqp-radv-vega10-aco-skips.txt b/src/amd/ci/deqp-radv-vega10-aco-skips.txt new file mode 100644 index 00000000000..521123c7738 --- /dev/null +++ b/src/amd/ci/deqp-radv-vega10-aco-skips.txt @@ -0,0 +1,9 @@ +# Exclude this test which might fail when a new extension is implemented. +dEQP-VK.info.device_extensions + +# Exclude WSI related tests. +dEQP-VK.image.swapchain_mutable.* +dEQP-VK.wsi.* + +# Exclude this test which timeout most of the time. +dEQP-VK.memory.pipeline_barrier.transfer_src_transfer_dst.1048576