VERSION: bump for 22.3.0-rc2

This can cause us to stomp the contents of r5 before we have a chance to read
it, like this:

0x3d103186bb800000 nop                           ; nop                         ; ldvary.r0
0x3d105686bbf40000 nop                           ; mov rf26, r5                ; ldvary.r1
0x020000ef0000d000 bu.allna  232, r:unif (0x0000001c / 0.000000)
0x3d1096c6bbf40000 nop                           ; mov rf27, r5                ; ldvary.r2

Here, the MOV in the last instruction is supposed to read r5 produced from
ldvary.r0, but because we have inserted the bu instruction in between now
that read happens at the same time that ldvary.r1 updates r5, stomping the
value we were supposed to read.

Fix this by disallowing injection of a branch instruction in between an ldvary
instruction and its write to the r5 register 2 instructions later.

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/7062
Reviewed-by: Alejandro Piñeiro <apinheiro@igalia.com>
cc: mesa-stable

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19616>
(cherry picked from commit 1174f37609)

.editorconfig

@@ -8,7 +8,7 @@ charset = utf-8
 insert_final_newline = true
 tab_width = 8
 
-[*.{c,h,cpp,hpp,cc,hh,y,yy}]
+[*.{c,h,cpp,hpp,cc,hh}]
 indent_style = space
 indent_size = 3
 max_line_length = 78

.github/workflows/macos.yml

@@ -26,7 +26,6 @@ jobs:
         brew "libxcb"
         brew "libxdamage"
         brew "libxext"
-        brew "molten-vk"
         brew "ninja"
         brew "pkg-config"
         brew "python@3.10"
@@ -42,7 +41,7 @@ jobs:
         [binaries]
         llvm-config = '/usr/local/opt/llvm/bin/llvm-config'
         EOL
-        $MESON_EXEC . build --native-file=native_config -Dmoltenvk-dir=$(brew --prefix molten-vk) -Dbuild-tests=true -Dosmesa=true -Dgallium-drivers=swrast,zink -Dglx=${{ matrix.glx_option }}
+        $MESON_EXEC . build --native-file=native_config -Dbuild-tests=true -Dosmesa=true -Dgallium-drivers=swrast -Dglx=${{ matrix.glx_option }}
     - name: Build
       run: $MESON_EXEC compile -C build
     - name: Test

.gitignore

@@ -1,4 +1,3 @@
-.vscode*
 *.pyc
 *.pyo
 *.out

.gitlab-ci.yml

@@ -8,7 +8,7 @@ variables:
           rm download-git-cache.sh
           set +o xtrace
   CI_JOB_JWT_FILE: /minio_jwt
-  MINIO_HOST: s3.freedesktop.org
+  MINIO_HOST: minio-packet.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
@@ -23,8 +23,6 @@ variables:
   LIMA_FARM: "online"
   IGALIA_FARM: "online"
   ANHOLT_FARM: "online"
-  VALVE_FARM: "online"
-  AUSTRIANCODER_FARM: "online"  # only etnaviv GPUs
 
 default:
   before_script:
@@ -49,13 +47,12 @@ default:
 
 include:
   - project: 'freedesktop/ci-templates'
-    ref: ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2
+    ref: 34f4ade99434043f88e164933f570301fd18b125
     file:
       - '/templates/ci-fairy.yml'
   - project: 'freedesktop/ci-templates'
     ref: *ci-templates-commit
     file:
-      - '/templates/alpine.yml'
       - '/templates/debian.yml'
       - '/templates/fedora.yml'
   - local: '.gitlab-ci/image-tags.yml'
@@ -130,24 +127,21 @@ stages:
 
 
 .docs-base:
-  variables:
-    BUILDER: html
   extends:
     - .fdo.ci-fairy
     - .build-rules
-  artifacts:
-    expose_as: 'Documentation preview'
-    paths:
-    - public/
   script:
   - apk --no-cache add graphviz doxygen
   - pip3 install sphinx===5.1.1 breathe===4.34.0 mako===1.2.3 sphinx_rtd_theme===1.0.0
   - docs/doxygen-wrapper.py --out-dir=docs/doxygen_xml
-  - sphinx-build -W -b $BUILDER docs public
+  - sphinx-build -W -b html docs public
 
 pages:
   extends: .docs-base
   stage: deploy
+  artifacts:
+    paths:
+    - public
   needs: []
   rules:
     - !reference [.no_scheduled_pipelines-rules, rules]
@@ -176,24 +170,16 @@ test-docs-mr:
     - test-docs
   needs:
     - sanity
+  artifacts:
+    expose_as: 'Documentation preview'
+    paths:
+    - public/
   rules:
     - if: *is-pre-merge
       changes: *docs-or-ci
       when: on_success
     # Other cases default to never
 
-lincheck-docs:
-  extends: .docs-base
-  # Cancel job if a newer commit is pushed to the same branch
-  interruptible: true
-  stage: deploy
-  needs: []
-  rules:
-    - !reference [.scheduled_pipeline-rules, rules]
-  allow_failure: true
-  variables:
-    BUILDER: linkcheck
-
 # When to automatically run the CI for build jobs
 .build-rules:
   rules:
@@ -278,7 +264,9 @@ make git archive:
     # compress the current folder
     - tar -cvzf ../$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
+    # login with the JWT token file
+    - ci-fairy minio login --token-file "${CI_JOB_JWT_FILE}"
+    - 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
 
 
 # Sanity checks of MR settings and commit logs

.gitlab-ci/b2c/b2c.yml.jinja2.jinja2

@@ -52,7 +52,7 @@ deployment:
         b2c.container="-ti --tls-verify=false docker://{{ '{{' }} fdo_proxy_registry }}/mupuf/valve-infra/machine_registration:latest check"
         b2c.ntp_peer=10.42.0.1 b2c.pipefail b2c.cache_device=auto b2c.poweroff_delay={{ poweroff_delay }}
         b2c.minio="gateway,{{ '{{' }} minio_url }},{{ '{{' }} job_bucket_access_key }},{{ '{{' }} job_bucket_secret_key }}"
-        b2c.volume="{{ '{{' }} job_bucket }}-results,mirror=gateway/{{ '{{' }} job_bucket }},pull_on=pipeline_start,push_on=changes,overwrite{% for excl in job_volume_exclusions %},exclude={{ excl }}{% endfor %},remove,expiration=pipeline_end,preserve"
+        b2c.volume="{{ '{{' }} job_bucket }}-results,mirror=gateway/{{ '{{' }} job_bucket }},pull_on=pipeline_start,push_on=changes,overwrite{% for excl in job_volume_exclusions %},exclude={{ excl }}{% endfor %},expiration=pipeline_end,preserve"
 {% for volume in volumes %}
         b2c.volume={{ volume }}
 {% endfor %}

.gitlab-ci/b2c/generate_b2c.py

@@ -92,12 +92,10 @@ if args.mount_volume is not None:
 values['working_dir'] = args.working_dir
 
 assert(len(args.local_container) > 0)
-
-# Use the gateway's pull-through registry caches to reduce load on fd.o.
-values['local_container'] = args.local_container
-for url, replacement in [('registry.freedesktop.org', '{{ fdo_proxy_registry }}'),
-                         ('harbor.freedesktop.org', '{{ harbor_fdo_registry }}')]:
-    values['local_container'] = values['local_container'].replace(url, replacement)
+values['local_container'] = args.local_container.replace(
+    # Use the gateway's pull-through registry cache to reduce load on fd.o.
+    'registry.freedesktop.org', '{{ fdo_proxy_registry }}'
+)
 
 if 'B2C_KERNEL_CMDLINE_EXTRAS' in environ:
     values['cmdline_extras'] = environ['B2C_KERNEL_CMDLINE_EXTRAS']

.gitlab-ci/bare-metal/arm64_a630_egl.sh

@@ -0,0 +1,26 @@
+#!/bin/sh
+
+# This test script groups together a bunch of fast dEQP variant runs
+# to amortize the cost of rebooting the board.
+
+set -ex
+
+EXIT=0
+
+# Run reset tests without parallelism:
+if ! env \
+  DEQP_RESULTS_DIR=results/reset \
+  FDO_CI_CONCURRENT=1 \
+  DEQP_CASELIST_FILTER='.*reset.*' \
+  /install/deqp-runner.sh; then
+    EXIT=1
+fi
+
+# Then run everything else with parallelism:
+if ! env \
+  DEQP_RESULTS_DIR=results/nonrobustness \
+  DEQP_CASELIST_INV_FILTER='.*reset.*' \
+  /install/deqp-runner.sh; then
+    EXIT=1
+fi
+

.gitlab-ci/bin

@@ -1 +0,0 @@
-../bin/ci

.gitlab-ci/bin/ci_run_n_monitor.py

@@ -13,7 +13,6 @@ and show the job(s) logs.
 
 import argparse
 import re
-from subprocess import check_output
 import sys
 import time
 from concurrent.futures import ThreadPoolExecutor
@@ -215,7 +214,7 @@ def print_log(project, job_id) -> None:
         job = project.jobs.get(job_id)
 
         # GitLab's REST API doesn't offer pagination for logs, so we have to refetch it all
-        lines = job.trace().decode("raw_unicode_escape").splitlines()
+        lines = job.trace().decode("unicode_escape").splitlines()
         for line in lines[printed_lines:]:
             print(line)
         printed_lines = len(lines)
@@ -236,7 +235,7 @@ def parse_args() -> None:
     )
     parser.add_argument("--target", metavar="target-job", help="Target job")
     parser.add_argument(
-        "--rev", metavar="revision", help="repository git revision (default: HEAD)"
+        "--rev", metavar="revision", help="repository git revision", required=True
     )
     parser.add_argument(
         "--token",
@@ -257,9 +256,6 @@ def find_dependencies(target_job: str, project_path: str, sha: str) -> set[str]:
     )
 
     target_dep_dag = filter_dag(dag, target_job)
-    if not target_dep_dag:
-        print(Fore.RED + "The job(s) were not found in the pipeline." + Fore.RESET)
-        sys.exit(1)
     print(Fore.YELLOW)
     print("Detected job dependencies:")
     print()
@@ -276,23 +272,18 @@ if __name__ == "__main__":
 
         token = read_token(args.token)
 
-        gl = gitlab.Gitlab(url="https://gitlab.freedesktop.org",
-                           private_token=token,
-                           retry_transient_errors=True)
+        gl = gitlab.Gitlab(url="https://gitlab.freedesktop.org", private_token=token)
 
         cur_project = get_gitlab_project(gl, "mesa")
 
-        REV: str = args.rev
-        if not REV:
-            REV = check_output(['git', 'rev-parse', 'HEAD']).decode('ascii').strip()
-        print(f"Revision: {REV}")
-        pipe = wait_for_pipeline(cur_project, REV)
+        print(f"Revision: {args.rev}")
+        pipe = wait_for_pipeline(cur_project, args.rev)
         print(f"Pipeline: {pipe.web_url}")
         deps = set()
         if args.target:
             print("🞋 job: " + Fore.BLUE + args.target + Style.RESET_ALL)
             deps = find_dependencies(
-                target_job=args.target, sha=REV, project_path=cur_project
+                target_job=args.target, sha=args.rev, project_path=cur_project
             )
         target_job_id, ret = monitor_pipeline(
             cur_project, pipe, args.target, deps, args.force_manual, args.stress

.gitlab-ci/bin/update_traces_checksum.py

@@ -18,7 +18,6 @@ import sys
 from ruamel.yaml import YAML
 
 import gitlab
-from colorama import Fore, Style
 from gitlab_common import get_gitlab_project, read_token, wait_for_pipeline
 
 
@@ -38,8 +37,8 @@ def gather_results(
         if target_jobs_regex.match(job.name) and job.status == "failed":
             cur_job = project.jobs.get(job.id)
             # get variables
-            print(f"👁  {job.name}...")
-            log: list[str] = cur_job.trace().decode("unicode_escape").splitlines()
+            print(f"👁 Looking through logs for the device variable and traces.yml file in {job.name}...")
+            log = cur_job.trace().decode("unicode_escape").splitlines()
             filename: str = ''
             dev_name: str = ''
             for logline in log:
@@ -51,7 +50,7 @@ def gather_results(
                     dev_name = device_name.group(1)
 
             if not filename or not dev_name:
-                print(Fore.RED + "Couldn't find device name or YML file in the logs!" + Style.RESET_ALL)
+                print("! Couldn't find device name or YML file in the logs!")
                 return
 
             print(f"👁 Found {dev_name} and file {filename}")
@@ -84,20 +83,22 @@ def gather_results(
                     checksum: str = value['images'][0]['checksum_render']
 
                     if not checksum:
-                        print(Fore.RED + f"{dev_name}: {trace}: checksum is missing! Crash?" + Style.RESET_ALL)
+                        print(f"Trace {trace} checksum is missing! Abort.")
                         continue
 
                     if checksum == "error":
-                        print(Fore.RED + f"{dev_name}: {trace}: crashed" + Style.RESET_ALL)
+                        print(f"Trace {trace} crashed")
                         continue
 
-                    if target['traces'][trace][dev_name].get('checksum') == checksum:
+                    if (
+                        checksum in target['traces'][trace][dev_name] and
+                        target['traces'][trace][dev_name]['checksum'] == checksum
+                    ):
                         continue
 
                     if "label" in target['traces'][trace][dev_name]:
-                        print(f'{dev_name}: {trace}: please verify that label {Fore.BLUE}{target["traces"][trace][dev_name]["label"]}{Style.RESET_ALL} is still valid')
+                        print(f'{trace}: {dev_name}: has label: {target["traces"][trace][dev_name]["label"]}, is it still right?')
 
-                    print(Fore.GREEN + f'{dev_name}: {trace}: checksum updated' + Style.RESET_ALL)
                     target['traces'][trace][dev_name]['checksum'] = checksum
 
             with open(traces_file[0], 'w', encoding='utf-8') as target_file:

.gitlab-ci/build/gitlab-ci.yml

@@ -183,8 +183,6 @@ debian-build-testing:
       -D spirv-to-dxil=true
       -D osmesa=true
       -D tools=drm-shim,etnaviv,freedreno,glsl,intel,intel-ui,nir,nouveau,lima,panfrost,asahi
-      -D b_lto=true
-    LLVM_VERSION: 13
   script:
     - .gitlab-ci/lava/lava-pytest.sh
     - .gitlab-ci/run-shellcheck.sh
@@ -226,44 +224,6 @@ debian-release:
   script:
     - .gitlab-ci/meson/build.sh
 
-alpine-build-testing:
-  extends:
-    - .meson-build
-    - .use-alpine/x86_build
-  stage: build-x86_64
-  variables:
-    BUILDTYPE: "release"
-    C_ARGS: >
-      -Wno-error=cpp
-      -Wno-error=array-bounds
-      -Wno-error=stringop-overread
-    DRI_LOADERS: >
-      -D glx=disabled
-      -D gbm=enabled
-      -D egl=enabled
-      -D glvnd=false
-      -D platforms=wayland
-    LLVM_VERSION: ""
-    GALLIUM_DRIVERS: "crocus,etnaviv,freedreno,iris,kmsro,lima,nouveau,panfrost,r300,r600,radeonsi,svga,swrast,tegra,v3d,vc4,virgl,zink"
-    GALLIUM_ST: >
-      -D dri3=enabled
-      -D gallium-extra-hud=true
-      -D gallium-vdpau=disabled
-      -D gallium-omx=disabled
-      -D gallium-va=enabled
-      -D gallium-xa=disabled
-      -D gallium-nine=true
-      -D gallium-rusticl=false
-      -D gles1=disabled
-      -D gles2=enabled
-      -D llvm=enabled
-      -D microsoft-clc=disabled
-      -D shared-llvm=enabled
-    UNWIND: "disabled"
-    VULKAN_DRIVERS: "amd,broadcom,freedreno,intel,imagination-experimental"
-  script:
-    - .gitlab-ci/meson/build.sh
-
 fedora-release:
   extends:
     - .meson-build
@@ -273,6 +233,9 @@ fedora-release:
     C_ARGS: >
       -Wno-error=array-bounds
       -Wno-error=stringop-overread
+      -Wno-error=uninitialized
+    CPP_ARGS: >
+      -Wno-error=array-bounds
     DRI_LOADERS: >
       -D glx=dri
       -D gbm=enabled
@@ -322,6 +285,9 @@ debian-android:
       -Wno-error=initializer-overrides
       -Wno-error=missing-braces
       -Wno-error=sometimes-uninitialized
+      -Wno-error=unused-function
+    CPP_ARGS: >
+      -Wno-error=deprecated-declarations
     DRI_LOADERS: >
       -D glx=disabled
       -D gbm=disabled
@@ -362,7 +328,7 @@ debian-android:
       -D glx=dri
       -D gbm=enabled
       -D egl=enabled
-      -D platforms=x11,wayland
+      -D platforms=x11
       -D osmesa=false
     GALLIUM_ST: >
       -D dri3=enabled
@@ -395,9 +361,6 @@ debian-armhf:
       -D llvm=disabled
       -D valgrind=false
     MINIO_ARTIFACT_NAME: mesa-armhf
-    # The strip command segfaults, failing to strip the binary and leaving
-    # tempfiles in our artifacts.
-    ARTIFACTS_DEBUG_SYMBOLS: 1
   script:
     - .gitlab-ci/meson/build.sh
     - .gitlab-ci/prepare-artifacts.sh
@@ -458,6 +421,7 @@ debian-clang:
       -Wno-error=implicit-const-int-float-conversion
       -Wno-error=overloaded-virtual
       -Wno-error=tautological-constant-out-of-range-compare
+      -Wno-error=unused-const-variable
       -Wno-error=unused-private-field
     DRI_LOADERS: >
       -D glx=dri

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

@@ -28,6 +28,8 @@ for var in \
     CROSVM_GALLIUM_DRIVER \
     CROSVM_GPU_ARGS \
     DEQP_BIN_DIR \
+    DEQP_CASELIST_FILTER \
+    DEQP_CASELIST_INV_FILTER \
     DEQP_CONFIG \
     DEQP_EXPECTED_RENDERER \
     DEQP_FRACTION \
@@ -60,7 +62,6 @@ for var in \
     HWCI_FREQ_MAX \
     HWCI_KERNEL_MODULES \
     HWCI_KVM \
-    HWCI_START_WESTON \
     HWCI_START_XORG \
     HWCI_TEST_SCRIPT \
     IR3_SHADER_DEBUG \

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

@@ -45,16 +45,6 @@ set -ex
     echo -n $HWCI_KERNEL_MODULES | xargs -d, -n1 /usr/sbin/modprobe
 }
 
-# Set up ZRAM
-HWCI_ZRAM_SIZE=2G
-if zramctl --find --size $HWCI_ZRAM_SIZE -a zstd; then
-    mkswap /dev/zram0
-    swapon /dev/zram0
-    echo "zram: $HWCI_ZRAM_SIZE activated"
-else
-    echo "zram: skipping, not supported"
-fi
-
 #
 # Load the KVM module specific to the detected CPU virtualization extensions:
 # - vmx for Intel VT
@@ -128,7 +118,6 @@ BACKGROUND_PIDS="$! $BACKGROUND_PIDS"
 if [ -n "$HWCI_START_XORG" ]; then
   echo "touch /xorg-started; sleep 100000" > /xorg-script
   env \
-    VK_ICD_FILENAMES=/install/share/vulkan/icd.d/${VK_DRIVER}_icd.`uname -m`.json \
     xinit /bin/sh /xorg-script -- /usr/bin/Xorg -noreset -s 0 -dpms -logfile /Xorg.0.log &
   BACKGROUND_PIDS="$! $BACKGROUND_PIDS"
 
@@ -142,21 +131,6 @@ if [ -n "$HWCI_START_XORG" ]; then
   export DISPLAY=:0
 fi
 
-if [ -n "$HWCI_START_WESTON" ]; then
-  export XDG_RUNTIME_DIR=/run/user
-  mkdir -p $XDG_RUNTIME_DIR
-
-  # Xwayland to be used when HWCI_START_XORG is not set
-  export DISPLAY=:0
-  mkdir -p /tmp/.X11-unix
-
-  env \
-    VK_ICD_FILENAMES=/install/share/vulkan/icd.d/${VK_DRIVER}_icd.`uname -m`.json \
-    weston -Bheadless-backend.so --use-gl -Swayland-0 --xwayland &
-  export WAYLAND_DISPLAY=wayland-0
-  sleep 1
-fi
-
 RESULT=fail
 set +e
 sh -c "$HWCI_TEST_SCRIPT"
@@ -176,7 +150,8 @@ cleanup
 # upload artifacts
 if [ -n "$MINIO_RESULTS_UPLOAD" ]; then
   tar --zstd -cf results.tar.zst results/;
-  ci-fairy s3cp --token-file "${CI_JOB_JWT_FILE}" results.tar.zst https://"$MINIO_RESULTS_UPLOAD"/results.tar.zst;
+  ci-fairy minio login --token-file "${CI_JOB_JWT_FILE}";
+  ci-fairy minio cp results.tar.zst minio://"$MINIO_RESULTS_UPLOAD"/results.tar.zst;
 fi
 
 # We still need to echo the hwci: mesa message, as some scripts rely on it, such

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

@@ -1,70 +0,0 @@
-#!/bin/bash
-# shellcheck disable=SC2086 # we want word splitting
-
-set -e
-set -o xtrace
-
-
-EPHEMERAL="
-        autoconf
-        automake
-        bzip2
-        cmake
-        git
-        libtool
-        libepoxy-dev
-        libtbb-dev
-        make
-        openssl-dev
-        unzip
-        wget
-        xz
-	zstd-dev
-        "
-
-apk add \
-    bison \
-    ccache \
-    clang-dev \
-    flex \
-    gcc \
-    g++ \
-    gettext \
-    glslang \
-    linux-headers \
-    llvm15-dev \
-    meson \
-    expat-dev \
-    elfutils-dev \
-    libselinux-dev \
-    libva-dev \
-    libpciaccess-dev \
-    zlib-dev \
-    python3-dev \
-    py3-mako \
-    py3-ply \
-    vulkan-headers \
-    spirv-tools-dev \
-    util-macros \
-    $EPHEMERAL
-
-
-. .gitlab-ci/container/container_pre_build.sh
-
-. .gitlab-ci/container/build-libdrm.sh
-
-. .gitlab-ci/container/build-wayland.sh
-
-pushd /usr/local
-git clone https://gitlab.freedesktop.org/mesa/shader-db.git --depth 1
-rm -rf shader-db/.git
-cd shader-db
-make
-popd
-
-
-############### Uninstall the build software
-
-apk del $EPHEMERAL
-
-. .gitlab-ci/container/container_post_build.sh

.gitlab-ci/container/arm.config

@@ -1,12 +1,6 @@
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_DEBUG_KERNEL=y
 
-CONFIG_CRYPTO_ZSTD=y
-CONFIG_ZRAM_MEMORY_TRACKING=y
-CONFIG_ZRAM_WRITEBACK=y
-CONFIG_ZRAM=y
-CONFIG_ZSMALLOC_STAT=y
-
 # abootimg with a 'dummy' rootfs fails with root=/dev/nfs
 CONFIG_BLK_DEV_INITRD=n
 

.gitlab-ci/container/arm64.config

@@ -1,12 +1,6 @@
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_DEBUG_KERNEL=y
 
-CONFIG_CRYPTO_ZSTD=y
-CONFIG_ZRAM_MEMORY_TRACKING=y
-CONFIG_ZRAM_WRITEBACK=y
-CONFIG_ZRAM=y
-CONFIG_ZSMALLOC_STAT=y
-
 # abootimg with a 'dummy' rootfs fails with root=/dev/nfs
 CONFIG_BLK_DEV_INITRD=n
 
@@ -66,7 +60,6 @@ CONFIG_POWER_RESET_QCOM_PON=y
 CONFIG_RTC_DRV_PM8XXX=y
 CONFIG_INTERCONNECT=y
 CONFIG_INTERCONNECT_QCOM=y
-CONFIG_INTERCONNECT_QCOM_MSM8996=y
 CONFIG_INTERCONNECT_QCOM_SDM845=y
 CONFIG_INTERCONNECT_QCOM_MSM8916=y
 CONFIG_INTERCONNECT_QCOM_OSM_L3=y
@@ -74,9 +67,6 @@ CONFIG_INTERCONNECT_QCOM_SC7180=y
 CONFIG_CRYPTO_DEV_QCOM_RNG=y
 CONFIG_SC_DISPCC_7180=y
 CONFIG_SC_GPUCC_7180=y
-CONFIG_QCOM_SPMI_ADC5=y
-CONFIG_DRM_PARADE_PS8640=y
-CONFIG_PHY_QCOM_USB_HS=y
 
 # db410c ethernet
 CONFIG_USB_RTL8152=y

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

@@ -6,13 +6,13 @@ set -ex
 git config --global user.email "mesa@example.com"
 git config --global user.name "Mesa CI"
 
-CROSVM_VERSION=504899212d626ecf42b1c459e5592891dde5bf91
+CROSVM_VERSION=acd262cb42111c53b580a67355e795775545cced
 git clone --single-branch -b main --no-checkout https://chromium.googlesource.com/crosvm/crosvm /platform/crosvm
 pushd /platform/crosvm
 git checkout "$CROSVM_VERSION"
 git submodule update --init
 
-VIRGLRENDERER_VERSION=3f2685355f71201f22b98c19aa778b43732c8435
+VIRGLRENDERER_VERSION=3c5a9bbb7464e0e91e446991055300f4f989f6a9
 rm -rf third_party/virglrenderer
 git clone --single-branch -b master --no-checkout https://gitlab.freedesktop.org/virgl/virglrenderer.git third_party/virglrenderer
 pushd third_party/virglrenderer

.gitlab-ci/container/build-deqp-runner.sh

@@ -16,7 +16,7 @@ if [ -n "${DEQP_RUNNER_GIT_TAG}${DEQP_RUNNER_GIT_REV}" ]; then
     DEQP_RUNNER_CARGO_ARGS="${DEQP_RUNNER_CARGO_ARGS} ${EXTRA_CARGO_ARGS}"
 else
     # Install from package registry
-    DEQP_RUNNER_CARGO_ARGS="--version 0.16.0 ${EXTRA_CARGO_ARGS} -- deqp-runner"
+    DEQP_RUNNER_CARGO_ARGS="--version 0.15.0 ${EXTRA_CARGO_ARGS} -- deqp-runner"
 fi
 
 cargo install --locked  \

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

@@ -40,12 +40,6 @@ cmake -S /VK-GL-CTS -B . -G Ninja \
 ninja modules/egl/deqp-egl
 cp /deqp/modules/egl/deqp-egl /deqp/modules/egl/deqp-egl-x11
 
-cmake -S /VK-GL-CTS -B . -G Ninja \
-      -DDEQP_TARGET=wayland \
-      -DCMAKE_BUILD_TYPE=Release \
-      $EXTRA_CMAKE_ARGS
-ninja modules/egl/deqp-egl
-cp /deqp/modules/egl/deqp-egl /deqp/modules/egl/deqp-egl-wayland
 
 cmake -S /VK-GL-CTS -B . -G Ninja \
       -DDEQP_TARGET=${DEQP_TARGET:-x11_glx} \

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

@@ -1,13 +1,12 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 set -ex
 
-MOLD_VERSION="1.9.0"
+MOLD_VERSION="1.6.0"
 
 git clone -b v"$MOLD_VERSION" --single-branch --depth 1 https://github.com/rui314/mold.git
-pushd mold
-cmake -DCMAKE_BUILD_TYPE=Release -D BUILD_TESTING=OFF -D MOLD_LTO=ON
-cmake --build . --parallel
-cmake --install .
-popd
+cd mold
+make
+make install
+cd ..
 rm -rf mold

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

@@ -5,7 +5,7 @@ set -ex
 
 git clone https://gitlab.freedesktop.org/mesa/piglit.git --single-branch --no-checkout /piglit
 pushd /piglit
-git checkout 1cd716180cfb6ef0c1fc54702460ef49e5115791
+git checkout 591c91865012de4224bea551eac5d2274acf06ad
 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-vkd3d-proton.sh

@@ -2,7 +2,7 @@
 
 set -ex
 
-VKD3D_PROTON_COMMIT="804751ee1cb108a2ec59e182ce0c052bafef268e"
+VKD3D_PROTON_COMMIT="5b73139f182d86cd58a757e4b5f0d4cfad96d319"
 
 VKD3D_PROTON_DST_DIR="/vkd3d-proton-tests"
 VKD3D_PROTON_SRC_DIR="/vkd3d-proton-src"

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

@@ -1,5 +1,4 @@
 #!/bin/bash
-# shellcheck disable=SC2086 # we want word splitting
 
 set -ex
 
@@ -9,7 +8,7 @@ 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 $EXTRA_MESON_ARGS
+meson -Ddocumentation=false -Ddtd_validation=false -Dlibraries=true _build
 ninja -C _build install
 cd ..
 rm -rf wayland
@@ -17,7 +16,7 @@ rm -rf wayland
 git clone https://gitlab.freedesktop.org/wayland/wayland-protocols
 cd wayland-protocols
 git checkout "$WAYLAND_PROTOCOLS_VERSION"
-meson _build $EXTRA_MESON_ARGS
+meson _build
 ninja -C _build install
 cd ..
 rm -rf wayland-protocols

.gitlab-ci/container/container_pre_build.sh

@@ -2,8 +2,6 @@
 
 if test -f /etc/debian_version; then
     CCACHE_PATH=/usr/lib/ccache
-elif test -f /etc/alpine-release; then
-    CCACHE_PATH=/usr/lib/ccache/bin
 else
     CCACHE_PATH=/usr/lib64/ccache
 fi
@@ -45,6 +43,4 @@ export MAKEFLAGS="-j${FDO_CI_CONCURRENT:-4}"
 echo -e "retry_connrefused = on\n" \
         "read_timeout = 300\n" \
         "tries = 4\n" \
-	"retry_on_host_error = on\n" \
-	"retry_on_http_error = 429,500,502,503,504\n" \
         "wait_retry = 32" >> /etc/wgetrc

.gitlab-ci/container/create-cross-file.sh

@@ -2,18 +2,19 @@
 
 arch=$1
 cross_file="/cross_file-$arch.txt"
-meson env2mfile --cross --debarch "$arch" -o "$cross_file"
-
+/usr/share/meson/debcrossgen --arch "$arch" -o "$cross_file"
 # Explicitly set ccache path for cross compilers
 sed -i "s|/usr/bin/\([^-]*\)-linux-gnu\([^-]*\)-g|/usr/lib/ccache/\\1-linux-gnu\\2-g|g" "$cross_file"
-
+if [ "$arch" = "i386" ]; then
+    # Work around a bug in debcrossgen that should be fixed in the next release
+    sed -i "s|cpu_family = 'i686'|cpu_family = 'x86'|g" "$cross_file"
+fi
 # Rely on qemu-user being configured in binfmt_misc on the host
 # shellcheck disable=SC1003 # how this sed doesn't seems to work for me locally
 sed -i -e '/\[properties\]/a\' -e "needs_exe_wrapper = False" "$cross_file"
 
-# Add a line for rustc, which meson env2mfile is missing.
-cc=$(sed -n "s|^c\s*=\s*\[?'\(.*\)'\]?|\1|p" < "$cross_file")
-
+# Add a line for rustc, which debcrossgen is missing.
+cc=$(sed -n 's|c = .\(.*\).|\1|p' < "$cross_file")
 if [[ "$arch" = "arm64" ]]; then
     rust_target=aarch64-unknown-linux-gnu
 elif [[ "$arch" = "armhf" ]]; then
@@ -27,7 +28,6 @@ elif [[ "$arch" = "s390x" ]]; then
 else
     echo "Needs rustc target mapping"
 fi
-
 # shellcheck disable=SC1003 # how this sed doesn't seems to work for me locally
 sed -i -e '/\[binaries\]/a\' -e "rust = ['rustc', '--target=$rust_target', '-C', 'linker=$cc']" "$cross_file"
 

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

@@ -102,11 +102,9 @@ apt-get -y install --no-install-recommends \
     sntp \
     strace \
     waffle-utils \
-    weston \
     wget \
     xinit \
     xserver-xorg-core \
-    xwayland \
     zstd
 
 
@@ -125,7 +123,7 @@ fi
 
 # 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@ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2
+pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@34f4ade99434043f88e164933f570301fd18b125
 
 # Needed for manipulation with traces yaml files.
 pip3 install yq

.gitlab-ci/container/cross_build.sh

@@ -18,7 +18,6 @@ apt-get install -y --no-remove \
         crossbuild-essential-$arch \
         libelf-dev:$arch \
         libexpat1-dev:$arch \
-        libffi-dev:$arch \
         libpciaccess-dev:$arch \
         libstdc++6:$arch \
         libvulkan-dev:$arch \
@@ -36,7 +35,6 @@ apt-get install -y --no-remove \
         libxrandr-dev:$arch \
         libxshmfence-dev:$arch \
         libxxf86vm-dev:$arch \
-        libwayland-dev:$arch \
         wget
 
 if [[ $arch != "armhf" ]]; then
@@ -52,6 +50,7 @@ if [[ $arch != "armhf" ]]; then
     # around this.
     apt-get install -y --no-remove --no-install-recommends \
             libclang-cpp${LLVM}:$arch \
+            libffi-dev:$arch \
             libgcc-s1:$arch \
             libtinfo-dev:$arch \
             libz3-dev:$arch \
@@ -69,8 +68,6 @@ fi
 EXTRA_MESON_ARGS="--cross-file=/cross_file-${arch}.txt -D libdir=lib/$(dpkg-architecture -A $arch -qDEB_TARGET_MULTIARCH)"
 . .gitlab-ci/container/build-libdrm.sh
 
-. .gitlab-ci/container/build-wayland.sh
-
 apt-get purge -y \
         $STABLE_EPHEMERAL
 

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

@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-arch=arm64 . .gitlab-ci/container/debian/arm_test.sh

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

@@ -50,9 +50,8 @@ apt-get -y install \
 	libxrandr-dev \
 	libxshmfence-dev \
 	libxxf86vm-dev \
-	libwayland-dev \
 	llvm-11-dev \
-	ninja-build \
+	meson \
 	pkg-config \
 	python3-mako \
 	python3-pil \
@@ -69,10 +68,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@ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2
-
-# We need at least 0.61.4 for proper Rust; 0.62 for modern meson env2mfile
-pip3 install meson==0.63.3
+pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@34f4ade99434043f88e164933f570301fd18b125
 
 arch=armhf
 . .gitlab-ci/container/cross_build.sh
@@ -85,8 +81,6 @@ arch=armhf
 EXTRA_MESON_ARGS=
 . .gitlab-ci/container/build-libdrm.sh
 
-. .gitlab-ci/container/build-wayland.sh
-
 apt-get purge -y $STABLE_EPHEMERAL
 
 . .gitlab-ci/container/container_post_build.sh

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

@@ -1,5 +1,4 @@
 #!/bin/bash
-# shellcheck disable=SC2154 # arch is assigned in previous scripts
 
 set -e
 set -o xtrace
@@ -26,13 +25,12 @@ apt-get install -y --no-remove \
 wget https://raw.githubusercontent.com/net-snmp/net-snmp/master/mibs/SNMPv2-SMI.txt \
     -O /usr/share/snmp/mibs/SNMPv2-SMI.txt
 
-. .gitlab-ci/container/baremetal_build.sh
+arch=arm64 . .gitlab-ci/container/baremetal_build.sh
+arch=armhf . .gitlab-ci/container/baremetal_build.sh
 
-if [[ "$arch" == "arm64" ]]; then
-    # This firmware file from Debian bullseye causes hangs
-    wget https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/plain/qcom/a530_pfp.fw?id=d5f9eea5a251d43412b07f5295d03e97b89ac4a5 \
-      -O /rootfs-arm64/lib/firmware/qcom/a530_pfp.fw
-fi
+# This firmware file from Debian bullseye causes hangs
+wget https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/plain/qcom/a530_pfp.fw?id=d5f9eea5a251d43412b07f5295d03e97b89ac4a5 \
+     -O /rootfs-arm64/lib/firmware/qcom/a530_pfp.fw
 
 mkdir -p /baremetal-files/jetson-nano/boot/
 ln -s \

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

@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-arch=armhf . .gitlab-ci/container/debian/arm_test.sh

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

@@ -59,7 +59,7 @@ apt-get install -y --no-remove \
         libxshmfence-dev \
         libxxf86vm-dev \
         make \
-        ninja-build \
+        meson \
         pkg-config \
         python3-mako \
         python3-pil \
@@ -76,10 +76,10 @@ apt-get install -y --no-remove \
 	zstd
 
 # Needed for ci-fairy, this revision is able to upload files to MinIO
-pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2
+pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@34f4ade99434043f88e164933f570301fd18b125
 
-# We need at least 1.0.0 for proper Rust; 0.62 for modern meson env2mfile
-pip3 install meson==1.0.0
+# We need at least 0.61.4 for proper Rust
+pip3 install meson==0.61.5
 
 . .gitlab-ci/container/build-rust.sh
 

.gitlab-ci/container/debian/x86_build-mingw-source-deps.sh

@@ -27,8 +27,9 @@ popd
 # Building libva
 git clone https://github.com/intel/libva
 pushd libva/
-# libva-win32 is released with libva version 2.17 (see https://github.com/intel/libva/releases/tag/2.17.0)
-git checkout 2.17.0
+# Checking out commit hash with libva-win32 support
+# This feature will be released with libva version 2.17
+git checkout 2579eb0f77897dc01a02c1e43defc63c40fd2988
 popd
 # libva already has a build dir in their repo, use builddir instead
 mkdir -p libva/builddir

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

@@ -92,7 +92,7 @@ ninja install
 popd
 rm -rf DirectX-Headers
 
-pip3 install lavacli==1.5.2
+pip3 install git+https://git.lavasoftware.org/lava/lavacli@3db3ddc45e5358908bc6a17448059ea2340492b7
 
 # install bindgen
 RUSTFLAGS='-L native=/usr/local/lib' cargo install \

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

@@ -118,7 +118,7 @@ mkdir -p /lava-files/
 
 # 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@ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2
+pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@34f4ade99434043f88e164933f570301fd18b125
 
 # Needed for manipulation with traces yaml files.
 pip3 install yq

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

@@ -25,7 +25,6 @@ STABLE_EPHEMERAL=" \
       libudev-dev \
       libvulkan-dev \
       libwaffle-dev \
-      libwayland-dev \
       libx11-xcb-dev \
       libxcb-dri2-0-dev \
       libxkbcommon-dev \
@@ -60,8 +59,7 @@ apt-get install -y --no-remove \
       python3-lxml \
       python3-renderdoc \
       python3-simplejson \
-      spirv-tools \
-      weston
+      spirv-tools
 
 
 . .gitlab-ci/container/container_pre_build.sh

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

@@ -45,6 +45,7 @@ STABLE_EPHEMERAL=" \
       python3-setuptools \
       python3-wheel \
       software-properties-common \
+      wget \
       wine64-tools \
       xz-utils \
       "
@@ -56,7 +57,6 @@ apt-get install -y --no-remove --no-install-recommends \
       pciutils \
       python3-lxml \
       python3-simplejson \
-      wget \
       xinit \
       xserver-xorg-video-amdgpu \
       xserver-xorg-video-ati
@@ -66,6 +66,10 @@ apt-key add .gitlab-ci/container/debian/winehq.gpg.key
 apt-add-repository https://dl.winehq.org/wine-builds/debian/
 apt-get update -q
 
+# Needed for Valve's tracing jobs to collect information about the graphics
+# hardware on the test devices.
+pip3 install gfxinfo-mupuf==0.0.9
+
 # workaround wine needing 32-bit
 # https://bugs.winehq.org/show_bug.cgi?id=53393
 apt-get install -y --no-remove wine-stable-amd64  # a requirement for wine-stable

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

@@ -31,6 +31,7 @@ dnf install -y --setopt=install_weak_deps=False \
     glslang \
     kernel-headers \
     llvm-devel \
+    clang-devel \
     meson \
     "pkgconfig(dri2proto)" \
     "pkgconfig(expat)" \
@@ -64,6 +65,8 @@ dnf install -y --setopt=install_weak_deps=False \
     python-unversioned-command \
     python3-devel \
     python3-mako \
+    python3-devel \
+    python3-mako \
     python3-ply \
     vulkan-headers \
     spirv-tools-devel \

.gitlab-ci/container/gitlab-ci.yml

@@ -189,7 +189,7 @@ debian/android_build:
 debian/x86_test-base:
   extends: debian/x86_build-base
   variables:
-    KERNEL_URL: &kernel-rootfs-url "https://gitlab.freedesktop.org/gfx-ci/linux/-/archive/v6.0-for-mesa-ci-93bd820c433b/linux-v6.0-for-mesa-ci-93bd820c433b.tar.bz2"
+    KERNEL_URL: &kernel-rootfs-url "https://gitlab.freedesktop.org/gfx-ci/linux/-/archive/v5.19-for-mesa-ci-d4efddaec194/linux-v5.17-for-mesa-ci-b78f7870d97b.tar.bz2"
     MESA_IMAGE_TAG: &debian-x86_test-base ${DEBIAN_BASE_TAG}
 
 .use-debian/x86_test-base:
@@ -213,7 +213,7 @@ debian/x86_test-gl:
     - .set-image-base-tag
   variables:
     MESA_BASE_TAG: *debian-x86_test-base
-    MESA_IMAGE_PATH: ${DEBIAN_X86_TEST_IMAGE_GL_PATH}
+    MESA_IMAGE_PATH: ${DEBIAN_X86_TEST_IMAGE_PATH}
     MESA_IMAGE_TAG: *debian-x86_test-gl
   needs:
     - debian/x86_test-gl
@@ -229,7 +229,7 @@ debian/x86_test-vk:
     - .set-image-base-tag
   variables:
     MESA_BASE_TAG: *debian-x86_test-base
-    MESA_IMAGE_PATH: ${DEBIAN_X86_TEST_IMAGE_VK_PATH}
+    MESA_IMAGE_PATH: "debian/x86_test-vk"
     MESA_IMAGE_TAG: *debian-x86_test-vk
   needs:
     - debian/x86_test-vk
@@ -255,24 +255,6 @@ debian/arm_build:
     - debian/arm_build
 
 
-# Alpine based x86 build image
-alpine/x86_build:
-  extends:
-    - .fdo.container-build@alpine
-    - .container
-  variables:
-    FDO_DISTRIBUTION_VERSION: "3.16"
-    MESA_IMAGE_TAG: &alpine-x86_build ${ALPINE_X86_BUILD_TAG}
-
-.use-alpine/x86_build:
-  extends:
-    - .set-image
-  variables:
-    MESA_IMAGE_PATH: "alpine/x86_build"
-    MESA_IMAGE_TAG: *alpine-x86_build
-  needs:
-    - alpine/x86_build
-
 # Fedora 34 based x86 build image
 fedora/x86_build:
   extends:
@@ -340,56 +322,30 @@ kernel+rootfs_armhf:
     MESA_ROOTFS_TAG: *kernel-rootfs
 
 # x86 image with ARM64 & armhf kernel & rootfs for baremetal testing
-.debian/arm_test:
+debian/arm_test:
   extends:
     - .fdo.container-build@debian
     - .container
     # Don't want the .container rules
     - .build-rules
-  variables:
-    FDO_DISTRIBUTION_TAG: "${MESA_IMAGE_TAG}--${MESA_ROOTFS_TAG}--${MESA_TEMPLATES_COMMIT}"
-    ARTIFACTS_PREFIX: "https://${MINIO_HOST}/mesa-lava"
-    ARTIFACTS_SUFFIX: "${MESA_ROOTFS_TAG}--${MESA_ARTIFACTS_TAG}--${MESA_TEMPLATES_COMMIT}"
-    MESA_ARTIFACTS_TAG: *debian-arm_build
-    MESA_ROOTFS_TAG: *kernel-rootfs
-
-debian/armhf_test:
-  extends:
-    - .debian/arm_test
-  needs:
-    - kernel+rootfs_armhf
-  variables:
-    MESA_IMAGE_TAG: &debian-armhf_test ${DEBIAN_BASE_TAG}
-
-debian/arm64_test:
-  extends:
-    - .debian/arm_test
   needs:
     - kernel+rootfs_arm64
+    - kernel+rootfs_armhf
   variables:
-    MESA_IMAGE_TAG: &debian-arm64_test ${DEBIAN_BASE_TAG}
-
-.use-debian/arm_test:
-  variables:
+    FDO_DISTRIBUTION_TAG: "${MESA_IMAGE_TAG}--${MESA_ROOTFS_TAG}--${MESA_ARM_BUILD_TAG}--${MESA_TEMPLATES_COMMIT}"
+    ARTIFACTS_PREFIX: "https://${MINIO_HOST}/mesa-lava"
+    ARTIFACTS_SUFFIX: "${MESA_ROOTFS_TAG}--${MESA_ARM_BUILD_TAG}--${MESA_TEMPLATES_COMMIT}"
+    MESA_ARM_BUILD_TAG: *debian-arm_build
+    MESA_IMAGE_TAG: &debian-arm_test ${DEBIAN_BASE_TAG}
     MESA_ROOTFS_TAG: *kernel-rootfs
 
-.use-debian/armhf_test:
-  image: "$CI_REGISTRY_IMAGE/${MESA_IMAGE_PATH}:${MESA_IMAGE_TAG}--${MESA_ROOTFS_TAG}--${MESA_TEMPLATES_COMMIT}"
-  extends:
-    - .use-debian/arm_test
+.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_IMAGE_PATH: "debian/armhf_test"
-    MESA_IMAGE_TAG: *debian-armhf_test
-  needs:
-    - debian/arm_test
-
-.use-debian/arm64_test:
-  image: "$CI_REGISTRY_IMAGE/${MESA_IMAGE_PATH}:${MESA_IMAGE_TAG}--${MESA_ROOTFS_TAG}--${MESA_TEMPLATES_COMMIT}"
-  extends:
-    - .use-debian/arm_test
-  variables:
-    MESA_IMAGE_PATH: "debian/arm64_test"
-    MESA_IMAGE_TAG: *debian-arm64_test
+    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
 

.gitlab-ci/container/lava_build.sh

@@ -40,7 +40,6 @@ if [[ "$DEBIAN_ARCH" = "arm64" ]]; then
     DEVICE_TREES+=" arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-juniper-sku16.dtb"
     DEVICE_TREES+=" arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dtb"
     DEVICE_TREES+=" arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r5.dtb"
-    DEVICE_TREES+=" arch/arm64/boot/dts/qcom/sc7180-trogdor-kingoftown-r1.dtb"
     DEVICE_TREES+=" arch/arm64/boot/dts/freescale/imx8mq-nitrogen.dtb"
     KERNEL_IMAGE_NAME="Image"
 
@@ -110,7 +109,6 @@ apt-get install -y --no-remove \
                    libx11-xcb-dev \
                    libxcb-dri2-0-dev \
                    libxkbcommon-dev \
-                   libwayland-dev \
                    ninja-build \
                    patch \
                    protobuf-compiler \
@@ -200,8 +198,6 @@ if [[ ${DEBIAN_ARCH} = "amd64" ]]; then
     . .gitlab-ci/container/build-crosvm.sh
     mv /usr/local/bin/crosvm /lava-files/rootfs-${DEBIAN_ARCH}/usr/bin/
     mv /usr/local/lib/$GCC_ARCH/libvirglrenderer.* /lava-files/rootfs-${DEBIAN_ARCH}/usr/lib/$GCC_ARCH/
-    mkdir -p /lava-files/rootfs-${DEBIAN_ARCH}/usr/local/libexec/
-    mv /usr/local/libexec/virgl* /lava-files/rootfs-${DEBIAN_ARCH}/usr/local/libexec/
 fi
 
 ############### Build libdrm
@@ -244,7 +240,6 @@ cp .gitlab-ci/container/debian/winehq.gpg.key /lava-files/rootfs-${DEBIAN_ARCH}/
 chroot /lava-files/rootfs-${DEBIAN_ARCH} sh /create-rootfs.sh
 rm /lava-files/rootfs-${DEBIAN_ARCH}/{llvm-snapshot,winehq}.gpg.key
 rm /lava-files/rootfs-${DEBIAN_ARCH}/create-rootfs.sh
-cp /etc/wgetrc /lava-files/rootfs-${DEBIAN_ARCH}/etc/.
 
 
 ############### Install the built libdrm
@@ -272,6 +267,7 @@ popd
 . .gitlab-ci/container/container_post_build.sh
 
 ############### Upload the files!
+ci-fairy minio login --token-file "${CI_JOB_JWT_FILE}"
 FILES_TO_UPLOAD="lava-rootfs.tar.zst \
                  $KERNEL_IMAGE_NAME"
 
@@ -280,9 +276,9 @@ if [[ -n $DEVICE_TREES ]]; then
 fi
 
 for f in $FILES_TO_UPLOAD; do
-    ci-fairy s3cp --token-file "${CI_JOB_JWT_FILE}" /lava-files/$f \
-             https://${MINIO_PATH}/$f
+    ci-fairy minio cp /lava-files/$f \
+             minio://${MINIO_PATH}/$f
 done
 
 touch /lava-files/done
-ci-fairy s3cp --token-file "${CI_JOB_JWT_FILE}" /lava-files/done https://${MINIO_PATH}/done
+ci-fairy minio cp /lava-files/done minio://${MINIO_PATH}/done

.gitlab-ci/container/x86_64.config

@@ -1,12 +1,6 @@
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_DEBUG_KERNEL=y
 
-CONFIG_CRYPTO_ZSTD=y
-CONFIG_ZRAM_MEMORY_TRACKING=y
-CONFIG_ZRAM_WRITEBACK=y
-CONFIG_ZRAM=y
-CONFIG_ZSMALLOC_STAT=y
-
 CONFIG_PWM=y
 CONFIG_PM_DEVFREQ=y
 CONFIG_OF=y

.gitlab-ci/crosvm-runner.sh

@@ -96,8 +96,7 @@ LIBGL_ALWAYS_SOFTWARE=${CROSVM_LIBGL_ALWAYS_SOFTWARE} \
 GALLIUM_DRIVER=${CROSVM_GALLIUM_DRIVER} \
 VK_ICD_FILENAMES=$CI_PROJECT_DIR/install/share/vulkan/icd.d/${CROSVM_VK_DRIVER}_icd.x86_64.json \
 crosvm --no-syslog run \
-    --gpu "${CROSVM_GPU_ARGS}" --gpu-render-server "path=/usr/local/libexec/virgl_render_server" \
-    -m "${CROSVM_MEMORY:-4096}" -c 2 --disable-sandbox \
+    --gpu "${CROSVM_GPU_ARGS}" -m "${CROSVM_MEMORY:-4096}" -c 2 --disable-sandbox \
     --shared-dir /:my_root:type=fs:writeback=true:timeout=60:cache=always \
     --host-ip "192.168.30.1" --netmask "255.255.255.0" --mac "AA:BB:CC:00:00:12" \
     -s $VM_SOCKET \

.gitlab-ci/deqp-runner.sh

@@ -18,7 +18,6 @@ INSTALL=`pwd`/install
 export LD_LIBRARY_PATH=`pwd`/install/lib/
 export EGL_PLATFORM=surfaceless
 export VK_ICD_FILENAMES=`pwd`/install/share/vulkan/icd.d/"$VK_DRIVER"_icd.${VK_CPU:-`uname -m`}.json
-export OCL_ICD_VENDORS=`pwd`/install/etc/OpenCL/vendors/
 
 RESULTS=`pwd`/${DEQP_RESULTS_DIR:-results}
 mkdir -p $RESULTS
@@ -86,6 +85,14 @@ if [ -z "$DEQP_SUITE" ]; then
        sed -ni $CI_NODE_INDEX~$CI_NODE_TOTAL"p" /tmp/case-list.txt
     fi
 
+    if [ -n "$DEQP_CASELIST_FILTER" ]; then
+        sed -ni "/$DEQP_CASELIST_FILTER/p" /tmp/case-list.txt
+    fi
+
+    if [ -n "$DEQP_CASELIST_INV_FILTER" ]; then
+        sed -ni "/$DEQP_CASELIST_INV_FILTER/!p" /tmp/case-list.txt
+    fi
+
     if [ ! -s /tmp/case-list.txt ]; then
         echo "Caselist generation failed"
         exit 1

.gitlab-ci/image-tags.yml

@@ -1,31 +1,27 @@
 variables:
    DEBIAN_X86_BUILD_BASE_IMAGE: "debian/x86_build-base"
-   DEBIAN_BASE_TAG: "2023-01-31-rust-valgrind-23-stable"
+   DEBIAN_BASE_TAG: "2022-10-19-remove-xvmc-dev"
 
    DEBIAN_X86_BUILD_IMAGE_PATH: "debian/x86_build"
-   DEBIAN_BUILD_TAG: "2023-01-09-lavacli"
+   DEBIAN_BUILD_TAG: "2022-10-22-mold-1_6"
 
    DEBIAN_X86_BUILD_MINGW_IMAGE_PATH: "debian/x86_build-mingw"
-   DEBIAN_BUILD_MINGW_TAG: "2023-01-03-ci-libva-2.17"
+   DEBIAN_BUILD_MINGW_TAG: "2022-10-18-dx-headers-va"
 
    DEBIAN_X86_TEST_BASE_IMAGE: "debian/x86_test-base"
 
-   DEBIAN_X86_TEST_IMAGE_GL_PATH: "debian/x86_test-gl"
-   DEBIAN_X86_TEST_IMAGE_VK_PATH: "debian/x86_test-vk"
-   DEBIAN_X86_TEST_IMAGE_PATH: ${DEBIAN_X86_TEST_IMAGE_GL_PATH}
+   DEBIAN_X86_TEST_IMAGE_PATH: "debian/x86_test-gl"
+   DEBIAN_X86_TEST_GL_TAG: "2022-10-20-bindgen-zlib-cve"
+   DEBIAN_X86_TEST_VK_TAG: "2022-10-20-bindgen-zlib-cve"
 
-   DEBIAN_X86_TEST_GL_TAG: "2023-01-08-weston-xwayland"
-   DEBIAN_X86_TEST_VK_TAG: "2022-12-12-vkd3d-proton-uprev"
-
-   ALPINE_X86_BUILD_TAG: "2023-01-10-robust-wget"
-   FEDORA_X86_BUILD_TAG: "2023-01-10-robust-wget"
-   KERNEL_ROOTFS_TAG: "2023-01-10-virglrenderer"
+   FEDORA_X86_BUILD_TAG: "2022-09-22-python3-ply-2"
+   KERNEL_ROOTFS_TAG: "2022-10-20-bindgen-zlib-cve"
 
    WINDOWS_X64_VS_PATH: "windows/x64_vs"
    WINDOWS_X64_VS_TAG: "2022-10-20-upgrade-zlib"
 
    WINDOWS_X64_BUILD_PATH: "windows/x64_build"
-   WINDOWS_X64_BUILD_TAG: "2023-01-03-ci-libva-2.17"
+   WINDOWS_X64_BUILD_TAG: "2022-10-18-wrap-nodownload-va"
 
    WINDOWS_X64_TEST_PATH: "windows/x64_test"
-   WINDOWS_X64_TEST_TAG: "2023-01-03-piglit-waffle"
+   WINDOWS_X64_TEST_TAG: "2022-08-17-bump"

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

@@ -26,7 +26,8 @@ cat results/job-rootfs-overlay/set-job-env-vars.sh
 echo -e "\e[0Ksection_end:$(date +%s):variables\r\e[0K"
 
 tar zcf job-rootfs-overlay.tar.gz -C results/job-rootfs-overlay/ .
-ci-fairy s3cp --token-file "${CI_JOB_JWT_FILE}" job-rootfs-overlay.tar.gz "https://${JOB_ROOTFS_OVERLAY_PATH}"
+ci-fairy minio login --token-file "${CI_JOB_JWT_FILE}"
+ci-fairy minio cp job-rootfs-overlay.tar.gz "minio://${JOB_ROOTFS_OVERLAY_PATH}"
 
 touch results/lava.log
 tail -f results/lava.log &

.gitlab-ci/lava/lava_job_submitter.py

@@ -20,11 +20,11 @@ import traceback
 import urllib.parse
 import xmlrpc.client
 from datetime import datetime, timedelta
-from io import StringIO
 from os import getenv
 from typing import Any, Optional
 
 import lavacli
+import yaml
 from lava.exceptions import (
     MesaCIException,
     MesaCIKnownIssueException,
@@ -42,7 +42,7 @@ from lava.utils import (
     hide_sensitive_data,
     print_log,
 )
-from lavacli.utils import flow_yaml as lava_yaml
+from lavacli.utils import loader
 
 # Timeout in seconds to decide if the device from the dispatched LAVA job has
 # hung or not due to the lack of new log output.
@@ -62,7 +62,7 @@ NUMBER_OF_RETRIES_TIMEOUT_DETECTION = int(getenv("LAVA_NUMBER_OF_RETRIES_TIMEOUT
 NUMBER_OF_ATTEMPTS_LAVA_BOOT = int(getenv("LAVA_NUMBER_OF_ATTEMPTS_LAVA_BOOT", 3))
 
 
-def generate_lava_yaml_payload(args) -> dict[str, Any]:
+def generate_lava_yaml(args):
     # General metadata and permissions, plus also inexplicably kernel arguments
     values = {
         'job_name': 'mesa: {}'.format(args.pipeline_info),
@@ -74,20 +74,11 @@ def generate_lava_yaml_payload(args) -> dict[str, Any]:
         },
         "timeouts": {
             "job": {"minutes": args.job_timeout},
+            "action": {"minutes": 3},
             "actions": {
-                "depthcharge-retry": {
-                    # Could take between 1 and 1.5 min in slower boots
-                    "minutes": 2
-                },
-                "depthcharge-start": {
-                    # Should take less than 1 min.
-                    "minutes": 1,
-                },
                 "depthcharge-action": {
-                    # This timeout englobes the entire depthcharge timing,
-                    # including retries
-                    "minutes": 2 * NUMBER_OF_ATTEMPTS_LAVA_BOOT,
-                },
+                    "minutes": 3 * NUMBER_OF_ATTEMPTS_LAVA_BOOT,
+                }
             }
         },
     }
@@ -156,13 +147,8 @@ def generate_lava_yaml_payload(args) -> dict[str, Any]:
     #   - fetch and unpack per-job environment from lava-submit.sh
     #   - exec .gitlab-ci/common/init-stage2.sh
 
-    with open(args.first_stage_init, "r") as init_sh:
-        run_steps += [
-            x.rstrip() for x in init_sh if not x.startswith("#") and x.rstrip()
-        ]
-        run_steps.append(
-            f"wget -S --progress=dot:giga -O- {args.job_rootfs_overlay_url} | tar -xz -C /",
-        )
+    with open(args.first_stage_init, 'r') as init_sh:
+      run_steps += [ x.rstrip() for x in init_sh if not x.startswith('#') and x.rstrip() ]
 
     if args.jwt_file:
         with open(args.jwt_file) as jwt_file:
@@ -181,6 +167,7 @@ def generate_lava_yaml_payload(args) -> dict[str, Any]:
     run_steps += [
       'mkdir -p {}'.format(args.ci_project_dir),
       'wget -S --progress=dot:giga -O- {} | tar --zstd -x -C {}'.format(args.build_url, args.ci_project_dir),
+      'wget -S --progress=dot:giga -O- {} | tar -xz -C /'.format(args.job_rootfs_overlay_url),
 
       # Sleep a bit to give time for bash to dump shell xtrace messages into
       # console which may cause interleaving with LAVA_SIGNAL_STARTTC in some
@@ -198,7 +185,7 @@ def generate_lava_yaml_payload(args) -> dict[str, Any]:
       { 'test': test },
     ]
 
-    return values
+    return yaml.dump(values, width=10000000)
 
 
 def setup_lava_proxy():
@@ -285,12 +272,8 @@ class LAVAJob:
 
     def _load_log_from_data(self, data) -> list[str]:
         lines = []
-        if isinstance(data, xmlrpc.client.Binary):
-            # We are dealing with xmlrpc.client.Binary
-            # Let's extract the data
-            data = data.data
         # When there is no new log data, the YAML is empty
-        if loaded_lines := lava_yaml.load(data):
+        if loaded_lines := yaml.load(str(data), Loader=loader(False)):
             lines = loaded_lines
             self.last_log_line += len(lines)
         return lines
@@ -355,7 +338,7 @@ def find_exception_from_metadata(metadata, job_id):
 def find_lava_error(job) -> None:
     # Look for infrastructure errors and retry if we see them.
     results_yaml = _call_proxy(job.proxy.results.get_testjob_results_yaml, job.job_id)
-    results = lava_yaml.load(results_yaml)
+    results = yaml.load(results_yaml, Loader=loader(False))
     for res in results:
         metadata = res["metadata"]
         find_exception_from_metadata(metadata, job.job_id)
@@ -365,17 +348,16 @@ def find_lava_error(job) -> None:
     job.status = "fail"
 
 
-def show_job_data(job, colour=f"{CONSOLE_LOG['BOLD']}{CONSOLE_LOG['FG_GREEN']}"):
+def show_job_data(job):
     with GitlabSection(
         "job_data",
         "LAVA job info",
         type=LogSectionType.LAVA_POST_PROCESSING,
         start_collapsed=True,
-        colour=colour,
     ):
         show = _call_proxy(job.proxy.scheduler.jobs.show, job.job_id)
         for field, value in show.items():
-            print(f"{field:<15}: {value}")
+            print("{}\t: {}".format(field, value))
 
 
 def fetch_logs(job, max_idle_time, log_follower) -> None:
@@ -451,6 +433,8 @@ def follow_job_execution(job):
         while not job.is_finished:
             fetch_logs(job, max_idle_time, lf)
 
+    show_job_data(job)
+
     # Mesa Developers expect to have a simple pass/fail job result.
     # If this does not happen, it probably means a LAVA infrastructure error
     # happened.
@@ -469,7 +453,6 @@ def print_job_final_status(job):
         f"{CONSOLE_LOG['RESET']}"
     )
 
-    show_job_data(job, colour=f"{CONSOLE_LOG['BOLD']}{color}")
 
 def retriable_follow_job(proxy, job_definition) -> LAVAJob:
     retry_count = NUMBER_OF_RETRIES_TIMEOUT_DETECTION
@@ -522,9 +505,7 @@ def main(args):
     # script section timeout with a reasonable delay.
     GL_SECTION_TIMEOUTS[LogSectionType.TEST_CASE] = timedelta(minutes=args.job_timeout)
 
-    job_definition_stream = StringIO()
-    lava_yaml.dump(generate_lava_yaml_payload(args), job_definition_stream)
-    job_definition = job_definition_stream.getvalue()
+    job_definition = generate_lava_yaml(args)
 
     if args.dump_yaml:
         with GitlabSection(

.gitlab-ci/lava/utils/__init__.py

@@ -3,6 +3,7 @@ from .gitlab_section import GitlabSection
 from .log_follower import (
     LogFollower,
     fatal_err,
+    fix_lava_color_log,
     fix_lava_gitlab_section_log,
     hide_sensitive_data,
     print_log,

.gitlab-ci/lava/utils/log_follower.py

@@ -49,10 +49,6 @@ class LogFollower:
             section_is_created == section_has_started
         ), "Can't follow logs beginning from uninitialized GitLab sections."
 
-        # Initialize fix_lava_gitlab_section_log generator
-        self.gl_section_fix_gen = fix_lava_gitlab_section_log()
-        next(self.gl_section_fix_gen)
-
     @property
     def phase(self) -> LogSectionType:
         return (
@@ -142,7 +138,7 @@ class LogFollower:
             # job is progressing
             is_job_healthy = True
             self.manage_gl_sections(line)
-            if parsed_line := self.parse_lava_line(line):
+            if parsed_line := parse_lava_line(line):
                 self._buffer.append(parsed_line)
 
         self.log_hints.detect_failure(new_lines)
@@ -154,61 +150,55 @@ class LogFollower:
         self._buffer = []
         return buffer
 
-    def parse_lava_line(self, line) -> Optional[str]:
-        prefix = ""
-        suffix = ""
 
-        if line["lvl"] in ["results", "feedback", "debug"]:
-            return
-        elif line["lvl"] in ["warning", "error"]:
-            prefix = CONSOLE_LOG["FG_RED"]
-            suffix = CONSOLE_LOG["RESET"]
-        elif line["lvl"] == "input":
-            prefix = "$ "
-            suffix = ""
-        elif line["lvl"] == "target":
-            # gl_section_fix_gen will output the stored line if it can't find a
-            # match for the first split line
-            # So we can recover it and put it back to the buffer
-            if recovered_first_line := self.gl_section_fix_gen.send(line):
-                self._buffer.append(recovered_first_line)
+def fix_lava_color_log(line):
+    """This function is a temporary solution for the color escape codes mangling
+    problem. There is some problem in message passing between the LAVA
+    dispatcher and the device under test (DUT). Here \x1b character is missing
+    before `[:digit::digit:?:digit:?m` ANSI TTY color codes, or the more
+    complicated ones with number values for text format before background and
+    foreground colors.
+    When this problem is fixed on the LAVA side, one should remove this function.
+    """
+    line["msg"] = re.sub(r"(\[(\d+;){0,2}\d{1,3}m)", "\x1b" + r"\1", line["msg"])
 
-        return f'{prefix}{line["msg"]}{suffix}'
 
-def fix_lava_gitlab_section_log():
+def fix_lava_gitlab_section_log(line):
     """This function is a temporary solution for the Gitlab section markers
-    splitting problem. Gitlab parses the following lines to define a collapsible
+    mangling problem. Gitlab parses the following lines to define a collapsible
     gitlab section in their log:
     - \x1b[0Ksection_start:timestamp:section_id[collapsible=true/false]\r\x1b[0Ksection_header
     - \x1b[0Ksection_end:timestamp:section_id\r\x1b[0K
     There is some problem in message passing between the LAVA dispatcher and the
-    device under test (DUT), that replaces \r control characters into \n. When
-    this problem is fixed on the LAVA side, one should remove this function.
+    device under test (DUT), that digests \x1b and \r control characters
+    incorrectly. When this problem is fixed on the LAVA side, one should remove
+    this function.
     """
-    while True:
-        line = yield False
-        first_line = None
-        split_line_pattern = re.compile(r"\x1b\[0K(section_\w+):(\d+):([^\s\r]+)$")
-        second_line_pattern = re.compile(r"\x1b\[0K([\S ]+)?")
+    if match := re.match(r"\[0K(section_\w+):(\d+):(\S+)\[0K([\S ]+)?", line["msg"]):
+        marker, timestamp, id_collapsible, header = match.groups()
+        # The above regex serves for both section start and end lines.
+        # When the header is None, it means we are dealing with `section_end` line
+        header = header or ""
+        line["msg"] = f"\x1b[0K{marker}:{timestamp}:{id_collapsible}\r\x1b[0K{header}"
 
-        if not re.search(split_line_pattern, line["msg"]):
-            continue
 
-        first_line = line["msg"]
-        # Delete the current line and hold this log line stream to be able to
-        # possibly merge it with the next line.
-        line["msg"] = ""
-        line = yield False
+def parse_lava_line(line) -> Optional[str]:
+    prefix = ""
+    suffix = ""
 
-        # This code reached when we detect a possible first split line
-        if re.search(second_line_pattern, line["msg"]):
-            assert first_line
-            line["msg"] = f"{first_line}\r{line['msg']}"
-        else:
-            # The current line doesn't match with the previous one, send back the
-            # latter to give the user the chance to recover it.
-            yield first_line
+    if line["lvl"] in ["results", "feedback", "debug"]:
+        return
+    elif line["lvl"] in ["warning", "error"]:
+        prefix = CONSOLE_LOG["FG_RED"]
+        suffix = CONSOLE_LOG["RESET"]
+    elif line["lvl"] == "input":
+        prefix = "$ "
+        suffix = ""
+    elif line["lvl"] == "target":
+        fix_lava_color_log(line)
+        fix_lava_gitlab_section_log(line)
 
+    return f'{prefix}{line["msg"]}{suffix}'
 
 
 def print_log(msg):
@@ -224,5 +214,5 @@ def fatal_err(msg):
     sys.exit(1)
 
 
-def hide_sensitive_data(yaml_data: str, hide_tag: str ="HIDEME"):
+def hide_sensitive_data(yaml_data, hide_tag="HIDEME"):
     return "".join(line for line in yaml_data.splitlines(True) if hide_tag not in line)

.gitlab-ci/meson/build.sh

@@ -24,7 +24,7 @@ fi
 # tests in their meson.build with:
 #
 # test(...,
-#      should_fail: meson.get_external_property('xfail', '').contains(t),
+#      should_fail: meson.get_cross_property('xfail', '').contains(t),
 #     )
 #
 # where t is the name of the test, and the '' is the string to search when

.gitlab-ci/piglit/piglit-traces.sh

@@ -3,7 +3,7 @@
 set -ex
 
 INSTALL=$(realpath -s "$PWD"/install)
-MINIO_ARGS="--token-file ${CI_JOB_JWT_FILE}"
+MINIO_ARGS="--credentials=/tmp/.minio_credentials"
 
 RESULTS=$(realpath -s "$PWD"/results)
 mkdir -p "$RESULTS"
@@ -137,8 +137,8 @@ replay_minio_upload_images() {
             __DESTINATION_FILE_PATH="$__MINIO_TRACES_PREFIX/${line##*-}"
         fi
 
-        ci-fairy s3cp $MINIO_ARGS "$RESULTS/$__PREFIX/$line" \
-            "https://${__MINIO_PATH}/${__DESTINATION_FILE_PATH}"
+        ci-fairy minio cp $MINIO_ARGS "$RESULTS/$__PREFIX/$line" \
+            "minio://${__MINIO_PATH}/${__DESTINATION_FILE_PATH}"
     done
 }
 
@@ -173,6 +173,8 @@ if [ "$RUN_CMD_WRAPPER" ]; then
     RUN_CMD="set +e; $RUN_CMD_WRAPPER "$(/usr/bin/printf "%q" "$RUN_CMD")"; set -e"
 fi
 
+ci-fairy minio login $MINIO_ARGS --token-file "${CI_JOB_JWT_FILE}"
+
 # The replayer doesn't do any size or checksum verification for the traces in
 # the replayer db, so if we had to restart the system due to intermittent device
 # errors (or tried to cache replayer-db between runs, which would be nice to

.gitlab-ci/piglit/run_cl.sh

@@ -0,0 +1,75 @@
+#!/bin/bash
+
+set -e
+set -o xtrace
+
+VERSION=`head -1 install/VERSION`
+ROOTDIR=`pwd`
+
+if [ -d results ]; then
+    cd results && rm -rf ..?* .[!.]* *
+fi
+cd /piglit
+
+export OCL_ICD_VENDORS=$ROOTDIR/install/etc/OpenCL/vendors/
+
+set +e
+unset DISPLAY
+export LD_LIBRARY_PATH=$ROOTDIR/install/lib
+clinfo
+
+# If the job is parallel at the gitlab job level, will take the corresponding
+# fraction of the caselist.
+if [ -n "$CI_NODE_INDEX" ]; then
+
+    if [ "$PIGLIT_PROFILES" != "${PIGLIT_PROFILES% *}" ]; then
+        echo "Can't parallelize piglit with multiple profiles"
+        exit 1
+    fi
+    USE_CASELIST=1
+fi
+
+if [ -n "$USE_CASELIST" ]; then
+    ./piglit print-cmd $PIGLIT_TESTS $PIGLIT_PROFILES --format "{name}" > /tmp/case-list.txt
+
+    sed -ni $CI_NODE_INDEX~$CI_NODE_TOTAL"p" /tmp/case-list.txt
+
+    PIGLIT_TESTS="--test-list /tmp/case-list.txt"
+fi
+
+./piglit run -c -j${FDO_CI_CONCURRENT:-4} $PIGLIT_OPTIONS $PIGLIT_TESTS $PIGLIT_PROFILES $ROOTDIR/results
+retVal=$?
+if [ $retVal -ne 0 ]; then
+    echo "Found $(cat /tmp/version.txt), expected $VERSION"
+fi
+set -e
+
+PIGLIT_RESULTS=${PIGLIT_RESULTS:-$PIGLIT_PROFILES}
+mkdir -p .gitlab-ci/piglit
+./piglit summary console $ROOTDIR/results \
+  | tee ".gitlab-ci/piglit/$PIGLIT_RESULTS.txt.orig" \
+  | head -n -1 \
+  | grep -v ": pass" \
+  | sed '/^summary:/Q' \
+  > .gitlab-ci/piglit/$PIGLIT_RESULTS.txt
+
+if [ -n "$USE_CASELIST" ]; then
+    # Just filter the expected results based on the tests that were actually
+    # executed, and switch to the version with no summary
+    cat .gitlab-ci/piglit/$PIGLIT_RESULTS.txt.orig | sed '/^summary:/Q' | rev \
+         | cut -f2- -d: | rev | sed "s/$/:/g" > /tmp/executed.txt
+    grep -F -f /tmp/executed.txt $ROOTDIR/install/$PIGLIT_RESULTS.txt \
+         > .gitlab-ci/piglit/$PIGLIT_RESULTS.txt.baseline || true
+else
+    cp $ROOTDIR/install/$PIGLIT_RESULTS.txt .gitlab-ci/piglit/$PIGLIT_RESULTS.txt.baseline
+fi
+
+if diff -q .gitlab-ci/piglit/$PIGLIT_RESULTS.txt{.baseline,}; then
+    exit 0
+fi
+
+./piglit summary html --exclude-details=pass $ROOTDIR/results/summary $ROOTDIR/results
+
+echo Unexpected change in results:
+diff -u .gitlab-ci/piglit/$PIGLIT_RESULTS.txt{.baseline,}
+exit 1

.gitlab-ci/prepare-artifacts.sh

@@ -10,7 +10,7 @@ rm -rf install/bin install/include
 
 # Strip the drivers in the artifacts to cut 80% of the artifacts size.
 if [ -n "$CROSS" ]; then
-    STRIP=$(sed -n -E "s/strip\s*=\s*\[?'(.*)'\]?/\1/p" "$CROSS_FILE")
+    STRIP=`sed -n -E "s/strip\s*=\s*'(.*)'/\1/p" "$CROSS_FILE"`
     if [ -z "$STRIP" ]; then
         echo "Failed to find strip command in cross file"
         exit 1
@@ -54,5 +54,6 @@ if [ -n "$MINIO_ARTIFACT_NAME" ]; then
     # Pass needed files to the test stage
     MINIO_ARTIFACT_NAME="$MINIO_ARTIFACT_NAME.tar.zst"
     zstd artifacts/install.tar -o ${MINIO_ARTIFACT_NAME}
-    ci-fairy s3cp --token-file "${CI_JOB_JWT_FILE}" ${MINIO_ARTIFACT_NAME} https://${PIPELINE_ARTIFACTS_BASE}/${MINIO_ARTIFACT_NAME}
+    ci-fairy minio login --token-file "${CI_JOB_JWT_FILE}"
+    ci-fairy minio cp ${MINIO_ARTIFACT_NAME} minio://${PIPELINE_ARTIFACTS_BASE}/${MINIO_ARTIFACT_NAME}
 fi

.gitlab-ci/run-shader-db.sh

@@ -1,41 +1,27 @@
-#!/usr/bin/env bash
 set -e
+set -v
 
-echo -e "\e[0Ksection_start:$(date +%s):shader-db-prepare[collapsed=true]\r\e[0KPreparing shader-db"
-ARTIFACTSDIR=$(pwd)/shader-db
-mkdir -p "$ARTIFACTSDIR"
+ARTIFACTSDIR=`pwd`/shader-db
+mkdir -p $ARTIFACTSDIR
 export DRM_SHIM_DEBUG=true
 
-LIBDIR=$(pwd)/install/lib
+LIBDIR=`pwd`/install/lib
 export LD_LIBRARY_PATH=$LIBDIR
 
 cd /usr/local/shader-db
-echo -e "\e[0Ksection_end:$(date +%s):shader-db-prepare\r\e[0K"
 
-for driver in freedreno intel v3d vc4; do
-    echo -e "\e[0Ksection_start:$(date +%s):shader-db-${driver}[collapsed=true]\r\e[0KRunning shader-db for $driver"
-    env LD_PRELOAD="$LIBDIR/lib${driver}_noop_drm_shim.so" \
-        ./run -j"${FDO_CI_CONCURRENT:-4}" ./shaders \
-            > "$ARTIFACTSDIR/${driver}-shader-db.txt"
-    echo -e "\e[0Ksection_end:$(date +%s):shader-db-${driver}\r\e[0K"
+for driver in freedreno intel v3d; do
+    echo "Running drm-shim for $driver"
+    env LD_PRELOAD=$LIBDIR/lib${driver}_noop_drm_shim.so \
+        ./run -j${FDO_CI_CONCURRENT:-4} ./shaders \
+            > $ARTIFACTSDIR/${driver}-shader-db.txt
 done
 
 # Run shader-db over a number of supported chipsets for nouveau
 for chipset in 40 a3 c0 e4 f0 134 162; do
-    echo -e "\e[0Ksection_start:$(date +%s):shader-db-nouveau-${chipset}[collapsed=true]\r\e[0KRunning shader-db for nouveau - ${chipset}"
-    env LD_PRELOAD="$LIBDIR/libnouveau_noop_drm_shim.so" \
+    echo "Running drm-shim for nouveau - $chipset"
+    env LD_PRELOAD=$LIBDIR/libnouveau_noop_drm_shim.so \
         NOUVEAU_CHIPSET=${chipset} \
-        ./run -j"${FDO_CI_CONCURRENT:-4}" ./shaders \
-            > "$ARTIFACTSDIR/nouveau-${chipset}-shader-db.txt"
-    echo -e "\e[0Ksection_end:$(date +%s):shader-db-nouveau-${chipset}\r\e[0K"
-done
-
-# Run shader-db for r300 (RV370 and RV515)
-for chipset in 0x5460 0x7140; do
-    echo -e "\e[0Ksection_start:$(date +%s):shader-db-r300-${chipset}[collapsed=true]\r\e[0KRunning shader-db for r300 - ${chipset}"
-    env LD_PRELOAD="$LIBDIR/libradeon_noop_drm_shim.so" \
-        RADEON_GPU_ID=${chipset} \
-        ./run -j"${FDO_CI_CONCURRENT:-4}" -o r300 ./shaders \
-            > "$ARTIFACTSDIR/r300-${chipset}-shader-db.txt"
-    echo -e "\e[0Ksection_end:$(date +%s):shader-db-r300-${chipset}\r\e[0K"
+        ./run -j${FDO_CI_CONCURRENT:-4} ./shaders \
+            > $ARTIFACTSDIR/nouveau-${chipset}-shader-db.txt
 done

.gitlab-ci/skqp-runner.sh

@@ -0,0 +1,371 @@
+#!/bin/bash
+#
+# Copyright (C) 2022 Collabora Limited
+# Author: Guilherme Gallo <guilherme.gallo@collabora.com>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+# Args:
+# $1: section id
+# $2: section header
+gitlab_section_start() {
+    echo -e "\e[0Ksection_start:$(date +%s):$1[collapsed=${GL_COLLAPSED:-false}]\r\e[0K\e[32;1m$2\e[0m"
+}
+
+# Args:
+# $1: section id
+gitlab_section_end() {
+        echo -e "\e[0Ksection_end:$(date +%s):$1\r\e[0K"
+}
+
+
+# sponge allows piping to files that are being used as input.
+# E.g.: sort file.txt | sponge file.txt
+# In order to avoid installing moreutils just to have the sponge binary, we can
+# use a bash function for it
+# Source https://unix.stackexchange.com/a/561346/310927
+sponge () (
+    set +x
+    append=false
+
+    while getopts 'a' opt; do
+        case $opt in
+            a) append=true ;;
+            *) echo error; exit 1
+        esac
+    done
+    shift "$(( OPTIND - 1 ))"
+
+    outfile=$1
+
+    tmpfile=$(mktemp "$(dirname "$outfile")/tmp-sponge.XXXXXXXX") &&
+    cat >"$tmpfile" &&
+    if "$append"; then
+        cat "$tmpfile" >>"$outfile"
+    else
+        if [ -f "$outfile" ]; then
+            chmod --reference="$outfile" "$tmpfile"
+        fi
+        if [ -f "$outfile" ]; then
+            mv "$tmpfile" "$outfile"
+        elif [ -n "$outfile" ] && [ ! -e "$outfile" ]; then
+            cat "$tmpfile" >"$outfile"
+        else
+            cat "$tmpfile"
+        fi
+    fi &&
+    rm -f "$tmpfile"
+)
+
+remove_comments_from_files() (
+    INPUT_FILES="$*"
+    for INPUT_FILE in ${INPUT_FILES}
+    do
+        [ -f "${INPUT_FILE}" ] || continue
+        sed -i '/#/d' "${INPUT_FILE}"
+        sed -i '/^\s*$/d' "${INPUT_FILE}"
+    done
+)
+
+subtract_test_lists() (
+    MINUEND=$1
+    sort "${MINUEND}" | sponge "${MINUEND}"
+    shift
+    for SUBTRAHEND in "$@"
+    do
+        sort "${SUBTRAHEND}" | sponge "${SUBTRAHEND}"
+        join -v 1 "${MINUEND}" "${SUBTRAHEND}" |
+            sponge "${MINUEND}"
+    done
+)
+
+merge_rendertests_files() {
+    BASE_FILE=$1
+    shift
+    FILES="$*"
+    # shellcheck disable=SC2086
+    cat $FILES "$BASE_FILE" |
+        sort --unique --stable --field-separator=, --key=1,1 |
+        sponge "$BASE_FILE"
+}
+
+assure_files() (
+    for CASELIST_FILE in $*
+    do
+        >&2 echo "Looking for ${CASELIST_FILE}..."
+        [ -f ${CASELIST_FILE} ] || (
+            >&2 echo "Not found. Creating empty."
+            touch ${CASELIST_FILE}
+        )
+    done
+)
+
+# Generate rendertests from scratch, customizing with fails/flakes/crashes files
+generate_rendertests() (
+    set -e
+    GENERATED_FILE=$(mktemp)
+    TESTS_FILE_PREFIX="${SKQP_FILE_PREFIX}-${SKQP_BACKEND}_rendertests"
+    FLAKES_FILE="${TESTS_FILE_PREFIX}-flakes.txt"
+    FAILS_FILE="${TESTS_FILE_PREFIX}-fails.txt"
+    CRASHES_FILE="${TESTS_FILE_PREFIX}-crashes.txt"
+    RENDER_TESTS_FILE="${TESTS_FILE_PREFIX}.txt"
+
+    # Default to an empty known flakes file if it doesn't exist.
+    assure_files ${FLAKES_FILE} ${FAILS_FILE} ${CRASHES_FILE}
+
+    # skqp does not support comments in rendertests.txt file
+    remove_comments_from_files "${FLAKES_FILE}" "${FAILS_FILE}" "${CRASHES_FILE}"
+
+    # create an exhaustive rendertest list
+    "${SKQP_BIN_DIR}"/list_gms | sort > "$GENERATED_FILE"
+
+    # Remove undesirable tests from the list
+    subtract_test_lists "${GENERATED_FILE}" "${CRASHES_FILE}" "${FLAKES_FILE}"
+
+    # Add ",0" to each test to set the expected diff sum to zero
+    sed -i 's/$/,0/g' "$GENERATED_FILE"
+
+    merge_rendertests_files "$GENERATED_FILE" "${FAILS_FILE}"
+
+    mv "${GENERATED_FILE}" "${RENDER_TESTS_FILE}"
+
+    echo "${RENDER_TESTS_FILE}"
+)
+
+generate_unittests() (
+    set -e
+    GENERATED_FILE=$(mktemp)
+    TESTS_FILE_PREFIX="${SKQP_FILE_PREFIX}_unittests"
+    FLAKES_FILE="${TESTS_FILE_PREFIX}-flakes.txt"
+    FAILS_FILE="${TESTS_FILE_PREFIX}-fails.txt"
+    CRASHES_FILE="${TESTS_FILE_PREFIX}-crashes.txt"
+    UNIT_TESTS_FILE="${TESTS_FILE_PREFIX}.txt"
+
+    # Default to an empty known flakes file if it doesn't exist.
+    assure_files ${FLAKES_FILE} ${FAILS_FILE} ${CRASHES_FILE}
+
+    # Remove unitTest_ prefix
+    for UT_FILE in "${FAILS_FILE}" "${CRASHES_FILE}" "${FLAKES_FILE}"; do
+        sed -i 's/^unitTest_//g' "${UT_FILE}"
+    done
+
+    # create an exhaustive unittests list
+    "${SKQP_BIN_DIR}"/list_gpu_unit_tests > "${GENERATED_FILE}"
+
+    # Remove undesirable tests from the list
+    subtract_test_lists "${GENERATED_FILE}" "${CRASHES_FILE}" "${FLAKES_FILE}" "${FAILS_FILE}"
+
+    remove_comments_from_files "${GENERATED_FILE}"
+    mv "${GENERATED_FILE}" "${UNIT_TESTS_FILE}"
+
+    echo "${UNIT_TESTS_FILE}"
+)
+
+run_all_tests() {
+    rm -f "${SKQP_ASSETS_DIR}"/skqp/*.txt
+}
+
+copy_tests_files() (
+    # Copy either unit test or render test files from a specific driver given by
+    # GPU VERSION variable.
+    # If there is no test file at the expected location, this function will
+    # return error_code 1
+    SKQP_BACKEND="${1}"
+    SKQP_FILE_PREFIX="${INSTALL}/${GPU_VERSION}-skqp"
+
+    if echo "${SKQP_BACKEND}" | grep -qE 'vk|gl(es)?'
+    then
+        echo "Generating rendertests.txt file"
+        GENERATED_RENDERTESTS=$(generate_rendertests)
+        cp "${GENERATED_RENDERTESTS}" "${SKQP_ASSETS_DIR}"/skqp/rendertests.txt
+        mkdir -p "${SKQP_RESULTS_DIR}/${SKQP_BACKEND}"
+        cp "${GENERATED_RENDERTESTS}" "${SKQP_RESULTS_DIR}/${SKQP_BACKEND}/generated_rendertests.txt"
+        return 0
+    fi
+
+    # The unittests.txt path is hardcoded inside assets directory,
+    # that is why it needs to be a special case.
+    if echo "${SKQP_BACKEND}" | grep -qE "unitTest"
+    then
+        echo "Generating unittests.txt file"
+        GENERATED_UNITTESTS=$(generate_unittests)
+        cp "${GENERATED_UNITTESTS}" "${SKQP_ASSETS_DIR}"/skqp/unittests.txt
+        mkdir -p "${SKQP_RESULTS_DIR}/${SKQP_BACKEND}"
+        cp "${GENERATED_UNITTESTS}" "${SKQP_RESULTS_DIR}/${SKQP_BACKEND}/generated_unittests.txt"
+    fi
+)
+
+resolve_tests_files() {
+    if [ -n "${RUN_ALL_TESTS}" ]
+    then
+        run_all_tests
+        return
+    fi
+
+    SKQP_BACKEND=${1}
+    if ! copy_tests_files "${SKQP_BACKEND}"
+    then
+        echo "No override test file found for ${SKQP_BACKEND}. Using the default one."
+    fi
+}
+
+test_vk_backend() {
+    if echo "${SKQP_BACKENDS:?}" | grep -qE 'vk'
+    then
+        if [ -n "$VK_DRIVER" ]; then
+            return 0
+        fi
+
+        echo "VK_DRIVER environment variable is missing."
+        # shellcheck disable=SC2012
+        VK_DRIVERS=$(ls "$INSTALL"/share/vulkan/icd.d/ | cut -f 1 -d '_')
+        if [ -n "${VK_DRIVERS}" ]
+        then
+            echo "Please set VK_DRIVER to the correct driver from the list:"
+            echo "${VK_DRIVERS}"
+        fi
+        echo "No Vulkan tests will be executed, but it was requested in SKQP_BACKENDS variable. Exiting."
+        exit 2
+    fi
+
+    # Vulkan environment is not configured, but it was not requested by the job
+    return 1
+}
+
+setup_backends() {
+    if test_vk_backend
+    then
+        export VK_ICD_FILENAMES="$INSTALL"/share/vulkan/icd.d/"$VK_DRIVER"_icd."${VK_CPU:-$(uname -m)}".json
+    fi
+}
+
+show_reports() (
+    set +xe
+
+    # Unit tests produce empty HTML reports, guide the user to check the TXT file.
+    if echo "${SKQP_BACKENDS}" | grep -qE "unitTest"
+    then
+        # Remove the empty HTML report to avoid confusion
+        rm -f "${SKQP_RESULTS_DIR}"/unitTest/report.html
+
+        echo "See skqp unit test results at:"
+        echo "https://$CI_PROJECT_ROOT_NAMESPACE.pages.freedesktop.org/-/$CI_PROJECT_NAME/-/jobs/$CI_JOB_ID/artifacts${SKQP_RESULTS_DIR}/unitTest/unit_tests.txt"
+    fi
+
+    REPORT_FILES=$(mktemp)
+    find "${SKQP_RESULTS_DIR}"/**/report.html -type f > "${REPORT_FILES}"
+    while read -r REPORT
+    do
+        # shellcheck disable=SC2001
+        BACKEND_NAME=$(echo "${REPORT}" | sed  's@.*/\([^/]*\)/report.html@\1@')
+        echo "See skqp ${BACKEND_NAME} render tests report at:"
+        echo "https://$CI_PROJECT_ROOT_NAMESPACE.pages.freedesktop.org/-/$CI_PROJECT_NAME/-/jobs/$CI_JOB_ID/artifacts${REPORT}"
+    done < "${REPORT_FILES}"
+
+    # If there is no report available, tell the user that something is wrong.
+    if [ ! -s "${REPORT_FILES}" ]
+    then
+        echo "No skqp report available. Probably some fatal error has occured during the skqp execution."
+    fi
+)
+
+usage() {
+    cat <<EOF
+    Usage: $(basename "$0") [-a]
+
+    Arguments:
+        -a: Run all unit tests and render tests, useful when introducing a new driver to skqp.
+EOF
+}
+
+parse_args() {
+    while getopts ':ah' opt; do
+        case "$opt" in
+            a)
+            echo "Running all skqp tests"
+            export RUN_ALL_TESTS=1
+            shift
+            ;;
+
+            h)
+            usage
+            exit 0
+            ;;
+
+            ?)
+            echo "Invalid command option."
+            usage
+            exit 1
+            ;;
+        esac
+    done
+}
+
+set -e
+
+parse_args "${@}"
+
+# Needed so configuration files can contain paths to files in /install
+INSTALL="$CI_PROJECT_DIR"/install
+
+if [ -z "$GPU_VERSION" ]; then
+    echo 'GPU_VERSION must be set to something like "llvmpipe" or
+"freedreno-a630" (it will serve as a component to find the path for files
+residing in src/**/ci/*.txt)'
+    exit 1
+fi
+
+LD_LIBRARY_PATH=$INSTALL:$LD_LIBRARY_PATH
+setup_backends
+
+SKQP_BIN_DIR=${SKQP_BIN_DIR:-/skqp}
+SKQP_ASSETS_DIR="${SKQP_BIN_DIR}"/assets
+SKQP_RESULTS_DIR="${SKQP_RESULTS_DIR:-${PWD}/results}"
+
+mkdir -p "${SKQP_ASSETS_DIR}"/skqp
+
+# Show the reports on exit, even when a test crashes
+trap show_reports INT TERM EXIT
+
+SKQP_EXITCODE=0
+for SKQP_BACKEND in ${SKQP_BACKENDS}
+do
+    resolve_tests_files "${SKQP_BACKEND}"
+    SKQP_BACKEND_RESULTS_DIR="${SKQP_RESULTS_DIR}"/"${SKQP_BACKEND}"
+    mkdir -p "${SKQP_BACKEND_RESULTS_DIR}"
+    BACKEND_EXITCODE=0
+
+    GL_COLLAPSED=true gitlab_section_start "skqp_${SKQP_BACKEND}" "skqp logs for ${SKQP_BACKEND}"
+    "${SKQP_BIN_DIR}"/skqp "${SKQP_ASSETS_DIR}" "${SKQP_BACKEND_RESULTS_DIR}" "${SKQP_BACKEND}_" ||
+        BACKEND_EXITCODE=$?
+    gitlab_section_end "skqp_${SKQP_BACKEND}"
+
+    if [ ! $BACKEND_EXITCODE -eq 0 ]
+    then
+        echo "skqp failed on ${SKQP_BACKEND} tests with exit code: ${BACKEND_EXITCODE}."
+    else
+        echo "skqp succeeded on ${SKQP_BACKEND}."
+    fi
+
+    # Propagate error codes to leverage the final job result
+    SKQP_EXITCODE=$(( SKQP_EXITCODE | BACKEND_EXITCODE ))
+done
+
+exit $SKQP_EXITCODE

.gitlab-ci/test-source-dep.yml

@@ -14,20 +14,6 @@
     - if: *is-scheduled-pipeline
       when: never
 
-# Rule for restricted traces jobs to only run for users with access to those
-# traces (both https://gitlab.freedesktop.org/gfx-ci/tracie/traces-db-private
-# for trace access, and minio bucket access for viewing result images from CI).
-#
-# This is a compromise, allowing some marked developers to have their MRs
-# blocked on regressions to non-redistributable traces, while not blocking
-# merges for other devs who would be unable to debug changes to them.
-.restricted-rules:
-  rules:
-    # If the triggerer has access to the restricted traces and if it is pre-merge
-    - if: '($GITLAB_USER_LOGIN !~ "/^(robclark|anholt|flto|cwabbott0|Danil|tomeu|okias|gallo)$/") &&
-           ($GITLAB_USER_LOGIN != "marge-bot" || $CI_COMMIT_BRANCH)'
-      when: never
-
 # Mesa core source file dependencies that may impact any test job
 # ---------------------------------------------------------------
 .core-rules:
@@ -174,21 +160,6 @@
     - if: '$ANHOLT_FARM == "offline"'
       when: never
 
-.valve-farm-rules:
-  rules:
-    - if: '$VALVE_FARM == "offline"'
-      when: never
-    # The Valve CI Farm uses allow lists for projects/users to prevent abuse,
-    # so only enable automatic testing when running in the context of Mesa to
-    # prevent failures in forks.
-    - if: '$CI_PROJECT_NAMESPACE != "mesa"'
-      when: never
-
-.austriancoder-farm-rules:
-  rules:
-    - if: '$AUSTRIANCODER_FARM == "offline"'
-      when: never
-
 # Skips freedreno jobs if either of the farms we use are offline.
 .freedreno-farm-rules:
   rules:
@@ -199,7 +170,6 @@
 # Rules for changes that impact either freedreno or turnip.
 .freedreno-common-rules:
   rules:
-    - !reference [.no_scheduled_pipelines-rules, rules]
     - !reference [.freedreno-farm-rules, rules]
     - changes: &freedreno_core_file_list
       - src/freedreno/ci/**/*
@@ -240,7 +210,10 @@
 .freedreno-rules-restricted:
   stage: freedreno
   rules:
-    - !reference [.restricted-rules, rules]
+    # If the triggerer has access to the restricted traces and if it is pre-merge
+    - if: '($GITLAB_USER_LOGIN !~ "/^(robclark|anholt|flto|cwabbott0|Danil|tomeu|okias|gallo)$/") &&
+           ($GITLAB_USER_LOGIN != "marge-bot" || $CI_COMMIT_BRANCH)'
+      when: never
     - !reference [.freedreno-rules, rules]
 
 # Rules for GL driver performance tracking.  We want them to run as code is
@@ -322,21 +295,7 @@
       - src/panfrost/vulkan/*
       when: on_success
     - changes:
-      - src/panfrost/compiler/**/*
-      when: on_success
-
-.broadcom-common-rules:
-  rules:
-    - changes:
-      - src/broadcom/meson.build
-      - src/broadcom/ci/**/*
-      - src/broadcom/cle/**/*
-      - src/broadcom/clif/**/*
-      - src/broadcom/common/**/*
-      - src/broadcom/compiler/**/*
-      - src/broadcom/drm-shim/**/*
-      - src/broadcom/qpu/**/*
-      - src/broadcom/simulator/**/*
+      - src/panfrost/bifrost/**/*
       when: on_success
 
 .vc4-rules:
@@ -344,8 +303,8 @@
   rules:
     - !reference [.igalia-farm-rules, rules]
     - !reference [.gl-rules, rules]
-    - !reference [.broadcom-common-rules, rules]
     - changes:
+      - src/broadcom/**/*
       - src/gallium/drivers/vc4/**/*
       - src/gallium/winsys/kmsro/**/*
       - src/gallium/winsys/vc4/**/*
@@ -356,8 +315,8 @@
   rules:
     - !reference [.igalia-farm-rules, rules]
     - !reference [.gl-rules, rules]
-    - !reference [.broadcom-common-rules, rules]
     - changes:
+      - src/broadcom/**/*
       - src/gallium/drivers/v3d/**/*
       - src/gallium/winsys/kmsro/**/*
       - src/gallium/winsys/v3d/**/*
@@ -387,24 +346,13 @@
 .radv-rules:
   stage: amd
   rules:
+    - !reference [.collabora-farm-rules, rules]
     - !reference [.vulkan-rules, rules]
     - changes: &radv_file_list
       - src/amd/**/*
       - src/vulkan/**/*
       when: on_success
 
-.radv-collabora-rules:
-  stage: amd
-  rules:
-    - !reference [.collabora-farm-rules, rules]
-    - !reference [.radv-rules, rules]
-
-.radv-valve-rules:
-  stage: amd
-  rules:
-    - !reference [.valve-farm-rules, rules]
-    - !reference [.radv-rules, rules]
-
 .virgl-rules:
   stage: layered-backends
   rules:
@@ -568,13 +516,6 @@
     - !reference [.anv-rules, rules]
     - !reference [.zink-common-rules, rules]
 
-.zink-anv-rules-restricted:
-  stage: layered-backends
-  rules:
-    - !reference [.restricted-rules, rules]
-    - !reference [.anv-rules, rules]
-    - !reference [.zink-common-rules, rules]
-
 .zink-turnip-rules:
   stage: layered-backends
   rules:
@@ -604,8 +545,6 @@
       when: on_success
     - changes:
       - src/microsoft/**/*
-      - src/gallium/frontends/va/*
-      - src/gallium/targets/va/*
       when: on_success
     - changes:
         *radv_file_list
@@ -649,7 +588,6 @@
 .etnaviv-rules:
   stage: etnaviv
   rules:
-    - !reference [.austriancoder-farm-rules, rules]
     - !reference [.gl-rules, rules]
     - changes:
       - src/etnaviv/**/*

.gitlab-ci/test/gitlab-ci.yml

@@ -87,7 +87,7 @@ rustfmt:
     exclude:
       - results/*.shader_cache
   variables:
-    PIGLIT_REPLAY_EXTRA_ARGS: --keep-image --db-path ${CI_PROJECT_DIR}/replayer-db/ --minio_bucket=mesa-tracie-public --jwt-file=${CI_JOB_JWT_FILE}
+    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-file=${CI_JOB_JWT_FILE}
   script:
     - echo -e "\e[0Ksection_start:$(date +%s):variables[collapsed=true]\r\e[0KVariables passed through:"
     - install/common/generate-env.sh
@@ -109,6 +109,11 @@ rustfmt:
   variables:
     DEQP_VER: vk
 
+.skqp-test:
+  variables:
+    HWCI_START_XORG: 1
+    HWCI_TEST_SCRIPT: "/install/skqp-runner.sh"
+
 .fossilize-test:
   script:
     - ./install/fossilize-runner.sh
@@ -130,8 +135,6 @@ rustfmt:
     # improve it even more (see https://docs.mesa3d.org/ci/bare-metal.html for
     # setup).
     - echo -e "\e[0Ksection_start:$(date +%s):artifacts_download[collapsed=true]\r\e[0KDownloading artifacts from minio"
-    # Note: Build dir (and thus install) may be dirty due to GIT_STRATEGY
-    - rm -rf install
     - wget ${FDO_HTTP_CACHE_URI:-}https://${PIPELINE_ARTIFACTS_BASE}/${MINIO_ARTIFACT_NAME}.tar.zst -S --progress=dot:giga -O- | tar --zstd -x
     - echo -e "\e[0Ksection_end:$(date +%s):artifacts_download\r\e[0K"
   artifacts:
@@ -149,12 +152,12 @@ rustfmt:
 .baremetal-test-armhf:
   extends:
     - .baremetal-test
-    - .use-debian/armhf_test
+    - .use-debian/arm_test
   variables:
     BM_ROOTFS: /rootfs-armhf
     MINIO_ARTIFACT_NAME: mesa-armhf
   needs:
-    - debian/armhf_test
+    - debian/arm_test
     - job: debian-armhf
       artifacts: false
 
@@ -162,12 +165,12 @@ rustfmt:
 .baremetal-test-arm64:
   extends:
     - .baremetal-test
-    - .use-debian/arm64_test
+    - .use-debian/arm_test
   variables:
     BM_ROOTFS: /rootfs-arm64
     MINIO_ARTIFACT_NAME: mesa-arm64
   needs:
-    - debian/arm64_test
+    - debian/arm_test
     - job: debian-arm64
       artifacts: false
 
@@ -175,12 +178,12 @@ rustfmt:
 .baremetal-arm64-asan-test:
   extends:
     - .baremetal-test
-    - .use-debian/arm64_test
+    - .use-debian/arm_test
   variables:
     DEQP_RUNNER_OPTIONS: "--env LD_PRELOAD=libasan.so.6:/install/lib/libdlclose-skip.so"
     MINIO_ARTIFACT_NAME: mesa-arm64-asan
   needs:
-    - debian/arm64_test
+    - debian/arm_test
     - job: debian-arm64-asan
       artifacts: false
 
@@ -201,13 +204,13 @@ rustfmt:
   # like FDO_DISTRIBUTION_TAG for *the* image, there is no way to
   # depend on more than one image per job. So, the job container is
   # built as part of the CI in the boot2container project.
-  image: registry.freedesktop.org/mupuf/valve-infra/mesa-trigger:2022-12-08.1
+  image: registry.freedesktop.org/mupuf/valve-infra/mesa-trigger:2022-03-03.2
   timeout: 1h 40m
   variables:
     # No need by default to pull the whole repo
     GIT_STRATEGY: none
     # boot2container initrd configuration parameters.
-    B2C_KERNEL_URL: 'https://gitlab.freedesktop.org/mupuf/valve-infra/-/package_files/519/download'  # Linux 6.1
+    B2C_KERNEL_URL: 'https://gitlab.freedesktop.org/mupuf/valve-infra/-/package_files/144/download'  # 5.17.1
     B2C_INITRAMFS_URL: 'https://gitlab.freedesktop.org/mupuf/boot2container/-/releases/v0.9.8/downloads/initramfs.linux_amd64.cpio.xz'
     B2C_JOB_SUCCESS_REGEX: '\[.*\]: Execution is over, pipeline status: 0\r$'
     B2C_JOB_WARN_REGEX: '\*ERROR\* ring .* timeout, but soft recovered'
@@ -236,11 +239,9 @@ rustfmt:
     GENERATE_ENV_SCRIPT: "${CI_COMMON_SCRIPTS}/generate-env.sh"
     B2C_JOB_TEMPLATE: "${CI_B2C_ARTIFACTS}/b2c.yml.jinja2.jinja2"
     JOB_FOLDER: "job_folder"
-
   before_script:
     # We don't want the tarball unpacking of .test, but will take the JWT bits.
     - !reference [default, before_script]
-
     - |
       set -x
 
@@ -320,6 +321,7 @@ rustfmt:
       env PYTHONUNBUFFERED=1 executorctl \
           run -w b2c.yml.jinja2 -j $(slugify "$CI_JOB_NAME") -s ${JOB_FOLDER}
 
+      ls -l
       # Anything our job places in results/ will be collected by the
       # Gitlab coordinator for status presentation. results/junit.xml
       # will be parsed by the UI for more detailed explanations of
@@ -330,7 +332,7 @@ rustfmt:
     paths:
       - ${JOB_FOLDER}/results
     reports:
-      junit: ${JOB_FOLDER}/results/**/junit.xml
+      junit: ${JOB_FOLDER}/results/junit.xml
 
 .b2c-test-vk:
   extends:

.gitlab-ci/tests/lava/helpers.py

@@ -1,22 +1,15 @@
 from contextlib import nullcontext as does_not_raise
 from datetime import datetime
-from io import StringIO
 from itertools import cycle
-from typing import Any, Callable, Generator, Iterable, Optional, Tuple, Union
+from typing import Callable, Generator, Iterable, Optional, Tuple, Union
 
+import yaml
 from freezegun import freeze_time
 from lava.utils.log_section import (
     DEFAULT_GITLAB_SECTION_TIMEOUTS,
     FALLBACK_GITLAB_SECTION_TIMEOUT,
     LogSectionType,
 )
-from lavacli.utils import flow_yaml as lava_yaml
-
-
-def yaml_dump(data: dict[str, Any]) -> str:
-    stream = StringIO()
-    lava_yaml.dump(data, stream)
-    return stream.getvalue()
 
 
 def section_timeout(section_type: LogSectionType) -> int:
@@ -53,7 +46,7 @@ def jobs_logs_response(
 
     logs = [timed_msg] if msg is None else msg
 
-    return finished, yaml_dump(logs)
+    return finished, yaml.safe_dump(logs)
 
 
 def section_aware_message_generator(

.gitlab-ci/tests/test_lava_job_submitter.py

@@ -298,9 +298,11 @@ def test_parse_job_result_from_log(message, expectation, mock_proxy):
     reason="Slow and sketchy test. Needs a LAVA log raw file at /tmp/log.yaml"
 )
 def test_full_yaml_log(mock_proxy, frozen_time):
+    import itertools
     import random
+    from datetime import datetime
 
-    from lavacli.utils import flow_yaml as lava_yaml
+    import yaml
 
     def time_travel_from_log_chunk(data_chunk):
         if not data_chunk:
@@ -319,28 +321,26 @@ def test_full_yaml_log(mock_proxy, frozen_time):
         # the same of from the job submitter execution
         with open("/tmp/log.yaml", "r") as f:
             first_log = f.readline()
-            first_log_time = lava_yaml.load(first_log)[0]["dt"]
+            first_log_time = yaml.safe_load(first_log)[0]["dt"]
             frozen_time.move_to(first_log_time)
 
     def load_lines() -> list:
         with open("/tmp/log.yaml", "r") as f:
-            # data = yaml.safe_load(f)
-            data = f.readlines()
-            stream = chain(data)
+            data = yaml.safe_load(f)
+            chain = itertools.chain(data)
             try:
                 while True:
-                    data_chunk = [next(stream) for _ in range(random.randint(0, 50))]
-                    serial_message = "".join(data_chunk)
+                    data_chunk = [next(chain) for _ in range(random.randint(0, 50))]
                     # Suppose that the first message timestamp is the same of
                     # log fetch RPC call
                     time_travel_from_log_chunk(data_chunk)
-                    yield False, "[]"
+                    yield False, []
                     # Travel to the same datetime of the last fetched log line
                     # in the chunk
                     time_travel_from_log_chunk(data_chunk)
-                    yield False, serial_message
+                    yield False, data_chunk
             except StopIteration:
-                yield True, serial_message
+                yield True, data_chunk
                 return
 
     proxy = mock_proxy()

.gitlab-ci/tests/utils/test_lava_log.py

@@ -8,16 +8,18 @@
 from datetime import datetime, timedelta
 
 import pytest
+import yaml
 from lava.exceptions import MesaCIKnownIssueException, MesaCITimeoutError
 from lava.utils import (
     GitlabSection,
     LogFollower,
     LogSectionType,
+    fix_lava_color_log,
     fix_lava_gitlab_section_log,
     hide_sensitive_data,
 )
 
-from ..lava.helpers import create_lava_yaml_msg, does_not_raise, lava_yaml, yaml_dump
+from ..lava.helpers import create_lava_yaml_msg, does_not_raise
 
 GITLAB_SECTION_SCENARIOS = {
     "start collapsed": (
@@ -156,49 +158,91 @@ SENSITIVE_DATA_SCENARIOS = {
     ids=SENSITIVE_DATA_SCENARIOS.keys(),
 )
 def test_hide_sensitive_data(input, expectation, tag):
-    yaml_data = yaml_dump(input)
+    yaml_data = yaml.safe_dump(input)
     yaml_result = hide_sensitive_data(yaml_data, tag)
-    result = lava_yaml.load(yaml_result)
+    result = yaml.safe_load(yaml_result)
 
     assert result == expectation
 
 
-GITLAB_SECTION_SPLIT_SCENARIOS = {
-    "Split section_start at target level": (
-        "\x1b[0Ksection_start:1668454947:test_post_process[collapsed=true]\r\x1b[0Kpost-processing test results",
-        (
-            "\x1b[0Ksection_start:1668454947:test_post_process[collapsed=true]",
-            "\x1b[0Kpost-processing test results",
+COLOR_MANGLED_SCENARIOS = {
+    "Mangled error message at target level": (
+        create_lava_yaml_msg(msg="[0m[0m[31mERROR - dEQP error: ", lvl="target"),
+        "\x1b[0m\x1b[0m\x1b[31mERROR - dEQP error: ",
+    ),
+    "Mangled pass message at target level": (
+        create_lava_yaml_msg(
+            msg="[0mPass: 26718, ExpectedFail: 95, Skip: 25187, Duration: 8:18, Remaining: 13",
+            lvl="target",
         ),
+        "\x1b[0mPass: 26718, ExpectedFail: 95, Skip: 25187, Duration: 8:18, Remaining: 13",
     ),
-    "Split section_end at target level": (
-        "\x1b[0Ksection_end:1666309222:test_post_process\r\x1b[0K",
-        ("\x1b[0Ksection_end:1666309222:test_post_process", "\x1b[0K"),
+    "Mangled error message with bold formatting at target level": (
+        create_lava_yaml_msg(msg="[1;31mReview the image changes...", lvl="target"),
+        "\x1b[1;31mReview the image changes...",
     ),
-    "Second line is not split from the first": (
-        ("\x1b[0Ksection_end:1666309222:test_post_process", "Any message"),
-        ("\x1b[0Ksection_end:1666309222:test_post_process", "Any message"),
+    "Mangled error message with high intensity background at target level": (
+        create_lava_yaml_msg(msg="[100mReview the image changes...", lvl="target"),
+        "\x1b[100mReview the image changes...",
+    ),
+    "Mangled error message with underline+bg color+fg color at target level": (
+        create_lava_yaml_msg(msg="[4;41;97mReview the image changes...", lvl="target"),
+        "\x1b[4;41;97mReview the image changes...",
+    ),
+    "Bad input for color code.": (
+        create_lava_yaml_msg(
+            msg="[4;97 This message is missing the `m`.", lvl="target"
+        ),
+        "[4;97 This message is missing the `m`.",
     ),
 }
 
 
 @pytest.mark.parametrize(
-    "expected_message, messages",
-    GITLAB_SECTION_SPLIT_SCENARIOS.values(),
-    ids=GITLAB_SECTION_SPLIT_SCENARIOS.keys(),
+    "message, fixed_message",
+    COLOR_MANGLED_SCENARIOS.values(),
+    ids=COLOR_MANGLED_SCENARIOS.keys(),
 )
-def test_fix_lava_gitlab_section_log(expected_message, messages):
-    fixed_messages = []
-    gen = fix_lava_gitlab_section_log()
-    next(gen)
+def test_fix_lava_color_log(message, fixed_message):
+    fix_lava_color_log(message)
 
-    for message in messages:
-        lava_log = create_lava_yaml_msg(msg=message, lvl="target")
-        if recovered_line := gen.send(lava_log):
-            fixed_messages.append((recovered_line, lava_log["msg"]))
-        fixed_messages.append(lava_log["msg"])
+    assert message["msg"] == fixed_message
 
-    assert expected_message in fixed_messages
+
+GITLAB_SECTION_MANGLED_SCENARIOS = {
+    "Mangled section_start at target level": (
+        create_lava_yaml_msg(
+            msg="[0Ksection_start:1652658415:deqp[collapsed=false][0Kdeqp-runner",
+            lvl="target",
+        ),
+        "\x1b[0Ksection_start:1652658415:deqp[collapsed=false]\r\x1b[0Kdeqp-runner",
+    ),
+    "Mangled section_start at target level with header with spaces": (
+        create_lava_yaml_msg(
+            msg="[0Ksection_start:1652658415:deqp[collapsed=false][0Kdeqp runner stats",
+            lvl="target",
+        ),
+        "\x1b[0Ksection_start:1652658415:deqp[collapsed=false]\r\x1b[0Kdeqp runner stats",
+    ),
+    "Mangled section_end at target level": (
+        create_lava_yaml_msg(
+            msg="[0Ksection_end:1652658415:test_setup[0K",
+            lvl="target",
+        ),
+        "\x1b[0Ksection_end:1652658415:test_setup\r\x1b[0K",
+    ),
+}
+
+
+@pytest.mark.parametrize(
+    "message, fixed_message",
+    GITLAB_SECTION_MANGLED_SCENARIOS.values(),
+    ids=GITLAB_SECTION_MANGLED_SCENARIOS.keys(),
+)
+def test_fix_lava_gitlab_section_log(message, fixed_message):
+    fix_lava_gitlab_section_log(message)
+
+    assert message["msg"] == fixed_message
 
 
 WATCHDOG_SCENARIOS = {

.gitlab-ci/valve/gl_combined_testing.sh

@@ -1,26 +0,0 @@
-#!/bin/bash
-
-set -eu
-
-function execute_testsuite {
-    local RESULTS_FOLDER EXEC_DONE_FILE
-
-    RESULTS_FOLDER="results/$1"
-    EXEC_DONE_FILE="$RESULTS_FOLDER/.done"
-
-    if [ ! -f "$EXEC_DONE_FILE" ]; then
-        DEQP_RESULTS_DIR="$RESULTS_FOLDER" PIGLIT_RESULTS_DIR="$RESULTS_FOLDER" $2
-        touch "$EXEC_DONE_FILE"
-    else
-        echo "--> Skipped, as it already was executed"
-    fi
-}
-
-echo -e "\n# GL CTS testing"
-DEQP_VER=gl46 execute_testsuite gl ./install/deqp-runner.sh
-
-echo -e "\n# GLES CTS testing"
-DEQP_SUITE=zink-radv execute_testsuite gles ./install/deqp-runner.sh
-
-echo -e "\n# Piglit testing"
-execute_testsuite piglit ./install/piglit/piglit-runner.sh

.gitlab-ci/windows/deqp_runner_run.ps1

@@ -1,3 +1,10 @@
+$dxil_dll = cmd.exe /C "C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=amd64 -no_logo && where dxil.dll" 2>&1
+if ($dxil_dll -notmatch "dxil.dll$") {
+    Write-Output "Couldn't get path to dxil.dll"
+    exit 1
+}
+$env:Path = "$(Split-Path $dxil_dll);$env:Path"
+
 # VK_ICD_FILENAMES environment variable is not used when running with
 # elevated privileges. Add a key to the registry instead.
 $hkey_path = "HKLM:\SOFTWARE\Khronos\Vulkan\Drivers\"

.gitlab-ci/windows/mesa_build.ps1

@@ -83,5 +83,6 @@ Copy-Item ".\.gitlab-ci\windows\spirv2dxil_check.ps1" -Destination $installdir
 Copy-Item ".\.gitlab-ci\windows\spirv2dxil_run.ps1" -Destination $installdir
 
 Copy-Item ".\.gitlab-ci\windows\deqp_runner_run.ps1" -Destination $installdir
+Copy-Item ".\src\microsoft\ci\deqp-dozen.toml" -Destination $installdir
 
-Get-ChildItem -Recurse -Filter "ci" | Get-ChildItem -Include "*.txt","*.toml" | Copy-Item -Destination $installdir
+Get-ChildItem -Recurse -Filter "ci" | Get-ChildItem -Filter "*.txt" | Copy-Item -Destination $installdir

.gitlab-ci/windows/mesa_deps_build.ps1

@@ -64,9 +64,10 @@ if (!$?) {
 }
 
 Push-Location -Path ".\deps\libva"
-Write-Host "Checking out libva df3c584bb79d1a1e521372d62fa62e8b1c52ce6c"
-# libva-win32 is released with libva version 2.17 (see https://github.com/intel/libva/releases/tag/2.17.0)
-git checkout 2.17.0
+Write-Host "Checking out libva commit 2579eb0f77897dc01a02c1e43defc63c40fd2988"
+# Checking out commit hash with libva-win32 support
+# This feature will be released with libva version 2.17
+git checkout 2579eb0f77897dc01a02c1e43defc63c40fd2988
 Pop-Location
 
 Write-Host "Building libva"

.gitlab-ci/windows/mesa_deps_test.ps1

@@ -1,36 +1,33 @@
 Get-Date
-Write-Host "Cloning Waffle"
+Write-Host "Downloading Freeglut"
+
+$freeglut_zip = 'freeglut-MSVC.zip'
+$freeglut_url = "https://www.transmissionzero.co.uk/files/software/development/GLUT/$freeglut_zip"
+
+For ($i = 0; $i -lt 5; $i++) {
+  Invoke-WebRequest -Uri $freeglut_url -OutFile $freeglut_zip
+  $freeglut_downloaded = $?
+  if ($freeglut_downloaded) {
+    Break
+  }
+}
+
+if (!$freeglut_downloaded) {
+  Write-Host "Failed to download Freeglut"
+  Exit 1
+}
+
+Get-Date
+Write-Host "Installing Freeglut"
+Expand-Archive $freeglut_zip -DestinationPath C:\
+if (!$?) {
+  Write-Host "Failed to install Freeglut"
+  Exit 1
+}
 
 $MyPath = $MyInvocation.MyCommand.Path | Split-Path -Parent
 . "$MyPath\mesa_vs_init.ps1"
 
-git clone --no-progress --single-branch --no-checkout https://gitlab.freedesktop.org/mesa/waffle.git 'C:\src\waffle'
-if (!$?) {
-  Write-Host "Failed to clone Waffle repository"
-  Exit 1
-}
-
-Push-Location -Path C:\src\waffle
-git checkout 950a1f35a718bc2a8e1dda75845e52651bb331a7
-Pop-Location
-
-Get-Date
-$waffle_build = New-Item -ItemType Directory -Path "C:\src\waffle" -Name "build"
-Push-Location -Path $waffle_build.FullName
-Write-Host "Compiling Waffle"
-meson setup `
---buildtype=release `
---default-library=static `
---prefix="C:\Waffle" && `
-ninja -j32 install
-$buildstatus = $?
-Pop-Location
-Remove-Item -Recurse -Path $waffle_build
-if (!$buildstatus) {
-  Write-Host "Failed to compile or install Waffle"
-  Exit 1
-}
-
 Get-Date
 Write-Host "Downloading glext.h"
 New-Item -ItemType Directory -Path ".\glext" -Name "GL"
@@ -39,31 +36,39 @@ Invoke-WebRequest -Uri 'https://www.khronos.org/registry/OpenGL/api/GL/glext.h'
 
 Get-Date
 Write-Host "Cloning Piglit"
-git clone --no-progress --single-branch --no-checkout https://gitlab.freedesktop.org/mesa/piglit.git 'C:\piglit'
+git clone --no-progress --single-branch --no-checkout https://gitlab.freedesktop.org/mesa/piglit.git 'C:\src\piglit'
 if (!$?) {
   Write-Host "Failed to clone Piglit repository"
   Exit 1
 }
-Push-Location -Path C:\piglit
-git checkout b41accc83689966f91217fc5b57dbe06202b8c8c
+Push-Location -Path C:\src\piglit
+git checkout f7f2a6c2275cae023a27b6cc81be3dda8c99492d
+Pop-Location
 
 Get-Date
+$piglit_build = New-Item -ItemType Directory -Path "C:\src\piglit" -Name "build"
+Push-Location -Path $piglit_build.FullName
 Write-Host "Compiling Piglit"
-cmake -S . -B . `
+cmake .. `
 -GNinja `
 -DCMAKE_BUILD_TYPE=Release `
--DPIGLIT_USE_WAFFLE=ON `
--DWaffle_INCLUDE_DIRS=C:\Waffle\include\waffle-1 `
--DWaffle_LDFLAGS=C:\Waffle\lib\libwaffle-1.a `
+-DCMAKE_INSTALL_PREFIX="C:\Piglit" `
+-DGLUT_INCLUDE_DIR=C:\freeglut\include `
+-DGLUT_glut_LIBRARY_RELEASE=C:\freeglut\lib\x64\freeglut.lib `
 -DGLEXT_INCLUDE_DIR=.\glext && `
 ninja -j32
 $buildstatus = $?
+ninja -j32 install | Out-Null
+$installstatus = $?
 Pop-Location
-if (!$buildstatus) {
-  Write-Host "Failed to compile Piglit"
+Remove-Item -Recurse -Path $piglit_build
+if (!$buildstatus -Or !$installstatus) {
+  Write-Host "Failed to compile or install Piglit"
   Exit 1
 }
 
+Copy-Item -Path C:\freeglut\bin\x64\freeglut.dll -Destination C:\Piglit\lib\piglit\bin\freeglut.dll
+
 Get-Date
 Write-Host "Cloning spirv-samples"
 git clone --no-progress --single-branch --no-checkout https://github.com/dneto0/spirv-samples.git  C:\spirv-samples\
@@ -99,8 +104,8 @@ cmake -S $($deqp_source) `
 ninja -j32
 $buildstatus = $?
 Pop-Location
-if (!$buildstatus) {
-  Write-Host "Failed to compile deqp"
+if (!$buildstatus -Or !$installstatus) {
+  Write-Host "Failed to compile or install deqp"
   Exit 1
 }
 
@@ -130,50 +135,5 @@ Write-Host "Installing deqp-runner"
 $env:Path += ";$($env:USERPROFILE)\.cargo\bin"
 cargo install --git https://gitlab.freedesktop.org/anholt/deqp-runner.git
 
-Get-Date
-Write-Host "Downloading DirectX 12 Agility SDK"
-Invoke-WebRequest -Uri https://www.nuget.org/api/v2/package/Microsoft.Direct3D.D3D12/1.706.3-preview -OutFile 'agility.zip'
-Expand-Archive -Path 'agility.zip' -DestinationPath 'C:\agility'
-Remove-Item 'agility.zip'
-
-$piglit_bin = 'C:\Piglit\bin'
-$vk_cts_bin = "$deqp_build\external\vulkancts\modules\vulkan"
-
-# Copy Agility SDK into subfolder of piglit and Vulkan CTS
-$agility_dest = New-Item -ItemType Directory -Path $piglit_bin -Name 'D3D12'
-Copy-Item 'C:\agility\build\native\bin\x64\*.dll' -Destination $agility_dest
-$agility_dest = New-Item -ItemType Directory -Path $vk_cts_bin -Name 'D3D12'
-Copy-Item 'C:\agility\build\native\bin\x64\*.dll' -Destination $agility_dest
-Remove-Item -Recurse 'C:\agility'
-
-Get-Date
-Write-Host "Downloading Updated WARP"
-Invoke-WebRequest -Uri https://www.nuget.org/api/v2/package/Microsoft.Direct3D.WARP/1.0.2 -OutFile 'warp.zip'
-Expand-Archive -Path 'warp.zip' -DestinationPath 'C:\warp'
-Remove-Item 'warp.zip'
-
-# Copy WARP next to piglit and Vulkan CTS
-Copy-Item 'C:\warp\build\native\amd64\d3d10warp.dll' -Destination $piglit_bin
-Copy-Item 'C:\warp\build\native\amd64\d3d10warp.dll' -Destination $vk_cts_bin
-Remove-Item -Recurse 'C:\warp'
-
-Get-Date
-Write-Host "Downloading DirectXShaderCompiler release"
-Invoke-WebRequest -Uri https://github.com/microsoft/DirectXShaderCompiler/releases/download/v1.7.2207/dxc_2022_07_18.zip -OutFile 'DXC.zip'
-Expand-Archive -Path 'DXC.zip' -DestinationPath 'C:\DXC'
-# No more need to get dxil.dll from the VS install
-Copy-Item 'C:\DXC\bin\x64\*.dll' -Destination 'C:\Windows\System32'
-
-Get-Date
-Write-Host "Enabling developer mode"
-# Create AppModelUnlock if it doesn't exist, required for enabling Developer Mode
-$RegistryKeyPath = "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\AppModelUnlock"
-if (-not(Test-Path -Path $RegistryKeyPath)) {
-    New-Item -Path $RegistryKeyPath -ItemType Directory -Force
-}
-
-# Add registry value to enable Developer Mode
-New-ItemProperty -Path $RegistryKeyPath -Name AllowDevelopmentWithoutDevLicense -PropertyType DWORD -Value 1 -Force
-
 Get-Date
 Write-Host "Complete"

.gitlab-ci/windows/piglit_run.ps1

@@ -1,13 +1,28 @@
 $env:PIGLIT_NO_FAST_SKIP = 1
 
-Copy-Item -Path _install\bin\opengl32.dll -Destination C:\Piglit\bin\opengl32.dll
-Copy-Item -Path _install\bin\libgallium_wgl.dll -Destination C:\Piglit\bin\libgallium_wgl.dll
-Copy-Item -Path _install\bin\libglapi.dll -Destination C:\Piglit\bin\libglapi.dll
+Copy-Item -Path _install\bin\opengl32.dll -Destination C:\Piglit\lib\piglit\bin\opengl32.dll
+Copy-Item -Path _install\bin\libgallium_wgl.dll -Destination C:\Piglit\lib\piglit\bin\libgallium_wgl.dll
+Copy-Item -Path _install\bin\libglapi.dll -Destination C:\Piglit\lib\piglit\bin\libglapi.dll
 
-deqp-runner suite --output .\logs --suite "_install/$env:PIGLIT_SUITE" `
-  --skips "_install/$env:PIGLIT_SKIPS" `
-  --baseline "_install/$env:PIGLIT_BASELINE" `
-  --flakes "_install/$env:PIGLIT_FLAKES"
-if (!$?) {
+# Run this using VsDevCmd.bat to ensure DXIL.dll is in %PATH%
+cmd.exe /C "C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=amd64 && py -3 C:\Piglit\bin\piglit.py run `"$env:PIGLIT_PROFILE`" $env:PIGLIT_OPTIONS $env:PIGLIT_TESTS .\results"
+
+py -3 C:\Piglit\bin\piglit.py summary console .\results | Select -SkipLast 1 | Select-String -NotMatch -Pattern ': pass' | Set-Content -Path .\result.txt
+
+$reference = Get-Content ".\_install\$env:PIGLIT_RESULTS.txt"
+$result = Get-Content .\result.txt
+if (-Not ($reference -And $result)) {
   Exit 1
 }
+
+$diff = Compare-Object -ReferenceObject $reference -DifferenceObject $result
+if (-Not $diff) {
+  Exit 0
+}
+
+py -3 C:\Piglit\bin\piglit.py summary html --exclude-details=pass .\summary .\results
+
+Write-Host "Unexpected change in results:"
+Write-Output $diff | Format-Table -Property SideIndicator,InputObject -Wrap
+
+Exit 1

.gitlab-ci/windows/spirv2dxil_check.ps1

@@ -1,3 +1,11 @@
+# Ensure that dxil.dll in on the %PATH%
+$dxil_dll = cmd.exe /C "C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=amd64 -no_logo && where dxil.dll" 2>&1
+if ($dxil_dll -notmatch "dxil.dll$") {
+    Write-Output "Couldn't get path to dxil.dll"
+    exit 1
+}
+$env:Path = "$(Split-Path $dxil_dll);$env:Path"
+
 $exec_mode_to_stage = @{ Fragment = "fragment"; Vertex = "vertex"; GLCompute = "compute" }
 
 $spvasm_files = (Get-ChildItem C:\spirv-samples\spvasm\*.spvasm) | Sort-Object Name

CODEOWNERS

@@ -123,8 +123,8 @@ meson.build @dbaker @eric
 /src/gallium/drivers/freedreno/ @robclark
 
 # Imagination
-/include/drm-uapi/pvr_drm.h @CreativeCylon @frankbinns @MTCoster
-/src/imagination/ @CreativeCylon @frankbinns @MTCoster
+/include/drm-uapi/pvr_drm.h @CreativeCylon @frankbinns
+/src/imagination/ @CreativeCylon @frankbinns
 /src/imagination/rogue/ @simon-perretta-img
 
 # Intel

VERSION

@@ -1 +1 @@
-23.0.4
+22.3.0-rc2

android/Android.mk

@@ -30,7 +30,6 @@ LIBDRM_VERSION = $(shell cat external/libdrm/meson.build | grep -o "\<version\>\
 
 MESA_VK_LIB_SUFFIX_amd := radeon
 MESA_VK_LIB_SUFFIX_intel := intel
-MESA_VK_LIB_SUFFIX_intel_hasvk := intel_hasvk
 MESA_VK_LIB_SUFFIX_freedreno := freedreno
 MESA_VK_LIB_SUFFIX_broadcom := broadcom
 MESA_VK_LIB_SUFFIX_panfrost := panfrost

bin/commit_in_branch.py

@@ -45,26 +45,24 @@ def is_commit_valid(commit: str) -> bool:
     return ret == 0
 
 
-def branch_has_commit(upstream_branch: str, commit: str) -> bool:
+def branch_has_commit(upstream: str, branch: str, commit: str) -> bool:
     """
     Returns True if the commit is actually present in the branch
     """
     ret = subprocess.call(['git', 'merge-base', '--is-ancestor',
-                           commit, upstream_branch],
+                           commit, upstream + '/' + branch],
                           stdout=subprocess.DEVNULL,
                           stderr=subprocess.DEVNULL)
     return ret == 0
 
 
-def branch_has_backport_of_commit(upstream_branch: str, commit: str) -> str:
+def branch_has_backport_of_commit(upstream: str, branch: str, commit: str) -> str:
     """
     Returns the commit hash if the commit has been backported to the branch,
     or an empty string if is hasn't
     """
-    upstream, _ = upstream_branch.split('/', 1)
-
     out = subprocess.check_output(['git', 'log', '--format=%H',
-                                   upstream + '..' + upstream_branch,
+                                   branch + '-branchpoint..' + upstream + '/' + branch,
                                    '--grep', 'cherry picked from commit ' + commit],
                                   stderr=subprocess.DEVNULL)
     return out.decode().strip()
@@ -91,7 +89,7 @@ def validate_branch(branch: str) -> str:
     out = subprocess.check_output(['git', 'remote', '--verbose'],
                                   stderr=subprocess.DEVNULL)
     remotes = out.decode().splitlines()
-    upstream, _ = branch.split('/', 1)
+    (upstream, _) = branch.split('/')
     valid_remote = False
     for line in remotes:
         if line.startswith(upstream + '\t'):
@@ -127,15 +125,17 @@ if __name__ == "__main__":
                         help='colorize output (default: true if stdout is a terminal)')
     args = parser.parse_args()
 
-    if branch_has_commit(args.branch, args.commit):
-        print_(args, True, 'Commit ' + args.commit + ' is in branch ' + args.branch)
+    (upstream, branch) = args.branch.split('/')
+
+    if branch_has_commit(upstream, branch, args.commit):
+        print_(args, True, 'Commit ' + args.commit + ' is in branch ' + branch)
         exit(0)
 
-    backport = branch_has_backport_of_commit(args.branch, args.commit)
+    backport = branch_has_backport_of_commit(upstream, branch, args.commit)
     if backport:
         print_(args, True,
-               'Commit ' + args.commit + ' was backported to branch ' + args.branch + ' as commit ' + backport)
+               'Commit ' + args.commit + ' was backported to branch ' + branch + ' as commit ' + backport)
         exit(0)
 
-    print_(args, False, 'Commit ' + args.commit + ' is NOT in branch ' + args.branch)
+    print_(args, False, 'Commit ' + args.commit + ' is NOT in branch ' + branch)
     exit(1)

bin/commit_in_branch_test.py

@@ -46,7 +46,6 @@ def test_canonicalize_commit(commit: str, expected: bool) -> None:
     'commit, expected',
     [
         (get_upstream() + '/20.1', True),
-        (get_upstream() + '/staging/20.1', True),
         (get_upstream() + '/main', True),
         ('20.1', False),
         ('main', False),
@@ -74,7 +73,6 @@ def test_validate_branch(commit: str, expected: bool) -> None:
         ('20.1-branchpoint', True),
         ('20.1', False),
         (get_upstream() + '/20.1', True),
-        (get_upstream() + '/staging/20.1', True),
         ('e58a10af640ba58b6001f5c5ad750b782547da76', True),
         ('d043d24654c851f0be57dbbf48274b5373dea42b', True),
         ('dd2bd68fa69124c86cd008b256d06f44fab8e6cd', True),
@@ -88,31 +86,31 @@ def test_is_commit_valid(commit: str, expected: bool) -> None:
 @pytest.mark.parametrize(
     'branch, commit, expected',
     [
-        (get_upstream() + '/20.1', '20.1-branchpoint', True),
-        (get_upstream() + '/20.1', '20.0', False),
-        (get_upstream() + '/20.1', 'main', False),
-        (get_upstream() + '/20.1', 'e58a10af640ba58b6001f5c5ad750b782547da76', True),
-        (get_upstream() + '/20.1', 'd043d24654c851f0be57dbbf48274b5373dea42b', True),
-        (get_upstream() + '/staging/20.1', 'd043d24654c851f0be57dbbf48274b5373dea42b', True),
-        (get_upstream() + '/20.1', 'dd2bd68fa69124c86cd008b256d06f44fab8e6cd', False),
-        (get_upstream() + '/main', 'dd2bd68fa69124c86cd008b256d06f44fab8e6cd', True),
-        (get_upstream() + '/20.0', 'd043d24654c851f0be57dbbf48274b5373dea42b', False),
+        ('20.1', '20.1-branchpoint', True),
+        ('20.1', '20.0', False),
+        ('20.1', 'main', False),
+        ('20.1', 'e58a10af640ba58b6001f5c5ad750b782547da76', True),
+        ('20.1', 'd043d24654c851f0be57dbbf48274b5373dea42b', True),
+        ('20.1', 'dd2bd68fa69124c86cd008b256d06f44fab8e6cd', False),
+        ('main', 'dd2bd68fa69124c86cd008b256d06f44fab8e6cd', True),
+        ('20.0', 'd043d24654c851f0be57dbbf48274b5373dea42b', False),
     ])
 def test_branch_has_commit(branch: str, commit: str, expected: bool) -> None:
-    assert branch_has_commit(branch, commit) == expected
+    upstream = get_upstream()
+    assert branch_has_commit(upstream, branch, commit) == expected
 
 
 @pytest.mark.parametrize(
     'branch, commit, expected',
     [
-        (get_upstream() + '/20.1', 'dd2bd68fa69124c86cd008b256d06f44fab8e6cd', 'd043d24654c851f0be57dbbf48274b5373dea42b'),
-        (get_upstream() + '/staging/20.1', 'dd2bd68fa69124c86cd008b256d06f44fab8e6cd', 'd043d24654c851f0be57dbbf48274b5373dea42b'),
-        (get_upstream() + '/20.1', '20.1-branchpoint', ''),
-        (get_upstream() + '/20.1', '20.0', ''),
-        (get_upstream() + '/20.1', '20.2', 'abac4859618e02aea00f705b841a7c5c5007ad1a'),
-        (get_upstream() + '/20.1', 'main', ''),
-        (get_upstream() + '/20.1', 'd043d24654c851f0be57dbbf48274b5373dea42b', ''),
-        (get_upstream() + '/20.0', 'dd2bd68fa69124c86cd008b256d06f44fab8e6cd', '8cd4f57381cefe69019a3282d457d5bda3644030'),
+        ('20.1', 'dd2bd68fa69124c86cd008b256d06f44fab8e6cd', 'd043d24654c851f0be57dbbf48274b5373dea42b'),
+        ('20.1', '20.1-branchpoint', ''),
+        ('20.1', '20.0', ''),
+        ('20.1', '20.2', ''),
+        ('20.1', 'main', ''),
+        ('20.1', 'd043d24654c851f0be57dbbf48274b5373dea42b', ''),
+        ('20.0', 'dd2bd68fa69124c86cd008b256d06f44fab8e6cd', ''),
     ])
 def test_branch_has_backport_of_commit(branch: str, commit: str, expected: bool) -> None:
-    assert branch_has_backport_of_commit(branch, commit) == expected
+    upstream = get_upstream()
+    assert branch_has_backport_of_commit(upstream, branch, commit) == expected

bin/gen_release_notes.py

@@ -175,7 +175,7 @@ inliner = Inliner();
 
 async def gather_commits(version: str) -> str:
     p = await asyncio.create_subprocess_exec(
-        'git', 'log', '--oneline', f'mesa-{version}..', '-i', '--grep', r'\(Closes\|Fixes\): \(https\|#\).*',
+        'git', 'log', '--oneline', f'mesa-{version}..', '--grep', r'Closes: \(https\|#\).*',
         stdout=asyncio.subprocess.PIPE)
     out, _ = await p.communicate()
     assert p.returncode == 0, f"git log didn't work: {version}"
@@ -193,34 +193,22 @@ async def parse_issues(commits: str) -> typing.List[str]:
         out = _out.decode().split('\n')
 
         for line in reversed(out):
-            if not line.lower().startswith(('closes:', 'fixes:')):
-                continue
-            bug = line.split(':', 1)[1].strip()
-            if (bug.startswith('https://gitlab.freedesktop.org/mesa/mesa')
-                # Avoid parsing "merge_requests" URL. Note that a valid issue
-                # URL may or may not contain the "/-/" text, so we check if
-                # the word "issues" is contained in URL.
-                and '/issues' in bug):
-                # This means we have a bug in the form "Closes: https://..."
-                issues.append(os.path.basename(urllib.parse.urlparse(bug).path))
-            elif ',' in bug:
-                multiple_bugs = [b.strip().lstrip('#') for b in bug.split(',')]
-                if not all(b.isdigit() for b in multiple_bugs):
-                    # this is likely a "Fixes" tag that refers to a commit name
-                    continue
-                issues.extend(multiple_bugs)
-            elif bug.startswith('#'):
-                issues.append(bug.lstrip('#'))
+            if line.startswith('Closes:'):
+                bug = line.lstrip('Closes:').strip()
+                if bug.startswith('https://gitlab.freedesktop.org/mesa/mesa'):
+                    # This means we have a bug in the form "Closes: https://..."
+                    issues.append(os.path.basename(urllib.parse.urlparse(bug).path))
+                elif ',' in bug:
+                    issues.extend([b.strip().lstrip('#') for b in bug.split(',')])
+                elif bug.startswith('#'):
+                    issues.append(bug.lstrip('#'))
 
     return issues
 
 
 async def gather_bugs(version: str) -> typing.List[str]:
     commits = await gather_commits(version)
-    if commits:
-        issues = await parse_issues(commits)
-    else:
-        issues = []
+    issues = await parse_issues(commits)
 
     loop = asyncio.get_event_loop()
     async with aiohttp.ClientSession(loop=loop) as session:
@@ -239,12 +227,7 @@ async def get_bug(session: aiohttp.ClientSession, bug_id: str) -> str:
     params = {'iids[]': bug_id}
     async with session.get(url, params=params) as response:
         content = await response.json()
-    if not content:
-        # issues marked as "confidential" look like "404" page for
-        # unauthorized users
-        return f'Confidential issue #{bug_id}'
-    else:
-        return content[0]['title']
+    return content[0]['title']
 
 
 async def get_shortlog(version: str) -> str:
@@ -298,45 +281,22 @@ def calculate_previous_version(version: str, is_point: bool) -> str:
 
 
 def get_features(is_point_release: bool) -> typing.Generator[str, None, None]:
-    p = pathlib.Path('docs') / 'relnotes' / 'new_features.txt'
-    if p.exists() and p.stat().st_size > 0:
+    p = pathlib.Path(__file__).parent.parent / 'docs' / 'relnotes' / 'new_features.txt'
+    if p.exists():
         if is_point_release:
             print("WARNING: new features being introduced in a point release", file=sys.stderr)
         with p.open('rt') as f:
             for line in f:
-                yield line.rstrip()
+                yield line
+            else:
+                yield "None"
         p.unlink()
     else:
         yield "None"
 
 
-def update_release_notes_index(version: str) -> None:
-    relnotes_index_path = pathlib.Path('docs') / 'relnotes.rst'
-
-    with relnotes_index_path.open('r') as f:
-        relnotes = f.readlines()
-
-    new_relnotes = []
-    first_list = True
-    second_list = True
-    for line in relnotes:
-        if first_list and line.startswith('-'):
-            first_list = False
-            new_relnotes.append(f'-  :doc:`{version} release notes <relnotes/{version}>`\n')
-        if not first_list and second_list and line.startswith('   relnotes/'):
-            second_list = False
-            new_relnotes.append(f'   relnotes/{version}\n')
-        new_relnotes.append(line)
-
-    with relnotes_index_path.open('w') as f:
-        for line in new_relnotes:
-            f.write(line)
-
-    subprocess.run(['git', 'add', relnotes_index_path])
-
-
 async def main() -> None:
-    v = pathlib.Path('VERSION')
+    v = pathlib.Path(__file__).parent.parent / 'VERSION'
     with v.open('rt') as f:
         raw_version = f.read().strip()
     is_point_release = '-rc' not in raw_version
@@ -353,7 +313,7 @@ async def main() -> None:
         gather_bugs(previous_version),
     )
 
-    final = pathlib.Path('docs') / 'relnotes' / f'{this_version}.rst'
+    final = pathlib.Path(__file__).parent.parent / 'docs' / 'relnotes' / f'{this_version}.rst'
     with final.open('wt') as f:
         try:
             f.write(TEMPLATE.render(
@@ -371,12 +331,8 @@ async def main() -> None:
             ))
         except:
             print(exceptions.text_error_template().render())
-            return
 
     subprocess.run(['git', 'add', final])
-
-    update_release_notes_index(this_version)
-
     subprocess.run(['git', 'commit', '-m',
                     f'docs: add release notes for {this_version}'])
 

bin/gen_release_notes_test.py

@@ -148,45 +148,6 @@ async def test_gather_commits():
             ''',
             ['3456', '3457', '3458'],
         ),
-        (
-            '''\
-            Without /-/
-
-            Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/36
-            ''',
-            ['36'],
-        ),
-        (
-            '''\
-            Ignore merge_requests
-
-            Closes: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20241
-            ''',
-            [],
-        ),
-        (
-            '''\
-            Parse "Fixes:" tag too
-
-            Fixes: https://gitlab.freedesktop.org/mesa/mesa/issues/36
-            Fixes: 142565a3bc2
-            Fixes: 142565a3bc2 ("docs: do something very useful")
-            Fixes: 142565a3bc2 ("docs: fix #1234, have a comma")
-            Fixes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/37
-            ''',
-            ['36', '37'],
-        ),
-        (
-            '''\
-            Parse Fixes/Closes in weird cases
-
-            fixes: https://gitlab.freedesktop.org/mesa/mesa/issues/36
-            fiXES: https://gitlab.freedesktop.org/mesa/mesa/issues/37
-            closes: https://gitlab.freedesktop.org/mesa/mesa/issues/38
-            cloSES: https://gitlab.freedesktop.org/mesa/mesa/issues/39
-            ''',
-            ['36', '37', '38', '39'],
-        ),
     ])
 async def test_parse_issues(content: str, bugs: typing.List[str]) -> None:
     mock_com = mock.AsyncMock(return_value=(textwrap.dedent(content).encode(), ''))

bin/gen_vs_module_defs.py

@@ -35,7 +35,7 @@ For gcc/x86,gcc/arm
 `stw_get_device` => `stw_get_device`
 
 """
-def gen_vs_module_def(in_file: str, out_file: str, compiler_abi: str, compiler_id: str, cpu_family: str) -> None:
+def gen_vs_module_def(in_file: str, out_file: str, compiler_id: str, cpu_family: str) -> None:
     out_file_lines = ['EXPORTS']
     with open(in_file, 'r', encoding='utf-8') as f:
         lines = f.readlines()
@@ -57,7 +57,7 @@ def gen_vs_module_def(in_file: str, out_file: str, compiler_abi: str, compiler_i
                 continue
             order_info = '' if len(def_infos) <= 1 else def_infos[1]
             if def_infos[0] != name_infos[0] and \
-                (compiler_abi == 'gcc' and compiler_id != 'clang') and (cpu_family not in {'x86_64', 'aarch64'}):
+                (compiler_id == 'gcc') and (cpu_family not in {'x86_64', 'aarch64'}):
                 if order_info:
                     out_file_lines.append('\t' + def_infos[0] + ' ' + order_info + ' == ' + name_infos[0])
                 else:
@@ -71,29 +71,28 @@ def gen_vs_module_def(in_file: str, out_file: str, compiler_abi: str, compiler_i
         out_file_content = '\n'.join(out_file_lines) + '\n'
         f.write(out_file_content.encode('utf-8'))
 '''
-python ./bin/gen_vs_module_defs.py --in_file src/gallium/targets/libgl-gdi/opengl32.def.in --out_file src/gallium/targets/libgl-gdi/opengl32.def --compiler_abi gcc --cpu_family x86_64
-python ./bin/gen_vs_module_defs.py --in_file src/gallium/targets/libgl-gdi/opengl32.def.in --out_file src/gallium/targets/libgl-gdi/opengl32.mingw.def --compiler_abi gcc --cpu_family x86
+python ./bin/gen_vs_module_defs.py --in_file src/gallium/targets/libgl-gdi/opengl32.def.in --out_file src/gallium/targets/libgl-gdi/opengl32.def --compiler_id gcc --cpu_family x86_64
+python ./bin/gen_vs_module_defs.py --in_file src/gallium/targets/libgl-gdi/opengl32.def.in --out_file src/gallium/targets/libgl-gdi/opengl32.mingw.def --compiler_id gcc --cpu_family x86
 
-python ./bin/gen_vs_module_defs.py --in_file src/gallium/targets/osmesa/osmesa.def.in --out_file src/gallium/targets/osmesa/osmesa.def --compiler_abi gcc --cpu_family x86_64
-python ./bin/gen_vs_module_defs.py --in_file src/gallium/targets/osmesa/osmesa.def.in --out_file src/gallium/targets/osmesa/osmesa.mingw.def --compiler_abi gcc --cpu_family x86
+python ./bin/gen_vs_module_defs.py --in_file src/gallium/targets/osmesa/osmesa.def.in --out_file src/gallium/targets/osmesa/osmesa.def --compiler_id gcc --cpu_family x86_64
+python ./bin/gen_vs_module_defs.py --in_file src/gallium/targets/osmesa/osmesa.def.in --out_file src/gallium/targets/osmesa/osmesa.mingw.def --compiler_id gcc --cpu_family x86
 
-python ./bin/gen_vs_module_defs.py --in_file src/gallium/targets/wgl/gallium_wgl.def.in --out_file src/gallium/targets/wgl/gallium_wgl.def --compiler_abi gcc --cpu_family x86_64
-python ./bin/gen_vs_module_defs.py --in_file src/gallium/targets/wgl/gallium_wgl.def.in --out_file src/gallium/targets/wgl/gallium_wgl.mingw.def --compiler_abi gcc --cpu_family x86
+python ./bin/gen_vs_module_defs.py --in_file src/gallium/targets/wgl/gallium_wgl.def.in --out_file src/gallium/targets/wgl/gallium_wgl.def --compiler_id gcc --cpu_family x86_64
+python ./bin/gen_vs_module_defs.py --in_file src/gallium/targets/wgl/gallium_wgl.def.in --out_file src/gallium/targets/wgl/gallium_wgl.mingw.def --compiler_id gcc --cpu_family x86
 
-python ./bin/gen_vs_module_defs.py --in_file src/egl/main/egl.def.in --out_file src/egl/main/egl.def --compiler_abi gcc --cpu_family x86_64
-python ./bin/gen_vs_module_defs.py --in_file src/egl/main/egl.def.in --out_file src/egl/main/egl.mingw.def --compiler_abi gcc --cpu_family x86
+python ./bin/gen_vs_module_defs.py --in_file src/egl/main/egl.def.in --out_file src/egl/main/egl.def --compiler_id gcc --cpu_family x86_64
+python ./bin/gen_vs_module_defs.py --in_file src/egl/main/egl.def.in --out_file src/egl/main/egl.mingw.def --compiler_id gcc --cpu_family x86
 
-python ./bin/gen_vs_module_defs.py --in_file src/gallium/targets/lavapipe/vulkan_lvp.def.in --out_file src/gallium/targets/lavapipe/vulkan_lvp.def --compiler_abi gcc --cpu_family x86_64
-python ./bin/gen_vs_module_defs.py --in_file src/gallium/targets/lavapipe/vulkan_lvp.def.in --out_file src/gallium/targets/lavapipe/vulkan_lvp.mingw.def --compiler_abi gcc --cpu_family x86
+python ./bin/gen_vs_module_defs.py --in_file src/gallium/targets/lavapipe/vulkan_lvp.def.in --out_file src/gallium/targets/lavapipe/vulkan_lvp.def --compiler_id gcc --cpu_family x86_64
+python ./bin/gen_vs_module_defs.py --in_file src/gallium/targets/lavapipe/vulkan_lvp.def.in --out_file src/gallium/targets/lavapipe/vulkan_lvp.mingw.def --compiler_id gcc --cpu_family x86
 
 '''
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(description=gen_help)
     parser.add_argument('--in_file', help='input template moudle definition file')
     parser.add_argument('--out_file', help='output moudle definition file')
-    parser.add_argument('--compiler_abi', help='compiler abi')
     parser.add_argument('--compiler_id', help='compiler id')
     parser.add_argument('--cpu_family', help='cpu family')
     args = parser.parse_args()
     # print(args)
-    gen_vs_module_def(args.in_file, args.out_file, args.compiler_abi, args.compiler_id, args.cpu_family)
+    gen_vs_module_def(args.in_file, args.out_file, args.compiler_id, args.cpu_family)

bin/khronos-update.py

@@ -118,25 +118,24 @@ SOURCES = [
         'api': 'opencl',
         'inc_folder': 'CL',
         'sources': [
-            Source('include/CL/opencl.h',                        'https://github.com/KhronosGroup/OpenCL-Headers/raw/main/CL/opencl.h'),
-            Source('include/CL/cl.h',                            'https://github.com/KhronosGroup/OpenCL-Headers/raw/main/CL/cl.h'),
-            Source('include/CL/cl_platform.h',                   'https://github.com/KhronosGroup/OpenCL-Headers/raw/main/CL/cl_platform.h'),
-            Source('include/CL/cl_gl.h',                         'https://github.com/KhronosGroup/OpenCL-Headers/raw/main/CL/cl_gl.h'),
-            Source('include/CL/cl_gl_ext.h',                     'https://github.com/KhronosGroup/OpenCL-Headers/raw/main/CL/cl_gl_ext.h'),
-            Source('include/CL/cl_ext.h',                        'https://github.com/KhronosGroup/OpenCL-Headers/raw/main/CL/cl_ext.h'),
-            Source('include/CL/cl_version.h',                    'https://github.com/KhronosGroup/OpenCL-Headers/raw/main/CL/cl_version.h'),
-            Source('include/CL/cl_icd.h',                        'https://github.com/KhronosGroup/OpenCL-Headers/raw/main/CL/cl_icd.h'),
-            Source('include/CL/cl_egl.h',                        'https://github.com/KhronosGroup/OpenCL-Headers/raw/main/CL/cl_egl.h'),
-            Source('include/CL/cl_d3d10.h',                      'https://github.com/KhronosGroup/OpenCL-Headers/raw/main/CL/cl_d3d10.h'),
-            Source('include/CL/cl_d3d11.h',                      'https://github.com/KhronosGroup/OpenCL-Headers/raw/main/CL/cl_d3d11.h'),
-            Source('include/CL/cl_dx9_media_sharing.h',          'https://github.com/KhronosGroup/OpenCL-Headers/raw/main/CL/cl_dx9_media_sharing.h'),
-            Source('include/CL/cl_dx9_media_sharing_intel.h',    'https://github.com/KhronosGroup/OpenCL-Headers/raw/main/CL/cl_dx9_media_sharing_intel.h'),
-            Source('include/CL/cl_ext_intel.h',                  'https://github.com/KhronosGroup/OpenCL-Headers/raw/main/CL/cl_ext_intel.h'),
-            Source('include/CL/cl_va_api_media_sharing_intel.h', 'https://github.com/KhronosGroup/OpenCL-Headers/raw/main/CL/cl_va_api_media_sharing_intel.h'),
+            Source('include/CL/opencl.h',                        'https://github.com/KhronosGroup/OpenCL-Headers/raw/master/CL/opencl.h'),
+            Source('include/CL/cl.h',                            'https://github.com/KhronosGroup/OpenCL-Headers/raw/master/CL/cl.h'),
+            Source('include/CL/cl_platform.h',                   'https://github.com/KhronosGroup/OpenCL-Headers/raw/master/CL/cl_platform.h'),
+            Source('include/CL/cl_gl.h',                         'https://github.com/KhronosGroup/OpenCL-Headers/raw/master/CL/cl_gl.h'),
+            Source('include/CL/cl_gl_ext.h',                     'https://github.com/KhronosGroup/OpenCL-Headers/raw/master/CL/cl_gl_ext.h'),
+            Source('include/CL/cl_ext.h',                        'https://github.com/KhronosGroup/OpenCL-Headers/raw/master/CL/cl_ext.h'),
+            Source('include/CL/cl_version.h',                    'https://github.com/KhronosGroup/OpenCL-Headers/raw/master/CL/cl_version.h'),
+            Source('include/CL/cl_icd.h',                        'https://github.com/KhronosGroup/OpenCL-Headers/raw/master/CL/cl_icd.h'),
+            Source('include/CL/cl_egl.h',                        'https://github.com/KhronosGroup/OpenCL-Headers/raw/master/CL/cl_egl.h'),
+            Source('include/CL/cl_d3d10.h',                      'https://github.com/KhronosGroup/OpenCL-Headers/raw/master/CL/cl_d3d10.h'),
+            Source('include/CL/cl_d3d11.h',                      'https://github.com/KhronosGroup/OpenCL-Headers/raw/master/CL/cl_d3d11.h'),
+            Source('include/CL/cl_dx9_media_sharing.h',          'https://github.com/KhronosGroup/OpenCL-Headers/raw/master/CL/cl_dx9_media_sharing.h'),
+            Source('include/CL/cl_dx9_media_sharing_intel.h',    'https://github.com/KhronosGroup/OpenCL-Headers/raw/master/CL/cl_dx9_media_sharing_intel.h'),
+            Source('include/CL/cl_ext_intel.h',                  'https://github.com/KhronosGroup/OpenCL-Headers/raw/master/CL/cl_ext_intel.h'),
+            Source('include/CL/cl_va_api_media_sharing_intel.h', 'https://github.com/KhronosGroup/OpenCL-Headers/raw/master/CL/cl_va_api_media_sharing_intel.h'),
 
-            Source('include/CL/cl.hpp',                          'https://github.com/KhronosGroup/OpenCL-CLHPP/raw/5f3cc41df821a3e5988490232082a3e3b82c0283/include/CL/cl.hpp'),
-            Source('include/CL/cl2.hpp',                         'https://github.com/KhronosGroup/OpenCL-CLHPP/raw/main/include/CL/cl2.hpp'),
-            Source('include/CL/opencl.hpp',                      'https://github.com/KhronosGroup/OpenCL-CLHPP/raw/main/include/CL/opencl.hpp'),
+            Source('include/CL/cl.hpp',                          'https://github.com/KhronosGroup/OpenCL-CLHPP/raw/master/include/CL/cl.hpp'),
+            Source('include/CL/cl2.hpp',                         'https://github.com/KhronosGroup/OpenCL-CLHPP/raw/master/include/CL/cl2.hpp'),
         ],
     },
 

bin/meson.build

@@ -20,11 +20,5 @@
 
 git_sha1_gen_py = files('git_sha1_gen.py')
 gen_vs_module_defs_py = files('gen_vs_module_defs.py')
-gen_vs_module_defs_normal_command = [
-  prog_python, gen_vs_module_defs_py,
-  '--in_file', '@INPUT@', '--out_file', '@OUTPUT@',
-  '--compiler_abi', cc.get_argument_syntax(),
-  '--compiler_id', cc.get_id(), '--cpu_family', host_machine.cpu_family()
-]
 symbols_check = find_program('symbols-check.py')
 install_megadrivers_py = find_program('install_megadrivers.py')

bin/meson_get_version.py

@@ -20,16 +20,11 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-import argparse
 import os
 
 
 def main():
-    parser = argparse.ArgumentParser()
-    parser.add_argument('version_dir', help="Directory with VERSION file")
-    args = parser.parse_args()
-
-    filename = os.path.join(args.version_dir, 'VERSION')
+    filename = os.path.join(os.environ['MESON_SOURCE_ROOT'], 'VERSION')
     with open(filename) as f:
         version = f.read().strip()
     print(version, end='')

bin/pick-ui.py

@@ -27,7 +27,7 @@ from pick.ui import UI, PALETTE
 
 if __name__ == "__main__":
     u = UI()
-    evl = urwid.AsyncioEventLoop(loop=asyncio.new_event_loop())
+    evl = urwid.AsyncioEventLoop(loop=asyncio.get_event_loop())
     loop = urwid.MainLoop(u.render(), PALETTE, event_loop=evl, handle_mouse=False)
     u.mainloop = loop
     loop.run()

bin/pick/core.py

@@ -21,7 +21,6 @@
 """Core data structures and routines for pick."""
 
 import asyncio
-import contextlib
 import enum
 import json
 import pathlib
@@ -41,11 +40,10 @@ if typing.TYPE_CHECKING:
         sha: str
         description: str
         nominated: bool
-        nomination_type: int
+        nomination_type: typing.Optional[int]
         resolution: typing.Optional[int]
         main_sha: typing.Optional[str]
         because_sha: typing.Optional[str]
-        notes: typing.Optional[str]
 
 IS_FIX = re.compile(r'^\s*fixes:\s*([a-f0-9]{6,40})', flags=re.MULTILINE | re.IGNORECASE)
 # FIXME: I dislike the duplication in this regex, but I couldn't get it to work otherwise
@@ -53,48 +51,16 @@ IS_CC = re.compile(r'^\s*cc:\s*["\']?([0-9]{2}\.[0-9])?["\']?\s*["\']?([0-9]{2}\
                    flags=re.MULTILINE | re.IGNORECASE)
 IS_REVERT = re.compile(r'This reverts commit ([0-9a-f]{40})')
 
+# XXX: hack
+SEM = asyncio.Semaphore(50)
+
+COMMIT_LOCK = asyncio.Lock()
+
 git_toplevel = subprocess.check_output(['git', 'rev-parse', '--show-toplevel'],
                                        stderr=subprocess.DEVNULL).decode("ascii").strip()
 pick_status_json = pathlib.Path(git_toplevel) / '.pick_status.json'
 
 
-@attr.s(slots=True, cmp=False)
-class AsyncRWLock:
-
-    """An asynchronous Read/Write lock.
-    
-    This is a very simple read/write lock that prioritizes reads.
-
-    As an implementation detail, this relies on python's global locking to drop
-    the need for a lock to protect the `readers` attribute.
-    """
-
-    readers: int = attr.ib(0, init=False)
-    global_lock: asyncio.Lock = attr.ib(factory=asyncio.Lock, init=False)
-    read_lock: asyncio.Lock = attr.ib(factory=asyncio.Lock, init=False)
-
-    @contextlib.asynccontextmanager
-    async def read(self) -> typing.AsyncIterator[None]:
-        async with self.read_lock:
-            self.readers += 1
-            if self.readers == 1:
-                await self.global_lock.acquire()
-        yield
-        async with self.read_lock:
-            self.readers -= 1
-            if self.readers == 0:
-                self.global_lock.release()
-
-    @contextlib.asynccontextmanager
-    async def write(self) -> typing.AsyncIterator[None]:
-        async with self.global_lock:
-            yield
-
-
-GIT_LOCK = AsyncRWLock()
-STATE_LOCK = AsyncRWLock()
-
-
 class PickUIException(Exception):
     pass
 
@@ -105,7 +71,6 @@ class NominationType(enum.Enum):
     CC = 0
     FIXES = 1
     REVERT = 2
-    NONE = 3
 
 
 @enum.unique
@@ -120,7 +85,7 @@ class Resolution(enum.Enum):
 
 async def commit_state(*, amend: bool = False, message: str = 'Update') -> bool:
     """Commit the .pick_status.json file."""
-    async with STATE_LOCK.write():
+    async with COMMIT_LOCK:
         p = await asyncio.create_subprocess_exec(
             'git', 'add', pick_status_json.as_posix(),
             stdout=asyncio.subprocess.DEVNULL,
@@ -151,26 +116,24 @@ class Commit:
     sha: str = attr.ib()
     description: str = attr.ib()
     nominated: bool = attr.ib(False)
-    nomination_type: NominationType = attr.ib(NominationType.NONE)
+    nomination_type: typing.Optional[NominationType] = attr.ib(None)
     resolution: Resolution = attr.ib(Resolution.UNRESOLVED)
     main_sha: typing.Optional[str] = attr.ib(None)
     because_sha: typing.Optional[str] = attr.ib(None)
-    notes: typing.Optional[str] = attr.ib(None)
 
     def to_json(self) -> 'CommitDict':
         d: typing.Dict[str, typing.Any] = attr.asdict(self)
-        d['nomination_type'] = self.nomination_type.value
+        if self.nomination_type is not None:
+            d['nomination_type'] = self.nomination_type.value
         if self.resolution is not None:
             d['resolution'] = self.resolution.value
         return typing.cast('CommitDict', d)
 
     @classmethod
     def from_json(cls, data: 'CommitDict') -> 'Commit':
-        c = cls(data['sha'], data['description'], data['nominated'], main_sha=data['main_sha'],
-                because_sha=data['because_sha'], notes=data['notes'])
-        if (d := data['nomination_type']) is None:
-            d = NominationType.NONE.value
-        c.nomination_type = NominationType(d)
+        c = cls(data['sha'], data['description'], data['nominated'], main_sha=data['main_sha'], because_sha=data['because_sha'])
+        if data['nomination_type'] is not None:
+            c.nomination_type = NominationType(data['nomination_type'])
         if data['resolution'] is not None:
             c.resolution = Resolution(data['resolution'])
         return c
@@ -183,25 +146,31 @@ class Commit:
             stderr=subprocess.DEVNULL
         ).decode("ascii").strip()
 
-    async def apply(self) -> typing.Tuple[bool, str]:
+    async def apply(self, ui: 'UI') -> typing.Tuple[bool, str]:
         # FIXME: This isn't really enough if we fail to cherry-pick because the
         # git tree will still be dirty
-        # We'll end up with a recursive locking situation here if we take the git lock
-        p = await asyncio.create_subprocess_exec(
-            'git', 'cherry-pick', '-x', self.sha,
-            stdout=asyncio.subprocess.DEVNULL,
-            stderr=asyncio.subprocess.PIPE,
-        )
-        _, err = await p.communicate()
+        async with COMMIT_LOCK:
+            p = await asyncio.create_subprocess_exec(
+                'git', 'cherry-pick', '-x', self.sha,
+                stdout=asyncio.subprocess.DEVNULL,
+                stderr=asyncio.subprocess.PIPE,
+            )
+            _, err = await p.communicate()
 
-        ret = p.returncode == 0
-        if ret:
-            self.resolution = Resolution.MERGED
-        return ret, err.decode()
+        if p.returncode != 0:
+            return (False, err.decode())
+
+        self.resolution = Resolution.MERGED
+        await ui.feedback(f'{self.sha} ({self.description}) applied successfully')
+
+        # Append the changes to the .pickstatus.json file
+        ui.save()
+        v = await commit_state(amend=True)
+        return (v, '')
 
     async def abort_cherry(self, ui: 'UI', err: str) -> None:
         await ui.feedback(f'{self.sha} ({self.description}) failed to apply\n{err}')
-        async with GIT_LOCK.write():
+        async with COMMIT_LOCK:
             p = await asyncio.create_subprocess_exec(
                 'git', 'cherry-pick', '--abort',
                 stdout=asyncio.subprocess.DEVNULL,
@@ -210,43 +179,44 @@ class Commit:
             r = await p.wait()
         await ui.feedback(f'{"Successfully" if r == 0 else "Failed to"} abort cherry-pick.')
 
-    async def denominate(self) -> None:
+    async def denominate(self, ui: 'UI') -> bool:
         self.resolution = Resolution.DENOMINATED
+        ui.save()
+        v = await commit_state(message=f'Mark {self.sha} as denominated')
+        assert v
+        await ui.feedback(f'{self.sha} ({self.description}) denominated successfully')
+        return True
 
-    async def backport(self) -> None:
+    async def backport(self, ui: 'UI') -> bool:
         self.resolution = Resolution.BACKPORTED
+        ui.save()
+        v = await commit_state(message=f'Mark {self.sha} as backported')
+        assert v
+        await ui.feedback(f'{self.sha} ({self.description}) backported successfully')
+        return True
 
     async def resolve(self, ui: 'UI') -> None:
         self.resolution = Resolution.MERGED
-        await ui.save()
+        ui.save()
         v = await commit_state(amend=True)
         assert v
         await ui.feedback(f'{self.sha} ({self.description}) committed successfully')
 
-    async def update_notes(self, ui: 'UI', notes: typing.Optional[str]) -> None:
-        self.notes = notes
-        await ui.save()
-        v = await commit_state(message=f'Updates notes for {self.sha}')
-        assert v
-        await ui.feedback(f'{self.sha} ({self.description}) notes updated successfully')
-
 
 async def get_new_commits(sha: str) -> typing.List[typing.Tuple[str, str]]:
     # Try to get the authoritative upstream main
-    async with GIT_LOCK.read():
-        p = await asyncio.create_subprocess_exec(
-            'git', 'for-each-ref', '--format=%(upstream)', 'refs/heads/main',
-            stdout=asyncio.subprocess.PIPE,
-            stderr=asyncio.subprocess.DEVNULL)
-        out, _ = await p.communicate()
+    p = await asyncio.create_subprocess_exec(
+        'git', 'for-each-ref', '--format=%(upstream)', 'refs/heads/main',
+        stdout=asyncio.subprocess.PIPE,
+        stderr=asyncio.subprocess.DEVNULL)
+    out, _ = await p.communicate()
     upstream = out.decode().strip()
 
-    async with GIT_LOCK.read():
-        p = await asyncio.create_subprocess_exec(
-            'git', 'log', '--pretty=oneline', f'{sha}..{upstream}',
-            stdout=asyncio.subprocess.PIPE,
-            stderr=asyncio.subprocess.DEVNULL)
-        out, _ = await p.communicate()
+    p = await asyncio.create_subprocess_exec(
+        'git', 'log', '--pretty=oneline', f'{sha}..{upstream}',
+        stdout=asyncio.subprocess.PIPE,
+        stderr=asyncio.subprocess.DEVNULL)
+    out, _ = await p.communicate()
     assert p.returncode == 0, f"git log didn't work: {sha}"
     return list(split_commit_list(out.decode().strip()))
 
@@ -261,7 +231,7 @@ def split_commit_list(commits: str) -> typing.Generator[typing.Tuple[str, str],
 
 
 async def is_commit_in_branch(sha: str) -> bool:
-    async with GIT_LOCK.read():
+    async with SEM:
         p = await asyncio.create_subprocess_exec(
             'git', 'merge-base', '--is-ancestor', sha, 'HEAD',
             stdout=asyncio.subprocess.DEVNULL,
@@ -272,7 +242,7 @@ async def is_commit_in_branch(sha: str) -> bool:
 
 
 async def full_sha(sha: str) -> str:
-    async with GIT_LOCK.read():
+    async with SEM:
         p = await asyncio.create_subprocess_exec(
             'git', 'rev-parse', sha,
             stdout=asyncio.subprocess.PIPE,
@@ -285,7 +255,7 @@ async def full_sha(sha: str) -> str:
 
 
 async def resolve_nomination(commit: 'Commit', version: str) -> 'Commit':
-    async with GIT_LOCK.read():
+    async with SEM:
         p = await asyncio.create_subprocess_exec(
             'git', 'log', '--format=%B', '-1', commit.sha,
             stdout=asyncio.subprocess.PIPE,
@@ -334,25 +304,38 @@ async def resolve_nomination(commit: 'Commit', version: str) -> 'Commit':
     return commit
 
 
-async def changes_commit(commit: Commit, commits: typing.List['Commit']) -> typing.List[Commit]:
-    """Find all reverts and fixes for a given commit.
+async def resolve_fixes(commits: typing.List['Commit'], previous: typing.List['Commit']) -> None:
+    """Determine if any of the undecided commits fix/revert a staged commit.
 
+    The are still needed if they apply to a commit that is staged for
+    inclusion, but not yet included.
+
+    This must be done in order, because a commit 3 might fix commit 2 which
+    fixes commit 1.
     """
-    new_commits: typing.List[Commit] = []
-    for c in reversed(commits):
-        if c is commit:
-            break
-        new_commits.append(c)
+    shas: typing.Set[str] = set(c.sha for c in previous if c.nominated)
+    assert None not in shas, 'None in shas'
 
-    ret: typing.List[Commit] = []
+    for commit in reversed(commits):
+        if not commit.nominated and commit.nomination_type is NominationType.FIXES:
+            commit.nominated = commit.because_sha in shas
 
-    for c in reversed(new_commits):
-        if (c.nomination_type in {NominationType.REVERT, NominationType.FIXES} and
-                c.because_sha == commit.sha):
-            c.nominated = True
-            ret.append(c)
-    
-    return ret
+        if commit.nominated:
+            shas.add(commit.sha)
+
+    for commit in commits:
+        if (commit.nomination_type is NominationType.REVERT and
+                commit.because_sha in shas):
+            for oldc in reversed(commits):
+                if oldc.sha == commit.because_sha:
+                    # In this case a commit that hasn't yet been applied is
+                    # reverted, we don't want to apply that commit at all
+                    oldc.nominated = False
+                    oldc.resolution = Resolution.DENOMINATED
+                    commit.nominated = False
+                    commit.resolution = Resolution.DENOMINATED
+                    shas.remove(commit.because_sha)
+                    break
 
 
 async def gather_commits(version: str, previous: typing.List['Commit'],
@@ -379,6 +362,8 @@ async def gather_commits(version: str, previous: typing.List['Commit'],
     assert None not in m_commits
     commits = typing.cast(typing.List[Commit], m_commits)
 
+    await resolve_fixes(commits, previous)
+
     for commit in commits:
         if commit.resolution is Resolution.UNRESOLVED and not commit.nominated:
             commit.resolution = Resolution.NOTNEEDED

bin/pick/core_test.py

@@ -393,6 +393,53 @@ class TestResolveNomination:
         assert c.nomination_type is core.NominationType.CC
 
 
+class TestResolveFixes:
+
+    @pytest.mark.asyncio
+    async def test_in_new(self):
+        """Because commit abcd is nominated, so f123 should be as well."""
+        c = [
+            core.Commit('f123', 'desc', nomination_type=core.NominationType.FIXES, because_sha='abcd'),
+            core.Commit('abcd', 'desc', True),
+        ]
+        await core.resolve_fixes(c, [])
+        assert c[1].nominated
+
+    @pytest.mark.asyncio
+    async def test_not_in_new(self):
+        """Because commit abcd is not nominated, commit f123 shouldn't be either."""
+        c = [
+            core.Commit('f123', 'desc', nomination_type=core.NominationType.FIXES, because_sha='abcd'),
+            core.Commit('abcd', 'desc'),
+        ]
+        await core.resolve_fixes(c, [])
+        assert not c[0].nominated
+
+    @pytest.mark.asyncio
+    async def test_in_previous(self):
+        """Because commit abcd is nominated, so f123 should be as well."""
+        p = [
+            core.Commit('abcd', 'desc', True),
+        ]
+        c = [
+            core.Commit('f123', 'desc', nomination_type=core.NominationType.FIXES, because_sha='abcd'),
+        ]
+        await core.resolve_fixes(c, p)
+        assert c[0].nominated
+
+    @pytest.mark.asyncio
+    async def test_not_in_previous(self):
+        """Because commit abcd is not nominated, commit f123 shouldn't be either."""
+        p = [
+            core.Commit('abcd', 'desc'),
+        ]
+        c = [
+            core.Commit('f123', 'desc', nomination_type=core.NominationType.FIXES, because_sha='abcd'),
+        ]
+        await core.resolve_fixes(c, p)
+        assert not c[0].nominated
+
+
 class TestIsCommitInBranch:
 
     @pytest.mark.asyncio
@@ -421,50 +468,3 @@ class TestFullSha:
         # This commit is from 2000, it better always be in the branch
         with pytest.raises(core.PickUIException):
             await core.full_sha('fffffffffffffffffffffffffffffffffff')
-
-
-
-class TestChangesCommit:
-
-    @pytest.mark.asyncio
-    async def test_fixes(self) -> None:
-        commit = core.Commit('abcdef', 'first commit')
-        commits = [
-            commit,
-            core.Commit('abcdef1234567890', 'a commit', nomination_type=core.NominationType.FIXES,
-                        because_sha='abcdef')
-        ]
-
-        new = await core.changes_commit(commit, commits)
-        assert new == [commits[1]]
-
-    @pytest.mark.asyncio
-    async def test_revert(self) -> None:
-        commit = core.Commit('abcdef', 'first commit')
-        commits = [
-            commit,
-            core.Commit('abcdef1234567890', 'REVERT: first commit',
-                        nomination_type=core.NominationType.REVERT, because_sha='abcdef')
-        ]
-
-        new = await core.changes_commit(commit, commits)
-        assert new == [commits[1]]
-        assert new[0].nominated
-
-    @pytest.mark.asyncio
-    async def test_mixed(self) -> None:
-        commit = core.Commit('abcdef', 'first commit')
-        commits = [
-            commit,
-            core.Commit('abcdef1234567890', 'REVERT: first commit',
-                        nomination_type=core.NominationType.REVERT, because_sha='abcdef'),
-            core.Commit('123545', 'a useless commit'),
-            core.Commit('abcde123', 'a commit', nomination_type=core.NominationType.FIXES,
-                        because_sha='abcdef'),
-            core.Commit('123321', 'a useless commit'),
-        ]
-
-        new = await core.changes_commit(commit, commits)
-        assert new == [commits[1], commits[3]]
-        assert new[0].nominated
-        assert new[1].nominated

bin/pick/ui.py

@@ -47,13 +47,6 @@ class RootWidget(urwid.Frame):
         super().__init__(*args, **kwargs)
         self.ui = ui
 
-
-class CommitList(urwid.ListBox):
-
-    def __init__(self, *args, ui: 'UI', **kwargs):
-        super().__init__(*args, **kwargs)
-        self.ui = ui
-
     def keypress(self, size: int, key: str) -> typing.Optional[str]:
         if key == 'q':
             raise urwid.ExitMainLoop()
@@ -79,36 +72,21 @@ class CommitWidget(urwid.Text):
         self.commit = commit
 
     async def apply(self) -> None:
-        async with core.GIT_LOCK.write():
-            result, err = await self.commit.apply()
+        async with self.ui.git_lock:
+            result, err = await self.commit.apply(self.ui)
             if not result:
-                await self.ui.feedback(
-                    f'{self.commit.sha} ({self.commit.description}) failed to apply\n{err}')
                 self.ui.chp_failed(self, err)
             else:
-                await self.ui.feedback(
-                    f'{self.commit.sha} ({self.commit.description}) applied successfully')
-                await self.ui.check_new_commits(self.commit)
-                await self.ui.save()
-                await core.commit_state(amend=True)
-
                 self.ui.remove_commit(self)
 
     async def denominate(self) -> None:
-        async with core.GIT_LOCK.write():
-            await self.commit.denominate()
-            await self.ui.save()
-            await core.commit_state(message=f'Mark {self.commit.sha} as denominated')
-            await self.ui.feedback(f'{self.commit.sha} ({self.commit.description}) denominated successfully')
+        async with self.ui.git_lock:
+            await self.commit.denominate(self.ui)
             self.ui.remove_commit(self)
 
     async def backport(self) -> None:
-        async with core.GIT_LOCK.write():
-            await self.commit.backport()
-            await self.ui.check_new_commits(self.commit)
-            await self.ui.save()
-            await core.commit_state(message=f'Mark {self.commit.sha} as backported')
-            await self.ui.feedback(f'{self.commit.sha} ({self.commit.description}) marked as backported')
+        async with self.ui.git_lock:
+            await self.commit.backport(self.ui)
             self.ui.remove_commit(self)
 
     def keypress(self, size: int, key: str) -> typing.Optional[str]:
@@ -123,23 +101,6 @@ class CommitWidget(urwid.Text):
         return None
 
 
-class FocusAwareEdit(urwid.Edit):
-
-    """An Edit type that signals when it comes into and leaves focus."""
-
-    signals = urwid.Edit.signals + ['focus_changed']
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.__is_focus = False
-
-    def render(self, size: typing.Tuple[int], focus: bool = False) -> urwid.Canvas:
-        if focus != self.__is_focus:
-            self._emit("focus_changed", focus)
-            self.__is_focus = focus
-        return super().render(size, focus)
-
-
 @attr.s(slots=True)
 class UI:
 
@@ -151,7 +112,6 @@ class UI:
 
     commit_list: typing.List['urwid.Button'] = attr.ib(factory=lambda: urwid.SimpleFocusListWalker([]), init=False)
     feedback_box: typing.List['urwid.Text'] = attr.ib(factory=lambda: urwid.SimpleFocusListWalker([]), init=False)
-    notes: 'FocusAwareEdit' = attr.ib(factory=lambda: FocusAwareEdit('', multiline=True), init=False)
     header: 'urwid.Text' = attr.ib(factory=lambda: urwid.Text('Mesa Stable Picker', align='center'), init=False)
     body: 'urwid.Columns' = attr.ib(attr.Factory(lambda s: s._make_body(), True), init=False)
     footer: 'urwid.Columns' = attr.ib(attr.Factory(lambda s: s._make_footer(), True), init=False)
@@ -160,37 +120,12 @@ class UI:
 
     previous_commits: typing.List['core.Commit'] = attr.ib(factory=list, init=False)
     new_commits: typing.List['core.Commit'] = attr.ib(factory=list, init=False)
-
-    def _get_current_commit(self) -> typing.Optional['core.Commit']:
-        entry = self.commit_list.get_focus()[0]
-        return entry.original_widget.commit if entry is not None else None
-
-    def _change_notes_cb(self) -> None:
-        commit = self._get_current_commit()
-        if commit and commit.notes:
-            self.notes.set_edit_text(commit.notes)
-        else:
-            self.notes.set_edit_text('')
-
-    def _change_notes_focus_cb(self, notes: 'FocusAwareEdit', focus: 'bool') -> 'None':
-        # in the case of coming into focus we don't want to do anything
-        if focus:
-            return
-        commit = self._get_current_commit()
-        if commit is None:
-            return
-        text: str = notes.get_edit_text()
-        if text != commit.notes:
-            asyncio.ensure_future(commit.update_notes(self, text))
+    git_lock: asyncio.Lock = attr.ib(factory=asyncio.Lock, init=False)
 
     def _make_body(self) -> 'urwid.Columns':
-        commits = CommitList(self.commit_list, ui=self)
+        commits = urwid.ListBox(self.commit_list)
         feedback = urwid.ListBox(self.feedback_box)
-        urwid.connect_signal(self.commit_list, 'modified', self._change_notes_cb)
-        notes = urwid.Filler(self.notes)
-        urwid.connect_signal(self.notes, 'focus_changed', self._change_notes_focus_cb)
-
-        return urwid.Columns([urwid.LineBox(commits), urwid.Pile([urwid.LineBox(notes), urwid.LineBox(feedback)])])
+        return urwid.Columns([commits, feedback])
 
     def _make_footer(self) -> 'urwid.Columns':
         body = [
@@ -199,12 +134,12 @@ class UI:
             urwid.Text('[C]herry Pick'),
             urwid.Text('[D]enominate'),
             urwid.Text('[B]ackport'),
-            urwid.Text('[A]pply additional patch'),
+            urwid.Text('[A]pply additional patch')
         ]
         return urwid.Columns(body)
 
     def _make_root(self) -> 'RootWidget':
-        return RootWidget(self.body, urwid.LineBox(self.header), urwid.LineBox(self.footer), 'body', ui=self)
+        return RootWidget(self.body, self.header, self.footer, 'body', ui=self)
 
     def render(self) -> 'WidgetType':
         asyncio.ensure_future(self.update())
@@ -238,18 +173,7 @@ class UI:
             if commit.nominated and commit.resolution is core.Resolution.UNRESOLVED:
                 b = urwid.AttrMap(CommitWidget(self, commit), None, focus_map='reversed')
                 self.commit_list.append(b)
-        await self.save()
-
-    async def check_new_commits(self, commit: core.Commit) -> None:
-        """After applying a commit, check for any new commits that affect that commit.
-
-        :param commit: _description_
-        """
-        new = await core.changes_commit(
-            commit, [c.base_widget.commit for c in self.commit_list])
-        if new:
-            # TODO: this will place them out of order
-            self.commit_list.extend([CommitWidget(self, c) for c in new])
+        self.save()
 
     async def feedback(self, text: str) -> None:
         self.feedback_box.append(urwid.AttrMap(urwid.Text(text), None))
@@ -262,7 +186,7 @@ class UI:
                 del self.commit_list[i]
                 break
 
-    async def save(self) -> None:
+    def save(self):
         core.save(itertools.chain(self.new_commits, self.previous_commits))
 
     def add(self) -> None:
@@ -287,8 +211,7 @@ class UI:
             else:
                 raise RuntimeError(f"Couldn't find {sha}")
 
-            wid = CommitWidget(self, commit)
-            await wid.apply()
+            await commit.apply(self)
 
         q = urwid.Edit("Commit sha\n")
         ok_btn = urwid.Button('Ok')

bin/post_version.py

@@ -27,6 +27,31 @@ import pathlib
 import subprocess
 
 
+def update_release_notes(version: str) -> None:
+    p = pathlib.Path('docs') / 'relnotes.rst'
+
+    with open(p, 'r') as f:
+        relnotes = f.readlines()
+
+    new_relnotes = []
+    first_list = True
+    second_list = True
+    for line in relnotes:
+        if first_list and line.startswith('-'):
+            first_list = False
+            new_relnotes.append(f'-  :doc:`{version} release notes <relnotes/{version}>`\n')
+        if not first_list and second_list and line.startswith('   relnotes/'):
+            second_list = False
+            new_relnotes.append(f'   relnotes/{version}\n')
+        new_relnotes.append(line)
+
+    with open(p, 'w') as f:
+        for line in new_relnotes:
+            f.write(line)
+
+    subprocess.run(['git', 'add', p])
+
+
 def update_calendar(version: str) -> None:
     p = pathlib.Path('docs') / 'release-calendar.csv'
 
@@ -56,9 +81,14 @@ def main() -> None:
     args = parser.parse_args()
 
     update_calendar(args.version)
+    done = 'update calendar'
+
+    if 'rc' not in args.version:
+        update_release_notes(args.version)
+        done += ' and link releases notes'
 
     subprocess.run(['git', 'commit', '-m',
-                    f'docs: update calendar for {args.version}'])
+                    f'docs: {done} for {args.version}'])
 
 
 if __name__ == "__main__":

docs/_exts/formatting.py

@@ -6,8 +6,17 @@
 import docutils.nodes
 import sphinx.addnodes
 
-from sphinx.util.nodes import split_explicit_title
-from docutils import nodes, utils
+def parse_envvar(env, sig, signode):
+    envvar, t, default = sig.split(" ", 2)
+    envvar = envvar.strip().upper()
+    t = "Type: %s" % t.strip(" <>").lower()
+    default = "Default: %s" % default.strip(" ()")
+    signode += sphinx.addnodes.desc_name(envvar, envvar)
+    signode += docutils.nodes.Text(' ')
+    signode += sphinx.addnodes.desc_type(t, t)
+    signode += docutils.nodes.Text(', ')
+    signode += sphinx.addnodes.desc_annotation(default, default)
+    return envvar
 
 def parse_opcode(env, sig, signode):
     opcode, desc = sig.split("-", 1)
@@ -17,23 +26,8 @@ def parse_opcode(env, sig, signode):
     signode += sphinx.addnodes.desc_annotation(desc, desc)
     return opcode
 
-
-def ext_role(name, rawtext, text, lineno, inliner, options={}, content=[]):
-    text = utils.unescape(text)
-    has_explicit_title, title, ext = split_explicit_title(text)
-
-    parts = ext.split('_', 2)
-    if parts[0] == 'VK':
-        full_url = f'https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/{ext}.html'
-    elif parts[0] == 'GL':
-        full_url = f'https://registry.khronos.org/OpenGL/extensions/{parts[1]}/{parts[1]}_{parts[2]}.txt'
-    else:
-        raise Exception(f'Unexpected API: {parts[0]}')
-
-    pnode = nodes.reference(title, title, internal=False, refuri=full_url)
-    return [pnode], []
-
 def setup(app):
+    app.add_object_type("envvar", "envvar", "%s (environment variable)",
+        parse_envvar)
     app.add_object_type("opcode", "opcode", "%s (TGSI opcode)",
         parse_opcode)
-    app.add_role('ext', ext_role)

docs/amber.rst

@@ -3,7 +3,7 @@ Amber Branch
 
 After Mesa 21.3, all non-Gallium DRI drivers were removed from the Mesa
 source-tree. These drivers are still being maintained to some degree,
-but only on the ``amber`` branch, and only for critical fixes.
+but only on the 21.3.x branch, and only for critical fixes.
 
 These drivers include:
 
@@ -39,8 +39,8 @@ enable that logic, you need to pass the ``-Damber=true`` flag to Meson.
 Documentation
 -------------
 
-On `docs.mesa3d.org <https://docs.mesa3d.org/>`__, we currently only
+On `docs.mesa3d.org <https://docs.mesa3d.org/>`, we currently only
 publish the documentation from our main branch. But you can view the
 documentation for the Amber branch `here
-<https://gitlab.freedesktop.org/mesa/mesa/-/tree/amber/docs>`__.
+<https://gitlab.freedesktop.org/mesa/mesa/-/tree/21.3/docs>`_.
 

docs/ci/LAVA.rst

@@ -1,13 +1,13 @@
 LAVA CI
 =======
 
-`LAVA <https://www.lavasoftware.org/>`__ is a system for functional
-testing of boards including deploying custom bootloaders and kernels.
-This is particularly relevant to testing Mesa because we often need
-to change kernels for UAPI changes (and this lets us do full testing
-of a new kernel during development), and our workloads can easily
-take down boards when mistakes are made (kernel oopses, OOMs that
-take out critical system services).
+`LAVA <https://lavasoftware.org/>`_ is a system for functional testing
+of boards including deploying custom bootloaders and kernels.  This is
+particularly relevant to testing Mesa because we often need to change
+kernels for UAPI changes (and this lets us do full testing of a new
+kernel during development), and our workloads can easily take down
+boards when mistakes are made (kernel oopses, OOMs that take out
+critical system services).
 
 Mesa-LAVA software architecture
 -------------------------------

docs/ci/bare-metal.rst

@@ -34,7 +34,7 @@ initramfs) for trace replay testing.  Given that we need networking already, and
 our dEQP/Piglit/etc. payload is large, we use NFS from the x86 runner system
 rather than initramfs.
 
-See ``src/freedreno/ci/gitlab-ci.yml`` for an example of fastboot on DB410c and
+See `src/freedreno/ci/gitlab-ci.yml` for an example of fastboot on DB410c and
 DB820c (freedreno-a306 and freedreno-a530).
 
 Requirements (Servo)
@@ -74,7 +74,7 @@ call "servo"::
   dhcp-option=tag:cheza1,option:root-path,/srv/nfs/cheza1
   dhcp-option=tag:cheza2,option:root-path,/srv/nfs/cheza2
 
-See ``src/freedreno/ci/gitlab-ci.yml`` for an example of Servo on cheza.  Note
+See `src/freedreno/ci/gitlab-ci.yml` for an example of Servo on cheza.  Note
 that other Servo boards in CI are managed using LAVA.
 
 Requirements (POE)
@@ -124,12 +124,12 @@ With that set up, you should be able to power on/off a port with something like:
 Note that the "1.3.6..." SNMP OID changes between switches.  The last digit
 above is the interface id (port number).  You can probably find the right OID by
 google, that was easier than figuring it out from finding the switch's MIB
-database.  You can query the POE status from the switch serial using the ``show
-power inline`` command.
+database.  You can query the POE status from the switch serial using the `show
+power inline` command.
 
 Other than that, find the dnsmasq/tftp/NFS setup for your boards "servo" above.
 
-See ``src/broadcom/ci/gitlab-ci.yml`` and ``src/nouveau/ci/gitlab-ci.yml`` for an
+See `src/broadcom/ci/gitlab-ci.yml` and `src/nouveau/ci/gitlab-ci.yml` for an
 examples of POE for Raspberry Pi 3/4, and Jetson Nano.
 
 Setup
@@ -219,12 +219,12 @@ Enable the site and restart nginx:
   sudo service nginx restart
 
   # First download will hit the internet
-  wget http://localhost/cache/?uri=https://s3.freedesktop.org/mesa-tracie-public/itoral-gl-terrain-demo/demo.trace
+  wget http://localhost/cache/?uri=https://minio-packet.freedesktop.org/mesa-tracie-public/itoral-gl-terrain-demo/demo.trace
   # Second download should be cached.
-  wget http://localhost/cache/?uri=https://s3.freedesktop.org/mesa-tracie-public/itoral-gl-terrain-demo/demo.trace
+  wget http://localhost/cache/?uri=https://minio-packet.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://s3.freedesktop.org/mesa-tracie-public``
+``http://10.42.0.1:8888/cache/?uri=https://minio-packet.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/ci/docker.rst

@@ -3,7 +3,7 @@ Docker CI
 
 For LLVMpipe and Softpipe CI, we run tests in a container containing
 VK-GL-CTS, on the shared GitLab runners provided by `freedesktop
-<https://freedesktop.org>`__
+<http://freedesktop.org>`_
 
 Software architecture
 ---------------------
@@ -53,7 +53,7 @@ step across multiple test runs.  Since the images are large and change
 approximately weekly, the DUTs also need to be running some script to
 prune stale Docker images periodically in order to not run out of disk
 space as we rev those containers (perhaps `this script
-<https://gitlab.com/gitlab-org/gitlab-runner/-/issues/2980#note_169233611>`__).
+<https://gitlab.com/gitlab-org/gitlab-runner/issues/2980#note_169233611>`_).
 
 Note that Docker doesn't allow containers to be stored on NFS, and
 doesn't allow multiple Docker daemons to interact with the same

docs/ci/index.rst

@@ -59,7 +59,7 @@ The CI replays application traces with various drivers in two different jobs. Th
 job replays traces listed in ``src/<driver>/ci/traces-<driver>.yml`` files and if any
 of those traces fail the pipeline fails as well. The second job replays traces listed in
 ``src/<driver>/ci/restricted-traces-<driver>.yml`` and it is allowed to fail. This second
-job is only created when the pipeline is triggered by ``marge-bot`` or any other user that
+job is only created when the pipeline is triggered by `marge-bot` or any other user that
 has been granted access to these traces.
 
 A traces YAML file also includes a ``download-url`` pointing to a MinIO
@@ -173,7 +173,7 @@ faster personal machine as a runner.  You can find the gitlab-runner
 package in Debian, or use GitLab's own builds.
 
 To do so, follow `GitLab's instructions
-<https://docs.gitlab.com/ee/ci/runners/runners_scope.html#create-a-specific-runner>`__ to
+<https://docs.gitlab.com/ce/ci/runners/#create-a-specific-runner>`__ to
 register your personal GitLab runner in your Mesa fork.  Then, tell
 Mesa how many jobs it should serve (``concurrent=``) and how many
 cores those jobs should use (``FDO_CI_CONCURRENT=``) by editing these
@@ -191,7 +191,7 @@ Docker caching
 The CI system uses Docker images extensively to cache
 infrequently-updated build content like the CTS.  The `freedesktop.org
 CI templates
-<https://gitlab.freedesktop.org/freedesktop/ci-templates/>`__ help us
+<https://gitlab.freedesktop.org/freedesktop/ci-templates/>`_ help us
 manage the building of the images to reduce how frequently rebuilds
 happen, and trim down the images (stripping out manpages, cleaning the
 apt cache, and other such common pitfalls of building Docker images).
@@ -199,7 +199,7 @@ apt cache, and other such common pitfalls of building Docker images).
 When running a container job, the templates will look for an existing
 build of that image in the container registry under
 ``MESA_IMAGE_TAG``.  If it's found it will be reused, and if
-not, the associated ``.gitlab-ci/containers/<jobname>.sh`` will be run
+not, the associated `.gitlab-ci/containers/<jobname>.sh`` will be run
 to build it.  So, when developing any change to container build
 scripts, you need to update the associated ``MESA_IMAGE_TAG`` to
 a new unique string.  We recommend using the current date plus some
@@ -211,7 +211,7 @@ When developing a given change to your Docker image, you would have to
 bump the tag on each ``git commit --amend`` to your development
 branch, which can get tedious.  Instead, you can navigate to the
 `container registry
-<https://gitlab.freedesktop.org/mesa/mesa/container_registry>`__ for
+<https://gitlab.freedesktop.org/mesa/mesa/container_registry>`_ for
 your repository and delete the tag to force a rebuild.  When your code
 is eventually merged to main, a full image rebuild will occur again
 (forks inherit images from the main repo, but MRs don't propagate

docs/ci/kernel.rst

@@ -18,8 +18,8 @@ Linux mainline, that is why Mesa has its own kernel version which should be used
 as the base for newer kernels.
 
 So, one should base the kernel uprev from the last tag used in the Mesa CI,
-please refer to ``.gitlab-ci/container/gitlab-ci.yml`` ``KERNEL_URL`` variable.
-Every tag has a standard naming: ``vX.YZ-for-mesa-ci-<commit_short_SHA>``, which
+please refer to `.gitlab-ci/container/gitlab-ci.yml` `KERNEL_URL` variable.
+Every tag has a standard naming: `vX.YZ-for-mesa-ci-<commit_short_SHA>`, which
 can be created via the command:
 
 :code:`git tag vX.YZ-for-mesa-ci-$(git rev-parse --short HEAD)`
@@ -28,7 +28,7 @@ Building Kernel
 ---------------
 
 When Mesa CI generates a new rootfs image, the Linux Kernel is built based on
-the script located at ``.gitlab-ci/container/build-kernel.sh``.
+the script located at `.gitlab-ci/container/build-kernel.sh`.
 
 Updating Kconfigs
 ^^^^^^^^^^^^^^^^^
@@ -36,7 +36,7 @@ Updating Kconfigs
 When a Kernel uprev happens, it is worth compiling and cross-compiling the
 Kernel locally, in order to update the Kconfigs accordingly.  Remember that the
 resulting Kconfig is a merge between *Mesa CI Kconfig* and *Linux tree
-defconfig* made via ``merge_config.sh`` script located at Linux Kernel tree.
+defconfig* made via `merge_config.sh` script located at Linux Kernel tree.
 
 Kconfigs location
 """""""""""""""""
@@ -70,9 +70,9 @@ Development routine
 
 1. Compile the newer kernel locally for each platform.
 2. Compile device trees for ARM platforms
-3. Update Kconfigs. Are new Kconfigs necessary? Is CONFIG_XYZ_BLA deprecated? Does the ``merge_config.sh`` override an important config?
+3. Update Kconfigs. Are new Kconfigs necessary? Is CONFIG_XYZ_BLA deprecated? Does the `merge_config.sh` override an important config?
 4. Push a new development branch to `Kernel repository`_ based on the latest kernel tag used in GitLab CI
-5. Hack ``build-kernel.sh`` script to clone kernel from your development branch
+5. Hack `build-kernel.sh` script to clone kernel from your development branch
 6. Update image tags. See `Updating image tags`_
 7. Run the entire CI pipeline, all the automatic jobs should be green. If some job is red or taking too long, you will need to investigate it and probably ask for help.
 
@@ -80,7 +80,7 @@ When the Kernel uprev is stable
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 1. Push a new tag to Mesa CI `Kernel repository`_
-2. Update KERNEL_URL ``debian/x86_test-gl`` job definition
+2. Update KERNEL_URL `debian/x86_test-gl` job definition
 3. Open a merge request, if it is not opened yet
 
 Tips and Tricks
@@ -107,15 +107,15 @@ Bare-metal custom kernels
 Some CI jobs have support to plug in a custom kernel by simply changing a variable.
 This is great, since rebuilding the kernel and rootfs may takes dozens of minutes.
 
-For example, Freedreno jobs ``gitlab.yml`` manifest support a variable named
-``BM_KERNEL``. If one puts a gz-compressed kernel URL there, the job will use that
-kernel to boot the Freedreno bare-metal devices. The same works for ``BM_DTB`` in
+For example, Freedreno jobs `gitlab.yml` manifest support a variable named
+`BM_KERNEL`. If one puts a gz-compressed kernel URL there, the job will use that
+kernel to boot the Freedreno bare-metal devices. The same works for `BM_DTB` in
 the case of device tree binaries.
 
 Careful reading of the job logs
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Sometimes a job may turn to red for reasons unrelated to the kernel update, e.g.
-LAVA ``tftp`` timeout, problems with the freedesktop servers etc.
+LAVA `tftp` timeout, problems with the freedesktop servers etc.
 So it is important to see the reason why the job turned red, and retry it if an
 infrastructure error has happened.

docs/ci/local-traces.rst

@@ -3,10 +3,10 @@ Running traces on a local machine
 
 Prerequisites
 -------------
-- Install `Apitrace <https://apitrace.github.io/>`__
-- Install `Renderdoc <https://renderdoc.org/>`__ (only needed for some traces)
-- Download and compile `Piglit <https://gitlab.freedesktop.org/mesa/piglit>`__ and install his `dependencies <https://gitlab.freedesktop.org/mesa/piglit#2-setup>`__
-- Download traces you want to replay from `traces-db <https://gitlab.freedesktop.org/gfx-ci/tracie/traces-db/>`__
+- Install `Apitrace <https://apitrace.github.io/>`_
+- Install `Renderdoc <https://renderdoc.org/>`_ (only needed for some traces)
+- Download and compile `Piglit <https://gitlab.freedesktop.org/mesa/piglit>`_ and install his `dependencies <https://gitlab.freedesktop.org/mesa/piglit#2-setup>`_
+- Download traces you want to replay from `traces-db <https://gitlab.freedesktop.org/gfx-ci/tracie/traces-db/>`_
 
 Running single trace
 --------------------
@@ -16,7 +16,7 @@ A simple run to see the output of the trace can be done with
 
     apitrace replay -w name_of_trace.trace
 
-For more information, look into the `Apitrace documentation <https://github.com/apitrace/apitrace/blob/master/docs/USAGE.markdown>`__.
+For more information, look into the `Apitrace documentation <https://github.com/apitrace/apitrace/blob/master/docs/USAGE.markdown>`_.
 
 For comparing checksums use:
 
@@ -32,7 +32,7 @@ Simulating CI trace job
 
 Sometimes it's useful to be able to test traces on your local machine instead of the Mesa CI runner. To simulate the CI environment as closely as possible.
 
-Download the YAML file from your driver's ``ci/`` directory and then change the path in the YAML file from local proxy or MinIO to the local directory (url-like format ``file://``)
+Download the YAML file from your driver's `ci/` directory and then change the path in the YAML file from local proxy or MinIO to the local directory (url-like format ``file://``)
 
 .. code-block:: console
 

docs/ci/skqp.rst

@@ -1,33 +1,101 @@
 SkQP
 ====
 
-`SkQP <https://skia.org/docs/dev/testing/skqp/>`__ stands for SKIA Quality
+`SkQP <https://skia.org/docs/dev/testing/skqp/>`_ stands for SKIA Quality
 Program conformance tests.  Basically, it has sets of rendering tests and unit
-tests to ensure that `SKIA <https://skia.org/>`__ is meeting its design specifications on a specific
+tests to ensure that `SKIA <https://skia.org/>`_ is meeting its design specifications on a specific
 device.
 
 The rendering tests have support for GL, GLES and Vulkan backends and test some
 rendering scenarios.
-And the unit tests check the GPU behavior without rendering images, using any of the GL/GLES or Vulkan drivers.
+And the unit tests check the GPU behavior without rendering images.
+
+Tests
+-----
+
+Render tests design
+^^^^^^^^^^^^^^^^^^^
+
+It is worth noting that `rendertests.txt` can bring some detail about each test
+expectation, so each test can have a max pixel error count, to tell SkQP that it
+is OK to have at most that number of errors for that test. See also:
+https://github.com/google/skia/blob/c29454d1c9ebed4758a54a69798869fa2e7a36e0/tools/skqp/README_ALGORITHM.md
+
+.. _test-location:
+
+Location
+^^^^^^^^
+
+Each `rendertests.txt` and `unittest.txt` file must be located inside a specific
+subdirectory inside SkQP assets directory.
+
++--------------+--------------------------------------------+
+| Test type    | Location                                   |
++==============+============================================+
+| Render tests |  `${SKQP_ASSETS_DIR}/skqp/rendertests.txt` |
++--------------+--------------------------------------------+
+| Unit tests   |  `${SKQP_ASSETS_DIR}/skqp/unittests.txt`   |
++--------------+--------------------------------------------+
+
+The `skqp-runner.sh` script will make the necessary modifications to separate
+`rendertests.txt` for each backend-driver combination. As long as the test files are located in the expected place:
+
++--------------+----------------------------------------------------------------------------------------------+
+| Test type    | Location                                                                                     |
++==============+==============================================================================================+
+| Render tests | `${MESA_REPOSITORY_DIR}/src/${GPU_DRIVER}/ci/${GPU_VERSION}-${SKQP_BACKEND}_rendertests.txt` |
++--------------+----------------------------------------------------------------------------------------------+
+| Unit tests   | `${MESA_REPOSITORY_DIR}/src/${GPU_DRIVER}/ci/${GPU_VERSION}_unittests.txt`                   |
++--------------+----------------------------------------------------------------------------------------------+
+
+Where `SKQP_BACKEND` can be:
+
+- gl: for GL backend
+- gles: for GLES backend
+- vk: for Vulkan backend
+
+Example file
+""""""""""""
+
+.. code-block:: console
+
+  src/freedreno/ci/freedreno-a630-skqp-gl_rendertests.txt
+
+- GPU_DRIVER: `freedreno`
+- GPU_VERSION: `freedreno-a630`
+- SKQP_BACKEND: `gl`
+
+.. _rendertests-design:
 
 SkQP reports
 ------------
 
-SkQP generates reports after finishing its execution, and deqp-runner collects
-them in the job artifacts results directory under the test name.  Click the
-'Browse' button from a failing job to get to them.
+SkQP generates reports after finishing its execution, they are located at the job
+artifacts results directory and are divided in subdirectories by rendering tests
+backends and unit
+tests. The job log has links to every generated report in order to facilitate
+the SkQP debugging.
 
-SkQP failing tests
-------------------
+Maintaining SkQP on Mesa CI
+---------------------------
 
-SkQP rendering tests will have a range of pixel values allowed for the driver's
-rendering for a given test.  This can make the "expected" image in the result
-output look rather strange, but you should be able to make sense of it knowing
-that.
+SkQP is built alongside with another binary, namely `list_gpu_unit_tests`, it is
+located in the same folder where `skqp` binary is.
 
-In SkQP itself, testcases can have increased failing pixel thresholds added to
-them to keep CI green when the rendering is "correct" but out of normal range.
-However, we don't support changing the thresholds in our testing.  Because any
-driver rendering not meeting the normal thresholds will trigger Android CTS
-failures, we treat them as failures and track them as expected failures the
-```*-fails.txt`` file.`
+This binary will generate the expected `unittests.txt` for the target GPU, so
+ideally it should be executed on every SkQP update and when a new device
+receives SkQP CI jobs.
+
+1. Generate target unit tests for the current GPU with :code:`./list_gpu_unit_tests > unittests.txt`
+
+2. Run SkQP job
+
+3. If there is a failing or crashing unit test, remove it from the corresponding `unittests.txt`
+
+4. If there is a crashing render test, remove it from the corresponding `rendertests.txt`
+
+5. If there is a failing render test, visually inspect the result from the HTML report
+    - If the render result is OK, update the max error count for that test
+    - Otherwise, or put `-1` in the same threshold, as seen in :ref:`rendertests-design`
+
+6. Remember to put the new tests files to the locations cited in :ref:`test-location`

docs/codingstyle.rst

@@ -36,7 +36,7 @@ Basic formatting guidelines
 
 -  Use comments wherever you think it would be helpful for other
    developers. Several specific cases and style examples follow. Note
-   that we roughly follow `Doxygen <https://www.doxygen.nl>`__
+   that we roughly follow `Doxygen <http://www.doxygen.nl>`__
    conventions.
 
    Single-line comments: