From 76cd9388a140cc57a5bed00d85dc69c71fafdbd6 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Wed, 20 Mar 2024 11:18:42 +0100 Subject: [PATCH] zink/ci: enable RADV_PERFTEST=shader_object for NAVI10/VANGOGH Mark arb_tessellation_shader-tes-gs-max-output as flake because it passes with ESO but crashes with pipelines (existing failure). Signed-off-by: Samuel Pitoiset Part-of: --- src/gallium/drivers/zink/ci/gitlab-ci.yml | 2 ++ src/gallium/drivers/zink/ci/zink-radv-navi10-fails.txt | 1 - src/gallium/drivers/zink/ci/zink-radv-navi10-flakes.txt | 3 +++ src/gallium/drivers/zink/ci/zink-radv-vangogh-fails.txt | 1 - src/gallium/drivers/zink/ci/zink-radv-vangogh-flakes.txt | 3 +++ 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/zink/ci/gitlab-ci.yml b/src/gallium/drivers/zink/ci/gitlab-ci.yml index 750ffe85427..555c51bde8f 100644 --- a/src/gallium/drivers/zink/ci/gitlab-ci.yml +++ b/src/gallium/drivers/zink/ci/gitlab-ci.yml @@ -121,6 +121,7 @@ zink-radv-navi10-valve: variables: B2C_TIMEOUT_OVERALL_MINUTES: 30 GPU_VERSION: zink-radv-navi10 + RADV_PERFTEST: shader_object zink-radv-vangogh-valve: timeout: 35m @@ -136,6 +137,7 @@ zink-radv-vangogh-valve: B2C_TIMEOUT_BOOT_MINUTES: 30 B2C_TIMEOUT_OVERALL_MINUTES: 30 FDO_CI_CONCURRENT: 6 + RADV_PERFTEST: shader_object # Override the list of tags to drop `priority:low` tags: - farm:$RUNNER_FARM_LOCATION diff --git a/src/gallium/drivers/zink/ci/zink-radv-navi10-fails.txt b/src/gallium/drivers/zink/ci/zink-radv-navi10-fails.txt index 39a1311f815..295e5501163 100644 --- a/src/gallium/drivers/zink/ci/zink-radv-navi10-fails.txt +++ b/src/gallium/drivers/zink/ci/zink-radv-navi10-fails.txt @@ -72,7 +72,6 @@ spec@arb_shader_texture_lod@execution@arb_shader_texture_lod-texgradcube,Fail spec@arb_shading_language_packing@execution@built-in-functions@fs-packhalf2x16,Fail spec@arb_shading_language_packing@execution@built-in-functions@vs-packhalf2x16,Fail -spec@arb_tessellation_shader@arb_tessellation_shader-tes-gs-max-output -small -scan 1 50,Crash spec@egl 1.4@eglterminate then unbind context,Fail spec@egl_chromium_sync_control@conformance@eglGetSyncValuesCHROMIUM_msc_and_sbc_test,Fail diff --git a/src/gallium/drivers/zink/ci/zink-radv-navi10-flakes.txt b/src/gallium/drivers/zink/ci/zink-radv-navi10-flakes.txt index 2f4f7b1852c..609c77db700 100644 --- a/src/gallium/drivers/zink/ci/zink-radv-navi10-flakes.txt +++ b/src/gallium/drivers/zink/ci/zink-radv-navi10-flakes.txt @@ -18,3 +18,6 @@ spec@glsl-1.50@execution@geometry@point-size-out spec@!opengl 1.0@rasterpos spec@!opengl 1.0@rasterpos@glsl_vs_gs_linked spec@!opengl 1.0@rasterpos@glsl_vs_tes_linke + +# Marked as flake because it passes with ESO but crashes with pipelines. +spec@arb_tessellation_shader@arb_tessellation_shader-tes-gs-max-output -small -scan 1 50 diff --git a/src/gallium/drivers/zink/ci/zink-radv-vangogh-fails.txt b/src/gallium/drivers/zink/ci/zink-radv-vangogh-fails.txt index d756d67970f..9c8d2906691 100644 --- a/src/gallium/drivers/zink/ci/zink-radv-vangogh-fails.txt +++ b/src/gallium/drivers/zink/ci/zink-radv-vangogh-fails.txt @@ -71,7 +71,6 @@ spec@arb_sample_shading@interpolate-at-sample-position 8,Fail spec@arb_shader_texture_lod@execution@arb_shader_texture_lod-texgradcube,Fail spec@arb_shading_language_packing@execution@built-in-functions@fs-packhalf2x16,Fail spec@arb_shading_language_packing@execution@built-in-functions@vs-packhalf2x16,Fail -spec@arb_tessellation_shader@arb_tessellation_shader-tes-gs-max-output -small -scan 1 50,Crash spec@egl 1.4@eglterminate then unbind context,Fail spec@egl_chromium_sync_control@conformance@eglGetSyncValuesCHROMIUM_msc_and_sbc_test,Fail diff --git a/src/gallium/drivers/zink/ci/zink-radv-vangogh-flakes.txt b/src/gallium/drivers/zink/ci/zink-radv-vangogh-flakes.txt index 5a68bcdae14..a16cd73b913 100644 --- a/src/gallium/drivers/zink/ci/zink-radv-vangogh-flakes.txt +++ b/src/gallium/drivers/zink/ci/zink-radv-vangogh-flakes.txt @@ -31,3 +31,6 @@ spec@!opengl 1.0@rasterpos spec@!opengl 1.0@rasterpos@glsl_vs_gs_linked spec@!opengl 1.0@rasterpos@glsl_vs_tes_linked spec@!opengl 1.1@depthstencil-default_fb-blit samples=4 + +# Marked as flake because it passes with ESO but crashes with pipelines. +spec@arb_tessellation_shader@arb_tessellation_shader-tes-gs-max-output -small -scan 1 50