Module: Mesa Branch: main Commit: 8b5cdc5fa54edadbf344b2344750565e7f75947c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8b5cdc5fa54edadbf344b2344750565e7f75947c
Author: Pavel Ondračka <pavel.ondra...@gmail.com> Date: Tue Dec 26 22:01:03 2023 +0100 ci: add r300 RV530 dEQP gles2 CI job Reviewed-by: Martin Roukala <martin.rouk...@mupuf.org> Reviewed-by: David Heidelberg <david.heidelb...@collabora.com> Reviewed-by: Eric Engestrom <e...@igalia.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26823> --- .ci-farms/ondracka | 0 .gitlab-ci.yml | 1 + .gitlab-ci/build/gitlab-ci.yml | 2 +- .gitlab-ci/common/generate-env.sh | 1 + .gitlab-ci/farm-rules.yml | 25 ++++++++++++++++++++ src/gallium/drivers/r300/ci/gitlab-ci-inc.yml | 27 ++++++++++++++++++++++ src/gallium/drivers/r300/ci/gitlab-ci.yml | 26 +++++++++++++++++++++ src/gallium/drivers/r300/ci/r300-rv515-flakes.txt | 1 - ...-rv515-fails.txt => r300-rv530-nohiz-fails.txt} | 5 ---- ...-rv515-skips.txt => r300-rv530-nohiz-skips.txt} | 6 ----- 10 files changed, 81 insertions(+), 13 deletions(-) diff --git a/.ci-farms/ondracka b/.ci-farms/ondracka new file mode 100644 index 00000000000..e69de29bb2d diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 35c72f07812..e97be0f5320 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -167,6 +167,7 @@ include: - local: 'src/gallium/drivers/crocus/ci/gitlab-ci.yml' - local: 'src/gallium/drivers/d3d12/ci/gitlab-ci.yml' - local: 'src/gallium/drivers/i915/ci/gitlab-ci.yml' + - local: 'src/gallium/drivers/r300/ci/gitlab-ci.yml' - local: 'src/gallium/drivers/lima/ci/gitlab-ci.yml' - local: 'src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml' - local: 'src/gallium/drivers/nouveau/ci/gitlab-ci.yml' diff --git a/.gitlab-ci/build/gitlab-ci.yml b/.gitlab-ci/build/gitlab-ci.yml index 782c5a57c71..b7c3106f8c7 100644 --- a/.gitlab-ci/build/gitlab-ci.yml +++ b/.gitlab-ci/build/gitlab-ci.yml @@ -76,7 +76,7 @@ debian-testing: -D dri3=enabled -D gallium-va=enabled -D gallium-rusticl=true - GALLIUM_DRIVERS: "swrast,virgl,radeonsi,zink,crocus,iris,i915" + GALLIUM_DRIVERS: "swrast,virgl,radeonsi,zink,crocus,iris,i915,r300" VULKAN_DRIVERS: "swrast,amd,intel,intel_hasvk,virtio,nouveau-experimental" BUILDTYPE: "debugoptimized" EXTRA_OPTION: > diff --git a/.gitlab-ci/common/generate-env.sh b/.gitlab-ci/common/generate-env.sh index 0e06e402982..ef6ffd43139 100755 --- a/.gitlab-ci/common/generate-env.sh +++ b/.gitlab-ci/common/generate-env.sh @@ -107,6 +107,7 @@ for var in \ PIGLIT_TESTS \ PIGLIT_TRACES_FILE \ PIPELINE_ARTIFACTS_BASE \ + RADEON_DEBUG \ RADV_DEBUG \ RADV_PERFTEST \ SKQP_ASSETS_DIR \ diff --git a/.gitlab-ci/farm-rules.yml b/.gitlab-ci/farm-rules.yml index 6087bd73f74..920ff0031c3 100644 --- a/.gitlab-ci/farm-rules.yml +++ b/.gitlab-ci/farm-rules.yml @@ -238,6 +238,27 @@ - !reference [.freedreno-farm-rules, rules] +.ondracka-farm-rules: + rules: + - exists: [ .ci-farms-disabled/ondracka ] + when: never + - changes: [ .ci-farms-disabled/ondracka ] + if: '$CI_PIPELINE_SOURCE != "schedule"' + when: on_success + - changes: [ .ci-farms-disabled/* ] + if: '$CI_PIPELINE_SOURCE != "schedule"' + when: never + +.ondracka-farm-manual-rules: + rules: + - exists: [ .ci-farms-disabled/ondracka ] + when: never + - changes: [ .ci-farms-disabled/ondracka ] + if: '$CI_PIPELINE_SOURCE != "schedule"' + when: never + - !reference [.ondracka-farm-rules, rules] + + # Skip container & build jobs when disabling any farm, and run them if any # farm gets re-enabled. # Only apply these rules in MR context, because otherwise we get a false @@ -286,6 +307,10 @@ changes: [ .ci-farms-disabled/freedreno ] exists: [ .ci-farms-disabled/freedreno ] when: never + - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' + changes: [ .ci-farms-disabled/ondracka ] + exists: [ .ci-farms-disabled/ondracka ] + when: never # Any other change to ci-farms/* means some farm is getting re-enabled. # Run jobs in Marge pipelines (and let it fallback to manual otherwise) - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "marge-bot"' diff --git a/src/gallium/drivers/r300/ci/gitlab-ci-inc.yml b/src/gallium/drivers/r300/ci/gitlab-ci-inc.yml new file mode 100644 index 00000000000..e5ecf7682ee --- /dev/null +++ b/src/gallium/drivers/r300/ci/gitlab-ci-inc.yml @@ -0,0 +1,27 @@ +.r300-rules: + stage: amd + rules: + - !reference [.test, rules] + - !reference [.ondracka-farm-rules, rules] + - !reference [.gl-rules, rules] + - changes: &r300_file_list + - src/gallium/drivers/r300/* + - src/gallium/drivers/r300/compiler/**/* + - src/gallium/drivers/r300/ci/gitlab-ci.yml + - src/gallium/drivers/r300/ci/gitlab-ci-inc.yml + - src/gallium/drivers/r300/ci/$GPU_VERSION-fails.txt + - src/gallium/drivers/r300/ci/$GPU_VERSION-flakes.txt + - src/gallium/drivers/r300/ci/$GPU_VERSION-skips.txt + - src/gallium/winsys/radeon/**/* + when: on_success + +.r300-manual-rules: + stage: amd + retry: !reference [.scheduled_pipeline-rules, retry] + rules: + - !reference [.test, rules] + - !reference [.ondracka-farm-manual-rules, rules] + - !reference [.gl-manual-rules, rules] + - changes: + *r300_file_list + when: manual diff --git a/src/gallium/drivers/r300/ci/gitlab-ci.yml b/src/gallium/drivers/r300/ci/gitlab-ci.yml new file mode 100644 index 00000000000..9f6b72855b8 --- /dev/null +++ b/src/gallium/drivers/r300/ci/gitlab-ci.yml @@ -0,0 +1,26 @@ +include: + - local: 'src/gallium/drivers/r300/ci/gitlab-ci-inc.yml' + +.ondracka-rv530: + extends: + - .b2c-test-gl + - .r300-manual-rules + tags: + - radeon:codename:RV530 + variables: + FDO_CI_CONCURRENT: 2 + # 6.6.8 kernel with radeon driver. + B2C_KERNEL_URL: https://gitlab.freedesktop.org/ondracka/boot2container/-/wikis/uploads/1733cfc7cc114d08ec785044b24314f3/linux-x86_64 + +r300-rv530-deqp-gles2: + extends: + - .ondracka-rv530 + - .deqp-test-valve + variables: + DEQP_VER: gles2 + DEQP_EXPECTED_RENDERER: RV530 + GPU_VERSION: r300-rv530-nohiz + # Only single process can use hiz at a time, and we have some issues + # there in depth stencil tests, so it brings flakes, + # see https://gitlab.freedesktop.org/mesa/mesa/-/issues/8093 + RADEON_DEBUG: nohiz diff --git a/src/gallium/drivers/r300/ci/r300-rv515-flakes.txt b/src/gallium/drivers/r300/ci/r300-rv515-flakes.txt deleted file mode 100644 index 7cda3e729ff..00000000000 --- a/src/gallium/drivers/r300/ci/r300-rv515-flakes.txt +++ /dev/null @@ -1 +0,0 @@ -dEQP-GLES2.functional.fragment_ops.depth_stencil.* diff --git a/src/gallium/drivers/r300/ci/r300-rv515-fails.txt b/src/gallium/drivers/r300/ci/r300-rv530-nohiz-fails.txt similarity index 99% rename from src/gallium/drivers/r300/ci/r300-rv515-fails.txt rename to src/gallium/drivers/r300/ci/r300-rv530-nohiz-fails.txt index 50fe019754f..14635a90eee 100644 --- a/src/gallium/drivers/r300/ci/r300-rv515-fails.txt +++ b/src/gallium/drivers/r300/ci/r300-rv530-nohiz-fails.txt @@ -9,14 +9,10 @@ dEQP-GLES2.functional.draw.draw_elements.indices.user_ptr.index_byte,Fail # "Framebuffer checked as complete, expected incomplete" dEQP-GLES2.functional.fbo.completeness.renderable.texture.color0.rgb_half_float_oes,Fail -dEQP-GLES2.functional.fbo.completeness.renderable.texture.color0.rgba_half_float_oes,Fail dEQP-GLES2.functional.fbo.render.repeated_clear.tex2d_rgb,Fail dEQP-GLES2.functional.fbo.render.repeated_clear.tex2d_rgba,Fail -dEQP-GLES2.functional.fragment_ops.interaction.basic_shader.43,Fail -dEQP-GLES2.functional.fragment_ops.interaction.basic_shader.74,Fail - dEQP-GLES2.functional.polygon_offset.default_factor_1_slope,Fail dEQP-GLES2.functional.polygon_offset.fixed16_displacement_with_units,Fail dEQP-GLES2.functional.polygon_offset.fixed16_render_with_units,Fail @@ -38,7 +34,6 @@ dEQP-GLES2.functional.texture.format.etc1_cube_npot,Fail dEQP-GLES2.functional.texture.mipmap.cube.basic.nearest_nearest,Fail dEQP-GLES2.functional.texture.mipmap.cube.basic.linear_nearest,Fail -dEQP-GLES2.functional.texture.mipmap.cube.projected.linear_linear,Fail # Looks like minor sampling location errors for the NPOT case. dEQP-GLES2.functional.texture.size.cube.15x15_l8,Fail diff --git a/src/gallium/drivers/r300/ci/r300-rv515-skips.txt b/src/gallium/drivers/r300/ci/r300-rv530-nohiz-skips.txt similarity index 58% rename from src/gallium/drivers/r300/ci/r300-rv515-skips.txt rename to src/gallium/drivers/r300/ci/r300-rv530-nohiz-skips.txt index c309d409ab2..7a9ee5e24bc 100644 --- a/src/gallium/drivers/r300/ci/r300-rv515-skips.txt +++ b/src/gallium/drivers/r300/ci/r300-rv530-nohiz-skips.txt @@ -1,6 +1,3 @@ -# Timeout city -#KHR-GLES2.texture_3d.filtering.combinations.* - # Timeouts KHR-GLES2.texture_3d.filtering.combinations.*linear_mipmap_linear KHR-GLES2.texture_3d.filtering.sizes.*linear_mipmap_linear @@ -8,6 +5,3 @@ shaders@glsl-predication-on-large-array # I'm running it with gl_rgba8_snorm glx@ - -# GPU hang -dEQP-GLES2.functional.shaders.struct.local.dynamic_loop_nested_struct_array_vertex
