egl: don't expose swrast device if swrast is not built

This fixes piglit/egl_ext_device_base without swrast.

Reviewed-by: Yogesh Mohan Marimuthu <yogesh.mohanmarimuthu@amd.com>
(cherry picked from commit 48e218b49d)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28885>

.gitlab-ci.yml

@@ -5,7 +5,8 @@ variables:
           set -o xtrace
           /usr/bin/wget -q -O- ${CI_PROJECT_URL}/-/raw/${CI_COMMIT_SHA}/.gitlab-ci/download-git-cache.sh | bash -
           set +o xtrace
-  MINIO_HOST: minio-packet.freedesktop.org
+  CI_JOB_JWT_FILE: /minio_jwt
+  MINIO_HOST: s3.freedesktop.org
   # per-pipeline artifact storage on MinIO
   PIPELINE_ARTIFACTS_BASE: ${MINIO_HOST}/artifacts/${CI_PROJECT_PATH}/${CI_PIPELINE_ID}
   # per-job artifact storage on MinIO
@@ -16,9 +17,24 @@ variables:
   # running on a particular CI farm (ie. for outages, etc):
   FD_FARM: "online"
 
+default:
+  before_script:
+    - echo -e "\e[0Ksection_start:$(date +%s):unset_env_vars_section[collapsed=true]\r\e[0KUnsetting vulnerable environment variables"
+    - echo -n "${CI_JOB_JWT}" > "${CI_JOB_JWT_FILE}"
+    - unset CI_JOB_JWT
+    - echo -e "\e[0Ksection_end:$(date +%s):unset_env_vars_section\r\e[0K"
+
+  after_script:
+    - >
+      set +x
+
+      test -e "${CI_JOB_JWT_FILE}" &&
+      export CI_JOB_JWT="$(<${CI_JOB_JWT_FILE})" &&
+      rm "${CI_JOB_JWT_FILE}"
+
 include:
   - project: 'freedesktop/ci-templates'
-    ref: 79c325922670137e8f0a4dc5f6f097e0eb57c1af
+    ref: ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2
     file:
       - '/templates/ci-fairy.yml'
   - project: 'freedesktop/ci-templates'
@@ -26,22 +42,7 @@ include:
     file:
       - '/templates/debian.yml'
       - '/templates/fedora.yml'
-  - local: '.gitlab-ci/lava/lava-gitlab-ci.yml'
   - local: '.gitlab-ci/test-source-dep.yml'
-  - local: 'src/amd/ci/gitlab-ci.yml'
-  - local: 'src/broadcom/ci/gitlab-ci.yml'
-  - local: 'src/etnaviv/ci/gitlab-ci.yml'
-  - local: 'src/freedreno/ci/gitlab-ci.yml'
-  - local: 'src/gallium/drivers/i915/ci/gitlab-ci.yml'
-  - local: 'src/gallium/drivers/iris/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/radeonsi/ci/gitlab-ci.yml'
-  - local: 'src/gallium/drivers/softpipe/ci/gitlab-ci.yml'
-  - local: 'src/gallium/drivers/virgl/ci/gitlab-ci.yml'
-  - local: 'src/gallium/drivers/zink/ci/gitlab-ci.yml'
-  - local: 'src/gallium/frontends/lavapipe/ci/gitlab-ci.yml'
-  - local: 'src/panfrost/ci/gitlab-ci.yml'
 
 stages:
   - sanity
@@ -49,14 +50,6 @@ stages:
   - git-archive
   - build-x86_64
   - build-misc
-  - amd
-  - intel
-  - arm
-  - broadcom
-  - freedreno
-  - etnaviv
-  - software-renderer
-  - layered-backends
   - deploy
 
 # Generic rule to not run the job during scheduled pipelines
@@ -290,7 +283,7 @@ debian/x86_build-base:
     - .fdo.container-build@debian
     - .container
   variables:
-    MESA_IMAGE_TAG: &debian-x86_build-base "2021-07-26-python"
+    MESA_IMAGE_TAG: &debian-x86_build-base "2022-11-22-wayland"
 
 .use-debian/x86_build-base:
   extends:
@@ -388,36 +381,6 @@ debian/android_build:
   needs:
     - debian/android_build
 
-# Debian 11 based x86 test image base
-debian/x86_test-base:
-  extends: debian/x86_build-base
-  variables:
-    MESA_IMAGE_TAG: &debian-x86_test-base "2021-10-15-va"
-
-.use-debian/x86_test-base:
-  extends:
-    - .fdo.container-build@debian
-    - .use-base-image
-  variables:
-    MESA_BASE_IMAGE: "debian/x86_test-base"
-    MESA_BASE_TAG: *debian-x86_test-base
-  needs:
-    - debian/x86_test-base
-
-# Debian 11 based x86 test image for GL
-debian/x86_test-gl:
-  extends: .use-debian/x86_test-base
-  variables:
-    FDO_DISTRIBUTION_EXEC: 'env KERNEL_URL=${KERNEL_URL} FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/container/${CI_JOB_NAME}.sh'
-    KERNEL_URL: &kernel-rootfs-url "https://gitlab.freedesktop.org/gfx-ci/linux/-/archive/v5.15-for-mesa-ci-540a4af22d71/linux-v5.15-for-mesa-ci-540a4af22d71.tar.bz2"
-    MESA_IMAGE_TAG: &debian-x86_test-gl "2021-11-02-lazor"
-
-# Debian 11 based x86 test image for VK
-debian/x86_test-vk:
-  extends: .use-debian/x86_test-base
-  variables:
-    MESA_IMAGE_TAG: &debian-x86_test-vk "2021-2021-10-15-va"
-
 # Debian 11 based ARM build image
 debian/arm_build:
   extends:
@@ -426,7 +389,7 @@ debian/arm_build:
   tags:
     - aarch64
   variables:
-    MESA_IMAGE_TAG: &debian-arm_build "2021-07-26-python"
+    MESA_IMAGE_TAG: &debian-arm_build "2022-11-16-ci-fairy"
 
 .use-debian/arm_build:
   extends:
@@ -446,7 +409,7 @@ fedora/x86_build:
     - .container
   variables:
     FDO_DISTRIBUTION_VERSION: 34
-    MESA_IMAGE_TAG: &fedora-x86_build "2021-07-08-bump-libdrm"
+    MESA_IMAGE_TAG: &fedora-x86_build "2022-11-22-wayland"
 
 .use-fedora/x86_build:
   extends:
@@ -458,124 +421,6 @@ fedora/x86_build:
     - fedora/x86_build
 
 
-.kernel+rootfs:
-  extends:
-    - .ci-run-policy
-  stage: container
-  variables:
-    GIT_STRATEGY: fetch
-    KERNEL_URL: *kernel-rootfs-url
-    MESA_ROOTFS_TAG: &kernel-rootfs "2021-11-02-lazor"
-    DISTRIBUTION_TAG: &distribution-tag-arm "${MESA_ROOTFS_TAG}--${MESA_ARTIFACTS_TAG}--${MESA_TEMPLATES_COMMIT}"
-  script:
-    - .gitlab-ci/container/lava_build.sh
-
-kernel+rootfs_amd64:
-  extends:
-    - .use-debian/x86_build-base
-    - .kernel+rootfs
-  image: "$FDO_BASE_IMAGE"
-  variables:
-    DEBIAN_ARCH: "amd64"
-    DISTRIBUTION_TAG: &distribution-tag-amd64 "${MESA_ROOTFS_TAG}--${MESA_ARTIFACTS_BASE_TAG}--${MESA_TEMPLATES_COMMIT}"
-
-kernel+rootfs_arm64:
-  extends:
-    - .use-debian/arm_build
-    - .kernel+rootfs
-  tags:
-    - aarch64
-  variables:
-    DEBIAN_ARCH: "arm64"
-
-kernel+rootfs_armhf:
-  extends:
-    - kernel+rootfs_arm64
-  variables:
-    DEBIAN_ARCH: "armhf"
-
-# Cannot use anchors defined here from included files, so use extends: instead
-.use-kernel+rootfs-arm:
-  variables:
-    DISTRIBUTION_TAG: *distribution-tag-arm
-    MESA_ROOTFS_TAG: *kernel-rootfs
-
-.use-kernel+rootfs-amd64:
-  variables:
-    DISTRIBUTION_TAG: *distribution-tag-amd64
-    MESA_ROOTFS_TAG: *kernel-rootfs
-
-# x86 image with ARM64 & armhf kernel & rootfs for baremetal testing
-debian/arm_test:
-  extends:
-    - .fdo.container-build@debian
-    - .container
-    # Don't want the .container rules
-    - .ci-run-policy
-  needs:
-    - kernel+rootfs_arm64
-    - kernel+rootfs_armhf
-  variables:
-    FDO_DISTRIBUTION_EXEC: 'env ARTIFACTS_PREFIX=https://${MINIO_HOST}/mesa-lava ARTIFACTS_SUFFIX=${MESA_ROOTFS_TAG}--${MESA_ARM_BUILD_TAG}--${MESA_TEMPLATES_COMMIT} CI_PROJECT_PATH=${CI_PROJECT_PATH} FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} FDO_UPSTREAM_REPO=${FDO_UPSTREAM_REPO} bash .gitlab-ci/container/${CI_JOB_NAME}.sh'
-    FDO_DISTRIBUTION_TAG: "${MESA_IMAGE_TAG}--${MESA_ROOTFS_TAG}--${MESA_ARM_BUILD_TAG}--${MESA_TEMPLATES_COMMIT}"
-    MESA_ARM_BUILD_TAG: *debian-arm_build
-    MESA_IMAGE_TAG: &debian-arm_test "2021-09-17-deqp"
-    MESA_ROOTFS_TAG: *kernel-rootfs
-
-.use-debian/arm_test:
-  image: "$CI_REGISTRY_IMAGE/${MESA_IMAGE_PATH}:${MESA_IMAGE_TAG}--${MESA_ROOTFS_TAG}--${MESA_ARM_BUILD_TAG}--${MESA_TEMPLATES_COMMIT}"
-  variables:
-    MESA_ARM_BUILD_TAG: *debian-arm_build
-    MESA_IMAGE_PATH: "debian/arm_test"
-    MESA_IMAGE_TAG: *debian-arm_test
-    MESA_ROOTFS_TAG: *kernel-rootfs
-  needs:
-    - debian/arm_test
-
-# Native Windows docker builds
-#
-# Unlike the above Linux-based builds - including MinGW builds which
-# cross-compile for Windows - which use the freedesktop ci-templates, we
-# cannot use the same scheme here. As Windows lacks support for
-# Docker-in-Docker, and Podman does not run natively on Windows, we have
-# to open-code much of the same ourselves.
-#
-# This is achieved by first running in a native Windows shell instance
-# (host PowerShell) in the container stage to build and push the image,
-# then in the build stage by executing inside Docker.
-
-.windows-docker-vs2019:
-  extends:
-    - .set-image
-  variables:
-    MESA_IMAGE: "$CI_REGISTRY_IMAGE/${MESA_IMAGE_PATH}:${MESA_IMAGE_TAG}"
-    MESA_IMAGE_PATH: "windows/x64_build"
-    MESA_IMAGE_TAG: "2021-06-24-zink-msvc"
-    MESA_UPSTREAM_IMAGE: "$CI_REGISTRY/$FDO_UPSTREAM_REPO/$MESA_IMAGE_PATH:${MESA_IMAGE_TAG}"
-
-windows_build_vs2019:
-  extends:
-    - .container
-    - .windows-docker-vs2019
-  stage: container
-  variables:
-    GIT_STRATEGY: fetch # we do actually need the full repository though
-  timeout: 2h 30m # LLVM + piglit takes ages
-  tags:
-    - windows
-    - shell
-    - "1809"
-    - mesa
-  script:
-    - .\.gitlab-ci\windows\mesa_container.ps1 $CI_REGISTRY $CI_REGISTRY_USER $CI_REGISTRY_PASSWORD $MESA_IMAGE $MESA_UPSTREAM_IMAGE
-
-.use-windows_build_vs2019:
-  extends: .windows-docker-vs2019
-  image: "$MESA_IMAGE"
-  needs:
-    - windows_build_vs2019
-
-
 # Git archive
 
 make git archive:
@@ -594,9 +439,7 @@ make git archive:
     # compress the current folder
     - tar -cvzf ../$CI_PROJECT_NAME.tar.gz .
 
-    # login with the JWT token
-    - ci-fairy minio login $CI_JOB_JWT
-    - ci-fairy minio cp ../$CI_PROJECT_NAME.tar.gz minio://$MINIO_HOST/git-cache/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/$CI_PROJECT_NAME.tar.gz
+    - ci-fairy s3cp --token-file "${CI_JOB_JWT_FILE}" ../$CI_PROJECT_NAME.tar.gz https://$MINIO_HOST/git-cache/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/$CI_PROJECT_NAME.tar.gz
 
 
 # Sanity checks of MR settings and commit logs
@@ -643,23 +486,13 @@ sanity:
     CCACHE_DIR: /cache/mesa/ccache
   # Use ccache transparently, and print stats before/after
   before_script:
+    - !reference [default, before_script]
     - export PATH="/usr/lib/ccache:$PATH"
     - export CCACHE_BASEDIR="$PWD"
     - ccache --show-stats
   after_script:
     - ccache --show-stats
-
-.build-windows:
-  extends: .build-common
-  tags:
-    - windows
-    - docker
-    - "1809"
-    - mesa
-  cache:
-    key: ${CI_JOB_NAME}
-    paths:
-      - subprojects/packagecache
+    - !reference [default, after_script]
 
 .meson-build:
   extends:
@@ -671,63 +504,6 @@ sanity:
   script:
     - .gitlab-ci/meson/build.sh
 
-debian-testing:
-  extends:
-    - .meson-build
-    - .ci-deqp-artifacts
-  variables:
-    UNWIND: "enabled"
-    DRI_LOADERS: >
-      -D glx=dri
-      -D gbm=enabled
-      -D egl=enabled
-      -D platforms=x11
-    GALLIUM_ST: >
-      -D dri3=enabled
-      -D gallium-va=enabled
-    GALLIUM_DRIVERS: "swrast,virgl,radeonsi,zink,iris,i915"
-    VULKAN_DRIVERS: "swrast,amd"
-    BUILDTYPE: "debugoptimized"
-    EXTRA_OPTION: >
-      -D valgrind=false
-    MINIO_ARTIFACT_NAME: mesa-amd64
-  script:
-    - .gitlab-ci/meson/build.sh
-    - .gitlab-ci/prepare-artifacts.sh
-
-debian-testing-asan:
-  extends:
-    - debian-testing
-  variables:
-    C_ARGS: >
-      -Wno-error=stringop-truncation
-    EXTRA_OPTION: >
-      -D b_sanitize=address
-      -D valgrind=false
-    MINIO_ARTIFACT_NAME: ""
-    ARTIFACTS_DEBUG_SYMBOLS: 1
-
-debian-clover-testing:
-  extends:
-    - .meson-build
-    - .ci-deqp-artifacts
-  variables:
-    UNWIND: "enabled"
-    DRI_LOADERS: >
-      -D glx=disabled
-      -D egl=disabled
-      -D gbm=disabled
-    GALLIUM_ST: >
-      -D gallium-opencl=icd
-      -D opencl-spirv=true
-    GALLIUM_DRIVERS: "swrast"
-    BUILDTYPE: "debugoptimized"
-    EXTRA_OPTION: >
-      -D valgrind=false
-  script:
-    - .gitlab-ci/meson/build.sh
-    - .gitlab-ci/prepare-artifacts.sh
-
 debian-gallium:
   extends: .meson-build
   variables:
@@ -826,7 +602,6 @@ fedora-release:
       -D llvm=enabled
       -D microsoft-clc=disabled
       -D shared-llvm=enabled
-      -D vulkan-device-select-layer=true
     LLVM_VERSION: ""
     UNWIND: "disabled"
     VULKAN_DRIVERS: "amd,broadcom,freedreno,intel"
@@ -1018,42 +793,6 @@ debian-clang:
     CC: clang
     CXX: clang++
 
-windows-vs2019:
-  extends:
-    - .build-windows
-    - .use-windows_build_vs2019
-    - .windows-build-rules
-  stage: build-misc
-  script:
-    - . .\.gitlab-ci\windows\mesa_build.ps1
-  artifacts:
-    paths:
-      - _build/meson-logs/*.txt
-      - _install/
-
-test-d3d12-windows:
-  extends:
-    - .build-windows
-    - .use-windows_build_vs2019
-    - .windows-test-rules
-  stage: layered-backends
-  dependencies:
-    - windows-vs2019
-  needs:
-    - windows-vs2019
-  variables:
-    GIT_STRATEGY: none # testing doesn't build anything from source
-    GALLIUM_DRIVER: d3d12
-    PIGLIT_PROFILE: quick_gl
-    PIGLIT_TESTS: -x nv_copy_depth_to_color -x repeat-wait -x arb_timer_query@timestamp-get
-  script:
-    - . _install/piglit_run.ps1
-  artifacts:
-    when: on_failure
-    name: "mesa_${CI_JOB_NAME}"
-    paths:
-      - summary/
-
 debian-clover:
   extends: .meson-build
   variables:
@@ -1141,213 +880,3 @@ debian-ppc64el:
     CROSS: ppc64el
     GALLIUM_DRIVERS: "nouveau,radeonsi,swrast,virgl,zink"
     VULKAN_DRIVERS: "amd,swrast"
-
-debian-mingw32-x86_64:
-  extends: .meson-build
-  stage: build-misc
-  variables:
-    UNWIND: "disabled"
-    C_ARGS: >
-      -Wno-error=format
-      -Wno-error=format-extra-args
-    CPP_ARGS: $C_ARGS
-    DRI_DRIVERS: ""
-    GALLIUM_DRIVERS: "swrast"
-    EXTRA_OPTION: >
-      -Dllvm=disabled
-      -Dzlib=disabled
-      -Dosmesa=true
-      --cross-file=.gitlab-ci/x86_64-w64-mingw32
-
-.test:
-  extends:
-    - .ci-run-policy
-  # Cancel job if a newer commit is pushed to the same branch
-  interruptible: true
-  variables:
-    GIT_STRATEGY: none # testing doesn't build anything from source
-  before_script:
-    # Note: Build dir (and thus install) may be dirty due to GIT_STRATEGY
-    - rm -rf install
-    - tar -xf artifacts/install.tar
-    - LD_LIBRARY_PATH=install/lib find install/lib -name "*.so" -print -exec ldd {} \;
-  artifacts:
-    when: always
-    name: "mesa_${CI_JOB_NAME}"
-    paths:
-      - results/
-
-.use-debian/x86_test-gl:
-  extends:
-    - .test
-    - .set-image-base-tag
-  variables:
-    MESA_BASE_TAG: *debian-x86_test-base
-    MESA_IMAGE_PATH: "debian/x86_test-gl"
-    MESA_IMAGE_TAG: *debian-x86_test-gl
-  needs:
-    - debian/x86_test-gl
-
-.test-gl:
-  extends:
-    - .use-debian/x86_test-gl
-  needs:
-    - debian/x86_test-gl
-    - debian-testing
-
-.test-vk:
-  extends:
-    - .test
-    - .set-image-base-tag
-  variables:
-    MESA_BASE_TAG: *debian-x86_test-base
-    MESA_IMAGE_PATH: "debian/x86_test-vk"
-    MESA_IMAGE_TAG: *debian-x86_test-vk
-  needs:
-    - debian-testing
-    - debian/x86_test-vk
-
-.test-cl:
-  extends:
-    - .use-debian/x86_test-gl
-  needs:
-    - debian/x86_test-gl
-    - debian-clover-testing
-
-.vkd3d-proton-test:
-  artifacts:
-    when: on_failure
-    name: "mesa_${CI_JOB_NAME}"
-    paths:
-      - results/vkd3d-proton.log
-  script:
-    - ./install/vkd3d-proton/run.sh
-
-.piglit-test:
-  artifacts:
-    when: on_failure
-    name: "mesa_${CI_JOB_NAME}"
-    paths:
-      - results/summary/
-      - results/*.txt
-  variables:
-    PIGLIT_NO_WINDOW: 1
-  script:
-    - install/piglit/run.sh
-
-.piglit-traces-test:
-  extends:
-    - .piglit-test
-  cache:
-    key: ${CI_JOB_NAME}
-    paths:
-      - replayer-db/
-  artifacts:
-    when: on_failure
-    name: "mesa_${CI_JOB_NAME}"
-    reports:
-      junit: results/junit.xml
-  variables:
-    PIGLIT_PROFILES: replay
-    PIGLIT_REPLAY_UPLOAD_TO_MINIO: 1
-    PIGLIT_REPLAY_EXTRA_ARGS:  --keep-image --db-path ${CI_PROJECT_DIR}/replayer-db/ --minio_host=minio-packet.freedesktop.org --minio_bucket=mesa-tracie-public --role-session-name=${CI_PROJECT_PATH}:${CI_JOB_ID} --jwt=${CI_JOB_JWT}
-    PIGLIT_JUNIT_RESULTS: 1
-
-.deqp-test:
-  script:
-    - ./install/deqp-runner.sh
-  artifacts:
-    exclude:
-      - results/*.shader_cache
-    reports:
-      junit: results/junit.xml
-
-.deqp-test-vk:
-  extends:
-    - .deqp-test
-  variables:
-    DEQP_VER: vk
-
-.fossilize-test:
-  script:
-    - ./install/fossilize-runner.sh
-  artifacts:
-    when: on_failure
-    name: "mesa_${CI_JOB_NAME}"
-    paths:
-      - results/
-
-# Rules for tests that should not be present in MRs or the main
-# project's pipeline (don't block marge or report red on
-# mesa/mesa main) but should be present on pipelines in personal
-# branches (so you can opt in to running the flaky test when you want
-# to).
-.test-manual:
-  rules:
-    - *ignore_scheduled_pipelines
-    - if: *is-forked-branch
-      changes:
-        *all_paths
-      when: manual
-    - when: never
-  variables:
-    GIT_STRATEGY: none
-    JOB_TIMEOUT: 80
-
-# The above .test-manual rules doesn't allow the jobs to be available for MRs
-# but we should have an option to have manual jobs in MRs as well.
-.test-manual-mr:
-  rules:
-    - *ignore_scheduled_pipelines
-    - if: *is-forked-branch-or-pre-merge-not-for-marge
-      changes:
-        *all_paths
-      when: manual
-    - when: never
-  variables:
-    GIT_STRATEGY: none
-    JOB_TIMEOUT: 80
-
-.baremetal-test:
-  extends:
-    - .ci-run-policy
-    - .test
-  # Cancel job if a newer commit is pushed to the same branch
-  interruptible: true
-  stage: test
-  before_script:
-    # Use this instead of gitlab's artifacts download because it hits packet.net
-    # instead of fd.o.  Set FDO_HTTP_CACHE_URI to an http cache for your test lab to
-    # improve it even more (see https://docs.mesa3d.org/ci/bare-metal.html for
-    # setup).
-    - wget ${FDO_HTTP_CACHE_URI:-}https://${PIPELINE_ARTIFACTS_BASE}/${MINIO_ARTIFACT_NAME}.tar.gz -S --progress=dot:giga -O- | tar -xz
-  artifacts:
-    when: always
-    name: "mesa_${CI_JOB_NAME}"
-    paths:
-      - results/
-      - serial*.txt
-    exclude:
-      - results/*.shader_cache
-    reports:
-      junit: results/junit.xml
-
-.baremetal-test-armhf:
-  extends:
-    - .baremetal-test
-  variables:
-    MINIO_ARTIFACT_NAME: mesa-armhf
-
-.baremetal-arm64-asan-test:
-  variables:
-    DEQP_RUNNER_OPTIONS: "--env LD_PRELOAD=libasan.so.6"
-    MINIO_ARTIFACT_NAME: mesa-arm64-asan
-  needs:
-    - debian/arm_test
-    - job: debian-arm64-asan
-      artifacts: false
-
-.baremetal-deqp-test:
-  variables:
-    HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
-    FDO_CI_CONCURRENT: 0 # Default to number of CPUs

.gitlab-ci/bare-metal/rootfs-setup.sh

@@ -16,7 +16,8 @@ set +x
 chmod +x $rootfs_dst/set-job-env-vars.sh
 echo "Variables passed through:"
 cat $rootfs_dst/set-job-env-vars.sh
-echo "export CI_JOB_JWT=${CI_JOB_JWT@Q}" >> $rootfs_dst/set-job-env-vars.sh
+mkdir -p "$(dirname "$rootfs_dst/${CI_JOB_JWT_FILE}")"
+cp "${CI_JOB_JWT_FILE}" "$rootfs_dst/${CI_JOB_JWT_FILE}"
 set -x
 
 # Add the Mesa drivers we built, and make a consistent symlink to them.

.gitlab-ci/common/generate-env.sh

@@ -8,6 +8,7 @@ for var in \
     CI_COMMIT_TITLE \
     CI_JOB_ID \
     CI_JOB_URL \
+    CI_JOB_JWT_FILE \
     CI_MERGE_REQUEST_SOURCE_BRANCH_NAME \
     CI_MERGE_REQUEST_TITLE \
     CI_NODE_INDEX \

.gitlab-ci/common/init-stage2.sh

@@ -71,8 +71,7 @@ fi
 MINIO=$(cat /proc/cmdline | tr ' ' '\n' | grep minio_results | cut -d '=' -f 2 || true)
 if [ -n "$MINIO" ]; then
   tar -czf results.tar.gz results/;
-  ci-fairy minio login "$CI_JOB_JWT";
-  ci-fairy minio cp results.tar.gz minio://"$MINIO"/results.tar.gz;
+  ci-fairy s3cp --token-file "${CI_JOB_JWT_FILE}" results.tar.gz https://"$MINIO_RESULTS_UPLOAD"/results.tar.gz;
 fi
 
 echo "hwci: mesa: $RESULT"

.gitlab-ci/container/build-piglit.sh

@@ -5,6 +5,11 @@ set -ex
 git clone https://gitlab.freedesktop.org/mesa/piglit.git --single-branch --no-checkout /piglit
 pushd /piglit
 git checkout 7d7dd2688c214e1b3c00f37226500cbec4a58efb
+
+# TODO: Remove the following patch when piglit commit got past
+# 1cd716180cfb6ef0c1fc54702460ef49e5115791
+git apply $OLDPWD/.gitlab-ci/piglit/build-piglit_backport-s3-migration.diff
+
 patch -p1 <$OLDPWD/.gitlab-ci/piglit/disable-vs_in.diff
 cmake -S . -B . -G Ninja -DCMAKE_BUILD_TYPE=Release $PIGLIT_OPTS $EXTRA_CMAKE_ARGS
 ninja $PIGLIT_BUILD_TARGETS

.gitlab-ci/container/build-wayland.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+set -ex
+
+export LIBWAYLAND_VERSION="1.18.0"
+export WAYLAND_PROTOCOLS_VERSION="1.24"
+
+git clone https://gitlab.freedesktop.org/wayland/wayland
+cd wayland
+git checkout "$LIBWAYLAND_VERSION"
+meson -Ddocumentation=false -Ddtd_validation=false -Dlibraries=true _build
+ninja -C _build install
+cd ..
+rm -rf wayland
+
+git clone https://gitlab.freedesktop.org/wayland/wayland-protocols
+cd wayland-protocols
+git checkout "$WAYLAND_PROTOCOLS_VERSION"
+meson _build
+ninja -C _build install
+cd ..
+rm -rf wayland-protocols

.gitlab-ci/container/create-rootfs.sh

@@ -71,7 +71,7 @@ apt-get -y install --no-install-recommends \
 
 # Needed for ci-fairy, this revision is able to upload files to
 # MinIO and doesn't depend on git
-pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@0f1abc24c043e63894085a6bd12f14263e8b29eb
+pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2
 
 apt-get purge -y \
         $INSTALL_CI_FAIRY_PACKAGES

.gitlab-ci/container/debian/arm_build.sh

@@ -57,7 +57,7 @@ apt-get -y install \
 apt-get install -y --no-remove -t buster \
         android-sdk-ext4-utils
 
-pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@6f5af7e5574509726c79109e3c147cee95e81366
+pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2
 
 arch=armhf
 . .gitlab-ci/container/cross_build.sh

.gitlab-ci/container/debian/x86_build-base.sh

@@ -63,7 +63,6 @@ apt-get install -y --no-remove \
         python3-requests \
         qemu-user \
         valgrind \
-        wayland-protocols \
         wget \
         wine64 \
         x11proto-dri2-dev \
@@ -73,7 +72,7 @@ apt-get install -y --no-remove \
         zlib1g-dev
 
 # Needed for ci-fairy, this revision is able to upload files to MinIO
-pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@6f5af7e5574509726c79109e3c147cee95e81366
+pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2
 
 ############### Uninstall ephemeral packages
 

.gitlab-ci/container/debian/x86_build.sh

@@ -67,10 +67,8 @@ chmod +x /usr/local/bin/x86_64-w64-mingw32-pkg-config
 
 # dependencies where we want a specific version
 export              XORG_RELEASES=https://xorg.freedesktop.org/releases/individual
-export           WAYLAND_RELEASES=https://wayland.freedesktop.org/releases
 
 export         XORGMACROS_VERSION=util-macros-1.19.0
-export         LIBWAYLAND_VERSION=wayland-1.18.0
 
 wget $XORG_RELEASES/util/$XORGMACROS_VERSION.tar.bz2
 tar -xvf $XORGMACROS_VERSION.tar.bz2 && rm $XORGMACROS_VERSION.tar.bz2
@@ -79,11 +77,7 @@ rm -rf $XORGMACROS_VERSION
 
 . .gitlab-ci/container/build-libdrm.sh
 
-wget $WAYLAND_RELEASES/$LIBWAYLAND_VERSION.tar.xz
-tar -xvf $LIBWAYLAND_VERSION.tar.xz && rm $LIBWAYLAND_VERSION.tar.xz
-cd $LIBWAYLAND_VERSION; ./configure --enable-libraries --without-host-scanner --disable-documentation --disable-dtd-validation; make install; cd ..
-rm -rf $LIBWAYLAND_VERSION
-
+. .gitlab-ci/container/build-wayland.sh
 
 pushd /usr/local
 git clone https://gitlab.freedesktop.org/mesa/shader-db.git --depth 1

.gitlab-ci/container/debian/x86_test-base.sh

@@ -59,7 +59,7 @@ apt-get install -y --no-install-recommends \
 
 # Needed for ci-fairy, this revision is able to upload files to MinIO
 # and doesn't depend on git
-pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@0f1abc24c043e63894085a6bd12f14263e8b29eb
+pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2
 
 ############### Build dEQP runner
 . .gitlab-ci/container/build-deqp-runner.sh

.gitlab-ci/container/debian/x86_test-gl.sh

@@ -22,6 +22,7 @@ STABLE_EPHEMERAL=" \
       libcap-dev \
       libclang-cpp11-dev \
       libelf-dev \
+      libexpat1-dev \
       libfdt-dev \
       libgbm-dev \
       libgles2-mesa-dev \
@@ -31,7 +32,6 @@ STABLE_EPHEMERAL=" \
       libudev-dev \
       libvulkan-dev \
       libwaffle-dev \
-      libwayland-dev \
       libx11-xcb-dev \
       libxcb-dri2-0-dev \
       libxext-dev \
@@ -45,7 +45,6 @@ STABLE_EPHEMERAL=" \
       patch \
       pkg-config \
       python3-distutils \
-      wayland-protocols \
       wget \
       xz-utils \
       "
@@ -86,6 +85,10 @@ mkdir -p /lava-files/
 
 . .gitlab-ci/container/build-libdrm.sh
 
+############### Build Wayland
+
+. .gitlab-ci/container/build-wayland.sh
+
 ############### Build libclc
 
 . .gitlab-ci/container/build-libclc.sh

.gitlab-ci/container/debian/x86_test-vk.sh

@@ -13,6 +13,7 @@ STABLE_EPHEMERAL=" \
       g++-mingw-w64-i686-posix \
       g++-mingw-w64-x86-64-posix \
       glslang-tools \
+      libexpat1-dev \
       libgbm-dev \
       libgles2-mesa-dev \
       liblz4-dev \
@@ -20,7 +21,6 @@ STABLE_EPHEMERAL=" \
       libudev-dev \
       libvulkan-dev \
       libwaffle-dev \
-      libwayland-dev \
       libx11-xcb-dev \
       libxcb-ewmh-dev \
       libxcb-keysyms1-dev \
@@ -124,6 +124,10 @@ wine \
 
 . .gitlab-ci/container/build-libdrm.sh
 
+############### Build Wayland
+
+. .gitlab-ci/container/build-wayland.sh
+
 ############### Build parallel-deqp-runner's hang-detection tool
 
 . .gitlab-ci/container/build-hang-detection.sh

.gitlab-ci/container/fedora/x86_build.sh

@@ -40,9 +40,6 @@ dnf install -y --setopt=install_weak_deps=False \
     "pkgconfig(pciaccess)" \
     "pkgconfig(vdpau)" \
     "pkgconfig(vulkan)" \
-    "pkgconfig(wayland-egl-backend)" \
-    "pkgconfig(wayland-protocols)" \
-    "pkgconfig(wayland-scanner)" \
     "pkgconfig(x11)" \
     "pkgconfig(x11-xcb)" \
     "pkgconfig(xcb)" \
@@ -74,10 +71,8 @@ dnf install -y --setopt=install_weak_deps=False \
 
 # dependencies where we want a specific version
 export              XORG_RELEASES=https://xorg.freedesktop.org/releases/individual
-export           WAYLAND_RELEASES=https://wayland.freedesktop.org/releases
 
 export         XORGMACROS_VERSION=util-macros-1.19.0
-export         LIBWAYLAND_VERSION=wayland-1.18.0
 
 wget $XORG_RELEASES/util/$XORGMACROS_VERSION.tar.bz2
 tar -xvf $XORGMACROS_VERSION.tar.bz2 && rm $XORGMACROS_VERSION.tar.bz2
@@ -86,11 +81,7 @@ rm -rf $XORGMACROS_VERSION
 
 . .gitlab-ci/container/build-libdrm.sh
 
-wget $WAYLAND_RELEASES/$LIBWAYLAND_VERSION.tar.xz
-tar -xvf $LIBWAYLAND_VERSION.tar.xz && rm $LIBWAYLAND_VERSION.tar.xz
-cd $LIBWAYLAND_VERSION; ./configure --enable-libraries --without-host-scanner --disable-documentation --disable-dtd-validation; make install; cd ..
-rm -rf $LIBWAYLAND_VERSION
-
+. .gitlab-ci/container/build-wayland.sh
 
 pushd /usr/local
 git clone https://gitlab.freedesktop.org/mesa/shader-db.git --depth 1

.gitlab-ci/container/lava_build.sh

@@ -17,6 +17,16 @@ check_minio()
 check_minio "${FDO_UPSTREAM_REPO}"
 check_minio "${CI_PROJECT_PATH}"
 
+# This script is arguably the longest one when if it comes to this line
+# Let's make some sanity checks, before failing miserably after waiting a long time
+ci-fairy s3cp --help >/dev/null 2>&1 ||
+    (
+        ERRCODE=$?
+        set +x
+        echo "ci-fairy must have s3cp support. Please update ci-templates package."
+        exit $ERRCODE
+    )
+
 . .gitlab-ci/container/container_pre_build.sh
 
 # Install rust, which we'll be using for deqp-runner.  It will be cleaned up at the end.
@@ -205,7 +215,6 @@ popd
 . .gitlab-ci/container/container_post_build.sh
 
 ############### Upload the files!
-ci-fairy minio login $CI_JOB_JWT
 FILES_TO_UPLOAD="lava-rootfs.tgz \
                  $KERNEL_IMAGE_NAME"
 
@@ -214,9 +223,9 @@ if [[ -n $DEVICE_TREES ]]; then
 fi
 
 for f in $FILES_TO_UPLOAD; do
-    ci-fairy minio cp /lava-files/$f \
-             minio://${MINIO_PATH}/$f
+    ci-fairy s3cp --token-file "${CI_JOB_JWT_FILE}" /lava-files/$f \
+             https://${MINIO_PATH}/$f
 done
 
 touch /lava-files/done
-ci-fairy minio cp /lava-files/done minio://${MINIO_PATH}/done
+ci-fairy s3cp --token-file "${CI_JOB_JWT_FILE}" /lava-files/done https://${MINIO_PATH}/done

.gitlab-ci/lava/lava-gitlab-ci.yml

@@ -1,120 +0,0 @@
-.lava-test:
-  extends:
-    - .ci-run-policy
-  # Cancel job if a newer commit is pushed to the same branch
-  interruptible: true
-  variables:
-    GIT_STRATEGY: none # testing doesn't build anything from source
-    FDO_CI_CONCURRENT: 6 # should be replaced by per-machine definitions
-    DEQP_VER: gles2
-    # proxy used to cache data locally
-    FDO_HTTP_CACHE_URI: "http://caching-proxy/cache/?uri="
-    # base system generated by the container build job, shared between many pipelines
-    BASE_SYSTEM_HOST_PREFIX: "${MINIO_HOST}/mesa-lava"
-    BASE_SYSTEM_MAINLINE_HOST_PATH: "${BASE_SYSTEM_HOST_PREFIX}/${FDO_UPSTREAM_REPO}/${DISTRIBUTION_TAG}/${ARCH}"
-    BASE_SYSTEM_FORK_HOST_PATH: "${BASE_SYSTEM_HOST_PREFIX}/${CI_PROJECT_PATH}/${DISTRIBUTION_TAG}/${ARCH}"
-    # per-job build artifacts
-    MESA_BUILD_PATH: "${PIPELINE_ARTIFACTS_BASE}/mesa-${ARCH}.tar.gz"
-    JOB_ROOTFS_OVERLAY_PATH: "${JOB_ARTIFACTS_BASE}/job-rootfs-overlay.tar.gz"
-    JOB_RESULTS_PATH: "${JOB_ARTIFACTS_BASE}/results.tar.gz"
-    PIGLIT_NO_WINDOW: 1
-    VISIBILITY_GROUP: "Collabora+fdo"
-  script:
-    - ./artifacts/lava/lava-submit.sh
-  artifacts:
-    name: "mesa_${CI_JOB_NAME}"
-    when: always
-    paths:
-      - results/
-    exclude:
-      - results/*.shader_cache
-  after_script:
-    - wget -q "https://${JOB_RESULTS_PATH}" -O- | tar -xz
-
-.lava-test:armhf:
-  variables:
-    ARCH: armhf
-    KERNEL_IMAGE_NAME: zImage
-    KERNEL_IMAGE_TYPE: "zimage"
-    BOOT_METHOD: u-boot
-    HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
-  extends:
-    - .use-debian/arm_build # for same $MESA_ARTIFACTS_TAG as in kernel+rootfs_armhf
-    - .use-debian/x86_build
-    - .lava-test
-    - .use-kernel+rootfs-arm
-  needs:
-    - kernel+rootfs_armhf
-    - debian/x86_build
-    - debian-armhf
-
-.lava-test:arm64:
-  variables:
-    ARCH: arm64
-    KERNEL_IMAGE_NAME: Image
-    KERNEL_IMAGE_TYPE: "image"
-    BOOT_METHOD: u-boot
-    HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
-  extends:
-    - .use-debian/arm_build # for same $MESA_ARTIFACTS_TAG as in kernel+rootfs_arm64
-    - .use-debian/x86_build
-    - .lava-test
-    - .use-kernel+rootfs-arm
-  dependencies:
-    - debian-arm64
-  needs:
-    - kernel+rootfs_arm64
-    - debian/x86_build
-    - debian-arm64
-
-.lava-test:amd64:
-  variables:
-    ARCH: amd64
-    KERNEL_IMAGE_NAME: bzImage
-    KERNEL_IMAGE_TYPE: "zimage"
-    BOOT_METHOD: u-boot
-    HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
-  extends:
-    - .use-debian/x86_build-base # for same $MESA_ARTIFACTS_BASE_TAG as in kernel+rootfs_amd64
-    - .use-debian/x86_build
-    - .lava-test
-    - .use-kernel+rootfs-amd64
-  needs:
-    - kernel+rootfs_amd64
-    - debian-testing
-
-.lava-traces-base:
-  variables:
-    HWCI_TEST_SCRIPT: "/install/piglit/run.sh"
-  artifacts:
-    reports:
-      junit: results/junit.xml
-
-.lava-piglit:
-  variables:
-    PIGLIT_REPLAY_DEVICE_NAME: "gl-${GPU_VERSION}"
-    PIGLIT_RESULTS: "${GPU_VERSION}-${PIGLIT_PROFILES}"
-    HWCI_TEST_SCRIPT: "/install/piglit/piglit-runner.sh"
-
-.lava-piglit-traces:amd64:
-  extends:
-    - .lava-test:amd64
-    - .lava-piglit
-    - .lava-traces-base
-
-.lava-piglit-traces:armhf:
-  extends:
-    - .lava-test:armhf
-    - .lava-piglit
-    - .lava-traces-base
-
-.lava-piglit-traces:arm64:
-  extends:
-    - .lava-test:arm64
-    - .lava-piglit
-    - .lava-traces-base
-
-.lava-piglit:amd64:
-  extends:
-    - .lava-test:amd64
-    - .lava-piglit

.gitlab-ci/lava/lava-submit.sh

@@ -22,8 +22,7 @@ cp artifacts/ci-common/init-*.sh results/job-rootfs-overlay/
 artifacts/ci-common/generate-env.sh > results/job-rootfs-overlay/set-job-env-vars.sh
 
 tar zcf job-rootfs-overlay.tar.gz -C results/job-rootfs-overlay/ .
-ci-fairy minio login "${CI_JOB_JWT}"
-ci-fairy minio cp job-rootfs-overlay.tar.gz "minio://${JOB_ROOTFS_OVERLAY_PATH}"
+ci-fairy s3cp --token-file "${CI_JOB_JWT_FILE}" job-rootfs-overlay.tar.gz "https://${JOB_ROOTFS_OVERLAY_PATH}"
 
 touch results/lava.log
 tail -f results/lava.log &
@@ -39,7 +38,6 @@ artifacts/lava/lava_job_submitter.py \
 	--ci-project-dir ${CI_PROJECT_DIR} \
 	--device-type ${DEVICE_TYPE} \
 	--dtb ${DTB} \
-	--jwt "${CI_JOB_JWT}" \
 	--kernel-image-name ${KERNEL_IMAGE_NAME} \
 	--kernel-image-type "${KERNEL_IMAGE_TYPE}" \
 	--boot-method ${BOOT_METHOD} \

.gitlab-ci/lava/lava_job_submitter.py

@@ -146,9 +146,6 @@ def generate_lava_yaml(args):
       'mkdir -p {}'.format(args.ci_project_dir),
       'wget -S --progress=dot:giga -O- {} | tar -xz -C {}'.format(args.mesa_build_url, args.ci_project_dir),
       'wget -S --progress=dot:giga -O- {} | tar -xz -C /'.format(args.job_rootfs_overlay_url),
-      'set +x',
-      'export CI_JOB_JWT="{}"'.format(args.jwt),
-      'set -x',
       'exec /init-stage2.sh',
     ]
     test['definitions'][0]['repository']['run']['steps'] = init_lines
@@ -286,7 +283,6 @@ def main(args):
 
     if args.dump_yaml:
         censored_args = args
-        censored_args.jwt = "jwt-hidden"
         print(generate_lava_yaml(censored_args))
 
     if args.validate_only:
@@ -341,7 +337,6 @@ if __name__ == '__main__':
     parser.add_argument("--kernel-image-type", nargs='?', default="")
     parser.add_argument("--boot-method")
     parser.add_argument("--lava-tags", nargs='?', default="")
-    parser.add_argument("--jwt")
     parser.add_argument("--validate-only", action='store_true')
     parser.add_argument("--dump-yaml", action='store_true')
     parser.add_argument("--visibility-group")

.gitlab-ci/piglit/build-piglit_backport-s3-migration.diff

@@ -0,0 +1,83 @@
+diff --git a/framework/replay/download_utils.py b/framework/replay/download_utils.py
+index bc0225c6c..c9c6b5096 100644
+--- a/framework/replay/download_utils.py
++++ b/framework/replay/download_utils.py
+@@ -1,6 +1,6 @@
+ # coding=utf-8
+ #
+-# Copyright (c) 2020 Collabora Ltd
++# Copyright © 2020, 2022 Collabora Ltd
+ # Copyright © 2020 Valve Corporation.
+ #
+ # Permission is hereby granted, free of charge, to any person obtaining a
+@@ -33,11 +33,11 @@ from os import path
+ from time import time
+ from email.utils import formatdate
+ from requests.utils import requote_uri
++from urllib.parse import urlparse
+
+ from framework import core, exceptions
+ from framework.replay.options import OPTIONS
+
+-
+ __all__ = ['ensure_file']
+
+ minio_credentials = None
+@@ -87,7 +87,6 @@ def get_minio_credentials(url):
+ def get_authorization_headers(url, resource):
+     minio_key, minio_secret, minio_token = get_minio_credentials(url)
+
+-    content_type = 'application/octet-stream'
+     date = formatdate(timeval=None, localtime=False, usegmt=True)
+     to_sign = "GET\n\n\n%s\nx-amz-security-token:%s\n/%s/%s" % (date,
+                                                                 minio_token,
+@@ -101,6 +100,16 @@ def get_authorization_headers(url, resource):
+                'x-amz-security-token': minio_token}
+     return headers
+
++def get_jwt_authorization_headers(url, resource):
++    date = formatdate(timeval=None, localtime=False, usegmt=True)
++    jwt = OPTIONS.download['jwt']
++    host = urlparse(url).netloc
++
++    headers = {'Host': host,
++               'Date': date,
++               'Authorization': 'Bearer %s' % (jwt)}
++    return headers
++
+ def ensure_file(file_path):
+     destination_file_path = path.join(OPTIONS.db_path, file_path)
+     if OPTIONS.download['url'] is None:
+@@ -123,7 +132,9 @@ def ensure_file(file_path):
+         assert OPTIONS.download['minio_bucket']
+         assert OPTIONS.download['role_session_name']
+         assert OPTIONS.download['jwt']
+-        headers = get_authorization_headers(url, file_path)
++        headers = get_minio_authorization_headers(url, file_path)
++    elif OPTIONS.download['jwt']:
++        headers = get_jwt_authorization_headers(url, file_path)
+     else:
+         headers = None
+
+diff --git a/unittests/framework/replay/test_download_utils.py b/unittests/framework/replay/test_download_utils.py
+index 0f1102722..abd438c20 100644
+--- a/unittests/framework/replay/test_download_utils.py
++++ b/unittests/framework/replay/test_download_utils.py
+@@ -141,3 +141,17 @@ class TestDownloadUtils(object):
+         get_request = requests_mock.request_history[1]
+         assert(get_request.method == 'GET')
+         assert(requests_mock.request_history[1].headers['Authorization'].startswith('AWS Key'))
++
++    def test_jwt_authorization(self, requests_mock):
++        """download_utils.ensure_file: Check we send the authentication headers to the server"""
++        # reset minio_host from previous tests
++        OPTIONS.download['minio_host'] = ''
++        OPTIONS.download['jwt'] = 'jwt'
++
++        assert not self.trace_file.check()
++        download_utils.ensure_file(self.trace_path)
++        TestDownloadUtils.check_same_file(self.trace_file, "remote")
++
++        get_request = requests_mock.request_history[0]
++        assert(get_request.method == 'GET')
++        assert(requests_mock.request_history[0].headers['Authorization'].startswith('Bearer'))

.gitlab-ci/piglit/run.sh

@@ -3,7 +3,7 @@
 set -ex
 
 INSTALL=$(realpath -s "$PWD"/install)
-MINIO_ARGS="--credentials=/tmp/.minio_credentials"
+MINIO_ARGS="--credentials=/tmp/.minio_credentials --token-file=${CI_JOB_JWT_FILE}"
 
 RESULTS=$(realpath -s "$PWD"/results)
 mkdir -p "$RESULTS"
@@ -162,8 +162,8 @@ replay_minio_upload_images() {
             __DESTINATION_FILE_PATH="$__MINIO_TRACES_PREFIX/${line##*-}"
         fi
 
-        ci-fairy minio cp $MINIO_ARGS "$RESULTS/$__PREFIX/$line" \
-            "minio://${__MINIO_PATH}/${__DESTINATION_FILE_PATH}"
+        ci-fairy s3cp $MINIO_ARGS "$RESULTS/$__PREFIX/$line" \
+            "https://${__MINIO_PATH}/${__DESTINATION_FILE_PATH}"
     done
 }
 
@@ -200,11 +200,6 @@ fi
 
 FAILURE_MESSAGE=$(printf "%s" "Unexpected change in results:")
 
-if [ "x$PIGLIT_PROFILES" = "xreplay" ] \
-       && [ ${PIGLIT_REPLAY_UPLOAD_TO_MINIO:-0} -eq 1 ]; then
-    ci-fairy minio login $MINIO_ARGS $CI_JOB_JWT
-fi
-
 eval $RUN_CMD
 
 if [ $? -ne 0 ]; then

.gitlab-ci/prepare-artifacts.sh

@@ -52,6 +52,5 @@ if [ -n "$MINIO_ARTIFACT_NAME" ]; then
     # Pass needed files to the test stage
     MINIO_ARTIFACT_NAME="$MINIO_ARTIFACT_NAME.tar.gz"
     gzip -c artifacts/install.tar > ${MINIO_ARTIFACT_NAME}
-    ci-fairy minio login $CI_JOB_JWT
-    ci-fairy minio cp ${MINIO_ARTIFACT_NAME} minio://${PIPELINE_ARTIFACTS_BASE}/${MINIO_ARTIFACT_NAME}
+    ci-fairy s3cp --token-file "${CI_JOB_JWT_FILE}" ${MINIO_ARTIFACT_NAME} https://${PIPELINE_ARTIFACTS_BASE}/${MINIO_ARTIFACT_NAME}
 fi

docs/ci/bare-metal.rst

@@ -153,12 +153,12 @@ Enable the site and restart nginx:
   sudo service nginx restart
 
   # First download will hit the internet
-  wget http://localhost/cache/?uri=https://minio-packet.freedesktop.org/mesa-tracie-public/itoral-gl-terrain-demo/demo.trace
+  wget http://localhost/cache/?uri=https://s3.freedesktop.org/mesa-tracie-public/itoral-gl-terrain-demo/demo.trace
   # Second download should be cached.
-  wget http://localhost/cache/?uri=https://minio-packet.freedesktop.org/mesa-tracie-public/itoral-gl-terrain-demo/demo.trace
+  wget http://localhost/cache/?uri=https://s3.freedesktop.org/mesa-tracie-public/itoral-gl-terrain-demo/demo.trace
 
 Now, set ``download-url`` in your ``traces-*.yml`` entry to something like
-``http://10.42.0.1:8888/cache/?uri=https://minio-packet.freedesktop.org/mesa-tracie-public``
+``http://10.42.0.1:8888/cache/?uri=https://s3.freedesktop.org/mesa-tracie-public``
 and you should have cached downloads for traces.  Add it to
 ``FDO_HTTP_CACHE_URI=`` in your ``config.toml`` runner environment lines and you
 can use it for cached artifact downloads instead of going all the way to

docs/conf.py

@@ -74,7 +74,7 @@ release = 'latest'
 #
 # This is also used if you do content translation via gettext catalogs.
 # Usually you set "language" from the command line for these cases.
-language = None
+language = 'en'
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.

docs/release-calendar.csv

@@ -1,9 +1,3 @@
-21.2,2021-10-13,21.2.4,Dylan Baker,
-,2021-10-27,21.2.5,Dylan Baker,
-,2021-11-10,21.2.6,Dylan Baker,
-,2021-11-24,21.2.7,Dylan Baker,
-,2021-12-08,21.2.8,Dylan Baker,Last planned 21.2.x release.
-21.3,2021-10-13,21.3.0-rc1,Eric Engestrom,
-,2021-10-20,21.3.0-rc2,Eric Engestrom,
-,2021-10-27,21.3.0-rc3,Eric Engestrom,
-,2021-11-03,21.3.0-rc4,Eric Engestrom,
+22.0,2022-03-23,22.0.1,Dylan Baker
+,2022-04-06,22.0.2,Dylan Baker
+,2022-04-20,22.0.3,Dylan Baker,This is the last planned release of the 22.0.x series.

docs/relnotes.rst

@@ -3,6 +3,27 @@ Release Notes
 
 The release notes summarize what's new or changed in each Mesa release.
 
+-  :doc:`21.3.9 release notes <relnotes/21.3.9>`
+-  :doc:`22.0.5 release notes <relnotes/22.0.5>`
+-  :doc:`22.1.1 release notes <relnotes/22.1.1>`
+-  :doc:`22.0.4 release notes <relnotes/22.0.4>`
+-  :doc:`22.1.0 release notes <relnotes/22.1.0>`
+-  :doc:`22.0.3 release notes <relnotes/22.0.3>`
+-  :doc:`22.0.2 release notes <relnotes/22.0.2>`
+-  :doc:`22.0.1 release notes <relnotes/22.0.1>`
+-  :doc:`21.3.8 release notes <relnotes/21.3.8>`
+-  :doc:`22.0.0 release notes <relnotes/22.0.0>`
+-  :doc:`21.3.7 release notes <relnotes/21.3.7>`
+-  :doc:`21.3.6 release notes <relnotes/21.3.6>`
+-  :doc:`21.3.5 release notes <relnotes/21.3.5>`
+-  :doc:`21.3.4 release notes <relnotes/21.3.4>`
+-  :doc:`21.3.3 release notes <relnotes/21.3.3>`
+-  :doc:`21.3.2 release notes <relnotes/21.3.2>`
+-  :doc:`21.3.1 release notes <relnotes/21.3.1>`
+-  :doc:`21.2.6 release notes <relnotes/21.2.6>`
+-  :doc:`21.3.0 release notes <relnotes/21.3.0>`
+-  :doc:`21.2.5 release notes <relnotes/21.2.5>`
+-  :doc:`21.2.4 release notes <relnotes/21.2.4>`
 -  :doc:`21.2.3 release notes <relnotes/21.2.3>`
 -  :doc:`21.2.2 release notes <relnotes/21.2.2>`
 -  :doc:`21.1.8 release notes <relnotes/21.1.8>`
@@ -345,6 +366,27 @@ release notes, or in the `old docs`_.
    :maxdepth: 1
    :hidden:
 
+   relnotes/21.3.9
+   relnotes/22.0.5
+   relnotes/22.1.1
+   relnotes/22.0.4
+   relnotes/22.1.0
+   relnotes/22.0.3
+   relnotes/22.0.2
+   relnotes/22.0.1
+   relnotes/21.3.8
+   relnotes/22.0.0
+   relnotes/21.3.7
+   relnotes/21.3.6
+   relnotes/21.3.5
+   relnotes/21.3.4
+   relnotes/21.3.3
+   relnotes/21.3.2
+   relnotes/21.3.1
+   relnotes/21.2.6
+   relnotes/21.3.0
+   relnotes/21.2.5
+   relnotes/21.2.4
    relnotes/21.2.3
    relnotes/21.2.2
    relnotes/21.1.8

docs/relnotes/21.2.4.rst

@@ -0,0 +1,147 @@
+Mesa 21.2.4 Release Notes / 2021-10-14
+======================================
+
+Mesa 21.2.4 is a bug fix release which fixes bugs found since the 21.2.3 release.
+
+Mesa 21.2.4 implements the OpenGL 4.6 API, but the version reported by
+glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) /
+glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used.
+Some drivers don't support all the features required in OpenGL 4.6. OpenGL
+4.6 is **only** available if requested at context creation.
+Compatibility contexts may report a lower version depending on each driver.
+
+Mesa 21.2.4 implements the Vulkan 1.2 API, but the version reported by
+the apiVersion property of the VkPhysicalDeviceProperties struct
+depends on the particular driver being used.
+
+SHA256 checksum
+---------------
+
+::
+
+    TBD.
+
+
+New features
+------------
+
+- None
+
+
+Bug fixes
+---------
+
+- RADV: Rendering issues in Resident Evil 2 with NGGC
+- crocus:  Incorrect stride when used through prime
+- anv: descriptorBindingUniformBufferUpdateAfterBind feature is not supported
+
+
+Changes
+-------
+
+Alyssa Rosenzweig (3):
+
+- panfrost: Move special_varying to compiler definitions
+- panfrost: Fix off-by-one in varying count assert
+- panfrost: Don't set CAP_TGSI_FS_COORD_PIXEL_CENTER_INTEGER
+
+Bas Nieuwenhuizen (2):
+
+- amd/common: Add fallback for misreported clocks for RGP.
+- radv: Handle copying zero queries.
+
+Chia-I Wu (1):
+
+- radv: plug leaks in radv_device_init_accel_struct_build_state
+
+Connor Abbott (1):
+
+- ir3: Use source in ir3_output_conv_src_type()
+
+Dave Airlie (7):
+
+- crocus/query: don't loop on ready status after gpu hang.
+- device_select: close dri3 fd after using it.
+- crocus: Honor scanout requirement from DRI
+- crocus/gen5: reemit shaders on gen5 after new program cache bo.
+- crocus/gen5: add dirty flags for urb fences.
+- crocus/gen6: don't reemit the svbi when debugging
+- gallivm/format: clamp SINT conversion rather than truncate.
+
+Dylan Baker (7):
+
+- docs" Add SHA256 sum for mesa 21.2.3
+- .pick_status.json: Update to fb8f532ea1bbd9c959e0f59c652347e435a71f91
+- .pick_status.json: Update to d2543658ef6fe0ad59af217a09a931d3b6174a43
+- .pick_status.json: Update to 729991e09cd28550001ae63710ab929d95b115bc
+- .pick_status.json: Update to 3a18963b0876af2aa0d60dd9917e69d409ce4d6e
+- .pick_status.json: Update to ced950e42f4a95ef410e63c2d26a2119e0c3c40b
+- .pick_status.json: Update to 783f8f728ce8e77885adbc7b2c12c39c3e3e5198
+
+Emma Anholt (2):
+
+- gallium/dri: Make YUV formats we're going to emulate external-only.
+- i915g: Check for the scanout-layout conditions before setting level info.
+
+Filip Gawin (1):
+
+- r300: implement forgotten tgsi's cases of textures
+
+Gert Wollny (1):
+
+- mesa: signal driver when buffer is bound to different texture format
+
+Icecream95 (1):
+
+- pan/mdg: Use the correct swizzle for condition moves
+
+Jason Ekstrand (1):
+
+- vulkan/shader_module: Fix the lifetime of temporary shader modules
+
+Kai Wasserbäch (2):
+
+- gallivm: add new wrapper around Module::setOverrideStackAlignment()
+- gallivm: fix FTBFS on i386 with LLVM >= 13, StackAlignmentOverride is gone
+
+Lionel Landwerlin (3):
+
+- anv: enable UBO indexing
+- anv: add missing transition handling bits
+- spirv: deal with null pointers
+
+Marek Olšák (2):
+
+- radeonsi: add back a workaround for DCC MSAA on gfx9 due to conformance issues
+- ac/surface: don't overwrite DCC settings for imported buffers
+
+Pavel Asyutchenko (1):
+
+- llvmpipe: fix crash when doing FB fetch + gl_FragDepth write in one shader
+
+Qiang Yu (1):
+
+- loader/dri3: fix swap out of order when changing swap interval
+
+Rob Clark (1):
+
+- freedreno/drm: Move pipe unref after fence removal
+
+Samuel Pitoiset (2):
+
+- radv: fix adjusting the frag coord when RADV_FORCE_VRS is enabled
+- aco: fix load_barycentric_at_{offset,sample}
+
+Timur Kristóf (3):
+
+- aco: Fix small primitive precision.
+- aco: Fix determining whether any culling is enabled.
+- ac/nir/cull: Accept NaN and +/- Inf in face culling.
+
+Vasily Khoruzhick (1):
+
+- lima: split_load_input: don't split unaligned vec2
+
+Vinson Lee (1):
+
+- pps: Avoid duplicate elements in with_datasources array.

docs/relnotes/21.2.5.rst

@@ -0,0 +1,138 @@
+Mesa 21.2.5 Release Notes / 2021-10-28
+======================================
+
+Mesa 21.2.5 is a bug fix release which fixes bugs found since the 21.2.4 release.
+
+Mesa 21.2.5 implements the OpenGL 4.6 API, but the version reported by
+glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) /
+glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used.
+Some drivers don't support all the features required in OpenGL 4.6. OpenGL
+4.6 is **only** available if requested at context creation.
+Compatibility contexts may report a lower version depending on each driver.
+
+Mesa 21.2.5 implements the Vulkan 1.2 API, but the version reported by
+the apiVersion property of the VkPhysicalDeviceProperties struct
+depends on the particular driver being used.
+
+SHA256 checksum
+---------------
+
+::
+
+    TBD.
+
+
+New features
+------------
+
+- None
+
+
+Bug fixes
+---------
+
+- RADV: Resident Evil Village needs invariantgeom when NGG culling is enabled
+- [radeonsi] Euro Truck Simulator 2: broken mimimap
+- [regression][bisected] Launching Valheim OpenGL game leads to GPU Hang
+- Android Meson build regression: hardware/system information apps crash on Raspberry Pi 4
+- anv: dEQP-VK.graphicsfuzz.cov-multiple-one-iteration-loops-global-counter-write-matrices fails
+
+
+Changes
+-------
+
+Alyssa Rosenzweig (4):
+
+- panfrost: Detect implementations support AFBC
+- panfrost,panvk: Use dev->has_afbc instead of quirks
+- panfrost: Fix gl_FragColor lowering
+- panfrost: Add internal afbc_formats
+
+Boris Brezillon (3):
+
+- vulkan: Fix weak symbol emulation when compiling with MSVC
+- vulkan: Set unused entrypoints to vk_entrypoint_stub when compiling with MSVC
+- vulkan: Fix entrypoint generation when compiling for x86 with MSVC
+
+Daniel Schürmann (1):
+
+- driconf: set vk_x11_strict_image_count for Wolfenstein: Youngblood
+
+Dylan Baker (7):
+
+- docs: add sha256 sum for 21.2.4 release
+- .pick_status.json: Update to 1c0eb7aa78bac4494dbff0c502a8c09e23a4c123
+- .pick_status.json: Update to d43f89f17a8259c842016fa559fa33c1c6279105
+- .pick_status.json: Update to be6d584de43966ee58bf1fcac156ebf8040081d1
+- .pick_status.json: Update to 39f25945311e1385a54ddd17f71f9f6023d97256
+- .pick_status.json: Update to dc74285d32df9c09eb896bc4571066402d32d10b
+- .pick_status.json: Update to 16f838576cf29e26f1af198ac93a0fb3a3cfad8f
+
+Emma Anholt (1):
+
+- radeonsi: Fix leak of screen->perfcounters.
+
+Ian Romanick (1):
+
+- nir/loop_unroll: Always unroll loops that iterate at most once
+
+Jan Beich (1):
+
+- meson: disable -Werror=thread-safety on FreeBSD
+
+Jason Ekstrand (2):
+
+- i965: Emit a NULL surface for buffer textures with no buffer
+- nir/algebraic: Lower fisfinite
+
+Karol Herbst (1):
+
+- spirv: Don't add 0.5 to array indicies for OpImageSampleExplicitLod
+
+Lionel Landwerlin (2):
+
+- isl: only bump the min row pitch for display when not specified
+- anv: fix push constant lowering with bindless shaders
+
+Maniraj D (1):
+
+- egl: set TSD as NULL after deinit
+
+Marcin Ślusarz (2):
+
+- iris: fix scratch address patching for TESS_EVAL stage
+- intel: fix INTEL_DEBUG environment variable on 32-bit systems
+
+Marek Olšák (2):
+
+- mesa: fix crashes in the no_error path of glUniform
+- st/mesa: don't crash when draw indirect buffer has no storage
+
+Mike Blumenkrantz (6):
+
+- aux/pb: add a tolerance for reclaim failure
+- aux/pb: more correctly check number of reclaims
+- zink: fully zero surface creation struct
+- zink: don't break early when applying fb clears
+- zink: fix gl_SampleMaskIn spirv generation
+- nir/lower_samplers_as_deref: rewrite more image intrinsics
+
+Mykhailo Skorokhodov (1):
+
+- iris: Add missed tile flush flag
+
+Nanley Chery (1):
+
+- iris: Tile cache flush for depth before fast clear
+
+Pierre-Eric Pelloux-Prayer (1):
+
+- radeonsi: use viewport offset in quant_mode determination
+
+Tapani Pälli (1):
+
+- anv: use vk_object_zalloc for wsi fences created
+
+Timur Kristóf (1):
+
+- drirc: Apply radv_invariant_geom workaround to Resident Evil Village.

docs/relnotes/21.2.6.rst

@@ -0,0 +1,161 @@
+Mesa 21.2.6 Release Notes / 2021-11-24
+======================================
+
+Mesa 21.2.6 is a bug fix release which fixes bugs found since the 21.2.5 release.
+
+Mesa 21.2.6 implements the OpenGL 4.6 API, but the version reported by
+glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) /
+glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used.
+Some drivers don't support all the features required in OpenGL 4.6. OpenGL
+4.6 is **only** available if requested at context creation.
+Compatibility contexts may report a lower version depending on each driver.
+
+Mesa 21.2.6 implements the Vulkan 1.2 API, but the version reported by
+the apiVersion property of the VkPhysicalDeviceProperties struct
+depends on the particular driver being used.
+
+SHA256 checksum
+---------------
+
+::
+
+    TBD.
+
+
+New features
+------------
+
+- None
+
+
+Bug fixes
+---------
+
+- NIR validation failed after nir_copy_prop
+- lima: Corrupted Android-12 UI on Allwinner A64
+- RADV/ACO: Rendering glitches in Forza Horizon 5 windshields
+- dEQP-GLES31.*imulextended* compiling fp64 glsl 4.00 shader
+- Regression/Bisected: Crash in Godot games when steam overlay enabled
+- RADV: IsHelperInvocationEXT query is not considered volatile in ACO
+- Final Fantasy V (Old version): Random text characters are not displayed
+- Diagonal rendering artifacts in Tomb Raider
+- [hsw][bisected][regression] dEQP-VK.reconvergence.*nesting* failures
+
+
+Changes
+-------
+
+Connor Abbott (2):
+
+- ir3/lower_pcopy: Fix shr.b illegal copy lowering
+- ir3/lower_pcopy: Fix bug with "illegal" copies and swaps
+
+Danylo Piliaiev (1):
+
+- ir3/ra: Check register file upper bound when updating preferred_reg
+
+Dave Airlie (2):
+
+- llvmpipe: disable 64-bit integer textures.
+- llvmpipe: fix compressed image sizes.
+
+Dylan Baker (9):
+
+- docs: add sha256 sums for 21.2.5
+- .pick_status.json: Update to 8bfa146b8056d5dded6fdd2c4d8524aa0c438058
+- .pick_status.json: Update to 79f57f68930ce4fcf59bdca82357e19b4f3d62e6
+- .pick_status.json: Update to c356f3cfce9459dc1341b6a2a0fd5336a9bdcc3c
+- .pick_status.json: Mark a large number of zink patches as denominated
+- .pick_status.json: Update to 78b613db23c10dc257247d99d8b2b1ef6c96bebb
+- .pick_status.json: Update to 09bb4dbe60b1bb233c5c0102446ffbc142a29246
+- .pick_status.json: Update to e0de7aa4d7717bbd79bbc5bfc660f941f680402b
+- .pick_status.json: Update to f8009d3db25512b5dc62d0272c979fb79f8c7075
+
+Eric Engestrom (1):
+
+- meson: drop duplicate addition of surfaceless & drm to the list of platforms
+
+Greg V (1):
+
+- util: make util_get_process_exec_path work on FreeBSD w/o procfs
+
+Ian Romanick (1):
+
+- glsl/nir: Don't build soft float64 when it cannot be used
+
+Jason Ekstrand (1):
+
+- anv: Fix FlushMappedMemoryRanges for odd mmap offsets
+
+Jesse Natalie (2):
+
+- util/hash_table: Clear special 0/1 entries for u64 hash table too
+- d3d12: Fix Linux fence wait return value
+
+Kenneth Graunke (1):
+
+- iris: Fix MOCS for buffer copies
+
+Lionel Landwerlin (6):
+
+- intel/dev: fix HSW GT3 number of subslices in slice1
+- intel/dev: don't forget to set max_eu_per_subslice in generated topology
+- intel/perf: fix perf equation subslice mask generation for gfx12+
+- intel/devinfo: fix wrong offset computation
+- intel: remove 2 preproduction pci-id for ADLS
+- intel/fs: fix shader call lowering pass
+
+Liviu Prodea (1):
+
+- aco: Work around MSVC restrict in c99_compat.h
+
+Marek Olšák (4):
+
+- radeonsi: print the border color error message only once
+- radeonsi: fix 2 issues with depth_cleared_level_mask
+- radeonsi: fix a typo preventing a fast depth-stencil clear
+- driconf: disallow 10-bit pbuffers for viewperf2020/maya due to X errors
+
+Mike Blumenkrantz (10):
+
+- zink: add better handling for CUBE_COMPATIBLE bit
+- zink: always use explicit lod for texture() when legal in non-fragment stages
+- zink: be more permissive for injecting LOD into texture() instructions
+- zink: inject LOD for sampler version of OpImageQuerySize
+- zink: don't clamp cube array surfacess to cubes
+- zink: don't clamp 2D_ARRAY surfaces to 2D
+- zink: add more int/float types to cast switching in ntv
+- zink: force float dest types on some alu results
+- aux/primconvert: handle singular incomplete restarts
+- zink: clamp PIPE_SHADER_CAP_MAX_INPUTS for xfb
+
+Pierre-Eric Pelloux-Prayer (3):
+
+- radeonsi: treat nir_intrinsic_load_constant as a VMEM operation
+- ac/surface: don't validate DCC settings if DCC isn't possible
+- mesa: always call _mesa_update_pixel
+
+Rhys Perry (2):
+
+- aco/spill: use spills_entry instead of spills_exit to kill linear VGPRs
+- spirv: run nir_copy_prop before nir_rematerialize_derefs_in_use_blocks_impl
+
+Roman Stratiienko (1):
+
+- android.mk: Add missing variables to the make target
+
+Thomas H.P. Andersen (1):
+
+- svga: fix bitwise/logical and mixup
+
+Timothy Arceri (1):
+
+- mesa: fix buffer overrun in SavedObj texture obj array
+
+Timur Kristóf (1):
+
+- aco: Fix how p_is_helper interacts with optimizations.
+
+Vadym Shovkoplias (1):
+
+- intel/fs: Fix a cmod prop bug when cmod is set to inst that doesn't support it

docs/relnotes/21.3.0.rst

@@ -1499,8 +1499,8 @@ Emma Anholt (233):
 - ci/deqp-runner: Don't start GPU hang detection for making junit results.
 - ci/deqp-runner: Move more non-suite logic under the non-suite 'if'.
 - ci/piglit-runner: Fix funny indentation of the piglit-runner command.
-- ci/deqp-runner: Rename the deqp-drivername-\*.txt files to drivername-*.txt
-- ci/piglit-runner: Merge piglit-driver-\*.txt files into driver-*.txt.
+- ci/deqp-runner: Rename the deqp-drivername-\*.txt files to drivername-\*.txt
+- ci/piglit-runner: Merge piglit-driver-\*.txt files into driver-\*.txt.
 - ci: Enable testing radeonsi's libva using libva-util unit tests.
 - freedreno: Fix gmem invalidating the depth or stencil of packed d/s.
 - freedreno/a6xx: Fix partial z/s clears with sysmem.

docs/relnotes/21.3.9.rst

@@ -19,7 +19,7 @@ SHA256 checksum
 
 ::
 
-    TBD.
+    91fe6f20339884e37a7c47bfba42fb1cd397512c9ed5ad423de369f047cd8b5c  mesa-21.3.9.tar.xz
 
 
 New features

docs/relnotes/22.0.1.rst

@@ -0,0 +1,168 @@
+Mesa 22.0.1 Release Notes / 2022-03-29
+======================================
+
+Mesa 22.0.1 is a bug fix release which fixes bugs found since the 22.0.0 release.
+
+Mesa 22.0.1 implements the OpenGL 4.6 API, but the version reported by
+glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) /
+glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used.
+Some drivers don't support all the features required in OpenGL 4.6. OpenGL
+4.6 is **only** available if requested at context creation.
+Compatibility contexts may report a lower version depending on each driver.
+
+Mesa 22.0.1 implements the Vulkan 1.2 API, but the version reported by
+the apiVersion property of the VkPhysicalDeviceProperties struct
+depends on the particular driver being used.
+
+SHA256 checksum
+---------------
+
+::
+
+    TBD.
+
+
+New features
+------------
+
+- None
+
+
+Bug fixes
+---------
+
+- freedreno: crash in PUBG
+- [regression][bisected] MSVC: Build failure in libmesa_util when targeting x86 32-bit
+- A crash in radeonsi driver
+- freedreno: deqp cts fails
+
+
+Changes
+-------
+
+Alyssa Rosenzweig (4):
+
+- panfrost: Emulate GL_CLAMP on Bifrost
+- pan/bi: Handle non-2D arrays
+- panfrost: Fix primitive restart with 32-bit indices
+- pan/bi: Don't analyze helper reqs in !frag shaders
+
+Anuj Phogat (1):
+
+- anv, iris: Add Wa_16011411144 for DG2
+
+Connor Abbott (3):
+
+- ir3/ra: Sanitize parallel copy flags better
+- util/bitset: Fix off-by-one in __bitset_set_range
+- ir3/lower_spill: Fix corner case with oob offsets
+
+Dave Airlie (3):
+
+- zink: workaround depth texture mode alpha.
+- lavapipe: remove broken workaround for zink depth texturing.
+- crocus: don't map scanout buffers as write-back
+
+Dylan Baker (17):
+
+- docs: add release notes for 22.0.0
+- .pick_status.json: Update to cc4f0e804e6feee17a657d052f4f2ee32ebe53d0
+- ci: Fixup some lvp expected passes
+- .pick_status.json: Update to d5870c45ae82c091e72f1258920aa54974e19a36
+- .pick_status.json: Update to dc247e5d4319b644e373534495cc75f41bc7bcd2
+- .pick_status.json: Mark dd9b8881e0ad84ab1e74d972a8233f5c03e7b37a as denominated
+- .pick_status.json: Mark 5dbbc0f0a824e4addffeb115631a9c5bcb426c29 as denominated
+- .pick_status.json: Update to acbb0d86f71c950e29df70e357ae08e5ca903a49
+- .pick_status.json: Update
+- pick/ui: Fix mypy issue
+- pick/core: drop the main_sha field
+- pick/core: Add proper type annotation for update_commits callback
+- pick/core: Add a method for updating commits
+- pick/core: Add a MANUAL_RESOLUTION resolution
+- pick/ui: correctly handle MANUAL_RESOLUTION
+- core: don't pass the ui back into commit.apply
+- .pick_status.json: Update to 8991e646411b73c1e03278267c80758e921f2352
+
+Erik Faye-Lund (1):
+
+- docs: fixup zink gl 4.3 requirements
+
+Gert Wollny (1):
+
+- virgl: Fix texture transfers by using a staging resource
+
+Icecream95 (1):
+
+- panfrost: Don't initialise the trampolines array
+
+Jason Ekstrand (3):
+
+- lavapipe: Reset the free_cmd_buffers list in TrimCommandPool
+- anv: Allow MSAA resolve with different numbers of planes
+- spirv: Properly mangle generic pointers
+
+Jonathan Gray (1):
+
+- util: fix msvc build
+
+Kenneth Graunke (1):
+
+- iris: Fix MOCS for copy regions
+
+Lionel Landwerlin (2):
+
+- anv: emit timestamp & availability using the same part of CS
+- anv: flush tile cache with query copy command
+
+Marek Olšák (1):
+
+- amd: add support for gfx1036 and gfx1037 chips
+
+Mike Blumenkrantz (23):
+
+- llvmpipe: fix debug print iterating in set_framebuffer_state
+- lavapipe: clamp clear attachments rects
+- llvmpipe: clamp surface clear geometry
+- zink: map R8G8B8X8_SRGB -> R8G8B8A8_SRGB
+- lavapipe: update multisample state after blend state
+- lavapipe: fix pipeline creation for blend and zs states
+- aux/trace: rzalloc the context struct
+- zink: lower dmod on AMD hardware
+- zink: use 64bit mask for xfb analysis
+- zink: store the correct number of components for xfb packing outputs
+- zink: correctly set xfb packed output offsets
+- lavapipe: use the correct value for dynamic render resolve attachment indexing
+- lavapipe: skip format checks for EXTENDED_USAGE
+- lavapipe: run nir_opt_copy_prop_vars during optimization loop
+- anv: fix xfb usage with rasterizer discard
+- anv: fix CmdSetColorWriteEnableEXT for maximum rts
+- anv: fix some dynamic rasterization discard cases in pipeline construction
+- lavapipe: always clone shader nir for shader states
+- gallivm: fix oob image detection for cube/1dArray/2dArray/cubeArray
+- llvmpipe: fix occlusion queries with early depth test
+- zink: force-add usage when adding last-ref tracking
+- zink: only update usage on buffer rebind if rebinds occurred
+- nir/lower_is_helper_invocation: create load_helper_invocation instr with bitsize=1
+
+Pierre-Eric Pelloux-Prayer (2):
+
+- util/slab: add slab_zalloc
+- radeonsi: don't clear framebuffer.state before dcc decomp
+
+Rob Clark (2):
+
+- mesa: Fix discard_framebuffer for fbo vs winsys
+- freedreno/ir3: Don't try re-swapping cat3 srcs
+
+Sagar Ghuge (2):
+
+- intel/fs: Add Wa_22013689345
+- intel/fs: Add Wa_14014435656
+
+Samuel Pitoiset (1):
+
+- radv: add reference counting for descriptor set layouts
+
+Stefan Dirsch (1):
+
+- meson: restore private requires to libdrm in dri.pc file

docs/relnotes/22.0.2.rst

@@ -0,0 +1,293 @@
+Mesa 22.0.2 Release Notes / 2022-04-21
+======================================
+
+Mesa 22.0.2 is a bug fix release which fixes bugs found since the 22.0.1 release.
+
+Mesa 22.0.2 implements the OpenGL 4.6 API, but the version reported by
+glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) /
+glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used.
+Some drivers don't support all the features required in OpenGL 4.6. OpenGL
+4.6 is **only** available if requested at context creation.
+Compatibility contexts may report a lower version depending on each driver.
+
+Mesa 22.0.2 implements the Vulkan 1.2 API, but the version reported by
+the apiVersion property of the VkPhysicalDeviceProperties struct
+depends on the particular driver being used.
+
+SHA256 checksum
+---------------
+
+::
+
+    TBD.
+
+
+New features
+------------
+
+- None
+
+
+Bug fixes
+---------
+
+- Vulkan::Calling vkWaitForFences Timeout
+- Intel (CHT) - Uplink text rendering bugged out in Mesa 22.0
+- gen9atom gpu hang on dEQP-VK.spirv_assembly.instruction.graphics.float16.arithmetic_1
+- bad memory managment on panfrost RK3399 -  cannot alocate more ram - fury unleashed
+- [Intel, Iris] Broken rendering in Ryujinx on Tigerlake
+- intel: integer_mad_hi / integer_mad_sat / integer_mul_hi produce invalid results
+- Textures colors distortion in "Black Geyser: Couriers of Darkness" with radeonsi
+- ShaderStorageBlocksWriteAccess not set for spir-v shaders?
+- radeonsi dEQP-GLES3.functional.buffer.map.write.explicit_flush.* flake crashes
+- radv: nir validation error with invalid array access
+- Intel Iris Xe Geometry Flickering/Assets Disappearing
+- Rendering artifacts when playing Outer Wilds [Reproducible with latest ANV driver built from main]
+- Vulkan wsi leaks vk_sync object on every wsi_AcquireNextImageKHR call
+- [bisected] panfrost(RK3399/T860): Emulationstation: broken, black or missing menus with v22.0.0
+- Plasma/KDE settings menus disappear on daily build
+- Square Artifacts Dragons Dogma
+- r300: Anmesia the dark descent corruption
+- Error compiling with LLVM-git/15
+
+
+Changes
+-------
+
+Alexey Bozhenko (1):
+
+- spirv: fix OpBranchConditional when both branches are the same
+
+Alyssa Rosenzweig (1):
+
+- panfrost: Process scissor state earlier
+
+Benjamin Cheng (1):
+
+- vulkan/queue: Destroy wait temps if they are skipped
+
+Boris Brezillon (1):
+
+- lavapipe: Don't use VK_OUTARRAY_MAKE()/vk_outarray_append()
+
+Caio Oliveira (2):
+
+- intel/fs: Initialize the sample mask in flags register when using demote
+- intel/fs: Fix IsHelperInvocation for the case no discard/demote are used
+
+Cristian Ciocaltea (1):
+
+- ci: Avoid altering EXTRA_CARGO_ARGS environment variable
+
+Daniel Schürmann (1):
+
+- aco/optimizer: fix call to can_use_opsel() in apply_insert()
+
+Danylo Piliaiev (3):
+
+- turnip: Fix the lack of WFM before indirect draws
+- turnip: enable has_ccu_flush_bug workaround for a660
+- turnip: Correctly store separate stencil in gmem store
+
+Dave Airlie (6):
+
+- radv: use flush vgt streamout like PAL does.
+- gallivm/sample: detect if rho is inf or nan and flush to zero.
+- llvmpipe: fix nr_sampler_view in key creation.
+- draw: handle tess eval shader when getting num outputs
+- u_blitter/stencil: take dstbox x/y into accounts for dst fb width
+- util/stencil: fix stencil fallback blit shader texture types.
+
+Dylan Baker (20):
+
+- docs: add sah256 sum for mesa 22.0.1
+- .pick_status.json: Update to 5a459b8f6b0b59814865bc5869a868269f8f7ebf
+- pick/core: have update_commits return the commit list
+- bin/auto-pick: Add a script that automates applying commits
+- .pick_status.json: Mark 3ef093f697ad9027ba514c7a4a6a10b7bd95bd47 as denominated
+- core: don't pass the ui back into commit.apply
+- .pick_status.json: Update to 33c800bf913771ddadb5bd632df46582f4d1c9f3
+- .pick_status.json: Update to 837f781c9a4f909ac1ee0b3b8331af87301b5fc3
+- .pick_status.json: Update to 7478b00c7cc7f7ec8cbe224ce600362f7fdb9411
+- .pick_status.json: Update to c7eaf0306876df53d3608ae3bf67afc272dcdf20
+- .pick_status.json: Mark 94706601fa2f52605d6e488f30fad9a0e2440612 as denominated
+- .pick_status.json: Mark 174d086e8c818db4522731e845bd259e2baa8830 as denominated
+- .pick_status.json: Mark 8b71118aa066ab125b7440912ed1e14da79c9451 as backported
+- .pick_status.json: Mark 4e30da7874e6586c7ac94cd34560c782d0f9678d as backported
+- .pick_status.json: Mark 7da211e24fe14d8b107461bdfcb3b8d67212f88a as backported
+- .pick_status.json: Mark 8294d454245d4318befac7c8915e55db3d47cefd as backported
+- .pick_status.json: Update to e509598470c000498c3e1328e012142d9047e292
+- .pick_status.json: Mark 2b688942c1b1f5ca4f3e4d33231579149aeb8fdb as denominated
+- .pick_status.json: Mark dd783d7144932d79ef761810d46e45c3df7148cf as denominated
+- .pick_status.json: Update to 9f44a264623461c98368185b023d99446676e039
+
+Emma Anholt (13):
+
+- r600: Update the PS state before checking for cb_misc update.
+- r600: Fix ordering of SSBO loads versus texturing.
+- r600: Add a workaround and explanation for shadowcubearray TG4.
+- vulkan: Make sure we've loaded our connectors when querying plane props.
+- st/glsl-to-tgsi: Fix handling of csel(bool, vec, vec).
+- r600: Disable SB in the presence of indirection on temp arrays.
+- r600: Disable SB when INTERP_SAMPLE is used.
+- r600: Implement memoryBarrier() in the non-SFN path.
+- nir_to_tgsi: Fix emitting the sample number for non-array MSAA image access.
+- nir_to_tgsi: Fix the address reg mapping for images and SSBOs to match G-T-T.
+- turnip: Stop allocating unused pvtmem space in the pipeline CS.
+- nir: Add lowering for fround_even on r300.
+- nouveau/nir: Fix the inverted sense of usesSampleMaskIn.
+
+Erik Faye-Lund (3):
+
+- vbo/dlist: do not try to pad an empty draw
+- d3d12: fix return-code without dxcompiler.dll
+- vulkan: explicitly cast object-type enum
+
+Francisco Jerez (1):
+
+- intel/perf: Fix OA report accumulation on Gfx12+.
+
+Georg Lehmann (7):
+
+- nir/fold_16bit_sampler_conversions: Don't fold dest upcasts.
+- radv: Add a vkCmdBuildAccelerationStructuresIndirectKHR stub.
+- radv: Add more RT pipeline stubs.
+- radv: Don't hash ycbcr sampler base object.
+- nir/fold_16bit_sampler_conversions: Fix dest type mismatches.
+- nir/fold_16bit_sampler_conversions: Fix src type mismatches.
+- radv: Enable global bo list if 1.2 features are used.
+
+Ian Romanick (3):
+
+- intel/compiler: Fix sample_d messages on DG2
+- intel/fs: Force destination types on DP4A instructions
+- nir: intel/compiler: Lower TXD on array surfaces on DG2+
+
+Icecream95 (1):
+
+- panfrost: Stop overallocating compressed textures
+
+Jason Ekstrand (7):
+
+- v3dv/queue: Rework multisync_free
+- nir: Dont set coord_components on txs
+- lavapipe: Use VK_OUTARRAY for GetPhysicalDeviceQueueFamilyProperties[2]
+- anv: Disallow blending on swizzled formats
+- nir/lower_int64: Fix [iu]mul_high handling
+- iris: Don't leak scratch BOs
+- nir/opcodes: fisfinite32 should return bool32
+
+Jordan Justen (1):
+
+- intel/dev: Add device info for RPL-P
+
+Kai Wasserbäch (2):
+
+- fix(FTBFS): clover: work around removal of PointerType::getElementType()
+- fix(clover): FTBFS: Added missing include for ConstantInt for LLVM 15
+
+Kenneth Graunke (2):
+
+- intel/compiler: Call inst->resize_sources before setting the sources
+- iris: Add pre-draw flushing for stream output targets
+
+Lionel Landwerlin (9):
+
+- anv: fix variable shadowing
+- anv: zero-out anv_batch_bo
+- anv: implement EXT_tooling_info
+- iris: don't synchronize BO for batch decoding
+- anv: disable preemption on 3DPRIMITIVE on gfx12
+- anv: fix dynamic sample locations on Gen7/7.5
+- blorp: disable depth bounds
+- intel: fix URB programming for GT1s
+- anv: allow getting the address of the beginning of the batch
+
+Marcin Ślusarz (3):
+
+- anv: fix push constant lowering for task/mesh
+- anv: invalidate all metadata in anv_nir_lower_ubo_loads
+- intel/compiler: invalidate all metadata in brw_nir_lower_intersection_shader
+
+Michael Olbrich (1):
+
+- crocus: export GEM handle with RDWR access rights
+
+Mike Blumenkrantz (29):
+
+- draw: fix gs vertex stream counting
+- radv: fix CmdSetColorWriteEnableEXT(attachmentCount==MAX_RTS)
+- draw: fix nonzero stream primitives generated queries
+- lavapipe: enforce monotonic timeline incrementing
+- zink: force push descriptors cache update if hashing detects changes
+- llvmpipe: handle sampling from 2d views of 3d images
+- zink: unset resource layout+access when doing storage setup
+- zink: adds refs to user index buffers when tc is not active
+- zink: handle 0 ubos and 0 ssbos in pipeline layout
+- zink: create pipeline layout if only bindless descriptor set is used
+- zink: fix xfb analysis variable finding for arrays
+- zink: track internal conditional render state
+- zink: flag sample locations for re-set on batch flush
+- lavapipe: fix typo in set_event execution
+- mesa/st: add special casing for pointsize constant updating during validate
+- intel/isl: fix 2d view of 3d textures
+- zink: fix max geometry input component advertising
+- nir/lower_tex: avoid adding invalid LOD to RECT textures
+- zink: use the calculated last struct member idx for ssbo size in ntv
+- zink: avoid creating ssbo variable types with multiple runtime arrays
+- nir/lower_tex: fix rect queries with lower_rect set
+- mesa/st: set normalized coords for RECT samplers if rects are unsupported
+- zink: reject resource creation if format features don't match attachment
+- zink: unconditionally set line width on rasterizer state change
+- zink: support restart with PIPE_PRIM_LINES_ADJACENCY if ext is available
+- zink: handle device-local unsynchronized maps
+- util/draw: fix map size of indirect buffer in util_draw_indirect_read
+- util/draw: handle draw_count=0 when reading indirect parameters
+- util/draw: fix indirect draw count readback
+
+Pavel Ondračka (1):
+
+- r300: respect output_semantic_index when writing colors
+
+Pierre-Eric Pelloux-Prayer (6):
+
+- glsl/nir/linker: update shader_storage_blocks_write_access for SPIR-V
+- gallium/u_threaded: late alloc cpu_storage
+- gallium/tc: warn if an app is incompatible with cpu_storage
+- gallium/tc: zero alloc transfers
+- glsl/nir/linker: fix shader_storage_blocks_write_access
+- drirc: enable radeonsi_zerovram for Black Geyser
+
+Qiang Yu (1):
+
+- nir/linker: disable varying from uniform lowering by default
+
+Rohan Garg (1):
+
+- iris: set a default EDSC flag
+
+Samuel Pitoiset (8):
+
+- radv,drirc: move RADV workarounds to 00-radv-defaults.conf
+- radv: disable DCC for Fable Anniversary, Dragons Dogma, GTA IV and more
+- radv: enable radv_disable_aniso_single_level for DXVK/vkd3d
+- radv: fix cleaning the image view for CmdCopyImageToBuffer()
+- radv: save/restore the stencil write mask during internal driver operations
+- radv: suspend/resume queries during internal driver operations
+- radv: save/restore the stencil reference during internal driver operations
+- radv: fix initializing pipeline_key::topology for GFX9 and older
+
+Sviatoslav Peleshko (1):
+
+- mesa: flush bitmap caches when changing scissors or window rects state
+
+Timothy Arceri (1):
+
+- glsl: fix needs_lowering() call in varying packing pass
+
+Timur Kristóf (4):
+
+- aco: Fix VOP2 instruction format in visit_tex.
+- nir: Handle out of bounds access in nir_vectorize_tess_levels.
+- radv: Fix gs_vgpr_comp_cnt for NGG VS without passthrough mode.
+- radv: Use correct buffer offset for conditional rendering.

docs/relnotes/22.0.3.rst

@@ -0,0 +1,201 @@
+Mesa 22.0.3 Release Notes / 2022-05-04
+======================================
+
+Mesa 22.0.3 is a bug fix release which fixes bugs found since the 22.0.2 release.
+
+Mesa 22.0.3 implements the OpenGL 4.6 API, but the version reported by
+glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) /
+glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used.
+Some drivers don't support all the features required in OpenGL 4.6. OpenGL
+4.6 is **only** available if requested at context creation.
+Compatibility contexts may report a lower version depending on each driver.
+
+Mesa 22.0.3 implements the Vulkan 1.2 API, but the version reported by
+the apiVersion property of the VkPhysicalDeviceProperties struct
+depends on the particular driver being used.
+
+SHA256 checksum
+---------------
+
+::
+
+    TBD.
+
+
+New features
+------------
+
+- None
+
+
+Bug fixes
+---------
+
+- freedreno: fragile location packing can break cull/clip distance
+- turnip: dEQP-VK.spirv_assembly.instruction.compute.float_controls.fp16.generated_args.* failures
+- piglit ext_image_dma_buf_import.ext_image_dma_buf_import*  regression
+- piglit ext_image_dma_buf_import.ext_image_dma_buf_import*  regression
+- Grid Autosport via proton/vulkan: glitches on the grass on amdgpu, fine on amdgpu-pro
+- [Bisected] r600: Big performance regression on some games
+- Huge amount of anon_inode:sync_file file descriptor created
+- anv regressions from commit 57445adc891 "anv: Re-enable CCS_E on TGL+"
+- NIR validation failed after nir_opt_if
+- intel: integer_mad_hi / integer_mad_sat / integer_mul_hi produce invalid results
+- Aperture Desk Job rendering artifacts Intel TGL
+- intel: integer_sub_sat produces stack corruption / OpISubBorrow compilation issue
+- r300/rv530: "Black rendering" of Baldur's Gate Dark Alliance in Xbox emulator CXBX-R under wine with Gallium Nine and RADEON_DEBUG=use_tgsi
+- radv/aco: xfb bug
+- Occasional flicker corruption in Rage 2, e.g. after loading, with ACO on RX 5700 XT
+- RADV: Quake 2 RTX v1.6.0 Corrupted Graphics
+- '../src/amd/common/ac_surface.c:1575: void ac_copy_dcc_equation(const struct radeon_info \*, ADDR2_COMPUTE_DCCINFO_OUTPUT \*, struct gfx9_meta_equation \*): assertion "dcc->equation.gfx9.num_bits <= ARRAY_SIZE(equation->u.gfx9.bit)" failed'
+
+
+Changes
+-------
+
+Chia-I Wu (1):
+
+- util: Keep quiet NaNs quiet when converting to half float.
+
+Dave Airlie (2):
+
+- llvmpipe: add user memory resources to the debug global list.
+- vulkan/wsi: keep allocate queue families in image, just don't fill them
+
+Dylan Baker (21):
+
+- docs: Add sha256sums for 22.0.2
+- .pick_status.json: Update to 5e84335fb578f03938468bb8ac0029f68349d330
+- .pick_status.json: Update to a6a4bf0f1eae36cb68d5c67653ac013fe0fbde8a
+- .pick_status.json: Update to ef9d97ec1f9d9834db3066b5a7ec67ce6d4ecd86
+- .pick_status.json: Update to f17d3a125126dd7e0f1c2072545976cec1eeb1c8
+- .pick_status.json: Update to 1dc697942af7254798f83583f5788e1abf136d27
+- .pick_status.json: Mark d5870c45ae82c091e72f1258920aa54974e19a36 as denominated
+- .pick_status.json: Mark f348103fce4484b891a58bf3147b71e3a3558135 as denominated
+- .pick_status.json: Mark a4f502de3228ec37dfcaa38225077ec3709d74ea as denominated
+- .pick_status.json: Mark 1d250b7b959d2a206280e4f83db05780a83e0927 as denominated
+- .pick_status.json: Mark 4eca6e3e5d2b9426d6357e9af1514a0c942638f0 as denominated
+- .pick_status.json: Mark 3dcb80da9d6d34e567680ef7fecd24aab4537e8a as denominated
+- .pick_status.json: Mark dd078d13cb6b445ad02087a3e80433ef053b7490 as denominated
+- .pick_status.json: Mark bbdf22ce136a7f02a8bd6c7e646d12a7e10db18d as denominated
+- .pick_status.json: Mark 8806f444a5c005d20cd4ec4ed42e508ffd9cb1da as denominated
+- .pick_status.json: Mark 373c8001d6615d70d112c7526ea4f4953257b6b9 as denominated
+- .pick_status.json: Mark a056cbc691843861da417b5bcea9f871fdceeb19 as denominated
+- .pick_status.json: Mark fc5edf9b68159288baa22c055e471de958812312 as denominated
+- .pick_status.json: Mark e509598470c000498c3e1328e012142d9047e292 as denominated
+- .pick_status.json: Update to 53a94fbdd57acbbe2bc745901cbfeca968e25273
+- .pick_status.json: Update to 2505afc430c6b151e7e4243503953ba0b0a2c842
+
+Erik Faye-Lund (3):
+
+- meson: remove unused defines
+- gallium/xlib: fix stale comment
+- mesa: add missing error-path
+
+Filip Gawin (1):
+
+- r300: Print warning when stubbing derivatives
+
+Gert Wollny (1):
+
+- r600: Allow eight bit, three channel formats for vertex buffers
+
+Icecream95 (1):
+
+- panfrost: Fix pack_32_2x16 implementation
+
+Iván Briano (1):
+
+- vulkan/wsi/wayland: Fix double free on error condition
+
+Jason Ekstrand (4):
+
+- util/set: Respect found in search_or_add_pre_hashed
+- nir: Lower all bit sizes of usub_borrow
+- vulkan: Set signals[i].stageMask = ALL_COMMANDS for QueueSubmit2 wrapping
+- spirv: Handle Op*MulExtended for non-32-bit types
+
+Jordan Justen (3):
+
+- vulkan/wsi/x11: Use atomic_int with sent_image_count
+- iris: Fix assertion meant to only target the clear-color stride
+- iris: Fix assertion meant to only target the clear-color stride
+
+Juan A. Suarez Romero (1):
+
+- mesa: unref syncobj after wait_sync
+
+Konstantin Seurer (2):
+
+- radv: Fix barriers with cp dma
+- radv: Fix lowering ignore_ray_intersection
+
+Lionel Landwerlin (6):
+
+- nir/divergence: handle load_global_block_intel
+- intel: fixup number of threads per EU on XeHP
+- anv: fix acceleration structure descriptor template writes
+- anv: skip acceleration structure in binding table emission
+- anv: fix clflush usage on utrace copy batch
+- anv: fix invalid utrace memcpy l3 config on gfx < 11
+
+Marek Olšák (3):
+
+- nir: fix an uninitialized variable valgrind warning in nir_group_loads
+- ac/surface: fix an addrlib race condition on gfx9
+- winsys/amdgpu: fix a mutex deadlock when we fail to create pipe_screen
+
+Mike Blumenkrantz (10):
+
+- wgl: support GL 4.6
+- zink: fix tcs control barriers for use without vk memory model
+- zink: fix semantics mask for compute control barriers
+- zink: add synchronization for buffer clears
+- mesa/st: clamp GL_RENDERBUFFER to GL_TEXTURE_2D for sparse queries
+- glsl/nir: set new_style_shadow for sparse tex ops as necessary
+- zink: fix group memory barrier emission
+- vulkan: bump layer api versions to current vk header version
+- llvmpipe: disable compute statistics queries if queries are disabled
+- llvmpipe: disable statistic queries during draw if queries are disabled
+
+Nanley Chery (2):
+
+- Revert "anv: Disable CCS_E for some 8/16bpp copies on TGL+"
+- iris: Return a 64B stride for clear color plane
+
+Paulo Zanoni (1):
+
+- iris: fix race condition during busy tracking
+
+Pavel Ondračka (1):
+
+- r300: set PIPE_BIND_CONSTANT_BUFFER for const_uploader
+
+Pierre-Eric Pelloux-Prayer (1):
+
+- ac/surface: adjust gfx9.pitch[*] based on surf->blk_w
+
+Samuel Pitoiset (6):
+
+- radv: only apply enable_mrt_output_nan_fixup for 32-bit float MRTs
+- aco: fix load_barycentric_at_{sample,offset} on GFX6-7
+- nir: fix marking XFB varyings as always active IO
+- nir: mark XFB varyings as unmoveable to prevent them to be remapped
+- radv: fix handling divisor == 0 with dynamic vertex input state
+- radv: enable radv_disable_sinking_load_input_fs for Grid Autosport
+
+Sviatoslav Peleshko (1):
+
+- anv: workaround apps that assume full subgroups without specifying it
+
+Tapani Pälli (1):
+
+- isl: disable mcs (and mcs+ccs) for color msaa on DG2
+
+Timothy Arceri (1):
+
+- nir: fix sorting before assigning varying driver locations
+
+Yevhenii Kolesnikov (1):
+
+- nir: Remove single-source phis before opt_if_loop_last_continue

docs/relnotes/22.0.4.rst

@@ -0,0 +1,152 @@
+Mesa 22.0.4 Release Notes / 2022-05-19
+======================================
+
+Mesa 22.0.4 is a bug fix release which fixes bugs found since the 22.0.3 release.
+
+Mesa 22.0.4 implements the OpenGL 4.6 API, but the version reported by
+glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) /
+glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used.
+Some drivers don't support all the features required in OpenGL 4.6. OpenGL
+4.6 is **only** available if requested at context creation.
+Compatibility contexts may report a lower version depending on each driver.
+
+Mesa 22.0.4 implements the Vulkan 1.2 API, but the version reported by
+the apiVersion property of the VkPhysicalDeviceProperties struct
+depends on the particular driver being used.
+
+SHA256 checksum
+---------------
+
+::
+
+    TBD.
+
+
+New features
+------------
+
+- None
+
+
+Bug fixes
+---------
+
+- turnip: gfxbench mh3.1 offscreen crash with ANGLE
+- [radv] DCC causes artifacts in Senran Kagura Shinovi Versus
+- Radeon RX 5700XT crash when using prusa-slicer
+- clover: Assertion \`NumContainedTys && "Attempting to get element type of opaque pointer"' failed
+
+
+Changes
+-------
+
+Alyssa Rosenzweig (1):
+
+- nir: Don't set writes_memory for reading XFB
+
+Chia-I Wu (1):
+
+- anv: advertise rectangularLines only for Gen10+
+
+Danylo Piliaiev (3):
+
+- tu: Fix indices of drm_msm_gem_submit_cmd when filling them
+- tu: Do not flush ccu in clear/blits during renderpass
+- pps: Open writable renderer node in DrmDevice::create
+
+Dylan Baker (17):
+
+- docs: Add sh256sum for mesa 20.0.3
+- .pick_status.json: Update to 7f91e8fad94dd34f83c6a124dbbe5d210be7715f
+- .pick_status.json: Update to 14b1ed1ce105d42652f70e2fd13c90fc4f2e7ffc
+- .pick_status.json: Mark 69e6417e19793043e4bb3cd500cfcf377bce4c03 as denominated
+- .pick_status.json: Mark c025cb9ee9d79ebfb66a577556e04deecfe012ed as denominated
+- .pick_status.json: Mark 6317f88b044501354a052064478d5b43dfe41809 as denominated
+- .pick_status.json: Mark 5ff3fa5912778adb8117fa26bfe4786b583e741b as denominated
+- .pick_status.json: Mark 9a412c10b7a96adf71c9a2ca44a0abca75de1c49 as denominated
+- .pick_status.json: Mark 0e49ef5c9f2ec34567613226ad498edca28bce88 as denominated
+- .pick_status.json: Mark ae369e9f6d4f2c826f1f2a748c32a14f9d5f1f54 as denominated
+- .pick_status.json: Update to 14b1ed1ce105d42652f70e2fd13c90fc4f2e7ffc
+- .pick_status.json: Mark 8c1d9c7b744b2e5b40fd42cfd51256b16deea6a8 as denominated
+- .pick_status.json: Mark f1d1371e512e32d03f7f54d873020e589ee67d47 as denominated
+- .pick_status.json: Update to 57293dee2b11ba7e52052edc4d0437f08db19144
+- .pick_status.json: Update to 5c90eb1c53f46e86717c6bf4d5253dd23c4dac1f
+- .pick_status.json: Mark 5a3aee78cbb70918b413cdd40dffcae7c9e97d8c as denominated
+- ci: Some panfrost tests are unexpectedly passing.
+
+Georg Lehmann (1):
+
+- nir/opt_algebraic: Fix mask in shift by constant combining.
+
+Icecream95 (6):
+
+- nir/lower_tex: Copy more fields in lower_tex_to_txd and friends
+- pan/mdg: Keep min_bound at 16 when alignment requires it
+- pan/mdg: Use MAX2 to set min_alignment
+- pan/mdg: Fix mask usage when filling before a spill
+- pan/mdg: Return the instruction from mir_insert_instruction_*_scheduled
+- pan/mdg: Fix multiple spilt writes in the same bundle
+
+Jason Ekstrand (4):
+
+- vulkan/wsi: Set the right stage flags for semaphore waits
+- gallium/u_threaded_context: Use PIPE_MAX_SHADER_SAMPLER_VIEWS for sampler_buffers
+- nir/cf: Return a cursor from nir_cf_extract as well
+- nir: Preserve metadata if remove_dead_derefs makes no progress
+
+Lionel Landwerlin (4):
+
+- nir/cf: return cursor after insertion of cf_list
+- nir/lower_shader_calls: don't use nop instructions as cursors
+- nir/lower_shader_calls: don't insert code after break/continue
+- nir/lower_shader_calls: put inserted instructions into a dummy block
+
+Marcin Ślusarz (2):
+
+- anv: update task/mesh distribution with the recommended values
+- anv: disable streamout before emitting mesh shading state
+
+Marek Olšák (2):
+
+- ac/llvm: set the correct cache policy for sparse buffer loads
+- radeonsi: fix a crash when failing to create a context
+
+Mike Blumenkrantz (14):
+
+- util/blitter: fix sampler restore with 0 saved samplers
+- st/draw_feedback: set constant buffer stride
+- llvmpipe: always set ssbo data pointers for draw
+- gallivm: fix oob txf swizzling
+- zink: fix up sparse texture sampling for shadow samplers
+- zink: clamp out min_lod operands for explicit lod ops
+- zink: fix sparse binding for arrayed textures
+- zink: fix sparse texture depth calcs for arrayed textures
+- zink: remove refs from shader images
+- zink: reuse local res pointer in set_shader_images
+- zink: simplify dumb update flagging in set_shader_images
+- zink: read shader image r/w usage from incoming data struct
+- zink: copy incoming shader image struct after doing updates
+- zink: stop leaking shader image surfaces
+
+Pavel Ondračka (1):
+
+- r300: guard for unsigned underflow when unrolling loops
+
+Pierre-Eric Pelloux-Prayer (2):
+
+- radeonsi: don't use wave32 for GE on gfx10 if culling is used
+- amd: fix ac_build_mbcnt_add in wave32 mode
+
+Rhys Perry (1):
+
+- aco/ra: fix vgpr_limit
+
+Samuel Pitoiset (3):
+
+- radv: re-emit dynamic line stipple state if the primitive topology changed
+- radv: disable instance packing to fix pipeline query stats
+- radv: disable DCC for Senra Kagura Shinovi Versus
+
+Thomas Debesse (1):
+
+- gallium/clover: pass -no-opaque-pointers to Clang

docs/relnotes/22.0.5.rst

@@ -0,0 +1,139 @@
+Mesa 22.0.5 Release Notes / 2022-06-01
+======================================
+
+Mesa 22.0.5 is a bug fix release which fixes bugs found since the 22.0.4 release.
+
+Mesa 22.0.5 implements the OpenGL 4.6 API, but the version reported by
+glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) /
+glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used.
+Some drivers don't support all the features required in OpenGL 4.6. OpenGL
+4.6 is **only** available if requested at context creation.
+Compatibility contexts may report a lower version depending on each driver.
+
+Mesa 22.0.5 implements the Vulkan 1.2 API, but the version reported by
+the apiVersion property of the VkPhysicalDeviceProperties struct
+depends on the particular driver being used.
+
+SHA256 checksum
+---------------
+
+::
+
+    TBD.
+
+
+New features
+------------
+
+- None
+
+
+Bug fixes
+---------
+
+- nir_lower_phis_to_regs_block: Assertion \`src->src.is_ssa' failed.
+- Build failure on sparc
+- Signal 6 (Aborted) when opening GTK3 applications
+- radv: Conditional rendering on compute queue
+- anv: line failure
+- panfrost midgard - major issues with MelonDS emulator - not able to trace properly too
+- Nheko misrendering on RK3399 (Mali T860)
+
+
+Changes
+-------
+
+Daniel Schürmann (1):
+
+- aco: fix spilling of phis without temp operands
+
+Dave Airlie (2):
+
+- meson: add build-id to pipe libraries
+- lavapipe: fix depth bias offset flag enables.
+
+Dylan Baker (6):
+
+- docs: add sha256sum to 22.0.4 notes
+- .pick_status.json: Update to 95d4e5435bf63239105a50370ebbbbdeb7fed2f8
+- .pick_status.json: Update to ee2278de654853f1d6107e6ef6fc8537a668866e
+- .pick_status.json: Update to 9773ed1dc74b98019640d909cdc2b5d6cffae85a
+- .pick_status.json: Update to 5067a26f4432ae5e9690e70ef2498ea24798593e
+- .pick_status.json: Update to 1c63a0beafefccec599ddbe355ec5a8b61df6438
+
+Erik Faye-Lund (4):
+
+- editorconfig: remove scons-ism
+- editorconfig: remove html-rule
+- editorconfig: remove m4-rule
+- editorconfig: remove pl-rule
+
+Filip Gawin (1):
+
+- r300: keep negation if w is an inline constant
+
+Hans-Kristian Arntzen (1):
+
+- radv: Fix RTPSO hashing of pGroups.
+
+Icecream95 (5):
+
+- panfrost: Copy blend constant into variant even when reusing it
+- nir: Add store_combined_output_pan BASE back
+- pan/bi: Read base for combined stores
+- pan/mdg: Read base for combined stores
+- panfrost: Only write depth / stencil once if MRT is used
+
+Jason Ekstrand (6):
+
+- intel/fs: Copy color_outputs_valid into wm_prog_data
+- anv: Drop alpha_to_coverage from the NULL FS optimization
+- anv: Handle the null FS optimization after compiling shaders
+- anv: Don't disable the fragment shader if XFB is enabled
+- nir: Handle register sources in lower_phis_to_regs_block
+- glsl/nir: Stop leaking varyings_info
+
+Matt Turner (1):
+
+- mesa: Drop dead #include "sparc/sparc.h"
+
+Michael Skorokhodov (1):
+
+- anv: Update line range
+
+Mike Blumenkrantz (13):
+
+- spirv: fix barrier scope assert
+- zink: only reject non-blittable resource creation if it has no other binds
+- zink: add extra validation for resource creation
+- zink: remove input attachment usage when pruning surface usage
+- zink: add extended usage and retry if resource creation fails
+- zink: fix surface/bufferview cache comparisons
+- zink: force render target usage for sampler-only resources
+- zink: fix non-dynamic vertex stride update flagging
+- turnip: fix assert for max xfb outputs
+- zink: require draw params ext/cap in ntv if drawid is used
+- zink: emit spirv cap for subgroup vote ops
+- zink: drop wideLines requirement
+- zink: drop largePoints requirement
+
+Pierre-Eric Pelloux-Prayer (2):
+
+- glx: set max values for pbuffer width / height
+- radeonsi: don't use sel->nir in si_check_blend_dst_sampler_noop
+
+Qiang Yu (1):
+
+- radeonsi: lower nir_intrinsic_sparse_residency_code_and
+
+Rhys Perry (1):
+
+- aco: fix p_constaddr with a non-zero offset
+
+Samuel Pitoiset (1):
+
+- radv: fix writing buffer markers with non-zero memory offset
+
+Timur Kristóf (1):
+
+- radv: Implement conditional rendering for async compute queue.

docs/relnotes/22.1.1.rst

@@ -0,0 +1,168 @@
+Mesa 22.1.1 Release Notes / 2022-06-01
+======================================
+
+Mesa 22.1.1 is a bug fix release which fixes bugs found since the 22.1.0 release.
+
+Mesa 22.1.1 implements the OpenGL 4.6 API, but the version reported by
+glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) /
+glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used.
+Some drivers don't support all the features required in OpenGL 4.6. OpenGL
+4.6 is **only** available if requested at context creation.
+Compatibility contexts may report a lower version depending on each driver.
+
+Mesa 22.1.1 implements the Vulkan 1.2 API, but the version reported by
+the apiVersion property of the VkPhysicalDeviceProperties struct
+depends on the particular driver being used.
+
+SHA256 checksum
+---------------
+
+::
+
+    TBD.
+
+
+New features
+------------
+
+- None
+
+
+Bug fixes
+---------
+
+- nir_lower_phis_to_regs_block: Assertion \`src->src.is_ssa' failed.
+- Build failure on sparc
+- Signal 6 (Aborted) when opening GTK3 applications
+- radv: Conditional rendering on compute queue
+- anv: line failure
+- panfrost midgard - major issues with MelonDS emulator - not able to trace properly too
+- Nheko misrendering on RK3399 (Mali T860)
+
+
+Changes
+-------
+
+Alyssa Rosenzweig (1):
+
+- pan/bi: Fix mov and pack_32_2x16
+
+Boris Brezillon (1):
+
+- dzn: Use the vk_sync_binary abstraction
+
+Charmaine Lee (1):
+
+- gallium/util: Increase the debug_flush map depth to 64
+
+Daniel Schürmann (1):
+
+- aco: fix spilling of phis without temp operands
+
+Dave Airlie (2):
+
+- lavapipe: fix depth bias offset flag enables.
+- llvmpipe: flush resources for kms swrast path.
+
+Dylan Baker (8):
+
+- docs: add release notes for 22.1.0
+- VERSION: bump for 22.1.0 final
+- relnotes: Add sha256sum and fix minor formatting issues
+- .pick_status.json: Update to 8b13ee75ba9f27ceac6b6180ca05d321caa13612
+- .pick_status.json: Update to 95d4e5435bf63239105a50370ebbbbdeb7fed2f8
+- .pick_status.json: Update to ee2278de654853f1d6107e6ef6fc8537a668866e
+- .pick_status.json: Update to 9773ed1dc74b98019640d909cdc2b5d6cffae85a
+- .pick_status.json: Update to 5067a26f4432ae5e9690e70ef2498ea24798593e
+
+Erik Faye-Lund (4):
+
+- editorconfig: remove scons-ism
+- editorconfig: remove html-rule
+- editorconfig: remove m4-rule
+- editorconfig: remove pl-rule
+
+Filip Gawin (1):
+
+- r300: keep negation if w is an inline constant
+
+Hans-Kristian Arntzen (1):
+
+- radv: Fix RTPSO hashing of pGroups.
+
+Icecream95 (5):
+
+- panfrost: Copy blend constant into variant even when reusing it
+- nir: Add store_combined_output_pan BASE back
+- pan/bi: Read base for combined stores
+- pan/mdg: Read base for combined stores
+- panfrost: Only write depth / stencil once if MRT is used
+
+Jason Ekstrand (8):
+
+- radv: Add a sqtt entrypoint for CmdBindVertexBuffers2
+- intel/fs: Copy color_outputs_valid into wm_prog_data
+- anv: Drop alpha_to_coverage from the NULL FS optimization
+- anv: Handle the null FS optimization after compiling shaders
+- anv: Don't disable the fragment shader if XFB is enabled
+- nir: Handle register sources in lower_phis_to_regs_block
+- glsl/nir: Stop leaking varyings_info
+- nir: Mark negative re-distribution on fadd as imprecise
+
+Konstantin Seurer (1):
+
+- radv: Fix handling of primitiveOffset
+
+Matt Turner (1):
+
+- mesa: Drop dead #include "sparc/sparc.h"
+
+Michael Skorokhodov (1):
+
+- anv: Update line range
+
+Mike Blumenkrantz (10):
+
+- turnip: fix assert for max xfb outputs
+- zink: use a zink_render_pass_pipeline_state bit for fbfetch
+- zink: add renderpass bits for color/depth r/w
+- zink: only warn once for SRGB fb without KHR_swapchain_mutable_format
+- zink: require draw params ext/cap in ntv if drawid is used
+- zink: emit spirv cap for subgroup vote ops
+- st/pbo_compute: use different calc for non-3d compute buffer sizing
+- zink: make swapchain kill message more descriptive
+- zink: drop wideLines requirement
+- zink: drop largePoints requirement
+
+Pierre-Eric Pelloux-Prayer (1):
+
+- radeonsi: don't use sel->nir in si_check_blend_dst_sampler_noop
+
+Qiang Yu (1):
+
+- radeonsi: lower nir_intrinsic_sparse_residency_code_and
+
+Rhys Perry (2):
+
+- aco: fix p_constaddr with a non-zero offset
+- aco/ra: fix usage of invalidated iterator
+
+Samuel Pitoiset (1):
+
+- radv: fix writing buffer markers with non-zero memory offset
+
+Timur Kristóf (2):
+
+- radv: Implement conditional rendering for async compute queue.
+- radv: Disable predication for supass clear and image clears.
+
+Yogesh Mohan Marimuthu (1):
+
+- vulkan/wsi: fix extra free if buffer_blit_queue
+
+Zack Rusin (4):
+
+- svga: Don't try to build x86/x64 assembly on different arch's
+- svga: finish readbacks before mapping resources
+- svga: Use direct maps when GB objects are present
+- svga: Add support for SVGAv3

meson.build

@@ -213,6 +213,12 @@ gallium_drivers = get_option('gallium-drivers')
 if gallium_drivers.contains('auto')
   if amber
     gallium_drivers = []
+    if with_dri_i915
+      warning('End user should use i915g. i915 should only be used for regression testing.')
+    endif
+    if with_dri_i965
+      warning('End user should use crocus or iris. i965 should only be used for regression testing.')
+    endif
   elif system_has_kms_drm
     # TODO: PPC, Sparc
     if ['x86', 'x86_64'].contains(host_machine.cpu_family())

meson_options.txt

@@ -537,5 +537,5 @@ option(
   'amber',
   type : 'boolean',
   value : false,
-  description : 'Configure LTS build to coexist with Mesa >= 22.0'
+  description : 'Configure build for legacy devices (coexist with Mesa >= 22.0)'
 )

src/amd/ci/gitlab-ci.yml

@@ -1,103 +0,0 @@
-.test-radv:
-  extends:
-    - .test-vk
-    - .radv-rules
-  variables:
-    VK_DRIVER: radeon
-    DRIVER_NAME: radv
-    ACO_DEBUG: validateir,validatera
-    MESA_VK_IGNORE_CONFORMANCE_WARNING: 1
-
-radv-navy_flounder-vkd3d-proton:
-  extends:
-    - .test-radv
-    - .vkd3d-proton-test
-    - .test-manual
-  variables:
-    VKD3D_PROTON_RESULTS: "navy_flounder"
-  tags:
-    - amdgpu:codename:NAVY_FLOUNDER
-
-radv-navy_flounder-traces:
-  extends:
-    - .test-radv
-    - .piglit-traces-test
-    - .test-manual
-  variables:
-    PIGLIT_REPLAY_DESCRIPTION_FILE: "${CI_PROJECT_DIR}/install/traces-radv.yml"
-    PIGLIT_REPLAY_DEVICE_NAME: "vk-amd-navy_flounder"
-    PIGLIT_REPLAY_GFXRECON_REPLAY_EXTRA_ARGS: "-m rebind"
-    PIGLIT_RESULTS: "radv-navy_flounder-replay"
-  tags:
-    - amdgpu:codename:NAVY_FLOUNDER
-
-radv-raven-traces:
-  extends:
-    - .test-radv
-    - .piglit-traces-test
-    - .test-manual
-  variables:
-    PIGLIT_REPLAY_DESCRIPTION_FILE: "${CI_PROJECT_DIR}/install/traces-radv.yml"
-    PIGLIT_REPLAY_DEVICE_NAME: "vk-amd-raven"
-    PIGLIT_RESULTS: "radv-raven-replay"
-  tags:
-    - amdgpu:codename:RAVEN
-
-# Can only be triggered manually on personal branches because RADV is the only
-# driver that does Vulkan testing at the moment.
-radv_polaris10_vkcts:
-  extends:
-    - .deqp-test-vk
-    - .test-radv
-    - .test-manual
-  variables:
-    GPU_VERSION: radv-polaris10-aco
-  tags:
-    - polaris10
-
-# Run three jobs in parallel each running 1/30th of the test suite
-radv_stoney_vkcts:amd64:
-  extends:
-    - .lava-test:amd64
-    - .radv-rules
-  parallel: 3
-  variables:
-    DEQP_VER: vk
-    DEQP_FRACTION: 10
-    FDO_CI_CONCURRENT: 4
-    DEQP_EXPECTED_RENDERER: STONEY
-    DEVICE_TYPE: hp-11A-G6-EE-grunt
-    DTB: ""
-    GPU_VERSION: radv-stoney-aco
-    BOOT_METHOD: depthcharge
-    KERNEL_IMAGE_TYPE: ""
-    HWCI_KERNEL_MODULES: amdgpu
-    HWCI_FREQ_MAX: "true"
-    VK_DRIVER: radeon
-    DRIVER_NAME: radv
-  tags:
-    - mesa-ci-x86-64-lava-hp-11A-G6-EE-grunt
-
-radv-fossils:
-  extends:
-    - .fossilize-test
-    - .test-radv
-  script:
-    # Pitcairn (GFX6)
-    - export RADV_FORCE_FAMILY="pitcairn"
-    - ./install/fossilize-runner.sh
-    # Bonaire (GFX7)
-    - export RADV_FORCE_FAMILY="bonaire"
-    - ./install/fossilize-runner.sh
-    # Polaris10 (GFX8)
-    - export RADV_FORCE_FAMILY="polaris10"
-    - ./install/fossilize-runner.sh
-    # Vega10 (GFX9)
-    - export RADV_FORCE_FAMILY="vega10"
-    - ./install/fossilize-runner.sh
-    # Navi10 (GFX10)
-    - export RADV_FORCE_FAMILY="navi10"
-    - ./install/fossilize-runner.sh
-    # Sienna Cichlid (GFX10)
-    - export RADV_FORCE_FAMILY="sienna_cichlid"
-    - ./install/fossilize-runner.sh

src/amd/ci/traces-radv.yml

@@ -1,22 +0,0 @@
-traces-db:
-  download-url: "https://minio-packet.freedesktop.org/mesa-tracie-public/"
-
-traces:
-  - path: KhronosGroup-Vulkan-Tools/amd/polaris10/vkcube.gfxr
-    expectations:
-      - device: vk-amd-navy_flounder
-        checksum: 03f3a03ca175e8a05c4a2b6cff5c568c
-      - device: vk-amd-raven
-        checksum: 45f9a89c7eabdaee5bc52ad4f45e598f
-  - path: LunarG-VulkanSamples/amd/polaris10/Hologram:-w:640:-h:480.gfxr
-    expectations:
-      - device: vk-amd-navy_flounder
-        checksum: 77c449653e2af0f41272dca8daa9ae30
-      - device: vk-amd-raven
-        checksum: 7bc6948ef0388ae6ba368048c0eb6fed
-  - path: Wicked-Engine/Tests:Cloth_Physics_Test.trace-dxgi
-    expectations:
-      - device: vk-amd-navy_flounder
-        checksum: 09a2bb4296fdff3e15b6127cb66e6f21
-      - device: vk-amd-raven
-        checksum: 8515e09da1ea4d949468046af71ca06c

src/broadcom/ci/gitlab-ci.yml

@@ -1,137 +0,0 @@
-.vc4-rpi3-test:armhf:
-  extends:
-    - .baremetal-test-armhf
-    - .vc4-rules
-    - .use-debian/arm_test
-  variables:
-    BM_BOOTFS: /boot/raspberrypi_armhf
-    BM_ROOTFS: /rootfs-armhf
-    GPU_VERSION: vc4-rpi3
-    HWCI_KERNEL_MODULES: vc4
-    FLAKES_CHANNEL: "#videocore-ci"
-  script:
-    - ./install/bare-metal/poe-powered.sh
-  needs:
-    - job: debian/arm_test
-      artifacts: false
-    - debian-armhf
-  tags:
-    - igalia-rpi3
-
-vc4-rpi3-gles:armhf:
-  extends:
-    - .vc4-rpi3-test:armhf
-  parallel: 2
-  variables:
-    HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
-    DEQP_SUITE: vc4-rpi3-gles
-
-vc4-rpi3-egl:armhf:
-  extends:
-    - .vc4-rpi3-test:armhf
-  variables:
-    HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
-    HWCI_START_XORG: 1
-    DEQP_RUNNER_OPTIONS: "--tests-per-group 250"
-    DEQP_VER: egl
-
-.vc4-rpi3-piglit:armhf:
-  extends:
-    - .piglit-test
-    - .vc4-rpi3-test:armhf
-    - .test-manual
-  variables:
-    HWCI_TEST_SCRIPT: "/install/piglit/piglit-runner.sh"
-    BM_POE_TIMEOUT: 180
-    HWCI_START_XORG: 1
-    PIGLIT_PLATFORM: mixed_glx_egl
-
-vc4-rpi3-piglit-quick_gl:armhf:
-  extends:
-    - .vc4-rpi3-piglit:armhf
-  parallel: 4
-  variables:
-    FDO_CI_CONCURRENT: 1
-    PIGLIT_PROFILES: quick_gl
-
-vc4-rpi3-piglit-quick_shader:armhf:
-  extends:
-    - .vc4-rpi3-piglit:armhf
-  parallel: 2
-  variables:
-    FDO_CI_CONCURRENT: 2
-    PIGLIT_PROFILES: quick_shader
-
-.v3d-rpi4-test:armhf:
-  extends:
-    - .baremetal-test-armhf
-    - .v3d-rules
-    - .use-debian/arm_test
-  variables:
-    HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
-    BM_BOOTFS: /boot/raspberrypi_armhf
-    BM_POE_TIMEOUT: 300
-    BM_ROOTFS: /rootfs-armhf
-    FLAKES_CHANNEL: "#videocore-ci"
-    GPU_VERSION: v3d-rpi4
-    HWCI_KERNEL_MODULES: v3d,vc4
-  script:
-    - ./install/bare-metal/poe-powered.sh
-  needs:
-    - debian/arm_test
-    - debian-armhf
-  tags:
-    - igalia-rpi4
-
-v3d-rpi4-gles:armhf:
-  extends:
-    - .v3d-rpi4-test:armhf
-  parallel: 8
-  variables:
-    DEQP_SUITE: v3d-rpi4-gles
-
-v3d-rpi4-egl:armhf:
-  extends:
-    - .v3d-rpi4-test:armhf
-  variables:
-    HWCI_START_XORG: 1
-    DEQP_VER: egl
-
-v3d-rpi4-piglit:armhf:
-  extends:
-    - .piglit-test
-    - .v3d-rpi4-test:armhf
-  parallel: 4
-  variables:
-    HWCI_TEST_SCRIPT: "/install/piglit/piglit-runner.sh"
-    HWCI_START_XORG: 1
-    PIGLIT_PLATFORM: mixed_glx_egl
-    PIGLIT_PROFILES: all
-
-v3dv-rpi4-vk:arm64:
-  extends:
-    - .baremetal-test
-    - .use-debian/arm_test
-    - .v3dv-rules
-  parallel: 8
-  variables:
-    HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
-    BM_BOOTFS: /boot/raspberrypi_arm64
-    BM_POE_TIMEOUT: 300
-    BM_ROOTFS: /rootfs-arm64
-    DEQP_EXPECTED_RENDERER: "V3D.4.2"
-    DEQP_FRACTION: 5
-    DEQP_VER: vk
-    FLAKES_CHANNEL: "#videocore-ci"
-    GPU_VERSION: v3dv-rpi4
-    HWCI_KERNEL_MODULES: v3d,vc4
-    MINIO_ARTIFACT_NAME: mesa-arm64
-    VK_DRIVER: broadcom
-  script:
-    - ./install/bare-metal/poe-powered.sh
-  needs:
-    - debian/arm_test
-    - job: debian-arm64
-      artifacts: false
-  tags:
-    - igalia-rpi4

src/compiler/glsl/glsl_lexer.ll

@@ -536,10 +536,10 @@ uimage2DArray   TYPE_WITH_ALT(130, 300, 420, 310, yyextra->ARB_shader_image_load
 uimageCubeArray TYPE_WITH_ALT(130, 300, 420, 320, yyextra->ARB_shader_image_load_store_enable || yyextra->EXT_shader_image_load_store_enable || yyextra->OES_texture_cube_map_array_enable || yyextra->EXT_texture_cube_map_array_enable, glsl_type::uimageCubeArray_type);
 uimage2DMS      TYPE_WITH_ALT(130, 300, 420, 0, yyextra->ARB_shader_image_load_store_enable || yyextra->EXT_shader_image_load_store_enable, glsl_type::uimage2DMS_type);
 uimage2DMSArray TYPE_WITH_ALT(130, 300, 420, 0, yyextra->ARB_shader_image_load_store_enable || yyextra->EXT_shader_image_load_store_enable, glsl_type::uimage2DMSArray_type);
-image1DShadow           KEYWORD(130, 300, 0, 0, IMAGE1DSHADOW);
-image2DShadow           KEYWORD(130, 300, 0, 0, IMAGE2DSHADOW);
-image1DArrayShadow      KEYWORD(130, 300, 0, 0, IMAGE1DARRAYSHADOW);
-image2DArrayShadow      KEYWORD(130, 300, 0, 0, IMAGE2DARRAYSHADOW);
+image1DShadow           KEYWORD(130, 0, 420, 0, IMAGE1DSHADOW);
+image2DShadow           KEYWORD(130, 0, 420, 0, IMAGE2DSHADOW);
+image1DArrayShadow      KEYWORD(130, 0, 420, 0, IMAGE1DARRAYSHADOW);
+image2DArrayShadow      KEYWORD(130, 0, 420, 0, IMAGE2DARRAYSHADOW);
 
 coherent       KEYWORD_WITH_ALT(420, 300, 420, 310, yyextra->ARB_shader_image_load_store_enable || yyextra->EXT_shader_image_load_store_enable || yyextra->ARB_shader_storage_buffer_object_enable, COHERENT);
 volatile       KEYWORD_WITH_ALT(110, 100, 420, 310, yyextra->ARB_shader_image_load_store_enable || yyextra->EXT_shader_image_load_store_enable || yyextra->ARB_shader_storage_buffer_object_enable, VOLATILE);

src/compiler/nir/nir.h

@@ -5108,6 +5108,7 @@ typedef struct nir_lower_tex_options {
    unsigned lower_y41x_external;
    unsigned bt709_external;
    unsigned bt2020_external;
+   unsigned yuv_full_range_external;
 
    /**
     * To emulate certain texture wrap modes, this can be used

src/compiler/nir/nir_lower_tex.c

@@ -33,6 +33,8 @@
  *     inserts instructions to clamp specified coordinates to [0.0, 1.0].
  *     Note that this automatically triggers texture projector lowering if
  *     needed, since clamping must happen after projector lowering.
+ *   + YUV-to-RGB conversion: to allow sampling YUV values as RGB values
+ *     according to a specific YUV color space and range.
  */
 
 #include "nir.h"
@@ -44,30 +46,54 @@ typedef struct nir_const_value_3_4 {
    nir_const_value v[3][4];
 } nir_const_value_3_4;
 
-static const nir_const_value_3_4 bt601_csc_coeffs = { {
+static const nir_const_value_3_4 bt601_limited_range_csc_coeffs = { {
    { { .f32 = 1.16438356f }, { .f32 =  1.16438356f }, { .f32 = 1.16438356f } },
    { { .f32 = 0.0f        }, { .f32 = -0.39176229f }, { .f32 = 2.01723214f } },
    { { .f32 = 1.59602678f }, { .f32 = -0.81296764f }, { .f32 = 0.0f        } },
 } };
-static const nir_const_value_3_4 bt709_csc_coeffs = { {
+static const nir_const_value_3_4 bt601_full_range_csc_coeffs = { {
+   { { .f32 = 1.0f        }, { .f32 =  1.0f        }, { .f32 = 1.0f        } },
+   { { .f32 = 0.0f        }, { .f32 = -0.34413629f }, { .f32 = 1.772f      } },
+   { { .f32 = 1.402f      }, { .f32 = -0.71413629f }, { .f32 = 0.0f        } },
+} };
+static const nir_const_value_3_4 bt709_limited_range_csc_coeffs = { {
    { { .f32 = 1.16438356f }, { .f32 =  1.16438356f }, { .f32 = 1.16438356f } },
    { { .f32 = 0.0f        }, { .f32 = -0.21324861f }, { .f32 = 2.11240179f } },
    { { .f32 = 1.79274107f }, { .f32 = -0.53290933f }, { .f32 = 0.0f        } },
 } };
-static const nir_const_value_3_4 bt2020_csc_coeffs = { {
+static const nir_const_value_3_4 bt709_full_range_csc_coeffs = { {
+   { { .f32 = 1.0f        }, { .f32 =  1.0f        }, { .f32 = 1.0f        } },
+   { { .f32 = 0.0f        }, { .f32 = -0.18732427f }, { .f32 = 1.8556f     } },
+   { { .f32 = 1.5748f     }, { .f32 = -0.46812427f }, { .f32 = 0.0f        } },
+} };
+static const nir_const_value_3_4 bt2020_limited_range_csc_coeffs = { {
    { { .f32 = 1.16438356f }, { .f32 =  1.16438356f }, { .f32 = 1.16438356f } },
    { { .f32 = 0.0f        }, { .f32 = -0.18732610f }, { .f32 = 2.14177232f } },
-   { { .f32 = 1.67867411f }, { .f32 = -0.65042432f }, { .f32 = 0.0f        } },
+   { { .f32 = 1.67878795f }, { .f32 = -0.65046843f }, { .f32 = 0.0f        } },
+} };
+static const nir_const_value_3_4 bt2020_full_range_csc_coeffs = { {
+   { { .f32 = 1.0f        }, { .f32 =  1.0f        }, { .f32 = 1.0f        } },
+   { { .f32 = 0.0f        }, { .f32 = -0.16455313f }, { .f32 = 1.88140000f } },
+   { { .f32 = 1.4747f     }, { .f32 = -0.57139187f }, { .f32 = 0.0f        } },
 } };
 
-static const float bt601_csc_offsets[3] = {
+static const float bt601_limited_range_csc_offsets[3] = {
    -0.874202218f, 0.531667823f, -1.085630789f
 };
-static const float bt709_csc_offsets[3] = {
+static const float bt601_full_range_csc_offsets[3] = {
+   -0.701000000f, 0.529136286f, -0.886000000f
+};
+static const float bt709_limited_range_csc_offsets[3] = {
    -0.972945075f, 0.301482665f, -1.133402218f
 };
-static const float bt2020_csc_offsets[3] = {
-   -0.915687932f, 0.347458499f, -1.148145075f
+static const float bt709_full_range_csc_offsets[3] = {
+   -0.787400000f, 0.327724273f, -0.927800000f
+};
+static const float bt2020_limited_range_csc_offsets[3] = {
+   -0.915745075f, 0.347480639f, -1.148145075f
+};
+static const float bt2020_full_range_csc_offsets[3] = {
+   -0.737350000f, 0.367972500f, -0.940700000f
 };
 
 static bool
@@ -326,15 +352,28 @@ convert_yuv_to_rgb(nir_builder *b, nir_tex_instr *tex,
    const float *offset_vals;
    const nir_const_value_3_4 *m;
    assert((options->bt709_external & options->bt2020_external) == 0);
-   if (options->bt709_external & (1u << texture_index)) {
-      m = &bt709_csc_coeffs;
-      offset_vals = bt709_csc_offsets;
-   } else if (options->bt2020_external & (1u << texture_index)) {
-      m = &bt2020_csc_coeffs;
-      offset_vals = bt2020_csc_offsets;
+   if (options->yuv_full_range_external & (1u << texture_index)) {
+      if (options->bt709_external & (1u << texture_index)) {
+         m = &bt709_full_range_csc_coeffs;
+         offset_vals = bt709_full_range_csc_offsets;
+      } else if (options->bt2020_external & (1u << texture_index)) {
+         m = &bt2020_full_range_csc_coeffs;
+         offset_vals = bt2020_full_range_csc_offsets;
+      } else {
+         m = &bt601_full_range_csc_coeffs;
+         offset_vals = bt601_full_range_csc_offsets;
+      }
    } else {
-      m = &bt601_csc_coeffs;
-      offset_vals = bt601_csc_offsets;
+      if (options->bt709_external & (1u << texture_index)) {
+         m = &bt709_limited_range_csc_coeffs;
+         offset_vals = bt709_limited_range_csc_offsets;
+      } else if (options->bt2020_external & (1u << texture_index)) {
+         m = &bt2020_limited_range_csc_coeffs;
+         offset_vals = bt2020_limited_range_csc_offsets;
+      } else {
+         m = &bt601_limited_range_csc_coeffs;
+         offset_vals = bt601_limited_range_csc_offsets;
+      }
    }
 
    unsigned bit_size = nir_dest_bit_size(tex->dest);

src/egl/main/egldevice.c

@@ -322,7 +322,7 @@ _eglQueryDevicesEXT(EGLint max_devices,
                     _EGLDevice **devices,
                     EGLint *num_devices)
 {
-   _EGLDevice *dev, *devs;
+   _EGLDevice *dev, *devs, *swrast;
    int i = 0, num_devs;
 
    if ((devices && max_devices <= 0) || !num_devices)
@@ -333,29 +333,38 @@ _eglQueryDevicesEXT(EGLint max_devices,
    num_devs = _eglRefreshDeviceList();
    devs = _eglGlobal.DeviceList;
 
+#ifdef GALLIUM_SOFTPIPE
+   swrast = devs;
+#else
+   swrast = NULL;
+   num_devs--;
+#endif
+
+   /* The first device is swrast. Start with the non-swrast device. */
+   devs = devs->Next;
+
    /* bail early if we only care about the count */
    if (!devices) {
       *num_devices = num_devs;
       goto out;
    }
 
-   /* Push the first device (the software one) to the end of the list.
-    * Sending it to the user only if they've requested the full list.
+   *num_devices = MIN2(num_devs, max_devices);
+
+   /* Add non-swrast devices first and add swrast last.
     *
     * By default, the user is likely to pick the first device so having the
     * software (aka least performant) one is not a good idea.
     */
-   *num_devices = MIN2(num_devs, max_devices);
-
-   for (i = 0, dev = devs->Next; dev && i < max_devices; i++) {
+   for (i = 0, dev = devs; dev && i < max_devices; i++) {
       devices[i] = dev;
       dev = dev->Next;
    }
 
    /* User requested the full device list, add the sofware device. */
-   if (max_devices >= num_devs) {
-      assert(_eglDeviceSupports(devs, _EGL_DEVICE_SOFTWARE));
-      devices[num_devs - 1] = devs;
+   if (max_devices >= num_devs && swrast) {
+      assert(_eglDeviceSupports(swrast, _EGL_DEVICE_SOFTWARE));
+      devices[num_devs - 1] = swrast;
    }
 
 out:

src/egl/meson.build

@@ -27,6 +27,10 @@ link_for_egl = []
 deps_for_egl = []
 incs_for_egl = [inc_include, inc_src, inc_egl]
 
+if with_gallium_softpipe
+  c_args_for_egl += '-DGALLIUM_SOFTPIPE'
+endif
+
 files_egl = files(
   'main/eglapi.c',
   'main/eglarray.c',

src/etnaviv/ci/gitlab-ci.yml

@@ -1,36 +0,0 @@
-.etnaviv-armhf-test:
-  extends:
-    - .baremetal-test
-    - .use-debian/arm_test
-    - .etnaviv-rules
-  script:
-    - ./install/bare-metal/fastboot.sh
-  variables:
-    BM_CMDLINE: "ip=dhcp console=ttymxc0,115200n8 root=/dev/nfs rw nfsrootdebug init=/init $BM_KERNELARGS"
-    BM_KERNEL: /baremetal-files/zImage
-    BM_ROOTFS: /rootfs-armhf
-    ETNA_MESA_DEBUG: nir
-    FLAKES_CHANNEL: "#etnaviv-ci"
-    MINIO_ARTIFACT_NAME: mesa-armhf
-  needs:
-    - debian/arm_test
-    - job: debian-arm64
-      artifacts: false
-
-.etnaviv-armhf-gc2000:
-  extends:
-    - .etnaviv-armhf-test
-  variables:
-    BM_DTB: /baremetal-files/imx6q-cubox-i.dtb
-    DEQP_EXPECTED_RENDERER: GC2000
-    GPU_VERSION: "etnaviv-gc2000"
-  tags:
-    - etnaviv-gc2000
-
-gc2000_gles2:
-  extends:
-    - .etnaviv-armhf-gc2000
-    - .test-manual-mr
-  variables:
-    HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
-    DEQP_VER: gles2

src/freedreno/ci/gitlab-ci.yml

@@ -1,238 +0,0 @@
-.freedreno-test:
-  extends:
-    - .baremetal-test
-    - .use-debian/arm_test
-    - .freedreno-rules
-  variables:
-    MINIO_ARTIFACT_NAME: mesa-arm64
-    BM_ROOTFS: /rootfs-arm64
-    FLAKES_CHANNEL: "#freedreno-ci"
-    PIGLIT_PLATFORM: mixed_glx_egl
-    BM_CMDLINE: "ip=dhcp console=ttyMSM0,115200n8 root=/dev/nfs rw nfsrootdebug nfsroot=,tcp,nfsvers=4.2 init=/init $BM_KERNELARGS"
-  script:
-    - ./install/bare-metal/fastboot.sh
-  needs:
-    - debian/arm_test
-    - job: debian-arm64
-      artifacts: false
-  tags:
-    - google-freedreno-db410c
-
-.baremetal-deqp-test-freedreno-vk:
-  extends:
-    - .baremetal-deqp-test
-  variables:
-    DEQP_VER: vk
-    VK_DRIVER: freedreno
-    MESA_VK_IGNORE_CONFORMANCE_WARNING: 1
-
-.freedreno-test-traces:
-  extends:
-    - .piglit-traces-test
-  variables:
-    HWCI_TEST_SCRIPT: "/install/piglit/run.sh"
-    HWCI_START_XORG: 1
-    PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/traces-freedreno.yml"
-  artifacts:
-    reports:
-      junit: results/junit.xml
-
-.a306-test:
-  extends:
-    - .freedreno-test
-  variables:
-    BM_KERNEL: /baremetal-files/Image.gz
-    BM_DTB: /baremetal-files/apq8016-sbc.dtb
-    GPU_VERSION: freedreno-a307
-
-a306_gl:
-  extends:
-    - .baremetal-deqp-test
-    - .a306-test
-  variables:
-    DEQP_SUITE: freedreno-a307
-  parallel: 5
-
-a306-traces:
-  extends:
-    - .freedreno-test-traces
-    - .a306-test
-  variables:
-    PIGLIT_REPLAY_DEVICE_NAME: "freedreno-a306"
-    PIGLIT_RESULTS: "freedreno-a306-replay"
-
-.a530-test:
-  extends:
-    - .freedreno-test
-    - .test-manual-mr
-  variables:
-    BM_KERNEL: /baremetal-files/Image.gz
-    BM_DTB: /baremetal-files/apq8096-db820c.dtb
-    GPU_VERSION: freedreno-a530
-  tags:
-    - google-freedreno-db820c
-
-a530_gl:
-  extends:
-    - .baremetal-deqp-test
-    - .a530-test
-  variables:
-    DEQP_SUITE: freedreno-a530
-  parallel: 5
-
-.a530_piglit:
-  extends:
-    - .piglit-test
-    - .a530-test
-  variables:
-    HWCI_TEST_SCRIPT: "/install/piglit/piglit-runner.sh"
-    HWCI_START_XORG: 1
-
-# piglit_gl since it takes a bit under 20 minutes and has a lot of flakes, so
-# leave it as manual.
-a530_piglit_gl:
-  extends:
-    - .a530_piglit
-    - .test-manual-mr
-  variables:
-    PIGLIT_PROFILES: quick_gl
-
-a530_piglit_shader:
-  extends:
-    - .a530_piglit
-  parallel: 2
-  variables:
-    PIGLIT_PROFILES: quick_shader
-
-a530-traces:
-  extends:
-    - .freedreno-test-traces
-    - .a530-test
-  variables:
-    PIGLIT_REPLAY_DEVICE_NAME: "freedreno-a530"
-    PIGLIT_RESULTS: "freedreno-a530-replay"
-
-.a630-test:
-  extends:
-    - .freedreno-test
-  variables:
-    FDO_CI_CONCURRENT: 10
-    BM_KERNEL: /baremetal-files/cheza-kernel
-    BM_CMDLINE: "ip=dhcp console=ttyMSM0,115200n8 root=/dev/nfs rw nfsrootdebug nfsroot=,tcp,nfsvers=4.2 init=/init"
-    GPU_VERSION: freedreno-a630
-  tags:
-    - google-freedreno-cheza
-  script:
-    - ./install/bare-metal/cros-servo.sh
-
-a630_gl:
-  extends:
-    - .baremetal-deqp-test
-    - .a630-test
-  parallel: 4
-  variables:
-    DEQP_SUITE: freedreno-a630
-
-# Robustness tests may be disruptive to other tests, so we run EGL's robustness
-# tests separately.
-a630_egl:
-  extends:
-    - .baremetal-deqp-test
-    - .a630-test
-  variables:
-    DEQP_VER: egl
-    HWCI_START_XORG: 1
-    HWCI_TEST_SCRIPT: "/install/bare-metal/arm64_a630_egl.sh"
-
-a630_gles_asan:
-  extends:
-    - .baremetal-deqp-test
-    - .a630-test
-    - .baremetal-arm64-asan-test
-    - .test-manual
-  variables:
-    DEQP_VER: gles31
-    DEQP_FRACTION: 10
-    DEQP_EXPECTED_RENDERER: FD630
-    GPU_VERSION: freedreno-a630-asan
-
-a630_vk:
-  extends:
-    - .a630-test
-    - .baremetal-deqp-test-freedreno-vk
-  parallel: 3
-  variables:
-    DEQP_SUITE: freedreno-a630-vk
-
-a630_vk_full:
-  extends:
-    - a630_vk
-    - .test-manual-mr
-  parallel: 2
-  variables:
-    DEQP_SUITE: freedreno-a630-vk-full
-
-# Disabled by default until we can sort out what looks like timeouts before
-# getting to the first test (or is it at cleanup after tests completed?).
-# Clicking play can show you some useful areas for fixing turnip, though.
-a630_vk_asan:
-  extends:
-    - .a630-test
-    - .baremetal-deqp-test-freedreno-vk
-    - .baremetal-arm64-asan-test
-    - .test-manual
-  variables:
-    DEQP_EXPECTED_RENDERER: "Turnip Adreno (TM) 630"
-    DEQP_FRACTION: 100
-    FDO_CI_CONCURRENT: 4 # We get OOMkills if we go too wide with asan enabled
-    TU_DEBUG: forcebin
-    # Disable the leak checks, since the library gets dlclose()d and thus get
-    # totally useless leak reports.  We can still catch buffer overflows.
-    ASAN_OPTIONS: "detect_leaks=0"
-
-a630_piglit:
-  extends:
-    - .piglit-test
-    - .a630-test
-  variables:
-    HWCI_TEST_SCRIPT: "/install/piglit/piglit-runner.sh"
-    HWCI_START_XORG: 1
-    PIGLIT_PROFILES: gpu
-
-a630-traces:
-  extends:
-    - .freedreno-test-traces
-    - .a630-test
-  variables:
-    PIGLIT_REPLAY_DEVICE_NAME: "freedreno-a630"
-    PIGLIT_RESULTS: "freedreno-a630-replay"
-    # This lets us run several more traces which don't use any features we're
-    # missing.
-    MESA_GLSL_VERSION_OVERRIDE: "460"
-    MESA_GL_VERSION_OVERRIDE: "4.6"
-
-a630-traces-restricted:
-  extends:
-    - a630-traces
-    - .freedreno-rules-restricted
-  variables:
-    PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/restricted-traces-freedreno.yml"
-    PIGLIT_REPLAY_EXTRA_ARGS:  --keep-image --db-path ${CI_PROJECT_DIR}/replayer-db/ --minio_host=minio-packet.freedesktop.org --minio_bucket=mesa-tracie-private --role-session-name=${CI_PROJECT_PATH}:${CI_JOB_ID} --jwt=${CI_JOB_JWT}
-  allow_failure: true
-
-a630-traces-performance:
-  extends:
-    - a630-traces
-    - .freedreno-rules-performance
-  variables:
-    PIGLIT_REPLAY_SUBCOMMAND: "profile"
-    PIGLIT_REPLAY_EXTRA_ARGS: "--db-path ${CI_PROJECT_DIR}/replayer-db/"
-    # More than this can hit OOM due to BOs leaked during the replay of the last frame
-    PIGLIT_REPLAY_LOOP_TIMES: 150
-    # We don't want for more than one workload to be submitted to the GPU at a time
-    FDO_CI_CONCURRENT: 1
-    # So we aren't capped by VSync by the X server
-    EGL_PLATFORM: surfaceless
-    GIT_STRATEGY: none
-    HWCI_FREQ_MAX: "true"
-  allow_failure: true

src/freedreno/ci/restricted-traces-freedreno.yml

@@ -1,39 +0,0 @@
-traces-db:
-  download-url: "http://10.42.0.1:8888/cache/?uri=https://minio-packet.freedesktop.org/mesa-tracie-private/"
-
-traces:
-# Crashes
-#  - path: alien-isolation/AlienIsolation.bin.1-trim--k-f2000-v20201203.trace
-#    expectations:
-#      - device: freedreno-a630
-#        checksum: 4ae01533a347796097e3cefff10b029e
-  - path: civilization-v/CivilizationV-trim--s705-761-f762-v20201203.trace
-    expectations:
-      - device: freedreno-a630
-        checksum: 930dd4d5deb6df171235217898fa3567
-  - path: golf-with-your-friends/GolfWithYourFriends-trim--f1070-v20201203.trace
-    expectations:
-      - device: freedreno-a630
-        checksum: 1531665cf86c7e7502dcd9701def5b17
-  - path: hollow-knight/HollowKnight-trim--f2020-v20201203.trace
-    expectations:
-      - device: freedreno-a630
-        checksum: e72925568412a8ebdbac68c929972a55
-# Crashes
-#  - path: ksp/KSP-trim--f4800-v20201203.trace
-#    expectations:
-#      - device: freedreno-a630
-#        checksum: 59da6ef5c9509616d595d1613fdac42e
-  - path: overcooked2/Overcooked2-trim--f3301-v20201203.trace
-    expectations:
-      - device: freedreno-a630
-        checksum: f5cf383154f328e626baf7c4515e170b
-# Crashes
-#  - path: plaugue-inc-evolved/PlagueIncEvolved-trim--f1200-v20201203.trace
-#    expectations:
-#      - device: freedreno-a630
-#        checksum: 59da6ef5c9509616d595d1613fdac42e
-  - path: portal2/Portal2-trim--f1020-v20201203.trace
-    expectations:
-      - device: freedreno-a630
-        checksum: 636cddddf4f416585aa4d5dca795a182

src/freedreno/ci/traces-freedreno.yml

@@ -1,580 +0,0 @@
-traces-db:
-  download-url: "http://10.42.0.1:8888/cache/?uri=https://minio-packet.freedesktop.org/mesa-tracie-public/"
-
-# NOTE for faster runtime, try to sort tests so the longer running traces
-# appear first (and therefore are started first).
-#
-# Current approx durations for the longer traces (17 Jun 2021):
-#
-#   half-life-2:          37.83s
-#   portal:               16.29s
-#   counterstrike-source: 14.24s
-#   xonotic:              13.46s
-#   stk:                  11.15s
-#   0ad:                  10.93s
-#   counterstrike:         9.87s
-#   minetest:              8.24s
-#   neverball:             8.53s
-
-traces:
-  - path: valve/half-life-2-v2.trace
-    expectations:
-      # Skipped since it's slow even on a530.
-      # - device: freedreno-a306
-      #   checksum: 8f5929c82e7d990e8c3d2bea14688224
-      # 2 minutes
-      - device: freedreno-a530
-        checksum: f7e6f426d7b9c82742f00baed830797f
-      - device: freedreno-a630
-        checksum: 14f7656971b98fdaaf00bf576ada7ccf
-  - path: valve/portal-2-v2.trace
-    expectations:
-      # Skipped since it's slow even on a530.
-      # - device: freedreno-a306
-      #   checksum: a3a9e158ccf7fa5ba978e045505a060e
-      # 2 minutes
-      - device: freedreno-a530
-        checksum: 102a09ce76092436173fd09a6a2bd941
-      # Floor splatter rendering failure, probably the same alpha test issue.
-      - device: freedreno-a630
-        checksum: a3a9e158ccf7fa5ba978e045505a060e
-  - path: valve/counterstrike-source-v2.trace
-    expectations:
-      # Skipped since it's slow even on a530.
-      # - device: freedreno-a306
-      #   checksum: 4b707f385256b380c936186db8c251cb
-      # 1 minute
-      - device: freedreno-a530
-        checksum: a71d62bb2c0fabeca41468628777b441
-      - device: freedreno-a630
-        checksum: 339dce29ae08569652438116829510c7
-  - path: xonotic/xonotic-keybench-high.trace
-    expectations:
-      # Skipped since it's long on a530.
-      # - device: freedreno-a306
-      #   checksum: 0efd30250af93d0b5f03eeabd079e8ee
-      # 3 minute runtime, skip.
-      # - device: freedreno-a530
-      #   checksum: 0fcb5afdad37f08b3f5bf26fbba752c1
-      - device: freedreno-a630
-        checksum: 0efd30250af93d0b5f03eeabd079e8ee
-  - path: supertuxkart/supertuxkart-mansion-egl-gles.trace
-    expectations:
-      # Skipped since it's long on a530.
-      # - device: freedreno-a306
-      #   checksum: 1ae49af7017ae2a08fbb1caf377ada91
-      # 50 second runtime, skip
-      # - device: freedreno-a530
-      #   checksum: 1ae49af7017ae2a08fbb1caf377ada91
-      - device: freedreno-a630
-        checksum: 47016a34553e5a28e2e1e0b92d11c92f
-  - path: 0ad/0ad.trace
-    expectations:
-      # triggers hangcheck on db410c
-      # - device: freedreno-a306
-      #   checksum: ea2b03e0768e8400c0badd46e4d26087
-      # 2 minute runtime on db820c
-      # - device: freedreno-a530
-      #   checksum: b007061e6e93020ddf2aff6a0f32ed72
-      - device: freedreno-a630
-        checksum: c846e0721b7e7576e523eab6d3129e9c
-  - path: valve/counterstrike-v2.trace
-    expectations:
-# With the addition of userspace fences we start feeding the GPU fast
-# enough to hit bad behavior on kernel side with ringbuffer-full
-# situations.  Kernel side fix is WIP, disable for now.
-#      - device: freedreno-a306
-#        checksum: b4af9243e34f3de0153b6855dc9c66b6
-      # Flaky rendering (slight pixel differences around the tree alpha tests)
-      # - device: freedreno-a530
-      #   checksum: 14e78caf29b6a3341081c8f2e678355f
-      - device: freedreno-a630
-        checksum: c8608d54cc6298476a2b60686d152dbc
-  # Disabled on all devices due to:
-  # https://gitlab.freedesktop.org/mesa/mesa/-/issues/4595
-  # - path: minetest/minetest.trace
-  #   expectations:
-  #     # Started flaking and sometimes not drawing the left side of the crosshair around 2021-06-25.
-  #     # Note that the crosshair is drawn some time in the middle of the frame.
-  #     # - device: freedreno-a306
-  #     #   checksum: bd6e158327d68e69ecf5edfacc368a7b
-  #     - device: freedreno-a530
-  #       checksum: 599b00e7a443a90b0edcd06fccd1a400
-  #     - device: freedreno-a630
-  #       checksum: a71da1e8c855209d79fa8a0b83a46775
-  - path: neverball/neverball.trace
-    expectations:
-      # Skipped since it's long on a530.
-      # - device: freedreno-a306
-      #  checksum: 57fd57aef14d37043a7b56a16dbf50b6
-      # 2 minute runtime, skip it.
-      # - device: freedreno-a530
-      #   checksum: 2a53e6086588f4675ae3dcda9f26603b
-      - device: freedreno-a630
-        checksum: 7038fe16ec1483ca1f475c563afcee84
-  - path: behdad-glyphy/glyphy.trace
-    expectations:
-      - device: freedreno-a306
-        checksum: 2d4a6b609ba58cfb0df1e78ef30c7ab5
-      - device: freedreno-a530
-        checksum: 3a37faf7ec62d48dada63f157f30d876
-      - device: freedreno-a630
-        checksum: d25edb433abfcde517b626b3071906ff
-  - path: glmark2/buffer:update-fraction=0.5:update-dispersion=0.9:columns=200:update-method=map:interleave=false.trace
-    expectations:
-      - device: freedreno-a306
-        checksum: 67f73c60b3ff286b7a4a10f4c14eec8b
-      - device: freedreno-a530
-        checksum: eaee77d5109260a2c91f38e7428a9cb6
-      - device: freedreno-a630
-        checksum: e79224d7afc13318a3511b3dbdca57c1
-  - path: glmark2/buffer:update-fraction=0.5:update-dispersion=0.9:columns=200:update-method=map:interleave=true.trace
-    expectations:
-      - device: freedreno-a306
-        checksum: ec04315638a814e1bd870f52883a4564
-      - device: freedreno-a530
-        checksum: 52b81ddea38b362105b64847d64b80c9
-      - device: freedreno-a630
-        checksum: df325d374967a1508675f17d38a16a2c
-  - path: glmark2/buffer:update-fraction=0.5:update-dispersion=0.9:columns=200:update-method=subdata:interleave=false.trace
-    expectations:
-      - device: freedreno-a306
-        checksum: f03b78ff377bacd073b4bc46384c4c06
-      - device: freedreno-a530
-        checksum: 9209aa63fcc0c3608bbb0299437fd54c
-      - device: freedreno-a630
-        checksum: dc0c1f9c167427ee453019f24dddaac4
-  - path: glmark2/bump:bump-render=height.trace
-    expectations:
-      - device: freedreno-a306
-        checksum: 8ed4fa21732e57dc53dc004e572f910c
-      # a530/a630: grid-like rendering glitches since "ir3: nir_op_f2f16 should round to even"
-      - device: freedreno-a530
-        checksum: 88c1dd62b6b42b18ba35f79657ef46c8
-      - device: freedreno-a630
-        checksum: ddc2fab265aac11a971afcae8655835c
-  - path: glmark2/bump:bump-render=high-poly.trace
-    expectations:
-      - device: freedreno-a306
-        checksum: 5513a099b67446a365f9899bb9b226fb
-      - device: freedreno-a530
-        checksum: 5d3a8c494789e48fecd99cdf55e1506f
-      - device: freedreno-a630
-        checksum: 5d3a8c494789e48fecd99cdf55e1506f
-  - path: glmark2/bump:bump-render=normals.trace
-    expectations:
-      - device: freedreno-a306
-        checksum: c4baca790e93ba5198352d45937adc01
-      - device: freedreno-a530
-        checksum: 9298dc5a65182a7c3441882d46fee6f9
-      - device: freedreno-a630
-        checksum: edef28326ed7a4121791d84862fa8b08
-  - path: glmark2/conditionals:vertex-steps=0:fragment-steps=0.trace
-    expectations:
-      - device: freedreno-a306
-        checksum: b613d2ade6b0db2ca253fd7763115b1f
-      # Incorrect rendering on a530/a630, a bunch of the area is uniform gray
-      # when it should continue the pattern
-      - device: freedreno-a530
-        checksum: 610a670dbcdfee95fd0b660e4a681440
-      - device: freedreno-a630
-        checksum: 610a670dbcdfee95fd0b660e4a681440
-  - path: glmark2/conditionals:vertex-steps=0:fragment-steps=5.trace
-    expectations:
-      - device: freedreno-a306
-        checksum: e755948206fee3ab5aeed680c48cabd5
-      # Incorrect rendering on a530/a630, a bunch of the area is uniform gray
-      # when it should continue the pattern
-      - device: freedreno-a530
-        checksum: f0660e7bc8d0834d488a365cee68b649
-      - device: freedreno-a630
-        checksum: f0660e7bc8d0834d488a365cee68b649
-  - path: glmark2/conditionals:vertex-steps=5:fragment-steps=0.trace
-    expectations:
-      - device: freedreno-a306
-        checksum: 6327be9cbdcc4f838a8691e1dce40a31
-      # Incorrect rendering on a530/a630, a bunch of the area is uniform gray
-      # when it should continue the pattern
-      - device: freedreno-a530
-        checksum: 809b7b66f30f134490012817a30774c3
-      - device: freedreno-a630
-        checksum: 809b7b66f30f134490012817a30774c3
-  - path: glmark2/desktop:windows=4:effect=blur:blur-radius=5:passes=1:separable=true.trace
-    expectations:
-      - device: freedreno-a306
-        checksum: e24428dc1f1669e2fa763a14ff81a35e
-      - device: freedreno-a530
-        checksum: 70e18ba06d56fea277cd3fb000729879
-      - device: freedreno-a630
-        checksum: 9eb6d261c0c5946d8aeb0f41b2b7c1b1
-  - path: glmark2/desktop:windows=4:effect=shadow.trace
-    expectations:
-      - device: freedreno-a306
-        checksum: d33fb71482b226368fb2c5fde18e4f98
-      - device: freedreno-a530
-        checksum: 0bc91339efce710fa2661927a2c1c6d4
-      - device: freedreno-a630
-        checksum: 6940cc16e4e7ffa3b46e594a2d70bf83
-  - path: glmark2/effect2d:kernel=0,1,0;1,-4,1;0,1,0;.trace
-    expectations:
-      - device: freedreno-a306
-        checksum: bfb9695c876a3b9e98757df9e82c9456
-      - device: freedreno-a530
-        checksum: 7712c8143a244c56922124f4ac207722
-      - device: freedreno-a630
-        checksum: 7712c8143a244c56922124f4ac207722
-  - path: glmark2/effect2d:kernel=1,1,1,1,1;1,1,1,1,1;1,1,1,1,1;.trace
-    expectations:
-      - device: freedreno-a306
-        checksum: b80963dae6ecf40c83bfb16943ef1011
-      - device: freedreno-a530
-        checksum: 50f1841f2bb96905c9fcd1815c4a95c0
-      - device: freedreno-a630
-        checksum: 50f1841f2bb96905c9fcd1815c4a95c0
-  - path: glmark2/function:fragment-steps=5:fragment-complexity=low.trace
-    expectations:
-      - device: freedreno-a306
-        checksum: b4f610ee5161fad9f819dbad77266255
-      # Incorrect rendering on a530/a630, a bunch of the area is uniform gray
-      # when it should continue the pattern
-      - device: freedreno-a530
-        checksum: 460793bd7feae473250aa8924166ee74
-      - device: freedreno-a630
-        checksum: 460793bd7feae473250aa8924166ee74
-  - path: glmark2/function:fragment-steps=5:fragment-complexity=medium.trace
-    expectations:
-      - device: freedreno-a306
-        checksum: 88f2b33b6dfa114f735836c75b6d210a
-      # Incorrect rendering on a530/a630, a bunch of the area is uniform gray
-      # when it should continue the pattern
-      - device: freedreno-a530
-        checksum: d3ae445b44bf4a5d3c2eda9ddce83210
-      - device: freedreno-a630
-        checksum: d3ae445b44bf4a5d3c2eda9ddce83210
-  - path: glmark2/build:use-vbo=false.trace
-    expectations:
-      - device: freedreno-a306
-        checksum: 592c711716f249ca94d073fc058b5ccf
-      - device: freedreno-a530
-        checksum: 2bb3a186838a5a7138b80af34e5fea52
-      - device: freedreno-a630
-        checksum: eaff1a204f1319c039b3b5cb161294e4
-  - path: glmark2/build:use-vbo=true.trace
-    expectations:
-      - device: freedreno-a306
-        checksum: 4271c14511d650a962ee967c2c73d5e8
-      - device: freedreno-a530
-        checksum: b05e0e05543e2b1b587233ef201c9ae9
-      - device: freedreno-a630
-        checksum: f31b28d3b83ee3873683ebafaa857a8a
-  - path: glmark2/ideas:speed=10000.trace
-    expectations:
-      - device: freedreno-a306
-        checksum: c31e4b18d29e87751e4c30760ddfef18
-      - device: freedreno-a530
-        checksum: 3272ac6018600da9cc61636416ed387e
-      - device: freedreno-a630
-        checksum: 2570e22fbb4ad1a68b45e4caf682d77d
-  - path: glmark2/jellyfish.trace
-    expectations:
-      - device: freedreno-a306
-        checksum: 7a8566cfb28e2721443f4c88fa62e515
-      - device: freedreno-a530
-        checksum: 2cccf4a61c7023ecce668ef9158fdb46
-      - device: freedreno-a630
-        checksum: 2d5dbe1aee68f1966a26f70511ca793c
-  - path: glmark2/loop:vertex-steps=5:fragment-steps=5:fragment-loop=false.trace
-    expectations:
-      - device: freedreno-a306
-        checksum: e32b05e4488b4de3d145a73bdabdc0a9
-      # Incorrect rendering on a530/a630, a bunch of the area is uniform gray
-      # when it should continue the pattern
-      - device: freedreno-a530
-        checksum: d3e21cc50cf71daa0a9a3410737509c8
-      - device: freedreno-a630
-        checksum: d3e21cc50cf71daa0a9a3410737509c8
-  - path: glmark2/loop:vertex-steps=5:fragment-steps=5:fragment-uniform=false.trace
-    expectations:
-      - device: freedreno-a306
-        checksum: 0ff662e9d264f44d03fd286f4ed7eb3e
-      # Incorrect rendering on a530/a630, a bunch of the area is uniform gray
-      # when it should continue the pattern
-      - device: freedreno-a530
-        checksum: ebf6251eed60084b36ff3d99c6ce89cc
-      - device: freedreno-a630
-        checksum: ebf6251eed60084b36ff3d99c6ce89cc
-  - path: glmark2/loop:vertex-steps=5:fragment-steps=5:fragment-uniform=true.trace
-    expectations:
-      - device: freedreno-a306
-        checksum: 42b5b79572eaf74689ab778498636e3d
-      # Incorrect rendering on a530/a630, a bunch of the area is uniform gray
-      # when it should continue the pattern
-      - device: freedreno-a530
-        checksum: b6d31e839c64b8f5c69b9174521df5b6
-      - device: freedreno-a630
-        checksum: b6d31e839c64b8f5c69b9174521df5b6
-  - path: glmark2/pulsar:quads=5:texture=false:light=false.trace
-    expectations:
-      - device: freedreno-a306
-        checksum: 670b75468880bace66d3fefe4631e53b
-      - device: freedreno-a530
-        checksum: 7dbd6748a00800904b18fe566a32d0af
-      - device: freedreno-a630
-        checksum: 749531db9fdfe92b74432fdac2e8b037
-  - path: glmark2/refract.trace
-    expectations:
-      # Occasional hangcheck on a306 since switching to apitraces
-      #- device: freedreno-a306
-      #  checksum: 0c57ccc3989b75a940b28ea1cc09cb0d
-      - device: freedreno-a530
-        checksum: bc19f0f58935fdb348f401396e6845e1
-      - device: freedreno-a630
-        checksum: f546f840e916ab0f11f8df0e4eee584d
-  - path: glmark2/shading:shading=blinn-phong-inf.trace
-    expectations:
-      - device: freedreno-a306
-        checksum: 7d3ee3db4f209066c380f1dcce2d4603
-    # Some speckling on the main specular highlight on a530/a630 that may just be
-    # mediump artifacts
-      - device: freedreno-a530
-        checksum: 77018ae203d254fdb563de95f41cfb92
-      - device: freedreno-a630
-        checksum: 77018ae203d254fdb563de95f41cfb92
-  - path: glmark2/shading:shading=cel.trace
-    expectations:
-      - device: freedreno-a306
-        checksum: 17e20c8c0f8ecb7fb7f158ab9b80b8ca
-      - device: freedreno-a530
-        checksum: 723b7e42171a4e450eb1e72e861f0fdf
-      - device: freedreno-a630
-        checksum: 723b7e42171a4e450eb1e72e861f0fdf
-  - path: glmark2/shading:shading=gouraud.trace
-    expectations:
-      - device: freedreno-a306
-        checksum: 6dcee5beb1e45d4976acfc20f90f72bb
-      - device: freedreno-a530
-        checksum: f3042c3069e5bcb61af26b111de50f66
-      - device: freedreno-a630
-        checksum: 30e8c8b9ac5044a214d7e52797802719
-  - path: glmark2/shading:shading=phong.trace
-    expectations:
-      - device: freedreno-a306
-        checksum: 087367cffd0d45bec5622aa08fa75058
-    # Some speckling on the main specular highlight on a530/a630 that may just be
-    # mediump artifacts
-      - device: freedreno-a530
-        checksum: 1fddb03346295d4a33e43f8762fc16b4
-      - device: freedreno-a630
-        checksum: 1fddb03346295d4a33e43f8762fc16b4
-  - path: glmark2/shadow.trace
-    expectations:
-      - device: freedreno-a306
-        checksum: b5f5c4321d385292c33426f31f26b352
-      - device: freedreno-a530
-        checksum: 841719375bac8c4ef19603a6324759df
-      - device: freedreno-a630
-        checksum: 77af823d8465d9a59e1e05bcfccfddb1
-  - path: glmark2/texture:texture-filter=linear.trace
-    expectations:
-      - device: freedreno-a306
-        checksum: 8870474a93cd94c0fde9a4cb8486284c
-      - device: freedreno-a530
-        checksum: 2f9304ddf783e43a28d8d8436e578bb9
-      - device: freedreno-a630
-        checksum: b340dcd56221af71a8e23ba42deb0360
-  - path: glmark2/texture:texture-filter=mipmap.trace
-    expectations:
-      # Crashes on a3xx?
-      # - device: freedreno-a306
-      #   checksum: 1ae1036fcaae693b3bf36a1d2d6bbc64
-      - device: freedreno-a530
-        checksum: 9a51ef8594c48ea1c76127aad56daa1c
-      - device: freedreno-a630
-        checksum: 836509331883c04ef3e63d0e68ce9ad0
-  - path: glmark2/texture:texture-filter=nearest.trace
-    expectations:
-      - device: freedreno-a306
-        checksum: 678998df410b2e656af1241ca1947985
-      - device: freedreno-a530
-        checksum: 509cfb6ad7b973aaf1ea42ac9328d65f
-      - device: freedreno-a630
-        checksum: c3ce3ab02fb7416bc57772e729f77f07
-  - path: glxgears/glxgears-2.trace
-    expectations:
-      # inner rings are flat shaded when they should be smooth
-      - device: freedreno-a306
-        checksum: 3df913932335f17918c55aa70cfba817
-      # bad shading on the inner ring of red
-      - device: freedreno-a530
-        checksum: 4e980c27c1715a355d3226295b3885e9
-      - device: freedreno-a630
-        checksum: 3ff0833c1456ad05fa9dab751decd838
-  - path: gputest/furmark.trace
-    expectations:
-      # Triggers hangcheck on db410c
-      # - device: freedreno-a306
-      #   checksum: 751e0e784ba2f003cfc456fe8699f1fa
-      - device: freedreno-a530
-        checksum: ba53d1ffbe911171546a93259fb2e57c
-      - device: freedreno-a630
-        checksum: 313ef615f0f5a11eeaf95a2a87769a32
-# Note: Requires GL3.3
-  - path: gputest/gimark.trace
-    expectations:
-      - device: freedreno-a630
-        checksum: e58167bd8eeb8952facbc00ff0449135
-  - path: gputest/pixmark-julia-fp32.trace
-    expectations:
-      - device: freedreno-a630
-        checksum: f83f7ad4b147607e2a7de65a48f8ed4d
-# Note: Requires GL4 (fp64).
-#  - path: gputest/pixmark-julia-fp64.trace
-#    expectations:
-#      - device: freedreno-a630
-#        checksum: 0
-# Intermittent GPU hangs on a630 result in test failures for this.
-#  - path: gputest/pixmark-piano.trace
-#    expectations:
-#      # One of the material textures appears brighter on freedreno than
-#      # i965 in a way that is probably wrong.
-#      - device: freedreno-a630
-#        checksum: 1aad6e1ffe23cae71acdb70695a6184b
-  - path: gputest/pixmark-volplosion.trace
-    expectations:
-      # triggers hangcheck on db410c
-      # - device: freedreno-a306
-      #   checksum: 2d1cf314b5ef2e0a79f5f98eee8de446
-      - device: freedreno-a530
-        checksum: ef9cec3c226477e908d4bb2ffe9e8eb9
-      # Looks fine, but totally different shape from the rendering on i965.
-      - device: freedreno-a630
-        checksum: e4da2cf366cb68833569105d37aaa50d
-  - path: gputest/plot3d.trace
-    expectations:
-      - device: freedreno-a306
-        checksum: f6ecd9b8afc692b0cdb459b9b30db8d4
-      - device: freedreno-a530
-        checksum: 4faafe5fab0d8ec6d7b549c94f663c92
-      - device: freedreno-a630
-        checksum: 0a6a16c394a413f02ec2ebcc3251e366
-# Note: Requires GL4 for tess.
-  - path: gputest/tessmark.trace
-    expectations:
-      - device: freedreno-a630
-        checksum: af356a98c4d55fb10613a11fbe687adb
-  - path: gputest/triangle.trace
-    expectations:
-      - device: freedreno-a306
-        checksum: aa9f373a7aef4bf03942c0b4c71ff900
-      - device: freedreno-a530
-        checksum: a7142cfb819f5f45863ccca75a5e26a5
-      - device: freedreno-a630
-        checksum: 2cbd1de2e9ed281b3cd19c957858c81a
-  - path: humus/AmbientAperture.trace
-    expectations:
-      - device: freedreno-a306
-        checksum: 8d4c52f0af9c09710d358f24c73fae3c
-      - device: freedreno-a530
-        checksum: aab5c853e383e1cda56663d65f6925ad
-      - device: freedreno-a630
-        checksum: 83fd7bce0fc1e1f30bd143b7d30ca890
-  - path: humus/CelShading.trace
-    expectations:
-      # Z or stencil failures or something on the cel shading outlines on a306
-      - device: freedreno-a306
-        checksum: daedd0c29d197ee1b6a4a7dea72ec87b
-      - device: freedreno-a530
-        checksum: c424072f305db125ffd9e3f5bebcb512
-      - device: freedreno-a630
-        checksum: b0ac8fb4b2b2268cfb87944730125886
-  - path: humus/DynamicBranching3.trace
-    expectations:
-      - device: freedreno-a306
-        checksum: 765fa742b87e411763921c6f988b2573
-      - device: freedreno-a530
-        checksum: f4aa0730942c471759d6f9b929b9122a
-      - device: freedreno-a630
-        checksum: 238f06550db39c36e5b880d3b3d7440f
-  - path: humus/HDR.trace
-    expectations:
-      # Blurring effect missing on a306
-      - device: freedreno-a306
-        checksum: 80b164e85e96a413568d18ce308caae3
-      - device: freedreno-a530
-        checksum: 22e849b9c7a91869729f4d2b73681d75
-      - device: freedreno-a630
-        checksum: 40387a4e89ef71c472a94413b175ff59
-  # Started producing flaky results near that old gap in the upper right once
-  # the parallel trace runner landed.
-  #- path: humus/Portals.trace
-  #  expectations:
-  #    # Bad rendering -- some sort of gap in the upper right of the image.
-  #    - device: freedreno-a630
-  #      checksum: 773787656bdb83df21ff42cf9d98d7d2
-  - path: humus/RaytracedShadows.trace
-    expectations:
-      - device: freedreno-a306
-        checksum: b3a848fbd6d9bc9c35a7604994867c38
-      - device: freedreno-a530
-        checksum: 0fb847eb10e74da0483a17e782f2a22a
-      - device: freedreno-a630
-        checksum: 5f1a655e62eab99d53dab88b634afed3
-  - path: humus/VolumetricFogging2.trace
-    expectations:
-      - device: freedreno-a306
-        checksum: aec880cec7ba460f3144b789bc517891
-      - device: freedreno-a530
-        checksum: fa6ec09d80a2c42e3ed49f87b608e0c4
-      - device: freedreno-a630
-        checksum: e5d2b54f49ba1c24279d5ff84e0f002b
-# Unstable results
-#  - path: itoral-gl-terrain-demo/demo.trace
-#    expectations:
-#      - device: freedreno-a630
-#        checksum: 9571117bf4eab6fe29b12f6c3d42d865
-  - path: pathfinder/canvas_moire.trace
-    expectations:
-      # a306/a630 would need higher GL version to run
-      - device: freedreno-a630
-        checksum: 0e32ca8fc815a7250f38a07faeafb21b
-  - path: pathfinder/canvas_text_v2.trace
-    expectations:
-      # a306/a630 would need higher GL version to run
-      - device: freedreno-a630
-        checksum: c163253b33a93577600e2f1c0571737c
-  - path: pathfinder/demo.trace
-    expectations:
-      # a306/a630 would need higher GL version to run
-      - device: freedreno-a630
-        checksum: f6661ed4de9e0a444c6338ebd0cd3768
-#  Throws "Invalid state in _mesa_program_state_string" and
-#  GL_INVALID_OPERATION in glBindTexture(target mismatch), fails to produce
-#  a .png at all.  Renders fine on radeonsi.
-#  - path: pioneer/pioneer.trace
-#    expectations:
-#      - device: freedreno-a630
-#        checksum: a0000000000000000000000000000000
-# 21 seconds to render.  Renders nearly completely black, logs "warning:
-# 0:29(61): warning: `var_Position' used uninitialized".  Replays fine
-# on radeonsi.  Skip for now.
-#  - path: thedarkmod/thedarkmod.trace
-#    expectations:
-#      #- device: freedreno-a630
-#      #  checksum: a0000000000000000000000000000000
-# Throws errors on freedreno
-#  - path: supertuxkart/supertuxkart-antediluvian-abyss.rdc
-#    expectations:
-#      - device: freedreno-a630
-#        checksum: 0
-#  - path: supertuxkart/supertuxkart-menu.rdc
-#    expectations:
-#      - device: freedreno-a630
-#        checksum: 0
-#  - path: supertuxkart/supertuxkart-ravenbridge-mansion.rdc
-#    expectations:
-#      - device: freedreno-a630
-#        checksum: 0
-#  - path: godot/Material Testers.x86_64_2020.04.08_13.38_frame799.rdc
-#    expectations:
-#      - device: freedreno-a630
-#        checksum: 0

src/gallium/drivers/i915/ci/gitlab-ci.yml

@@ -1,41 +0,0 @@
-# Manual test rules for using anholt's shared g33.
-.anholt-g33-test:
-  extends:
-    - .i915g-rules
-    - .test-gl
-    - .test-manual-mr
-  tags:
-    - anholt-g33
-  variables:
-    GPU_VERSION: i915-g33
-
-i915-g33-deqp:
-  extends:
-    - .anholt-g33-test
-    - .deqp-test
-  variables:
-    DEQP_SUITE: i915g
-
-i915-g33-piglit:
-  extends:
-    - .anholt-g33-test
-    - .piglit-test
-  variables:
-    PIGLIT_PROFILES: gpu
-    PIGLIT_PLATFORM: gbm
-  artifacts:
-    paths:
-      - results/
-    reports:
-      junit: results/junit.xml
-  script:
-    - install/piglit/piglit-runner.sh
-
-i915-g33-traces:
-  extends:
-    - .anholt-g33-test
-    - .piglit-traces-test
-  variables:
-    EGL_PLATFORM: "surfaceless"
-    PIGLIT_REPLAY_DESCRIPTION_FILE: "${CI_PROJECT_DIR}/install/traces-i915.yml"
-    PIGLIT_REPLAY_DEVICE_NAME: "i915-g33"

src/gallium/drivers/i915/ci/traces-i915.yml

@@ -1,63 +0,0 @@
-traces-db:
-  download-url: "https://minio-packet.freedesktop.org/mesa-tracie-public/"
-
-# glmark2 looks like maybe it fails due to wanting an xserver, but we don't have
-# Xorg in the x86 docker images we're using.
-
-traces:
-  - path: glxgears/glxgears-2.trace
-    expectations:
-      - device: i915-g33
-        checksum: ee8dcdb3b9eaef2b32a2914b89373419
-  - path: gputest/plot3d.trace
-    expectations:
-      - device: i915-g33
-        checksum: 4731890d1f782c106dd9c12af77b3607
-  - path: gputest/triangle.trace
-    expectations:
-      # Weird white bar behind Tux's head.
-      - device: i915-g33
-        checksum: ef9b19e9a6dcd928d3bd44e7eee95029
-  # Requires GLSL 1.30
-  #- path: humus/AmbientAperture.trace
-  #  expectations:
-  #    - device: i915-g33
-  #      checksum: 8d4c52f0af9c09710d358f24c73fae3c
-  - path: humus/CelShading.trace
-    # The cel shading is pretty chunky, but maybe that's just precision stuff.
-    expectations:
-      - device: i915-g33
-        checksum: 7518414e4f1a4f1e07c04ec1500f53e7
-  # Requires GLSL 1.30
-  #- path: humus/DynamicBranching3.trace
-  #  expectations:
-  #    - device: i915-g33
-  #      checksum: 765fa742b87e411763921c6f988b2573
-  # Requires GLSL 1.30
-  #- path: humus/HDR.trace
-  #  expectations:
-  #    - device: i915-g33
-  #      checksum: 80b164e85e96a413568d18ce308caae3
-  - path: humus/Portals.trace
-    expectations:
-      - device: i915-g33
-        checksum: f782469019417923831d5d53dbe6a507
-  # The shadow raytracing shader fails to compile
-  #- path: humus/RaytracedShadows.trace
-  #  expectations:
-  #    - device: i915-g33
-  #      checksum: 5dc0af9fead0102a791784d0f6122096
-  # Requires GLSL 1.30
-  #- path: humus/VolumetricFogging2.trace
-  #  expectations:
-  #    - device: i915-g33
-  #      checksum: aec880cec7ba460f3144b789bc517891
-  - path: neverball/neverball.trace
-    expectations:
-      - device: i915-g33
-        checksum: f925aa92da47ebc757285f826113f4db
-  - path: valve/counterstrike-v2.trace
-    # Tree foliage rendering is extra aliased.
-    expectations:
-      - device: i915-g33
-        checksum: d17298ad3bb44b43b6c17e017f7c1e6a

src/gallium/drivers/iris/ci/gitlab-ci.yml

@@ -1,267 +0,0 @@
-.iris-test:
-  extends:
-    - .lava-test:amd64
-    - .iris-rules
-  variables:
-    DTB: ""
-    DRIVER_NAME: iris
-    BOOT_METHOD: depthcharge
-    KERNEL_IMAGE_TYPE: ""
-    FLAKES_CHANNEL: "#intel-ci"
-    HWCI_FREQ_MAX: "true"
-
-# 5 boards
-.iris-apl-test:
-  extends:
-    - .iris-test
-  variables:
-    DEVICE_TYPE: asus-C523NA-A20057-coral
-    GPU_VERSION: iris-apl
-  tags:
-    - mesa-ci-x86-64-lava-asus-C523NA-A20057-coral
-
-# 4 boards
-.iris-glk-test:
-  extends:
-    - .iris-test
-    - .test-manual-mr
-  variables:
-    DEVICE_TYPE: hp-x360-12b-ca0010nr-n4020-octopus
-    GPU_VERSION: iris-glk
-  tags:
-    - mesa-ci-x86-64-lava-hp-x360-12b-ca0010nr-n4020-octopus
-
-# 5 boards
-.iris-amly-test:
-  extends:
-    - .iris-test
-    - .test-manual-mr
-  variables:
-    DEVICE_TYPE: asus-C433TA-AJ0005-rammus
-    GPU_VERSION: iris-amly
-  tags:
-    - mesa-ci-x86-64-lava-asus-C433TA-AJ0005-rammus
-
-# 6 boards
-.iris-kbl-test:
-  extends:
-    - .iris-test
-    - .test-manual-mr
-  variables:
-    DEVICE_TYPE: hp-x360-14-G1-sona
-    GPU_VERSION: iris-kbl
-  tags:
-    - mesa-ci-x86-64-lava-hp-x360-14-G1-sona
-
-# 1 board
-.iris-whl-test:
-  extends:
-    - .iris-test
-    - .test-manual-mr
-  variables:
-    DEVICE_TYPE: dell-latitude-5400-4305U-sarien
-    GPU_VERSION: iris-whl
-  tags:
-    - mesa-ci-x86-64-lava-dell-latitude-5400-4305U-sarien
-
-# 4 boards
-.iris-cml-test:
-  extends:
-    - .iris-test
-    - .test-manual-mr
-  variables:
-    DEVICE_TYPE: asus-C436FA-Flip-hatch
-    GPU_VERSION: iris-cml
-  tags:
-    - mesa-ci-x86-64-lava-asus-C436FA-flip-hatch
-
-iris-apl-deqp:
-  extends:
-    - .iris-apl-test
-  variables:
-    DEQP_SUITE: iris-apl
-  parallel: 3
-
-iris-apl-egl:
-  extends:
-    - .iris-apl-test
-  variables:
-    PIGLIT_NO_WINDOW: 0
-    HWCI_START_XORG: 1
-    DEQP_VER: egl
-
-iris-glk-deqp:
-  extends:
-    - .iris-glk-test
-  variables:
-    DEQP_SUITE: iris-glk
-  parallel: 2
-
-iris-glk-egl:
-  extends:
-    - .iris-glk-test
-  variables:
-    PIGLIT_NO_WINDOW: 0
-    HWCI_START_XORG: 1
-    DEQP_VER: egl
-
-iris-amly-deqp:
-  extends:
-    - .iris-amly-test
-  variables:
-    DEQP_SUITE: iris-amly
-  parallel: 3
-
-iris-kbl-deqp:
-  extends:
-    - .iris-kbl-test
-  variables:
-    DEQP_SUITE: iris-kbl
-  parallel: 3
-
-iris-whl-deqp:
-  extends:
-    - .iris-whl-test
-  variables:
-    DEQP_SUITE: iris-whl
-
-iris-cml-deqp:
-  extends:
-    - .iris-cml-test
-  variables:
-    DEQP_SUITE: iris-cml
-  parallel: 2
-
-iris-amly-egl:
-  extends:
-    - .iris-amly-test
-  variables:
-    PIGLIT_NO_WINDOW: 0
-    HWCI_START_XORG: 1
-    DEQP_VER: egl
-
-iris-amly-piglit:
-  extends:
-    - .iris-amly-test
-    - .lava-piglit
-  parallel: 3
-  variables:
-    HWCI_START_XORG: 1
-    PIGLIT_NO_WINDOW: 0
-    PIGLIT_PLATFORM: mixed_glx_egl
-    PIGLIT_PROFILES: gpu
-    PIGLIT_JUNIT_RESULTS: 1
-
-.iris-traces:
-  extends:
-    - .lava-traces-base
-  variables:
-    EGL_PLATFORM: surfaceless
-    PIGLIT_PROFILES: replay
-    PIGLIT_JUNIT_RESULTS: 1
-    PIGLIT_REPLAY_DEVICE_NAME: "gl-${GPU_VERSION}"
-    PIGLIT_RESULTS: "${GPU_VERSION}-${PIGLIT_PROFILES}"
-    PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/traces-iris.yml"
-    PIGLIT_REPLAY_EXTRA_ARGS: --keep-image
-
-iris-apl-traces:
-  variables:
-    GPU_VERSION: intel-apl
-  extends:
-    - .iris-apl-test
-    - .iris-traces
-
-iris-glk-traces:
-  variables:
-    GPU_VERSION: intel-glk
-  extends:
-    - .iris-glk-test
-    - .iris-traces
-
-iris-amly-traces:
-  variables:
-    GPU_VERSION: intel-amly
-  extends:
-    - .iris-amly-test
-    - .iris-traces
-
-iris-kbl-traces:
-  variables:
-    GPU_VERSION: intel-kbl
-  extends:
-    - .iris-kbl-test
-    - .iris-traces
-
-iris-whl-traces:
-  variables:
-    GPU_VERSION: intel-whl
-  extends:
-    - .iris-whl-test
-    - .iris-traces
-
-iris-cml-traces:
-  variables:
-    GPU_VERSION: intel-cml
-  extends:
-    - .iris-cml-test
-    - .iris-traces
-
-.profile-traces:
-  extends:
-    - .iris-traces
-    - .iris-rules-performance
-  variables:
-    PIGLIT_REPLAY_SUBCOMMAND: "profile"
-    PIGLIT_REPLAY_EXTRA_ARGS: "--db-path ${CI_PROJECT_DIR}/replayer-db/"
-    # More than this can hit OOM due to BOs leaked during the replay of the last frame
-    PIGLIT_REPLAY_LOOP_TIMES: 150
-    # We don't want for more than one workload to be submitted to the GPU at a time
-    FDO_CI_CONCURRENT: 1
-    # So we aren't capped by VSync by the X server
-    EGL_PLATFORM: surfaceless
-    GIT_STRATEGY: none
-    HWCI_FREQ_MAX: "true"
-    LAVA_TAGS: "cbg-0"
-  allow_failure: true
-
-iris-apl-traces-performance:
-  extends:
-    - .iris-apl-test
-    - .profile-traces
-  variables:
-    GPU_VERSION: intel-apl
-
-iris-glk-traces-performance:
-  extends:
-    - .iris-glk-test
-    - .profile-traces
-  variables:
-    GPU_VERSION: intel-glk
-
-iris-amly-traces-performance:
-  extends:
-    - .iris-amly-test
-    - .profile-traces
-  variables:
-    GPU_VERSION: intel-amly
-
-iris-kbl-traces-performance:
-  extends:
-    - .iris-kbl-test
-    - .profile-traces
-  variables:
-    GPU_VERSION: intel-kbl
-
-iris-whl-traces-performance:
-  extends:
-    - .iris-whl-test
-    - .profile-traces
-  variables:
-    GPU_VERSION: intel-whl
-
-iris-cml-traces-performance:
-  extends:
-    - .iris-cml-test
-    - .profile-traces
-  variables:
-    GPU_VERSION: intel-cml

src/gallium/drivers/iris/ci/traces-iris.yml

@@ -1,920 +0,0 @@
-traces-db:
-  download-url: "http://caching-proxy/cache/?uri=https://minio-packet.freedesktop.org/mesa-tracie-public/"
-
-traces:
-#  - path: 0ad/0ad.trace
-#    expectations:
-#      # Renders the loading screen instead of the in-game screen.  Needs to be debugged.
-#      # junit.xml says "warning: unexpected end of file while reading trace /usr/games/pyrogenesis pid"
-#      - device: gl-intel-apl
-#        checksum: becaa29fae8a988b8b5f4694f59383db
-#      - device: gl-intel-glk
-#        checksum: becaa29fae8a988b8b5f4694f59383db
-#      - device: gl-intel-amly
-#        checksum: becaa29fae8a988b8b5f4694f59383db
-#      - device: gl-intel-kbl
-#        checksum: becaa29fae8a988b8b5f4694f59383db
-#      - device: gl-intel-whl
-#        checksum: becaa29fae8a988b8b5f4694f59383db
-#      - device: gl-intel-cml
-#        checksum: becaa29fae8a988b8b5f4694f59383db
-  - path: behdad-glyphy/glyphy.trace
-    expectations:
-      - device: gl-intel-apl
-        checksum: 5c7e2fc5961b43a18ea65523fe025b96
-      - device: gl-intel-glk
-        checksum: 5c7e2fc5961b43a18ea65523fe025b96
-      - device: gl-intel-amly
-        checksum: e749faf799fe11f95208a01ca6e32fef
-      - device: gl-intel-kbl
-        checksum: 5c7e2fc5961b43a18ea65523fe025b96
-      - device: gl-intel-whl
-        checksum: 5c7e2fc5961b43a18ea65523fe025b96
-      - device: gl-intel-cml
-        checksum: 5c7e2fc5961b43a18ea65523fe025b96
-  - path: glmark2/desktop:windows=4:effect=blur:blur-radius=5:passes=1:separable=true.trace
-    expectations:
-      - device: gl-intel-apl
-        checksum: c8c96a8cc167e0d07f889d7310316922
-      - device: gl-intel-glk
-        checksum: c8c96a8cc167e0d07f889d7310316922
-      - device: gl-intel-amly
-        checksum: c8c96a8cc167e0d07f889d7310316922
-      - device: gl-intel-kbl
-        checksum: c8c96a8cc167e0d07f889d7310316922
-      - device: gl-intel-whl
-        checksum: c8c96a8cc167e0d07f889d7310316922
-      - device: gl-intel-cml
-        checksum: c8c96a8cc167e0d07f889d7310316922
-  - path: glmark2/jellyfish.trace
-    expectations:
-      - device: gl-intel-apl
-        checksum: c31236c496768159903aa48f5a47bcdc
-      - device: gl-intel-glk
-        checksum: c31236c496768159903aa48f5a47bcdc
-      - device: gl-intel-amly
-        checksum: 3b7d64de0a60d527f63695518897f367
-      - device: gl-intel-kbl
-        checksum: c31236c496768159903aa48f5a47bcdc
-      - device: gl-intel-whl
-        checksum: c31236c496768159903aa48f5a47bcdc
-      - device: gl-intel-cml
-        checksum: c31236c496768159903aa48f5a47bcdc
-  - path: glxgears/glxgears-2.trace
-    expectations:
-      - device: gl-intel-apl
-        checksum: f53ac20e17da91c0359c31f2fa3f401e
-      - device: gl-intel-glk
-        checksum: f53ac20e17da91c0359c31f2fa3f401e
-      - device: gl-intel-amly
-        checksum: f53ac20e17da91c0359c31f2fa3f401e
-      - device: gl-intel-kbl
-        checksum: f53ac20e17da91c0359c31f2fa3f401e
-      - device: gl-intel-whl
-        checksum: f53ac20e17da91c0359c31f2fa3f401e
-      - device: gl-intel-cml
-        checksum: f53ac20e17da91c0359c31f2fa3f401e
-  - path: 0ad/0ad.trace
-    expectations:
-      - device: gl-intel-apl
-        checksum: 45739401f068971e6e1052f10afe9f99
-      - device: gl-intel-glk
-        checksum: 45739401f068971e6e1052f10afe9f99
-      - device: gl-intel-amly
-        checksum: 60d295cddd4679982993ffe60b4f5f12
-      - device: gl-intel-kbl
-        checksum: 45739401f068971e6e1052f10afe9f99
-      - device: gl-intel-whl
-        checksum: 45739401f068971e6e1052f10afe9f99
-      - device: gl-intel-cml
-        checksum: 45739401f068971e6e1052f10afe9f99
-  - path: pathfinder/demo.trace
-    expectations:
-      - device: gl-intel-apl
-        checksum: d9b33f0a2efe17c21b7933242afd9ec7
-      - device: gl-intel-glk
-        checksum: d9b33f0a2efe17c21b7933242afd9ec7
-      - device: gl-intel-amly
-        checksum: d9b33f0a2efe17c21b7933242afd9ec7
-      - device: gl-intel-kbl
-        checksum: d9b33f0a2efe17c21b7933242afd9ec7
-      - device: gl-intel-whl
-        checksum: d9b33f0a2efe17c21b7933242afd9ec7
-      - device: gl-intel-cml
-        checksum: d9b33f0a2efe17c21b7933242afd9ec7
-  - path: pathfinder/canvas_moire.trace
-    expectations:
-      - device: gl-intel-apl
-        checksum: 21bccd42f2deb6416cf6591cd6a99258
-      - device: gl-intel-glk
-        checksum: 21bccd42f2deb6416cf6591cd6a99258
-      - device: gl-intel-amly
-        checksum: 21bccd42f2deb6416cf6591cd6a99258
-      - device: gl-intel-kbl
-        checksum: 21bccd42f2deb6416cf6591cd6a99258
-      - device: gl-intel-whl
-        checksum: 21bccd42f2deb6416cf6591cd6a99258
-      - device: gl-intel-cml
-        checksum: 21bccd42f2deb6416cf6591cd6a99258
-  - path: pathfinder/canvas_text_v2.trace
-    expectations:
-      - device: gl-intel-apl
-        checksum: 448886e3b24f6408e013ea13f7c96d28
-      - device: gl-intel-glk
-        checksum: 448886e3b24f6408e013ea13f7c96d28
-      - device: gl-intel-amly
-        checksum: 448886e3b24f6408e013ea13f7c96d28
-      - device: gl-intel-kbl
-        checksum: 448886e3b24f6408e013ea13f7c96d28
-      - device: gl-intel-whl
-        checksum: 448886e3b24f6408e013ea13f7c96d28
-      - device: gl-intel-cml
-        checksum: 448886e3b24f6408e013ea13f7c96d28
-  - path: gputest/furmark.trace
-    expectations:
-      - device: gl-intel-apl
-        checksum: 06d587a2b934295da6ad874b750b9c9d
-      - device: gl-intel-glk
-        checksum: 06d587a2b934295da6ad874b750b9c9d
-      - device: gl-intel-amly
-        checksum: 34466e5a6103be730f18eea2d4d357ee
-      - device: gl-intel-kbl
-        checksum: 06d587a2b934295da6ad874b750b9c9d
-      - device: gl-intel-whl
-        checksum: 06d587a2b934295da6ad874b750b9c9d
-      - device: gl-intel-cml
-        checksum: 06d587a2b934295da6ad874b750b9c9d
-  - path: gputest/pixmark-piano.trace
-    expectations:
-      - device: gl-intel-apl
-        checksum: 3899d6cd893b7c3ef6baa637cbd79690
-      - device: gl-intel-glk
-        checksum: 3899d6cd893b7c3ef6baa637cbd79690
-      - device: gl-intel-amly
-        checksum: 9534418a99a80b31251266a987fb7c07
-      - device: gl-intel-kbl
-        checksum: 3899d6cd893b7c3ef6baa637cbd79690
-      - device: gl-intel-whl
-        checksum: 3899d6cd893b7c3ef6baa637cbd79690
-      - device: gl-intel-cml
-        checksum: 3899d6cd893b7c3ef6baa637cbd79690
-  - path: gputest/triangle.trace
-    expectations:
-      - device: gl-intel-apl
-        checksum: 0a1524303e0772f6d869e4875fe1f401
-      - device: gl-intel-glk
-        checksum: 0a1524303e0772f6d869e4875fe1f401
-      - device: gl-intel-amly
-        checksum: 0a1524303e0772f6d869e4875fe1f401
-      - device: gl-intel-kbl
-        checksum: 0a1524303e0772f6d869e4875fe1f401
-      - device: gl-intel-whl
-        checksum: 0a1524303e0772f6d869e4875fe1f401
-      - device: gl-intel-cml
-        checksum: 0a1524303e0772f6d869e4875fe1f401
-  - path: glmark2/buffer:update-fraction=0.5:update-dispersion=0.9:columns=200:update-method=map:interleave=false.trace
-    expectations:
-      - device: gl-intel-apl
-        checksum: 46052998784defb089ce20fc8f39c6e9
-      - device: gl-intel-glk
-        checksum: 46052998784defb089ce20fc8f39c6e9
-      - device: gl-intel-amly
-        checksum: 7cd8249faa260ddb384b6707701370b1
-      - device: gl-intel-kbl
-        checksum: 46052998784defb089ce20fc8f39c6e9
-      - device: gl-intel-whl
-        checksum: 46052998784defb089ce20fc8f39c6e9
-      - device: gl-intel-cml
-        checksum: 46052998784defb089ce20fc8f39c6e9
-  - path: glmark2/buffer:update-fraction=0.5:update-dispersion=0.9:columns=200:update-method=map:interleave=true.trace
-    expectations:
-      - device: gl-intel-apl
-        checksum: 9ef1ec1d83a0b9448b2303b3c5f78447
-      - device: gl-intel-glk
-        checksum: 9ef1ec1d83a0b9448b2303b3c5f78447
-      - device: gl-intel-amly
-        checksum: f3ffb9c057daf37836fa1d9edded10c8
-      - device: gl-intel-kbl
-        checksum: 9ef1ec1d83a0b9448b2303b3c5f78447
-      - device: gl-intel-whl
-        checksum: 9ef1ec1d83a0b9448b2303b3c5f78447
-      - device: gl-intel-cml
-        checksum: 9ef1ec1d83a0b9448b2303b3c5f78447
-  - path: glmark2/buffer:update-fraction=0.5:update-dispersion=0.9:columns=200:update-method=subdata:interleave=false.trace
-    expectations:
-      - device: gl-intel-apl
-        checksum: 29a7734de59f3745158596942d0fb2fe
-      - device: gl-intel-glk
-        checksum: 29a7734de59f3745158596942d0fb2fe
-      - device: gl-intel-amly
-        checksum: 5c59cc9445dfbfcb41464fd469af9c2b
-      - device: gl-intel-kbl
-        checksum: 29a7734de59f3745158596942d0fb2fe
-      - device: gl-intel-whl
-        checksum: 29a7734de59f3745158596942d0fb2fe
-      - device: gl-intel-cml
-        checksum: 29a7734de59f3745158596942d0fb2fe
-  - path: glmark2/bump:bump-render=height.trace
-    expectations:
-      - device: gl-intel-apl
-        checksum: e299189c84a7005726554f7ca74611eb
-      - device: gl-intel-glk
-        checksum: e299189c84a7005726554f7ca74611eb
-      - device: gl-intel-amly
-        checksum: 5b119c2de40f8a46708470f567952852
-      - device: gl-intel-kbl
-        checksum: e299189c84a7005726554f7ca74611eb
-      - device: gl-intel-whl
-        checksum: e299189c84a7005726554f7ca74611eb
-      - device: gl-intel-cml
-        checksum: e299189c84a7005726554f7ca74611eb
-  - path: glmark2/bump:bump-render=high-poly.trace
-    expectations:
-      - device: gl-intel-apl
-        checksum: a6e89335a4443a80eaf7b1ae75575cac
-      - device: gl-intel-glk
-        checksum: a6e89335a4443a80eaf7b1ae75575cac
-      - device: gl-intel-amly
-        checksum: a6e89335a4443a80eaf7b1ae75575cac
-      - device: gl-intel-kbl
-        checksum: a6e89335a4443a80eaf7b1ae75575cac
-      - device: gl-intel-whl
-        checksum: a6e89335a4443a80eaf7b1ae75575cac
-      - device: gl-intel-cml
-        checksum: a6e89335a4443a80eaf7b1ae75575cac
-  - path: glmark2/bump:bump-render=normals.trace
-    expectations:
-      - device: gl-intel-apl
-        checksum: c8726956c5a3879b575ea244c36e372b
-      - device: gl-intel-glk
-        checksum: c8726956c5a3879b575ea244c36e372b
-      - device: gl-intel-amly
-        checksum: c8726956c5a3879b575ea244c36e372b
-      - device: gl-intel-kbl
-        checksum: c8726956c5a3879b575ea244c36e372b
-      - device: gl-intel-whl
-        checksum: c8726956c5a3879b575ea244c36e372b
-      - device: gl-intel-cml
-        checksum: c8726956c5a3879b575ea244c36e372b
-  - path: glmark2/conditionals:vertex-steps=0:fragment-steps=0.trace
-    expectations:
-      - device: gl-intel-apl
-        checksum: 70cd4a7a8ae25177bc4a2e3044c44c2d
-      - device: gl-intel-glk
-        checksum: 70cd4a7a8ae25177bc4a2e3044c44c2d
-      - device: gl-intel-amly
-        checksum: 70cd4a7a8ae25177bc4a2e3044c44c2d
-      - device: gl-intel-kbl
-        checksum: 70cd4a7a8ae25177bc4a2e3044c44c2d
-      - device: gl-intel-whl
-        checksum: 70cd4a7a8ae25177bc4a2e3044c44c2d
-      - device: gl-intel-cml
-        checksum: 70cd4a7a8ae25177bc4a2e3044c44c2d
-  - path: glmark2/conditionals:vertex-steps=0:fragment-steps=5.trace
-    expectations:
-      - device: gl-intel-apl
-        checksum: ef659484c57854a3fedb54c4f5b3983e
-      - device: gl-intel-glk
-        checksum: ef659484c57854a3fedb54c4f5b3983e
-      - device: gl-intel-amly
-        checksum: ef659484c57854a3fedb54c4f5b3983e
-      - device: gl-intel-kbl
-        checksum: ef659484c57854a3fedb54c4f5b3983e
-      - device: gl-intel-whl
-        checksum: ef659484c57854a3fedb54c4f5b3983e
-      - device: gl-intel-cml
-        checksum: ef659484c57854a3fedb54c4f5b3983e
-  - path: glmark2/conditionals:vertex-steps=5:fragment-steps=0.trace
-    expectations:
-      - device: gl-intel-apl
-        checksum: 0ee6864cc2c68cf767ffa773a1f81b6f
-      - device: gl-intel-glk
-        checksum: 0ee6864cc2c68cf767ffa773a1f81b6f
-      - device: gl-intel-amly
-        checksum: 0ee6864cc2c68cf767ffa773a1f81b6f
-      - device: gl-intel-kbl
-        checksum: 0ee6864cc2c68cf767ffa773a1f81b6f
-      - device: gl-intel-whl
-        checksum: 0ee6864cc2c68cf767ffa773a1f81b6f
-      - device: gl-intel-cml
-        checksum: 0ee6864cc2c68cf767ffa773a1f81b6f
-  - path: glmark2/desktop:windows=4:effect=shadow.trace
-    expectations:
-      - device: gl-intel-apl
-        checksum: 9099e32184329cecdfc6388b2a18964a
-      - device: gl-intel-glk
-        checksum: 9099e32184329cecdfc6388b2a18964a
-      - device: gl-intel-amly
-        checksum: 9099e32184329cecdfc6388b2a18964a
-      - device: gl-intel-kbl
-        checksum: 9099e32184329cecdfc6388b2a18964a
-      - device: gl-intel-whl
-        checksum: 9099e32184329cecdfc6388b2a18964a
-      - device: gl-intel-cml
-        checksum: 9099e32184329cecdfc6388b2a18964a
-  - path: glmark2/effect2d:kernel=0,1,0;1,-4,1;0,1,0;.trace
-    expectations:
-      - device: gl-intel-apl
-        checksum: e3677a85bc346a9bd52a6569d17bbe6e
-      - device: gl-intel-glk
-        checksum: e3677a85bc346a9bd52a6569d17bbe6e
-      - device: gl-intel-amly
-        checksum: e3677a85bc346a9bd52a6569d17bbe6e
-      - device: gl-intel-kbl
-        checksum: e3677a85bc346a9bd52a6569d17bbe6e
-      - device: gl-intel-whl
-        checksum: e3677a85bc346a9bd52a6569d17bbe6e
-      - device: gl-intel-cml
-        checksum: e3677a85bc346a9bd52a6569d17bbe6e
-  - path: glmark2/effect2d:kernel=1,1,1,1,1;1,1,1,1,1;1,1,1,1,1;.trace
-    expectations:
-      - device: gl-intel-apl
-        checksum: b80963dae6ecf40c83bfb16943ef1011
-      - device: gl-intel-glk
-        checksum: b80963dae6ecf40c83bfb16943ef1011
-      - device: gl-intel-amly
-        checksum: b80963dae6ecf40c83bfb16943ef1011
-      - device: gl-intel-kbl
-        checksum: b80963dae6ecf40c83bfb16943ef1011
-      - device: gl-intel-whl
-        checksum: b80963dae6ecf40c83bfb16943ef1011
-      - device: gl-intel-cml
-        checksum: b80963dae6ecf40c83bfb16943ef1011
-  - path: glmark2/function:fragment-steps=5:fragment-complexity=low.trace
-    expectations:
-      - device: gl-intel-apl
-        checksum: 8fa0f14154ac1ec8162ea8a0d5f26092
-      - device: gl-intel-glk
-        checksum: 8fa0f14154ac1ec8162ea8a0d5f26092
-      - device: gl-intel-amly
-        checksum: 8fa0f14154ac1ec8162ea8a0d5f26092
-      - device: gl-intel-kbl
-        checksum: 8fa0f14154ac1ec8162ea8a0d5f26092
-      - device: gl-intel-whl
-        checksum: 8fa0f14154ac1ec8162ea8a0d5f26092
-      - device: gl-intel-cml
-        checksum: 8fa0f14154ac1ec8162ea8a0d5f26092
-  - path: glmark2/function:fragment-steps=5:fragment-complexity=medium.trace
-    expectations:
-      - device: gl-intel-apl
-        checksum: 2ead7a061d05a6431c0efd076cb8731a
-      - device: gl-intel-glk
-        checksum: 2ead7a061d05a6431c0efd076cb8731a
-      - device: gl-intel-amly
-        checksum: 2ead7a061d05a6431c0efd076cb8731a
-      - device: gl-intel-kbl
-        checksum: 2ead7a061d05a6431c0efd076cb8731a
-      - device: gl-intel-whl
-        checksum: 2ead7a061d05a6431c0efd076cb8731a
-      - device: gl-intel-cml
-        checksum: 2ead7a061d05a6431c0efd076cb8731a
-  - path: glmark2/build:use-vbo=false.trace
-    expectations:
-      - device: gl-intel-apl
-        checksum: cd8899ad41a62df1425e9b9c9c8d9817
-      - device: gl-intel-glk
-        checksum: cd8899ad41a62df1425e9b9c9c8d9817
-      - device: gl-intel-amly
-        checksum: cf8ee908ffab16537acf899cd31698d3
-      - device: gl-intel-kbl
-        checksum: cd8899ad41a62df1425e9b9c9c8d9817
-      - device: gl-intel-whl
-        checksum: cd8899ad41a62df1425e9b9c9c8d9817
-      - device: gl-intel-cml
-        checksum: cd8899ad41a62df1425e9b9c9c8d9817
-  - path: glmark2/build:use-vbo=true.trace
-    expectations:
-      - device: gl-intel-apl
-        checksum: ef075cad089512504539bdb4139190f5
-      - device: gl-intel-glk
-        checksum: ef075cad089512504539bdb4139190f5
-      - device: gl-intel-amly
-        checksum: ef075cad089512504539bdb4139190f5
-      - device: gl-intel-kbl
-        checksum: ef075cad089512504539bdb4139190f5
-      - device: gl-intel-whl
-        checksum: ef075cad089512504539bdb4139190f5
-      - device: gl-intel-cml
-        checksum: ef075cad089512504539bdb4139190f5
-  - path: glmark2/ideas:speed=10000.trace
-    expectations:
-      - device: gl-intel-apl
-        checksum: 6af136c5ad47c86dfb48eaefae99856c
-      - device: gl-intel-glk
-        checksum: 6af136c5ad47c86dfb48eaefae99856c
-      - device: gl-intel-amly
-        checksum: b6d2684de7801307d540c1dc8d1a7bc4
-      - device: gl-intel-kbl
-        checksum: 6af136c5ad47c86dfb48eaefae99856c
-      - device: gl-intel-whl
-        checksum: 6af136c5ad47c86dfb48eaefae99856c
-      - device: gl-intel-cml
-        checksum: 6af136c5ad47c86dfb48eaefae99856c
-  - path: glmark2/loop:vertex-steps=5:fragment-steps=5:fragment-loop=false.trace
-    expectations:
-      - device: gl-intel-apl
-        checksum: 6c5675c503aec910095e57f0390d0311
-      - device: gl-intel-glk
-        checksum: 6c5675c503aec910095e57f0390d0311
-      - device: gl-intel-amly
-        checksum: 6c5675c503aec910095e57f0390d0311
-      - device: gl-intel-kbl
-        checksum: 6c5675c503aec910095e57f0390d0311
-      - device: gl-intel-whl
-        checksum: 6c5675c503aec910095e57f0390d0311
-      - device: gl-intel-cml
-        checksum: 6c5675c503aec910095e57f0390d0311
-  - path: glmark2/loop:vertex-steps=5:fragment-steps=5:fragment-uniform=false.trace
-    expectations:
-      - device: gl-intel-apl
-        checksum: 35521cba43b8c537f335bf65a31b6492
-      - device: gl-intel-glk
-        checksum: 35521cba43b8c537f335bf65a31b6492
-      - device: gl-intel-amly
-        checksum: 35521cba43b8c537f335bf65a31b6492
-      - device: gl-intel-kbl
-        checksum: 35521cba43b8c537f335bf65a31b6492
-      - device: gl-intel-whl
-        checksum: 35521cba43b8c537f335bf65a31b6492
-      - device: gl-intel-cml
-        checksum: 35521cba43b8c537f335bf65a31b6492
-  - path: glmark2/loop:vertex-steps=5:fragment-steps=5:fragment-uniform=true.trace
-    expectations:
-      - device: gl-intel-apl
-        checksum: 314cebc76c8eb24bc4a453ac7b85e6a7
-      - device: gl-intel-glk
-        checksum: 314cebc76c8eb24bc4a453ac7b85e6a7
-      - device: gl-intel-amly
-        checksum: 314cebc76c8eb24bc4a453ac7b85e6a7
-      - device: gl-intel-kbl
-        checksum: 314cebc76c8eb24bc4a453ac7b85e6a7
-      - device: gl-intel-whl
-        checksum: 314cebc76c8eb24bc4a453ac7b85e6a7
-      - device: gl-intel-cml
-        checksum: 314cebc76c8eb24bc4a453ac7b85e6a7
-  - path: glmark2/pulsar:quads=5:texture=false:light=false.trace
-    expectations:
-      - device: gl-intel-apl
-        checksum: e5c0ce9da8cd96f9a07dfdf053683b66
-      - device: gl-intel-glk
-        checksum: e5c0ce9da8cd96f9a07dfdf053683b66
-      - device: gl-intel-amly
-        checksum: e5c0ce9da8cd96f9a07dfdf053683b66
-      - device: gl-intel-kbl
-        checksum: e5c0ce9da8cd96f9a07dfdf053683b66
-      - device: gl-intel-whl
-        checksum: e5c0ce9da8cd96f9a07dfdf053683b66
-      - device: gl-intel-cml
-        checksum: e5c0ce9da8cd96f9a07dfdf053683b66
-  - path: glmark2/refract.trace
-    expectations:
-      - device: gl-intel-apl
-        checksum: fce8611398afd2fbef4b6d4e571fe878
-      - device: gl-intel-glk
-        checksum: fce8611398afd2fbef4b6d4e571fe878
-      - device: gl-intel-amly
-        checksum: dd8079f362dcbdd0cd1bdaac02c86dc4
-      - device: gl-intel-kbl
-        checksum: fce8611398afd2fbef4b6d4e571fe878
-      - device: gl-intel-whl
-        checksum: fce8611398afd2fbef4b6d4e571fe878
-      - device: gl-intel-cml
-        checksum: fce8611398afd2fbef4b6d4e571fe878
-  - path: glmark2/shading:shading=blinn-phong-inf.trace
-    expectations:
-      - device: gl-intel-apl
-        checksum: 8e29dfb2accb040d3ea40ad106e776a9
-      - device: gl-intel-glk
-        checksum: 8e29dfb2accb040d3ea40ad106e776a9
-      - device: gl-intel-amly
-        checksum: 8e29dfb2accb040d3ea40ad106e776a9
-      - device: gl-intel-kbl
-        checksum: 8e29dfb2accb040d3ea40ad106e776a9
-      - device: gl-intel-whl
-        checksum: 8e29dfb2accb040d3ea40ad106e776a9
-      - device: gl-intel-cml
-        checksum: 8e29dfb2accb040d3ea40ad106e776a9
-  - path: glmark2/shading:shading=cel.trace
-    expectations:
-      - device: gl-intel-apl
-        checksum: adf3d3fd63b94dff23312fad6939e789
-      - device: gl-intel-glk
-        checksum: adf3d3fd63b94dff23312fad6939e789
-      - device: gl-intel-amly
-        checksum: adf3d3fd63b94dff23312fad6939e789
-      - device: gl-intel-kbl
-        checksum: adf3d3fd63b94dff23312fad6939e789
-      - device: gl-intel-whl
-        checksum: adf3d3fd63b94dff23312fad6939e789
-      - device: gl-intel-cml
-        checksum: adf3d3fd63b94dff23312fad6939e789
-  - path: glmark2/shading:shading=gouraud.trace
-    expectations:
-      - device: gl-intel-apl
-        checksum: 76d7f65e289f474a7024a44152252aa8
-      - device: gl-intel-glk
-        checksum: 76d7f65e289f474a7024a44152252aa8
-      - device: gl-intel-amly
-        checksum: 76d7f65e289f474a7024a44152252aa8
-      - device: gl-intel-kbl
-        checksum: 76d7f65e289f474a7024a44152252aa8
-      - device: gl-intel-whl
-        checksum: 76d7f65e289f474a7024a44152252aa8
-      - device: gl-intel-cml
-        checksum: 76d7f65e289f474a7024a44152252aa8
-  - path: glmark2/shading:shading=phong.trace
-    expectations:
-      - device: gl-intel-apl
-        checksum: f6b5fd88e53d12d90622f3504b92e6db
-      - device: gl-intel-glk
-        checksum: f6b5fd88e53d12d90622f3504b92e6db
-      - device: gl-intel-amly
-        checksum: 3fd0b081537d54868292b148ffa5ad80
-      - device: gl-intel-kbl
-        checksum: f6b5fd88e53d12d90622f3504b92e6db
-      - device: gl-intel-whl
-        checksum: f6b5fd88e53d12d90622f3504b92e6db
-      - device: gl-intel-cml
-        checksum: f6b5fd88e53d12d90622f3504b92e6db
-  - path: glmark2/shadow.trace
-    expectations:
-      - device: gl-intel-apl
-        checksum: 5d152ef79b699de16dfc1e2c72951346
-      - device: gl-intel-glk
-        checksum: 5d152ef79b699de16dfc1e2c72951346
-      - device: gl-intel-amly
-        checksum: 5d152ef79b699de16dfc1e2c72951346
-      - device: gl-intel-kbl
-        checksum: 5d152ef79b699de16dfc1e2c72951346
-      - device: gl-intel-whl
-        checksum: 5d152ef79b699de16dfc1e2c72951346
-      - device: gl-intel-cml
-        checksum: 5d152ef79b699de16dfc1e2c72951346
-  - path: glmark2/terrain.trace
-    expectations:
-      - device: gl-intel-apl
-        checksum: 4cff4ebdf12cf46ffe3a4baee607f32c
-      - device: gl-intel-glk
-        checksum: 4cff4ebdf12cf46ffe3a4baee607f32c
-      - device: gl-intel-amly
-        checksum: 649b4fc7926c1f062fd72c80b1ffea93
-      - device: gl-intel-kbl
-        checksum: 4cff4ebdf12cf46ffe3a4baee607f32c
-      - device: gl-intel-whl
-        checksum: 4cff4ebdf12cf46ffe3a4baee607f32c
-      - device: gl-intel-cml
-        checksum: 4cff4ebdf12cf46ffe3a4baee607f32c
-  - path: glmark2/texture:texture-filter=linear.trace
-    expectations:
-      - device: gl-intel-apl
-        checksum: 9c15add29b4c783c93e1cc0d0fa0b084
-      - device: gl-intel-glk
-        checksum: 9c15add29b4c783c93e1cc0d0fa0b084
-      - device: gl-intel-amly
-        checksum: 9c15add29b4c783c93e1cc0d0fa0b084
-      - device: gl-intel-kbl
-        checksum: 9c15add29b4c783c93e1cc0d0fa0b084
-      - device: gl-intel-whl
-        checksum: 9c15add29b4c783c93e1cc0d0fa0b084
-      - device: gl-intel-cml
-        checksum: 9c15add29b4c783c93e1cc0d0fa0b084
-  - path: glmark2/texture:texture-filter=mipmap.trace
-    expectations:
-      - device: gl-intel-apl
-        checksum: ae4c0e010181f4e97d37e254737238c1
-      - device: gl-intel-glk
-        checksum: ae4c0e010181f4e97d37e254737238c1
-      - device: gl-intel-amly
-        checksum: ae4c0e010181f4e97d37e254737238c1
-      - device: gl-intel-kbl
-        checksum: ae4c0e010181f4e97d37e254737238c1
-      - device: gl-intel-whl
-        checksum: ae4c0e010181f4e97d37e254737238c1
-      - device: gl-intel-cml
-        checksum: ae4c0e010181f4e97d37e254737238c1
-  - path: glmark2/texture:texture-filter=nearest.trace
-    expectations:
-      - device: gl-intel-apl
-        checksum: 15d736a49c5457bdcf0abcfb9eb07890
-      - device: gl-intel-glk
-        checksum: 15d736a49c5457bdcf0abcfb9eb07890
-      - device: gl-intel-amly
-        checksum: 15d736a49c5457bdcf0abcfb9eb07890
-      - device: gl-intel-kbl
-        checksum: 15d736a49c5457bdcf0abcfb9eb07890
-      - device: gl-intel-whl
-        checksum: 15d736a49c5457bdcf0abcfb9eb07890
-      - device: gl-intel-cml
-        checksum: 15d736a49c5457bdcf0abcfb9eb07890
-  - path: godot/Material Testers.x86_64_2020.04.08_13.38_frame799.rdc
-    expectations:
-      - device: gl-intel-apl
-        checksum: ba5302821a4a4024ade9b98a191e80cc
-      - device: gl-intel-glk
-        checksum: ba5302821a4a4024ade9b98a191e80cc
-      - device: gl-intel-amly
-        checksum: daa6f0258a8f25e8cc6aa242ed796f64
-      - device: gl-intel-kbl
-        checksum: ba5302821a4a4024ade9b98a191e80cc
-      - device: gl-intel-whl
-        checksum: ba5302821a4a4024ade9b98a191e80cc
-      - device: gl-intel-cml
-        checksum: ba5302821a4a4024ade9b98a191e80cc
-  - path: gputest/pixmark-julia-fp32.trace
-    expectations:
-      - device: gl-intel-apl
-        checksum: a5ec72a5da355dfcd689411f89164f0c
-      - device: gl-intel-glk
-        checksum: a5ec72a5da355dfcd689411f89164f0c
-      - device: gl-intel-amly
-        checksum: 9beb523176e7c153300521679853127a
-      - device: gl-intel-kbl
-        checksum: a5ec72a5da355dfcd689411f89164f0c
-      - device: gl-intel-whl
-        checksum: a5ec72a5da355dfcd689411f89164f0c
-      - device: gl-intel-cml
-        checksum: a5ec72a5da355dfcd689411f89164f0c
-  - path: gputest/pixmark-julia-fp64.trace
-    expectations:
-      - device: gl-intel-apl
-        checksum: 95235e084d88bc41f8a1a05b79e88e33
-      - device: gl-intel-glk
-        checksum: 95235e084d88bc41f8a1a05b79e88e33
-      - device: gl-intel-amly
-        checksum: 95235e084d88bc41f8a1a05b79e88e33
-      - device: gl-intel-kbl
-        checksum: 95235e084d88bc41f8a1a05b79e88e33
-      - device: gl-intel-whl
-        checksum: 95235e084d88bc41f8a1a05b79e88e33
-      - device: gl-intel-cml
-        checksum: 95235e084d88bc41f8a1a05b79e88e33
-  - path: gputest/pixmark-volplosion.trace
-    expectations:
-      - device: gl-intel-apl
-        checksum: 9c891fd21b0cdc79f7071001d95d549c
-      - device: gl-intel-glk
-        checksum: 9c891fd21b0cdc79f7071001d95d549c
-      - device: gl-intel-amly
-        checksum: eedef23963d477408028b620badca109
-      - device: gl-intel-kbl
-        checksum: 9c891fd21b0cdc79f7071001d95d549c
-      - device: gl-intel-whl
-        checksum: 9c891fd21b0cdc79f7071001d95d549c
-      - device: gl-intel-cml
-        checksum: 9c891fd21b0cdc79f7071001d95d549c
-  - path: gputest/plot3d.trace
-    expectations:
-      - device: gl-intel-apl
-        checksum: cea8f26227763a3c3b2a2a6af9a0c1da
-      - device: gl-intel-glk
-        checksum: cea8f26227763a3c3b2a2a6af9a0c1da
-      - device: gl-intel-amly
-        checksum: 777f3cb48ccfdc541d78b12104761616
-      - device: gl-intel-kbl
-        checksum: cea8f26227763a3c3b2a2a6af9a0c1da
-      - device: gl-intel-whl
-        checksum: cea8f26227763a3c3b2a2a6af9a0c1da
-      - device: gl-intel-cml
-        checksum: cea8f26227763a3c3b2a2a6af9a0c1da
-  - path: gputest/tessmark.trace
-    expectations:
-      - device: gl-intel-apl
-        checksum: 10e49cd5a5e12d4a01f504c14b4335cc
-      - device: gl-intel-glk
-        checksum: 10e49cd5a5e12d4a01f504c14b4335cc
-      - device: gl-intel-amly
-        checksum: 37a451853926683b350353442a296c47
-      - device: gl-intel-kbl
-        checksum: 10e49cd5a5e12d4a01f504c14b4335cc
-      - device: gl-intel-whl
-        checksum: 10e49cd5a5e12d4a01f504c14b4335cc
-      - device: gl-intel-cml
-        checksum: 10e49cd5a5e12d4a01f504c14b4335cc
-  - path: humus/AmbientAperture.trace
-    expectations:
-      - device: gl-intel-apl
-        checksum: 5d0d439423d38d2f0f2520e6a1c4c819
-      - device: gl-intel-glk
-        checksum: 5d0d439423d38d2f0f2520e6a1c4c819
-      - device: gl-intel-amly
-        checksum: a946252f3188a979144f4c8f4ea22fea
-      - device: gl-intel-kbl
-        checksum: 5d0d439423d38d2f0f2520e6a1c4c819
-      - device: gl-intel-whl
-        checksum: 5d0d439423d38d2f0f2520e6a1c4c819
-      - device: gl-intel-cml
-        checksum: 5d0d439423d38d2f0f2520e6a1c4c819
-  - path: humus/Portals.trace
-    expectations:
-      - device: gl-intel-apl
-        checksum: 4b50340b8898687c37a908e799f9238e
-      - device: gl-intel-glk
-        checksum: 4b50340b8898687c37a908e799f9238e
-      - device: gl-intel-amly
-        checksum: 84da7effee40af07b99e60d12c836c3c
-      - device: gl-intel-kbl
-        checksum: 4b50340b8898687c37a908e799f9238e
-      - device: gl-intel-whl
-        checksum: 4b50340b8898687c37a908e799f9238e
-      - device: gl-intel-cml
-        checksum: 4b50340b8898687c37a908e799f9238e
-  - path: humus/CelShading.trace
-    expectations:
-      - device: gl-intel-apl
-        checksum: 5476bd1ed551e20fbe118dc8b4b5d515
-      - device: gl-intel-glk
-        checksum: 5476bd1ed551e20fbe118dc8b4b5d515
-      - device: gl-intel-amly
-        checksum: 5476bd1ed551e20fbe118dc8b4b5d515
-      - device: gl-intel-kbl
-        checksum: 5476bd1ed551e20fbe118dc8b4b5d515
-      - device: gl-intel-whl
-        checksum: 5476bd1ed551e20fbe118dc8b4b5d515
-      - device: gl-intel-cml
-        checksum: 5476bd1ed551e20fbe118dc8b4b5d515
-  - path: humus/DynamicBranching3.trace
-    expectations:
-      - device: gl-intel-apl
-        checksum: 51d5ffe732076a80ffaa7f935c528c42
-      - device: gl-intel-glk
-        checksum: 51d5ffe732076a80ffaa7f935c528c42
-      - device: gl-intel-amly
-        checksum: e4ad0f6c724ac072fe41c15d35fabc7c
-      - device: gl-intel-kbl
-        checksum: 51d5ffe732076a80ffaa7f935c528c42
-      - device: gl-intel-whl
-        checksum: 51d5ffe732076a80ffaa7f935c528c42
-      - device: gl-intel-cml
-        checksum: 51d5ffe732076a80ffaa7f935c528c42
-  - path: humus/HDR.trace
-    expectations:
-      - device: gl-intel-apl
-        checksum: e23bfd9704f3cc6ce3fd38685f5d3c61
-      - device: gl-intel-glk
-        checksum: e23bfd9704f3cc6ce3fd38685f5d3c61
-      - device: gl-intel-amly
-        checksum: e23bfd9704f3cc6ce3fd38685f5d3c61
-      - device: gl-intel-kbl
-        checksum: e23bfd9704f3cc6ce3fd38685f5d3c61
-      - device: gl-intel-whl
-        checksum: e23bfd9704f3cc6ce3fd38685f5d3c61
-      - device: gl-intel-cml
-        checksum: e23bfd9704f3cc6ce3fd38685f5d3c61
-  - path: humus/RaytracedShadows.trace
-    expectations:
-      - device: gl-intel-apl
-        checksum: c6ecea7b8ddb60526af4de7ec1a5be62
-      - device: gl-intel-glk
-        checksum: c6ecea7b8ddb60526af4de7ec1a5be62
-      - device: gl-intel-amly
-        checksum: c6ecea7b8ddb60526af4de7ec1a5be62
-      - device: gl-intel-kbl
-        checksum: c6ecea7b8ddb60526af4de7ec1a5be62
-      - device: gl-intel-whl
-        checksum: c6ecea7b8ddb60526af4de7ec1a5be62
-      - device: gl-intel-cml
-        checksum: c6ecea7b8ddb60526af4de7ec1a5be62
-  - path: humus/VolumetricFogging2.trace
-    expectations:
-      - device: gl-intel-apl
-        checksum: 2224e04e0aa162c19a22cbeb5bf16114
-      - device: gl-intel-glk
-        checksum: 2224e04e0aa162c19a22cbeb5bf16114
-      - device: gl-intel-amly
-        checksum: 2224e04e0aa162c19a22cbeb5bf16114
-      - device: gl-intel-kbl
-        checksum: 2224e04e0aa162c19a22cbeb5bf16114
-      - device: gl-intel-whl
-        checksum: 2224e04e0aa162c19a22cbeb5bf16114
-      - device: gl-intel-cml
-        checksum: 2224e04e0aa162c19a22cbeb5bf16114
-  - path: neverball/neverball.trace
-    expectations:
-      - device: gl-intel-apl
-        checksum: 75acd3160d268de2c5f286ff4546258c
-      - device: gl-intel-glk
-        checksum: 75acd3160d268de2c5f286ff4546258c
-      - device: gl-intel-amly
-        checksum: 4ca08b4200d9e8a5e74babcb9e14b726
-      - device: gl-intel-kbl
-        checksum: 75acd3160d268de2c5f286ff4546258c
-      - device: gl-intel-whl
-        checksum: 75acd3160d268de2c5f286ff4546258c
-      - device: gl-intel-cml
-        checksum: 75acd3160d268de2c5f286ff4546258c
-  - path: supertuxkart/supertuxkart-antediluvian-abyss.rdc
-    expectations:
-      - device: gl-intel-apl
-        checksum: 0af2faa0d9183c1bc4dc7612befe1f0a
-      - device: gl-intel-glk
-        checksum: 0af2faa0d9183c1bc4dc7612befe1f0a
-      - device: gl-intel-amly
-        checksum: 8b76f8dc6770a62b413b956d700a1080
-      - device: gl-intel-kbl
-        checksum: 0af2faa0d9183c1bc4dc7612befe1f0a
-      - device: gl-intel-whl
-        checksum: 0af2faa0d9183c1bc4dc7612befe1f0a
-      - device: gl-intel-cml
-        checksum: 0af2faa0d9183c1bc4dc7612befe1f0a
-  - path: supertuxkart/supertuxkart-menu.rdc
-    expectations:
-      - device: gl-intel-apl
-        checksum: 0a4095dc7b441643a3336975b61c9e6a
-      - device: gl-intel-glk
-        checksum: 0a4095dc7b441643a3336975b61c9e6a
-      - device: gl-intel-amly
-        checksum: 0a4095dc7b441643a3336975b61c9e6a
-      - device: gl-intel-kbl
-        checksum: 0a4095dc7b441643a3336975b61c9e6a
-      - device: gl-intel-whl
-        checksum: 0a4095dc7b441643a3336975b61c9e6a
-      - device: gl-intel-cml
-        checksum: 0a4095dc7b441643a3336975b61c9e6a
-  - path: supertuxkart/supertuxkart-ravenbridge-mansion.rdc
-    expectations:
-      - device: gl-intel-apl
-        checksum: ca0b64f1a62e01765146be8391eae636
-      - device: gl-intel-glk
-        checksum: ca0b64f1a62e01765146be8391eae636
-      - device: gl-intel-amly
-        checksum: 66a7f3ad9511fd2700f5ec59589b0c7d
-      - device: gl-intel-kbl
-        checksum: ca0b64f1a62e01765146be8391eae636
-      - device: gl-intel-whl
-        checksum: ca0b64f1a62e01765146be8391eae636
-      - device: gl-intel-cml
-        checksum: ca0b64f1a62e01765146be8391eae636
-  - path: valve/counterstrike-v2.trace
-    expectations:
-      - device: gl-intel-apl
-        checksum: 757e0c9a37ecfc5a2efb10505f98ad95
-      - device: gl-intel-glk
-        checksum: 757e0c9a37ecfc5a2efb10505f98ad95
-      - device: gl-intel-amly
-        checksum: 757e0c9a37ecfc5a2efb10505f98ad95
-      - device: gl-intel-kbl
-        checksum: 757e0c9a37ecfc5a2efb10505f98ad95
-      - device: gl-intel-whl
-        checksum: 757e0c9a37ecfc5a2efb10505f98ad95
-      - device: gl-intel-cml
-        checksum: 757e0c9a37ecfc5a2efb10505f98ad95
-  # 3 minutes on APL
-  #- path: valve/counterstrike-source-v2.trace
-  #  expectations:
-  #    - device: gl-intel-apl
-  #      checksum: 072e488a7d0289a49d60dc5bcb0b1878
-  #    - device: gl-intel-glk
-  #      checksum: 072e488a7d0289a49d60dc5bcb0b1878
-  #    - device: gl-intel-amly
-  #      checksum: 072e488a7d0289a49d60dc5bcb0b1878
-  #    - device: gl-intel-kbl
-  #      checksum: 072e488a7d0289a49d60dc5bcb0b1878
-  #    - device: gl-intel-whl
-  #      checksum: 072e488a7d0289a49d60dc5bcb0b1878
-  #    - device: gl-intel-cml
-  #      checksum: 072e488a7d0289a49d60dc5bcb0b1878
-  # 4 minutes on APL
-  #- path: valve/half-life-2-v2.trace
-  #  expectations:
-  #    - device: gl-intel-apl
-  #      checksum: 64575bc6478dbc2b2dde1552010ac37b
-  #    - device: gl-intel-glk
-  #      checksum: 64575bc6478dbc2b2dde1552010ac37b
-  #    - device: gl-intel-amly
-  #      checksum: 64575bc6478dbc2b2dde1552010ac37b
-  #    - device: gl-intel-kbl
-  #      checksum: 64575bc6478dbc2b2dde1552010ac37b
-  #    - device: gl-intel-whl
-  #      checksum: 64575bc6478dbc2b2dde1552010ac37b
-  #    - device: gl-intel-cml
-  #      checksum: 64575bc6478dbc2b2dde1552010ac37b
-  # 3 minutes on APL
-  #- path: valve/portal-2-v2.trace
-  #  expectations:
-  #    - device: gl-intel-apl
-  #      checksum: 9c698dac9ca633e3a54980b80b7b287a
-  #    - device: gl-intel-glk
-  #     checksum: 9c698dac9ca633e3a54980b80b7b287a
-  #    - device: gl-intel-amly
-  #      checksum: 9c698dac9ca633e3a54980b80b7b287a
-  #    - device: gl-intel-kbl
-  #      checksum: 9c698dac9ca633e3a54980b80b7b287a
-  #    - device: gl-intel-whl
-  #      checksum: 9c698dac9ca633e3a54980b80b7b287a
-  #    - device: gl-intel-cml
-  #      checksum: 9c698dac9ca633e3a54980b80b7b287a
-  # Seeing connection resets downloading this.
-  # - path: xonotic/xonotic-keybench-high.trace
-  #   expectations:
-  #     - device: gl-intel-apl
-  #       checksum: 95f60026993c36b37957043190d1a21c
-  #     - device: gl-intel-glx
-  #      checksum: 95f60026993c36b37957043190d1a21c
-  #     - device: gl-intel-amly
-  #       checksum: 95f60026993c36b37957043190d1a21c
-  #    - device: gl-intel-kbl
-  #       checksum: 95f60026993c36b37957043190d1a21c
-  #    - device: gl-intel-whl
-  #       checksum: 95f60026993c36b37957043190d1a21c
-  #    - device: gl-intel-cml
-  #       checksum: 95f60026993c36b37957043190d1a21c

src/gallium/drivers/lima/ci/gitlab-ci.yml

@@ -1,15 +0,0 @@
-.lima-mali450-test:arm64:
-  extends:
-    - .lava-test:arm64
-    - .lima-rules
-  variables:
-    DEVICE_TYPE: meson-gxl-s805x-libretech-ac
-    DTB: ${DEVICE_TYPE}
-    FDO_HTTP_CACHE_URI: ''
-    GPU_VERSION: lima
-    FDO_CI_CONCURRENT: 4
-    DEQP_EXPECTED_RENDERER: Mali450
-    VISIBILITY_GROUP: "mesa-ci"
-
-  tags:
-    - mesa-ci-x86-64-lava-lima

src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml

@@ -1,114 +0,0 @@
-.llvmpipe-test:
-  extends:
-    - .llvmpipe-rules
-  variables:
-    LIBGL_ALWAYS_SOFTWARE: "true"
-    GALLIUM_DRIVER: "llvmpipe"
-    FLAKES_CHANNEL: "#mesa-swrast-ci"
-
-llvmpipe-piglit-cl:
-  extends:
-    - .test-cl
-    - .piglit-test
-    - .llvmpipe-test
-    - .llvmpipe-cl-rules
-  variables:
-    LP_CL: 1
-    LP_NUM_THREADS: 1
-    PIGLIT_PROFILES: cl
-    PIGLIT_RESULTS: "llvmpipe-cl"
-    PIGLIT_TESTS: >
-      -x bswap -x phatk -x clz-optimizations
-  script:
-    - install/piglit/run_cl.sh
-
-llvmpipe-piglit-quick_gl:
-  extends:
-    - .test-gl
-    - .piglit-test
-    - .llvmpipe-test
-  variables:
-    GALLIVM_PERF: "no_quad_lod"
-    LP_NUM_THREADS: 0
-    PIGLIT_OPTIONS: >
-      --process-isolation false
-    # Can't run gl-2.0-edgeflag* because of assertion failures on loading from
-    # disk cache which flake depending on which one runs first
-    PIGLIT_TESTS: >
-      -x gl-2.0-edgeflag
-      -x egl_ext_device_
-      -x egl_ext_platform_device
-      -x ext_timer_query@time-elapsed
-      -x glx-multithread-clearbuffer
-      -x glx-multithread-shader-compile
-      -x max-texture-size
-      -x maxsize
-    PIGLIT_PROFILES: quick_gl
-    PIGLIT_RESULTS: "llvmpipe-quick_gl"
-
-llvmpipe-piglit-glslparser:
-  extends:
-    - .test-gl
-    - .piglit-test
-    - .llvmpipe-test
-  variables:
-    LP_NUM_THREADS: 0
-    PIGLIT_PROFILES: glslparser
-    PIGLIT_RESULTS: "llvmpipe-glslparser"
-
-llvmpipe-piglit-quick_shader:
-  extends:
-    - .test-gl
-    - .piglit-test
-    - .llvmpipe-test
-  variables:
-    LP_NUM_THREADS: 1
-    PIGLIT_PROFILES: quick_shader
-    PIGLIT_RESULTS: "llvmpipe-quick_shader"
-
-llvmpipe-traces:
-  extends:
-    - .test-gl
-    - .piglit-traces-test
-    - .llvmpipe-test
-  variables:
-    EGL_PLATFORM: "surfaceless"
-    PIGLIT_REPLAY_DESCRIPTION_FILE: "${CI_PROJECT_DIR}/install/traces-llvmpipe.yml"
-    PIGLIT_REPLAY_DEVICE_NAME: "gl-vmware-llvmpipe"
-    PIGLIT_RESULTS: "llvmpipe-replay"
-
-.llvmpipe-deqp-test:
-  variables:
-    GALLIVM_PERF: "nopt"
-    # Don't use threads inside llvmpipe, we've already got all cores
-    # busy at the deqp-runner level.
-    LP_NUM_THREADS: 0
-    GPU_VERSION: llvmpipe
-  extends:
-    - .test-gl
-    - .deqp-test
-    - .llvmpipe-test
-
-llvmpipe-deqp:
-  variables:
-    DEQP_SUITE: llvmpipe
-  parallel: 2
-  extends: .llvmpipe-deqp-test
-
-llvmpipe-deqp-asan:
-  variables:
-    DEQP_SUITE: llvmpipe-asan
-    GPU_VERSION: llvmpipe-asan
-    DEQP_FRACTION: 10
-  extends: .llvmpipe-deqp-test
-  needs:
-    - debian/x86_test-gl
-    - debian-testing-asan
-
-llvmpipe-egl:
-  variables:
-    DEQP_VER: egl
-  extends:
-    - .llvmpipe-deqp-test
-  script:
-    - xvfb-run --server-args='-noreset' ./install/deqp-runner.sh

src/gallium/drivers/llvmpipe/ci/traces-llvmpipe.yml

@@ -1,177 +0,0 @@
-traces-db:
-  download-url: "https://minio-packet.freedesktop.org/mesa-tracie-public/"
-
-traces:
-  - path: glmark2/desktop:windows=4:effect=blur:blur-radius=5:passes=1:separable=true.trace
-    expectations:
-      - device: gl-vmware-llvmpipe
-        checksum: fa54af7770699dfe78c3e33061312739
-  - path: glmark2/jellyfish.trace
-    expectations:
-      - device: gl-vmware-llvmpipe
-        checksum: 0bba174c99746be068c4960cb6a9dabb
-  - path: glxgears/glxgears-2.trace
-    expectations:
-      - device: gl-vmware-llvmpipe
-        checksum: f8eba0fec6e3e0af9cb09844bc73bdc8
-  - path: 0ad/0ad.trace
-    expectations:
-      - device: gl-vmware-llvmpipe
-        checksum: b29c740db174350d9be0beaaccd40453
-  - path: pathfinder/demo.trace
-    expectations:
-      - device: gl-vmware-llvmpipe
-        checksum: a053c56658bc830249bc94317a3b3ea8
-  - path: pathfinder/canvas_moire.trace
-    expectations:
-      - device: gl-vmware-llvmpipe
-        checksum: 2cb5be6a6f62e417f1a89c89180e5728
-  - path: pathfinder/canvas_text_v2.trace
-    expectations:
-      - device: gl-vmware-llvmpipe
-        checksum: a1446d0c42a78771240fca6f3b1e10d8
-  - path: gputest/furmark.trace
-    expectations:
-      - device: gl-vmware-llvmpipe
-        checksum: e2fea90560ce0f65efba5d38610dc7ef
-  - path: gputest/pixmark-piano.trace
-    expectations:
-      - device: gl-vmware-llvmpipe
-        checksum: b580ae01560380461a103975cab77393
-  - path: gputest/triangle.trace
-    expectations:
-      - device: gl-vmware-llvmpipe
-        checksum: 7812de00011a3a059892e36cea19c696
-  - path: humus/Portals.trace
-    expectations:
-      - device: gl-vmware-llvmpipe
-        checksum: a55dd3d87a86b3b47121ff67861028c3
-  - path: bgfx/01-cubes.rdc
-    expectations:
-      - device: gl-vmware-llvmpipe
-        checksum: a453a832e0e07132bb2c92c3fed7df18
-  - path: bgfx/02-metaballs.rdc
-    expectations:
-      - device: gl-vmware-llvmpipe
-        checksum: 905b005c6dce1cb54819085bf0c8dbfd
-  - path: bgfx/03-raymarch.rdc
-    expectations:
-      - device: gl-vmware-llvmpipe
-        checksum: 71c0a0fc8a3e2760014efda8c07c623e
-  - path: bgfx/04-mesh.rdc
-    expectations:
-      - device: gl-vmware-llvmpipe
-        checksum: 274682ad4bf2ca4fa9cc92b55a7fd20b
-  - path: bgfx/05-instancing.rdc
-    expectations:
-      - device: gl-vmware-llvmpipe
-        checksum: 948ec4c353485559163c575e80a01550
-  - path: bgfx/06-bump.rdc
-    expectations:
-      - device: gl-vmware-llvmpipe
-        checksum: 49b428a9c1a8e72f1ef5f3e91bc278db
-  - path: bgfx/07-callback.rdc
-    expectations:
-      - device: gl-vmware-llvmpipe
-        checksum: 702793a6317d16de9f8045128401b31a
-  - path: bgfx/09-hdr.rdc
-    expectations:
-      - device: gl-vmware-llvmpipe
-        checksum: f0e52dff670caa2aad0080a8aa59ad06
-  - path: bgfx/10-font.rdc
-    expectations:
-      - device: gl-vmware-llvmpipe
-        checksum: 0a1673e22adc3dc126c921fe9460b2fe
-  - path: bgfx/11-fontsdf.rdc
-    expectations:
-      - device: gl-vmware-llvmpipe
-        checksum: 65d8ab58c89debcb4b7d3f39e6785d2e
-  - path: bgfx/12-lod.rdc
-    expectations:
-      - device: gl-vmware-llvmpipe
-        checksum: a79ccce53c09c2a43a51be2467cb15bc
-  - path: bgfx/13-stencil.rdc
-    expectations:
-      - device: gl-vmware-llvmpipe
-        checksum: 244919318cc38eed2ca68a31a067f507
-  - path: bgfx/14-shadowvolumes.rdc
-    expectations:
-      - device: gl-vmware-llvmpipe
-        checksum: a94f05e82d4adc3e31bfcffd37f7b04b
-  - path: bgfx/15-shadowmaps-simple.rdc
-    expectations:
-      - device: gl-vmware-llvmpipe
-        checksum: 607edbe247f0977a011ea673965c376d
-  - path: bgfx/16-shadowmaps.rdc
-    expectations:
-      - device: gl-vmware-llvmpipe
-        checksum: 87562fb15f341a214765e47adc910cc0
-  - path: bgfx/18-ibl.rdc
-    expectations:
-      - device: gl-vmware-llvmpipe
-        checksum: 47490275249793f778fc5d14899bf836
-  - path: bgfx/19-oit.rdc
-    expectations:
-      - device: gl-vmware-llvmpipe
-        checksum: 5e5751621add149c9aab1e28e70ccfc7
-  - path: bgfx/20-nanosvg.rdc
-    expectations:
-      - device: gl-vmware-llvmpipe
-        checksum: 6b32c5f18a421412c7bbae3c65b5e0f6
-  - path: bgfx/23-vectordisplay.rdc
-    expectations:
-      - device: gl-vmware-llvmpipe
-        checksum: 7af42ee2a19009fd65e2a0c6aa2c2c8a
-  - path: bgfx/26-occlusion.rdc
-    expectations:
-      - device: gl-vmware-llvmpipe
-        checksum: 601965313d5db009067fce901be2be2c
-  - path: bgfx/28-wireframe.rdc
-    expectations:
-      - device: gl-vmware-llvmpipe
-        checksum: de5452f4cbc0100d8ecb51459e47cd99
-  - path: bgfx/29-debugdraw.rdc
-    expectations:
-      - device: gl-vmware-llvmpipe
-        checksum: 164e5226af26b6552506542a45bc6bf5
-  - path: bgfx/31-rsm.rdc
-    expectations:
-      - device: gl-vmware-llvmpipe
-        checksum: ef42f05c98862167a9eac6c733021e91
-  - path: bgfx/32-particles.rdc
-    expectations:
-      - device: gl-vmware-llvmpipe
-        checksum: 018418bdd7f60a186cce532613b0c7ab
-  - path: bgfx/33-pom.rdc
-    expectations:
-      - device: gl-vmware-llvmpipe
-        checksum: c2d54a830ada2ff97c7e532b22d858b4
-  - path: bgfx/34-mvs.rdc
-    expectations:
-      - device: gl-vmware-llvmpipe
-        checksum: 6ad9c7d97debb7bf495b0bfca921ba9c
-  - path: bgfx/35-dynamic.rdc
-    expectations:
-      - device: gl-vmware-llvmpipe
-        checksum: 62b390c4a31d7aa073fa4190fcfd0618
-  - path: bgfx/36-sky.rdc
-    expectations:
-      - device: gl-vmware-llvmpipe
-        checksum: 06b1a3eb0e4793930502d808939b2386
-  - path: bgfx/37-gpudrivenrendering.rdc
-    expectations:
-      - device: gl-vmware-llvmpipe
-        checksum: c435c6eedc86530da24856ab3f704681
-  - path: bgfx/38-bloom.rdc
-    expectations:
-      - device: gl-vmware-llvmpipe
-        checksum: 960ceb01ab2716de810d410c49cf71cf
-  - path: bgfx/39-assao.rdc
-    expectations:
-      - device: gl-vmware-llvmpipe
-        checksum: 5d9c6dd6399db34ac81951cd7152ec1c
-  - path: bgfx/40-svt.rdc
-    expectations:
-      - device: gl-vmware-llvmpipe
-        checksum: 83bf05971404700b874c4e9d9edd1379
-

src/gallium/drivers/radeonsi/ci/gitlab-ci.yml

@@ -1,95 +0,0 @@
-.radeonsi-stoney-test:amd64:
-  extends:
-    - .radeonsi-rules
-  variables:
-    DEVICE_TYPE: hp-11A-G6-EE-grunt
-    DTB: ""
-    GPU_VERSION: radeonsi-stoney
-    BOOT_METHOD: depthcharge
-    KERNEL_IMAGE_TYPE: ""
-    HWCI_KERNEL_MODULES: amdgpu
-    DRIVER_NAME: radeonsi
-    FDO_CI_CONCURRENT: 4
-    DEQP_EXPECTED_RENDERER: STONEY
-    HWCI_FREQ_MAX: "true"
-  tags:
-    - mesa-ci-x86-64-lava-hp-11A-G6-EE-grunt
-
-.radeonsi-stoney-deqp:amd64:
-  extends:
-    - .lava-test:amd64
-    - .radeonsi-stoney-test:amd64
-
-radeonsi-stoney-gles2:amd64:
-  extends:
-    - .radeonsi-stoney-deqp:amd64
-  variables:
-    DEQP_VER: gles2
-
-# Run two jobs in parallel each running 1/4th of the test suite
-radeonsi-stoney-gles3:amd64:
-  extends:
-    - .radeonsi-stoney-deqp:amd64
-  parallel: 2
-  variables:
-    DEQP_VER: gles3
-    FDO_CI_CONCURRENT: 4
-    DEQP_EXPECTED_RENDERER: STONEY
-    DEQP_FRACTION: 2
-
-
-# Run two jobs in parallel each running 1/4th of the test suite
-radeonsi-stoney-gles31:amd64:
-  extends:
-    - .radeonsi-stoney-deqp:amd64
-  parallel: 2
-  variables:
-    DEQP_VER: gles31
-    FDO_CI_CONCURRENT: 4
-    DEQP_EXPECTED_RENDERER: STONEY
-    DEQP_FRACTION: 2
-
-
-radeonsi-stoney-traces:amd64:
-  extends:
-    - .lava-piglit-traces:amd64
-    - .radeonsi-stoney-test:amd64
-  variables:
-    EGL_PLATFORM: surfaceless
-    PIGLIT_PROFILES: replay
-    PIGLIT_JUNIT_RESULTS: 1
-    PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/traces-radeonsi.yml"
-    PIGLIT_REPLAY_EXTRA_ARGS: --keep-image
-  tags:
-    - mesa-ci-x86-64-lava-hp-11A-G6-EE-grunt
-
-radeonsi-stoney-piglit-gl:amd64:
-  extends:
-    - .lava-piglit:amd64
-    - .radeonsi-stoney-test:amd64
-  variables:
-    PIGLIT_FRACTION: 4
-    PIGLIT_PLATFORM: mixed_glx_egl
-    PIGLIT_PROFILES: quick_gl
-    PIGLIT_JUNIT_RESULTS: 1
-    HWCI_START_XORG: 1
-
-radeonsi-stoney-va:amd64:
-  extends:
-    - .lava-test:amd64
-    - .radeonsi-stoney-test:amd64
-    - .radeonsi-vaapi-rules
-  variables:
-    HWCI_TEST_SCRIPT: "/install/gtest-runner.sh"
-    # While the tests don't need Xorg, it's an easy way to keep DRM open so we don't
-    # spend all our time in drm_lastclose()'s modesetting.
-    HWCI_START_XORG: 1
-    GTEST: test_va_api
-    # The big 10-surface 10k allocations oomkill us at around 2.5G of GPU memory
-    # allocated if we run at the normal 4 threads.
-    # https://github.com/intel/libva-utils/issues/248
-    FDO_CI_CONCURRENT: 1
-    # A whole run would be about 25 minutes currently.  Fixing
-    # https://github.com/intel/libva-utils/issues/247 and
-    # https://github.com/google/googletest/issues/3614 would probably help.
-    GTEST_FRACTION: 5

src/gallium/drivers/radeonsi/ci/traces-radeonsi.yml

@@ -1,236 +0,0 @@
-traces-db:
-  download-url: "http://caching-proxy/cache/?uri=https://minio-packet.freedesktop.org/mesa-tracie-public/"
-
-traces:
-  - path: glmark2/desktop:windows=4:effect=blur:blur-radius=5:passes=1:separable=true.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 740fa8f8e9a9d815cf160b1893370755
-  - path: glmark2/jellyfish.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 5bc7d5c250b7d568313c4afd064082f6
-  - path: glxgears/glxgears-2.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: ef3653f50d4853d3e9cb3244c799565a
-  - path: 0ad/0ad.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 1a089d8584a9e68e7ab08eada954741b
-  - path: pathfinder/demo.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: c81c85f9b247dd1b06c3dd5b669cc283
-  - path: pathfinder/canvas_moire.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 78dd2357ad6e5ffc049a75bfb11c5497
-  - path: pathfinder/canvas_text_v2.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 6cb8190a2ee4c335291914fbc70a8bb8
-  - path: gputest/furmark.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 4ceea12000bb5995b915228d2d4b49c7
-  - path: gputest/pixmark-piano.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 86ebe6ff8038975de8724fa9536edb7e
-  - path: gputest/triangle.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 2d0527e7288a0fc31099404546dadbfb
-  - path: humus/Portals.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 5b96333495b794691e4ed071ae92ff19
-  - path: glmark2/buffer:update-fraction=0.5:update-dispersion=0.9:columns=200:update-method=map:interleave=false.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 5db05161041946e8971f39f12bbd847c
-  - path: glmark2/buffer:update-fraction=0.5:update-dispersion=0.9:columns=200:update-method=map:interleave=true.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: e2154c522fcdb4f43b31b31c17adda74
-  - path: glmark2/buffer:update-fraction=0.5:update-dispersion=0.9:columns=200:update-method=subdata:interleave=false.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 70298e48479147af2d848a5441fb5f47
-  - path: glmark2/bump:bump-render=height.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: f5129b06e401a5fefa18a9895b18deec
-  - path: glmark2/bump:bump-render=high-poly.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 3fc1adf0caa289b3296a80c2c13834ca
-  - path: glmark2/bump:bump-render=normals.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 596fd7a084d3a7a6b61b322593385f45
-  - path: glmark2/conditionals:vertex-steps=0:fragment-steps=0.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: fb2eda378ace8ca8b81d73d20cbfbbf7
-  - path: glmark2/conditionals:vertex-steps=0:fragment-steps=5.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: b8575de0e043f540b12f13209054d000
-  - path: glmark2/conditionals:vertex-steps=5:fragment-steps=0.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: f70625a1f9bd9d2c211e330032b86f85
-  - path: glmark2/desktop:windows=4:effect=shadow.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 384015de55daf7dd406c9463576018e9
-  - path: glmark2/effect2d:kernel=0,1,0;1,-4,1;0,1,0;.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: e3677a85bc346a9bd52a6569d17bbe6e
-  - path: glmark2/effect2d:kernel=1,1,1,1,1;1,1,1,1,1;1,1,1,1,1;.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: f8af0ba4f5162fc91937a90c17445b50
-  - path: glmark2/function:fragment-steps=5:fragment-complexity=low.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 9efd8bb5df15f9483a18a00f9650caa9
-  - path: glmark2/function:fragment-steps=5:fragment-complexity=medium.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 9bdd506c0404cb11a7148cb08b429d1b
-  - path: glmark2/build:use-vbo=false.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 506b1910317b04e5d32aacf2bd70bd0d
-  - path: glmark2/build:use-vbo=true.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 793dc29115ae442b279276adb89d0999
-  - path: glmark2/ideas:speed=10000.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 1ae057093620f868aad846167f04c6e0
-  - path: glmark2/loop:vertex-steps=5:fragment-steps=5:fragment-loop=false.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 6fb2f9bce414879e3751bb51d1a8d481
-  - path: glmark2/loop:vertex-steps=5:fragment-steps=5:fragment-uniform=false.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 27fabda45ca2a989c21b4ec386a2e8f6
-  - path: glmark2/loop:vertex-steps=5:fragment-steps=5:fragment-uniform=true.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 05ac8be6e2e0c03ea1caec85f037cddd
-  - path: glmark2/pulsar:quads=5:texture=false:light=false.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 0b62b9c04e4c00f44eba64b366c47783
-  - path: glmark2/refract.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: c711f3a07f6aa9e0f19c544c6d7c2000
-  - path: glmark2/shading:shading=blinn-phong-inf.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 429c6bbdf99d573cc4eaaee3c0471257
-  - path: glmark2/shading:shading=cel.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 330d9a8375970e42ba5ddc3142dc6477
-  - path: glmark2/shading:shading=gouraud.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: e22908309d41af8c9753c5c7cae73b29
-  - path: glmark2/shading:shading=phong.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 2ac9f1b6ba39f8924b374d18181edeeb
-  - path: glmark2/shadow.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 9215a1525dfe5b12999652b3a3ba05d8
-  - path: glmark2/terrain.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 80a1bba6ff969c9a82c68de0306f2b61
-  - path: glmark2/texture:texture-filter=linear.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 928479421abda4823a673393cd59ff81
-  - path: glmark2/texture:texture-filter=mipmap.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: cb94bca58ed8f41c5f6f6dda3fb15600
-  - path: glmark2/texture:texture-filter=nearest.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 63762536d93048c0dadb19b22381cb90
-  - path: godot/Material Testers.x86_64_2020.04.08_13.38_frame799.rdc
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 0e7441a7f2c86c75eeac72269786e7a1
-  - path: gputest/gimark.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 3e021c1c5f2900e53c3375e0366eeda9
-  - path: gputest/pixmark-julia-fp32.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: b5e0ae5ad680d884432f89a923f3e70d
-  - path: gputest/pixmark-julia-fp64.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: b181b0a910f5ae5b161df70f834c3d5f
-  - path: gputest/pixmark-volplosion.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: c8321043b7c05156b71f9837b54e7b50
-  - path: gputest/plot3d.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 2832d2190df232bcbde71a4b720303e1
-  - path: gputest/tessmark.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: b4bc7998ff804bf25aac9f9609b8acbf
-  - path: humus/AmbientAperture.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 679dc88e5f0d3b3608e0490b4b39fbea
-  - path: humus/CelShading.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: ebd3f460386b9461aab6adef04dc0547
-  - path: humus/DynamicBranching3.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 9f932808ccce10a2bf7568ddafe1a1cf
-  - path: humus/HDR.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: fddf642f7a4e3946f1975e33cf773220
-  - path: humus/RaytracedShadows.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 743ce9c218b87404cfe615ed7951d5b8
-  - path: humus/VolumetricFogging2.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: e3eb8d6934c23cbef7133ba501821698
-  - path: supertuxkart/supertuxkart-antediluvian-abyss.rdc
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 112f203971d0f1ae46bc8268683480a2
-  - path: supertuxkart/supertuxkart-menu.rdc
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: e17f3125683d8b2acac8bc0b4b8e1b44
-  - path: supertuxkart/supertuxkart-ravenbridge-mansion.rdc
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 60f74020451e9beaf586b4551541b763

src/gallium/drivers/softpipe/ci/gitlab-ci.yml

@@ -1,71 +0,0 @@
-.softpipe-deqp-test:
-  extends:
-    - .test-gl
-    - .deqp-test
-    # this must be last to avoid breaking dependency rules
-    - .softpipe-rules
-  variables:
-    GPU_VERSION: softpipe
-    LIBGL_ALWAYS_SOFTWARE: "true"
-    GALLIUM_DRIVER: "softpipe"
-    DEQP_EXPECTED_RENDERER: softpipe
-    FLAKES_CHANNEL: "#mesa-swrast-ci"
-
-softpipe-deqp:
-  variables:
-    DEQP_SUITE: softpipe
-  parallel: 2
-  extends: .softpipe-deqp-test
-
-softpipe-asan-gles31:
-  variables:
-    GPU_VERSION: softpipe-asan
-    DEQP_FRACTION: 10
-    DEQP_VER: gles31
-    DEQP_RUNNER_OPTIONS: "--env LD_PRELOAD=libasan.so.6"
-  extends: .softpipe-deqp-test
-  needs:
-    - debian/x86_test-gl
-    - debian-testing-asan
-
-softpipe-piglit-quick:
-  extends:
-    - .test-gl
-    - .piglit-test
-    - .softpipe-rules
-  variables:
-    GALLIUM_DRIVER: softpipe
-    # rasterpos skipped until we uprev piglit (commit ff2a7650be7349)
-    # triangle-rasterization skipped due to flakes thanks to it using a time-based random seed.
-    # glx-multithread-texture is flaky, undiagnosed
-    PIGLIT_TESTS: >
-      -x rasterpos
-      -x triangle-rasterization
-      -x glx-multithread-texture
-      -x egl_ext_device_
-      -x egl_ext_platform_device
-      -x ext_timer_query@time-elapsed
-      -x glx-multithread-clearbuffer
-      -x glx-multithread-shader-compile
-      -x max-texture-size
-      -x maxsize
-      -x fs-execution-ordering
-      -x local-id-explosion
-      -x arb_pipeline_statistics_query-comp
-      -x streaming-texture-leak
-      -x longprim
-      -x shader-mem-barrier
-      -x arb_gpu_shader_fp64
-      -x arb_gpu_shader_int64
-      -x arb_tessellation_shader
-      -x glsl-4.00
-      -x glsl-4.10
-      -x glsl-4.20
-      -x glsl-4.30
-      -x glsl-4.40
-      -x glsl-4.50
-      -x gpu_shader4
-      -x gpu_shader5
-      -x glsl-uniform-interstage-limits
-    PIGLIT_PROFILES: quick_gl quick_shader
-    PIGLIT_RESULTS: softpipe-quick

src/gallium/drivers/virgl/ci/gitlab-ci.yml

@@ -1,51 +0,0 @@
-.virgl-test:
-  extends:
-    - .test-gl
-    - .virgl-rules
-  variables:
-    GALLIUM_DRIVER: "virgl"
-    CROSVM_GALLIUM_DRIVER: "llvmpipe"
-    CROSVM_GPU_ARGS: "gles=false,backend=virglrenderer,egl=true,surfaceless=true"
-
-virgl-on-gl:
-  variables:
-    DEQP_SUITE: virgl-gl
-    GPU_VERSION: virgl-gl
-    # Speed rendering a bit, as crosvm is processing requests serially
-    LP_NUM_THREADS: 8
-    FDO_CI_CONCURRENT: 3
-    CROSVM_TEST_SCRIPT: "/install/deqp-runner.sh"
-  parallel: 6
-  tags:
-    - kvm
-  script:
-    - install/crosvm-runner.sh
-  extends:
-    - .deqp-test
-    - .virgl-test
-
-virgl-on-gles:
-  variables:
-    VIRGL_HOST_API: GLES
-    DEQP_SUITE: virgl-gles
-    GPU_VERSION: virgl-gles
-    CROSVM_GPU_ARGS: "gles=true,backend=virglrenderer,egl=true,surfaceless=true"
-  extends:
-    - virgl-on-gl
-    - .test-manual
-
-virgl-traces:
-  extends:
-    - .virgl-test
-    - .piglit-traces-test
-  variables:
-    EGL_PLATFORM: "surfaceless"
-    PIGLIT_REPLAY_DESCRIPTION_FILE: "${CI_PROJECT_DIR}/install/traces-virgl.yml"
-    PIGLIT_REPLAY_DEVICE_NAME: "gl-virgl"
-    PIGLIT_RESULTS: "virgl-replay"
-    CROSVM_TEST_SCRIPT: "/install/piglit/run.sh"
-  tags:
-    - kvm
-  script:
-    - install/crosvm-runner.sh
-

src/gallium/drivers/virgl/ci/traces-virgl.yml

@@ -1,276 +0,0 @@
-traces-db:
-  download-url: "https://minio-packet.freedesktop.org/mesa-tracie-public/"
-
-traces:
-  - path: glmark2/desktop:windows=4:effect=blur:blur-radius=5:passes=1:separable=true.trace
-    expectations:
-      - device: gl-virgl
-        checksum: 2fc8433c4a38b796173bda2bcfb924cc
-  - path: glmark2/jellyfish.trace
-    expectations:
-      - device: gl-virgl
-        checksum: 48a2ad1162bf92301cedbe53edf52a6b
-  - path: glxgears/glxgears-2.trace
-    expectations:
-      - device: gl-virgl
-        checksum: f8eba0fec6e3e0af9cb09844bc73bdc8
-  - path: gputest/furmark.trace
-    expectations:
-      - device: gl-virgl
-        checksum: a38d4c123d13c5ccd3a86f0663fe1aab
-  - path: gputest/pixmark-piano.trace
-    expectations:
-      - device: gl-virgl
-        checksum: b580ae01560380461a103975cab77393
-  - path: gputest/triangle.trace
-    expectations:
-      - device: gl-virgl
-        checksum: 7812de00011a3a059892e36cea19c696
-  - path: humus/Portals.trace
-    expectations:
-      - device: gl-virgl
-        checksum: b697edce7776f1afe294a7e80dfc013e
-  - path: 0ad/0ad.trace
-    expectations:
-      - device: gl-virgl
-        checksum: 5e5bd83446d2554bf25761576d9b1af6
-  - path: glmark2/buffer:update-fraction=0.5:update-dispersion=0.9:columns=200:update-method=map:interleave=false.trace
-    expectations:
-      - device: gl-virgl
-        checksum: 0a44720bfe9cce13c52299a3125b2aae
-  - path: glmark2/buffer:update-fraction=0.5:update-dispersion=0.9:columns=200:update-method=subdata:interleave=false.trace
-    expectations:
-      - device: gl-virgl
-        checksum: c109416afbc0db4ba466d5a453b8a6dc
-  - path: glmark2/buffer:update-fraction=0.5:update-dispersion=0.9:columns=200:update-method=map:interleave=true.trace
-    expectations:
-      - device: gl-virgl
-        checksum: 1c0551f10a5dc9358f3fb9bb9f059883
-  - path: glmark2/bump:bump-render=height.trace
-    expectations:
-      - device: gl-virgl
-        checksum: 4d5211dfb0fd82a1a1dbb498dc2e5b8b
-  - path: glmark2/bump:bump-render=high-poly.trace
-    expectations:
-      - device: gl-virgl
-        checksum: 4b4d4a4b7bb1341bbd0299c7eb3a6ac9
-  - path: glmark2/bump:bump-render=normals.trace
-    expectations:
-      - device: gl-virgl
-        checksum: 832e5baf289b27dd84a665f1c85f57c2
-  - path: glmark2/conditionals:vertex-steps=0:fragment-steps=0.trace
-    expectations:
-      - device: gl-virgl
-        checksum: b78f28d97b675fcc7649cced3930650a
-  - path: glmark2/conditionals:vertex-steps=0:fragment-steps=5.trace
-    expectations:
-      - device: gl-virgl
-        checksum: d0782a516f06a6dddac4f1e1249f41e7
-  - path: glmark2/conditionals:vertex-steps=5:fragment-steps=0.trace
-    expectations:
-      - device: gl-virgl
-        checksum: 1ae280a9c6cae495f2d272516a52167e
-  - path: glmark2/desktop:windows=4:effect=shadow.trace
-    expectations:
-      - device: gl-virgl
-        checksum: d4b3e8338327859a029c7267c9916524
-  - path: glmark2/effect2d:kernel=0,1,0;1,-4,1;0,1,0;.trace
-    expectations:
-      - device: gl-virgl
-        checksum: 25d3b5d18a64a86fc812872987f4f5e7
-  - path: glmark2/effect2d:kernel=1,1,1,1,1;1,1,1,1,1;1,1,1,1,1;.trace
-    expectations:
-      - device: gl-virgl
-        checksum: b80963dae6ecf40c83bfb16943ef1011
-  - path: glmark2/function:fragment-steps=5:fragment-complexity=low.trace
-    expectations:
-      - device: gl-virgl
-        checksum: da10cb29cab30c5c068e722b5da7c2e5
-  - path: glmark2/function:fragment-steps=5:fragment-complexity=medium.trace
-    expectations:
-      - device: gl-virgl
-        checksum: 8e40504d9f2ead8c0d02604291bff1b6
-  - path: glmark2/build:use-vbo=false.trace
-    expectations:
-      - device: gl-virgl
-        checksum: 024fc485e1f33461313c956ab1b73bdf
-  - path: glmark2/build:use-vbo=true.trace
-    expectations:
-      - device: gl-virgl
-        checksum: 48c45d16cd410a71aea1a12a73e257d3
-  - path: glmark2/ideas:speed=10000.trace
-    expectations:
-      - device: gl-virgl
-        checksum: db78cfb035213e31e1435b637b1a8f19
-  - path: glmark2/loop:vertex-steps=5:fragment-steps=5:fragment-loop=false.trace
-    expectations:
-      - device: gl-virgl
-        checksum: 7fee2e864e015353ace431d51d41bb22
-  - path: glmark2/loop:vertex-steps=5:fragment-steps=5:fragment-uniform=false.trace
-    expectations:
-      - device: gl-virgl
-        checksum: c87127a5c3256c1fe7c79f7931b8f9df
-  - path: glmark2/loop:vertex-steps=5:fragment-steps=5:fragment-uniform=true.trace
-    expectations:
-      - device: gl-virgl
-        checksum: 5fec1f728bda86891db4243130546187
-  - path: glmark2/pulsar:quads=5:texture=false:light=false.trace
-    expectations:
-      - device: gl-virgl
-        checksum: 3e0e6675fb65e00f9128138ff08c2634
-  - path: glmark2/refract.trace
-    expectations:
-      - device: gl-virgl
-        checksum: cdadfee0518b964433d80c01329ec191
-  - path: glmark2/shading:shading=blinn-phong-inf.trace
-    expectations:
-      - device: gl-virgl
-        checksum: 36b07dad759ca65e52f1abf1667e7ca8
-  - path: glmark2/shading:shading=cel.trace
-    expectations:
-      - device: gl-virgl
-        checksum: cb41cf2531a06d65f6e4f442ab62ae8d
-  - path: glmark2/shading:shading=gouraud.trace
-    expectations:
-      - device: gl-virgl
-        checksum: 3e5469d5038d7cc94ef3549ce9d8c385
-  - path: glmark2/shading:shading=phong.trace
-    expectations:
-      - device: gl-virgl
-        checksum: e40abcbb4cfbbbfb499d4b0e6d668f41
-  - path: glmark2/shadow.trace
-    expectations:
-      - device: gl-virgl
-        checksum: 2bb7290f8559ff93305c0e29f3d671e1
-  - path: glmark2/texture:texture-filter=linear.trace
-    expectations:
-      - device: gl-virgl
-        checksum: 914fd8dddb23751d9a187a979d881abb
-  - path: glmark2/texture:texture-filter=mipmap.trace
-    expectations:
-      - device: gl-virgl
-        checksum: ea1939f3c4e8dd9cdbc26d41f9dc891a
-  - path: glmark2/texture:texture-filter=nearest.trace
-    expectations:
-      - device: gl-virgl
-        checksum: 1ae652bdebd1188ab912a800a4c37166
-  - path: glxgears/glxgears.trace
-    expectations:
-      - device: gl-virgl
-        checksum: 02aca9b4b4ad6fd60331df6e4f87f2cd
-# Crash
-#  - path: gputest/gimark.trace
-#    expectations:
-#      - device: gl-virgl
-#        checksum: 2cf40180a1315795389d0dfc18aad988
-  - path: gputest/pixmark-julia-fp32.trace
-    expectations:
-      - device: gl-virgl
-        checksum: 8b3584b1dd8f1d1bb63205564bd78e4e
-  - path: gputest/pixmark-julia-fp64.trace
-    expectations:
-      - device: gl-virgl
-        checksum: 73ccaff82ea764057fb0f93f0024cf84
-  - path: gputest/pixmark-volplosion.trace
-    expectations:
-      - device: gl-virgl
-        checksum: 9bedb84d81528e1b4087522de9f70383
-  - path: gputest/plot3d.trace
-    expectations:
-      - device: gl-virgl
-        checksum: 7e818a6070005056700e5ef8590a3f8e
-# Times out
-# - path: gputest/tessmark.trace
-#   expectations:
-#     - device: gl-virgl
-#       checksum: 5d04b8d71517238b9bc8a527574e884b
-  - path: humus/AmbientAperture.trace
-    expectations:
-      - device: gl-virgl
-        checksum: b33fb8ee73b0c50b14822e170f15ab8a
-  - path: humus/CelShading.trace
-    expectations:
-      - device: gl-virgl
-        checksum: 3629cba72bde53e4275a8365175fde83
-  - path: humus/DynamicBranching3.trace
-    expectations:
-      - device: gl-virgl
-        checksum: 0236b28aa8b26fa60172d71bb040f2e9
-  - path: humus/HDR.trace
-    expectations:
-      - device: gl-virgl
-        checksum: eab0801aadeae87ce31aa0d4ff55e8f8
-  - path: humus/RaytracedShadows.trace
-    expectations:
-      - device: gl-virgl
-        checksum: 298e49b697e9141294ecbc6283729d86
-  - path: humus/VolumetricFogging2.trace
-    expectations:
-      - device: gl-virgl
-        checksum: 382891c83f2afe4fcbdd2bfd241c1339
-  - path: itoral-gl-terrain-demo/demo.trace
-    expectations:
-      - device: gl-virgl
-        checksum: fe6124227b7f8e4e96ffbbd48c713c42
-  - path: neverball/neverball.trace
-    expectations:
-      - device: gl-virgl
-        checksum: cc11743f008ccd76adf72695a423436a
-  - path: pathfinder/canvas_moire.trace
-    expectations:
-      - device: gl-virgl
-        checksum: 2cb5be6a6f62e417f1a89c89180e5728
-  - path: pathfinder/canvas_text_v2.trace
-    expectations:
-      - device: gl-virgl
-        checksum: a1446d0c42a78771240fca6f3b1e10d8
-  - path: pathfinder/demo.trace
-    expectations:
-      - device: gl-virgl
-        checksum: 0702a66c415cfc13d5bae8bec08402cf
-  - path: supertuxkart/supertuxkart-mansion-egl-gles.trace
-    expectations:
-      - device: gl-virgl
-        checksum: 156c26de2cefe1973b1593e6b22f7edb
-  - path: xonotic/xonotic-keybench-high.trace
-    expectations:
-      - device: gl-virgl
-        checksum: f3b184bf8858a6ebccd09e7ca032197e
-  - path: valve/counterstrike.trace
-    expectations:
-      - device: gl-virgl
-        checksum: 3bc0e0e39cb3c29f6d76ff07f1f02860
-# Piglit times-out when trying to run these two
-#  - path: valve/counterstrike-source.trace
-#    expectations:
-#      - device: gl-virgl
-#        checksum: 4c19f6060ff0fe0055678c48e1e77282
-#  - path: valve/half-life-2.trace
-#    expectations:
-#      - device: gl-virgl
-#        checksum: 323887eedf59fa9282d6c3a4c82c3192
-  - path: valve/portal-2.trace
-    expectations:
-      - device: gl-virgl
-        checksum: 9f7fecf8df89e105a4d2b4a61468b427
-# Piglit crashes when trying to run this one
-#  - path: supertuxkart/supertuxkart-antediluvian-abyss.rdc
-#    expectations:
-#      - device: gl-virgl
-#        checksum: 0
-# Piglit crashes when trying to run this one
-#  - path: supertuxkart/supertuxkart-menu.rdc
-#    expectations:
-#      - device: gl-virgl
-#        checksum: 0
-# Piglit crashes when trying to run this one
-#  - path: supertuxkart/supertuxkart-ravenbridge-mansion.rdc
-#    expectations:
-#      - device: gl-virgl
-#        checksum: 0
-# Piglit crashes when trying to run this one
-#  - path: godot/Material Testers.x86_64_2020.04.08_13.38_frame799.rdc
-#    expectations:
-#      - device: gl-virgl
-#        checksum: 0
-

src/gallium/drivers/zink/ci/gitlab-ci.yml

@@ -1,48 +0,0 @@
-.zink-lvp-test:
-  extends:
-    - .zink-rules
-  variables:
-    ZINK_USE_LAVAPIPE: "true"
-    LIBGL_ALWAYS_SOFTWARE: "1"
-    GPU_VERSION: zink-lvp
-    # Fix non-conformant llvmpipe filter defaults
-    GALLIVM_PERF: "no_quad_lod"
-    LP_NUM_THREADS: 0
-
-.zink-piglit-quick_gl:
-  extends:
-    - .test-gl
-    - .zink-lvp-test
-  variables:
-    PIGLIT_PROFILES: quick_gl
-    PIGLIT_NO_WINDOW: 1
-    PIGLIT_RUNNER_OPTIONS: "--timeout 180"
-
-zink-piglit-timelines:
-  extends:
-    - .zink-piglit-quick_gl
-  script:
-    - xvfb-run --server-args='-noreset' sh -c "GALLIUM_DRIVER=zink VK_DRIVER=lvp install/piglit/piglit-runner.sh"
-
-zink-piglit-no_timelines:
-  extends:
-    - .zink-piglit-quick_gl
-  script:
-    - xvfb-run --server-args='-noreset' sh -c "ZINK_NO_TIMELINES=1 GALLIUM_DRIVER=zink VK_DRIVER=lvp install/piglit/piglit-runner.sh"
-
-zink-piglit-lazy:
-  extends:
-    - .zink-piglit-quick_gl
-  script:
-    - xvfb-run --server-args='-noreset' sh -c "ZINK_DESCRIPTORS=lazy GALLIUM_DRIVER=zink VK_DRIVER=lvp install/piglit/piglit-runner.sh"
-
-zink-lvp-deqp:
-  extends:
-    - .test-gl
-    - .deqp-test
-    - .zink-lvp-test
-  variables:
-    GALLIUM_DRIVER: "zink" # move here due to bad xvfb-run interactions
-    VK_DRIVER: lvp # Don't move to the top level, piglit runs do funny stuff with VK_DRIVER set
-    DEQP_SUITE: zink-lvp
-  parallel: 2

src/gallium/frontends/lavapipe/ci/gitlab-ci.yml

@@ -1,39 +0,0 @@
-.lavapipe-test:
-  stage: software-renderer
-  extends:
-    - .test-vk
-    - .lavapipe-rules
-    - .deqp-test-vk
-  variables:
-    GPU_VERSION: lvp
-    VK_DRIVER: lvp
-    DEQP_EXPECTED_RENDERER: llvmpipe
-
-lavapipe-vk:
-  stage: software-renderer
-  extends:
-    - .lavapipe-test
-  variables:
-    DEQP_FRACTION: 10
-
-lavapipe-nir-stress:
-  extends:
-    - .lavapipe-test
-  variables:
-    DEQP_FRACTION: 100
-    NIR_TEST_CLONE: "true"
-    NIR_TEST_SERIALIZE: "true"
-
-lavapipe-vk-asan:
-  extends:
-    - .lavapipe-test
-  variables:
-    GPU_VERSION: lvp-asan
-    DEQP_FRACTION: 50
-    DEQP_RUNNER_OPTIONS: "--env LD_PRELOAD=libasan.so.6"
-    # Disable the leak checks, since the library gets dlclose()d and thus get
-    # totally useless leak reports.  We can still catch buffer overflows.
-    ASAN_OPTIONS: "detect_leaks=0"
-  needs:
-    - debian/x86_test-vk
-    - debian-testing-asan

src/intel/compiler/brw_compiler.h

@@ -217,6 +217,7 @@ struct brw_sampler_prog_key_data {
    uint32_t xyuv_image_mask;
    uint32_t bt709_mask;
    uint32_t bt2020_mask;
+   uint32_t yuv_full_range_mask;
 
    /* Scale factor for each texture. */
    float scale_factors[32];

src/intel/compiler/brw_debug_recompile.c

@@ -72,6 +72,9 @@ debug_sampler_recompile(const struct brw_compiler *c, void *log,
    found |= check("xy_uxvx image bound", xy_uxvx_image_mask);
    found |= check("ayuv image bound", ayuv_image_mask);
    found |= check("xyuv image bound", xyuv_image_mask);
+   found |= check("bt709", bt709_mask);
+   found |= check("bt2020", bt2020_mask);
+   found |= check("yuv full range", yuv_full_range_mask);
 
    for (unsigned i = 0; i < MAX_SAMPLERS; i++) {
       found |= check("EXT_texture_swizzle or DEPTH_TEXTURE_MODE", swizzles[i]);

src/intel/compiler/brw_nir.c

@@ -1240,6 +1240,7 @@ brw_nir_apply_sampler_key(nir_shader *nir,
    tex_options.lower_xyuv_external = key_tex->xyuv_image_mask;
    tex_options.bt709_external = key_tex->bt709_mask;
    tex_options.bt2020_external = key_tex->bt2020_mask;
+   tex_options.yuv_full_range_external = key_tex->yuv_full_range_mask;
 
    /* Setup array of scaling factors for each texture. */
    memcpy(&tex_options.scale_factors, &key_tex->scale_factors,

src/mesa/drivers/dri/i965/brw_tex_image.c

@@ -634,6 +634,7 @@ brw_image_target_texture(struct gl_context *ctx, GLenum target,
    struct brw_texture_object *intel_texobj = brw_texture_object(texObj);
    intel_texobj->planar_format = image->planar_format;
    intel_texobj->yuv_color_space = image->yuv_color_space;
+   intel_texobj->yuv_range = image->sample_range;
 
    GLenum internal_format =
       image->internal_format != 0 ?

src/mesa/drivers/dri/i965/brw_tex_obj.h

@@ -64,6 +64,7 @@ struct brw_texture_object
 
    const struct brw_image_format *planar_format;
    unsigned int yuv_color_space;
+   enum __DRISampleRange yuv_range;
 };
 
 

src/mesa/drivers/dri/i965/brw_wm.c

@@ -345,6 +345,9 @@ brw_populate_sampler_prog_key_data(struct gl_context *ctx,
             default:
               break;
             }
+
+            if (intel_tex->yuv_range == __DRI_YUV_FULL_RANGE)
+               key->yuv_full_range_mask |= 1 << s;
          }
 
       }

src/mesa/drivers/dri/i965/genX_state_upload.c

@@ -3423,7 +3423,9 @@ UNUSED static const struct brw_tracked_state genX(color_calc_state) = {
              (GFX_VER <= 5 ? BRW_NEW_CC_VP |
                              BRW_NEW_STATS_WM
                            : BRW_NEW_CC_STATE |
-                             BRW_NEW_STATE_BASE_ADDRESS),
+                             BRW_NEW_STATE_BASE_ADDRESS) |
+             (GFX_VER == 6 ? BRW_NEW_FS_PROG_DATA
+                           : 0),
    },
    .emit = genX(upload_color_calc_state),
 };

src/mesa/drivers/dri/nouveau/nouveau_driver.c

@@ -69,7 +69,7 @@ nouveau_flush(struct gl_context *ctx, unsigned gallium_flush_flags)
 	struct nouveau_context *nctx = to_nouveau_context(ctx);
 	struct nouveau_pushbuf *push = context_push(ctx);
 
-	PUSH_KICK(push);
+	if (push) PUSH_KICK(push);
 
 	if (ctx->DrawBuffer && _mesa_is_winsys_fbo(ctx->DrawBuffer) &&
 	    ctx->DrawBuffer->_ColorDrawBufferIndexes[0] == BUFFER_FRONT_LEFT) {

src/panfrost/ci/gitlab-ci.yml

@@ -1,175 +0,0 @@
-.panfrost-test:
-  variables:
-    FLAKES_CHANNEL: "#panfrost-ci"
-    PAN_MESA_DEBUG: sync
-    HWCI_FREQ_MAX: "true"
-
-panfrost-t720-gles2:arm64:
-  extends:
-    - .lava-test:arm64
-    - .panfrost-midgard-rules
-    - .panfrost-test
-  variables:
-    DEVICE_TYPE: sun50i-h6-pine-h64
-    DTB: $DEVICE_TYPE
-    GPU_VERSION: panfrost-t720
-    DEQP_SUITE: panfrost-t720
-    FDO_CI_CONCURRENT: 6
-  tags:
-    - mesa-ci-x86-64-lava-sun50i-h6-pine-h64
-
-panfrost-t760-gles2:armhf:
-  extends:
-    - .lava-test:armhf
-    - .panfrost-midgard-rules
-    - .panfrost-test
-  variables:
-    DEVICE_TYPE: rk3288-veyron-jaq
-    DTB: $DEVICE_TYPE
-    GPU_VERSION: panfrost-t760
-    BOOT_METHOD: depthcharge
-    KERNEL_IMAGE_TYPE: ""
-    DEQP_SUITE: panfrost-t760
-    FDO_CI_CONCURRENT: 6
-  tags:
-    - mesa-ci-x86-64-lava-rk3288-veyron-jaq
-
-panfrost-t760-traces:armhf:
-  extends:
-    - .lava-piglit-traces:armhf
-    - .panfrost-midgard-rules
-    - .panfrost-test
-  variables:
-    DEVICE_TYPE: rk3288-veyron-jaq
-    DTB: $DEVICE_TYPE
-    GPU_VERSION: panfrost-t760
-    DRIVER_NAME: panfrost
-    BOOT_METHOD: depthcharge
-    KERNEL_IMAGE_TYPE: ""
-    PAN_MESA_DEBUG: "deqp,sync"
-    MESA_GLES_VERSION_OVERRIDE: "3.1"
-    MESA_GL_VERSION_OVERRIDE: "3.3"
-    MESA_GLSL_VERSION_OVERRIDE: 330
-    EGL_PLATFORM: surfaceless
-    PIGLIT_PROFILES: replay
-    PIGLIT_JUNIT_RESULTS: 1
-    PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/traces-panfrost.yml"
-    PIGLIT_REPLAY_EXTRA_ARGS: "--keep-image"
-  tags:
-    - mesa-ci-x86-64-lava-rk3288-veyron-jaq
-
-.lava-rk3399-gru-kevin:
-  extends:
-    - .panfrost-midgard-rules
-    - .panfrost-test
-  variables:
-    DEVICE_TYPE: rk3399-gru-kevin
-    DTB: $DEVICE_TYPE
-    GPU_VERSION: panfrost-t860
-    DRIVER_NAME: panfrost
-    BOOT_METHOD: depthcharge
-    KERNEL_IMAGE_TYPE: ""
-  tags:
-    - mesa-ci-x86-64-lava-rk3399-gru-kevin
-
-panfrost-t860-gl:arm64:
-  parallel: 3
-  extends:
-    - .lava-test:arm64
-    - .lava-rk3399-gru-kevin
-  variables:
-    FDO_CI_CONCURRENT: 6
-    DEQP_SUITE: panfrost-t860
-
-panfrost-t860-traces:arm64:
-  extends:
-    - .lava-piglit-traces:arm64
-    - .lava-rk3399-gru-kevin
-  variables:
-    PAN_MESA_DEBUG: "deqp,sync"
-    MESA_GLES_VERSION_OVERRIDE: "3.1"
-    MESA_GL_VERSION_OVERRIDE: "3.3"
-    MESA_GLSL_VERSION_OVERRIDE: 330
-    EGL_PLATFORM: surfaceless
-    PIGLIT_PROFILES: replay
-    PIGLIT_JUNIT_RESULTS: 1
-    PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/traces-panfrost.yml"
-    PIGLIT_REPLAY_EXTRA_ARGS: --keep-image
-
-.lava-meson-g12b-a311d-khadas-vim3:
-  extends:
-    - .panfrost-bifrost-rules
-    - .panfrost-test
-  variables:
-    DEVICE_TYPE: meson-g12b-a311d-khadas-vim3
-    DTB: $DEVICE_TYPE
-    GPU_VERSION: panfrost-g52
-  tags:
-    - mesa-ci-x86-64-lava-meson-g12b-a311d-khadas-vim3
-
-panfrost-g52-gl:arm64:
-  parallel: 3
-  extends:
-    - .lava-test:arm64
-    - .lava-meson-g12b-a311d-khadas-vim3
-  variables:
-    FDO_CI_CONCURRENT: 6
-    DEQP_SUITE: panfrost-g52
-    PAN_MESA_DEBUG: "deqp,sync,indirect"
-
-panfrost-g52-vk:arm64:
-  extends:
-    - .lava-test:arm64
-    - .lava-meson-g12b-a311d-khadas-vim3
-  variables:
-    VK_DRIVER: panfrost
-    MESA_VK_IGNORE_CONFORMANCE_WARNING: 1
-    PAN_I_WANT_A_BROKEN_VULKAN_DRIVER: 1
-    DEQP_SUITE: panfrost-g52-vk
-
-panfrost-g52-piglit-gl:arm64:
-  parallel: 2    # TODO: Reduce to a single job once all crashes are fixed
-  extends:
-    - .piglit-test
-    - .lava-test:arm64
-    - .lava-meson-g12b-a311d-khadas-vim3
-    - .test-manual-mr
-  variables:
-    HWCI_TEST_SCRIPT: "/install/piglit/piglit-runner.sh"
-    HWCI_START_XORG: 1
-    PIGLIT_PROFILES: quick_gl
-
-.lava-mt8183-kukui-jacuzzi-juniper-sku16:
-  extends:
-    - .panfrost-bifrost-rules
-    - .panfrost-test
-  variables:
-    DEVICE_TYPE: mt8183-kukui-jacuzzi-juniper-sku16
-    DTB: mt8183-kukui-jacuzzi-juniper-sku16
-    BOOT_METHOD: depthcharge
-    KERNEL_IMAGE_TYPE: ""
-    GPU_VERSION: panfrost-g72
-  tags:
-    - mesa-ci-x86-64-lava-mt8183-kukui-jacuzzi-juniper-sku16
-
-panfrost-g72-gl:arm64:
-  parallel: 3
-  extends:
-    - .lava-test:arm64
-    - .lava-mt8183-kukui-jacuzzi-juniper-sku16
-  variables:
-    DEQP_SUITE: panfrost-g72
-
-.panfrost-t820-gles2:arm64:
-  extends:
-    - .lava-test:arm64
-    - .panfrost-midgard-rules
-    - .panfrost-test
-  variables:
-    DEVICE_TYPE: meson-gxm-khadas-vim2
-    DTB: $DEVICE_TYPE
-    GPU_VERSION: panfrost-t820
-    FDO_CI_CONCURRENT: 6
-    DEQP_SUITE: panfrost-t720
-  tags:
-    - mesa-ci-aarch64-lava-baylibre

src/panfrost/ci/traces-panfrost.yml

@@ -1,247 +0,0 @@
-traces-db:
-  download-url: "http://caching-proxy/cache/?uri=https://minio-packet.freedesktop.org/mesa-tracie-public/"
-
-traces:
-  - path: behdad-glyphy/glyphy.trace
-    expectations:
-      - device: gl-panfrost-t860
-        checksum: 22bf5262745fd47c5c5eadb93d7cc420
-  - path: glmark2/desktop:windows=4:effect=blur:blur-radius=5:passes=1:separable=true.trace
-    expectations:
-      - device: gl-panfrost-t860
-        checksum: 0b3309c7f8dddef0d5f8eb4c959e6005
-      - device: gl-panfrost-t760
-        checksum: 1567f39cdcfecf738564f5441e7018a6
-  - path: glmark2/jellyfish.trace
-    expectations:
-      - device: gl-panfrost-t860
-        checksum: 4c4feda29cbc467d7906813804a98cb2
-      - device: gl-panfrost-t760
-        checksum: f95cfe777ffa6f14dfce7ce20e3497a0
-  - path: glxgears/glxgears-2.trace
-    expectations:
-      - device: gl-panfrost-t860
-        checksum: bcc73608b6e2b5d92bf926d1c21889c7
-      - device: gl-panfrost-t760
-        checksum: bcc73608b6e2b5d92bf926d1c21889c7
-  - path: pathfinder/demo.trace
-    expectations:
-      - device: gl-panfrost-t860
-        checksum: c4f5e6bfe0cba230b1aef631c2fa4584
-      - device: gl-panfrost-t760
-        checksum: c4f5e6bfe0cba230b1aef631c2fa4584
-  - path: pathfinder/canvas_moire.trace
-    expectations:
-      - device: gl-panfrost-t860
-        checksum: 2fb2c8e83719526cb6c02b6c2e069d61
-      - device: gl-panfrost-t760
-        checksum: 2fb2c8e83719526cb6c02b6c2e069d61
-  - path: pathfinder/canvas_text_v2.trace
-    expectations:
-      - device: gl-panfrost-t860
-        checksum: 35fbb0c520595e948d3a0f3aaa499d77
-      - device: gl-panfrost-t760
-        checksum: 35fbb0c520595e948d3a0f3aaa499d77
-  - path: gputest/furmark.trace
-    expectations:
-      - device: gl-panfrost-t860
-        checksum: 6540f71b1c051ba82af2a25b93065f34
-  - path: gputest/triangle.trace
-    expectations:
-      - device: gl-panfrost-t860
-        checksum: 75c5a2e261d576d115a659f6cd52a90d
-      - device: gl-panfrost-t760
-        checksum: 75c5a2e261d576d115a659f6cd52a90d
-  - path: humus/Portals.trace
-    expectations:
-      - device: gl-panfrost-t860
-        checksum: ad04db74ea70b7772719080f8a4c499b
-      - device: gl-panfrost-t760
-        # Wrong rendering, many elements are missing
-        checksum: 67db7302b28cb8e3e217cc79b672af79
-  - path: 0ad/0ad.trace
-    expectations:
-      - device: gl-panfrost-t860
-        checksum: 5a4fba0ae20e3ab9dc6fc4089add9457
-  - path: glmark2/buffer:update-fraction=0.5:update-dispersion=0.9:columns=200:update-method=map:interleave=false.trace
-    expectations:
-      - device: gl-panfrost-t860
-        checksum: d518ab0d0fd7e19d33f9003d55c3d46d
-  - path: glmark2/buffer:update-fraction=0.5:update-dispersion=0.9:columns=200:update-method=map:interleave=true.trace
-    expectations:
-      - device: gl-panfrost-t860
-        checksum: d6b17cfbdb6994fc1bcfa2ad0ae25b3b
-  - path: glmark2/buffer:update-fraction=0.5:update-dispersion=0.9:columns=200:update-method=subdata:interleave=false.trace
-    expectations:
-      - device: gl-panfrost-t860
-        checksum: bf10418a5e138b876018eb6d3af26f61
-  - path: glmark2/bump:bump-render=height.trace
-    expectations:
-      - device: gl-panfrost-t860
-        checksum: 2efca26d7eb85d826276b30f3265153b
-  - path: glmark2/bump:bump-render=high-poly.trace
-    expectations:
-      - device: gl-panfrost-t860
-        checksum: e6fde05acfff951f4e03fff3f607b314
-  - path: glmark2/bump:bump-render=normals.trace
-    expectations:
-      - device: gl-panfrost-t860
-        checksum: eaff095ef64913f05ea04e27158e309e
-  - path: glmark2/conditionals:vertex-steps=0:fragment-steps=0.trace
-    expectations:
-      # Missing most of the grid
-      - device: gl-panfrost-t860
-        checksum: 9c5d165041f7f91534b0c55db4a80be5
-  - path: glmark2/conditionals:vertex-steps=0:fragment-steps=5.trace
-    expectations:
-      # Missing most of the grid
-      - device: gl-panfrost-t860
-        checksum: 32990489087da1beaa5cd749edebeff3
-  - path: glmark2/conditionals:vertex-steps=5:fragment-steps=0.trace
-    expectations:
-      # Missing most of the grid
-      - device: gl-panfrost-t860
-        checksum: 9c0bd1768585fb156e0b1288b3f4df45
-  - path: glmark2/desktop:windows=4:effect=shadow.trace
-    expectations:
-      - device: gl-panfrost-t860
-        checksum: 044a380037f706827c0afa4214bef4ad
-  - path: glmark2/effect2d:kernel=0,1,0;1,-4,1;0,1,0;.trace
-    expectations:
-      - device: gl-panfrost-t860
-        checksum: 4472d33cd46351290a602f98adb338b9
-  - path: glmark2/effect2d:kernel=1,1,1,1,1;1,1,1,1,1;1,1,1,1,1;.trace
-    expectations:
-      - device: gl-panfrost-t860
-        checksum: 667a47069aed836f46645e43761147a2
-  - path: glmark2/function:fragment-steps=5:fragment-complexity=low.trace
-    expectations:
-      # Missing most of the grid
-      - device: gl-panfrost-t860
-        checksum: 1f37cb49a1f4e507a2d602738a4ae541
-  - path: glmark2/function:fragment-steps=5:fragment-complexity=medium.trace
-    expectations:
-      # Missing most of the grid
-      - device: gl-panfrost-t860
-        checksum: 1f37cb49a1f4e507a2d602738a4ae541
-  - path: glmark2/build:use-vbo=false.trace
-    expectations:
-      - device: gl-panfrost-t860
-        checksum: 462c648af68f87413cc88fe3b29c6b15
-  - path: glmark2/build:use-vbo=true.trace
-    expectations:
-      - device: gl-panfrost-t860
-        checksum: 5577342fa83ed592a3684d39a48b0232
-  - path: glmark2/ideas:speed=10000.trace
-    expectations:
-      - device: gl-panfrost-t860
-        checksum: e2cdaa2864c92c6dd25501053cedeea9
-  - path: glmark2/loop:vertex-steps=5:fragment-steps=5:fragment-loop=false.trace
-    expectations:
-      # Missing most of the grid
-      - device: gl-panfrost-t860
-        checksum: df44ed65d3aba97f4a155ec643672ef2
-  - path: glmark2/loop:vertex-steps=5:fragment-steps=5:fragment-uniform=false.trace
-    expectations:
-      # Missing most of the grid
-      - device: gl-panfrost-t860
-        checksum: c96070ddb18a9a8b5f34d72596f1bed4
-  - path: glmark2/loop:vertex-steps=5:fragment-steps=5:fragment-uniform=true.trace
-    expectations:
-      # Missing most of the grid
-      - device: gl-panfrost-t860
-        checksum: 7006d7b18a1124554eeb5d1b1053eff2
-  - path: glmark2/pulsar:quads=5:texture=false:light=false.trace
-    expectations:
-      - device: gl-panfrost-t860
-        checksum: 87f60d44f66e2d42065e17f4940bb995
-  - path: glmark2/refract.trace
-    expectations:
-      - device: gl-panfrost-t860
-        checksum: 6557deca1a47a7a77723658ea579ac63
-  - path: glmark2/shading:shading=blinn-phong-inf.trace
-    expectations:
-      - device: gl-panfrost-t860
-        checksum: 935cede73a9a6d4c66dd4f3ec91cc970
-  - path: glmark2/shading:shading=cel.trace
-    expectations:
-      - device: gl-panfrost-t860
-        checksum: cd32b44b107ac21f979e21b7c1bfe464
-  - path: glmark2/shading:shading=gouraud.trace
-    expectations:
-      - device: gl-panfrost-t860
-        checksum: aa13779fff8e60264bf40b207e54fadd
-  - path: glmark2/shading:shading=phong.trace
-    expectations:
-      - device: gl-panfrost-t860
-        checksum: c6215ff6dbf6f9247ba4677da2fb5593
-  - path: glmark2/shadow.trace
-    expectations:
-      - device: gl-panfrost-t860
-        checksum: f2c20b40c53a29459c7b91a01b93751c
-  # INSTR_INVALID_ENC faults that I can't reproduce locally
-  # - path: glmark2/terrain.trace
-  #   expectations:
-  #     - device: gl-panfrost-t860
-  #       checksum: 8cc39e8323bd33a696fb14de47305073
-  - path: glmark2/texture:texture-filter=linear.trace
-    expectations:
-      - device: gl-panfrost-t860
-        checksum: 5f1db5ee751cc3f7604b7326b810c7cd
-  - path: glmark2/texture:texture-filter=mipmap.trace
-    expectations:
-      - device: gl-panfrost-t860
-        checksum: af0f3339c57e3686222e6637da6cb97b
-  - path: glmark2/texture:texture-filter=nearest.trace
-    expectations:
-      - device: gl-panfrost-t860
-        checksum: 68ab52ebb19d47d885ab70f2a2215774
-  # Flaky since the introduction of parallel trace replay
-  #- path: gputest/gimark.trace
-  #  expectations:
-  #   - device: gl-panfrost-t860
-  #      # Some blue rings are missing on the top-left corner, also the penguin watermark
-  #      checksum: 0020a77e25003e4e8db1ce929eed8914
-  - path: gputest/pixmark-julia-fp32.trace
-    expectations:
-      - device: gl-panfrost-t860
-        checksum: d85b6967b7c768f28395c5c5dfbcfe3e
-  - path: gputest/plot3d.trace
-    expectations:
-      - device: gl-panfrost-t860
-        checksum: a34223830866a42747db199b04c5e1be
-  - path: humus/AmbientAperture.trace
-    expectations:
-      - device: gl-panfrost-t860
-        checksum: e4c0b930ef99f14305e1ade7f1779c09
-  - path: humus/CelShading.trace
-    expectations:
-      - device: gl-panfrost-t860
-        checksum: 521ca6a236b8400cf692e6817b91c739
-  - path: humus/DynamicBranching3.trace
-    expectations:
-      - device: gl-panfrost-t860
-        checksum: 32e349d14319b4ae921c146224d26a0e
-  - path: humus/RaytracedShadows.trace
-    expectations:
-      - device: gl-panfrost-t860
-        checksum: b2f909cbf5ea5de03b88f8a685eb2e28
-  - path: humus/VolumetricFogging2.trace
-    expectations:
-      - device: gl-panfrost-t860
-        checksum: f53b5b1430aa21804c6fed01bce560aa
-  - path: neverball/neverball.trace
-    expectations:
-      # Missing the coins and the texture on the "Nev" of the level.
-      - device: gl-panfrost-t860
-        checksum: 33235a5466d402348adbf3196cf3cf6b
-  # Definitely wedges the GPU
-  # - path: valve/counterstrike-v2.trace
-  #   expectations:
-  #     - device: gl-panfrost-t860
-  #       checksum: b4af9243e34f3de0153b6855dc9c66b6
-  # I think wedges the GPU.
-  # - path: valve/counterstrike-source-v2.trace
-  #   expectations:
-  #     - device: gl-panfrost-t860
-  #       checksum: bbe74b2171d62fc6738086740e1aa0d8