From 9eb05801ad29d264455103d300f1915c22f84fa0 Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Mon, 6 Mar 2023 10:58:03 +0100 Subject: [PATCH] radeonsi/test: use gbm-skips.txt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use shared skips file to avoid running tests that can't pass on gbm. Reviewed-by: Marek Olšák Part-of: --- src/gallium/drivers/radeonsi/ci/gfx10-navi10-fail.csv | 11 ----------- .../drivers/radeonsi/ci/gfx10_3-navi21-fail.csv | 11 ----------- .../drivers/radeonsi/ci/gfx11-gfx1100-fail.csv | 11 ----------- .../drivers/radeonsi/ci/gfx8-polaris11-fail.csv | 11 ----------- src/gallium/drivers/radeonsi/ci/gfx9-raven-fail.csv | 11 ----------- src/gallium/drivers/radeonsi/ci/gfx9-vega20-fail.csv | 11 ----------- src/gallium/drivers/radeonsi/ci/radeonsi-run-tests.py | 2 ++ 7 files changed, 2 insertions(+), 66 deletions(-) diff --git a/src/gallium/drivers/radeonsi/ci/gfx10-navi10-fail.csv b/src/gallium/drivers/radeonsi/ci/gfx10-navi10-fail.csv index 2081d944e17..f2e73f7ec7d 100644 --- a/src/gallium/drivers/radeonsi/ci/gfx10-navi10-fail.csv +++ b/src/gallium/drivers/radeonsi/ci/gfx10-navi10-fail.csv @@ -18,21 +18,10 @@ glx@glx_ext_import_context@make current- multi process,Fail glx@glx_ext_import_context@make current- single process,Fail glx@glx_ext_import_context@query context info,Fail glx@glx_ext_no_config_context@no fbconfig,Fail -spec@!opengl 1.0@gl-1.0-swapbuffers-behavior,Fail spec@!opengl 1.0@gl-1.0-user-clip-all-planes,Fail spec@!opengl 1.0@rasterpos,Fail spec@!opengl 1.0@rasterpos@glsl_vs_gs_linked,Fail spec@!opengl 1.0@rasterpos@glsl_vs_tes_linked,Fail -spec@!opengl 1.1@read-front,Fail -spec@!opengl 1.1@read-front clear-front-first,Fail -spec@!opengl 1.1@read-front clear-front-first samples=2,Fail -spec@!opengl 1.1@read-front clear-front-first samples=4,Fail -spec@!opengl 1.1@read-front clear-front-first samples=6,Fail -spec@!opengl 1.1@read-front clear-front-first samples=8,Fail -spec@!opengl 1.1@read-front samples=2,Fail -spec@!opengl 1.1@read-front samples=4,Fail -spec@!opengl 1.1@read-front samples=6,Fail -spec@!opengl 1.1@read-front samples=8,Fail spec@arb_bindless_texture@compiler@samplers@arith-bound-sampler-texture2d.frag,Crash spec@arb_gpu_shader_fp64@execution@conversion@frag-conversion-explicit-dmat2-mat2,Fail spec@arb_gpu_shader_fp64@execution@conversion@frag-conversion-explicit-dmat2x3-mat2x3,Fail diff --git a/src/gallium/drivers/radeonsi/ci/gfx10_3-navi21-fail.csv b/src/gallium/drivers/radeonsi/ci/gfx10_3-navi21-fail.csv index bbf150e08f2..f6a173ecf65 100644 --- a/src/gallium/drivers/radeonsi/ci/gfx10_3-navi21-fail.csv +++ b/src/gallium/drivers/radeonsi/ci/gfx10_3-navi21-fail.csv @@ -17,21 +17,10 @@ glx@glx_ext_import_context@make current- multi process,Fail glx@glx_ext_import_context@make current- single process,Fail glx@glx_ext_import_context@query context info,Fail glx@glx_ext_no_config_context@no fbconfig,Fail -spec@!opengl 1.0@gl-1.0-swapbuffers-behavior,Fail spec@!opengl 1.0@gl-1.0-user-clip-all-planes,Fail spec@!opengl 1.0@rasterpos,Fail spec@!opengl 1.0@rasterpos@glsl_vs_gs_linked,Fail spec@!opengl 1.0@rasterpos@glsl_vs_tes_linked,Fail -spec@!opengl 1.1@read-front,Fail -spec@!opengl 1.1@read-front clear-front-first,Fail -spec@!opengl 1.1@read-front clear-front-first samples=2,Fail -spec@!opengl 1.1@read-front clear-front-first samples=4,Fail -spec@!opengl 1.1@read-front clear-front-first samples=6,Fail -spec@!opengl 1.1@read-front clear-front-first samples=8,Fail -spec@!opengl 1.1@read-front samples=2,Fail -spec@!opengl 1.1@read-front samples=4,Fail -spec@!opengl 1.1@read-front samples=6,Fail -spec@!opengl 1.1@read-front samples=8,Fail spec@arb_bindless_texture@compiler@samplers@arith-bound-sampler-texture2d.frag,Crash spec@arb_gpu_shader_fp64@execution@conversion@frag-conversion-explicit-dmat2-mat2,Fail spec@arb_gpu_shader_fp64@execution@conversion@frag-conversion-explicit-dmat2x3-mat2x3,Fail diff --git a/src/gallium/drivers/radeonsi/ci/gfx11-gfx1100-fail.csv b/src/gallium/drivers/radeonsi/ci/gfx11-gfx1100-fail.csv index 34171ec36d9..4d2b8c052b4 100644 --- a/src/gallium/drivers/radeonsi/ci/gfx11-gfx1100-fail.csv +++ b/src/gallium/drivers/radeonsi/ci/gfx11-gfx1100-fail.csv @@ -17,21 +17,10 @@ glx@glx_ext_import_context@make current- multi process,Fail glx@glx_ext_import_context@make current- single process,Fail glx@glx_ext_import_context@query context info,Fail glx@glx_ext_no_config_context@no fbconfig,Fail -spec@!opengl 1.0@gl-1.0-swapbuffers-behavior,Fail spec@!opengl 1.0@gl-1.0-user-clip-all-planes,Fail spec@!opengl 1.0@rasterpos,Fail spec@!opengl 1.0@rasterpos@glsl_vs_gs_linked,Fail spec@!opengl 1.0@rasterpos@glsl_vs_tes_linked,Fail -spec@!opengl 1.1@read-front,Fail -spec@!opengl 1.1@read-front clear-front-first,Fail -spec@!opengl 1.1@read-front clear-front-first samples=2,Fail -spec@!opengl 1.1@read-front clear-front-first samples=4,Fail -spec@!opengl 1.1@read-front clear-front-first samples=6,Fail -spec@!opengl 1.1@read-front clear-front-first samples=8,Fail -spec@!opengl 1.1@read-front samples=2,Fail -spec@!opengl 1.1@read-front samples=4,Fail -spec@!opengl 1.1@read-front samples=6,Fail -spec@!opengl 1.1@read-front samples=8,Fail spec@arb_bindless_texture@compiler@samplers@arith-bound-sampler-texture2d.frag,Crash spec@arb_gpu_shader_fp64@execution@conversion@frag-conversion-explicit-dmat2-mat2,Fail spec@arb_gpu_shader_fp64@execution@conversion@frag-conversion-explicit-dmat2x3-mat2x3,Fail diff --git a/src/gallium/drivers/radeonsi/ci/gfx8-polaris11-fail.csv b/src/gallium/drivers/radeonsi/ci/gfx8-polaris11-fail.csv index 9978c45d164..4cea36a23d9 100644 --- a/src/gallium/drivers/radeonsi/ci/gfx8-polaris11-fail.csv +++ b/src/gallium/drivers/radeonsi/ci/gfx8-polaris11-fail.csv @@ -17,21 +17,10 @@ glx@glx_ext_import_context@make current- multi process,Fail glx@glx_ext_import_context@make current- single process,Fail glx@glx_ext_import_context@query context info,Fail glx@glx_ext_no_config_context@no fbconfig,Fail -spec@!opengl 1.0@gl-1.0-swapbuffers-behavior,Fail spec@!opengl 1.0@gl-1.0-user-clip-all-planes,Fail spec@!opengl 1.0@rasterpos,Fail spec@!opengl 1.0@rasterpos@glsl_vs_gs_linked,Fail spec@!opengl 1.0@rasterpos@glsl_vs_tes_linked,Fail -spec@!opengl 1.1@read-front,Fail -spec@!opengl 1.1@read-front clear-front-first,Fail -spec@!opengl 1.1@read-front clear-front-first samples=2,Fail -spec@!opengl 1.1@read-front clear-front-first samples=4,Fail -spec@!opengl 1.1@read-front clear-front-first samples=6,Fail -spec@!opengl 1.1@read-front clear-front-first samples=8,Fail -spec@!opengl 1.1@read-front samples=2,Fail -spec@!opengl 1.1@read-front samples=4,Fail -spec@!opengl 1.1@read-front samples=6,Fail -spec@!opengl 1.1@read-front samples=8,Fail spec@!opengl 1.1@texwrap formats bordercolor-swizzled,Fail spec@!opengl 1.1@texwrap formats bordercolor-swizzled@GL_R3_G3_B2- swizzled- border color only,Fail spec@!opengl 1.1@texwrap formats bordercolor-swizzled@GL_RGB10- swizzled- border color only,Fail diff --git a/src/gallium/drivers/radeonsi/ci/gfx9-raven-fail.csv b/src/gallium/drivers/radeonsi/ci/gfx9-raven-fail.csv index 06efda15ba8..bebdcbdb1c2 100644 --- a/src/gallium/drivers/radeonsi/ci/gfx9-raven-fail.csv +++ b/src/gallium/drivers/radeonsi/ci/gfx9-raven-fail.csv @@ -16,21 +16,10 @@ glx@glx_ext_import_context@make current- multi process,Fail glx@glx_ext_import_context@make current- single process,Fail glx@glx_ext_import_context@query context info,Fail glx@glx_ext_no_config_context@no fbconfig,Fail -spec@!opengl 1.0@gl-1.0-swapbuffers-behavior,Fail spec@!opengl 1.0@gl-1.0-user-clip-all-planes,Fail spec@!opengl 1.0@rasterpos,Fail spec@!opengl 1.0@rasterpos@glsl_vs_gs_linked,Fail spec@!opengl 1.0@rasterpos@glsl_vs_tes_linked,Fail -spec@!opengl 1.1@read-front,Fail -spec@!opengl 1.1@read-front clear-front-first,Fail -spec@!opengl 1.1@read-front clear-front-first samples=2,Fail -spec@!opengl 1.1@read-front clear-front-first samples=4,Fail -spec@!opengl 1.1@read-front clear-front-first samples=6,Fail -spec@!opengl 1.1@read-front clear-front-first samples=8,Fail -spec@!opengl 1.1@read-front samples=2,Fail -spec@!opengl 1.1@read-front samples=4,Fail -spec@!opengl 1.1@read-front samples=6,Fail -spec@!opengl 1.1@read-front samples=8,Fail spec@arb_bindless_texture@compiler@samplers@arith-bound-sampler-texture2d.frag,Crash spec@arb_gpu_shader_fp64@execution@conversion@frag-conversion-explicit-dmat2-mat2,Fail spec@arb_gpu_shader_fp64@execution@conversion@frag-conversion-explicit-dmat2x3-mat2x3,Fail diff --git a/src/gallium/drivers/radeonsi/ci/gfx9-vega20-fail.csv b/src/gallium/drivers/radeonsi/ci/gfx9-vega20-fail.csv index a1ba7299c25..aa0de1b493c 100644 --- a/src/gallium/drivers/radeonsi/ci/gfx9-vega20-fail.csv +++ b/src/gallium/drivers/radeonsi/ci/gfx9-vega20-fail.csv @@ -22,21 +22,10 @@ glx@glx_ext_import_context@make current- multi process,Fail glx@glx_ext_import_context@make current- single process,Fail glx@glx_ext_import_context@query context info,Fail glx@glx_ext_no_config_context@no fbconfig,Fail -spec@!opengl 1.0@gl-1.0-swapbuffers-behavior,Fail spec@!opengl 1.0@gl-1.0-user-clip-all-planes,Fail spec@!opengl 1.0@rasterpos,Fail spec@!opengl 1.0@rasterpos@glsl_vs_gs_linked,Fail spec@!opengl 1.0@rasterpos@glsl_vs_tes_linked,Fail -spec@!opengl 1.1@read-front,Fail -spec@!opengl 1.1@read-front clear-front-first,Fail -spec@!opengl 1.1@read-front clear-front-first samples=2,Fail -spec@!opengl 1.1@read-front clear-front-first samples=4,Fail -spec@!opengl 1.1@read-front clear-front-first samples=6,Fail -spec@!opengl 1.1@read-front clear-front-first samples=8,Fail -spec@!opengl 1.1@read-front samples=2,Fail -spec@!opengl 1.1@read-front samples=4,Fail -spec@!opengl 1.1@read-front samples=6,Fail -spec@!opengl 1.1@read-front samples=8,Fail spec@!opengl 3.2@gl-3.2-adj-prims cull-back pv-first,Fail spec@!opengl 3.2@gl-3.2-adj-prims cull-back pv-last,Fail spec@!opengl 3.2@gl-3.2-adj-prims cull-front pv-first,Fail diff --git a/src/gallium/drivers/radeonsi/ci/radeonsi-run-tests.py b/src/gallium/drivers/radeonsi/ci/radeonsi-run-tests.py index 4b3ac80117f..d0ce221b903 100755 --- a/src/gallium/drivers/radeonsi/ci/radeonsi-run-tests.py +++ b/src/gallium/drivers/radeonsi/ci/radeonsi-run-tests.py @@ -404,6 +404,8 @@ if args.piglit: str(args.jobs), "--skips", skips, + "--skips", + os.path.join(path_above_mesa, "mesa", ".gitlab-ci", "gbm-skips.txt") ] + filters_args + flakes_args if os.path.exists(baseline):