From 6b9415cb4507cacf4fcd5ed30023457de06c85ad Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 3 Jun 2025 13:50:33 -0400 Subject: [PATCH] ci: rename "lvp" jobs to lavapipe better regex globbing Part-of: --- ...-zink-lvp.toml => deqp-zink-lavapipe.toml} | 0 ...lvp.toml => deqp-zink-venus-lavapipe.toml} | 0 src/gallium/drivers/zink/ci/gitlab-ci-inc.yml | 18 +++++++-------- src/gallium/drivers/zink/ci/gitlab-ci.yml | 22 +++++++++---------- ...-lvp-fails.txt => zink-lavapipe-fails.txt} | 0 ...vp-flakes.txt => zink-lavapipe-flakes.txt} | 0 ...-lvp-skips.txt => zink-lavapipe-skips.txt} | 0 ... => zink-lavapipe-validation-settings.txt} | 0 ...ails.txt => zink-venus-lavapipe-fails.txt} | 0 ...kes.txt => zink-venus-lavapipe-flakes.txt} | 0 ...kips.txt => zink-venus-lavapipe-skips.txt} | 0 11 files changed, 20 insertions(+), 20 deletions(-) rename src/gallium/drivers/zink/ci/{deqp-zink-lvp.toml => deqp-zink-lavapipe.toml} (100%) rename src/gallium/drivers/zink/ci/{deqp-zink-venus-lvp.toml => deqp-zink-venus-lavapipe.toml} (100%) rename src/gallium/drivers/zink/ci/{zink-lvp-fails.txt => zink-lavapipe-fails.txt} (100%) rename src/gallium/drivers/zink/ci/{zink-lvp-flakes.txt => zink-lavapipe-flakes.txt} (100%) rename src/gallium/drivers/zink/ci/{zink-lvp-skips.txt => zink-lavapipe-skips.txt} (100%) rename src/gallium/drivers/zink/ci/{zink-lvp-validation-settings.txt => zink-lavapipe-validation-settings.txt} (100%) rename src/gallium/drivers/zink/ci/{zink-venus-lvp-fails.txt => zink-venus-lavapipe-fails.txt} (100%) rename src/gallium/drivers/zink/ci/{zink-venus-lvp-flakes.txt => zink-venus-lavapipe-flakes.txt} (100%) rename src/gallium/drivers/zink/ci/{zink-venus-lvp-skips.txt => zink-venus-lavapipe-skips.txt} (100%) diff --git a/src/gallium/drivers/zink/ci/deqp-zink-lvp.toml b/src/gallium/drivers/zink/ci/deqp-zink-lavapipe.toml similarity index 100% rename from src/gallium/drivers/zink/ci/deqp-zink-lvp.toml rename to src/gallium/drivers/zink/ci/deqp-zink-lavapipe.toml diff --git a/src/gallium/drivers/zink/ci/deqp-zink-venus-lvp.toml b/src/gallium/drivers/zink/ci/deqp-zink-venus-lavapipe.toml similarity index 100% rename from src/gallium/drivers/zink/ci/deqp-zink-venus-lvp.toml rename to src/gallium/drivers/zink/ci/deqp-zink-venus-lavapipe.toml diff --git a/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml b/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml index f29e4ce3a3e..0e53566beb4 100644 --- a/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml +++ b/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml @@ -25,14 +25,14 @@ *zink_files_list when: manual -.zink-lvp-rules: +.zink-lavapipe-rules: stage: layered-backends rules: - !reference [.test, rules] - !reference [.lavapipe-rules, rules] - !reference [.zink-common-rules, rules] -.zink-venus-lvp-rules: +.zink-venus-lavapipe-rules: stage: layered-backends rules: - !reference [.test, rules] @@ -40,7 +40,7 @@ - !reference [.venus-rules, rules] - !reference [.zink-common-rules, rules] -.zink-venus-lvp-manual-rules: +.zink-venus-lavapipe-manual-rules: stage: layered-backends-nightly extends: .no-auto-retry rules: @@ -151,27 +151,27 @@ WAFFLE_PLATFORM: gbm PIGLIT_PLATFORM: gbm -.zink-lvp-test: +.zink-lavapipe-test: extends: - - .zink-lvp-rules + - .zink-lavapipe-rules - .zink-test tags: - $FDO_RUNNER_JOB_PRIORITY_TAG_X86_64 variables: LIBGL_ALWAYS_SOFTWARE: "true" LVP_POISON_MEMORY: "1" - GPU_VERSION: zink-lvp + GPU_VERSION: zink-lavapipe # Fix non-conformant llvmpipe filter defaults GALLIVM_PERF: "no_quad_lod" -.zink-venus-lvp-test: +.zink-venus-lavapipe-test: extends: - - .zink-venus-lvp-rules + - .zink-venus-lavapipe-rules - .zink-test variables: LIBGL_ALWAYS_SOFTWARE: "true" LVP_POISON_MEMORY: "1" - GPU_VERSION: zink-venus-lvp + GPU_VERSION: zink-venus-lavapipe # Fix non-conformant llvmpipe filter defaults GALLIVM_PERF: "no_quad_lod" VK_DRIVER: virtio diff --git a/src/gallium/drivers/zink/ci/gitlab-ci.yml b/src/gallium/drivers/zink/ci/gitlab-ci.yml index a92e52f8915..4e66172ea16 100644 --- a/src/gallium/drivers/zink/ci/gitlab-ci.yml +++ b/src/gallium/drivers/zink/ci/gitlab-ci.yml @@ -1,20 +1,20 @@ include: - local: 'src/gallium/drivers/zink/ci/gitlab-ci-inc.yml' -zink-lvp: +zink-lavapipe: extends: - .test-gl - .test-piglit - .deqp-test - - .zink-lvp-test + - .zink-lavapipe-test tags: # FIXME: kvm is a hack, should not be needed - $FDO_RUNNER_JOB_PRIORITY_TAG_X86_64_KVM variables: - DEQP_SUITE: zink-lvp + DEQP_SUITE: zink-lavapipe DEQP_FRACTION: 8 PIGLIT_NO_WINDOW: 1 - # Enable validation (except for on piglit, see deqp-zink-lvp.toml), logging + # Enable validation (except for on piglit, see deqp-zink-lavapipe.toml), logging # to stdout and aborting on unknown failures. ZINK_DEBUG: validation XVFB_SCRIPT: "VK_DRIVER=lvp install/deqp-runner.sh" @@ -23,19 +23,19 @@ zink-lvp: export LIBGL_DRIVERS_PATH="$CI_PROJECT_DIR/install/lib/dri" xvfb-run --server-args='-noreset' bash -c ". $SCRIPTS_DIR/setup-test-env.sh && ${XVFB_SCRIPT}" -zink-venus-lvp: +zink-venus-lavapipe: extends: - .test-gl - .deqp-test - - .zink-venus-lvp-test + - .zink-venus-lavapipe-test - .test-crosvm - .test-piglit 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_SUITE: zink-venus-lavapipe DEQP_FRACTION: 2 PIGLIT_NO_WINDOW: 1 - # Enable validation (except for on piglit, see deqp-zink-venus-lvp.toml), logging + # Enable validation (except for on piglit, see deqp-zink-venus-lavapipe.toml), logging # to stdout and aborting on unknown failures. ZINK_DEBUG: validation LP_NUM_THREADS: 2 @@ -47,10 +47,10 @@ zink-venus-lvp: export LIBGL_DRIVERS_PATH="$CI_PROJECT_DIR/install/lib/dri" xvfb-run --server-args='-noreset' bash -c ". $SCRIPTS_DIR/setup-test-env.sh && ${XVFB_SCRIPT}" -zink-venus-lvp-full: +zink-venus-lavapipe-full: extends: - - zink-venus-lvp - - .zink-venus-lvp-manual-rules + - zink-venus-lavapipe + - .zink-venus-lavapipe-manual-rules timeout: 30m variables: DEQP_FRACTION: 1 diff --git a/src/gallium/drivers/zink/ci/zink-lvp-fails.txt b/src/gallium/drivers/zink/ci/zink-lavapipe-fails.txt similarity index 100% rename from src/gallium/drivers/zink/ci/zink-lvp-fails.txt rename to src/gallium/drivers/zink/ci/zink-lavapipe-fails.txt diff --git a/src/gallium/drivers/zink/ci/zink-lvp-flakes.txt b/src/gallium/drivers/zink/ci/zink-lavapipe-flakes.txt similarity index 100% rename from src/gallium/drivers/zink/ci/zink-lvp-flakes.txt rename to src/gallium/drivers/zink/ci/zink-lavapipe-flakes.txt diff --git a/src/gallium/drivers/zink/ci/zink-lvp-skips.txt b/src/gallium/drivers/zink/ci/zink-lavapipe-skips.txt similarity index 100% rename from src/gallium/drivers/zink/ci/zink-lvp-skips.txt rename to src/gallium/drivers/zink/ci/zink-lavapipe-skips.txt diff --git a/src/gallium/drivers/zink/ci/zink-lvp-validation-settings.txt b/src/gallium/drivers/zink/ci/zink-lavapipe-validation-settings.txt similarity index 100% rename from src/gallium/drivers/zink/ci/zink-lvp-validation-settings.txt rename to src/gallium/drivers/zink/ci/zink-lavapipe-validation-settings.txt diff --git a/src/gallium/drivers/zink/ci/zink-venus-lvp-fails.txt b/src/gallium/drivers/zink/ci/zink-venus-lavapipe-fails.txt similarity index 100% rename from src/gallium/drivers/zink/ci/zink-venus-lvp-fails.txt rename to src/gallium/drivers/zink/ci/zink-venus-lavapipe-fails.txt diff --git a/src/gallium/drivers/zink/ci/zink-venus-lvp-flakes.txt b/src/gallium/drivers/zink/ci/zink-venus-lavapipe-flakes.txt similarity index 100% rename from src/gallium/drivers/zink/ci/zink-venus-lvp-flakes.txt rename to src/gallium/drivers/zink/ci/zink-venus-lavapipe-flakes.txt diff --git a/src/gallium/drivers/zink/ci/zink-venus-lvp-skips.txt b/src/gallium/drivers/zink/ci/zink-venus-lavapipe-skips.txt similarity index 100% rename from src/gallium/drivers/zink/ci/zink-venus-lvp-skips.txt rename to src/gallium/drivers/zink/ci/zink-venus-lavapipe-skips.txt