diff --git a/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml b/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml index 37dbd05b114..50dd8f7ca5a 100644 --- a/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml +++ b/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml @@ -40,6 +40,15 @@ - !reference [.venus-rules, rules] - !reference [.zink-common-rules, rules] +.zink-venus-lvp-manual-rules: + stage: layered-backends-postmerge + extends: .no-auto-retry + rules: + - !reference [.test, rules] + - !reference [.lavapipe-manual-rules, rules] + - !reference [.venus-manual-rules, rules] + - !reference [.zink-common-manual-rules, rules] + .zink-anv-rules: stage: layered-backends rules: diff --git a/src/gallium/drivers/zink/ci/gitlab-ci.yml b/src/gallium/drivers/zink/ci/gitlab-ci.yml index 91abe8ecb64..977117291ea 100644 --- a/src/gallium/drivers/zink/ci/gitlab-ci.yml +++ b/src/gallium/drivers/zink/ci/gitlab-ci.yml @@ -24,9 +24,10 @@ zink-venus-lvp: - .test-gl - .deqp-test - .zink-venus-lvp-test - timeout: 15min # base run time = 5min, but it's on the shared runners so it can go up + timeout: 15min # base run time = 8min, but it's on the shared runners so it can go up variables: DEQP_SUITE: zink-venus-lvp + DEQP_FRACTION: 2 PIGLIT_NO_WINDOW: 1 # Enable validation (except for on piglit, see deqp-zink-venus-lvp.toml), logging # to stdout and aborting on unknown failures. @@ -39,6 +40,13 @@ zink-venus-lvp: export LIBGL_DRIVERS_PATH="$CI_PROJECT_DIR/install/lib/dri" xvfb-run --server-args='-noreset' bash -c "./install/crosvm-runner.sh ./install/deqp-runner.sh" +zink-venus-lvp-full: + extends: + - zink-venus-lvp + timeout: 30m + variables: + DEQP_FRACTION: 1 + zink-anv-adl: extends: - .zink-anv-adl-test diff --git a/src/gallium/drivers/zink/ci/zink-venus-lvp-skips.txt b/src/gallium/drivers/zink/ci/zink-venus-lvp-skips.txt index 2017781cbb6..002e393be17 100644 --- a/src/gallium/drivers/zink/ci/zink-venus-lvp-skips.txt +++ b/src/gallium/drivers/zink/ci/zink-venus-lvp-skips.txt @@ -48,3 +48,8 @@ spec@arb_texture_buffer_object@formats.*arb.* # Timeout KHR-Single-GL46.arrays_of_arrays_gl.SizedDeclarationsPrimitive + +# Slow tests, these take about two minutes +KHR-Single-GL46.arrays_of_arrays_gl.ConstructorsAndUnsizedDeclConstructors1 +KHR-Single-GL46.arrays_of_arrays_gl.ConstructorsAndUnsizedDeclConstructorSizing1 +KHR-Single-GL46.subgroups.arithmetic.compute.subgroupinclusiveadd_ivec3