bump version for 20.3-rc1

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

@@ -1,81 +0,0 @@
-#!/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
-
-# Test rendering with the gmem path forced when possible (~1 minute)
-if ! env \
-  DEQP_RESULTS_DIR=results/gmem \
-  DEQP_VER=gles31 \
-  DEQP_FRACTION=5 \
-  FD_MESA_DEBUG=nobypass \
-  /install/deqp-runner.sh; then
-    EXIT=1
-fi
-
-# Test rendering with the bypass path forced when possible (~1 minute)
-if ! env \
-  DEQP_RESULTS_DIR=results/bypass \
-  DEQP_VER=gles31 \
-  DEQP_FRACTION=5 \
-  FD_MESA_DEBUG=nogmem \
-  GPU_VERSION=freedreno-a630-bypass \
-  /install/deqp-runner.sh; then
-    EXIT=1
-fi
-
-# Test rendering with the UBO-to-constants optimization disabled (~1 minute)
-if ! env \
-  DEQP_RESULTS_DIR=results/nouboopt \
-  DEQP_VER=gles31 \
-  IR3_SHADER_DEBUG=nouboopt \
-  DEQP_CASELIST_FILTER="functional.*ubo" \
-  /install/deqp-runner.sh; then
-    EXIT=1
-fi
-
-# gles3-565nozs mustpass (~20s)
-if ! env \
-  DEQP_RESULTS_DIR=results/gles3-565nozs \
-  DEQP_VER=gles3 \
-  DEQP_CONFIG="rgb565d0s0ms0" \
-  DEQP_VARIANT="565-no-depth-no-stencil" \
-  /install/deqp-runner.sh; then
-    EXIT=1
-fi
-
-# gles31-565nozs mustpass (~1s)
-if ! env \
-  DEQP_RESULTS_DIR=results/gles31-565nozs \
-  DEQP_VER=gles31 \
-  DEQP_CONFIG="rgb565d0s0ms0" \
-  DEQP_VARIANT="565-no-depth-no-stencil" \
-  /install/deqp-runner.sh; then
-    EXIT=1
-fi
-
-# gles3-multisample mustpass -- disabled pending https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/1859
-# if ! env \
-#   DEQP_RESULTS_DIR=results/gles3-multisample \
-#   DEQP_VER=gles3 \
-#   DEQP_CONFIG="rgba8888d24s8ms4" \
-#   DEQP_VARIANT="multisample" \
-#   /install/deqp-runner.sh; then
-#     EXIT=1
-# fi
-
-# gles31-multisample mustpass -- disabled pending https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/1859
-# if ! env \
-#   DEQP_RESULTS_DIR=results/gles31-multisample \
-#   DEQP_VER=gles31 \
-#   DEQP_CONFIG="rgba8888d24s8ms4" \
-#   DEQP_VARIANT="multisample" \
-#   /install/deqp-runner.sh; then
-#     EXIT=1
-# fi
-
-exit $EXIT

.gitlab-ci/bare-metal/cros_servo_run.py

@@ -114,12 +114,6 @@ class CrosServoRun:
                     print("Detected intermittent tftp failure, restarting run...")
                     return 2
 
-            # There are very infrequent bus errors during power management transitions
-            # on cheza, which we don't expect to be the case on future boards.
-            if re.search("Kernel panic - not syncing: Asynchronous SError Interrupt", line):
-                print("Detected cheza power management bus error, restarting run...")
-                return 2
-
             result = re.search("bare-metal result: (\S*)", line)
             if result:
                 if result.group(1) == "pass":

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

@@ -64,18 +64,10 @@ rsync -a --delete $BM_ROOTFS/ rootfs/
 
 # Finally, pack it up into a cpio rootfs.  Skip the vulkan CTS since none of
 # these devices use it and it would take up space in the initrd.
-
-if [ -n "$PIGLIT_PROFILES" ]; then
-  EXCLUDE_FILTER="deqp|arb_gpu_shader5|arb_gpu_shader_fp64|arb_gpu_shader_int64|glsl-4.[0123456]0|arb_tessellation_shader"
-else
-  EXCLUDE_FILTER="piglit|python"
-fi
-
 pushd rootfs
 find -H | \
   egrep -v "external/(openglcts|vulkancts|amber|glslang|spirv-tools)" |
-  egrep -v "traces-db|apitrace|renderdoc" | \
-  egrep -v $EXCLUDE_FILTER | \
+  egrep -v "traces-db|apitrace|renderdoc|python" | \
   cpio -H newc -o | \
   xz --check=crc32 -T4 - > $CI_PROJECT_DIR/rootfs.cpio.gz
 popd

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

@@ -11,8 +11,6 @@ mount -t tmpfs tmpfs /tmp
 
 . /set-job-env-vars.sh
 
-[ -z "$BM_KERNEL_MODULES" ] || modprobe "$BM_KERNEL_MODULES"
-
 # Store Mesa's disk cache under /tmp, rather than sending it out over NFS.
 export XDG_CACHE_HOME=/tmp
 

.gitlab-ci/bare-metal/poe-off

@@ -1,8 +0,0 @@
-#!/bin/bash
-
-if [ -z "$BM_POE_INTERFACE" ]; then
-    echo "Must supply the PoE Interface to power off"
-    exit 1
-fi
-
-flock /var/run/poe.lock -c "$CI_PROJECT_DIR/install/bare-metal/poe-set $BM_POE_INTERFACE off"

.gitlab-ci/bare-metal/poe-on

@@ -1,8 +0,0 @@
-#!/bin/bash
-
-if [ -z "$BM_POE_INTERFACE" ]; then
-    echo "Must supply the PoE Interface to power up"
-    exit 1
-fi
-
-flock /var/run/poe.lock -c "$CI_PROJECT_DIR/install/bare-metal/poe-set $BM_POE_INTERFACE reset"

.gitlab-ci/bare-metal/poe-powered.sh

@@ -1,118 +0,0 @@
-#!/bin/bash
-
-# Boot script for devices attached to a PoE switch, using NFS for the root
-# filesystem.
-
-# We're run from the root of the repo, make a helper var for our paths
-BM=$CI_PROJECT_DIR/install/bare-metal
-
-# Runner config checks
-if [ -z "$BM_SERIAL" ]; then
-  echo "Must set BM_SERIAL in your gitlab-runner config.toml [[runners]] environment"
-  echo "This is the serial port to listen the device."
-  exit 1
-fi
-
-if [ -z "$BM_POE_ADDRESS" ]; then
-  echo "Must set BM_POE_ADDRESS in your gitlab-runner config.toml [[runners]] environment"
-  echo "This is the PoE switch address to connect for powering up/down devices."
-  exit 1
-fi
-
-if [ -z "$BM_POE_USERNAME" ]; then
-  echo "Must set BM_POE_USERNAME in your gitlab-runner config.toml [[runners]] environment"
-  echo "This is the PoE switch username."
-  exit 1
-fi
-
-if [ -z "$BM_POE_PASSWORD" ]; then
-  echo "Must set BM_POE_PASSWORD in your gitlab-runner config.toml [[runners]] environment"
-  echo "This is the PoE switch password."
-  exit 1
-fi
-
-if [ -z "$BM_POE_INTERFACE" ]; then
-  echo "Must set BM_POE_INTERFACE in your gitlab-runner config.toml [[runners]] environment"
-  echo "This is the PoE switch interface where the device is connected."
-  exit 1
-fi
-
-if [ -z "$BM_POWERUP" ]; then
-  echo "Must set BM_POWERUP in your gitlab-runner config.toml [[runners]] environment"
-  echo "This is a shell script that should power up the device and begin its boot sequence."
-  exit 1
-fi
-
-if [ -z "$BM_POWERDOWN" ]; then
-  echo "Must set BM_POWERDOWN in your gitlab-runner config.toml [[runners]] environment"
-  echo "This is a shell script that should power off the device."
-  exit 1
-fi
-
-if [ ! -d /nfs ]; then
-  echo "NFS rootfs directory needs to be mounted at /nfs by the gitlab runner"
-  exit 1
-fi
-
-if [ ! -d /tftp ]; then
-  echo "TFTP directory for this board needs to be mounted at /tftp by the gitlab runner"
-  exit 1
-fi
-
-# job config checks
-if [ -z "$BM_ROOTFS" ]; then
-  echo "Must set BM_ROOTFS to your board's rootfs directory in the job's variables"
-  exit 1
-fi
-
-if [ -z "$BM_BOOTFS" ]; then
-  echo "Must set /boot files for the TFTP boot in the job's variables"
-  exit 1
-fi
-
-if [ -z "$BM_CMDLINE" ]; then
-  echo "Must set BM_CMDLINE to your board's kernel command line arguments"
-  exit 1
-fi
-
-set -ex
-
-# Clear out any previous run's artifacts.
-rm -rf results/
-mkdir -p results
-
-# Create the rootfs in the NFS directory.  rm to make sure it's in a pristine
-# state, since it's volume-mounted on the host.
-rsync -a --delete $BM_ROOTFS/ /nfs/
-
-[ -z $BM_ROOTFS_EXTRA ] || rsync -a $BM_ROOTFS_EXTRA/ /nfs/
-
-mkdir -p /nfs/results
-. $BM/rootfs-setup.sh /nfs
-
-rsync -a --delete $BM_BOOTFS/ /tftp/
-
-echo "$BM_CMDLINE" > /tftp/cmdline.txt
-
-set +e
-ATTEMPTS=2
-while [ $((ATTEMPTS--)) -gt 0 ]; do
-  python3 $BM/poe_run.py \
-          --dev="$BM_SERIAL" \
-          --powerup="$BM_POWERUP" \
-          --powerdown="$BM_POWERDOWN"
-  ret=$?
-
-  if [ $ret -eq 2 ]; then
-    echo "Did not detect boot sequence, retrying..."
-  else
-    ATTEMPTS=0
-  fi
-done
-set -e
-
-# Bring artifacts back from the NFS dir to the build dir where gitlab-runner
-# will look for them.
-cp -Rp /nfs/results/. results/
-
-exit $ret

.gitlab-ci/bare-metal/poe-set

@@ -1,42 +0,0 @@
-#!/usr/bin/expect -f
-set SWITCHSERVER $env(BM_POE_ADDRESS)
-set USERNAME $env(BM_POE_USERNAME)
-set PASSWORD $env(BM_POE_PASSWORD)
-
-set PORTNUMBER [lindex $argv 0]
-set POESTATUS [lindex $argv 1]
-
-log_user 0
-
-spawn telnet $SWITCHSERVER
-expect "Login"
-sleep 1
-send "$USERNAME\t$PASSWORD\r"
-expect "Menu"
-send "\x01"
-expect ">"
-send "lcli\r"
-expect "Name:"
-send "$USERNAME\r"
-expect "Password:"
-send "$PASSWORD\r"
-expect "#"
-send "configure\r"
-expect "(config)#"
-send "interface GE $PORTNUMBER\r"
-expect "(config-if)#"
-if { "$POESTATUS" == "off" } {
-   send "power inline never\r"
-} elseif { "$POESTATUS" == "on" } {
-   send "power inline auto\r"
-} elseif { "$POESTATUS" == "reset" } {
-   send "power inline never\r"
-   send "power inline auto\r"
-}
-expect "(config-if)#"
-send "exit\r"
-expect "(config)#"
-send "exit\r"
-expect "$#"
-send "exit\r"
-expect eof

.gitlab-ci/bare-metal/poe_run.py

@@ -1,90 +0,0 @@
-#!/usr/bin/env python3
-#
-# Copyright © 2020 Igalia, S.L.
-#
-# 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.
-
-import argparse
-import os
-import re
-from serial_buffer import SerialBuffer
-import sys
-import threading
-
-class PoERun:
-    def __init__(self, args):
-        self.powerup = args.powerup
-        self.powerdown = args.powerdown
-        self.ser = SerialBuffer(args.dev, "results/serial-output.txt", "", 60)
-
-    def logged_system(self, cmd):
-        print("Running '{}'".format(cmd))
-        return os.system(cmd)
-
-    def run(self):
-        if self.logged_system(self.powerup) != 0:
-            return 1
-
-        boot_detected = False
-        for line in self.ser.lines():
-            if re.search("Booting Linux", line):
-                boot_detected = True
-                break
-
-        if not boot_detected:
-            print("Something wrong; couldn't detect the boot start up sequence")
-            self.logged_system(self.powerdown)
-            return 2
-
-        for line in self.ser.lines():
-            if re.search("---. end Kernel panic", line):
-                return 1
-
-            # Binning memory problems
-            if re.search("binner overflow mem", line):
-                print("Memory overflow in the binner; GPU hang")
-                return 1
-
-            result = re.search("bare-metal result: (\S*)", line)
-            if result:
-                if result.group(1) == "pass":
-                    return 0
-                else:
-                    return 1
-
-        print("Reached the end of the CPU serial log without finding a result")
-        return 1
-
-def main():
-    parser = argparse.ArgumentParser()
-    parser.add_argument('--dev', type=str, help='Serial device to monitor', required=True)
-    parser.add_argument('--powerup', type=str, help='shell command for rebooting', required=True)
-    parser.add_argument('--powerdown', type=str, help='shell command for powering off', required=True)
-    args = parser.parse_args()
-
-    poe = PoERun(args)
-    retval = poe.run()
-
-    poe.logged_system(args.powerdown)
-
-    sys.exit(retval)
-
-if __name__ == '__main__':
-    main()

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

@@ -15,7 +15,6 @@ touch $rootfs_dst/set-job-env-vars.sh
 chmod +x $rootfs_dst/set-job-env-vars.sh
 for var in \
     BARE_METAL_TEST_SCRIPT \
-    BM_KERNEL_MODULES \
     CI_COMMIT_BRANCH \
     CI_COMMIT_TITLE \
     CI_JOB_JWT \
@@ -28,44 +27,30 @@ for var in \
     CI_PIPELINE_ID \
     CI_PROJECT_PATH \
     CI_RUNNER_DESCRIPTION \
-    CI_SERVER_URL \
     DEQP_CASELIST_FILTER \
     DEQP_CONFIG \
+    DEQP_EXPECTED_FAILS \
     DEQP_EXPECTED_RENDERER \
-    DEQP_FRACTION \
     DEQP_HEIGHT \
     DEQP_NO_SAVE_RESULTS \
+    DEQP_FLAKES \
     DEQP_PARALLEL \
     DEQP_RESULTS_DIR \
+    DEQP_SKIPS \
     DEQP_VARIANT \
     DEQP_VER \
     DEQP_WIDTH \
     DEVICE_NAME \
     DRIVER_NAME \
-    EGL_PLATFORM \
-    FDO_CI_CONCURRENT \
-    FDO_UPSTREAM_REPO \
     FD_MESA_DEBUG \
     FLAKES_CHANNEL \
-    GPU_VERSION \
     IR3_SHADER_DEBUG \
     MESA_GL_VERSION_OVERRIDE \
     MESA_GLSL_VERSION_OVERRIDE \
     MESA_GLES_VERSION_OVERRIDE \
-    MINIO_HOST \
     NIR_VALIDATE \
-    PIGLIT_HTML_SUMMARY \
-    PIGLIT_JUNIT_RESULTS \
-    PIGLIT_OPTIONS \
-    PIGLIT_PLATFORM \
-    PIGLIT_PROFILES \
-    PIGLIT_REPLAY_ARTIFACTS_BASE_URL \
-    PIGLIT_REPLAY_DESCRIPTION_FILE \
-    PIGLIT_REPLAY_DEVICE_NAME \
-    PIGLIT_REPLAY_EXTRA_ARGS \
-    PIGLIT_REPLAY_REFERENCE_IMAGES_BASE_URL \
-    PIGLIT_REPLAY_UPLOAD_TO_MINIO \
-    PIGLIT_RESULTS \
+    TRACIE_NO_UNIT_TESTS \
+    TRACIE_UPLOAD_TO_MINIO \
     TU_DEBUG \
     VK_DRIVER \
     ; do

.gitlab-ci/bare-metal/serial_buffer.py

@@ -30,20 +30,19 @@ import time
 
 
 class SerialBuffer:
-    def __init__(self, dev, filename, prefix, timeout = None):
+    def __init__(self, dev, filename, prefix):
         self.filename = filename
         self.dev = dev
 
         if dev:
             self.f = open(filename, "wb+")
-            self.serial = serial.Serial(dev, 115200, timeout=timeout if timeout else 10)
+            self.serial = serial.Serial(dev, 115200, timeout=10)
         else:
             self.f = open(filename, "rb")
 
         self.byte_queue = queue.Queue()
         self.line_queue = queue.Queue()
         self.prefix = prefix
-        self.timeout = timeout
         self.sentinel = object()
 
         if self.dev:
@@ -59,19 +58,14 @@ class SerialBuffer:
         self.lines_thread.start()
 
     # Thread that just reads the bytes from the serial device to try to keep from
-    # buffer overflowing it. If nothing is received in 1 minute, it finalizes.
+    # buffer overflowing it.
     def serial_read_thread_loop(self):
         greet = "Serial thread reading from %s\n" % self.dev
         self.byte_queue.put(greet.encode())
 
         while True:
             try:
-                b = self.serial.read()
-                if len(b) > 0:
-                    self.byte_queue.put(b)
-                elif self.timeout:
-                    self.byte_queue.put(self.sentinel)
-                    break
+                self.byte_queue.put(self.serial.read())
             except Exception as err:
                 print(self.prefix + str(err))
                 self.byte_queue.put(self.sentinel)

.gitlab-ci/build-apitrace.sh

@@ -9,7 +9,7 @@ WAFFLE_VERSION="e3c995d9a2693b687501715b6550619922346089"
 git clone https://gitlab.freedesktop.org/mesa/waffle.git --single-branch --no-checkout /waffle
 pushd /waffle
 git checkout "$WAFFLE_VERSION"
-cmake -S . -B _build -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_BUILD_TYPE=Release $EXTRA_CMAKE_ARGS
+cmake -B_build -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_BUILD_TYPE=Release $EXTRA_CMAKE_ARGS .
 make -C _build install
 mkdir -p build/lib build/bin
 cp _build/lib/libwaffle-1.so build/lib/libwaffle-1.so.0
@@ -26,7 +26,7 @@ git checkout "$APITRACE_VERSION"
 # Note: The cmake stuff for waffle in apitrace fails to use waffle's library
 # directory.  Just force the issue here.
 env LDFLAGS="-L/usr/local/lib" \
-    cmake -S . -B _build -G Ninja -DCMAKE_BUILD_TYPE=Release -DENABLE_GUI=False -DENABLE_WAFFLE=on -DWaffle_DIR=/usr/local/lib/cmake/Waffle/ $EXTRA_CMAKE_ARGS
+    cmake -G Ninja -B_build -H. -DCMAKE_BUILD_TYPE=Release -DENABLE_GUI=False -DENABLE_WAFFLE=on -DWaffle_DIR=/usr/local/lib/cmake/Waffle/ $EXTRA_CMAKE_ARGS
 ninja -C _build
 mkdir build
 cp _build/apitrace build

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

@@ -4,6 +4,6 @@ set -ex
 
 cargo install deqp-runner \
   -j ${FDO_CI_CONCURRENT:-4} \
-  --version 0.4.0 \
+  --version 0.1.5 \
   --root /usr/local \
   $EXTRA_CARGO_ARGS

.gitlab-ci/build-deqp.sh

@@ -6,11 +6,14 @@ git config --global user.email "mesa@example.com"
 git config --global user.name "Mesa CI"
 git clone \
     https://github.com/KhronosGroup/VK-GL-CTS.git \
-    -b vulkan-cts-1.2.5.0 \
-    --depth 1 \
+    -b vulkan-cts-1.2.3.2 \
     /VK-GL-CTS
 pushd /VK-GL-CTS
 
+# cherry-pick fix for surfaceless config choosing:
+git cherry-pick -x 8f3bfc6c7def0c0cb452d5dadf31aa7fef242365
+
+
 # --insecure is due to SSL cert failures hitting sourceforge for zlib and
 # libpng (sigh).  The archives get their checksums checked anyway, and git
 # always goes through ssh or https.
@@ -23,10 +26,11 @@ cp doc/testlog-stylesheet/testlog.{css,xsl} /deqp
 popd
 
 pushd /deqp
-cmake -S /VK-GL-CTS -B . -G Ninja \
+cmake -G Ninja \
       -DDEQP_TARGET=${DEQP_TARGET:-x11_glx} \
       -DCMAKE_BUILD_TYPE=Release \
-      $EXTRA_CMAKE_ARGS
+      $EXTRA_CMAKE_ARGS \
+      /VK-GL-CTS
 ninja
 
 # Copy out the mustpass lists we want.

.gitlab-ci/build-fossilize.sh

@@ -8,7 +8,7 @@ git checkout 6b5b570008c9ab5269e341f04c811fe49a1bb72c
 git submodule update --init
 mkdir build
 cd build
-cmake -S .. -B . -G Ninja -DCMAKE_BUILD_TYPE=Release
+cmake .. -DCMAKE_BUILD_TYPE=Release -G Ninja
 ninja -C . install
 cd ../..
 rm -rf Fossilize

.gitlab-ci/build-gfxreconstruct.sh

@@ -11,7 +11,7 @@ pushd /gfxreconstruct
 git checkout "$GFXRECONSTRUCT_VERSION"
 git submodule update --init
 git submodule update
-cmake -S . -B _build -G Ninja -DCMAKE_BUILD_TYPE=Release
+cmake -G Ninja -B_build -H. -DCMAKE_BUILD_TYPE=Release
 ninja -C _build gfxrecon-replay gfxrecon-info
 mkdir -p build/bin
 install _build/tools/replay/gfxrecon-replay build/bin

.gitlab-ci/build-libclc.sh

@@ -8,7 +8,7 @@ $LLVM_CONFIG --version
 
 git clone https://github.com/KhronosGroup/SPIRV-LLVM-Translator -b llvm_release_100 --depth 1 /SPIRV-LLVM-Translator
 pushd /SPIRV-LLVM-Translator
-cmake -S . -B . -G Ninja -DLLVM_BUILD_TOOLS=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS=-fPIC -DCMAKE_CXX_FLAGS=-fPIC -DCMAKE_INSTALL_PREFIX=`$LLVM_CONFIG --prefix`
+cmake -G Ninja -DLLVM_BUILD_TOOLS=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS=-fPIC -DCMAKE_CXX_FLAGS=-fPIC -DCMAKE_INSTALL_PREFIX=`$LLVM_CONFIG --prefix`
 ninja
 ninja install
 popd
@@ -23,7 +23,7 @@ git clone \
 
 mkdir /libclc
 pushd /libclc
-cmake -S /llvm-project/libclc -B . -G Ninja -DLLVM_CONFIG=$LLVM_CONFIG -DLIBCLC_TARGETS_TO_BUILD="spirv-mesa3d-;spirv64-mesa3d-" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr
+cmake -G Ninja -DLLVM_CONFIG=$LLVM_CONFIG -DLIBCLC_TARGETS_TO_BUILD="spirv-mesa3d-;spirv64-mesa3d-" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr /llvm-project/libclc
 ninja
 ninja install
 popd

.gitlab-ci/build-piglit.sh

@@ -8,20 +8,10 @@ fi
 
 git clone https://gitlab.freedesktop.org/mesa/piglit.git --single-branch --no-checkout /piglit
 pushd /piglit
-git checkout c702d2bbf28b01a18ce613f386a4ffef03f6c0c9
+git checkout 404862743cf8a7b37a4e3a93b4ba1858d59cd4ab
 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
+cmake -G Ninja -DCMAKE_BUILD_TYPE=Release $PIGLIT_OPTS
+ninja
 find -name .git -o -name '*ninja*' -o -iname '*cmake*' -o -name '*.[chao]' | xargs rm -rf
 rm -rf target_api
-if [ "x$PIGLIT_BUILD_TARGETS" = "xpiglit_replayer" ]; then
-    find ! -regex "^\.$" \
-         ! -regex "^\.\/piglit.*" \
-         ! -regex "^\.\/framework.*" \
-         ! -regex "^\.\/bin$" \
-         ! -regex "^\.\/bin\/replayer\.py" \
-         ! -regex "^\.\/templates.*" \
-         ! -regex "^\.\/tests$" \
-         ! -regex "^\.\/tests\/replay\.py" 2>/dev/null | xargs rm -rf
-fi
 popd

.gitlab-ci/build-renderdoc.sh

@@ -7,7 +7,7 @@ RENDERDOC_VERSION=da02e88201dc3b64316fc33ce6ff69cc729689aa
 git clone https://github.com/baldurk/renderdoc.git --single-branch --no-checkout /renderdoc
 pushd /renderdoc
 git checkout "$RENDERDOC_VERSION"
-cmake -S . -B _build -G Ninja -DENABLE_QRENDERDOC=false -DCMAKE_BUILD_TYPE=Release $EXTRA_CMAKE_ARGS
+cmake -G Ninja -B_build -H. -DENABLE_QRENDERDOC=false -DCMAKE_BUILD_TYPE=Release $EXTRA_CMAKE_ARGS
 ninja -C _build
 mkdir -p build/lib
 ${STRIP_CMD:-strip} _build/lib/*.so

.gitlab-ci/build-spirv-tools.sh

@@ -7,7 +7,7 @@ pushd SPIRV-Tools
 pushd external
 git clone --depth 1 https://github.com/KhronosGroup/SPIRV-Headers
 popd
-cmake -S . -B _build -G Ninja -DCMAKE_BUILD_TYPE=Release
+cmake -G Ninja -B_build -H. -DCMAKE_BUILD_TYPE=Release
 ninja -C _build
 ninja -C _build install
 popd

.gitlab-ci/build-vulkantools.sh

@@ -10,7 +10,7 @@ git checkout "$VULKANTOOLS_VERSION"
 ./update_external_sources.sh
 mkdir _build
 ./scripts/update_deps.py --dir=_build --config=release --generator=Ninja
-cmake -S . -B _build -G Ninja \
+cmake -G Ninja -B_build -H. \
       -DCMAKE_BUILD_TYPE=Release \
       -DCMAKE_INSTALL_PREFIX=/VulkanTools/build \
       -DBUILD_TESTS=OFF \

.gitlab-ci/container/arm_build.sh

@@ -26,27 +26,13 @@ apt-get -y install \
 	libdrm-dev \
 	libelf-dev \
 	libexpat1-dev \
-	libx11-dev \
-	libx11-xcb-dev \
-	libxcb-dri2-0-dev \
-	libxcb-dri3-dev \
-	libxcb-glx0-dev \
-	libxcb-present-dev \
-	libxcb-randr0-dev \
-	libxcb-shm0-dev \
-	libxcb-xfixes0-dev \
-	libxdamage-dev \
-	libxext-dev \
-	libxrandr-dev \
-	libxshmfence-dev \
-	libxxf86vm-dev \
 	llvm-8-dev \
 	pkg-config \
 	python \
 	python3-mako \
 	python3-pil \
-	python3-pip \
 	python3-requests \
+	python3-pip \
 	python3-setuptools \
 	unzip \
 	wget \

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

@@ -18,22 +18,20 @@ apt-get install -y --no-remove \
         ccache \
         cmake \
         cpio \
+        g++ \
         debootstrap \
-        expect \
         fastboot \
         flex \
-        g++ \
         git \
         netcat \
         nginx-full \
-        pkg-config \
-        procps \
         python3-distutils \
         python3-minimal \
         python3-serial \
         python3.7 \
+        pkg-config \
+        procps \
         rsync \
-        telnet \
         u-boot-tools \
         unzip
 

.gitlab-ci/container/armhf_test.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-arch=armhf
-
-INCLUDE_PIGLIT=1
-
-. .gitlab-ci/container/baremetal_build.sh

.gitlab-ci/container/baremetal_build.sh

@@ -5,8 +5,6 @@ set -o xtrace
 
 ROOTFS=/lava-files/rootfs-${arch}
 
-INCLUDE_PIGLIT=1
-
 dpkg --add-architecture $arch
 apt-get update
 
@@ -16,8 +14,8 @@ BAREMETAL_EPHEMERAL=" \
         automake \
         crossbuild-essential-$arch \
         git-lfs \
-        libboost-dev:$arch \
         libdrm-dev:$arch \
+        libboost-dev:$arch \
         libegl1-mesa-dev:$arch \
         libelf-dev:$arch \
         libexpat1-dev:$arch \
@@ -30,11 +28,10 @@ BAREMETAL_EPHEMERAL=" \
         libpython3-dev:$arch \
         libstdc++6:$arch \
         libtinfo-dev:$arch \
-        libudev-dev:$arch \
+        libegl1-mesa-dev:$arch \
         libvulkan-dev:$arch \
-        libwaffle-dev:$arch \
         libxcb-keysyms1-dev:$arch \
-        libxkbcommon-dev:$arch \
+        libpython3-dev:$arch \
         python3-dev \
         qt5-default \
         qt5-qmake \

.gitlab-ci/container/cross_build.sh

@@ -21,21 +21,6 @@ apt-get install -y --no-remove \
         libffi-dev:$arch \
         libstdc++6:$arch \
         libtinfo-dev:$arch \
-        libvulkan-dev:$arch \
-        libx11-dev:$arch \
-        libx11-xcb-dev:$arch \
-        libxcb-dri2-0-dev:$arch \
-        libxcb-dri3-dev:$arch \
-        libxcb-glx0-dev:$arch \
-        libxcb-present-dev:$arch \
-        libxcb-randr0-dev:$arch \
-        libxcb-shm0-dev:$arch \
-        libxcb-xfixes0-dev:$arch \
-        libxdamage-dev:$arch \
-        libxext-dev:$arch \
-        libxrandr-dev:$arch \
-        libxshmfence-dev:$arch \
-        libxxf86vm-dev:$arch \
         wget
 
 if [[ $arch == "armhf" ]]; then

.gitlab-ci/container/lava_build.sh

@@ -5,14 +5,14 @@ set -o xtrace
 
 check_minio()
 {
-    MINIO_PATH="${MINIO_HOST}/mesa-lava/$1/${DISTRIBUTION_TAG}/${DEBIAN_ARCH}"
+    MINIO_PATH="minio-packet.freedesktop.org/mesa-lava/$1/${DISTRIBUTION_TAG}/${DEBIAN_ARCH}"
     if wget -q --method=HEAD "https://${MINIO_PATH}/done"; then
         exit
     fi
 }
 
 # If remote files are up-to-date, skip rebuilding them
-check_minio "${FDO_UPSTREAM_REPO}"
+check_minio "mesa/mesa"
 check_minio "${CI_PROJECT_PATH}"
 
 . .gitlab-ci/container/container_pre_build.sh
@@ -60,10 +60,11 @@ fi
 
 apt-get update
 apt-get install -y automake \
+                   git \
                    bc \
                    cmake \
+                   wget \
                    debootstrap \
-                   git \
                    libboost-dev \
                    libegl1-mesa-dev \
                    libgbm-dev \
@@ -73,62 +74,43 @@ apt-get install -y automake \
                    libpython3-dev \
                    libssl-dev \
                    libvulkan-dev \
-                   libwaffle-dev \
                    libxcb-keysyms1-dev \
-                   libxkbcommon-dev \
-                   patch \
                    python3-dev \
                    python3-distutils \
-                   python3-mako \
-                   python3-numpy \
                    python3-serial \
                    qt5-default \
                    qt5-qmake \
-                   qtbase5-dev \
-                   wget
+                   qtbase5-dev
 
 
 if [[ "$DEBIAN_ARCH" = "armhf" ]]; then
-    apt-get install -y libboost-dev:armhf \
-                       libegl1-mesa-dev:armhf \
-                       libelf-dev:armhf \
-                       libgbm-dev:armhf \
-                       libgles2-mesa-dev:armhf \
-                       libpcre3-dev:armhf \
-                       libpng-dev:armhf \
-                       libpython3-dev:armhf \
-                       libvulkan-dev:armhf \
-                       libwaffle-dev:armhf \
-                       libxcb-keysyms1-dev:armhf \
-                       libxkbcommon-dev:armhf \
-                       qtbase5-dev:armhf
+	apt-get install -y libboost-dev:armhf \
+		libegl1-mesa-dev:armhf \
+		libelf-dev:armhf \
+		libgbm-dev:armhf \
+		libgles2-mesa-dev:armhf \
+		libpcre3-dev:armhf \
+		libpng-dev:armhf \
+		libpython3-dev:armhf \
+		libvulkan-dev:armhf \
+		libxcb-keysyms1-dev:armhf \
+               qtbase5-dev:armhf
 fi
 
-
-############### Building
-STRIP_CMD="${GCC_ARCH}-strip"
-mkdir -p /lava-files/rootfs-${DEBIAN_ARCH}
-
-
 ############### Build dEQP runner
+
 . .gitlab-ci/build-deqp-runner.sh
 mkdir -p /lava-files/rootfs-${DEBIAN_ARCH}/usr/bin
 mv /usr/local/bin/deqp-runner /lava-files/rootfs-${DEBIAN_ARCH}/usr/bin/.
 
 
 ############### Build dEQP
+STRIP_CMD="${GCC_ARCH}-strip"
 DEQP_TARGET=surfaceless . .gitlab-ci/build-deqp.sh
 
 mv /deqp /lava-files/rootfs-${DEBIAN_ARCH}/.
 
 
-############### Build piglit
-if [ -n "$INCLUDE_PIGLIT" ]; then
-    . .gitlab-ci/build-piglit.sh
-    mv /piglit /lava-files/rootfs-${DEBIAN_ARCH}/.
-fi
-
-
 ############### Build apitrace
 . .gitlab-ci/build-apitrace.sh
 mkdir -p /lava-files/rootfs-${DEBIAN_ARCH}/apitrace
@@ -151,6 +133,9 @@ rm -rf /renderdoc
 ############### Build libdrm
 EXTRA_MESON_ARGS+=" -D prefix=/libdrm"
 . .gitlab-ci/build-libdrm.sh
+mkdir -p /lava-files/rootfs-${DEBIAN_ARCH}/usr/lib/$GCC_ARCH
+find /libdrm/ -name lib\*\.so\* | xargs cp -t /lava-files/rootfs-${DEBIAN_ARCH}/usr/lib/$GCC_ARCH/.
+rm -rf /libdrm
 
 
 ############### Cross-build kernel
@@ -158,6 +143,9 @@ mkdir -p kernel
 wget -qO- ${KERNEL_URL} | tar -xz --strip-components=1 -C kernel
 pushd kernel
 
+############### Delete rust, since the tests won't be compiling anything.
+rm -rf /root/.rustup /root/.cargo
+
 # The kernel doesn't like the gold linker (or the old lld in our debians).
 # Sneak in some override symlinks during kernel build until we can update
 # debian (they'll get blown away by the rm of the kernel dir at the end).
@@ -168,14 +156,8 @@ for i in /usr/bin/*-ld /usr/bin/ld; do
 done
 export PATH=`pwd`/ld-links:$PATH
 
-if [ -n "$INSTALL_KERNEL_MODULES" ]; then
-    # Disable all modules in defconfig, so we only build the ones we want
-    sed -i 's/=m/=n/g' ${DEFCONFIG}
-fi
-
-# Force db410c to host mode instead of OTG (which is otherwise selected by
-# default due to our micro cable for fastboot)
-sed -i 's/dr_mode = "otg"/dr_mode = "host"/' arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi
+# Disable all modules in defconfig, so we only build the ones we want
+sed -i 's/=m/=n/g' ${DEFCONFIG}
 
 ./scripts/kconfig/merge_config.sh ${DEFCONFIG} ../.gitlab-ci/${KERNEL_ARCH}.config
 make ${KERNEL_IMAGE_NAME}
@@ -188,10 +170,8 @@ if [[ -n ${DEVICE_TREES} ]]; then
     cp ${DEVICE_TREES} /lava-files/.
 fi
 
-if [ -n "$INSTALL_KERNEL_MODULES" ]; then
-    make modules
-    INSTALL_MOD_PATH=/lava-files/rootfs-${DEBIAN_ARCH}/ make modules_install
-fi
+make modules
+INSTALL_MOD_PATH=/lava-files/rootfs-${DEBIAN_ARCH}/ make modules_install
 
 if [[ ${DEBIAN_ARCH} = "arm64" ]] && which mkimage > /dev/null; then
     make Image.lzma
@@ -208,9 +188,6 @@ fi
 popd
 rm -rf kernel
 
-############### Delete rust, since the tests won't be compiling anything.
-rm -rf /root/.rustup /root/.cargo
-
 ############### Create rootfs
 set +e
 debootstrap \
@@ -226,24 +203,12 @@ set -e
 
 cp .gitlab-ci/create-rootfs.sh /lava-files/rootfs-${DEBIAN_ARCH}/.
 cp .gitlab-ci/container/llvm-snapshot.gpg.key /lava-files/rootfs-${DEBIAN_ARCH}/.
-chroot /lava-files/rootfs-${DEBIAN_ARCH} \
-    sh -c "INCLUDE_PIGLIT=$INCLUDE_PIGLIT sh /create-rootfs.sh"
+chroot /lava-files/rootfs-${DEBIAN_ARCH} sh /create-rootfs.sh
 rm /lava-files/rootfs-${DEBIAN_ARCH}/create-rootfs.sh
 rm /lava-files/rootfs-${DEBIAN_ARCH}/llvm-snapshot.gpg.key
-
-
-############### Install the built libdrm
-# Dependencies pulled during the creation of the rootfs may overwrite
-# the built libdrm. Hence, we add it after the rootfs has been already
-# created.
-mkdir -p /lava-files/rootfs-${DEBIAN_ARCH}/usr/lib/$GCC_ARCH
-find /libdrm/ -name lib\*\.so\* | xargs cp -t /lava-files/rootfs-${DEBIAN_ARCH}/usr/lib/$GCC_ARCH/.
-rm -rf /libdrm
-
-
 du -ah /lava-files/rootfs-${DEBIAN_ARCH} | sort -h | tail -100
 pushd /lava-files/rootfs-${DEBIAN_ARCH}
-  tar czf /lava-files/lava-rootfs.tgz .
+  tar cvzf /lava-files/lava-rootfs.tgz .
 popd
 
 if [ ${DEBIAN_ARCH} = arm64 ]; then

.gitlab-ci/container/ppc64el_build.sh

@@ -3,3 +3,6 @@
 arch=ppc64el
 
 . .gitlab-ci/container/cross_build.sh
+
+apt-get install -y --no-remove \
+        libvulkan-dev:$arch

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

@@ -7,7 +7,11 @@ export DEBIAN_FRONTEND=noninteractive
 
 apt-get install -y \
         ca-certificates \
-        gnupg
+        gnupg \
+        python3-pip \
+        python3-setuptools \
+        unzip \
+        wget
 
 # Upstream LLVM package repository
 apt-key add .gitlab-ci/container/llvm-snapshot.gpg.key
@@ -17,14 +21,6 @@ echo "deb https://apt.llvm.org/buster/ llvm-toolchain-buster-10 main" >/etc/apt/
 sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list
 echo 'deb https://deb.debian.org/debian buster-backports main' >/etc/apt/sources.list.d/backports.list
 
-# Ephemeral packages (installed for this script and removed again at
-# the end)
-STABLE_EPHEMERAL=" \
-        python3-pip \
-        python3-setuptools \
-        unzip \
-        "
-
 apt-get update
 
 apt-get install -y --no-remove \
@@ -39,8 +35,8 @@ apt-get install -y --no-remove \
         gcc \
         git \
         kmod \
-        libclang-10-dev \
         libclang-9-dev \
+        libclang-10-dev \
         libclc-dev \
         libelf-dev \
         libepoxy-dev \
@@ -54,6 +50,7 @@ apt-get install -y --no-remove \
         libvulkan-dev \
         libx11-dev \
         libx11-xcb-dev \
+        libxdamage-dev \
         libxext-dev \
         libxml2-utils \
         libxrandr-dev \
@@ -62,17 +59,17 @@ apt-get install -y --no-remove \
         libxvmc-dev \
         libxxf86vm-dev \
         libz-mingw-w64-dev \
-        llvm-10-dev \
         llvm-9-dev \
+        llvm-10-dev \
         pkg-config \
         python-mako \
         python3-mako \
         python3-pil \
+        python3-pip \
         python3-requests \
+        python3-setuptools \
         qemu-user \
         scons \
-        valgrind \
-        wget \
         wine64-development \
         x11proto-dri2-dev \
         x11proto-gl-dev \
@@ -98,7 +95,7 @@ rm bin/glslangValidator glslang-master-linux-Release.zip
 ############### Uninstall ephemeral packages
 
 apt-get purge -y \
-        $STABLE_EPHEMERAL \
-        gnupg
+        gnupg \
+        unzip
 
 . .gitlab-ci/container/container_post_build.sh

.gitlab-ci/container/x86_build.sh

@@ -26,7 +26,6 @@ apt-get update
 
 apt-get install -y --no-remove \
       $STABLE_EPHEMERAL \
-      libasan5 \
       libarchive-dev \
       libclang-cpp10-dev \
       liblua5.3-dev \
@@ -61,7 +60,7 @@ export           WAYLAND_RELEASES=https://wayland.freedesktop.org/releases
 export         XORGMACROS_VERSION=util-macros-1.19.0
 export           XCBPROTO_VERSION=xcb-proto-1.13
 export             LIBXCB_VERSION=libxcb-1.13
-export         LIBWAYLAND_VERSION=wayland-1.18.0
+export         LIBWAYLAND_VERSION=wayland-1.17.0
 export  WAYLAND_PROTOCOLS_VERSION=wayland-protocols-1.12
 
 wget $XORG_RELEASES/util/$XORGMACROS_VERSION.tar.bz2
@@ -105,7 +104,7 @@ rm -rf libglvnd-v$GLVND_VERSION
 
 git clone https://github.com/KhronosGroup/SPIRV-LLVM-Translator -b llvm_release_100 --depth 1
 pushd SPIRV-LLVM-Translator
-cmake -S . -B . -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS=-fPIC -DCMAKE_CXX_FLAGS=-fPIC
+cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS=-fPIC -DCMAKE_CXX_FLAGS=-fPIC
 ninja
 ninja install
 popd
@@ -117,15 +116,6 @@ cd shader-db
 make
 popd
 
-git clone https://github.com/microsoft/DirectX-Headers -b v1.0.1 --depth 1
-pushd DirectX-Headers
-mkdir build
-cd build
-meson .. --backend=ninja --buildtype=release -Dbuild-test=false
-ninja
-ninja install
-popd
-rm -rf DirectX-Headers
 
 ############### Uninstall the build software
 

.gitlab-ci/container/x86_build_old.sh

@@ -0,0 +1,69 @@
+#!/bin/bash
+
+set -e
+set -o xtrace
+
+export DEBIAN_FRONTEND=noninteractive
+
+apt-get install -y \
+      apt-transport-https \
+      ca-certificates
+
+sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list
+echo 'deb https://deb.debian.org/debian stretch-backports main' >/etc/apt/sources.list.d/backports.list
+
+apt-get update
+
+# Use newer packages from backports by default
+cat >/etc/apt/preferences <<EOF
+Package: *
+Pin: release a=stretch-backports
+Pin-Priority: 500
+EOF
+
+apt-get dist-upgrade -y
+
+apt-get install -y --no-remove \
+      bison \
+      bzip2 \
+      ccache \
+      flex \
+      g++ \
+      gcc \
+      git \
+      libclang-3.9-dev \
+      libclang-4.0-dev \
+      libclang-5.0-dev \
+      libclang-6.0-dev \
+      libclang-7-dev \
+      libclc-dev \
+      libdrm-dev \
+      libelf-dev \
+      libepoxy-dev \
+      libexpat1-dev \
+      libpng-dev \
+      libunwind-dev \
+      llvm-3.9-dev \
+      llvm-4.0-dev \
+      llvm-5.0-dev \
+      llvm-6.0-dev \
+      llvm-7-dev \
+      ninja-build \
+      pkg-config \
+      python-mako \
+      python3-mako \
+      python3-pip \
+      python3-setuptools \
+      python3-wheel \
+      scons \
+      xz-utils \
+      zlib1g-dev
+
+# We need at least 0.52.0, which is not in stretch
+python3 -m pip install meson>=0.52
+
+. .gitlab-ci/container/container_pre_build.sh
+
+############### Uninstall unused packages
+
+. .gitlab-ci/container/container_post_build.sh

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

@@ -17,15 +17,6 @@ echo "deb https://apt.llvm.org/buster/ llvm-toolchain-buster-10 main" >/etc/apt/
 sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list
 echo 'deb https://deb.debian.org/debian buster-backports main' >/etc/apt/sources.list.d/backports.list
 
-# Ephemeral packages (installed for this script and removed again at
-# the end)
-STABLE_EPHEMERAL=" \
-      python3-dev \
-      python3-pip \
-      python3-setuptools \
-      python3-wheel \
-      "
-
 apt-get update
 apt-get dist-upgrade -y
 
@@ -33,8 +24,8 @@ apt-get install -y --no-remove \
       git \
       git-lfs \
       libexpat1 \
-      libllvm10 \
       libllvm9 \
+      libllvm10 \
       liblz4-1 \
       libpcre32-3 \
       libpng16-16 \
@@ -43,8 +34,8 @@ apt-get install -y --no-remove \
       libwayland-client0 \
       libwayland-server0 \
       libxcb-ewmh2 \
-      libxcb-keysyms1 \
       libxcb-randr0 \
+      libxcb-keysyms1 \
       libxcb-xfixes0 \
       libxkbcommon0 \
       libxrandr2 \
@@ -66,15 +57,7 @@ apt-get install -y --no-remove \
       xvfb \
       zlib1g
 
-apt-get install -y --no-install-recommends \
-      $STABLE_EPHEMERAL
-
-# Needed for ci-fairy, this revision is able to upload files to MinIO
-# and doesn't depend on git
-pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@0f1abc24c043e63894085a6bd12f14263e8b29eb
-
 apt-get purge -y \
-      $STABLE_EPHEMERAL \
       gnupg
 
 apt-get autoremove -y --purge

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

@@ -37,14 +37,14 @@ STABLE_EPHEMERAL=" \
       "
 
 apt-get install -y --no-remove \
-      $STABLE_EPHEMERAL \
       clinfo \
       libclang-common-10-dev \
       libclang-cpp10 \
       libxcb-shm0 \
       ocl-icd-libopencl1 \
       python3-lxml \
-      python3-simplejson
+      python3-simplejson \
+      $STABLE_EPHEMERAL
 
 
 . .gitlab-ci/container/container_pre_build.sh

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

@@ -15,7 +15,6 @@ STABLE_EPHEMERAL=" \
       liblz4-dev \
       libpng-dev \
       libvulkan-dev \
-      libwaffle-dev \
       libxcb-ewmh-dev \
       libxkbcommon-dev \
       libxrandr-dev \
@@ -23,7 +22,6 @@ STABLE_EPHEMERAL=" \
       libzstd-dev \
       meson \
       p7zip \
-      patch \
       pkg-config \
       python3-distutils \
       wget \
@@ -32,14 +30,11 @@ STABLE_EPHEMERAL=" \
 # Unfortunately, gfxreconstruct needs the -dev packages:
 # https://github.com/LunarG/gfxreconstruct/issues/402
 apt-get install -y --no-remove \
-      $STABLE_EPHEMERAL \
       libwayland-dev \
       libx11-xcb-dev \
       libxcb-keysyms1-dev \
-      libxcb-shm0 \
       libxcb1-dev \
-      python3-lxml \
-      python3-simplejson
+      $STABLE_EPHEMERAL
 
 # We need multiarch for Wine
 dpkg --add-architecture i386
@@ -112,10 +107,6 @@ wine \
 
 . .gitlab-ci/container/container_pre_build.sh
 
-############### Build piglit
-
-PIGLIT_BUILD_TARGETS="piglit_replayer" . .gitlab-ci/build-piglit.sh
-
 ############### Build dEQP runner (and install rust temporarily for it)
 . .gitlab-ci/build-rust.sh
 . .gitlab-ci/build-deqp-runner.sh

.gitlab-ci/create-rootfs.sh

@@ -11,80 +11,42 @@ elif [ $DEBIAN_ARCH = amd64 ]; then
     echo "deb https://apt.llvm.org/buster/ llvm-toolchain-buster-10 main" >/etc/apt/sources.list.d/llvm10.list
     apt-get update
 
-    ARCH_PACKAGES="firmware-amd-graphics
-                   libelf1
+    ARCH_PACKAGES="libelf1
                    libllvm10
+                   libxcb-dri2-0
+                   libxcb-dri3-0
+                   libxcb-present0
+                   libxcb-sync1
+                   libxcb-xfixes0
+                   libxshmfence1
+                   firmware-amd-graphics
                   "
 fi
 
-if [ -n "$INCLUDE_VK_CTS" ]; then
-    VK_CTS_PACKAGES="libvulkan1"
-fi
-
-if [ -n "$INCLUDE_PIGLIT" ]; then
-    PIGLIT_PACKAGES="libwaffle-1-0
-                     libxkbcommon0
-                     python3-lxml
-                     python3-mako
-                     python3-numpy
-                     python3-simplejson
-                    "
-    INSTALL_CI_FAIRY_PACKAGES="git
-                               python3-dev
-                               python3-pip
-                               python3-setuptools
-                               python3-wheel
-                              "
-fi
-
 apt-get -y install --no-install-recommends \
-    $ARCH_PACKAGES \
-    $CI_FAIRY_PACKAGES \
-    $INSTALL_CI_FAIRY_PACKAGES \
-    $PIGLIT_PACKAGES \
-    $VK_CTS_PACKAGES \
     ca-certificates \
     curl \
     initramfs-tools \
-    libexpat1 \
     libpng16-16 \
-    libpython3.7 \
+    strace \
     libsensors5 \
-    libwaffle-1-0 \
+    libexpat1 \
     libx11-6 \
     libx11-xcb1 \
-    libxcb-dri2-0 \
-    libxcb-dri3-0 \
-    libxcb-glx0 \
-    libxcb-present0 \
-    libxcb-randr0 \
-    libxcb-shm0 \
-    libxcb-sync1 \
-    libxcb-xfixes0 \
-    libxdamage1 \
-    libxext6 \
-    libxfixes3 \
-    libxkbcommon0 \
-    libxshmfence1 \
-    libxxf86vm1 \
+    $ARCH_PACKAGES \
     netcat-openbsd \
     python3 \
+    libpython3.7 \
     python3-pil \
     python3-pytest \
     python3-requests \
     python3-yaml \
     sntp \
-    strace \
     wget \
     xz-utils
 
-if [ -n "$INCLUDE_PIGLIT" ]; then
-    # Needed for ci-fairy, this revision is able to upload files to
-    # MinIO and doesn't depend on git
-    pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@0f1abc24c043e63894085a6bd12f14263e8b29eb
-
-    apt-get purge -y \
-        $INSTALL_CI_FAIRY_PACKAGES
+if [ -n "$INCLUDE_VK_CTS" ]; then
+    apt-get install -y libvulkan1
 fi
 
 passwd root -d

.gitlab-ci/deqp-freedreno-a307-fails.txt

@@ -3,6 +3,7 @@ dEQP-GLES2.functional.clipping.line.wide_line_clip_viewport_corner,Fail
 dEQP-GLES2.functional.clipping.point.wide_point_clip,Fail
 dEQP-GLES2.functional.clipping.point.wide_point_clip_viewport_center,Fail
 dEQP-GLES2.functional.clipping.point.wide_point_clip_viewport_corner,Fail
+dEQP-GLES2.functional.clipping.triangle_vertex.clip_three.clip_neg_x_neg_z_and_pos_x_pos_z_and_neg_x_neg_y_pos_z,Fail
 dEQP-GLES2.functional.polygon_offset.fixed16_displacement_with_units,Fail
 dEQP-GLES2.functional.texture.filtering.2d.linear_nearest_clamp_l8_npot,Fail
 dEQP-GLES2.functional.texture.filtering.2d.linear_nearest_clamp_rgb888_npot,Fail
@@ -20,13 +21,461 @@ dEQP-GLES2.functional.texture.filtering.cube.nearest_linear_clamp_l8_npot,Fail
 dEQP-GLES2.functional.texture.filtering.cube.nearest_linear_clamp_rgb888_npot,Fail
 dEQP-GLES2.functional.texture.filtering.cube.nearest_linear_clamp_rgba4444_npot,Fail
 dEQP-GLES2.functional.texture.filtering.cube.nearest_linear_clamp_rgba8888_npot,Fail
+
+dEQP-GLES3.functional.clipping.line.wide_line_clip_viewport_center,Fail
+dEQP-GLES3.functional.clipping.line.wide_line_clip_viewport_corner,Fail
+dEQP-GLES3.functional.clipping.point.wide_point_clip,Fail
+dEQP-GLES3.functional.clipping.point.wide_point_clip_viewport_center,Fail
+dEQP-GLES3.functional.clipping.point.wide_point_clip_viewport_corner,Fail
+dEQP-GLES3.functional.draw.instancing.draw_arrays_instanced_grid_100x100,Fail
+dEQP-GLES3.functional.draw.instancing.draw_arrays_instanced_grid_32x32,Fail
 dEQP-GLES3.functional.draw.instancing.draw_elements_instanced_grid_100x100,Fail
+dEQP-GLES3.functional.draw.instancing.draw_elements_instanced_grid_32x32,Fail
+dEQP-GLES3.functional.draw.random.124,Fail
+dEQP-GLES3.functional.fbo.blit.depth_stencil.depth24_stencil8_basic,Fail
+dEQP-GLES3.functional.fbo.blit.depth_stencil.depth24_stencil8_scale,Fail
+dEQP-GLES3.functional.fbo.blit.depth_stencil.depth24_stencil8_stencil_only,Fail
+dEQP-GLES3.functional.fbo.blit.depth_stencil.depth32f_stencil8_basic,Fail
+dEQP-GLES3.functional.fbo.blit.depth_stencil.depth32f_stencil8_scale,Fail
+dEQP-GLES3.functional.fbo.blit.depth_stencil.depth32f_stencil8_stencil_only,Fail
+dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_mag_reverse_dst_x,Fail
+dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_mag_reverse_dst_y,Fail
+dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_mag_reverse_src_x,Fail
+dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_mag_reverse_src_y,Fail
+dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_min,Fail
+dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_min_reverse_dst_x,Fail
+dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_min_reverse_dst_y,Fail
+dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_min_reverse_src_dst_x,Fail
+dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_min_reverse_src_dst_y,Fail
+dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_min_reverse_src_x,Fail
+dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_min_reverse_src_y,Fail
+dEQP-GLES3.functional.fbo.color.blend.r8_src_over,Fail
+dEQP-GLES3.functional.fbo.depth.basic.depth24_stencil8,Fail
+dEQP-GLES3.functional.fbo.depth.basic.depth32f_stencil8,Fail
+dEQP-GLES3.functional.fbo.depth.basic.depth_component16,Fail
+dEQP-GLES3.functional.fbo.depth.basic.depth_component24,Fail
+dEQP-GLES3.functional.fbo.depth.basic.depth_component32f,Fail
+dEQP-GLES3.functional.fbo.depth.depth_test_clamp.depth24_stencil8,Fail
+dEQP-GLES3.functional.fbo.depth.depth_test_clamp.depth32f_stencil8,Fail
+dEQP-GLES3.functional.fbo.depth.depth_test_clamp.depth_component16,Fail
+dEQP-GLES3.functional.fbo.depth.depth_test_clamp.depth_component24,Fail
+dEQP-GLES3.functional.fbo.depth.depth_test_clamp.depth_component32f,Fail
+dEQP-GLES3.functional.fbo.depth.depth_write_clamp.depth24_stencil8,Fail
+dEQP-GLES3.functional.fbo.depth.depth_write_clamp.depth32f_stencil8,Fail
+dEQP-GLES3.functional.fbo.depth.depth_write_clamp.depth_component16,Fail
+dEQP-GLES3.functional.fbo.depth.depth_write_clamp.depth_component24,Fail
+dEQP-GLES3.functional.fbo.depth.depth_write_clamp.depth_component32f,Fail
+dEQP-GLES3.functional.fbo.invalidate.sub.unbind_blit_color,Fail
+dEQP-GLES3.functional.fbo.invalidate.sub.unbind_blit_depth,Fail
+dEQP-GLES3.functional.fbo.invalidate.sub.unbind_blit_msaa_color,Fail
+dEQP-GLES3.functional.fbo.invalidate.sub.unbind_blit_msaa_depth,Fail
+dEQP-GLES3.functional.fbo.invalidate.sub.unbind_blit_msaa_depth_stencil,Fail
+dEQP-GLES3.functional.fbo.invalidate.sub.unbind_blit_msaa_stencil,Fail
+dEQP-GLES3.functional.fbo.invalidate.whole.unbind_blit_color,Fail
+dEQP-GLES3.functional.fbo.invalidate.whole.unbind_blit_depth,Fail
+dEQP-GLES3.functional.fbo.invalidate.whole.unbind_blit_msaa_color,Fail
+dEQP-GLES3.functional.fbo.invalidate.whole.unbind_blit_msaa_depth,Fail
+dEQP-GLES3.functional.fbo.invalidate.whole.unbind_blit_msaa_depth_stencil,Fail
+dEQP-GLES3.functional.fbo.invalidate.whole.unbind_blit_msaa_stencil,Fail
+dEQP-GLES3.functional.fbo.msaa.2_samples.depth24_stencil8,Fail
+dEQP-GLES3.functional.fbo.msaa.2_samples.depth32f_stencil8,Fail
+dEQP-GLES3.functional.fbo.msaa.2_samples.depth_component16,Fail
+dEQP-GLES3.functional.fbo.msaa.2_samples.depth_component24,Fail
+dEQP-GLES3.functional.fbo.msaa.2_samples.depth_component32f,Fail
+dEQP-GLES3.functional.fbo.msaa.2_samples.r11f_g11f_b10f,Fail
+dEQP-GLES3.functional.fbo.msaa.2_samples.r16f,Fail
+dEQP-GLES3.functional.fbo.msaa.2_samples.r8,Fail
+dEQP-GLES3.functional.fbo.msaa.2_samples.rg16f,Fail
+dEQP-GLES3.functional.fbo.msaa.2_samples.rg8,Fail
+dEQP-GLES3.functional.fbo.msaa.2_samples.rgb10_a2,Fail
+dEQP-GLES3.functional.fbo.msaa.2_samples.rgb565,Fail
+dEQP-GLES3.functional.fbo.msaa.2_samples.rgb5_a1,Fail
+dEQP-GLES3.functional.fbo.msaa.2_samples.rgb8,Fail
+dEQP-GLES3.functional.fbo.msaa.2_samples.rgba4,Fail
+dEQP-GLES3.functional.fbo.msaa.2_samples.rgba8,Fail
 dEQP-GLES3.functional.fbo.msaa.2_samples.srgb8_alpha8,Fail
+dEQP-GLES3.functional.fbo.msaa.2_samples.stencil_index8,Fail
+dEQP-GLES3.functional.fbo.msaa.4_samples.depth24_stencil8,Fail
+dEQP-GLES3.functional.fbo.msaa.4_samples.depth32f_stencil8,Fail
+dEQP-GLES3.functional.fbo.msaa.4_samples.depth_component16,Fail
+dEQP-GLES3.functional.fbo.msaa.4_samples.depth_component24,Fail
+dEQP-GLES3.functional.fbo.msaa.4_samples.depth_component32f,Fail
+dEQP-GLES3.functional.fbo.msaa.4_samples.r11f_g11f_b10f,Fail
+dEQP-GLES3.functional.fbo.msaa.4_samples.r16f,Fail
+dEQP-GLES3.functional.fbo.msaa.4_samples.r8,Fail
+dEQP-GLES3.functional.fbo.msaa.4_samples.rg16f,Fail
+dEQP-GLES3.functional.fbo.msaa.4_samples.rg8,Fail
+dEQP-GLES3.functional.fbo.msaa.4_samples.rgb10_a2,Fail
+dEQP-GLES3.functional.fbo.msaa.4_samples.rgb565,Fail
 dEQP-GLES3.functional.fbo.msaa.4_samples.rgb5_a1,Fail
+dEQP-GLES3.functional.fbo.msaa.4_samples.rgb8,Fail
+dEQP-GLES3.functional.fbo.msaa.4_samples.rgba4,Fail
+dEQP-GLES3.functional.fbo.msaa.4_samples.rgba8,Fail
+dEQP-GLES3.functional.fbo.msaa.4_samples.srgb8_alpha8,Fail
+dEQP-GLES3.functional.fbo.msaa.4_samples.stencil_index8,Fail
+dEQP-GLES3.functional.fbo.render.recreate_depth_stencil.tex2d_rgba8_depth_rbo_depth_component16,Fail
+dEQP-GLES3.functional.fbo.render.recreate_depth_stencil.tex2d_rgba8_depth_rbo_depth_component32f,Fail
+dEQP-GLES3.functional.fbo.render.recreate_depth_stencil.tex2d_rgba8_depth_stencil_rbo_depth24_stencil8,Fail
+dEQP-GLES3.functional.fbo.render.recreate_depth_stencil.tex2d_rgba8_depth_stencil_rbo_depth32f_stencil8,Fail
+dEQP-GLES3.functional.fbo.render.recreate_depth_stencil.tex2d_rgba8_depth_stencil_tex2d_depth24_stencil8,Fail
+dEQP-GLES3.functional.fbo.render.recreate_depth_stencil.tex2d_rgba8_depth_stencil_tex2d_depth32f_stencil8,Fail
+dEQP-GLES3.functional.fbo.render.recreate_depth_stencil.tex2d_rgba8_depth_tex2d_depth_component16,Fail
+dEQP-GLES3.functional.fbo.render.recreate_depth_stencil.tex2d_rgba8_depth_tex2d_depth_component24,Fail
+dEQP-GLES3.functional.fbo.render.recreate_depth_stencil.tex2d_rgba8_depth_tex2d_depth_component32f,Fail
+dEQP-GLES3.functional.fbo.render.recreate_depth_stencil.tex2d_rgba8_stencil_rbo_stencil_index8,Fail
+dEQP-GLES3.functional.fbo.render.shared_colorbuffer.rbo_r8,Fail
+dEQP-GLES3.functional.fbo.render.shared_colorbuffer.rbo_r8_depth_rbo_depth24_stencil8,Fail
+dEQP-GLES3.functional.fbo.render.shared_colorbuffer.rbo_r8_depth_stencil_rbo_depth24_stencil8,Fail
+dEQP-GLES3.functional.fbo.render.shared_colorbuffer.tex2d_r8,Fail
+dEQP-GLES3.functional.fbo.render.shared_colorbuffer.tex2d_r8_depth_rbo_depth24_stencil8,Fail
+dEQP-GLES3.functional.fbo.render.shared_colorbuffer.tex2d_r8_depth_stencil_rbo_depth24_stencil8,Fail
+dEQP-GLES3.functional.lifetime.attach.deleted_input.buffer_vertex_array,Fail
+dEQP-GLES3.functional.lifetime.attach.deleted_output.buffer_transform_feedback,Fail
+dEQP-GLES3.functional.multisample.fbo_max_samples.proportionality_alpha_to_coverage,Fail
+dEQP-GLES3.functional.multisample.fbo_max_samples.proportionality_sample_coverage,Fail
+dEQP-GLES3.functional.multisample.fbo_max_samples.proportionality_sample_coverage_inverted,Fail
+dEQP-GLES3.functional.multisample.fbo_max_samples.sample_coverage_invert,Fail
+dEQP-GLES3.functional.negative_api.buffer.blit_framebuffer_multisample,Fail
+dEQP-GLES3.functional.negative_api.buffer.read_pixels_fbo_format_mismatch,Fail
+dEQP-GLES3.functional.negative_api.vertex_array.draw_elements_instanced,Fail
+dEQP-GLES3.functional.negative_api.vertex_array.draw_range_elements,Fail
+dEQP-GLES3.functional.occlusion_query.depth_clear,Fail
+dEQP-GLES3.functional.occlusion_query.depth_clear_stencil_write,Fail
+dEQP-GLES3.functional.occlusion_query.depth_clear_stencil_write_stencil_clear,Fail
+dEQP-GLES3.functional.occlusion_query.depth_write,Fail
+dEQP-GLES3.functional.occlusion_query.depth_write_depth_clear,Fail
+dEQP-GLES3.functional.occlusion_query.depth_write_depth_clear_stencil_clear,Fail
+dEQP-GLES3.functional.occlusion_query.depth_write_depth_clear_stencil_write,Fail
 dEQP-GLES3.functional.occlusion_query.depth_write_depth_clear_stencil_write_stencil_clear,Fail
+dEQP-GLES3.functional.occlusion_query.depth_write_stencil_clear,Fail
+dEQP-GLES3.functional.occlusion_query.depth_write_stencil_write,Fail
+dEQP-GLES3.functional.occlusion_query.depth_write_stencil_write_stencil_clear,Fail
+dEQP-GLES3.functional.occlusion_query.scissor,Fail
+dEQP-GLES3.functional.occlusion_query.scissor_depth_clear_stencil_write,Fail
+dEQP-GLES3.functional.occlusion_query.scissor_depth_clear_stencil_write_stencil_clear,Fail
+dEQP-GLES3.functional.occlusion_query.scissor_depth_write_depth_clear,Fail
+dEQP-GLES3.functional.occlusion_query.scissor_depth_write_stencil_write,Fail
+dEQP-GLES3.functional.occlusion_query.scissor_depth_write_stencil_write_stencil_clear,Fail
+dEQP-GLES3.functional.occlusion_query.scissor_stencil_write,Fail
+dEQP-GLES3.functional.occlusion_query.scissor_stencil_write_stencil_clear,Fail
 dEQP-GLES3.functional.occlusion_query.stencil_clear,Fail
+dEQP-GLES3.functional.occlusion_query.stencil_write,Fail
+dEQP-GLES3.functional.occlusion_query.stencil_write_stencil_clear,Fail
+dEQP-GLES3.functional.polygon_offset.fixed16_displacement_with_units,Fail
+dEQP-GLES3.functional.polygon_offset.fixed16_render_with_units,Fail
+dEQP-GLES3.functional.rasterization.fbo.rbo_multisample_max.interpolation.lines_wide,Fail
+dEQP-GLES3.functional.rasterization.fbo.rbo_multisample_max.interpolation.triangles,Fail
+dEQP-GLES3.functional.rasterization.fbo.rbo_multisample_max.primitives.lines_wide,Fail
+dEQP-GLES3.functional.rasterization.fbo.rbo_multisample_max.primitives.points,Fail
+dEQP-GLES3.functional.rasterization.fbo.rbo_singlesample.interpolation.triangles,Fail
+dEQP-GLES3.functional.rasterization.fbo.rbo_singlesample.primitives.points,Fail
+dEQP-GLES3.functional.rasterization.fbo.texture_2d.interpolation.triangles,Fail
+dEQP-GLES3.functional.rasterization.fbo.texture_2d.primitives.points,Fail
+dEQP-GLES3.functional.rasterization.flatshading.lines_wide,Fail
+dEQP-GLES3.functional.rasterization.flatshading.triangles,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_msaa4.float_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_msaa4.float_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_msaa4.vec2_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_msaa4.vec2_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_msaa4.vec3_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_msaa4.vec3_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_msaa4.vec4_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_msaa4.vec4_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_msaa2.float_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_msaa2.float_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_msaa2.vec2_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_msaa2.vec2_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_msaa2.vec3_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_msaa2.vec3_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_msaa2.vec4_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_msaa2.vec4_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_msaa4.float_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_msaa4.float_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_msaa4.vec2_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_msaa4.vec2_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_msaa4.vec3_highp,Fail
 dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_msaa4.vec3_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_msaa4.vec4_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_msaa4.vec4_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_msaa4.float_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_msaa4.float_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_msaa4.vec2_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_msaa4.vec2_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_msaa4.vec3_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_msaa4.vec3_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_msaa4.vec4_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_msaa4.vec4_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.texture.msaa4.float_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.texture.msaa4.float_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.texture.msaa4.vec2_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.texture.msaa4.vec2_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.texture.msaa4.vec3_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.texture.msaa4.vec3_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.texture.msaa4.vec4_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.texture.msaa4.vec4_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_msaa4.float_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_msaa4.float_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_msaa4.vec2_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_msaa4.vec2_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_msaa4.vec3_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_msaa4.vec3_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_msaa4.vec4_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_msaa4.vec4_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_msaa2.float_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_msaa2.float_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_msaa2.vec2_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_msaa2.vec2_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_msaa2.vec3_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_msaa2.vec3_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_msaa2.vec4_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_msaa2.vec4_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_msaa4.float_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_msaa4.float_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_msaa4.vec2_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_msaa4.vec2_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_msaa4.vec3_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_msaa4.vec3_mediump,Fail
 dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_msaa4.vec4_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_msaa4.vec4_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_msaa4.float_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_msaa4.float_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_msaa4.vec2_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_msaa4.vec2_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_msaa4.vec3_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_msaa4.vec3_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_msaa4.vec4_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_msaa4.vec4_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.texture.msaa4.float_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.texture.msaa4.float_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.texture.msaa4.vec2_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.texture.msaa4.vec2_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.texture.msaa4.vec3_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.texture.msaa4.vec3_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.texture.msaa4.vec4_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.texture.msaa4.vec4_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_msaa4.float_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_msaa4.float_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_msaa4.vec2_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_msaa4.vec2_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_msaa4.vec3_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_msaa4.vec3_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_msaa4.vec4_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_msaa4.vec4_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.fbo_msaa2.float_highp,Fail
 dEQP-GLES3.functional.shaders.derivate.fwidth.fbo_msaa2.float_mediump,Fail
-dEQP-GLES3.functional.transform_feedback.random_full_array_capture.interleaved.lines.8,Fail
-dEQP-GLES3.functional.transform_feedback.random_full_array_capture.separate.triangles.3,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.fbo_msaa2.vec2_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.fbo_msaa2.vec2_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.fbo_msaa2.vec3_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.fbo_msaa2.vec3_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.fbo_msaa2.vec4_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.fbo_msaa2.vec4_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.fbo_msaa4.float_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.fbo_msaa4.float_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.fbo_msaa4.vec2_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.fbo_msaa4.vec2_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.fbo_msaa4.vec3_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.fbo_msaa4.vec3_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.fbo_msaa4.vec4_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.fbo_msaa4.vec4_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_msaa4.float_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_msaa4.float_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_msaa4.vec2_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_msaa4.vec2_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_msaa4.vec3_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_msaa4.vec3_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_msaa4.vec4_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_msaa4.vec4_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.texture.msaa4.float_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.texture.msaa4.float_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.texture.msaa4.vec2_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.texture.msaa4.vec2_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.texture.msaa4.vec3_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.texture.msaa4.vec3_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.texture.msaa4.vec4_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.texture.msaa4.vec4_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_msaa4.float_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_msaa4.float_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_msaa4.vec2_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_msaa4.vec2_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_msaa4.vec3_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_msaa4.vec3_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_msaa4.vec4_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_msaa4.vec4_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_msaa2.float_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_msaa2.float_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_msaa2.vec2_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_msaa2.vec2_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_msaa2.vec3_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_msaa2.vec3_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_msaa2.vec4_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_msaa2.vec4_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_msaa4.float_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_msaa4.float_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_msaa4.vec2_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_msaa4.vec2_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_msaa4.vec3_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_msaa4.vec3_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_msaa4.vec4_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_msaa4.vec4_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_msaa4.float_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_msaa4.float_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_msaa4.vec2_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_msaa4.vec2_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_msaa4.vec3_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_msaa4.vec3_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_msaa4.vec4_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_msaa4.vec4_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_msaa4.float_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_msaa4.float_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_msaa4.vec2_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_msaa4.vec2_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_msaa4.vec3_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_msaa4.vec3_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_msaa4.vec4_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_msaa4.vec4_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_msaa2.float_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_msaa2.float_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_msaa2.vec2_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_msaa2.vec2_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_msaa2.vec3_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_msaa2.vec3_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_msaa2.vec4_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_msaa2.vec4_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_msaa4.float_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_msaa4.float_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_msaa4.vec2_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_msaa4.vec2_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_msaa4.vec3_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_msaa4.vec3_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_msaa4.vec4_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_msaa4.vec4_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_msaa4.float_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_msaa4.float_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_msaa4.vec2_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_msaa4.vec2_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_msaa4.vec3_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_msaa4.vec3_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_msaa4.vec4_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_msaa4.vec4_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_msaa4.float_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_msaa4.float_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_msaa4.vec2_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_msaa4.vec2_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_msaa4.vec3_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_msaa4.vec3_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_msaa4.vec4_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_msaa4.vec4_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.fbo_msaa2.float_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.fbo_msaa2.float_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.fbo_msaa2.vec2_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.fbo_msaa2.vec2_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.fbo_msaa2.vec3_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.fbo_msaa2.vec3_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.fbo_msaa2.vec4_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.fbo_msaa2.vec4_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.fbo_msaa4.float_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.fbo_msaa4.float_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.fbo_msaa4.vec2_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.fbo_msaa4.vec2_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.fbo_msaa4.vec3_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.fbo_msaa4.vec3_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.fbo_msaa4.vec4_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.fbo_msaa4.vec4_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_msaa4.float_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_msaa4.float_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_msaa4.vec2_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_msaa4.vec2_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_msaa4.vec3_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_msaa4.vec3_mediump,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_msaa4.vec4_highp,Fail
+dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_msaa4.vec4_mediump,Fail
+dEQP-GLES3.functional.shaders.linkage.varying.rules.differing_interpolation_2,Fail
+dEQP-GLES3.functional.shaders.texture_functions.texturegradoffset.isampler2d_vertex,Fail
+dEQP-GLES3.functional.shaders.texture_functions.texturegradoffset.isampler3d_vertex,Fail
+dEQP-GLES3.functional.shaders.texture_functions.texturegradoffset.sampler2darray_fixed_vertex,Fail
+dEQP-GLES3.functional.shaders.texture_functions.texturegradoffset.sampler2darrayshadow_vertex,Fail
+dEQP-GLES3.functional.shaders.texture_functions.texturegradoffset.sampler3d_fixed_vertex,Fail
+dEQP-GLES3.functional.shaders.texture_functions.textureprojgradoffset.sampler2dshadow_vertex,Fail
+dEQP-GLES3.functional.shaders.texture_functions.textureprojgradoffset.sampler3d_float_vertex,Fail
+dEQP-GLES3.functional.shaders.texture_functions.textureprojgradoffset.usampler3d_vertex,Fail
+dEQP-GLES3.functional.shaders.texture_functions.textureprojlodoffset.sampler2dshadow_vertex,Fail
+dEQP-GLES3.functional.shaders.texture_functions.textureprojoffset.sampler2dshadow_vertex,Fail
+dEQP-GLES3.functional.state_query.fbo.framebuffer_attachment_component_type,Fail
+dEQP-GLES3.functional.state_query.integers.max_samples_getfloat,Fail
+dEQP-GLES3.functional.state_query.integers.max_samples_getinteger64,Fail
+dEQP-GLES3.functional.state_query.rbo.renderbuffer_component_size_color,Fail
+dEQP-GLES3.functional.texture.mipmap.cube.max_level.linear_nearest,Fail
+dEQP-GLES3.functional.texture.specification.random_teximage2d.cube_3,Fail
+dEQP-GLES3.functional.texture.units.2_units.mixed.1,Fail
+dEQP-GLES3.functional.texture.units.2_units.mixed.9,Fail
+dEQP-GLES3.functional.texture.units.2_units.only_3d.5,Fail
+dEQP-GLES3.functional.texture.units.2_units.only_3d.9,Fail
+dEQP-GLES3.functional.texture.units.2_units.only_cube.2,Fail
+dEQP-GLES3.functional.texture.units.4_units.mixed.1,Fail
+dEQP-GLES3.functional.texture.units.4_units.mixed.9,Fail
+dEQP-GLES3.functional.texture.units.4_units.only_2d.0,Fail
+dEQP-GLES3.functional.texture.units.4_units.only_2d_array.0,Fail
+dEQP-GLES3.functional.texture.units.4_units.only_3d.0,Fail
+dEQP-GLES3.functional.texture.units.4_units.only_3d.1,Fail
+dEQP-GLES3.functional.texture.units.4_units.only_3d.5,Fail
+dEQP-GLES3.functional.texture.units.4_units.only_3d.7,Fail
+dEQP-GLES3.functional.texture.units.4_units.only_3d.9,Fail
+dEQP-GLES3.functional.texture.units.4_units.only_cube.2,Fail
+dEQP-GLES3.functional.texture.units.8_units.mixed.6,Fail
+dEQP-GLES3.functional.texture.units.8_units.mixed.7,Fail
+dEQP-GLES3.functional.texture.units.8_units.mixed.8,Fail
+dEQP-GLES3.functional.texture.units.8_units.only_2d.0,Fail
+dEQP-GLES3.functional.texture.units.8_units.only_2d.6,Fail
+dEQP-GLES3.functional.texture.units.8_units.only_2d_array.0,Fail
+dEQP-GLES3.functional.texture.units.8_units.only_2d_array.6,Fail
+dEQP-GLES3.functional.texture.units.8_units.only_3d.6,Fail
+dEQP-GLES3.functional.texture.units.8_units.only_3d.8,Fail
+dEQP-GLES3.functional.texture.units.8_units.only_cube.1,Fail
+dEQP-GLES3.functional.texture.units.8_units.only_cube.2,Fail
+dEQP-GLES3.functional.texture.units.all_units.mixed.0,Fail
+dEQP-GLES3.functional.texture.units.all_units.mixed.5,Fail
+dEQP-GLES3.functional.texture.units.all_units.mixed.6,Fail
+dEQP-GLES3.functional.texture.units.all_units.mixed.8,Fail
+dEQP-GLES3.functional.texture.units.all_units.mixed.9,Fail
+dEQP-GLES3.functional.texture.units.all_units.only_2d.0,Fail
+dEQP-GLES3.functional.texture.units.all_units.only_2d.6,Fail
+dEQP-GLES3.functional.texture.units.all_units.only_2d_array.0,Fail
+dEQP-GLES3.functional.texture.units.all_units.only_2d_array.5,Fail
+dEQP-GLES3.functional.texture.units.all_units.only_2d_array.6,Fail
+dEQP-GLES3.functional.texture.units.all_units.only_3d.5,Fail
+dEQP-GLES3.functional.texture.units.all_units.only_3d.6,Fail
+dEQP-GLES3.functional.texture.units.all_units.only_cube.1,Fail
+dEQP-GLES3.functional.texture.units.all_units.only_cube.2,Fail
+dEQP-GLES3.functional.transform_feedback.interpolation.centroid.highp_vec4_lines_interleaved,Fail
+dEQP-GLES3.functional.transform_feedback.interpolation.centroid.highp_vec4_lines_separate,Fail
+dEQP-GLES3.functional.transform_feedback.interpolation.centroid.highp_vec4_triangles_interleaved,Fail
+dEQP-GLES3.functional.transform_feedback.interpolation.centroid.highp_vec4_triangles_separate,Fail
+dEQP-GLES3.functional.transform_feedback.interpolation.centroid.lowp_vec4_lines_interleaved,Fail
+dEQP-GLES3.functional.transform_feedback.interpolation.centroid.lowp_vec4_lines_separate,Fail
+dEQP-GLES3.functional.transform_feedback.interpolation.centroid.lowp_vec4_triangles_interleaved,Fail
+dEQP-GLES3.functional.transform_feedback.interpolation.centroid.lowp_vec4_triangles_separate,Fail
+dEQP-GLES3.functional.transform_feedback.interpolation.centroid.mediump_vec4_lines_interleaved,Fail
+dEQP-GLES3.functional.transform_feedback.interpolation.centroid.mediump_vec4_lines_separate,Fail
+dEQP-GLES3.functional.transform_feedback.interpolation.centroid.mediump_vec4_triangles_interleaved,Fail
+dEQP-GLES3.functional.transform_feedback.interpolation.centroid.mediump_vec4_triangles_separate,Fail
+dEQP-GLES3.functional.transform_feedback.random.interleaved.lines.10,Fail
+dEQP-GLES3.functional.transform_feedback.random.interleaved.lines.4,Fail
+dEQP-GLES3.functional.transform_feedback.random.interleaved.lines.8,Fail
+dEQP-GLES3.functional.transform_feedback.random.interleaved.lines.9,Fail
+dEQP-GLES3.functional.transform_feedback.random.interleaved.triangles.1,Fail
+dEQP-GLES3.functional.transform_feedback.random.interleaved.triangles.3,Fail
+dEQP-GLES3.functional.transform_feedback.random.separate.lines.10,Fail
+dEQP-GLES3.functional.transform_feedback.random.separate.lines.2,Fail
+dEQP-GLES3.functional.transform_feedback.random.separate.lines.4,Fail
+dEQP-GLES3.functional.transform_feedback.random.separate.lines.7,Fail
+dEQP-GLES3.functional.transform_feedback.random.separate.triangles.10,Fail
+dEQP-GLES3.functional.transform_feedback.random.separate.triangles.3,Fail
+dEQP-GLES3.functional.transform_feedback.random.separate.triangles.4,Fail
+dEQP-GLES3.functional.transform_feedback.random.separate.triangles.5,Fail
+dEQP-GLES3.functional.transform_feedback.random.separate.triangles.6,Fail
+dEQP-GLES3.functional.transform_feedback.random.separate.triangles.7,Fail
+dEQP-GLES3.functional.transform_feedback.random.separate.triangles.8,Fail
+dEQP-GLES3.functional.transform_feedback.random.separate.triangles.9,Fail
+dEQP-GLES3.functional.vertex_arrays.single_attribute.first.byte.first6_offset16_stride32_quads5,Fail
+dEQP-GLES3.functional.vertex_arrays.single_attribute.normalize.int2_10_10_10.components4_quads256,Fail
+dEQP-GLES3.functional.vertex_arrays.single_attribute.usages.static_copy.stride4_short_quads256,Fail

.gitlab-ci/deqp-freedreno-a530-fails.txt

@@ -3,6 +3,7 @@ dEQP-GLES2.functional.clipping.line.wide_line_clip_viewport_corner,Fail
 dEQP-GLES2.functional.clipping.point.wide_point_clip,Fail
 dEQP-GLES2.functional.clipping.point.wide_point_clip_viewport_center,Fail
 dEQP-GLES2.functional.clipping.point.wide_point_clip_viewport_corner,Fail
+dEQP-GLES2.functional.clipping.triangle_vertex.clip_three.clip_neg_x_neg_z_and_pos_x_pos_z_and_neg_x_neg_y_pos_z,Fail
 dEQP-GLES2.functional.texture.specification.basic_copytexsubimage2d.2d_alpha,Fail
 dEQP-GLES2.functional.texture.specification.basic_copytexsubimage2d.2d_luminance,Fail
 dEQP-GLES2.functional.texture.specification.basic_copytexsubimage2d.2d_rgb,Fail
@@ -11,25 +12,32 @@ dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_mag_reverse_dst_y,Fail
 dEQP-GLES3.functional.transform_feedback.array.interleaved.lines.lowp_float,Fail
 dEQP-GLES3.functional.transform_feedback.array.interleaved.lines.mediump_int,Fail
 dEQP-GLES3.functional.transform_feedback.array.interleaved.points.highp_mat3x2,Fail
+dEQP-GLES3.functional.transform_feedback.array.interleaved.triangles.highp_mat2x3,Fail
+dEQP-GLES3.functional.transform_feedback.array.interleaved.triangles.lowp_uvec3,Fail
 dEQP-GLES3.functional.transform_feedback.array.separate.lines.highp_mat3x4,Fail
 dEQP-GLES3.functional.transform_feedback.array.separate.points.lowp_mat2,Fail
 dEQP-GLES3.functional.transform_feedback.array.separate.points.mediump_uint,Fail
+dEQP-GLES3.functional.transform_feedback.array.separate.triangles.lowp_vec3,Fail
+dEQP-GLES3.functional.transform_feedback.array.separate.triangles.mediump_ivec3,Fail
 dEQP-GLES3.functional.transform_feedback.array_element.interleaved.lines.highp_uvec4,Fail
 dEQP-GLES3.functional.transform_feedback.array_element.interleaved.points.highp_vec2,Fail
 dEQP-GLES3.functional.transform_feedback.array_element.interleaved.points.lowp_ivec3,Fail
+dEQP-GLES3.functional.transform_feedback.array_element.interleaved.triangles.lowp_int,Fail
 dEQP-GLES3.functional.transform_feedback.array_element.separate.lines.highp_vec4,Fail
 dEQP-GLES3.functional.transform_feedback.array_element.separate.lines.lowp_uint,Fail
 dEQP-GLES3.functional.transform_feedback.basic_types.interleaved.lines.lowp_mat2x4,Fail
 dEQP-GLES3.functional.transform_feedback.basic_types.interleaved.lines.mediump_uvec3,Fail
 dEQP-GLES3.functional.transform_feedback.basic_types.interleaved.points.highp_int,Fail
 dEQP-GLES3.functional.transform_feedback.basic_types.interleaved.points.mediump_float,Fail
+dEQP-GLES3.functional.transform_feedback.basic_types.interleaved.triangles.highp_mat4x3,Fail
 dEQP-GLES3.functional.transform_feedback.basic_types.separate.lines.highp_ivec3,Fail
 dEQP-GLES3.functional.transform_feedback.basic_types.separate.lines.mediump_vec3,Fail
 dEQP-GLES3.functional.transform_feedback.basic_types.separate.points.lowp_mat4x2,Fail
+dEQP-GLES3.functional.transform_feedback.basic_types.separate.triangles.lowp_mat3,Fail
+dEQP-GLES3.functional.transform_feedback.interpolation.smooth.highp_vec4_triangles_separate,Fail
 dEQP-GLES3.functional.transform_feedback.position.lines_separate,Fail
 dEQP-GLES3.functional.transform_feedback.random.interleaved.lines.3,Fail
 dEQP-GLES3.functional.transform_feedback.random.separate.points.3,Fail
-dEQP-GLES3.functional.transform_feedback.random_full_array_capture.separate.triangles.3,Fail
 dEQP-GLES31.functional.image_load_store.cube.format_reinterpret.r32i_rgba8,Fail
 dEQP-GLES31.functional.image_load_store.cube.format_reinterpret.rgba32f_rgba32ui,Fail
 dEQP-GLES31.functional.image_load_store.cube.format_reinterpret.rgba8_snorm_r32ui,Fail
@@ -38,8 +46,16 @@ dEQP-GLES31.functional.image_load_store.cube.load_store.r32f_single_layer,Fail
 dEQP-GLES31.functional.image_load_store.cube.load_store.rgba32i_single_layer,Fail
 dEQP-GLES31.functional.image_load_store.cube.load_store.rgba8_snorm_single_layer,Fail
 dEQP-GLES31.functional.image_load_store.early_fragment_tests.early_fragment_tests_stencil_fbo,Crash
+dEQP-GLES31.functional.layout_binding.image.image2d.fragment_binding_single,Fail
+dEQP-GLES31.functional.layout_binding.image.image3d.fragment_binding_single,Fail
+dEQP-GLES31.functional.program_interface_query.program_input.location.interface_blocks.in.named_block.var_struct_explicit_location,Fail
+dEQP-GLES31.functional.program_interface_query.program_input.resource_list.interface_blocks.in.named_block_explicit_location.var_struct,Fail
+dEQP-GLES31.functional.program_interface_query.program_input.type.interface_blocks.in.named_block_explicit_location.struct.uint,Fail
+dEQP-GLES31.functional.separate_shader.random.119,Fail
 dEQP-GLES31.functional.separate_shader.random.59,Fail
+dEQP-GLES31.functional.separate_shader.random.69,Fail
 dEQP-GLES31.functional.separate_shader.random.79,Fail
+dEQP-GLES31.functional.separate_shader.random.99,Fail
 dEQP-GLES31.functional.texture.border_clamp.formats.compressed_rgba8_etc2_eac.nearest_size_tile_multiple,Fail
 dEQP-GLES31.functional.texture.texture_buffer.modify.bufferdata.buffer_size_131071,Fail
 dEQP-GLES31.functional.texture.texture_buffer.render.as_index_array_as_fragment_texture.offset_7_alignments,Fail

.gitlab-ci/deqp-freedreno-a630-bypass-fails.txt

@@ -1,14 +1,87 @@
+
+dEQP-GLES31.functional.blend_equation_advanced.barrier.colorburn,Fail
 dEQP-GLES31.functional.blend_equation_advanced.barrier.colordodge,Fail
+dEQP-GLES31.functional.blend_equation_advanced.barrier.darken,Fail
+dEQP-GLES31.functional.blend_equation_advanced.barrier.difference,Fail
 dEQP-GLES31.functional.blend_equation_advanced.barrier.exclusion,Fail
+dEQP-GLES31.functional.blend_equation_advanced.barrier.hardlight,Fail
+dEQP-GLES31.functional.blend_equation_advanced.barrier.hsl_color,Fail
+dEQP-GLES31.functional.blend_equation_advanced.barrier.hsl_hue,Fail
+dEQP-GLES31.functional.blend_equation_advanced.barrier.hsl_luminosity,Fail
+dEQP-GLES31.functional.blend_equation_advanced.barrier.hsl_saturation,Fail
+dEQP-GLES31.functional.blend_equation_advanced.barrier.lighten,Fail
 dEQP-GLES31.functional.blend_equation_advanced.barrier.multiply,Fail
+dEQP-GLES31.functional.blend_equation_advanced.barrier.overlay,Fail
+dEQP-GLES31.functional.blend_equation_advanced.barrier.screen,Fail
+dEQP-GLES31.functional.blend_equation_advanced.barrier.softlight,Fail
+dEQP-GLES31.functional.blend_equation_advanced.basic.colorburn,Fail
 dEQP-GLES31.functional.blend_equation_advanced.basic.colordodge,Fail
+dEQP-GLES31.functional.blend_equation_advanced.basic.darken,Fail
+dEQP-GLES31.functional.blend_equation_advanced.basic.difference,Fail
 dEQP-GLES31.functional.blend_equation_advanced.basic.exclusion,Fail
+dEQP-GLES31.functional.blend_equation_advanced.basic.hardlight,Fail
+dEQP-GLES31.functional.blend_equation_advanced.basic.hsl_color,Fail
+dEQP-GLES31.functional.blend_equation_advanced.basic.hsl_hue,Fail
+dEQP-GLES31.functional.blend_equation_advanced.basic.hsl_luminosity,Fail
+dEQP-GLES31.functional.blend_equation_advanced.basic.hsl_saturation,Fail
+dEQP-GLES31.functional.blend_equation_advanced.basic.lighten,Fail
 dEQP-GLES31.functional.blend_equation_advanced.basic.multiply,Fail
+dEQP-GLES31.functional.blend_equation_advanced.basic.overlay,Fail
+dEQP-GLES31.functional.blend_equation_advanced.basic.screen,Fail
+dEQP-GLES31.functional.blend_equation_advanced.basic.softlight,Fail
+dEQP-GLES31.functional.blend_equation_advanced.msaa.colorburn,Fail
 dEQP-GLES31.functional.blend_equation_advanced.msaa.colordodge,Fail
+dEQP-GLES31.functional.blend_equation_advanced.msaa.darken,Fail
+dEQP-GLES31.functional.blend_equation_advanced.msaa.difference,Fail
 dEQP-GLES31.functional.blend_equation_advanced.msaa.exclusion,Fail
+dEQP-GLES31.functional.blend_equation_advanced.msaa.hardlight,Fail
+dEQP-GLES31.functional.blend_equation_advanced.msaa.hsl_color,Fail
+dEQP-GLES31.functional.blend_equation_advanced.msaa.hsl_hue,Fail
+dEQP-GLES31.functional.blend_equation_advanced.msaa.hsl_luminosity,Fail
+dEQP-GLES31.functional.blend_equation_advanced.msaa.hsl_saturation,Fail
+dEQP-GLES31.functional.blend_equation_advanced.msaa.lighten,Fail
 dEQP-GLES31.functional.blend_equation_advanced.msaa.multiply,Fail
+dEQP-GLES31.functional.blend_equation_advanced.msaa.overlay,Fail
+dEQP-GLES31.functional.blend_equation_advanced.msaa.screen,Fail
+dEQP-GLES31.functional.blend_equation_advanced.msaa.softlight,Fail
+dEQP-GLES31.functional.blend_equation_advanced.srgb.colorburn,Fail
 dEQP-GLES31.functional.blend_equation_advanced.srgb.colordodge,Fail
+dEQP-GLES31.functional.blend_equation_advanced.srgb.darken,Fail
+dEQP-GLES31.functional.blend_equation_advanced.srgb.difference,Fail
 dEQP-GLES31.functional.blend_equation_advanced.srgb.exclusion,Fail
+dEQP-GLES31.functional.blend_equation_advanced.srgb.hardlight,Fail
+dEQP-GLES31.functional.blend_equation_advanced.srgb.hsl_color,Fail
+dEQP-GLES31.functional.blend_equation_advanced.srgb.hsl_hue,Fail
+dEQP-GLES31.functional.blend_equation_advanced.srgb.hsl_luminosity,Fail
+dEQP-GLES31.functional.blend_equation_advanced.srgb.hsl_saturation,Fail
+dEQP-GLES31.functional.blend_equation_advanced.srgb.lighten,Fail
 dEQP-GLES31.functional.blend_equation_advanced.srgb.multiply,Fail
+dEQP-GLES31.functional.blend_equation_advanced.srgb.overlay,Fail
+dEQP-GLES31.functional.blend_equation_advanced.srgb.screen,Fail
+dEQP-GLES31.functional.blend_equation_advanced.srgb.softlight,Fail
+dEQP-GLES31.functional.compute.basic.shared_var_single_group,Fail
+dEQP-GLES31.functional.draw_buffers_indexed.overwrite_common.common_advanced_blend_eq_buffer_advanced_blend_eq,Fail
 dEQP-GLES31.functional.draw_buffers_indexed.overwrite_common.common_blend_eq_buffer_advanced_blend_eq,Fail
-dEQP-VK.renderpass2.depth_stencil_resolve.image_2d_16_64_6.samples_2.d24_unorm_s8_uint.depth_zero,Fail
+dEQP-GLES31.functional.draw_buffers_indexed.overwrite_common.common_separate_blend_eq_buffer_advanced_blend_eq,Fail
+dEQP-GLES31.functional.draw_buffers_indexed.overwrite_indexed.common_advanced_blend_eq_buffer_advanced_blend_eq,Fail
+dEQP-GLES31.functional.draw_buffers_indexed.overwrite_indexed.common_advanced_blend_eq_buffer_blend_eq,Fail
+dEQP-GLES31.functional.draw_buffers_indexed.overwrite_indexed.common_advanced_blend_eq_buffer_separate_blend_eq,Fail
+dEQP-GLES31.functional.draw_buffers_indexed.overwrite_indexed.common_separate_blend_eq_buffer_blend_eq,Fail
+dEQP-GLES31.functional.image_load_store.early_fragment_tests.early_fragment_tests_depth_fbo,Fail
+dEQP-GLES31.functional.ssbo.layout.3_level_array.std140.column_major_mat4x2,Fail
+dEQP-GLES31.functional.ssbo.layout.3_level_unsized_array.std430.mat3,Fail
+dEQP-GLES31.functional.ssbo.layout.random.arrays_of_arrays.6,Fail
+dEQP-GLES31.functional.ssbo.layout.unsized_struct_array.per_block_buffer.shared_instance_array,Fail
+dEQP-GLES31.functional.stencil_texturing.render.depth24_stencil8_draw,Fail
+dEQP-GLES31.functional.stencil_texturing.render.depth32f_stencil8_clear,Fail
+dEQP-GLES31.functional.stencil_texturing.render.depth32f_stencil8_draw,Fail
+dEQP-GLES31.functional.tessellation.invariance.inner_triangle_set.quads_fractional_even_spacing,Fail
+dEQP-GLES31.functional.tessellation.invariance.tess_coord_component_range.triangles_fractional_odd_spacing_cw,Fail
+dEQP-GLES31.functional.texture.multisample.samples_1.use_texture_depth_2d,Fail
+dEQP-GLES31.functional.texture.multisample.samples_1.use_texture_depth_2d_array,Fail
+dEQP-GLES31.functional.texture.multisample.samples_2.use_texture_depth_2d,Fail
+dEQP-GLES31.functional.texture.multisample.samples_2.use_texture_depth_2d_array,Fail
+dEQP-GLES31.functional.texture.multisample.samples_3.use_texture_depth_2d,Fail
+dEQP-GLES31.functional.texture.multisample.samples_3.use_texture_depth_2d_array,Fail
+dEQP-GLES31.functional.texture.multisample.samples_4.use_texture_depth_2d,Fail
+dEQP-GLES31.functional.texture.multisample.samples_4.use_texture_depth_2d_array,Fail

.gitlab-ci/deqp-freedreno-a630-bypass-flakes.txt

@@ -1,11 +0,0 @@
-# Note: flakes lists for CI are just a list of lines that, when
-# non-zero-length and not starting with '#', will regex match to
-# delete lines from the test list.  Be careful.
-
-# At least some of the separate_channels tests fail on sysmem due to an
-# interaction of use of a UBWC buffer as both a render target and a
-# texture.  Stores are done through both paths in separate channels,
-# and the UBWC updates don't get synced.  The current a650 blob also
-# fails these tests and qcom apparently noted the failure at one point
-# https://gitlab.khronos.org/Tracker/vk-gl-cts/-/issues/2017
-dEQP-VK.renderpass.*separate_channels.*

.gitlab-ci/deqp-freedreno-a630-fails.txt

@@ -1,59 +1,26 @@
-KHR-GL33.packed_depth_stencil.verify_get_tex_image.depth24_stencil8,Fail
-KHR-GL33.packed_depth_stencil.verify_read_pixels.depth24_stencil8,Fail
-KHR-GL33.transform_feedback.api_errors_test,Fail
-KHR-GL33.transform_feedback.capture_vertex_interleaved_test,Fail
-KHR-GL33.transform_feedback.capture_vertex_separate_test,Fail
-KHR-GL33.transform_feedback.discard_vertex_test,Fail
-KHR-GL33.transform_feedback.draw_xfb_feedbackk_test,Crash
-KHR-GL33.transform_feedback.draw_xfb_instanced_test,Crash
-KHR-GL33.transform_feedback.draw_xfb_stream_instanced_test,Crash
-KHR-GL33.transform_feedback.draw_xfb_test,Crash
-KHR-GL33.transform_feedback.query_vertex_interleaved_test,Fail
-KHR-GL33.transform_feedback.query_vertex_separate_test,Fail
-KHR-GL33.cull_distance.coverage,Fail
-dEQP-VK.api.object_management.single_alloc_callbacks.compute_pipeline,Fail
-dEQP-VK.draw.shader_viewport_index.fragment_shader_12,Fail
-dEQP-VK.draw.shader_viewport_index.fragment_shader_2,Fail
-dEQP-VK.draw.shader_viewport_index.vertex_shader_9,Fail
-dEQP-VK.glsl.atomic_operations.and_unsigned_geometry,Fail
-dEQP-VK.image.subresource_layout.2d.1_level.r8g8_snorm,Fail
-dEQP-VK.image.subresource_layout.2d.4_levels.b8g8r8a8_snorm,Fail
-dEQP-VK.image.subresource_layout.2d_array.2_levels.a8b8g8r8_snorm_pack32,Fail
-dEQP-VK.image.subresource_layout.2d_array.2_levels.r16g16b16a16_snorm,Fail
-dEQP-VK.image.subresource_layout.2d_array.4_levels.r16_snorm,Fail
-dEQP-VK.image.subresource_layout.2d_array.all_levels.r8_snorm,Fail
-dEQP-VK.image.subresource_layout.3d.2_levels.r16g16_snorm,Fail
-dEQP-VK.image.subresource_layout.3d.2_levels.r8g8b8a8_snorm,Fail
-dEQP-VK.image.subresource_layout.3d.4_levels.r8g8_snorm,Fail
-dEQP-VK.memory_model.message_passing.core11.u32.coherent.fence_fence.atomicwrite.device.payload_local.image.guard_local.image.frag,Crash
-dEQP-VK.memory_model.message_passing.core11.u32.coherent.fence_fence.atomicwrite.workgroup.payload_local.buffer.guard_local.image.comp,Crash
-dEQP-VK.memory_model.write_after_read.core11.u32.coherent.fence_fence.atomicwrite.device.payload_local.buffer.guard_local.image.comp,Crash
-dEQP-VK.memory_model.write_after_read.core11.u32.coherent.fence_fence.atomicwrite.workgroup.payload_local.image.guard_local.image.comp,Crash
-dEQP-VK.memory_model.write_after_read.core11.u32.coherent.fence_fence.atomicwrite.workgroup.payload_nonlocal.workgroup.guard_local.image.comp,Crash
-dEQP-VK.multiview.masks.max_multi_view_view_count,Fail
-dEQP-VK.multiview.renderpass2.masks.max_multi_view_view_count,Fail
-dEQP-VK.pipeline.extended_dynamic_state.after_pipelines.depth_compare_greater_equal_greater,Fail
-dEQP-VK.pipeline.extended_dynamic_state.before_draw.depth_compare_always_greater,Fail
-dEQP-VK.pipeline.multisample.alpha_to_coverage_unused_attachment.samples_4.alpha_invisible,Fail
-dEQP-VK.pipeline.push_descriptor.compute.binding3_numcalls2_sampler,Crash
-dEQP-VK.renderpass2.depth_stencil_resolve.image_2d_16_64_6.samples_2.d24_unorm_s8_uint.depth_zero,Fail
-dEQP-VK.renderpass2.depth_stencil_resolve.image_2d_16_64_6.samples_4.x8_d24_unorm_pack32.depth_zero,Fail
-dEQP-VK.renderpass2.suballocation.attachment_allocation.input_output.7,Fail
-dEQP-VK.spirv_assembly.instruction.graphics.opquantize.carry_to_exponent_tesse,Fail
-dEQP-VK.spirv_assembly.instruction.graphics.opquantize.negative_round_up_or_round_down_tesse,Fail
-dEQP-VK.spirv_assembly.instruction.graphics.opquantize.negative_too_small_tesse,Fail
-dEQP-VK.spirv_assembly.instruction.graphics.opquantize.round_to_inf_tesse,Fail
-dEQP-VK.spirv_assembly.instruction.graphics.opquantize.spec_const_carry_to_exponent_tesse,Fail
-dEQP-VK.spirv_assembly.instruction.graphics.opquantize.spec_const_negative_round_up_or_round_down_tesse,Fail
-dEQP-VK.tessellation.invariance.inner_triangle_set.triangles_equal_spacing,Fail
-dEQP-VK.tessellation.invariance.outer_edge_division.triangles_fractional_even_spacing,Fail
-dEQP-VK.tessellation.invariance.outer_edge_index_independence.triangles_equal_spacing_ccw,Fail
-dEQP-VK.tessellation.invariance.outer_edge_index_independence.triangles_fractional_even_spacing_cw,Fail
-dEQP-VK.tessellation.invariance.outer_edge_index_independence.quads_fractional_even_spacing_ccw,Fail
-dEQP-VK.tessellation.invariance.outer_edge_symmetry.isolines_equal_spacing_cw,Fail
-dEQP-VK.tessellation.invariance.outer_edge_symmetry.quads_fractional_odd_spacing_ccw,Fail
-dEQP-VK.tessellation.invariance.outer_edge_symmetry.triangles_fractional_odd_spacing_cw,Fail
-dEQP-VK.tessellation.invariance.outer_triangle_set.quads_fractional_odd_spacing,Fail
-dEQP-VK.tessellation.invariance.primitive_set.isolines_fractional_odd_spacing_ccw,Fail
-dEQP-VK.tessellation.invariance.primitive_set.quads_fractional_odd_spacing_cw,Fail
-dEQP-VK.tessellation.invariance.primitive_set.triangles_fractional_even_spacing_ccw,Fail
+# Possibly https://gitlab.khronos.org/Tracker/vk-gl-cts/-/issues/2035 related,Fail
+dEQP-GLES2.functional.clipping.triangle_vertex.clip_three.clip_neg_x_neg_z_and_pos_x_pos_z_and_neg_x_neg_y_pos_z,Fail
+
+dEQP-VK.api.image_clearing.core.clear_color_attachment.single_layer.a8b8g8r8_srgb_pack32_1x33,Fail
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_attachment.single_layer.b8g8r8a8_srgb_33x128,Fail
+dEQP-VK.compute.indirect_dispatch.upload_buffer.multi_dispatch,Fail
+dEQP-VK.draw.output_location.array.r8g8-uint-mediump-output-uint,Fail
+dEQP-VK.memory_model.message_passing.core11.u32.coherent.fence_fence.atomicwrite.device.payload_local.image.guard_nonlocal.workgroup.comp,Fail
+dEQP-VK.spirv_assembly.instruction.graphics.opquantize.round_to_negative_inf_geom,Fail
+dEQP-VK.spirv_assembly.instruction.graphics.opquantize.spec_const_positive_round_up_or_round_down_geom,Fail
+
+# not sure what's wrong here,Fail
+dEQP-VK.tessellation.invariance.outer_edge_index_independence.quads_fractional_even_spacing_ccw_point_mode,Fail
+dEQP-VK.tessellation.invariance.outer_edge_symmetry.triangles_fractional_odd_spacing_cw_point_mode,Fail
+
+KHR-GL30.transform_feedback.api_errors_test,Fail
+KHR-GL30.transform_feedback.capture_vertex_interleaved_test,Fail
+KHR-GL30.transform_feedback.capture_vertex_separate_test,Fail
+KHR-GL30.transform_feedback.discard_vertex_test,Fail
+KHR-GL30.transform_feedback.draw_xfb_feedbackk_test,Crash
+KHR-GL30.transform_feedback.draw_xfb_instanced_test,Crash
+KHR-GL30.transform_feedback.draw_xfb_stream_instanced_test,Crash
+KHR-GL30.transform_feedback.draw_xfb_test,Crash
+KHR-GL30.transform_feedback.get_xfb_varying,Fail
+KHR-GL30.transform_feedback.query_vertex_interleaved_test,Fail
+KHR-GL30.transform_feedback.query_vertex_separate_test,Fail

.gitlab-ci/deqp-freedreno-a630-flakes.txt

@@ -25,11 +25,28 @@ dEQP-GLES31.functional.ssbo.atomic.compswap.mediump_uint
 # Non-sysmem flakes
 dEQP-VK.pipeline.spec_constant.compute.composite.matrix.mat3x2
 
+# Sysmem flakes
+dEQP-GLES31.functional.texture.multisample.samples_3.use_texture_depth_2d
+dEQP-GLES31.functional.texture.multisample.samples_4.use_texture_depth_2d_array
+dEQP-GLES31.functional.stencil_texturing.render.depth24_stencil8_draw
+
 # Fails NIR_VALIDATE so probably flaky
 dEQP-VK.memory_model.write_after_read.core11.u32.coherent.fence_fence.atomicwrite.workgroup.payload_nonlocal.workgroup.guard_local.buffer.comp
 
+# At least some of the separate_channels tests fail on sysmem due to an
+# interaction of use of a UBWC buffer as both a render target and a
+# texture.  Stores are done through both paths in separate channels,
+# and the UBWC updates don't get synced.  The current a650 blob also
+# fails these tests and qcom apparently noted the failure at one point
+# https://gitlab.khronos.org/Tracker/vk-gl-cts/-/issues/2017
+dEQP-VK.renderpass.*separate_channels.*
+
+# These tests are broken (does not respect our minStorageBufferOffsetAlignment of 64)
+dEQP-VK.pipeline.push_descriptor.compute.*
+
 # Undiagnosed flakes appearing more than once in the last 2 months as
 # of 2020-08-19, in descending order of frequency.
+dEQP-GLES3.functional.fbo.msaa.2_samples.stencil_index8
 dEQP-GLES3.functional.fragment_out.random.39
 dEQP-VK.subgroups.shuffle.framebuffer.subgroupshufflexor_bvec3_tess_eval
 dEQP-VK.image.texel_view_compatible.graphic.extended.2d_image.texture_read.astc_10x6_unorm_block.r32g32b32a32_uint

.gitlab-ci/deqp-freedreno-a630-skips.txt

@@ -1,28 +0,0 @@
-# Note: skips lists for CI are just a list of lines that, when
-# non-zero-length and not starting with '#', will regex match to
-# delete lines from the test list.  Be careful.
-
-# Skip the perf/stress tests to keep runtime manageable
-dEQP-GLES[0-9]*.performance.*
-dEQP-GLES[0-9]*.stress.*
-
-# These are really slow on tiling architectures (including llvmpipe).
-dEQP-GLES[0-9]*.functional.flush_finish.*
-
-# Timeouts, passes otherwise
-KHR-GL33.texture_swizzle.smoke
-
-# Timeout on what looks like an infinite loop in ir3's mark_kill_path()
-dEQP-VK.geometry.layered.cube_array.36_36_12.secondary_cmd_buffer_inherit_framebuffer
-# More timeouts, possibly the same.
-dEQP-VK.geometry.layered.3d.64_64_8.secondary_cmd_buffer_inherit_framebuffer
-dEQP-VK.geometry.layered.cube_array.64_64_12.secondary_cmd_buffer_inherit_framebuffer
-dEQP-VK.spirv_assembly.instruction.graphics.spirv_ids_abuse.lots_ids_tesse
-dEQP-VK.tessellation.invariance.outer_edge_division.quads_fractional_odd_spacing
-
-# Timeout (VK-GL-CTS 1.2.5.0)
-dEQP-VK.geometry.layered.cube_array.36_36_12.readback
-dEQP-VK.geometry.layered.cube_array.64_64_12.readback
-
-# Crashes likely caused by https://gitlab.khronos.org/Tracker/vk-gl-cts/-/issues/2701
-dEQP-VK.synchronization.cross_instance.*binary_semaphore_fence_fd

.gitlab-ci/deqp-lima-skips.txt

@@ -10,6 +10,7 @@ dEQP-GLES[0-9]*.stress
 dEQP-GLES[0-9]*.functional.flush_finish
 
 # Flaky
+dEQP-GLES2.functional.clipping.triangle_vertex.clip_three.clip_neg_x_neg_z_and_pos_x_pos_z_and_neg_x_neg_y_pos_z
 dEQP-GLES2.functional.default_vertex_attrib.*
 dEQP-GLES2.functional.fbo.completeness.size.distinct
 dEQP-GLES2.functional.negative_api.shader.uniform_matrixfv_invalid_transpose

.gitlab-ci/deqp-lvp-fails.txt

@@ -1,62 +0,0 @@
-dEQP-VK.api.copy_and_blit.core.blit_image.all_formats.color.2d.a8b8g8r8_unorm_pack32.r16g16b16a16_unorm.general_optimal_linear,Fail
-dEQP-VK.api.copy_and_blit.core.blit_image.all_formats.color.2d.b8g8r8a8_unorm.r16g16b16a16_unorm.general_optimal_linear,Fail
-dEQP-VK.api.copy_and_blit.core.blit_image.all_formats.color.2d.r8g8_unorm.r16g16b16a16_unorm.general_optimal_linear,Fail
-dEQP-VK.api.copy_and_blit.core.blit_image.all_formats.color.2d.r8g8b8a8_unorm.a2b10g10r10_unorm_pack32.optimal_optimal_linear,Fail
-dEQP-VK.api.copy_and_blit.core.blit_image.all_formats.color.2d.r8g8b8a8_unorm.r16g16_unorm.general_optimal_linear,Fail
-dEQP-VK.api.copy_and_blit.core.blit_image.all_formats.color.2d.r8g8b8a8_unorm.r16g16b16a16_unorm.linear_general_linear,Fail
-dEQP-VK.api.copy_and_blit.core.blit_image.all_formats.color.2d.r8_unorm.r16g16b16a16_unorm.general_optimal_linear,Fail
-dEQP-VK.glsl.builtin.precision.pow.highp.vec3,Fail
-dEQP-VK.glsl.texture_functions.query.texturequerylod.sampler1d_fixed_fragment,Fail
-dEQP-VK.glsl.texture_functions.query.texturequerylod.sampler2darray_fixed_fragment,Fail
-dEQP-VK.glsl.texture_functions.query.texturequerylod.sampler2dshadow_fragment,Fail
-dEQP-VK.tessellation.invariance.outer_triangle_set.quads_fractional_odd_spacing,Timeout
-dEQP-VK.texture.filtering.2d.combinations.linear_mipmap_linear.linear.clamp_to_edge.repeat,Fail
-dEQP-VK.texture.filtering.2d.combinations.linear_mipmap_linear.linear.mirror_clamp_to_edge.repeat,Fail
-dEQP-VK.texture.filtering.2d.combinations.linear_mipmap_linear.linear.repeat.repeat,Fail
-dEQP-VK.texture.filtering.2d.combinations.linear_mipmap_linear.nearest.mirrored_repeat.repeat,Fail
-dEQP-VK.texture.filtering.2d.combinations.nearest_mipmap_linear.linear.mirrored_repeat.repeat,Fail
-dEQP-VK.texture.filtering.2d.combinations.nearest_mipmap_linear.nearest.clamp_to_edge.repeat,Fail
-dEQP-VK.texture.filtering.2d.combinations.nearest_mipmap_linear.nearest.mirror_clamp_to_edge.repeat,Fail
-dEQP-VK.texture.filtering.2d.combinations.nearest_mipmap_linear.nearest.repeat.repeat,Fail
-dEQP-VK.texture.filtering.2d.formats.r8g8b8a8_snorm.linear_mipmap_linear,Fail
-dEQP-VK.texture.filtering.2d.formats.r8g8b8a8_unorm.nearest_mipmap_linear,Fail
-dEQP-VK.texture.filtering.2d_array.combinations.linear_mipmap_linear.linear.mirrored_repeat.mirrored_repeat,Fail
-dEQP-VK.texture.filtering.2d_array.combinations.linear_mipmap_linear.nearest.clamp_to_edge.mirrored_repeat,Fail
-dEQP-VK.texture.filtering.2d_array.combinations.linear_mipmap_linear.nearest.mirror_clamp_to_edge.mirrored_repeat,Fail
-dEQP-VK.texture.filtering.2d_array.combinations.linear_mipmap_linear.nearest.repeat.mirrored_repeat,Fail
-dEQP-VK.texture.filtering.2d_array.combinations.nearest_mipmap_linear.linear.mirrored_repeat.mirrored_repeat,Fail
-dEQP-VK.texture.filtering.2d_array.combinations.nearest_mipmap_linear.nearest.clamp_to_edge.mirrored_repeat,Fail
-dEQP-VK.texture.filtering.2d_array.combinations.nearest_mipmap_linear.nearest.mirror_clamp_to_edge.mirrored_repeat,Fail
-dEQP-VK.texture.filtering.2d_array.combinations.nearest_mipmap_linear.nearest.repeat.mirrored_repeat,Fail
-dEQP-VK.texture.filtering.2d_array.formats.r16g16b16a16_sfloat.r16g16b16a16_sfloat_nearest_mipmap_linear,Fail
-dEQP-VK.texture.filtering.2d_array.formats.r5g6b5_unorm.r5g6b5_unorm_nearest_mipmap_linear,Fail
-dEQP-VK.texture.filtering.2d_array.sizes.32x64x16.linear_mipmap_linear,Fail
-dEQP-VK.texture.filtering.3d.formats.b10g11r11_ufloat.b10g11r11_ufloat_linear_mipmap_linear,Fail
-dEQP-VK.texture.filtering.3d.sizes.63x63x63.nearest_mipmap_linear,Fail
-dEQP-VK.texture.filtering.cube.combinations.linear_mipmap_linear.linear.clamp_to_edge.mirrored_repeat,Fail
-dEQP-VK.texture.filtering.cube.combinations.linear_mipmap_linear.linear.mirror_clamp_to_edge.mirrored_repeat,Fail
-dEQP-VK.texture.filtering.cube.combinations.linear_mipmap_linear.linear.repeat.mirrored_repeat,Fail
-dEQP-VK.texture.filtering.cube.combinations.linear_mipmap_linear.nearest.clamp_to_border.mirrored_repeat,Fail
-dEQP-VK.texture.filtering.cube.combinations.linear_mipmap_linear.nearest.mirrored_repeat.mirrored_repeat,Fail
-dEQP-VK.texture.filtering.cube.combinations.nearest_mipmap_linear.linear.clamp_to_edge.mirrored_repeat,Fail
-dEQP-VK.texture.filtering.cube.combinations.nearest_mipmap_linear.linear.mirror_clamp_to_edge.mirrored_repeat,Fail
-dEQP-VK.texture.filtering.cube.combinations.nearest_mipmap_linear.linear.repeat.mirrored_repeat,Fail
-dEQP-VK.texture.filtering.cube.combinations.nearest_mipmap_linear.nearest.clamp_to_border.mirrored_repeat,Fail
-dEQP-VK.texture.filtering.cube.combinations.nearest_mipmap_linear.nearest.mirrored_repeat.mirrored_repeat,Fail
-dEQP-VK.texture.filtering.cube.formats.a1r5g5b5_unorm.linear_mipmap_linear,Fail
-dEQP-VK.texture.filtering.cube.formats.r8g8b8a8_snorm.linear_mipmap_linear,Fail
-dEQP-VK.texture.filtering.cube.sizes.128x128.nearest_mipmap_linear,Fail
-dEQP-VK.texture.mipmap.2d.basic.linear_linear_clamp_npot,Fail
-dEQP-VK.texture.mipmap.2d.basic.nearest_linear_clamp,Fail
-dEQP-VK.texture.mipmap.2d.max_level.nearest_linear,Fail
-dEQP-VK.texture.mipmap.2d.projected.linear_linear_repeat,Fail
-dEQP-VK.texture.mipmap.3d.affine.nearest_linear_clamp,Fail
-dEQP-VK.texture.mipmap.3d.basic.linear_linear_repeat,Fail
-dEQP-VK.texture.mipmap.cubemap.basic.linear_linear_nearest_clamp,Fail
-dEQP-VK.texture.mipmap.cubemap.basic.linear_nearest_nearest_mirror,Fail
-dEQP-VK.texture.mipmap.cubemap.bias.linear_linear_nearest_mirror,Fail
-dEQP-VK.texture.mipmap.cubemap.bias.linear_nearest_linear_repeat,Fail
-dEQP-VK.texture.mipmap.cubemap.bias.nearest_nearest_nearest_clamp,Fail
-dEQP-VK.texture.mipmap.cubemap.max_lod.nearest_linear,Fail
-dEQP-VK.texture.mipmap.cubemap.projected.nearest_linear_nearest_mirror,Fail
-dEQP-VK.texture.mipmap.cubemap.projected.nearest_nearest_linear_repeat,Fail

.gitlab-ci/deqp-lvp-flakes.txt

@@ -1 +0,0 @@
-dEQP-VK.tessellation.invariance.outer_edge_division.quads_fractional_odd_spacing

.gitlab-ci/deqp-lvp-skips.txt

@@ -1,9 +0,0 @@
-# Note: skips lists for CI are just a list of lines that, when
-# non-zero-length and not starting with '#', will regex match to
-# delete lines from the test list.  Be careful.
-
-# TODO: fix me
-dEQP-VK.texture.filtering.3d.sizes.3x7x5.linear_mipmap_linear
-
-# Timeout (VK-GL-CTS 1.2.5.0)
-dEQP-VK.tessellation.invariance.outer_triangle_set.quads_fractional_odd_spacing

.gitlab-ci/deqp-panfrost-g52-fails.txt

@@ -0,0 +1,105 @@
+dEQP-GLES2.functional.clipping.triangle_vertex.clip_three.clip_neg_x_neg_z_and_pos_x_pos_z_and_neg_x_neg_y_pos_z,Fail
+dEQP-GLES2.functional.fbo.completeness.renderable.renderbuffer.color0.r16f,Fail
+dEQP-GLES2.functional.fbo.completeness.renderable.renderbuffer.color0.rg16f,Fail
+dEQP-GLES2.functional.fbo.completeness.renderable.renderbuffer.color0.rgba16f,Fail
+dEQP-GLES2.functional.fbo.completeness.renderable.renderbuffer.depth.r16f,Fail
+dEQP-GLES2.functional.fbo.completeness.renderable.renderbuffer.depth.rg16f,Fail
+dEQP-GLES2.functional.fbo.completeness.renderable.renderbuffer.depth.rgba16f,Fail
+dEQP-GLES2.functional.fbo.completeness.renderable.renderbuffer.stencil.r16f,Fail
+dEQP-GLES2.functional.fbo.completeness.renderable.renderbuffer.stencil.rg16f,Fail
+dEQP-GLES2.functional.fbo.completeness.renderable.renderbuffer.stencil.rgba16f,Fail
+dEQP-GLES2.functional.fbo.completeness.renderable.texture.color0.r8,Fail
+dEQP-GLES2.functional.fbo.completeness.renderable.texture.color0.rg8,Fail
+dEQP-GLES2.functional.fbo.completeness.renderable.texture.color0.rgb10_a2,Fail
+dEQP-GLES2.functional.fbo.completeness.renderable.texture.color0.rgb_half_float_oes,Fail
+dEQP-GLES2.functional.fbo.completeness.size.distinct,Fail
+dEQP-GLES2.functional.fbo.render.color.blend_npot_rbo_rgb565,Fail
+dEQP-GLES2.functional.fbo.render.color.blend_npot_rbo_rgb565_depth_component16,Fail
+dEQP-GLES2.functional.fbo.render.color.blend_npot_tex2d_rgb,Fail
+dEQP-GLES2.functional.fbo.render.color.blend_npot_tex2d_rgb_depth_component16,Fail
+dEQP-GLES2.functional.fbo.render.color.blend_rbo_rgb565,Fail
+dEQP-GLES2.functional.fbo.render.color.blend_rbo_rgb565_depth_component16,Fail
+dEQP-GLES2.functional.fbo.render.color.blend_tex2d_rgb,Fail
+dEQP-GLES2.functional.fbo.render.color.blend_tex2d_rgb_depth_component16,Fail
+dEQP-GLES2.functional.fbo.render.shared_colorbuffer.rbo_rgb565,Fail
+dEQP-GLES2.functional.fbo.render.shared_colorbuffer.rbo_rgb565_depth_component16,Fail
+dEQP-GLES2.functional.fbo.render.shared_colorbuffer.rbo_rgb565_stencil_index8,Fail
+dEQP-GLES2.functional.fbo.render.shared_colorbuffer.tex2d_rgb,Fail
+dEQP-GLES2.functional.fbo.render.shared_colorbuffer.tex2d_rgb_depth_component16,Fail
+dEQP-GLES2.functional.fbo.render.shared_colorbuffer.tex2d_rgb_stencil_index8,Fail
+dEQP-GLES2.functional.fbo.render.texsubimage.between_render_tex2d_rgb,Fail
+dEQP-GLES2.functional.fragment_ops.blend.rgb_func_alpha_func.src.constant_color_dst_alpha,Fail
+dEQP-GLES2.functional.fragment_ops.blend.rgb_func_alpha_func.src.constant_color_dst_color,Fail
+dEQP-GLES2.functional.fragment_ops.blend.rgb_func_alpha_func.src.constant_color_one_minus_dst_alpha,Fail
+dEQP-GLES2.functional.fragment_ops.blend.rgb_func_alpha_func.src.constant_color_one_minus_dst_color,Fail
+dEQP-GLES2.functional.fragment_ops.blend.rgb_func_alpha_func.src.one_minus_constant_color_dst_alpha,Fail
+dEQP-GLES2.functional.fragment_ops.blend.rgb_func_alpha_func.src.one_minus_constant_color_dst_color,Fail
+dEQP-GLES2.functional.fragment_ops.blend.rgb_func_alpha_func.src.one_minus_constant_color_one_minus_dst_alpha,Fail
+dEQP-GLES2.functional.fragment_ops.blend.rgb_func_alpha_func.src.one_minus_constant_color_one_minus_dst_color,Fail
+dEQP-GLES2.functional.fragment_ops.interaction.basic_shader.14,Fail
+dEQP-GLES2.functional.fragment_ops.interaction.basic_shader.22,Fail
+dEQP-GLES2.functional.fragment_ops.interaction.basic_shader.31,Fail
+dEQP-GLES2.functional.fragment_ops.interaction.basic_shader.32,Fail
+dEQP-GLES2.functional.fragment_ops.interaction.basic_shader.42,Fail
+dEQP-GLES2.functional.fragment_ops.interaction.basic_shader.43,Fail
+dEQP-GLES2.functional.fragment_ops.interaction.basic_shader.61,Fail
+dEQP-GLES2.functional.fragment_ops.interaction.basic_shader.67,Fail
+dEQP-GLES2.functional.fragment_ops.random.11,Fail
+dEQP-GLES2.functional.fragment_ops.random.24,Fail
+dEQP-GLES2.functional.fragment_ops.random.41,Fail
+dEQP-GLES2.functional.fragment_ops.random.45,Fail
+dEQP-GLES2.functional.fragment_ops.random.48,Fail
+dEQP-GLES2.functional.fragment_ops.random.5,Fail
+dEQP-GLES2.functional.fragment_ops.random.51,Fail
+dEQP-GLES2.functional.fragment_ops.random.67,Fail
+dEQP-GLES2.functional.fragment_ops.random.98,Fail
+dEQP-GLES2.functional.negative_api.shader.uniform_matrixfv_invalid_transpose,Fail
+dEQP-GLES2.functional.negative_api.texture.generatemipmap_zero_level_array_compressed,Fail
+dEQP-GLES2.functional.shaders.builtin_variable.fragcoord_xyz,Fail
+dEQP-GLES2.functional.shaders.random.all_features.fragment.88,Fail
+dEQP-GLES2.functional.shaders.texture_functions.vertex.texturecubelod,Fail
+dEQP-GLES2.functional.texture.mipmap.2d.generate.a8_fastest,Fail
+dEQP-GLES2.functional.texture.mipmap.2d.generate.a8_nicest,Fail
+dEQP-GLES2.functional.texture.mipmap.2d.generate.a8_non_square_fastest,Fail
+dEQP-GLES2.functional.texture.mipmap.2d.generate.a8_non_square_nicest,Fail
+dEQP-GLES2.functional.texture.mipmap.2d.generate.l8_fastest,Fail
+dEQP-GLES2.functional.texture.mipmap.2d.generate.l8_nicest,Fail
+dEQP-GLES2.functional.texture.mipmap.2d.generate.l8_non_square_fastest,Fail
+dEQP-GLES2.functional.texture.mipmap.2d.generate.l8_non_square_nicest,Fail
+dEQP-GLES2.functional.texture.mipmap.2d.generate.la88_fastest,Fail
+dEQP-GLES2.functional.texture.mipmap.2d.generate.la88_nicest,Fail
+dEQP-GLES2.functional.texture.mipmap.2d.generate.la88_non_square_fastest,Fail
+dEQP-GLES2.functional.texture.mipmap.2d.generate.la88_non_square_nicest,Fail
+dEQP-GLES2.functional.texture.mipmap.cube.basic.linear_linear,Fail
+dEQP-GLES2.functional.texture.mipmap.cube.basic.linear_nearest,Fail
+dEQP-GLES2.functional.texture.mipmap.cube.bias.linear_linear,Fail
+dEQP-GLES2.functional.texture.mipmap.cube.bias.linear_nearest,Fail
+dEQP-GLES2.functional.texture.mipmap.cube.generate.a8_fastest,Fail
+dEQP-GLES2.functional.texture.mipmap.cube.generate.a8_nicest,Fail
+dEQP-GLES2.functional.texture.mipmap.cube.generate.l8_fastest,Fail
+dEQP-GLES2.functional.texture.mipmap.cube.generate.l8_nicest,Fail
+dEQP-GLES2.functional.texture.mipmap.cube.generate.la88_fastest,Fail
+dEQP-GLES2.functional.texture.mipmap.cube.generate.la88_nicest,Fail
+dEQP-GLES2.functional.texture.mipmap.cube.projected.linear_linear,Fail
+dEQP-GLES2.functional.texture.mipmap.cube.projected.linear_nearest,Fail
+dEQP-GLES2.functional.texture.specification.basic_copyteximage2d.2d_alpha,Fail
+dEQP-GLES2.functional.texture.specification.basic_copyteximage2d.cube_alpha,Fail
+dEQP-GLES2.functional.texture.specification.basic_copytexsubimage2d.2d_alpha,Fail
+dEQP-GLES2.functional.texture.specification.basic_copytexsubimage2d.cube_alpha,Fail
+dEQP-GLES2.functional.texture.vertex.cube.filtering.linear_mipmap_linear_linear_clamp,Fail
+dEQP-GLES2.functional.texture.vertex.cube.filtering.linear_mipmap_linear_linear_mirror,Fail
+dEQP-GLES2.functional.texture.vertex.cube.filtering.linear_mipmap_linear_nearest_clamp,Fail
+dEQP-GLES2.functional.texture.vertex.cube.filtering.linear_mipmap_linear_nearest_mirror,Fail
+dEQP-GLES2.functional.texture.vertex.cube.filtering.nearest_mipmap_linear_linear_clamp,Fail
+dEQP-GLES2.functional.texture.vertex.cube.filtering.nearest_mipmap_linear_linear_mirror,Fail
+dEQP-GLES2.functional.texture.vertex.cube.filtering.nearest_mipmap_linear_linear_repeat,Fail
+dEQP-GLES2.functional.texture.vertex.cube.filtering.nearest_mipmap_nearest_linear_clamp,Fail
+dEQP-GLES2.functional.texture.vertex.cube.filtering.nearest_mipmap_nearest_linear_mirror,Fail
+dEQP-GLES2.functional.texture.vertex.cube.filtering.nearest_mipmap_nearest_linear_repeat,Fail
+dEQP-GLES2.functional.texture.vertex.cube.wrap.clamp_clamp,Fail
+dEQP-GLES2.functional.texture.vertex.cube.wrap.clamp_mirror,Fail
+dEQP-GLES2.functional.texture.vertex.cube.wrap.clamp_repeat,Fail
+dEQP-GLES2.functional.texture.vertex.cube.wrap.mirror_clamp,Fail
+dEQP-GLES2.functional.texture.vertex.cube.wrap.mirror_mirror,Fail
+dEQP-GLES2.functional.texture.vertex.cube.wrap.mirror_repeat,Fail
+dEQP-GLES2.functional.uniform_api.random.79,Fail

.gitlab-ci/deqp-panfrost-g52-flakes.txt

@@ -1,3 +1,4 @@
+dEQP-GLES2.functional.clipping.triangle_vertex.clip_three.clip_neg_x_neg_z_and_pos_x_pos_z_and_neg_x_neg_y_pos_z
 dEQP-GLES2.functional.texture.vertex.cube.filtering.nearest_mipmap_linear_linear_clamp
 dEQP-GLES2.functional.texture.vertex.cube.filtering.nearest_mipmap_linear_linear_mirror
 dEQP-GLES2.functional.texture.vertex.cube.filtering.nearest_mipmap_linear_linear_repeat

.gitlab-ci/deqp-panfrost-g52-skips.txt

@@ -9,7 +9,3 @@ dEQP-GLES[0-9]*.stress.*
 # These are really slow on tiling architectures (including llvmpipe).
 dEQP-GLES[0-9]*.functional.flush_finish.*
 
-# Currently exactly 4096 bytes, which causes INSTR_INVALID_ENC for unknown
-# reasons. This needs to be sorted out asap to avoid creating flakes in the near
-# future, which would be a Very Bad Thing.
-dEQP-GLES2.functional.shaders.indexing.tmp_array.vec3_const_write_dynamic_loop_read_vertex

.gitlab-ci/deqp-panfrost-t720-flakes.txt

@@ -1,4 +1,15 @@
-dEQP-GLES2.functional.fragment_ops.interaction.basic_shader.*
-dEQP-GLES2.functional.fragment_ops.random.*
+dEQP-GLES2.functional.fragment_ops.interaction.basic_shader.4
+dEQP-GLES2.functional.fragment_ops.interaction.basic_shader.11
+dEQP-GLES2.functional.fragment_ops.interaction.basic_shader.18
+dEQP-GLES2.functional.fragment_ops.interaction.basic_shader.39
+dEQP-GLES2.functional.fragment_ops.interaction.basic_shader.40
+dEQP-GLES2.functional.fragment_ops.interaction.basic_shader.56
+dEQP-GLES2.functional.fragment_ops.interaction.basic_shader.80
+dEQP-GLES2.functional.fragment_ops.interaction.basic_shader.81
+dEQP-GLES2.functional.fragment_ops.random.17
+dEQP-GLES2.functional.fragment_ops.random.24
+dEQP-GLES2.functional.fragment_ops.random.54
+dEQP-GLES2.functional.fragment_ops.random.59
+dEQP-GLES2.functional.fragment_ops.random.71
 dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.*
 dEQP-GLES2.functional.fragment_ops.blend.rgb_func_alpha_func.*

.gitlab-ci/deqp-panfrost-t720-skips.txt

@@ -9,6 +9,9 @@ dEQP-GLES[0-9]*.stress.*
 # These are really slow on tiling architectures (including llvmpipe).
 dEQP-GLES[0-9]*.functional.flush_finish.*
 
+# XXX: Why does this flake?
+dEQP-GLES2.functional.clipping.triangle_vertex.clip_three.clip_neg_x_neg_z_and_pos_x_pos_z_and_neg_x_neg_y_pos_z
+
 # Needs investigation
 dEQP-GLES2.functional.fbo.render.shared_colorbuffer.rbo_rgb565_depth_component16
 dEQP-GLES2.functional.fbo.render.shared_colorbuffer.tex2d_rgba_depth_component16

.gitlab-ci/deqp-panfrost-t820-skips.txt

@@ -8,3 +8,6 @@ dEQP-GLES[0-9]*.stress.*
 
 # These are really slow on tiling architectures (including llvmpipe).
 dEQP-GLES[0-9]*.functional.flush_finish.*
+
+# XXX: Why does this flake?
+dEQP-GLES2.functional.clipping.triangle_vertex.clip_three.clip_neg_x_neg_z_and_pos_x_pos_z_and_neg_x_neg_y_pos_z

.gitlab-ci/deqp-panfrost-t860-fails.txt

@@ -12,5 +12,31 @@ dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_min_reverse_src_dst_x,Fa
 dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_min_reverse_src_dst_y,Fail
 dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_min_reverse_src_x,Fail
 dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_min_reverse_src_y,Fail
-dEQP-GLES3.functional.shaders.matrix.inverse.dynamic.lowp_mat2_float_vertex,Fail
-dEQP-GLES3.functional.shaders.matrix.inverse.dynamic.mediump_mat2_float_vertex,Fail
+dEQP-GLES3.functional.fbo.invalidate.sub.unbind_blit_msaa_color,Fail
+dEQP-GLES3.functional.fbo.invalidate.sub.unbind_blit_msaa_depth,Fail
+dEQP-GLES3.functional.fbo.invalidate.sub.unbind_blit_msaa_stencil,Fail
+dEQP-GLES3.functional.fbo.invalidate.whole.unbind_blit_msaa_color,Fail
+dEQP-GLES3.functional.fbo.invalidate.whole.unbind_blit_msaa_depth,Fail
+dEQP-GLES3.functional.fbo.invalidate.whole.unbind_blit_msaa_stencil,Fail
+dEQP-GLES3.functional.fbo.msaa.2_samples.depth24_stencil8,Fail
+dEQP-GLES3.functional.fbo.msaa.2_samples.depth32f_stencil8,Fail
+dEQP-GLES3.functional.fbo.msaa.2_samples.depth_component16,Fail
+dEQP-GLES3.functional.fbo.msaa.2_samples.depth_component24,Fail
+dEQP-GLES3.functional.fbo.msaa.2_samples.depth_component32f,Fail
+dEQP-GLES3.functional.fbo.msaa.2_samples.r16f,Fail
+dEQP-GLES3.functional.fbo.msaa.2_samples.rg16f,Fail
+dEQP-GLES3.functional.fbo.msaa.2_samples.rgba16f,Fail
+dEQP-GLES3.functional.fbo.msaa.2_samples.stencil_index8,Fail
+dEQP-GLES3.functional.fbo.msaa.4_samples.depth24_stencil8,Fail
+dEQP-GLES3.functional.fbo.msaa.4_samples.depth32f_stencil8,Fail
+dEQP-GLES3.functional.fbo.msaa.4_samples.depth_component16,Fail
+dEQP-GLES3.functional.fbo.msaa.4_samples.depth_component24,Fail
+dEQP-GLES3.functional.fbo.msaa.4_samples.depth_component32f,Fail
+dEQP-GLES3.functional.fbo.msaa.4_samples.r16f,Fail
+dEQP-GLES3.functional.fbo.msaa.4_samples.r32f,Fail
+dEQP-GLES3.functional.fbo.msaa.4_samples.rg16f,Fail
+dEQP-GLES3.functional.fbo.msaa.4_samples.rg32f,Fail
+dEQP-GLES3.functional.fbo.msaa.4_samples.rgba16f,Fail
+dEQP-GLES3.functional.fbo.msaa.4_samples.rgba32f,Fail
+dEQP-GLES3.functional.fbo.msaa.4_samples.stencil_index8,Fail
+dEQP-GLES3.functional.fence_sync.client_wait_sync_finish,Fail

.gitlab-ci/deqp-panfrost-t860-skips.txt

@@ -8,3 +8,6 @@ dEQP-GLES[0-9]*.stress.*
 
 # These are really slow on tiling architectures (including llvmpipe).
 dEQP-GLES[0-9]*.functional.flush_finish.*
+
+# XXX: Why does this flake?
+dEQP-GLES2.functional.clipping.triangle_vertex.clip_three.clip_neg_x_neg_z_and_pos_x_pos_z_and_neg_x_neg_y_pos_z

.gitlab-ci/deqp-radv-default-skips.txt

@@ -4,6 +4,3 @@ dEQP-VK.info.device_extensions
 # Exclude WSI related tests.
 dEQP-VK.image.swapchain_mutable.*
 dEQP-VK.wsi.*
-
-# Exclude this test which timeout most of the time.
-dEQP-VK.memory.pipeline_barrier.transfer_src_transfer_dst.1048576

.gitlab-ci/deqp-radv-fiji-aco-fails.txt

@@ -1,3 +1,4 @@
+# Interesting failures...,Fail
 dEQP-VK.renderpass2.depth_stencil_resolve.image_2d_16_64_6.samples_2.d32_sfloat_s8_uint.stencil_max,Fail
 dEQP-VK.renderpass2.depth_stencil_resolve.image_2d_16_64_6.samples_2.d32_sfloat_s8_uint.stencil_min,Fail
 dEQP-VK.renderpass2.depth_stencil_resolve.image_2d_16_64_6.samples_2.d32_sfloat_s8_uint.stencil_zero,Fail
@@ -16,3 +17,13 @@ dEQP-VK.renderpass2.depth_stencil_resolve.image_2d_16_64_6.samples_8.d32_sfloat_
 dEQP-VK.renderpass2.depth_stencil_resolve.image_2d_16_64_6.samples_8.d32_sfloat_s8_uint_separate_layouts.stencil_max,Fail
 dEQP-VK.renderpass2.depth_stencil_resolve.image_2d_16_64_6.samples_8.d32_sfloat_s8_uint_separate_layouts.stencil_min,Fail
 dEQP-VK.renderpass2.depth_stencil_resolve.image_2d_16_64_6.samples_8.d32_sfloat_s8_uint_separate_layouts.stencil_zero,Fail
+
+dEQP-VK.rasterization.flatshading.line_strip_wide,Fail
+dEQP-VK.rasterization.flatshading.non_strict_line_strip_wide,Fail
+dEQP-VK.rasterization.flatshading.non_strict_lines_wide,Fail
+dEQP-VK.rasterization.interpolation.basic.line_strip_wide,Fail
+dEQP-VK.rasterization.interpolation.basic.non_strict_line_strip_wide,Fail
+dEQP-VK.rasterization.interpolation.basic.non_strict_lines_wide,Fail
+dEQP-VK.rasterization.interpolation.projected.lines_wide,Fail
+dEQP-VK.rasterization.interpolation.projected.non_strict_line_strip_wide,Fail
+dEQP-VK.rasterization.interpolation.projected.non_strict_lines_wide,Fail

.gitlab-ci/deqp-radv-navi10-aco-fails.txt

@@ -0,0 +1,9 @@
+dEQP-VK.rasterization.flatshading.line_strip_wide,Fail
+dEQP-VK.rasterization.flatshading.non_strict_line_strip_wide,Fail
+dEQP-VK.rasterization.flatshading.non_strict_lines_wide,Fail
+dEQP-VK.rasterization.interpolation.basic.line_strip_wide,Fail
+dEQP-VK.rasterization.interpolation.basic.non_strict_line_strip_wide,Fail
+dEQP-VK.rasterization.interpolation.basic.non_strict_lines_wide,Fail
+dEQP-VK.rasterization.interpolation.projected.lines_wide,Fail
+dEQP-VK.rasterization.interpolation.projected.non_strict_line_strip_wide,Fail
+dEQP-VK.rasterization.interpolation.projected.non_strict_lines_wide,Fail

.gitlab-ci/deqp-radv-navi14-aco-fails.txt

@@ -0,0 +1,9 @@
+dEQP-VK.rasterization.flatshading.line_strip_wide,Fail
+dEQP-VK.rasterization.flatshading.non_strict_line_strip_wide,Fail
+dEQP-VK.rasterization.flatshading.non_strict_lines_wide,Fail
+dEQP-VK.rasterization.interpolation.basic.line_strip_wide,Fail
+dEQP-VK.rasterization.interpolation.basic.non_strict_line_strip_wide,Fail
+dEQP-VK.rasterization.interpolation.basic.non_strict_lines_wide,Fail
+dEQP-VK.rasterization.interpolation.projected.lines_wide,Fail
+dEQP-VK.rasterization.interpolation.projected.non_strict_line_strip_wide,Fail
+dEQP-VK.rasterization.interpolation.projected.non_strict_lines_wide,Fail

.gitlab-ci/deqp-radv-polaris10-aco-fails.txt

@@ -0,0 +1,9 @@
+dEQP-VK.rasterization.flatshading.line_strip_wide,Fail
+dEQP-VK.rasterization.flatshading.non_strict_line_strip_wide,Fail
+dEQP-VK.rasterization.flatshading.non_strict_lines_wide,Fail
+dEQP-VK.rasterization.interpolation.basic.line_strip_wide,Fail
+dEQP-VK.rasterization.interpolation.basic.non_strict_line_strip_wide,Fail
+dEQP-VK.rasterization.interpolation.basic.non_strict_lines_wide,Fail
+dEQP-VK.rasterization.interpolation.projected.lines_wide,Fail
+dEQP-VK.rasterization.interpolation.projected.non_strict_line_strip_wide,Fail
+dEQP-VK.rasterization.interpolation.projected.non_strict_lines_wide,Fail

.gitlab-ci/deqp-radv-raven-aco-fails.txt

@@ -0,0 +1,9 @@
+dEQP-VK.rasterization.flatshading.line_strip_wide,Fail
+dEQP-VK.rasterization.flatshading.non_strict_line_strip_wide,Fail
+dEQP-VK.rasterization.flatshading.non_strict_lines_wide,Fail
+dEQP-VK.rasterization.interpolation.basic.line_strip_wide,Fail
+dEQP-VK.rasterization.interpolation.basic.non_strict_line_strip_wide,Fail
+dEQP-VK.rasterization.interpolation.basic.non_strict_lines_wide,Fail
+dEQP-VK.rasterization.interpolation.projected.lines_wide,Fail
+dEQP-VK.rasterization.interpolation.projected.non_strict_line_strip_wide,Fail
+dEQP-VK.rasterization.interpolation.projected.non_strict_lines_wide,Fail

.gitlab-ci/deqp-radv-raven-aco-skips.txt

@@ -1,13 +1,3 @@
-# Exclude this test which might fail when a new extension is implemented.
-dEQP-VK.info.device_extensions
-
-# Exclude WSI related tests.
-dEQP-VK.image.swapchain_mutable.*
-dEQP-VK.wsi.*
-
 # This subset of CTS seems to randomly hangs on RAVEN only.
 # This needs to be investigated and fixed!
 dEQP-VK.synchronization.*
-
-# Exclude this test which timeout most of the time.
-dEQP-VK.memory.pipeline_barrier.transfer_src_transfer_dst.1048576

.gitlab-ci/deqp-radv-vega10-aco-fails.txt

@@ -0,0 +1,9 @@
+dEQP-VK.rasterization.flatshading.line_strip_wide,Fail
+dEQP-VK.rasterization.flatshading.non_strict_line_strip_wide,Fail
+dEQP-VK.rasterization.flatshading.non_strict_lines_wide,Fail
+dEQP-VK.rasterization.interpolation.basic.line_strip_wide,Fail
+dEQP-VK.rasterization.interpolation.basic.non_strict_line_strip_wide,Fail
+dEQP-VK.rasterization.interpolation.basic.non_strict_lines_wide,Fail
+dEQP-VK.rasterization.interpolation.projected.lines_wide,Fail
+dEQP-VK.rasterization.interpolation.projected.non_strict_line_strip_wide,Fail
+dEQP-VK.rasterization.interpolation.projected.non_strict_lines_wide,Fail

.gitlab-ci/deqp-runner.sh

@@ -24,8 +24,8 @@ if [ "$DEQP_VER" = "vk" ]; then
    fi
 fi
 
-if [ -z "$GPU_VERSION" ]; then
-   echo 'GPU_VERSION must be set to something like "llvmpipe" or "freedreno-a630" (the name used in .gitlab-ci/deqp-gpu-version-*.txt)'
+if [ -z "$DEQP_SKIPS" ]; then
+   echo 'DEQP_SKIPS must be set to something like "deqp-default-skips.txt"'
    exit 1
 fi
 
@@ -57,15 +57,8 @@ else
    SUITE=KHR
 fi
 
-# If the caselist is too long to run in a reasonable amount of time, let the job
-# specify what fraction (1/n) of the caselist we should run.  Note: N~M is a gnu
-# sed extension to match every nth line (first line is #1).
-if [ -n "$DEQP_FRACTION" ]; then
-   sed -ni 1~$DEQP_FRACTION"p" /tmp/case-list.txt
-fi
-
-# If the job is parallel at the gitab job level, take the corresponding fraction
-# of the caselist.
+# If the job is parallel, take the corresponding fraction of the caselist.
+# Note: N~M is a gnu sed extension to match every nth line (first line is #1).
 if [ -n "$CI_NODE_INDEX" ]; then
    sed -ni $CI_NODE_INDEX~$CI_NODE_TOTAL"p" /tmp/case-list.txt
 fi
@@ -79,18 +72,12 @@ if [ ! -s /tmp/case-list.txt ]; then
     exit 1
 fi
 
-if [ -e "$INSTALL/deqp-$GPU_VERSION-fails.txt" ]; then
-    DEQP_RUNNER_OPTIONS="$DEQP_RUNNER_OPTIONS --baseline $INSTALL/deqp-$GPU_VERSION-fails.txt"
+if [ -n "$DEQP_EXPECTED_FAILS" ]; then
+    BASELINE="--baseline $INSTALL/$DEQP_EXPECTED_FAILS"
 fi
 
-if [ -e "$INSTALL/deqp-$GPU_VERSION-flakes.txt" ]; then
-    DEQP_RUNNER_OPTIONS="$DEQP_RUNNER_OPTIONS --flakes $INSTALL/deqp-$GPU_VERSION-flakes.txt"
-fi
-
-if [ -e "$INSTALL/deqp-$GPU_VERSION-skips.txt" ]; then
-    DEQP_RUNNER_OPTIONS="$DEQP_RUNNER_OPTIONS --skips $INSTALL/deqp-$GPU_VERSION-skips.txt"
-else
-    DEQP_RUNNER_OPTIONS="$DEQP_RUNNER_OPTIONS --skips $INSTALL/deqp-default-skips.txt"
+if [ -n "$DEQP_FLAKES" ]; then
+    FLAKES="--flakes $INSTALL/$DEQP_FLAKES"
 fi
 
 set +e
@@ -104,7 +91,7 @@ else
 fi
 
 # If this CI lab lacks artifacts support, print the whole list of failures/flakes.
-if [ -n "$DEQP_NO_SAVE_RESULTS" ]; then
+if [ -z "$DEQP_NO_SAVE_RESULTS" ]; then
    SUMMARY_LIMIT="--summary-limit 0"
 fi
 
@@ -120,7 +107,9 @@ run_cts() {
         --deqp $deqp \
         --output $RESULTS \
         --caselist $caselist \
-        --testlog-to-xml  /deqp/executor/testlog-to-xml \
+        --skips $INSTALL/$DEQP_SKIPS \
+        $BASELINE \
+        $FLAKES \
         $JOB \
         $SUMMARY_LIMIT \
 	$DEQP_RUNNER_OPTIONS \
@@ -171,6 +160,31 @@ report_flakes() {
 
 }
 
+# Generate junit results
+generate_junit() {
+    results=$1
+    echo "<?xml version=\"1.0\" encoding=\"utf-8\"?>"
+    echo "<testsuites>"
+    echo "<testsuite name=\"$DEQP_VER-$CI_NODE_INDEX\">"
+    while read line; do
+        testcase=${line%,*}
+        result=${line#*,}
+        # avoid counting Skip's in the # of tests:
+        if [ "$result" = "Skip" ]; then
+            continue;
+        fi
+        echo "<testcase name=\"$testcase\">"
+        if [ "$result" != "Pass" ]; then
+            echo "<failure type=\"$result\">"
+            echo "$result: See $CI_JOB_URL/artifacts/results/$testcase.xml"
+            echo "</failure>"
+        fi
+        echo "</testcase>"
+    done < $results
+    echo "</testsuite>"
+    echo "</testsuites>"
+}
+
 parse_renderer() {
     RENDERER=`grep -A1 TestCaseResult.\*info.renderer $RESULTS/deqp-info.qpa | grep '<Text' | sed 's|.*<Text>||g' | sed 's|</Text>||g'`
     VERSION=`grep -A1 TestCaseResult.\*info.version $RESULTS/deqp-info.qpa | grep '<Text' | sed 's|.*<Text>||g' | sed 's|</Text>||g'`
@@ -204,11 +218,6 @@ check_vk_device_name() {
     fi
 }
 
-report_load() {
-    echo "System load: $(cut -d' ' -f1-3 < /proc/loadavg)"
-    echo "# of CPU cores: $(cat /proc/cpuinfo | grep processor | wc -l)"
-}
-
 # wrapper to supress +x to avoid spamming the log
 quiet() {
     set +x
@@ -244,26 +253,31 @@ FAILURES_CSV=$RESULTS/failures.csv
 run_cts $DEQP /tmp/case-list.txt $RESULTS_CSV
 DEQP_EXITCODE=$?
 
-quiet report_load
+echo "System load: $(cut -d' ' -f1-3 < /proc/loadavg)"
+echo "# of CPU cores: $(cat /proc/cpuinfo | grep processor | wc -l)"
 
-# Remove all but the first 50 individual XML files uploaded as artifacts, to
-# save fd.o space when you break everything.
-find $RESULTS -name \*.xml | \
-    sort -n |
-    sed -n '1,+49!p' | \
-    xargs rm -f
+# Remove the shader cache, no need to include in the artifacts.
+find $RESULTS -name \*.shader_cache | xargs rm -f
 
-# If any QPA XMLs are there, then include the XSL/CSS in our artifacts.
-find $RESULTS -name \*.xml \
-    -exec cp /deqp/testlog.css /deqp/testlog.xsl "$RESULTS/" ";" \
-    -quit
+# junit is disabled, because it overloads gitlab.freedesktop.org to parse it.
+# quiet generate_junit $RESULTS_CSV > $RESULTS/results.xml
 
-deqp-runner junit \
-   --testsuite $DEQP_VER \
-   --results $RESULTS/failures.csv \
-   --output $RESULTS/junit.xml \
-   --limit 50 \
-   --template "See https://$CI_PROJECT_NAMESPACE.pages.freedesktop.org/-/$CI_PROJECT_NAME/-/jobs/$CI_JOB_ID/artifacts/results/{{testcase}}.xml"
+# Turn up to the first 50 individual test QPA files from failures or flakes into
+# XML results you can view from the browser.
+qpas=`find $RESULTS -name \*.qpa -a ! -name deqp-info.qpa`
+if [ -n "$qpas" ]; then
+    shard_qpas=`echo "$qpas" | grep dEQP- | head -n 50`
+    for qpa in $shard_qpas; do
+        xml=`echo $qpa | sed 's|\.qpa|.xml|'`
+        /deqp/executor/testlog-to-xml $qpa $xml
+    done
+
+    cp /deqp/testlog.css "$RESULTS/"
+    cp /deqp/testlog.xsl "$RESULTS/"
+
+    # Remove all the QPA files (extracted or not) now that we have the XML we want.
+    echo $qpas | xargs rm -f
+fi
 
 # Report the flakes to the IRC channel for monitoring (if configured):
 quiet report_flakes $RESULTS_CSV

.gitlab-ci/deqp-softpipe-fails.txt

@@ -93,6 +93,12 @@ dEQP-GLES3.functional.rasterization.interpolation.basic.lines_wide,Fail
 dEQP-GLES3.functional.rasterization.interpolation.projected.line_loop_wide,Fail
 dEQP-GLES3.functional.rasterization.interpolation.projected.line_strip_wide,Fail
 dEQP-GLES3.functional.rasterization.interpolation.projected.lines_wide,Fail
+dEQP-GLES3.functional.rasterizer_discard.basic.write_depth_points,Fail
+dEQP-GLES3.functional.rasterizer_discard.basic.write_stencil_points,Fail
+dEQP-GLES3.functional.rasterizer_discard.fbo.write_depth_points,Fail
+dEQP-GLES3.functional.rasterizer_discard.fbo.write_stencil_points,Fail
+dEQP-GLES3.functional.rasterizer_discard.scissor.write_depth_points,Fail
+dEQP-GLES3.functional.rasterizer_discard.scissor.write_stencil_points,Fail
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_msaa4.float_highp,Fail
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_msaa4.float_mediump,Fail
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_msaa4.vec2_highp,Fail
@@ -492,6 +498,7 @@ dEQP-GLES31.functional.image_load_store.early_fragment_tests.early_fragment_test
 dEQP-GLES31.functional.image_load_store.early_fragment_tests.early_fragment_tests_stencil_fbo,Fail
 dEQP-GLES31.functional.image_load_store.early_fragment_tests.no_early_fragment_tests_depth,Fail
 dEQP-GLES31.functional.image_load_store.early_fragment_tests.no_early_fragment_tests_depth_fbo,Fail
+dEQP-GLES31.functional.shaders.opaque_type_indexing.ubo.dynamically_uniform_geometry,Crash
 dEQP-GLES31.functional.state_query.integer.max_framebuffer_samples_getfloat,Fail
 dEQP-GLES31.functional.state_query.integer.max_framebuffer_samples_getinteger,Fail
 dEQP-GLES31.functional.state_query.integer.max_framebuffer_samples_getinteger64,Fail
@@ -564,15 +571,55 @@ dEQP-GLES31.functional.texture.filtering.cube_array.sizes.63x63x18_nearest_mipma
 dEQP-GLES31.functional.texture.filtering.cube_array.sizes.64x64x12_nearest_mipmap_linear,Fail
 dEQP-GLES31.functional.texture.filtering.cube_array.sizes.64x64x12_nearest_mipmap_nearest,Fail
 dEQP-GLES31.functional.texture.filtering.cube_array.sizes.8x8x6_nearest,Fail
+dEQP-GLES31.functional.texture.gather.basic.2d.rgba8i.texture_swizzle.alpha_zero_one_red,Fail
+dEQP-GLES31.functional.texture.gather.basic.2d.rgba8i.texture_swizzle.blue_alpha_zero_one,Fail
+dEQP-GLES31.functional.texture.gather.basic.2d.rgba8i.texture_swizzle.one_red_green_blue,Fail
+dEQP-GLES31.functional.texture.gather.basic.2d.rgba8i.texture_swizzle.zero_one_red_green,Fail
+dEQP-GLES31.functional.texture.gather.basic.2d.rgba8ui.texture_swizzle.alpha_zero_one_red,Fail
+dEQP-GLES31.functional.texture.gather.basic.2d.rgba8ui.texture_swizzle.blue_alpha_zero_one,Fail
+dEQP-GLES31.functional.texture.gather.basic.2d.rgba8ui.texture_swizzle.one_red_green_blue,Fail
+dEQP-GLES31.functional.texture.gather.basic.2d.rgba8ui.texture_swizzle.zero_one_red_green,Fail
+dEQP-GLES31.functional.texture.gather.basic.2d_array.rgba8i.texture_swizzle.alpha_zero_one_red,Fail
+dEQP-GLES31.functional.texture.gather.basic.2d_array.rgba8i.texture_swizzle.blue_alpha_zero_one,Fail
+dEQP-GLES31.functional.texture.gather.basic.2d_array.rgba8i.texture_swizzle.one_red_green_blue,Fail
+dEQP-GLES31.functional.texture.gather.basic.2d_array.rgba8i.texture_swizzle.zero_one_red_green,Fail
+dEQP-GLES31.functional.texture.gather.basic.2d_array.rgba8ui.texture_swizzle.alpha_zero_one_red,Fail
+dEQP-GLES31.functional.texture.gather.basic.2d_array.rgba8ui.texture_swizzle.blue_alpha_zero_one,Fail
+dEQP-GLES31.functional.texture.gather.basic.2d_array.rgba8ui.texture_swizzle.one_red_green_blue,Fail
+dEQP-GLES31.functional.texture.gather.basic.2d_array.rgba8ui.texture_swizzle.zero_one_red_green,Fail
 dEQP-GLES31.functional.texture.gather.basic.cube.rgba8.no_corners.size_pot.clamp_to_edge_repeat,Fail
 dEQP-GLES31.functional.texture.gather.basic.cube.rgba8.no_corners.size_pot.mirrored_repeat_clamp_to_edge,Fail
 dEQP-GLES31.functional.texture.gather.basic.cube.rgba8.no_corners.size_pot.repeat_mirrored_repeat,Fail
 dEQP-GLES31.functional.texture.gather.basic.cube.rgba8i.no_corners.size_pot.clamp_to_edge_repeat,Fail
 dEQP-GLES31.functional.texture.gather.basic.cube.rgba8i.no_corners.size_pot.mirrored_repeat_clamp_to_edge,Fail
 dEQP-GLES31.functional.texture.gather.basic.cube.rgba8i.no_corners.size_pot.repeat_mirrored_repeat,Fail
+dEQP-GLES31.functional.texture.gather.basic.cube.rgba8i.texture_swizzle.alpha_zero_one_red,Fail
+dEQP-GLES31.functional.texture.gather.basic.cube.rgba8i.texture_swizzle.blue_alpha_zero_one,Fail
+dEQP-GLES31.functional.texture.gather.basic.cube.rgba8i.texture_swizzle.one_red_green_blue,Fail
+dEQP-GLES31.functional.texture.gather.basic.cube.rgba8i.texture_swizzle.zero_one_red_green,Fail
 dEQP-GLES31.functional.texture.gather.basic.cube.rgba8ui.no_corners.size_pot.clamp_to_edge_repeat,Fail
 dEQP-GLES31.functional.texture.gather.basic.cube.rgba8ui.no_corners.size_pot.mirrored_repeat_clamp_to_edge,Fail
 dEQP-GLES31.functional.texture.gather.basic.cube.rgba8ui.no_corners.size_pot.repeat_mirrored_repeat,Fail
+dEQP-GLES31.functional.texture.gather.basic.cube.rgba8ui.texture_swizzle.alpha_zero_one_red,Fail
+dEQP-GLES31.functional.texture.gather.basic.cube.rgba8ui.texture_swizzle.blue_alpha_zero_one,Fail
+dEQP-GLES31.functional.texture.gather.basic.cube.rgba8ui.texture_swizzle.one_red_green_blue,Fail
+dEQP-GLES31.functional.texture.gather.basic.cube.rgba8ui.texture_swizzle.zero_one_red_green,Fail
+dEQP-GLES31.functional.texture.gather.offset.implementation_offset.2d.rgba8i.texture_swizzle.alpha_zero_one_red,Fail
+dEQP-GLES31.functional.texture.gather.offset.implementation_offset.2d.rgba8i.texture_swizzle.blue_alpha_zero_one,Fail
+dEQP-GLES31.functional.texture.gather.offset.implementation_offset.2d.rgba8i.texture_swizzle.one_red_green_blue,Fail
+dEQP-GLES31.functional.texture.gather.offset.implementation_offset.2d.rgba8i.texture_swizzle.zero_one_red_green,Fail
+dEQP-GLES31.functional.texture.gather.offset.implementation_offset.2d.rgba8ui.texture_swizzle.alpha_zero_one_red,Fail
+dEQP-GLES31.functional.texture.gather.offset.implementation_offset.2d.rgba8ui.texture_swizzle.blue_alpha_zero_one,Fail
+dEQP-GLES31.functional.texture.gather.offset.implementation_offset.2d.rgba8ui.texture_swizzle.one_red_green_blue,Fail
+dEQP-GLES31.functional.texture.gather.offset.implementation_offset.2d.rgba8ui.texture_swizzle.zero_one_red_green,Fail
+dEQP-GLES31.functional.texture.gather.offset.implementation_offset.2d_array.rgba8i.texture_swizzle.alpha_zero_one_red,Fail
+dEQP-GLES31.functional.texture.gather.offset.implementation_offset.2d_array.rgba8i.texture_swizzle.blue_alpha_zero_one,Fail
+dEQP-GLES31.functional.texture.gather.offset.implementation_offset.2d_array.rgba8i.texture_swizzle.one_red_green_blue,Fail
+dEQP-GLES31.functional.texture.gather.offset.implementation_offset.2d_array.rgba8i.texture_swizzle.zero_one_red_green,Fail
+dEQP-GLES31.functional.texture.gather.offset.implementation_offset.2d_array.rgba8ui.texture_swizzle.alpha_zero_one_red,Fail
+dEQP-GLES31.functional.texture.gather.offset.implementation_offset.2d_array.rgba8ui.texture_swizzle.blue_alpha_zero_one,Fail
+dEQP-GLES31.functional.texture.gather.offset.implementation_offset.2d_array.rgba8ui.texture_swizzle.one_red_green_blue,Fail
+dEQP-GLES31.functional.texture.gather.offset.implementation_offset.2d_array.rgba8ui.texture_swizzle.zero_one_red_green,Fail
 dEQP-GLES31.functional.texture.gather.offset_dynamic.implementation_offset.2d.depth32f.base_level.level_1,Fail
 dEQP-GLES31.functional.texture.gather.offset_dynamic.implementation_offset.2d.depth32f.base_level.level_2,Fail
 dEQP-GLES31.functional.texture.gather.offset_dynamic.implementation_offset.2d.depth32f.filter_mode.min_linear_mag_linear,Fail
@@ -769,6 +816,22 @@ dEQP-GLES31.functional.texture.gather.offset_dynamic.min_required_offset.2d_arra
 dEQP-GLES31.functional.texture.gather.offset_dynamic.min_required_offset.2d_array.rgba8ui.size_pot.clamp_to_edge_repeat,Fail
 dEQP-GLES31.functional.texture.gather.offset_dynamic.min_required_offset.2d_array.rgba8ui.size_pot.mirrored_repeat_clamp_to_edge,Fail
 dEQP-GLES31.functional.texture.gather.offset_dynamic.min_required_offset.2d_array.rgba8ui.size_pot.repeat_mirrored_repeat,Fail
+dEQP-GLES31.functional.texture.gather.offsets.implementation_offset.2d.rgba8i.texture_swizzle.alpha_zero_one_red,Fail
+dEQP-GLES31.functional.texture.gather.offsets.implementation_offset.2d.rgba8i.texture_swizzle.blue_alpha_zero_one,Fail
+dEQP-GLES31.functional.texture.gather.offsets.implementation_offset.2d.rgba8i.texture_swizzle.one_red_green_blue,Fail
+dEQP-GLES31.functional.texture.gather.offsets.implementation_offset.2d.rgba8i.texture_swizzle.zero_one_red_green,Fail
+dEQP-GLES31.functional.texture.gather.offsets.implementation_offset.2d.rgba8ui.texture_swizzle.alpha_zero_one_red,Fail
+dEQP-GLES31.functional.texture.gather.offsets.implementation_offset.2d.rgba8ui.texture_swizzle.blue_alpha_zero_one,Fail
+dEQP-GLES31.functional.texture.gather.offsets.implementation_offset.2d.rgba8ui.texture_swizzle.one_red_green_blue,Fail
+dEQP-GLES31.functional.texture.gather.offsets.implementation_offset.2d.rgba8ui.texture_swizzle.zero_one_red_green,Fail
+dEQP-GLES31.functional.texture.gather.offsets.implementation_offset.2d_array.rgba8i.texture_swizzle.alpha_zero_one_red,Fail
+dEQP-GLES31.functional.texture.gather.offsets.implementation_offset.2d_array.rgba8i.texture_swizzle.blue_alpha_zero_one,Fail
+dEQP-GLES31.functional.texture.gather.offsets.implementation_offset.2d_array.rgba8i.texture_swizzle.one_red_green_blue,Fail
+dEQP-GLES31.functional.texture.gather.offsets.implementation_offset.2d_array.rgba8i.texture_swizzle.zero_one_red_green,Fail
+dEQP-GLES31.functional.texture.gather.offsets.implementation_offset.2d_array.rgba8ui.texture_swizzle.alpha_zero_one_red,Fail
+dEQP-GLES31.functional.texture.gather.offsets.implementation_offset.2d_array.rgba8ui.texture_swizzle.blue_alpha_zero_one,Fail
+dEQP-GLES31.functional.texture.gather.offsets.implementation_offset.2d_array.rgba8ui.texture_swizzle.one_red_green_blue,Fail
+dEQP-GLES31.functional.texture.gather.offsets.implementation_offset.2d_array.rgba8ui.texture_swizzle.zero_one_red_green,Fail
 dEQP-GLES31.functional.texture.multisample.samples_1.sample_mask_and_alpha_to_coverage,Fail
 dEQP-GLES31.functional.texture.multisample.samples_1.sample_mask_and_sample_coverage,Fail
 dEQP-GLES31.functional.texture.multisample.samples_1.sample_mask_and_sample_coverage_and_alpha_to_coverage,Fail
@@ -785,6 +848,7 @@ KHR-GL33.transform_feedback.capture_geometry_interleaved_test,Fail
 KHR-GL33.transform_feedback.capture_geometry_separate_test,Fail
 KHR-GL33.transform_feedback.capture_vertex_interleaved_test,Fail
 KHR-GL33.transform_feedback.capture_vertex_separate_test,Fail
+KHR-GL33.transform_feedback.discard_geometry_test,Fail
 KHR-GL33.transform_feedback.discard_vertex_test,Fail
 KHR-GL33.transform_feedback.draw_xfb_instanced_test,Crash
 KHR-GL33.transform_feedback.draw_xfb_stream_instanced_test,Crash

.gitlab-ci/deqp-softpipe-skips.txt

@@ -13,6 +13,13 @@ dEQP-GLES[0-9]*.functional.flush_finish.*
 dEQP-GLES31.functional.draw_buffers_indexed.overwrite_indexed.common_color_mask_buffer_color_mask
 dEQP-GLES31.functional.fbo.no_attachments.maximums.all
 dEQP-GLES31.functional.fbo.no_attachments.maximums.size
+dEQP-GLES31.functional.geometry_shading.input.basic_primitive.points
+dEQP-GLES31.functional.shaders.builtin_functions.*geometry
+dEQP-GLES31.functional.shaders.linkage.es31.geometry.uniform.types.uvec4
+dEQP-GLES31.functional.shaders.linkage.es31.geometry.varying.types.uvec4
+dEQP-GLES31.functional.shaders.opaque_type_indexing.sampler.const_expression.geometry.usampler3d
+dEQP-GLES31.functional.shaders.opaque_type_indexing.sampler.dynamically_uniform.geometry.sampler2darray
+dEQP-GLES31.functional.primitive_bounding_box.wide_points.global_state.vertex_geometry_fragment.fbo_bbox_larger
 
 # This one is really slow and can time out (~56 seconds locally)
 KHR-GL33.texture_swizzle.smoke

.gitlab-ci/deqp-vc4-rpi3-fails.txt

@@ -1,23 +0,0 @@
-dEQP-GLES2.functional.clipping.line.wide_line_clip_viewport_center,Fail
-dEQP-GLES2.functional.clipping.line.wide_line_clip_viewport_corner,Fail
-dEQP-GLES2.functional.depth_stencil_clear.depth_stencil_masked,Fail
-dEQP-GLES2.functional.draw.draw_arrays.line_loop.multiple_attributes,Fail
-dEQP-GLES2.functional.draw.draw_arrays.line_loop.single_attribute,Fail
-dEQP-GLES2.functional.fbo.completeness.size.distinct,Fail
-dEQP-GLES2.functional.fbo.render.texsubimage.after_render_tex2d_rgba,Fail
-dEQP-GLES2.functional.fbo.render.texsubimage.between_render_tex2d_rgba,Fail
-dEQP-GLES2.functional.negative_api.shader.uniform_matrixfv_invalid_transpose,Fail
-dEQP-GLES2.functional.negative_api.texture.generatemipmap_zero_level_array_compressed,Fail
-dEQP-GLES2.functional.negative_api.vertex_array.vertex_attrib,Fail
-dEQP-GLES2.functional.negative_api.vertex_array.vertex_attribv,Fail
-dEQP-GLES2.functional.texture.filtering.2d.nearest_mipmap_linear_linear_mirror_rgba8888,Fail
-dEQP-GLES2.functional.texture.filtering.2d.nearest_mipmap_linear_linear_repeat_rgba8888,Fail
-dEQP-GLES2.functional.texture.filtering.2d.nearest_mipmap_nearest_linear_mirror_rgba8888,Fail
-dEQP-GLES2.functional.texture.filtering.2d.nearest_mipmap_nearest_linear_repeat_rgba8888,Fail
-dEQP-GLES2.functional.texture.mipmap.2d.basic.linear_linear_repeat_non_square,Fail
-dEQP-GLES2.functional.texture.mipmap.2d.basic.nearest_linear_clamp_non_square,Fail
-dEQP-GLES2.functional.texture.mipmap.2d.basic.nearest_linear_mirror_non_square,Fail
-dEQP-GLES2.functional.texture.mipmap.2d.basic.nearest_linear_repeat_non_square,Fail
-dEQP-GLES2.functional.texture.specification.basic_copytexsubimage2d.2d_rgba,Fail
-dEQP-GLES2.functional.texture.specification.basic_copytexsubimage2d.cube_rgba,Fail
-dEQP-GLES2.functional.texture.wrap.clamp_clamp_nearest_npot_etc1,Fail

.gitlab-ci/deqp-vc4-rpi3-flakes.txt

@@ -1,30 +0,0 @@
-dEQP-GLES2.functional.clipping.triangle_vertex.clip_three.clip_neg_x_and_pos_x_and_neg_x_neg_y_neg_z
-dEQP-GLES2.functional.clipping.triangle_vertex.clip_three.clip_neg_x_and_pos_x_and_pos_y_pos_z
-dEQP-GLES2.functional.clipping.triangle_vertex.clip_three.clip_neg_x_and_pos_x_neg_y_pos_z_and_neg_x_pos_y_neg_z
-dEQP-GLES2.functional.clipping.triangle_vertex.clip_three.clip_pos_x_and_neg_x_neg_y_pos_z_and_neg_x_pos_y_neg_z
-dEQP-GLES2.functional.draw.random.51
-dEQP-GLES2.functional.fragment_ops.blend.rgb_func_alpha_func.src.one_minus_src_alpha_constant_color
-dEQP-GLES2.functional.shaders.indexing.vector_subscript.vec4_direct_write_dynamic_loop_subscript_read_vertex
-dEQP-GLES2.functional.shaders.loops.do_while_dynamic_iterations.basic_mediump_int_vertex
-dEQP-GLES2.functional.shaders.loops.do_while_dynamic_iterations.conditional_continue_vertex
-dEQP-GLES2.functional.shaders.loops.do_while_dynamic_iterations.function_call_inout_vertex
-dEQP-GLES2.functional.shaders.loops.do_while_dynamic_iterations.function_call_return_vertex
-dEQP-GLES2.functional.shaders.loops.do_while_dynamic_iterations.nested_sequence_vertex
-dEQP-GLES2.functional.shaders.loops.while_constant_iterations.select_iteration_count_vertex
-dEQP-GLES2.functional.shaders.loops.while_dynamic_iterations.function_call_return_vertex
-dEQP-GLES2.functional.shaders.loops.while_dynamic_iterations.infinite_with_conditional_break_vertex
-dEQP-GLES2.functional.shaders.loops.while_dynamic_iterations.post_increment_vertex
-dEQP-GLES2.functional.shaders.loops.while_dynamic_iterations.single_iteration_vertex
-dEQP-GLES2.functional.shaders.operator.unary_operator.pre_decrement_result.mediump_vec3_fragment
-dEQP-GLES2.functional.shaders.random.exponential.fragment.51
-dEQP-GLES2.functional.shaders.random.texture.fragment.129
-dEQP-GLES2.functional.shaders.return.output_write_in_func_never_vertex
-dEQP-GLES2.functional.texture.filtering.2d.linear_linear_clamp_rgb888_pot
-dEQP-GLES2.functional.texture.filtering.cube.linear_mipmap_linear_nearest_mirror_rgba8888
-dEQP-GLES2.functional.texture.filtering.cube.nearest_linear_mirror_rgba8888_pot
-dEQP-GLES2.functional.texture.filtering.cube.nearest_mipmap_linear_linear_clamp_rgba8888
-dEQP-GLES2.functional.texture.filtering.cube.nearest_mipmap_linear_nearest_repeat_l8
-dEQP-GLES2.functional.texture.filtering.cube.nearest_mipmap_nearest_linear_clamp_rgba8888
-dEQP-GLES2.functional.texture.filtering.cube.nearest_mipmap_nearest_linear_mirror_rgba8888
-dEQP-GLES2.functional.texture.mipmap.cube.generate.rgb565_fastest
-dEQP-GLES2.functional.texture.size.cube.256x256_rgb888

.gitlab-ci/deqp-vc4-rpi3-skips.txt

@@ -1,28 +0,0 @@
-# Note: skips lists for CI are just a list of lines that, when
-# non-zero-length and not starting with '#', will regex match to
-# delete lines from the test list.  Be careful.
-
-# Skip the perf/stress tests to keep runtime manageable
-dEQP-GLES[0-9]*.performance.*
-dEQP-GLES[0-9]*.stress.*
-
-# These are really slow on tiling architectures (including llvmpipe).
-dEQP-GLES[0-9]*.functional.flush_finish.*
-
-# This is causing a binning memory overflow problem
-dEQP-GLES2.functional.fragment_ops.scissor.outside_render_line
-
-# These are very slow
-dEQP-GLES2.functional.uniform_api.random.3
-dEQP-GLES2.functional.uniform_api.random.79
-
-# Conformance issue: VC4 needs dynamic loops in the VS to cause a
-# shader link failure.
-#
-# The issue is that the HW doesn't have an exec mask at dispatch
-# for the VS, so the shouldn't-be-exec channels have undefined
-# contents and may cause infinite loops, leading to GPU hangs.  The
-# process of GPU hang reset causes flakes in whatever other jobs are
-# running simultaneously, so we can't even leave these in the flakes
-# list for tracking.
-dEQP-GLES2.functional.shaders.loops.*dynamic.*vertex

.gitlab-ci/deqp-virgl-gl-fails.txt

@@ -71,8 +71,10 @@ dEQP-GLES3.functional.polygon_offset.fixed16_render_with_units,Fail
 dEQP-GLES3.functional.polygon_offset.fixed24_displacement_with_units,Fail
 dEQP-GLES3.functional.polygon_offset.fixed24_render_with_units,Fail
 dEQP-GLES3.functional.polygon_offset.float32_displacement_with_units,Fail
+dEQP-GLES3.functional.rasterization.fbo.rbo_multisample_4.interpolation.lines,Fail
 dEQP-GLES3.functional.rasterization.fbo.rbo_multisample_4.primitives.lines,Fail
 dEQP-GLES3.functional.rasterization.fbo.rbo_multisample_4.primitives.points,Fail
+dEQP-GLES3.functional.rasterization.fbo.rbo_multisample_max.interpolation.lines,Fail
 dEQP-GLES3.functional.rasterization.fbo.rbo_multisample_max.primitives.lines,Fail
 dEQP-GLES3.functional.rasterization.fbo.rbo_multisample_max.primitives.points,Fail
 dEQP-GLES3.functional.rasterization.fbo.rbo_singlesample.interpolation.lines_wide,Fail
@@ -4678,7 +4680,7 @@ KHR-GL30.transform_feedback.query_vertex_separate_test,Fail
 KHR-GL31.transform_feedback.capture_vertex_interleaved_test,Fail
 KHR-GL31.transform_feedback.capture_vertex_separate_test,Fail
 KHR-GL31.transform_feedback.discard_vertex_test,Fail
-KHR-GL31.transform_feedback.draw_xfb_instanced_test,Crash
+KHR-GL31.transform_feedback.draw_xfb_instanced_test,Fail
 KHR-GL31.transform_feedback.draw_xfb_stream_instanced_test,Crash
 KHR-GL31.transform_feedback.query_vertex_interleaved_test,Fail
 KHR-GL31.transform_feedback.query_vertex_separate_test,Fail

.gitlab-ci/download-git-cache.sh

@@ -17,7 +17,7 @@ TMP_DIR=$(mktemp -d)
 
 echo "Downloading archived master..."
 /usr/bin/wget -O $TMP_DIR/mesa.tar.gz \
-              https://${MINIO_HOST}/git-cache/${FDO_UPSTREAM_REPO}/mesa.tar.gz
+              https://minio-packet.freedesktop.org/git-cache/mesa/mesa/mesa.tar.gz
 
 # check wget error code
 if [[ $? -ne 0 ]]

.gitlab-ci/lava-deqp.yml.jinja2

@@ -95,7 +95,8 @@ actions:
           - wget -S --progress=dot:giga -O- {{ mesa_url }} | tar -xz
 
           - export DEQP_NO_SAVE_RESULTS=1
-          - export GPU_VERSION={{ gpu_version }}
+          - export DEQP_EXPECTED_FAILS=deqp-{{ gpu_version }}-fails.txt
+          - export DEQP_SKIPS=deqp-{{ gpu_version }}-skips.txt
           - export DEQP_VER={{ deqp_version }}
           - export LIBGL_DRIVERS_PATH=`pwd`/install/lib/dri
 

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

@@ -1,5 +1,5 @@
 variables:
-  DISTRIBUTION_TAG: "2020-12-23-piglit"
+  DISTRIBUTION_TAG: "2020-11-05-deqp-runner"
 
 .kernel+rootfs:
   stage: container-2
@@ -9,9 +9,6 @@ variables:
     GIT_STRATEGY: fetch
     KERNEL_URL: "https://gitlab.freedesktop.org/tomeu/linux/-/archive/v5.10-rc2-for-mesa-ci/linux-v5.10-rc2-for-mesa-ci.tar.gz"
     UPLOAD_FOR_LAVA: 1
-    INSTALL_KERNEL_MODULES: 1
-    INCLUDE_PIGLIT: 1
-    PIGLIT_BUILD_TARGETS: "piglit_replayer"
   script:
     - .gitlab-ci/container/lava_build.sh
 
@@ -19,7 +16,7 @@ kernel+rootfs_amd64:
   extends:
     - .use-x86_build-base
     - .kernel+rootfs
-  image: "$CI_REGISTRY_IMAGE/debian/x86_build-base:${MESA_BASE_TAG}-${MESA_TEMPLATES_COMMIT}"
+  image: "$CI_REGISTRY_IMAGE/debian/x86_build-base:$BASE_TAG"
   variables:
     DEBIAN_ARCH: "amd64"
 
@@ -46,14 +43,14 @@ kernel+rootfs_armhf:
   variables:
     GIT_STRATEGY: none # testing doesn't build anything from source
     ENV_VARS: "DEQP_PARALLEL=6"
-    FIXED_ENV_VARS: "CI_PIPELINE_ID=${CI_PIPELINE_ID} CI_JOB_ID=${CI_JOB_ID} CI_PROJECT_PATH=${CI_PROJECT_PATH} CI_JOB_JWT=${CI_JOB_JWT} CI_SERVER_URL=${CI_SERVER_URL} DRIVER_NAME=${DRIVER_NAME} FDO_UPSTREAM_REPO=${FDO_UPSTREAM_REPO} PIGLIT_NO_WINDOW=1 PIGLIT_REPLAY_UPLOAD_TO_MINIO=1 MINIO_HOST=${MINIO_HOST}"
+    FIXED_ENV_VARS: "CI_PIPELINE_ID=${CI_PIPELINE_ID} CI_JOB_ID=${CI_JOB_ID} CI_PROJECT_PATH=${CI_PROJECT_PATH} CI_JOB_JWT=${CI_JOB_JWT} TRACIE_NO_UNIT_TESTS=1 TRACIE_UPLOAD_TO_MINIO=1 DRIVER_NAME=${DRIVER_NAME}"
     DEQP_VERSION: gles2
-    ARTIFACTS_PREFIX: "https://${MINIO_HOST}/mesa-lava/"
-    MESA_URL: "https://${MINIO_HOST}/artifacts/${CI_PROJECT_PATH}/${CI_PIPELINE_ID}/mesa-${ARCH}.tar.gz"
+    ARTIFACTS_PREFIX: "https://minio-packet.freedesktop.org/mesa-lava/"
+    MESA_URL: "https://minio-packet.freedesktop.org/artifacts/${CI_PROJECT_PATH}/${CI_PIPELINE_ID}/mesa-${ARCH}.tar.gz"
   script:
     # Try to use the kernel and rootfs built in mainline first, to save cycles
     - >
-      if wget -q --method=HEAD "${ARTIFACTS_PREFIX}/${FDO_UPSTREAM_REPO}/${DISTRIBUTION_TAG}/${ARCH}/done"; then
+      if wget -q --method=HEAD "${ARTIFACTS_PREFIX}/mesa/mesa/${DISTRIBUTION_TAG}/${ARCH}/done"; then
         ARTIFACTS_URL="${ARTIFACTS_PREFIX}/mesa/mesa/${DISTRIBUTION_TAG}/${ARCH}"
       else
         ARTIFACTS_URL="${ARTIFACTS_PREFIX}/${CI_PROJECT_PATH}/${DISTRIBUTION_TAG}/${ARCH}"
@@ -132,7 +129,6 @@ kernel+rootfs_armhf:
     - .use-arm_build
   needs:
     - kernel+rootfs_amd64
-    - arm_build
     - meson-testing
 
 .lava-traces-base:
@@ -143,26 +139,25 @@ kernel+rootfs_armhf:
     reports:
       junit: artifacts/junit.xml
 
-.lava-piglit:
+.lava-traces:amd64:
   variables:
-    TEST_SUITE: "piglit"
-
-.lava-piglit-traces:amd64:
+    TEST_SUITE: "tracie"
   extends:
     - .lava-test:amd64
-    - .lava-piglit
     - .lava-traces-base
 
-.lava-piglit-traces:armhf:
+.lava-traces:armhf:
+  variables:
+    TEST_SUITE: "tracie"
   extends:
     - .lava-test:armhf
-    - .lava-piglit
     - .lava-traces-base
 
-.lava-piglit-traces:arm64:
+.lava-traces:arm64:
+  variables:
+    TEST_SUITE: "tracie"
   extends:
     - .lava-test:arm64
-    - .lava-piglit
     - .lava-traces-base
 
 panfrost-t720-gles2:arm64:
@@ -173,7 +168,7 @@ panfrost-t720-gles2:arm64:
     DEVICE_TYPE: sun50i-h6-pine-h64
     DTB: ${DEVICE_TYPE}
     GPU_VERSION: panfrost-t720
-    ENV_VARS: "PAN_MESA_DEBUG=gles3 DEQP_PARALLEL=6 DEQP_EXPECTED_RENDERER=T720"
+    ENV_VARS: "PAN_MESA_DEBUG=gles3 DEQP_PARALLEL=6 DEQP_EXPECTED_RENDERER=T720 DEQP_FLAKES=deqp-panfrost-t720-flakes.txt"
   tags:
     - mesa-ci-aarch64-lava-collabora
 
@@ -193,7 +188,7 @@ panfrost-t720-gles2:arm64:
 
 .panfrost-t760-traces:armhf:
   extends:
-    - .lava-piglit-traces:armhf
+    - .lava-traces:armhf
     - .panfrost-rules
   variables:
     DEVICE_TYPE: rk3288-veyron-jaq
@@ -202,7 +197,7 @@ panfrost-t720-gles2:arm64:
     DRIVER_NAME: panfrost
     BOOT_METHOD: depthcharge
     KERNEL_IMAGE_TYPE: ""
-    ENV_VARS: "PAN_MESA_DEBUG=deqp MESA_GLES_VERSION_OVERRIDE=3.1 MESA_GL_VERSION_OVERRIDE=3.3 MESA_GLSL_VERSION_OVERRIDE=330 EGL_PLATFORM=surfaceless PIGLIT_PROFILES=replay PIGLIT_HTML_SUMMARY=0 PIGLIT_JUNIT_RESULTS=1"
+    ENV_VARS: "PAN_MESA_DEBUG=deqp MESA_GLES_VERSION_OVERRIDE=3.1 MESA_GL_VERSION_OVERRIDE=3.3 MESA_GLSL_VERSION_OVERRIDE=330"
   tags:
     - mesa-ci-aarch64-lava-collabora
 
@@ -237,39 +232,23 @@ panfrost-t860-gles3:arm64:
 
 panfrost-t860-traces:arm64:
   extends:
-    - .lava-piglit-traces:arm64
+    - .lava-traces:arm64
     - .lava-rk3399-gru-kevin
   variables:
-    ENV_VARS: "PAN_MESA_DEBUG=deqp MESA_GLES_VERSION_OVERRIDE=3.1 MESA_GL_VERSION_OVERRIDE=3.3 MESA_GLSL_VERSION_OVERRIDE=330 EGL_PLATFORM=surfaceless PIGLIT_PROFILES=replay PIGLIT_HTML_SUMMARY=0 PIGLIT_JUNIT_RESULTS=1"
+    ENV_VARS: "PAN_MESA_DEBUG=deqp MESA_GLES_VERSION_OVERRIDE=3.1 MESA_GL_VERSION_OVERRIDE=3.3 MESA_GLSL_VERSION_OVERRIDE=330"
 
-.lava-meson-g12b-a311d-khadas-vim3:
+panfrost-g52-gles2:arm64:
   extends:
+    - .lava-test:arm64
     - .panfrost-rules
   variables:
     DEVICE_TYPE: meson-g12b-a311d-khadas-vim3
     DTB: ${DEVICE_TYPE}
     GPU_VERSION: panfrost-g52
+    ENV_VARS: "PAN_MESA_DEBUG=bifrost DEQP_PARALLEL=6 DEQP_EXPECTED_RENDERER=G52"
   tags:
     - mesa-ci-aarch64-lava-collabora
 
-panfrost-g52-gles2:arm64:
-  extends:
-    - .lava-test:arm64
-    - .lava-meson-g12b-a311d-khadas-vim3
-  variables:
-    ENV_VARS: "DEQP_PARALLEL=6 DEQP_EXPECTED_RENDERER=G52"
-
-panfrost-g52-gles3:arm64:
-  extends:
-    - .lava-test:arm64
-    - .lava-meson-g12b-a311d-khadas-vim3
-  variables:
-    # We don't have enough VIM3s to run the full GLES3 testsuite yet
-    CI_NODE_INDEX: 1
-    CI_NODE_TOTAL: 2
-    DEQP_VERSION: gles3
-    ENV_VARS: "PAN_MESA_DEBUG=deqp DEQP_PARALLEL=6 DEQP_EXPECTED_RENDERER=G52"
-
 .panfrost-t820-gles2:arm64:
   extends:
     - .lava-test:arm64
@@ -344,7 +323,7 @@ radeonsi-stoney-gles31:amd64:
 
 radeonsi-stoney-traces:amd64:
   extends:
-    - .lava-piglit-traces:amd64
+    - .lava-traces:amd64
     - .radeonsi-rules
   variables:
     DEVICE_TYPE: hp-11A-G6-EE-grunt
@@ -353,6 +332,5 @@ radeonsi-stoney-traces:amd64:
     DRIVER_NAME: radeonsi
     BOOT_METHOD: depthcharge
     KERNEL_IMAGE_TYPE: ""
-    ENV_VARS: "EGL_PLATFORM=surfaceless PIGLIT_PROFILES=replay PIGLIT_HTML_SUMMARY=0 PIGLIT_JUNIT_RESULTS=1"
   tags:
     - mesa-ci-aarch64-lava-collabora

.gitlab-ci/lava-tracie.yml.jinja2

@@ -1,4 +1,4 @@
-job_name: mesa-piglit-{{ gpu_version }} {{ pipeline_info }}
+job_name: mesa-tracie-{{ gpu_version }} {{ pipeline_info }}
 device_type: {{ device_type }}
 context:
   extra_nfsroot_args: " init=/init rootwait"
@@ -61,8 +61,8 @@ actions:
     - repository:
         metadata:
           format: Lava-Test Test Definition 1.0
-          name: piglit
-          description: "Mesa piglit test plan"
+          name: tracie
+          description: "Mesa tracie test plan"
           os:
           - oe
           scope:
@@ -82,27 +82,22 @@ actions:
 {% if env_vars %}
           - export {{ env_vars }}
 {% endif %}
-          # piglit/run.sh assumes some stuff is in pwd
+          # tracie-runner.sh assumes some stuff is in pwd
           - cd /
 
           - wget -S --progress=dot:giga -O- {{ mesa_url }} | tar -xz
 
           - export PYTHONPATH=$(python3 -c "import sys;print(\":\".join(sys.path))")
           - export LIBGL_DRIVERS_PATH=`pwd`/install/lib/dri
-          - export PIGLIT_REPLAY_EXTRA_ARGS="--keep-image"
-          - export PIGLIT_REPLAY_REFERENCE_IMAGES_BASE_URL="/mesa-tracie-results/${CI_PROJECT_PATH}"
-          - export PIGLIT_REPLAY_ARTIFACTS_BASE_URL="/artifacts/${CI_PROJECT_PATH}/${CI_PIPELINE_ID}/${CI_JOB_ID}"
-          - export PIGLIT_REPLAY_DESCRIPTION_FILE="/install/traces-${DRIVER_NAME}.yml"
-          - export PIGLIT_REPLAY_DEVICE_NAME=gl-{{ gpu_version }}
-          - export PIGLIT_RESULTS={{ gpu_version }}-${PIGLIT_PROFILES}
+          - export DEVICE_NAME="gl-{{ gpu_version }}"
 
-          - "if sh /install/piglit/run.sh; then
-                  echo 'piglit: pass';
+          - "if sh /install/tracie-runner-gl.sh; then
+                  echo 'tracie: pass';
              else
-                  echo 'piglit: fail';
+                  echo 'tracie: fail';
              fi"
         parse:
           pattern: '(?P<test_case_id>\S*):\s+(?P<result>(pass|fail))'
       from: inline
-      name: piglit
-      path: inline/mesa-piglit.yaml
+      name: tracie
+      path: inline/mesa-tracie.yaml

.gitlab-ci/piglit/cl.txt

@@ -97,7 +97,7 @@ program/execute/vstore/vstore-half-private: skip
 summary:
        name:  results
        ----  --------
-       pass:     3766
+       pass:     3764
        fail:       14
       crash:        5
        skip:       73
@@ -109,4 +109,4 @@ summary:
     changes:        0
       fixes:        0
 regressions:        0
-      total:     3862
+      total:     3860

.gitlab-ci/piglit/freedreno-a630-replay.txt

@@ -1,16 +0,0 @@
-summary:
-       name:  results
-       ----  --------
-       pass:       52
-       fail:        0
-      crash:        0
-       skip:        0
-    timeout:        0
-       warn:        0
- incomplete:        0
- dmesg-warn:        0
- dmesg-fail:        0
-    changes:        0
-      fixes:        0
-regressions:        0
-      total:       52

.gitlab-ci/piglit/glslparser.txt

@@ -194,7 +194,6 @@ spec/amd_vertex_shader_layer/preprocessor/disabled-undefined-core.tese: skip
 spec/amd_vertex_shader_layer/preprocessor/disabled-undefined-core.vert: skip
 spec/amd_vertex_shader_layer/preprocessor/enabled-compat.frag: skip
 spec/amd_vertex_shader_layer/preprocessor/enabled-compat.vert: skip
-spec/amd_vertex_shader_viewport_index/compiler/vs-redeclares-pervertex-out-viewport-index-compat.vert: skip
 spec/amd_vertex_shader_viewport_index/preprocessor/disabled-defined-core.comp: skip
 spec/amd_vertex_shader_viewport_index/preprocessor/disabled-defined-core.frag: skip
 spec/amd_vertex_shader_viewport_index/preprocessor/disabled-defined-core.geom: skip
@@ -368,8 +367,6 @@ spec/arb_draw_instanced/preprocessor/disabled-undefined-core.geom: skip
 spec/arb_draw_instanced/preprocessor/disabled-undefined-core.tesc: skip
 spec/arb_draw_instanced/preprocessor/disabled-undefined-core.tese: skip
 spec/arb_draw_instanced/preprocessor/disabled-undefined-core.vert: skip
-spec/arb_enhanced_layouts/compiler/block-member-locations/arrayed-block-member-location.frag: fail
-spec/arb_enhanced_layouts/compiler/block-member-locations/arrayed-block-member-location.vert: fail
 spec/arb_enhanced_layouts/preprocessor/disabled-defined-core.comp: skip
 spec/arb_enhanced_layouts/preprocessor/disabled-defined-core.frag: skip
 spec/arb_enhanced_layouts/preprocessor/disabled-defined-core.geom: skip
@@ -2575,10 +2572,10 @@ spec/oes_texture_storage_multisample_2d_array/preprocessor/disabled-undefined-es
 summary:
        name:  results
        ----  --------
-       pass:    12265
-       fail:        4
+       pass:    12264
+       fail:        2
       crash:        4
-       skip:     2566
+       skip:     2565
     timeout:        0
        warn:        0
  incomplete:        0
@@ -2587,4 +2584,4 @@ summary:
     changes:        0
       fixes:        0
 regressions:        0
-      total:    14839
+      total:    14835

.gitlab-ci/piglit/llvmpipe-replay.txt

@@ -1,16 +0,0 @@
-summary:
-       name:  results
-       ----  --------
-       pass:       43
-       fail:        0
-      crash:        0
-       skip:        0
-    timeout:        0
-       warn:        0
- incomplete:        0
- dmesg-warn:        0
- dmesg-fail:        0
-    changes:        0
-      fixes:        0
-regressions:        0
-      total:       43

.gitlab-ci/piglit/panfrost-t760-replay.txt

@@ -1,16 +0,0 @@
-summary:
-       name:  results
-       ----  --------
-       pass:        8
-       fail:        0
-      crash:        0
-       skip:        0
-    timeout:        0
-       warn:        0
- incomplete:        0
- dmesg-warn:        0
- dmesg-fail:        0
-    changes:        0
-      fixes:        0
-regressions:        0
-      total:        8

.gitlab-ci/piglit/panfrost-t860-replay.txt

@@ -1,16 +0,0 @@
-summary:
-       name:  results
-       ----  --------
-       pass:       48
-       fail:        0
-      crash:        0
-       skip:        0
-    timeout:        0
-       warn:        0
- incomplete:        0
- dmesg-warn:        0
- dmesg-fail:        0
-    changes:        0
-      fixes:        0
-regressions:        0
-      total:       48

.gitlab-ci/piglit/quick_gl.txt

@@ -1,4 +1,3 @@
-fast_color_clear/fcc-clear-tex: skip
 glx/extension string sanity: fail
 glx/glx-buffer-age: skip
 glx/glx-buffer-age vblank_mode=0: skip
@@ -464,7 +463,8 @@ spec/arb_depth_buffer_float/depthstencil-render-miplevels 585 d=z32f_s=z24_s8: s
 spec/arb_depth_buffer_float/depthstencil-render-miplevels 585 s=z24_s8_d=z32f: skip
 spec/arb_depth_buffer_float/depthstencil-render-miplevels 585 s=z24_s8_d=z32f_s8: skip
 spec/arb_direct_state_access/getcompressedtextureimage: skip
-spec/arb_direct_state_access/gettextureimage-formats: crash
+spec/arb_direct_state_access/gettextureimage-formats: skip
+spec/arb_direct_state_access/gettextureimage-formats init-by-rendering: skip
 spec/arb_fragment_program/fp-indirections: skip
 spec/arb_fragment_shader_interlock/arb_fragment_shader_interlock-image-load-store: skip
 spec/arb_framebuffer_no_attachments/arb_framebuffer_no_attachments-params/dsa: skip
@@ -913,14 +913,8 @@ spec/ext_direct_state_access/named-buffers 15/mapnamedbufferrangeext: skip
 spec/ext_direct_state_access/named-buffers 15/namedcopybuffersubdataext: skip
 spec/ext_external_objects/memory-object-api-errors: skip
 spec/ext_external_objects/semaphore-api-errors: skip
-spec/ext_external_objects/vk-buf-exchange: skip
-spec/ext_external_objects/vk-depth-display: skip
 spec/ext_external_objects/vk-image-display: skip
-spec/ext_external_objects/vk-image-display-overwrite: skip
-spec/ext_external_objects/vk-image-overwrite: skip
-spec/ext_external_objects/vk-pix-buf-update-errors: skip
-spec/ext_external_objects/vk-vert-buf-reuse: skip
-spec/ext_external_objects/vk-vert-buf-update-errors: skip
+spec/ext_external_objects/vk-image-override: skip
 spec/ext_external_objects_fd/memory-object-api-errors: skip
 spec/ext_external_objects_fd/semaphore-api-errors: skip
 spec/ext_framebuffer_blit/fbo-blit-check-limits: fail
@@ -1661,10 +1655,10 @@ wgl/wgl-sanity: skip
 summary:
        name:  results
        ----  --------
-       pass:    23099
+       pass:    23075
        fail:      197
-      crash:        1
-       skip:     1438
+      crash:        0
+       skip:     1433
     timeout:        0
        warn:        6
  incomplete:        0
@@ -1673,4 +1667,4 @@ summary:
     changes:        0
       fixes:        0
 regressions:        0
-      total:    24759
+      total:    24729

.gitlab-ci/piglit/quick_shader.txt

@@ -15,7 +15,6 @@ spec/arb_bindless_texture/execution/samplers/basic-ubo-texture2d: skip
 spec/arb_bindless_texture/execution/samplers/explicit-texture-binding: skip
 spec/arb_bindless_texture/execution/samplers/fs-const-index-three-dimensions: skip
 spec/arb_bindless_texture/execution/samplers/fs-struct-non-const-index: skip
-spec/arb_bindless_texture/execution/samplers/sampler-in-struct: skip
 spec/arb_bindless_texture/execution/samplers/sampler-vertex-attrib-input-output: skip
 spec/arb_bindless_texture/execution/samplers/sampler-vertex-uniform-input-output: skip
 spec/arb_bindless_texture/execution/samplers/ubo-named-block: skip
@@ -379,8 +378,6 @@ spec/glsl-1.50/execution/compatibility/gs-texcoord-array-2: skip
 spec/glsl-1.50/execution/compatibility/vs-gs-ff-frag: skip
 spec/glsl-1.50/execution/compatibility/vs-gs-texcoord-array: skip
 spec/glsl-1.50/execution/compatibility/vs-gs-texcoord-array-2: skip
-spec/glsl-1.50/execution/primitive-id-no-gs-quad-strip: skip
-spec/glsl-1.50/execution/primitive-id-no-gs-quads: skip
 spec/glsl-4.00/execution/conversion/frag-conversion-explicit-dmat2-mat2: fail
 spec/glsl-4.00/execution/conversion/frag-conversion-explicit-dmat2x3-mat2x3: fail
 spec/glsl-4.00/execution/conversion/frag-conversion-explicit-dmat2x4-mat2x4: fail
@@ -564,32 +561,6 @@ spec/nv_shader_atomic_float/execution/shared-atomicadd-float: skip
 spec/nv_shader_atomic_float/execution/shared-atomicexchange-float: skip
 spec/nv_shader_atomic_float/execution/ssbo-atomicadd-float: skip
 spec/nv_shader_atomic_float/execution/ssbo-atomicexchange-float: skip
-spec/nv_shader_atomic_int64/execution/shared-atomicadd-int: skip
-spec/nv_shader_atomic_int64/execution/shared-atomicand-int: skip
-spec/nv_shader_atomic_int64/execution/shared-atomicand-uint: skip
-spec/nv_shader_atomic_int64/execution/shared-atomiccompswap-int: skip
-spec/nv_shader_atomic_int64/execution/shared-atomicexchange-int: skip
-spec/nv_shader_atomic_int64/execution/shared-atomicmax-int: skip
-spec/nv_shader_atomic_int64/execution/shared-atomicmax-uint: skip
-spec/nv_shader_atomic_int64/execution/shared-atomicmin-int: skip
-spec/nv_shader_atomic_int64/execution/shared-atomicmin-uint: skip
-spec/nv_shader_atomic_int64/execution/shared-atomicor-int: skip
-spec/nv_shader_atomic_int64/execution/shared-atomicor-uint: skip
-spec/nv_shader_atomic_int64/execution/shared-atomicxor-int: skip
-spec/nv_shader_atomic_int64/execution/shared-atomicxor-uint: skip
-spec/nv_shader_atomic_int64/execution/ssbo-atomicadd-int: skip
-spec/nv_shader_atomic_int64/execution/ssbo-atomicand-int: skip
-spec/nv_shader_atomic_int64/execution/ssbo-atomicand-uint: skip
-spec/nv_shader_atomic_int64/execution/ssbo-atomiccompswap-int: skip
-spec/nv_shader_atomic_int64/execution/ssbo-atomicexchange-int: skip
-spec/nv_shader_atomic_int64/execution/ssbo-atomicmax-int: skip
-spec/nv_shader_atomic_int64/execution/ssbo-atomicmax-uint: skip
-spec/nv_shader_atomic_int64/execution/ssbo-atomicmin-int: skip
-spec/nv_shader_atomic_int64/execution/ssbo-atomicmin-uint: skip
-spec/nv_shader_atomic_int64/execution/ssbo-atomicor-int: skip
-spec/nv_shader_atomic_int64/execution/ssbo-atomicor-uint: skip
-spec/nv_shader_atomic_int64/execution/ssbo-atomicxor-int: skip
-spec/nv_shader_atomic_int64/execution/ssbo-atomicxor-uint: skip
 spec/nv_viewport_array2/execution/viewport_broadcast: skip
 spec/nv_viewport_array2/execution/viewport_non_relative_broadcast: skip
 spec/nv_viewport_array2/execution/viewport_relative_broadcast: skip
@@ -598,10 +569,10 @@ spec/nv_viewport_swizzle/viewport_swizzle: skip
 summary:
        name:  results
        ----  --------
-       pass:    15819
+       pass:    15807
        fail:       83
       crash:      170
-       skip:      344
+       skip:      315
     timeout:        0
        warn:        0
  incomplete:        0
@@ -610,4 +581,4 @@ summary:
     changes:        0
       fixes:        0
 regressions:        0
-      total:    16416
+      total:    16375

.gitlab-ci/piglit/radeonsi-stoney-replay.txt

@@ -1,16 +0,0 @@
-summary:
-       name:  results
-       ----  --------
-       pass:       58
-       fail:        0
-      crash:        0
-       skip:        0
-    timeout:        0
-       warn:        0
- incomplete:        0
- dmesg-warn:        0
- dmesg-fail:        0
-    changes:        0
-      fixes:        0
-regressions:        0
-      total:       58

.gitlab-ci/piglit/radv-polaris10-replay.txt

@@ -1,16 +0,0 @@
-summary:
-       name:  results
-       ----  --------
-       pass:        3
-       fail:        0
-      crash:        0
-       skip:        0
-    timeout:        0
-       warn:        0
- incomplete:        0
- dmesg-warn:        0
- dmesg-fail:        0
-    changes:        0
-      fixes:        0
-regressions:        0
-      total:        3

.gitlab-ci/piglit/radv-raven-replay.txt

@@ -1,16 +0,0 @@
-summary:
-       name:  results
-       ----  --------
-       pass:        3
-       fail:        0
-      crash:        0
-       skip:        0
-    timeout:        0
-       warn:        0
- incomplete:        0
- dmesg-warn:        0
- dmesg-fail:        0
-    changes:        0
-      fixes:        0
-regressions:        0
-      total:        3

.gitlab-ci/piglit/run.sh

@@ -1,213 +1,36 @@
-#!/bin/sh
+#!/bin/bash
 
-set -ex
+set -e
+set -o xtrace
 
-INSTALL="$(pwd)/install"
-
-RESULTS="$(pwd)/results"
-mkdir -p "$RESULTS"
-
-# Set up the driver environment.
-# Modifiying here directly LD_LIBRARY_PATH may cause problems when
-# using a command wrapper. Hence, we will just set it when running the
-# command.
-export __LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$INSTALL/lib/"
-
-# Sanity check to ensure that our environment is sufficient to make our tests
-# run against the Mesa built by CI, rather than any installed distro version.
-MESA_VERSION=$(cat "$INSTALL/VERSION" | sed 's/\./\\./g')
-
-if [ "$VK_DRIVER" ]; then
-
-    ### VULKAN ###
-
-    # Set the Vulkan driver to use.
-    export VK_ICD_FILENAMES="$INSTALL/share/vulkan/icd.d/${VK_DRIVER}_icd.x86_64.json"
-
-    if [ "x$PIGLIT_PROFILES" = "xreplay" ]; then
-        # Set environment for VulkanTools' VK_LAYER_LUNARG_screenshot layer.
-        export VK_LAYER_PATH="$VK_LAYER_PATH:/VulkanTools/build/etc/vulkan/explicit_layer.d"
-        export __LD_LIBRARY_PATH="$__LD_LIBRARY_PATH:/VulkanTools/build/lib"
-
-        # Set environment for Wine.
-        export WINEDEBUG="-all"
-        export WINEPREFIX="/dxvk-wine64"
-        export WINEESYNC=1
-
-        # Set environment for DXVK.
-        export DXVK_LOG_LEVEL="none"
-        export DXVK_STATE_CACHE=0
-
-        # Set environment for gfxreconstruct executables.
-        export PATH="/gfxreconstruct/build/bin:$PATH"
-    fi
-
-    SANITY_MESA_VERSION_CMD="vulkaninfo"
-
-
-    # Set up the Window System Interface (WSI)
-
-    # IMPORTANT:
-    #
-    # Nothing to do here.
-    #
-    # Run vulkan against the host's running X server (xvfb doesn't
-    # have DRI3 support).
-    # Set the DISPLAY env variable in each gitlab-runner's
-    # configuration file:
-    # https://docs.gitlab.com/runner/configuration/advanced-configuration.html#the-runners-section
-else
-
-    ### GL/ES ###
-
-    if [ "x$PIGLIT_PROFILES" = "xreplay" ]; then
-        # Set environment for renderdoc libraries.
-        export PYTHONPATH="$PYTHONPATH:/renderdoc/build/lib"
-        export __LD_LIBRARY_PATH="$__LD_LIBRARY_PATH:/renderdoc/build/lib"
-
-        # Set environment for apitrace executable.
-        export PATH="/apitrace/build:$PATH"
-
-        # Our rootfs may not have "less", which apitrace uses during
-        # apitrace dump
-        export PAGER=cat
-    fi
-
-    SANITY_MESA_VERSION_CMD="wflinfo"
-
-
-    # Set up the platform windowing system.
-
-    # Set environment for the waffle library.
-    export __LD_LIBRARY_PATH="/waffle/build/lib:$__LD_LIBRARY_PATH"
-
-    # Set environment for wflinfo executable.
-    export PATH="/waffle/build/bin:$PATH"
-
-    if [ "x$EGL_PLATFORM" = "xsurfaceless" ]; then
-
-        # Use the surfaceless EGL platform.
-        export DISPLAY=
-        export WAFFLE_PLATFORM="surfaceless_egl"
-
-        SANITY_MESA_VERSION_CMD="$SANITY_MESA_VERSION_CMD --platform surfaceless_egl --api gles2"
-
-        if [ "x$GALLIUM_DRIVER" = "xvirpipe" ]; then
-            # piglit is to use virpipe, and virgl_test_server llvmpipe
-            export GALLIUM_DRIVER="$GALLIUM_DRIVER"
-
-            LD_LIBRARY_PATH="$__LD_LIBRARY_PATH" \
-            GALLIUM_DRIVER=llvmpipe \
-            GALLIVM_PERF="nopt,no_filter_hacks" \
-            VTEST_USE_EGL_SURFACELESS=1 \
-            VTEST_USE_GLES=1 \
-            virgl_test_server >"$RESULTS"/vtest-log.txt 2>&1 &
-
-            sleep 1
-        fi
-    elif [ "x$PIGLIT_PLATFORM" = "xgbm" ]; then
-        SANITY_MESA_VERSION_CMD="$SANITY_MESA_VERSION_CMD --platform gbm --api gl"
-    else
-        SANITY_MESA_VERSION_CMD="$SANITY_MESA_VERSION_CMD --platform glx --api gl --profile core"
-        RUN_CMD_WRAPPER="xvfb-run --server-args=\"-noreset\" sh -c"
-    fi
-fi
-
-SANITY_MESA_VERSION_CMD="$SANITY_MESA_VERSION_CMD | tee /tmp/version.txt | grep \"Mesa $MESA_VERSION\(\s\|$\)\""
+VERSION=`cat install/VERSION`
 
 rm -rf results
 cd /piglit
 
-PIGLIT_OPTIONS=$(printf "%s" "$PIGLIT_OPTIONS")
-
-PIGLIT_CMD="./piglit run -j${FDO_CI_CONCURRENT:-4} $PIGLIT_OPTIONS $PIGLIT_PROFILES "$(/usr/bin/printf "%q" "$RESULTS")
-
-RUN_CMD="export LD_LIBRARY_PATH=$__LD_LIBRARY_PATH; $SANITY_MESA_VERSION_CMD && $PIGLIT_CMD"
-
-if [ "$RUN_CMD_WRAPPER" ]; then
-    RUN_CMD="set +e; $RUN_CMD_WRAPPER "$(/usr/bin/printf "%q" "$RUN_CMD")"; set -e"
+PIGLIT_OPTIONS=$(echo $PIGLIT_OPTIONS | head -n 1)
+set +e
+xvfb-run --server-args="-noreset" sh -c \
+         "export LD_LIBRARY_PATH=$OLDPWD/install/lib;
+         wflinfo --platform glx --api gl --profile core | tee /tmp/version.txt | grep \"Mesa $VERSION\\\$\" &&
+         ./piglit run -j${FDO_CI_CONCURRENT:-4} $PIGLIT_OPTIONS $PIGLIT_PROFILES $OLDPWD/results"
+retVal=$?
+if [ $retVal -ne 0 ]; then
+    echo "Found $(cat /tmp/version.txt), expected $VERSION"
 fi
+set -e
 
-eval $RUN_CMD
-
-if [ $? -ne 0 ]; then
-    printf "%s\n" "Found $(cat /tmp/version.txt), expected $MESA_VERSION"
-fi
-
-if [ ${PIGLIT_JUNIT_RESULTS:-0} -eq 1 ]; then
-    ./piglit summary aggregate "$RESULTS" -o junit.xml
-fi
-
-PIGLIT_RESULTS="${PIGLIT_RESULTS:-$PIGLIT_PROFILES}"
-RESULTSFILE="$RESULTS/$PIGLIT_RESULTS.txt"
+PIGLIT_RESULTS=${PIGLIT_RESULTS:-$PIGLIT_PROFILES}
 mkdir -p .gitlab-ci/piglit
-./piglit summary console "$RESULTS"/results.json.bz2 \
-    | tee ".gitlab-ci/piglit/$PIGLIT_RESULTS.txt.orig" \
-    | head -n -1 | grep -v ": pass" > $RESULTSFILE
+cp $OLDPWD/install/piglit/$PIGLIT_RESULTS.txt .gitlab-ci/piglit/$PIGLIT_RESULTS.txt.baseline
+./piglit summary console $OLDPWD/results | head -n -1 | grep -v ": pass" >.gitlab-ci/piglit/$PIGLIT_RESULTS.txt
 
-if [ "x$PIGLIT_PROFILES" = "xreplay" ] \
-       && [ ${PIGLIT_REPLAY_UPLOAD_TO_MINIO:-0} -eq 1 ]; then
-
-    ci-fairy minio login $CI_JOB_JWT
-
-    __PREFIX="trace/$PIGLIT_REPLAY_DEVICE_NAME"
-    __MINIO_PATH="$PIGLIT_REPLAY_ARTIFACTS_BASE_URL"
-    __MINIO_TRACES_PREFIX="traces"
-
-    ci-fairy minio cp "$RESULTS"/results.json.bz2 \
-        "minio://${MINIO_HOST}${__MINIO_PATH}/${__MINIO_TRACES_PREFIX}/results.json.bz2"
-
-    find "$RESULTS/$__PREFIX" -type f -name "*.png" -printf "%P\n" \
-        | while read -r line; do
-
-        __TRACE="${line%-*-*}"
-        if grep -q "^$__PREFIX/$__TRACE: pass$" ".gitlab-ci/piglit/$PIGLIT_RESULTS.txt.orig"; then
-            if [ "x$CI_PROJECT_PATH" != "x$FDO_UPSTREAM_REPO" ]; then
-                continue
-            fi
-            __MINIO_PATH="$PIGLIT_REPLAY_REFERENCE_IMAGES_BASE_URL"
-            __DESTINATION_FILE_PATH="${line##*-}"
-            if ci-fairy minio ls "minio://${MINIO_HOST}${__MINIO_PATH}/${__DESTINATION_FILE_PATH}" 2>/dev/null; then
-                continue
-            fi
-        else
-            __MINIO_PATH="$PIGLIT_REPLAY_ARTIFACTS_BASE_URL"
-            __DESTINATION_FILE_PATH="$__MINIO_TRACES_PREFIX/${line##*-}"
-            # Adding to the JUnit the direct link to the diff page in
-            # the dashboard
-            __PIGLIT_TESTCASE_CLASSNAME="piglit\.trace\.$PIGLIT_REPLAY_DEVICE_NAME\.$(dirname $__TRACE | sed 's%/%\\.%g;s@%@\\%@')"
-            __PIGLIT_TESTCASE_NAME="$(basename $__TRACE | sed 's%\.%_%g;s@%@\\%@')"
-            __DASHBOARD_URL="https://tracie.freedesktop.org/dashboard/imagediff/${CI_PROJECT_PATH}/${CI_JOB_ID}/${__TRACE}"
-            sed '\%<testcase classname="'"${__PIGLIT_TESTCASE_CLASSNAME}"'" name="'"${__PIGLIT_TESTCASE_NAME}"'" status="fail"%,\%</system-out><failure type="fail"/></testcase>%{s%</system-out><failure type="fail"/></testcase>%</system-out><failure type="fail">To view the image differences visit: '"${__DASHBOARD_URL}"'</failure></testcase>%}' \
-                -i "$RESULTS"/junit.xml
-        fi
-
-        ci-fairy minio cp "$RESULTS/$__PREFIX/$line" \
-            "minio://${MINIO_HOST}${__MINIO_PATH}/${__DESTINATION_FILE_PATH}"
-    done
-
-    ci-fairy minio cp "$RESULTS"/junit.xml \
-        "minio://${MINIO_HOST}${__MINIO_PATH}/${__MINIO_TRACES_PREFIX}/junit.xml"
-fi
-
-cp "$INSTALL/piglit/$PIGLIT_RESULTS.txt" \
-   ".gitlab-ci/piglit/$PIGLIT_RESULTS.txt.baseline"
-if diff -q ".gitlab-ci/piglit/$PIGLIT_RESULTS.txt.baseline" $RESULTSFILE; then
+if diff -q .gitlab-ci/piglit/$PIGLIT_RESULTS.txt{.baseline,}; then
     exit 0
 fi
 
-if [ ${PIGLIT_HTML_SUMMARY:-1} -eq 1 ]; then
-    ./piglit summary html --exclude-details=pass \
-        "$OLDPWD"/summary "$RESULTS"/results.json.bz2
+./piglit summary html --exclude-details=pass $OLDPWD/summary $OLDPWD/results
 
-    if [ "x$PIGLIT_PROFILES" = "xreplay" ]; then
-        find "$OLDPWD"/summary -type f -name "*.html" -print0 \
-            | xargs -0 sed -i 's%<img src="file://'"${RESULTS}"'.*-\([0-9a-f]*\)\.png%<img src="https://'"${MINIO_HOST}${PIGLIT_REPLAY_ARTIFACTS_BASE_URL}"'/traces/\1.png%g'
-        find "$OLDPWD"/summary -type f -name "*.html" -print0 \
-            | xargs -0 sed -i 's%<img src="file://%<img src="https://'"${MINIO_HOST}${PIGLIT_REPLAY_REFERENCE_IMAGES_BASE_URL}"'/%g'
-    fi
-fi
-
-printf "%s\n" "Unexpected change in results:"
-diff -u ".gitlab-ci/piglit/$PIGLIT_RESULTS.txt.baseline" $RESULTSFILE
+echo Unexpected change in results:
+diff -u .gitlab-ci/piglit/$PIGLIT_RESULTS.txt{.baseline,}
 exit 1

.gitlab-ci/piglit/virgl-replay.txt

@@ -1,16 +0,0 @@
-summary:
-       name:  results
-       ----  --------
-       pass:        7
-       fail:        0
-      crash:        0
-       skip:        0
-    timeout:        0
-       warn:        0
- incomplete:        0
- dmesg-warn:        0
- dmesg-fail:        0
-    changes:        0
-      fixes:        0
-regressions:        0
-      total:        7

.gitlab-ci/prepare-artifacts.sh

@@ -27,6 +27,9 @@ cp -Rp .gitlab-ci/bare-metal install/
 cp -Rp .gitlab-ci/deqp* install/
 cp -Rp .gitlab-ci/piglit install/
 cp -Rp .gitlab-ci/traces*.yml install/
+cp -Rp .gitlab-ci/tracie install/
+cp -Rp .gitlab-ci/tracie-runner-gl.sh install/
+cp -Rp .gitlab-ci/tracie-runner-vk.sh install/
 cp -Rp .gitlab-ci/fossils.yml install/
 cp -Rp .gitlab-ci/fossils install/
 cp -Rp .gitlab-ci/fossilize-runner.sh install/
@@ -41,11 +44,11 @@ tar -cf artifacts/install.tar install
 if [ -n "$UPLOAD_FOR_LAVA" ]; then
     # Pass needed files to the test stage
     cp $CI_PROJECT_DIR/.gitlab-ci/generate_lava.py artifacts/.
-    cp $CI_PROJECT_DIR/.gitlab-ci/lava-*.yml.jinja2 artifacts/.
+    cp $CI_PROJECT_DIR/.gitlab-ci/lava-deqp.yml.jinja2 artifacts/.
+    cp $CI_PROJECT_DIR/.gitlab-ci/lava-tracie.yml.jinja2 artifacts/.
 
-    MESA_ARTIFACT=mesa-${DEBIAN_ARCH}.tar.gz
-    gzip -c artifacts/install.tar > ${MESA_ARTIFACT}
-    MINIO_PATH=${MINIO_HOST}/artifacts/${CI_PROJECT_PATH}/${CI_PIPELINE_ID}
+    gzip -c artifacts/install.tar > mesa-${DEBIAN_ARCH}.tar.gz
+    MINIO_PATH=minio-packet.freedesktop.org/artifacts/${CI_PROJECT_PATH}/${CI_PIPELINE_ID}
     ci-fairy minio login $CI_JOB_JWT
-    ci-fairy minio cp ${MESA_ARTIFACT} minio://${MINIO_PATH}/${MESA_ARTIFACT}
+    ci-fairy minio cp mesa-${DEBIAN_ARCH}.tar.gz minio://${MINIO_PATH}/mesa-${DEBIAN_ARCH}.tar.gz
 fi

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

@@ -16,12 +16,3 @@ for driver in freedreno intel v3d; do
         ./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; do
-    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
-done

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

@@ -1,18 +1,10 @@
 # This file list source dependencies to avoid creating/running jobs
 # those outcome cannot be changed by the modifications from a branch.
 
-# Generic rule to not run the job during scheduled pipelines
-# ----------------------------------------------------------
-.scheduled_pipelines-rules:
-  rules: &ignore_scheduled_pipelines
-    if: '$CI_PIPELINE_SOURCE == "schedule"'
-    when: never
-
 # Mesa core source file dependencies
 # ----------------------------------
 .mesa-rules:
   rules:
-    - *ignore_scheduled_pipelines
     - changes: &mesa_core_file_list
       - .gitlab-ci.yml
       - .gitlab-ci/**/*
@@ -37,7 +29,6 @@
 # -------------------------------------
 .gallium-rules:
   rules:
-    - *ignore_scheduled_pipelines
     - changes: &gallium_core_file_list
       - src/gallium/*
       - src/gallium/auxiliary/**/*
@@ -48,8 +39,15 @@
       - src/gallium/tests/**/*
       - src/gallium/winsys/*
 
+# Generic rule to not run the job during scheduled pipelines
+# ----------------------------------------------------------
+.scheduled_pipelines-rules:
+  rules: &ignore_scheduled_pipelines
+    if: '$CI_PIPELINE_SOURCE == "schedule"'
+    when: never
+
 .softpipe-rules:
-  stage: software-renderer
+  stage: softpipe
   rules:
     - *ignore_scheduled_pipelines
     - changes:
@@ -65,7 +63,7 @@
     - when: never
 
 .llvmpipe-rules:
-  stage: software-renderer
+  stage: llvmpipe
   rules:
     - *ignore_scheduled_pipelines
     - changes:
@@ -81,7 +79,7 @@
     - when: never
 
 .llvmpipe-cl-rules:
-  stage: software-renderer
+  stage: llvmpipe
   rules:
     - *ignore_scheduled_pipelines
     - changes:
@@ -133,7 +131,7 @@
     - when: never
 
 .panfrost-rules:
-  stage: arm
+  stage: panfrost
   rules:
     - *ignore_scheduled_pipelines
     - changes:
@@ -149,26 +147,8 @@
       when: on_success
     - when: never
 
-.vc4-rules:
-  stage: raspberrypi
-  rules:
-    - *ignore_scheduled_pipelines
-    - changes:
-        *mesa_core_file_list
-      when: on_success
-    - changes:
-        *gallium_core_file_list
-      when: on_success
-    - changes:
-      - src/broadcom/**/*
-      - src/gallium/drivers/vc4/**/*
-      - src/gallium/winsys/kmsro/**/*
-      - src/gallium/winsys/vc4/**/*
-      when: on_success
-    - when: never
-
 .lima-rules:
-  stage: arm
+  stage: lima
   rules:
     - *ignore_scheduled_pipelines
     - changes:
@@ -197,7 +177,7 @@
     - when: never
 
 .virgl-rules:
-  stage: layered-backends
+  stage: virgl
   rules:
     - *ignore_scheduled_pipelines
     - changes:
@@ -216,7 +196,7 @@
     - when: never
 
 .radeonsi-rules:
-  stage: amd
+  stage: radeonsi
   rules:
     - *ignore_scheduled_pipelines
     - changes:
@@ -235,37 +215,3 @@
       - src/amd/registers/**/*
       when: on_success
     - when: never
-
-# Unfortunately YAML doesn't let us concatenate arrays, so we have to do the
-# rules duplication manually
-.windows-build-rules:
-  rules:
-    - *ignore_scheduled_pipelines
-    - changes: 
-        *mesa_core_file_list
-      when: on_success
-    - changes:
-        *gallium_core_file_list
-      when: on_success
-    - changes: &d3d12_file_list
-      - src/gallium/drivers/d3d12/**/*
-      - src/microsoft/**/*
-      - src/gallium/frontends/wgl/*
-      - src/gallium/winsys/d3d12/wgl/*
-      - src/gallium/targets/libgl-gdi/*
-      - src/gallium/targets/libgl-d3d12/*
-      when: on_success
-    - when: never
-
-.windows-test-rules:
-  rules:
-    - *ignore_scheduled_pipelines
-    - changes: 
-        *mesa_core_file_list
-      when: on_success
-    - changes:
-        *gallium_core_file_list
-      when: on_success
-    - changes: *d3d12_file_list
-      when: on_success
-    - when: never

.gitlab-ci/traces-freedreno.yml

@@ -215,13 +215,11 @@ traces:
     expectations:
       - device: freedreno-a630
         checksum: 40387a4e89ef71c472a94413b175ff59
-  # Started producing flaky results near that old gap in the upper right once
-  # the parallel trace runner landed.
-  #- path: humus/Portals.trace
-  #  expectations:
-  #    # Bad rendering -- some sort of gap in the upper right of the image.
-  #    - device: freedreno-a630
-  #      checksum: 773787656bdb83df21ff42cf9d98d7d2
+  - path: humus/Portals.trace
+    expectations:
+      # Bad rendering -- some sort of gap in the upper right of the image.
+      - device: freedreno-a630
+        checksum: 773787656bdb83df21ff42cf9d98d7d2
   - path: humus/RaytracedShadows.trace
     expectations:
       - device: freedreno-a630