VERSION: bump for 21.1.2

On Wayland, if the wl_drm interface is not available, for example if the
compositor is using the proprietary NVIDIA driver along with their egl-wayland
library, the device_select layer will fail to initialize. However, the failure
path will unconditionally call wl_drm_destroy even though info.wl_drm would be
NULL in that case. This can cause a segfault in libwayland-client.so.

To fix this, check if info.wl_drm is NULL before calling wl_drm_destroy. This
way, initialization will fail gracefully even if that interface is not present.

Signed-off-by: Erik Kurzinger <ekurzinger@nvidia.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10598>

(cherry picked from commit f4eb13dc55)

.appveyor/appveyor_msvc.bat

@@ -1,66 +0,0 @@
-goto %1
-
-:install
-rem Check pip
-python --version
-python -m pip install --upgrade pip
-python -m pip --version
-if "%buildsystem%" == "scons" (
-    rem Install Mako
-    python -m pip install Mako==1.1.3
-    rem Install pywin32 extensions, needed by SCons
-    python -m pip install pypiwin32
-    rem Install python wheels, necessary to install SCons via pip
-    python -m pip install wheel
-    rem Install SCons
-    python -m pip install scons==3.1.2
-    call scons --version
-) else (
-    python -m pip install Mako meson
-    meson --version
-
-    rem Install pkg-config, which meson requires even on windows
-    cinst -y pkgconfiglite
-)
-
-rem Install flex/bison
-set WINFLEXBISON_ARCHIVE=win_flex_bison-%WINFLEXBISON_VERSION%.zip
-if not exist "%WINFLEXBISON_ARCHIVE%" appveyor DownloadFile "https://github.com/lexxmark/winflexbison/releases/download/v%WINFLEXBISON_VERSION%/%WINFLEXBISON_ARCHIVE%"
-7z x -y -owinflexbison\ "%WINFLEXBISON_ARCHIVE%" > nul
-set Path=%CD%\winflexbison;%Path%
-win_flex --version
-win_bison --version
-rem Download and extract LLVM
-if not exist "%LLVM_ARCHIVE%" appveyor DownloadFile "https://people.freedesktop.org/~jrfonseca/llvm/%LLVM_ARCHIVE%"
-7z x -y "%LLVM_ARCHIVE%" > nul
-if "%buildsystem%" == "scons" (
-    mkdir llvm\bin
-    set LLVM=%CD%\llvm
-) else (
-    move llvm subprojects\
-    copy .appveyor\llvm-wrap.meson subprojects\llvm\meson.build
-)
-goto :eof
-
-:build_script
-if "%buildsystem%" == "scons" (
-    call scons -j%NUMBER_OF_PROCESSORS% MSVC_VERSION=14.2 machine=x86 llvm=1
-) else (
-    call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\VsDevCmd.bat" -arch=x86
-    rem We use default-library as static to affect any wraps (such as expat and zlib)
-    rem it would be better if we could set subprojects buildtype independently,
-    rem but I haven't written that patch yet :)
-    call meson builddir --backend=vs2017 --default-library=static -Dbuild-tests=true -Db_vscrt=mtd --buildtype=release -Dllvm=true -Dgallium-drivers=swrast -Dosmesa=gallium
-    pushd builddir
-    call msbuild mesa.sln /m
-    popd
-)
-goto :eof
-
-:test_script
-if "%buildsystem%" == "scons" (
-    call scons -j%NUMBER_OF_PROCESSORS% MSVC_VERSION=14.2 machine=x86 llvm=1 check
-) else (
-    call meson test -C builddir
-)
-goto :eof

.appveyor/llvm-wrap.meson

@@ -1,36 +0,0 @@
-# A meson.build file for binary wrapping the LLVM used in the appvyeor CI
-project('llvm', ['cpp'])
-
-cpp = meson.get_compiler('cpp')
-
-_deps = []
-_search = join_paths(meson.current_source_dir(), 'lib')
-foreach d : ['LLVMAnalysis', 'LLVMAsmParser', 'LLVMAsmPrinter',
-             'LLVMBinaryFormat', 'LLVMBitReader', 'LLVMBitWriter',
-             'LLVMCodeGen', 'LLVMCore', 'LLVMCoroutines', 'LLVMCoverage',
-             'LLVMDebugInfoCodeView', 'LLVMDebugInfoDWARF',
-             'LLVMDebugInfoMSF', 'LLVMDebugInfoPDB', 'LLVMDemangle',
-             'LLVMDlltoolDriver', 'LLVMExecutionEngine', 'LLVMGlobalISel',
-             'LLVMInstCombine', 'LLVMInstrumentation', 'LLVMInterpreter',
-             'LLVMipo', 'LLVMIRReader', 'LLVMLibDriver', 'LLVMLineEditor',
-             'LLVMLinker', 'LLVMLTO', 'LLVMMCDisassembler', 'LLVMMCJIT',
-             'LLVMMC', 'LLVMMCParser', 'LLVMMIRParser', 'LLVMObjCARCOpts',
-             'LLVMObject', 'LLVMObjectYAML', 'LLVMOption', 'LLVMOrcJIT',
-             'LLVMPasses', 'LLVMProfileData', 'LLVMRuntimeDyld',
-             'LLVMScalarOpts', 'LLVMSelectionDAG', 'LLVMSupport',
-             'LLVMSymbolize', 'LLVMTableGen', 'LLVMTarget',
-             'LLVMTransformUtils', 'LLVMVectorize', 'LLVMX86AsmParser',
-             'LLVMX86AsmPrinter', 'LLVMX86CodeGen', 'LLVMX86Desc',
-             'LLVMX86Disassembler', 'LLVMX86Info', 'LLVMX86Utils',
-             'LLVMXRay']
-  _deps += cpp.find_library(d, dirs : _search)
-endforeach
-
-dep_llvm = declare_dependency(
-  include_directories : include_directories('include'),
-  dependencies : _deps,
-  version : '5.0.1',
-)
-
-has_rtti = false
-irbuilder_h = files('include/llvm/IR/IRBuilder.h')

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

@@ -0,0 +1,81 @@
+#!/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

@@ -1,3 +1,4 @@
+
 #!/usr/bin/env python3
 #
 # Copyright © 2020 Google LLC
@@ -79,6 +80,11 @@ class CrosServoRun:
         print("W SERIAL-CPU> %s" % s)
         self.cpu_ser.serial.write(s.encode())
 
+    def print_error(self, message):
+        RED = '\033[0;31m'
+        NO_COLOR = '\033[0m'
+        print(RED + message + NO_COLOR)
+
     def run(self):
         # Flush any partial commands in the EC's prompt, then ask for a reboot.
         self.ec_write("\n")
@@ -96,7 +102,7 @@ class CrosServoRun:
             # the system sometimes, possibly dependent on ambient temperature
             # in the farm.
             if re.search("POWER_GOOD not seen in time", line):
-                print("Detected intermittent poweron failure, restarting run...")
+                self.print_error("Detected intermittent poweron failure, restarting run...")
                 return 2
 
         tftp_failures = 0
@@ -111,9 +117,28 @@ class CrosServoRun:
             if re.search("R8152: Bulk read error 0xffffffbf", line):
                 tftp_failures += 1
                 if tftp_failures >= 100:
-                    print("Detected intermittent tftp failure, restarting run...")
+                    self.print_error("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):
+                self.print_error("Detected cheza power management bus error, restarting run...")
+                return 2
+
+            # These HFI response errors started appearing with the introduction
+            # of piglit runs.  CosmicPenguin says:
+            #
+            # "message ID 106 isn't a thing, so likely what happened is that we
+            # got confused when parsing the HFI queue.  If it happened on only
+            # one run, then memory corruption could be a possible clue"
+            #
+            # Given that it seems to trigger randomly near a GPU fault and then
+            # break many tests after that, just restart the whole run.
+            if re.search("a6xx_hfi_send_msg.*Unexpected message id .* on the response queue", line):
+                self.print_error("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":
@@ -121,7 +146,7 @@ class CrosServoRun:
                 else:
                     return 1
 
-        print("Reached the end of the CPU serial log without finding a result")
+        self.print_error("Reached the end of the CPU serial log without finding a result")
         return 1
 
 

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

@@ -45,32 +45,67 @@ if [ -z "$BM_ROOTFS" ]; then
   exit 1
 fi
 
-if [ -z "$BM_WEBDAV_IP" -o -z "$BM_WEBDAV_PORT" ]; then
-  echo "BM_WEBDAV_IP and/or BM_WEBDAV_PORT is not set - no results will be uploaded from DUT!"
-  WEBDAV_CMDLINE=""
-else
-  WEBDAV_CMDLINE="webdav=http://$BM_WEBDAV_IP:$BM_WEBDAV_PORT"
+if echo $BM_CMDLINE | grep -q "root=/dev/nfs"; then
+  BM_FASTBOOT_NFSROOT=1
+fi
+
+if [ -z "$BM_FASTBOOT_NFSROOT" ]; then
+  if [ -z "$BM_WEBDAV_IP" -o -z "$BM_WEBDAV_PORT" ]; then
+    echo "BM_WEBDAV_IP and/or BM_WEBDAV_PORT is not set - no results will be uploaded from DUT!"
+    WEBDAV_CMDLINE=""
+  else
+    WEBDAV_CMDLINE="webdav=http://$BM_WEBDAV_IP:$BM_WEBDAV_PORT"
+  fi
 fi
 
 set -ex
 
 # Clear out any previous run's artifacts.
 rm -rf results/
-mkdir -p results
+mkdir -p results/
 
-# Create the rootfs in a temp dir
-rsync -a --delete $BM_ROOTFS/ rootfs/
-. $BM/rootfs-setup.sh rootfs
+if [ -n "$BM_FASTBOOT_NFSROOT" ]; then
+  # 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/
+  mkdir -p /nfs/results
+  . $BM/rootfs-setup.sh /nfs
 
-# 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.
-pushd rootfs
-find -H | \
-  egrep -v "external/(openglcts|vulkancts|amber|glslang|spirv-tools)" |
-  egrep -v "traces-db|apitrace|renderdoc|python" | \
-  cpio -H newc -o | \
-  xz --check=crc32 -T4 - > $CI_PROJECT_DIR/rootfs.cpio.gz
-popd
+  # Root on NFS, no need for an inintramfs.
+  rm -f rootfs.cpio.gz
+  touch rootfs.cpio
+  gzip rootfs.cpio
+else
+  # Create the rootfs in a temp dir
+  rsync -a --delete $BM_ROOTFS/ rootfs/
+  . $BM/rootfs-setup.sh 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 | \
+    cpio -H newc -o | \
+    xz --check=crc32 -T4 - > $CI_PROJECT_DIR/rootfs.cpio.gz
+  popd
+
+  # Start nginx to get results from DUT
+  if [ -n "$WEBDAV_CMDLINE" ]; then
+    ln -s `pwd`/results /results
+    sed -i s/80/$BM_WEBDAV_PORT/g /etc/nginx/sites-enabled/default
+    sed -i s/www-data/root/g /etc/nginx/nginx.conf
+    nginx
+  fi
+fi
 
 # Make the combined kernel image and dtb for passing to fastboot.  For normal
 # Mesa development, we build the kernel and store it in the docker container
@@ -92,6 +127,7 @@ else
   cat $BM_KERNEL $BM_DTB > Image.gz-dtb
 fi
 
+mkdir -p artifacts
 abootimg \
   --create artifacts/fastboot.img \
   -k Image.gz-dtb \
@@ -99,27 +135,30 @@ abootimg \
   -c cmdline="$BM_CMDLINE $WEBDAV_CMDLINE"
 rm Image.gz-dtb
 
-# Start nginx to get results from DUT
-if [ -n "$WEBDAV_CMDLINE" ]; then
-  ln -s `pwd`/results /results
-  sed -i s/80/$BM_WEBDAV_PORT/g /etc/nginx/sites-enabled/default
-  sed -i s/www-data/root/g /etc/nginx/nginx.conf
-  nginx
-fi
-
 export PATH=$BM:$PATH
 
 # Start background command for talking to serial if we have one.
 if [ -n "$BM_SERIAL_SCRIPT" ]; then
-  $BM_SERIAL_SCRIPT | tee results/serial-output.txt &
+  $BM_SERIAL_SCRIPT > results/serial-output.txt &
 
   while [ ! -e results/serial-output.txt ]; do
     sleep 1
   done
 fi
 
+set +e
 $BM/fastboot_run.py \
   --dev="$BM_SERIAL" \
   --fbserial="$BM_FASTBOOT_SERIAL" \
   --powerup="$BM_POWERUP" \
   --powerdown="$BM_POWERDOWN"
+ret=$?
+set -e
+
+if [ -n "$BM_FASTBOOT_NFSROOT" ]; then
+  # Bring artifacts back from the NFS dir to the build dir where gitlab-runner
+  # will look for them.
+  cp -Rp /nfs/results/. results/
+fi
+
+exit $ret

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

@@ -34,6 +34,11 @@ class FastbootRun:
         self.ser = SerialBuffer(args.dev, "results/serial-output.txt", "R SERIAL> ")
         self.fastboot="fastboot boot -s {ser} artifacts/fastboot.img".format(ser=args.fbserial)
 
+    def print_error(self, message):
+        RED = '\033[0;31m'
+        NO_COLOR = '\033[0m'
+        print(RED + message + NO_COLOR)
+
     def logged_system(self, cmd):
         print("Running '{}'".format(cmd))
         return os.system(cmd)
@@ -53,7 +58,7 @@ class FastbootRun:
                 return 1
 
         if not fastboot_ready:
-            print("Failed to get to fastboot prompt")
+            self.print_error("Failed to get to fastboot prompt")
             return 1
 
         if self.logged_system(self.fastboot) != 0:
@@ -66,7 +71,13 @@ class FastbootRun:
             # The db820c boards intermittently reboot.  Just restart the run
             # when if we see a reboot after we got past fastboot.
             if re.search("PON REASON", line):
-                print("Detected spontaneous reboot, restarting run...")
+                self.print_error("Detected spontaneous reboot, restarting run...")
+                return 2
+
+            # db820c sometimes wedges around iommu fault recovery
+            if re.search("watchdog: BUG: soft lockup - CPU.* stuck", line):
+                self.print_error(
+                    "Detected kernel soft lockup, restarting run...")
                 return 2
 
             result = re.search("bare-metal result: (\S*)", line)
@@ -76,7 +87,7 @@ class FastbootRun:
                 else:
                     return 1
 
-        print("Reached the end of the CPU serial log without finding a result")
+        self.print_error("Reached the end of the CPU serial log without finding a result")
         return 1
 
 def main():

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

@@ -11,6 +11,8 @@ mount -t tmpfs tmpfs /tmp
 
 . /set-job-env-vars.sh
 
+[ -z "$BM_KERNEL_MODULES" ] || echo -n $BM_KERNEL_MODULES | xargs -d, -n1 /usr/sbin/modprobe
+
 # Store Mesa's disk cache under /tmp, rather than sending it out over NFS.
 export XDG_CACHE_HOME=/tmp
 
@@ -23,6 +25,27 @@ sntp -sS pool.ntp.org || true
 # expire after 5 minutes, so we poll for them).
 ./capture-devcoredump.sh &
 
+# If we want Xorg to be running for the test, then we start it up before the
+# BARE_METAL_TEST_SCRIPT because we need to use xinit to start X (otherwise
+# without using -displayfd you can race with Xorg's startup), but xinit will eat
+# your client's return code
+if [ -n "$BM_START_XORG" ]; then
+  echo "touch /xorg-started; sleep 100000" > /xorg-script
+  env \
+    LD_LIBRARY_PATH=/install/lib/ \
+    LIBGL_DRIVERS_PATH=/install/lib/dri/ \
+    xinit /bin/sh /xorg-script -- /usr/bin/Xorg -noreset -dpms -logfile /Xorg.0.log &
+
+  # Wait for xorg to be ready for connections.
+  for i in 1 2 3 4 5; do
+    if [ -e /xorg-started ]; then
+      break
+    fi
+    sleep 5
+  done
+  export DISPLAY=:0
+fi
+
 if sh $BARE_METAL_TEST_SCRIPT; then
   OK=1
 else

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

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+if [ -z "$BM_POE_INTERFACE" ]; then
+    echo "Must supply the PoE Interface to power up"
+    exit 1
+fi
+
+if [ -z "$BM_POE_ADDRESS" ]; then
+    echo "Must supply the PoE Switch host"
+    exit 1
+fi
+
+SNMP_KEY="SNMPv2-SMI::mib-2.105.1.1.1.3.1.`expr 48 + $BM_POE_INTERFACE`"
+SNMP_ON="i 1"
+SNMP_OFF="i 2"
+
+flock /var/run/poe.lock -c "snmpset -v2c -r 3 -t 30 -cmesaci $BM_POE_ADDRESS $SNMP_KEY $SNMP_OFF"

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

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+if [ -z "$BM_POE_INTERFACE" ]; then
+    echo "Must supply the PoE Interface to power up"
+    exit 1
+fi
+
+if [ -z "$BM_POE_ADDRESS" ]; then
+    echo "Must supply the PoE Switch host"
+    exit 1
+fi
+
+SNMP_KEY="SNMPv2-SMI::mib-2.105.1.1.1.3.1.`expr 48 + $BM_POE_INTERFACE`"
+SNMP_ON="i 1"
+SNMP_OFF="i 2"
+
+flock /var/run/poe.lock -c "snmpset -v2c -r 3 -t 30 -cmesaci $BM_POE_ADDRESS $SNMP_KEY $SNMP_OFF"
+sleep 3s
+flock /var/run/poe.lock -c "snmpset -v2c -r 3 -t 30 -cmesaci $BM_POE_ADDRESS $SNMP_KEY $SNMP_ON"

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

@@ -0,0 +1,146 @@
+#!/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
+
+if [ -z "$BM_BOOTCONFIG" ]; then
+  echo "Must set BM_BOOTCONFIG to your board's required boot configuration 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/
+
+# If BM_BOOTFS is an URL, download it
+if echo $BM_BOOTFS | grep -q http; then
+  apt install -y wget
+  wget ${FDO_HTTP_CACHE_URI:-}$BM_BOOTFS -O /tmp/bootfs.tar
+  BM_BOOTFS=/tmp/bootfs.tar
+fi
+
+# If BM_BOOTFS is a file, assume it is a tarball and uncompress it
+if [ -f $BM_BOOTFS ]; then
+  mkdir -p /tmp/bootfs
+  tar xf $BM_BOOTFS -C /tmp/bootfs
+  BM_BOOTFS=/tmp/bootfs
+fi
+
+# Install kernel modules (it could be either in /lib/modules or
+# /usr/lib/modules, but we want to install in the latter)
+[ -d $BM_BOOTFS/usr/lib/modules ] && rsync -a --delete $BM_BOOTFS/usr/lib/modules/ /nfs/usr/lib/modules/
+[ -d $BM_BOOTFS/lib/modules ] && rsync -a --delete $BM_BOOTFS/lib/modules/ /nfs/usr/lib/modules/
+
+# Install kernel image + bootloader files
+rsync -a --delete $BM_BOOTFS/boot/ /tftp/
+
+# Create the rootfs in the NFS directory
+mkdir -p /nfs/results
+. $BM/rootfs-setup.sh /nfs
+
+echo "$BM_CMDLINE" > /tftp/cmdline.txt
+
+# Add some required options in config.txt
+printf "$BM_BOOTCONFIG" >> /tftp/config.txt
+
+set +e
+ATTEMPTS=2
+while [ $((ATTEMPTS--)) -gt 0 ]; do
+  python3 $BM/poe_run.py \
+          --dev="$BM_SERIAL" \
+          --powerup="$BM_POWERUP" \
+          --powerdown="$BM_POWERDOWN" \
+          --timeout="${BM_POE_TIMEOUT:-60}"
+  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_run.py

@@ -0,0 +1,96 @@
+#!/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", "", args.timeout)
+
+    def print_error(self, message):
+        RED = '\033[0;31m'
+        NO_COLOR = '\033[0m'
+        print(RED + message + NO_COLOR)
+
+    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:
+            self.print_error("Something wrong; couldn't detect the boot start up sequence")
+            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):
+                self.print_error("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
+
+        self.print_error("Reached the end of the CPU serial log without finding a result")
+        return 2
+
+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)
+    parser.add_argument('--timeout', type=int, default=60,
+                        help='time in seconds to wait for activity', required=False)
+    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,43 +15,67 @@ 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 \
+    BM_START_XORG \
     CI_COMMIT_BRANCH \
     CI_COMMIT_TITLE \
-    CI_JOB_JWT \
     CI_JOB_ID \
+    CI_JOB_JWT \
     CI_JOB_URL \
     CI_MERGE_REQUEST_SOURCE_BRANCH_NAME \
     CI_MERGE_REQUEST_TITLE \
     CI_NODE_INDEX \
     CI_NODE_TOTAL \
+    CI_PAGES_DOMAIN \
     CI_PIPELINE_ID \
+    CI_PROJECT_NAME \
     CI_PROJECT_PATH \
+    CI_PROJECT_ROOT_NAMESPACE \
     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_RUNNER_OPTIONS \
     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 \
-    TRACIE_NO_UNIT_TESTS \
-    TRACIE_UPLOAD_TO_MINIO \
+    PIGLIT_FRACTION \
+    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 \
+    PIGLIT_TESTS \
+    TEST_LD_PRELOAD \
     TU_DEBUG \
+    VK_CPU \
     VK_DRIVER \
     ; do
   if [ -n "${!var+x}" ]; then
@@ -64,5 +88,5 @@ set -x
 
 # Add the Mesa drivers we built, and make a consistent symlink to them.
 mkdir -p $rootfs_dst/$CI_PROJECT_DIR
-tar -C $rootfs_dst/$CI_PROJECT_DIR/ -xf $CI_PROJECT_DIR/artifacts/install.tar
+rsync -aH --delete $CI_PROJECT_DIR/install/ $rootfs_dst/$CI_PROJECT_DIR/install/
 ln -sf $CI_PROJECT_DIR/install $rootfs_dst/install

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

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

.gitlab-ci/build-apitrace.sh

@@ -1,36 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-# Need an unreleased version of Waffle for surfaceless support in apitrace
-# Replace this build with the Debian package once that's possible
-
-WAFFLE_VERSION="e3c995d9a2693b687501715b6550619922346089"
-git clone https://gitlab.freedesktop.org/mesa/waffle.git --single-branch --no-checkout /waffle
-pushd /waffle
-git checkout "$WAFFLE_VERSION"
-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
-cp _build/bin/wflinfo build/bin/wflinfo
-${STRIP_CMD:-strip} build/lib/* build/bin/*
-find . -not -path './build' -not -path './build/*' -delete
-popd
-
-APITRACE_VERSION="9.0"
-
-git clone https://github.com/apitrace/apitrace.git --single-branch --no-checkout /apitrace
-pushd /apitrace
-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 -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
-cp _build/eglretrace build
-${STRIP_CMD:-strip} build/*
-find . -not -path './build' -not -path './build/*' -delete
-popd

.gitlab-ci/build-libclc.sh

@@ -1,37 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-export LLVM_CONFIG="llvm-config-10"
-
-$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 -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
-
-
-git config --global user.email "mesa@example.com"
-git config --global user.name "Mesa CI"
-git clone \
-    https://github.com/llvm/llvm-project \
-    --depth 1 \
-    /llvm-project
-
-mkdir /libclc
-pushd /libclc
-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
-
-# workaroud cmake vs debian packaging.
-mkdir -p /usr/lib/clc
-ln -s /usr/share/clc/spirv64-mesa3d-.spv /usr/lib/clc/
-ln -s /usr/share/clc/spirv-mesa3d-.spv /usr/lib/clc/
-
-du -sh *
-rm -rf /libclc /llvm-project /SPIRV-LLVM-Translator

.gitlab-ci/build-piglit.sh

@@ -1,17 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-if [ -n "$INCLUDE_OPENCL_TESTS" ]; then
-    PIGLIT_OPTS="-DPIGLIT_BUILD_CL_TESTS=ON"
-fi
-
-git clone https://gitlab.freedesktop.org/mesa/piglit.git --single-branch --no-checkout /piglit
-pushd /piglit
-git checkout 404862743cf8a7b37a4e3a93b4ba1858d59cd4ab
-patch -p1 <$OLDPWD/.gitlab-ci/piglit/disable-vs_in.diff
-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
-popd

.gitlab-ci/build-renderdoc.sh

@@ -1,17 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-RENDERDOC_VERSION=da02e88201dc3b64316fc33ce6ff69cc729689aa
-
-git clone https://github.com/baldurk/renderdoc.git --single-branch --no-checkout /renderdoc
-pushd /renderdoc
-git checkout "$RENDERDOC_VERSION"
-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
-cp _build/lib/renderdoc.so build/lib
-cp _build/lib/librenderdoc.so build/lib
-find . -not -path './build' -not -path './build/*' -delete
-popd

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

@@ -1,14 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-git clone --depth 1 https://github.com/KhronosGroup/SPIRV-Tools SPIRV-Tools
-pushd SPIRV-Tools
-pushd external
-git clone --depth 1 https://github.com/KhronosGroup/SPIRV-Headers
-popd
-cmake -G Ninja -B_build -H. -DCMAKE_BUILD_TYPE=Release
-ninja -C _build
-ninja -C _build install
-popd
-rm -rf SPIRV-Tools

.gitlab-ci/build-vulkantools.sh

@@ -1,29 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-VULKANTOOLS_VERSION=1862c6a47b64cd09156205d7f7e6b3bfcea76390
-
-git clone https://github.com/LunarG/VulkanTools.git --single-branch --no-checkout /VulkanTools
-pushd /VulkanTools
-git checkout "$VULKANTOOLS_VERSION"
-./update_external_sources.sh
-mkdir _build
-./scripts/update_deps.py --dir=_build --config=release --generator=Ninja
-cmake -G Ninja -B_build -H. \
-      -DCMAKE_BUILD_TYPE=Release \
-      -DCMAKE_INSTALL_PREFIX=/VulkanTools/build \
-      -DBUILD_TESTS=OFF \
-      -DBUILD_VLF=OFF \
-      -DBUILD_VKTRACE=OFF \
-      -DBUILD_VIA=OFF \
-      -DBUILD_VKTRACE_REPLAY=OFF \
-      -C_build/helper.cmake
-ninja -C _build VkLayer_screenshot VkLayer_screenshot-staging-json
-mkdir -p build/etc/vulkan/explicit_layer.d
-mkdir build/lib
-install _build/layersvt/staging-json/VkLayer_screenshot.json build/etc/vulkan/explicit_layer.d
-install _build/layersvt/libVkLayer_screenshot.so build/lib
-strip build/lib/*
-find . -not -path './build' -not -path './build/*' -delete
-popd

.gitlab-ci/container/android_build.sh

@@ -20,12 +20,12 @@ rdfind -makehardlinks true -makeresultsfile false /android-ndk-r21d/
 # Drop some large tools we won't use in this build.
 find /android-ndk-r21d/ -type f | egrep -i "clang-check|clang-tidy|lldb" | xargs rm -f
 
-sh .gitlab-ci/create-android-ndk-pc.sh /$ndk zlib.pc "" "-lz" "1.2.3"
+sh .gitlab-ci/container/create-android-ndk-pc.sh /$ndk zlib.pc "" "-lz" "1.2.3"
 
-sh .gitlab-ci/create-android-cross-file.sh /$ndk x86_64-linux-android x86_64 x86_64
-sh .gitlab-ci/create-android-cross-file.sh /$ndk i686-linux-android x86 x86
-sh .gitlab-ci/create-android-cross-file.sh /$ndk aarch64-linux-android arm armv8
-sh .gitlab-ci/create-android-cross-file.sh /$ndk arm-linux-androideabi arm armv7hl armv7a-linux-androideabi
+sh .gitlab-ci/container/create-android-cross-file.sh /$ndk x86_64-linux-android x86_64 x86_64
+sh .gitlab-ci/container/create-android-cross-file.sh /$ndk i686-linux-android x86 x86
+sh .gitlab-ci/container/create-android-cross-file.sh /$ndk aarch64-linux-android arm armv8
+sh .gitlab-ci/container/create-android-cross-file.sh /$ndk arm-linux-androideabi arm armv7hl armv7a-linux-androideabi
 
 # Not using build-libdrm.sh because we don't want its cleanup after building
 # each arch.  Fetch and extract now.

.gitlab-ci/container/arm64.config

@@ -45,6 +45,7 @@ CONFIG_PHY_QCOM_QUSB2=y
 CONFIG_PHY_QCOM_QMP=y
 CONFIG_QCOM_LLCC=y
 CONFIG_QCOM_SPMI_TEMP_ALARM=y
+CONFIG_QCOM_CLK_APCC_MSM8996=y
 CONFIG_POWER_RESET_QCOM_PON=y
 CONFIG_RTC_DRV_PM8XXX=y
 CONFIG_INTERCONNECT=y

.gitlab-ci/container/arm64_test.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-arch=arm64
-
-. .gitlab-ci/container/baremetal_build.sh

.gitlab-ci/container/arm_build.sh

@@ -5,11 +5,16 @@ set -o xtrace
 
 apt-get -y install ca-certificates
 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
+echo 'deb https://deb.debian.org/debian buster main' >/etc/apt/sources.list.d/buster.list
 apt-get update
+
+EPHEMERAL="
+	python3-pytest-runner
+	python3-wheel
+	"
+
 apt-get -y install \
 	abootimg \
-	android-sdk-ext4-utils \
 	autoconf \
 	automake \
 	bc \
@@ -22,27 +27,54 @@ apt-get -y install \
 	g++ \
 	git \
 	kmod \
-	lavacli \
+	libasan6 \
 	libdrm-dev \
 	libelf-dev \
 	libexpat1-dev \
-	llvm-8-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-11-dev \
+	meson \
 	pkg-config \
-	python \
+	python-is-python3 \
+	python3-aiohttp \
+	python3-jinja2 \
 	python3-mako \
 	python3-pil \
-	python3-requests \
 	python3-pip \
+	python3-requests \
 	python3-setuptools \
+	python3-yaml \
+	python3-zmq \
+	u-boot-tools \
 	unzip \
 	wget \
 	xz-utils \
-	zlib1g-dev
+	zlib1g-dev \
+	$EPHEMERAL
+
+# Update lavacli to v1.1+
+pip3 install git+https://git.lavasoftware.org/lava/lavacli@3db3ddc45e5358908bc6a17448059ea2340492b7
+
+# Not available anymore in bullseye
+apt-get install -y --no-remove -t buster \
+        android-sdk-ext4-utils
 
 pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@6f5af7e5574509726c79109e3c147cee95e81366
 
-apt install -y --no-remove -t buster-backports \
-    meson
+apt-get purge -y $EPHEMERAL
 
 arch=armhf
 . .gitlab-ci/container/cross_build.sh
@@ -51,6 +83,6 @@ arch=armhf
 
 # dependencies where we want a specific version
 EXTRA_MESON_ARGS=
-. .gitlab-ci/build-libdrm.sh
+. .gitlab-ci/container/build-libdrm.sh
 
 . .gitlab-ci/container/container_post_build.sh

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

@@ -1,45 +0,0 @@
-#!/bin/bash
-
-set -e
-set -o xtrace
-
-############### Install packages for building
-apt-get install -y ca-certificates
-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
-apt-get update
-
-apt-get install -y --no-remove \
-        abootimg \
-        android-sdk-ext4-utils \
-        bc \
-        bison \
-        bzip2 \
-        ccache \
-        cmake \
-        cpio \
-        g++ \
-        debootstrap \
-        fastboot \
-        flex \
-        git \
-        netcat \
-        nginx-full \
-        python3-distutils \
-        python3-minimal \
-        python3-serial \
-        python3.7 \
-        pkg-config \
-        procps \
-        rsync \
-        u-boot-tools \
-        unzip
-
-apt install -t buster-backports -y --no-remove \
-    meson
-
-# setup nginx
-sed -i '/gzip_/ s/#\ //g' /etc/nginx/nginx.conf
-cp .gitlab-ci/bare-metal/nginx-default-site  /etc/nginx/sites-enabled/default
-
-. .gitlab-ci/container/container_post_build.sh

.gitlab-ci/container/arm_test.sh

@@ -0,0 +1,40 @@
+#!/bin/bash
+
+set -e
+set -o xtrace
+
+############### Install packages for baremetal testing
+apt-get install -y ca-certificates
+sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list
+apt-get update
+
+apt-get install -y --no-remove \
+        abootimg \
+        cpio \
+        fastboot \
+        netcat \
+        nginx-full \
+        procps \
+        python-is-python3 \
+        python3-distutils \
+        python3-minimal \
+        python3-serial \
+        rsync \
+        snmp \
+        unzip \
+        wget
+
+# setup nginx
+sed -i '/gzip_/ s/#\ //g' /etc/nginx/nginx.conf
+cp .gitlab-ci/bare-metal/nginx-default-site  /etc/nginx/sites-enabled/default
+
+# setup SNMPv2 SMI MIB
+wget https://raw.githubusercontent.com/net-snmp/net-snmp/master/mibs/SNMPv2-SMI.txt \
+    -O /usr/share/snmp/mibs/SNMPv2-SMI.txt
+
+arch=arm64 . .gitlab-ci/container/baremetal_build.sh
+arch=armhf . .gitlab-ci/container/baremetal_build.sh
+
+# This firmware file from Debian bullseye causes hangs
+wget https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/plain/qcom/a530_pfp.fw?id=d5f9eea5a251d43412b07f5295d03e97b89ac4a5 \
+     -O /rootfs-arm64/lib/firmware/qcom/a530_pfp.fw

.gitlab-ci/container/baremetal_build.sh

@@ -3,58 +3,33 @@
 set -e
 set -o xtrace
 
-ROOTFS=/lava-files/rootfs-${arch}
+# Fetch the arm-built rootfs image and unpack it in our x86 container (saves
+# network transfer, disk usage, and runtime on test jobs)
 
-dpkg --add-architecture $arch
-apt-get update
+if wget -q --method=HEAD "${ARTIFACTS_PREFIX}/${FDO_UPSTREAM_REPO}/${ARTIFACTS_SUFFIX}/${arch}/done"; then
+  ARTIFACTS_URL="${ARTIFACTS_PREFIX}/${FDO_UPSTREAM_REPO}/${ARTIFACTS_SUFFIX}/${arch}"
+else
+  ARTIFACTS_URL="${ARTIFACTS_PREFIX}/${CI_PROJECT_PATH}/${ARTIFACTS_SUFFIX}/${arch}"
+fi
 
-# Cross-build test deps
-BAREMETAL_EPHEMERAL=" \
-        autoconf \
-        automake \
-        crossbuild-essential-$arch \
-        git-lfs \
-        libdrm-dev:$arch \
-        libboost-dev:$arch \
-        libegl1-mesa-dev:$arch \
-        libelf-dev:$arch \
-        libexpat1-dev:$arch \
-        libffi-dev:$arch \
-        libgbm-dev:$arch \
-        libgles2-mesa-dev:$arch \
-        libpciaccess-dev:$arch \
-        libpcre3-dev:$arch \
-        libpng-dev:$arch \
-        libpython3-dev:$arch \
-        libstdc++6:$arch \
-        libtinfo-dev:$arch \
-        libegl1-mesa-dev:$arch \
-        libvulkan-dev:$arch \
-        libxcb-keysyms1-dev:$arch \
-        libpython3-dev:$arch \
-        python3-dev \
-        qt5-default \
-        qt5-qmake \
-        qtbase5-dev:$arch \
-        "
+wget ${ARTIFACTS_URL}/lava-rootfs.tgz -O rootfs.tgz
+mkdir -p /rootfs-$arch
+tar -C /rootfs-$arch '--exclude=./dev/*' -zxf rootfs.tgz
+rm rootfs.tgz
 
-apt-get install -y --no-remove $BAREMETAL_EPHEMERAL
+if [[ $arch == "arm64" ]]; then
+    mkdir -p /baremetal-files
+    pushd /baremetal-files
 
-mkdir /var/cache/apt/archives/$arch
+    wget ${ARTIFACTS_URL}/Image
+    wget ${ARTIFACTS_URL}/Image.gz
+    wget ${ARTIFACTS_URL}/cheza-kernel
 
-############### Create cross-files
+    DEVICE_TREES="apq8016-sbc.dtb apq8096-db820c.dtb"
 
-. .gitlab-ci/create-cross-file.sh $arch
+    for DTB in $DEVICE_TREES; do
+        wget ${ARTIFACTS_URL}/$DTB
+    done
 
-. .gitlab-ci/container/container_pre_build.sh
-
-############### Create rootfs
-KERNEL_URL=https://github.com/anholt/linux/archive/cheza-pagetables-2020-09-04.tar.gz
-
-DEBIAN_ARCH=$arch INCLUDE_VK_CTS=1 . .gitlab-ci/container/lava_build.sh
-
-############### Uninstall the build software
-
-apt-get purge -y $BAREMETAL_EPHEMERAL
-
-. .gitlab-ci/container/container_post_build.sh
+    popd
+fi

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

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

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

@@ -6,14 +6,11 @@ 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.3.2 \
+    -b vulkan-cts-1.2.6.0 \
+    --depth 1 \
     /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.
@@ -26,11 +23,10 @@ cp doc/testlog-stylesheet/testlog.{css,xsl} /deqp
 popd
 
 pushd /deqp
-cmake -G Ninja \
+cmake -S /VK-GL-CTS -B . -G Ninja \
       -DDEQP_TARGET=${DEQP_TARGET:-x11_glx} \
       -DCMAKE_BUILD_TYPE=Release \
-      $EXTRA_CMAKE_ARGS \
-      /VK-GL-CTS
+      $EXTRA_CMAKE_ARGS
 ninja
 
 # Copy out the mustpass lists we want.

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

@@ -4,11 +4,11 @@ set -ex
 
 git clone https://github.com/ValveSoftware/Fossilize.git
 cd Fossilize
-git checkout 6b5b570008c9ab5269e341f04c811fe49a1bb72c
+git checkout 72088685d90bc814d14aad5505354ffa8a642789
 git submodule update --init
 mkdir build
 cd build
-cmake .. -DCMAKE_BUILD_TYPE=Release -G Ninja
+cmake -S .. -B . -G Ninja -DCMAKE_BUILD_TYPE=Release
 ninja -C . install
 cd ../..
 rm -rf Fossilize

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

@@ -2,16 +2,14 @@
 
 set -ex
 
-GFXRECONSTRUCT_VERSION=57c588c04af631d1d6d381a48e2b9283f9d9d528
+GFXRECONSTRUCT_VERSION=3738decc2f4f9ff183818e5ab213a75a79fb7ab1
 
-# Using the "dev" branch by now because it solves a crash and will allow us to
-# use the gfxreconstruct-info tool
-git clone https://github.com/LunarG/gfxreconstruct.git --single-branch -b dev --no-checkout /gfxreconstruct
+git clone https://github.com/LunarG/gfxreconstruct.git --single-branch -b master --no-checkout /gfxreconstruct
 pushd /gfxreconstruct
 git checkout "$GFXRECONSTRUCT_VERSION"
 git submodule update --init
 git submodule update
-cmake -G Ninja -B_build -H. -DCMAKE_BUILD_TYPE=Release
+cmake -S . -B _build -G Ninja -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/container/build-libclc.sh

@@ -0,0 +1,30 @@
+#!/bin/bash
+
+set -ex
+
+export LLVM_CONFIG="llvm-config-11"
+
+$LLVM_CONFIG --version
+
+git config --global user.email "mesa@example.com"
+git config --global user.name "Mesa CI"
+git clone \
+    https://github.com/llvm/llvm-project \
+    --depth 1 \
+    -b llvmorg-12.0.0-rc3 \
+    /llvm-project
+
+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 -DLLVM_SPIRV=/usr/bin/llvm-spirv
+ninja
+ninja install
+popd
+
+# workaroud cmake vs debian packaging.
+mkdir -p /usr/lib/clc
+ln -s /usr/share/clc/spirv64-mesa3d-.spv /usr/lib/clc/
+ln -s /usr/share/clc/spirv-mesa3d-.spv /usr/lib/clc/
+
+du -sh *
+rm -rf /libclc /llvm-project

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

@@ -2,7 +2,7 @@
 
 set -ex
 
-export LIBDRM_VERSION=libdrm-2.4.102
+export LIBDRM_VERSION=libdrm-2.4.105
 
 wget https://dri.freedesktop.org/libdrm/$LIBDRM_VERSION.tar.xz
 tar -xvf $LIBDRM_VERSION.tar.xz && rm $LIBDRM_VERSION.tar.xz

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

@@ -0,0 +1,27 @@
+#!/bin/bash
+
+set -ex
+
+if [ -n "$INCLUDE_OPENCL_TESTS" ]; then
+    PIGLIT_OPTS="-DPIGLIT_BUILD_CL_TESTS=ON"
+fi
+
+git clone https://gitlab.freedesktop.org/mesa/piglit.git --single-branch --no-checkout /piglit
+pushd /piglit
+git checkout 6a4be9e9946df310d9402f995f371c7deb8c27ba
+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
+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/container/container_pre_build.sh

@@ -8,7 +8,6 @@ export CCACHE_DIR=/cache/mesa/ccache
 export PATH=/usr/lib/ccache:$PATH
 
 # CMake ignores $PATH, so we have to force CC/GCC to the ccache versions.
-# Watch out, you can't have spaces in here because the renderdoc build fails.
 export CC="/usr/lib/ccache/gcc"
 export CXX="/usr/lib/ccache/g++"
 

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

@@ -16,8 +16,10 @@ arch2=${5:-$2}
 cat >$cross_file <<EOF
 [binaries]
 ar = '$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/$arch-ar'
-c = ['ccache', '$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/${arch2}29-clang', '-fuse-ld=lld', '-fno-exceptions', '-fno-unwind-tables', '-fno-asynchronous-unwind-tables']
-cpp = ['ccache', '$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/${arch2}29-clang++', '-fuse-ld=lld', '-fno-exceptions', '-fno-unwind-tables', '-fno-asynchronous-unwind-tables', '-static-libstdc++']
+c = ['ccache', '$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/${arch2}29-clang', '-fno-exceptions', '-fno-unwind-tables', '-fno-asynchronous-unwind-tables']
+cpp = ['ccache', '$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/${arch2}29-clang++', '-fno-exceptions', '-fno-unwind-tables', '-fno-asynchronous-unwind-tables', '-static-libstdc++']
+c_ld = 'lld'
+cpp_ld = 'lld'
 strip = '$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/$arch-strip'
 pkgconfig = ['/usr/bin/pkg-config']
 

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

@@ -5,49 +5,76 @@ set -ex
 if [ $DEBIAN_ARCH = arm64 ]; then
     ARCH_PACKAGES="firmware-qcom-media"
 elif [ $DEBIAN_ARCH = amd64 ]; then
-    # Upstream LLVM package repository
-    apt-get -y install --no-install-recommends gnupg ca-certificates
-    apt-key add /llvm-snapshot.gpg.key
-    echo "deb https://apt.llvm.org/buster/ llvm-toolchain-buster-10 main" >/etc/apt/sources.list.d/llvm10.list
-    apt-get update
-
-    ARCH_PACKAGES="libelf1
-                   libllvm10
-                   libxcb-dri2-0
-                   libxcb-dri3-0
-                   libxcb-present0
-                   libxcb-sync1
-                   libxcb-xfixes0
-                   libxshmfence1
-                   firmware-amd-graphics
+    ARCH_PACKAGES="firmware-amd-graphics
+                   libelf1
+                   libllvm11
                   "
 fi
 
+INSTALL_CI_FAIRY_PACKAGES="git
+                           python3-dev
+                           python3-pip
+                           python3-setuptools
+                           python3-wheel
+                           "
+
 apt-get -y install --no-install-recommends \
+    $ARCH_PACKAGES \
+    $INSTALL_CI_FAIRY_PACKAGES \
+    apitrace \
     ca-certificates \
     curl \
+    firmware-realtek \
     initramfs-tools \
-    libpng16-16 \
-    strace \
-    libsensors5 \
+    libasan6 \
     libexpat1 \
+    libpng16-16 \
+    libpython3.9 \
+    libsensors5 \
+    libvulkan1 \
+    libwaffle-1-0 \
     libx11-6 \
     libx11-xcb1 \
-    $ARCH_PACKAGES \
+    libxcb-dri2-0 \
+    libxcb-dri3-0 \
+    libxcb-glx0 \
+    libxcb-present0 \
+    libxcb-randr0 \
+    libxcb-shm0 \
+    libxcb-sync1 \
+    libxcb-xfixes0 \
+    libxdamage1 \
+    libxext6 \
+    libxfixes3 \
+    libxkbcommon0 \
+    libxrender1 \
+    libxshmfence1 \
+    libxxf86vm1 \
     netcat-openbsd \
     python3 \
-    libpython3.7 \
+    python3-lxml \
+    python3-mako \
+    python3-numpy \
+    python3-packaging \
     python3-pil \
-    python3-pytest \
+    python3-renderdoc \
     python3-requests \
+    python3-simplejson \
     python3-yaml \
     sntp \
+    strace \
+    waffle-utils \
     wget \
+    xinit \
+    xserver-xorg-core \
     xz-utils
 
-if [ -n "$INCLUDE_VK_CTS" ]; then
-    apt-get install -y libvulkan1
-fi
+# Needed for ci-fairy, this revision is able to upload files to
+# MinIO and doesn't depend on git
+pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@0f1abc24c043e63894085a6bd12f14263e8b29eb
+
+apt-get purge -y \
+        $INSTALL_CI_FAIRY_PACKAGES
 
 passwd root -d
 chsh -s /bin/sh
@@ -59,28 +86,21 @@ exec sh
 EOF
 chmod +x  /init
 
-mkdir -p /lib/firmware/rtl_nic
-wget https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/tree/rtl_nic/rtl8153a-3.fw -O /lib/firmware/rtl_nic/rtl8153a-3.fw
-
 #######################################################################
 # Strip the image to a small minimal system without removing the debian
 # toolchain.
 
-# xz compress firmware so it doesn't waste RAM at runtime.  Except db820c's
-# GPU firmware, due to using a precompiled kernel without compression support.
+# xz compress firmware so it doesn't waste RAM at runtime on ramdisk systems
 find /lib/firmware -type f -print0 | \
-    grep -vz a530 | \
     xargs -0r -P4 -n4 xz -T1 -C crc32
-ln -s /lib/firmware/qcom/a530* /lib/firmware/
 
 # Copy timezone file and remove tzdata package
 rm -rf /etc/localtime
 cp /usr/share/zoneinfo/Etc/UTC /etc/localtime
 
-UNNEEDED_PACKAGES="libfdisk1
-                   tzdata
-                   diffutils
-                   gnupg"
+UNNEEDED_PACKAGES="
+        libfdisk1
+        "
 
 export DEBIAN_FRONTEND=noninteractive
 
@@ -158,7 +178,6 @@ UNNEEDED_PACKAGES="apt libapt-pkg6.0 "\
 "libgles2-mesa-dev "\
 "libglx-mesa0 "\
 "mesa-common-dev "\
-"libz3-4 "\
 
 # Removing unneeded packages
 for PACKAGE in ${UNNEEDED_PACKAGES}
@@ -194,8 +213,8 @@ rm -rf usr/share/bash-completion
 # No zsh, no need for comletions
 rm -rf usr/share/zsh/vendor-completions
 
-# drop gcc-6 python helpers
-rm -rf usr/share/gcc-6
+# drop gcc python helpers
+rm -rf usr/share/gcc
 
 # Drop sysvinit leftovers
 rm -rf etc/init.d

.gitlab-ci/container/cross_build.sh

@@ -7,7 +7,6 @@ export DEBIAN_FRONTEND=noninteractive
 
 # Ephemeral packages (installed for this script and removed again at the end)
 STABLE_EPHEMERAL=" \
-        libpciaccess-dev:$arch
         "
 
 dpkg --add-architecture $arch
@@ -18,21 +17,46 @@ apt-get install -y --no-remove \
         crossbuild-essential-$arch \
         libelf-dev:$arch \
         libexpat1-dev:$arch \
-        libffi-dev:$arch \
+        libpciaccess-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
-        LLVM=llvm-7-dev
-else
-        LLVM=llvm-8-dev
+if [[ $arch != "armhf" ]]; then
+    if [[ $arch == "s390x" ]]; then
+        LLVM=9
+    else
+        LLVM=11
+    fi
+
+    # llvm-*-tools:$arch conflicts with python3:amd64. Install dependencies only
+    # with apt-get, then force-install llvm-*-{dev,tools}:$arch with dpkg to get
+    # around this.
+    apt-get install -y --no-remove \
+            libclang-cpp${LLVM}:$arch \
+            libffi-dev:$arch \
+            libgcc-s1:$arch \
+            libtinfo-dev:$arch \
+            libz3-dev:$arch \
+            llvm-${LLVM}:$arch \
+            zlib1g
 fi
 
-apt-get install -y --no-remove -t buster-backports \
-        $LLVM:$arch
-
-. .gitlab-ci/create-cross-file.sh $arch
+. .gitlab-ci/container/create-cross-file.sh $arch
 
 
 . .gitlab-ci/container/container_pre_build.sh
@@ -40,9 +64,16 @@ apt-get install -y --no-remove -t buster-backports \
 
 # dependencies where we want a specific version
 EXTRA_MESON_ARGS="--cross-file=/cross_file-${arch}.txt -D libdir=lib/$(dpkg-architecture -A $arch -qDEB_TARGET_MULTIARCH)"
-. .gitlab-ci/build-libdrm.sh
+. .gitlab-ci/container/build-libdrm.sh
 
 apt-get purge -y \
         $STABLE_EPHEMERAL
 
 . .gitlab-ci/container/container_post_build.sh
+
+# This needs to be done after container_post_build.sh, or apt-get breaks in there
+if [[ $arch != "armhf" ]]; then
+    apt-get download llvm-${LLVM}-{dev,tools}:$arch
+    dpkg -i --force-depends llvm-${LLVM}-*_${arch}.deb
+    rm llvm-${LLVM}-*_${arch}.deb
+fi

.gitlab-ci/container/lava_build.sh

@@ -3,28 +3,36 @@
 set -e
 set -o xtrace
 
+export DEBIAN_FRONTEND=noninteractive
+
 check_minio()
 {
-    MINIO_PATH="minio-packet.freedesktop.org/mesa-lava/$1/${DISTRIBUTION_TAG}/${DEBIAN_ARCH}"
+    MINIO_PATH="${MINIO_HOST}/mesa-lava/$1/${MINIO_SUFFIX}/${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 "mesa/mesa"
+check_minio "${FDO_UPSTREAM_REPO}"
 check_minio "${CI_PROJECT_PATH}"
 
 . .gitlab-ci/container/container_pre_build.sh
 
 # Install rust, which we'll be using for deqp-runner.  It will be cleaned up at the end.
-. .gitlab-ci/build-rust.sh
+. .gitlab-ci/container/build-rust.sh
 
 if [[ "$DEBIAN_ARCH" = "arm64" ]]; then
     GCC_ARCH="aarch64-linux-gnu"
     KERNEL_ARCH="arm64"
     DEFCONFIG="arch/arm64/configs/defconfig"
-    DEVICE_TREES="arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dtb arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dtb arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dtb arch/arm64/boot/dts/qcom/apq8016-sbc.dtb arch/arm64/boot/dts/amlogic/meson-g12b-a311d-khadas-vim3.dtb"
+    DEVICE_TREES="arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dtb"
+    DEVICE_TREES+=" arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dtb"
+    DEVICE_TREES+=" arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dtb"
+    DEVICE_TREES+=" arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dtb"
+    DEVICE_TREES+=" arch/arm64/boot/dts/qcom/apq8016-sbc.dtb"
+    DEVICE_TREES+=" arch/arm64/boot/dts/qcom/apq8096-db820c.dtb"
+    DEVICE_TREES+=" arch/arm64/boot/dts/amlogic/meson-g12b-a311d-khadas-vim3.dtb"
     KERNEL_IMAGE_NAME="Image"
 elif [[ "$DEBIAN_ARCH" = "armhf" ]]; then
     GCC_ARCH="arm-linux-gnueabihf"
@@ -32,7 +40,7 @@ elif [[ "$DEBIAN_ARCH" = "armhf" ]]; then
     DEFCONFIG="arch/arm/configs/multi_v7_defconfig"
     DEVICE_TREES="arch/arm/boot/dts/rk3288-veyron-jaq.dtb arch/arm/boot/dts/sun8i-h3-libretech-all-h3-cc.dtb"
     KERNEL_IMAGE_NAME="zImage"
-    . .gitlab-ci/create-cross-file.sh armhf
+    . .gitlab-ci/container/create-cross-file.sh armhf
 else
     GCC_ARCH="x86_64-linux-gnu"
     KERNEL_ARCH="x86_64"
@@ -59,83 +67,71 @@ if [[ -e /cross_file-$DEBIAN_ARCH.txt ]]; then
 fi
 
 apt-get update
-apt-get install -y automake \
-                   git \
+apt-get install -y --no-remove \
+                   automake \
                    bc \
                    cmake \
-                   wget \
                    debootstrap \
-                   libboost-dev \
+                   git \
                    libegl1-mesa-dev \
                    libgbm-dev \
                    libgles2-mesa-dev \
-                   libpcre3-dev \
-                   libpng-dev \
-                   libpython3-dev \
                    libssl-dev \
+                   libudev-dev \
                    libvulkan-dev \
-                   libxcb-keysyms1-dev \
-                   python3-dev \
+                   libwaffle-dev \
+                   libwayland-dev \
+                   libx11-xcb-dev \
+                   libxkbcommon-dev \
+                   patch \
                    python3-distutils \
+                   python3-mako \
+                   python3-numpy \
                    python3-serial \
-                   qt5-default \
-                   qt5-qmake \
-                   qtbase5-dev
+                   wget
 
 
 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 \
-		libxcb-keysyms1-dev:armhf \
-               qtbase5-dev:armhf
+    apt-get install -y --no-remove \
+                       libegl1-mesa-dev:armhf \
+                       libelf-dev:armhf \
+                       libgbm-dev:armhf \
+                       libgles2-mesa-dev:armhf \
+                       libudev-dev:armhf \
+                       libvulkan-dev:armhf \
+                       libwaffle-dev:armhf \
+                       libwayland-dev:armhf \
+                       libx11-xcb-dev:armhf \
+                       libxkbcommon-dev:armhf
 fi
 
-############### Build dEQP runner
 
-. .gitlab-ci/build-deqp-runner.sh
+############### Building
+STRIP_CMD="${GCC_ARCH}-strip"
+mkdir -p /lava-files/rootfs-${DEBIAN_ARCH}
+
+
+############### Build dEQP runner
+. .gitlab-ci/container/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/.
+mv /usr/local/bin/piglit-runner /lava-files/rootfs-${DEBIAN_ARCH}/usr/bin/.
 
 
 ############### Build dEQP
-STRIP_CMD="${GCC_ARCH}-strip"
-DEQP_TARGET=surfaceless . .gitlab-ci/build-deqp.sh
+DEQP_TARGET=surfaceless . .gitlab-ci/container/build-deqp.sh
 
 mv /deqp /lava-files/rootfs-${DEBIAN_ARCH}/.
 
 
-############### Build apitrace
-. .gitlab-ci/build-apitrace.sh
-mkdir -p /lava-files/rootfs-${DEBIAN_ARCH}/apitrace
-mv /apitrace/build /lava-files/rootfs-${DEBIAN_ARCH}/apitrace
-rm -rf /apitrace
-
-mkdir -p /lava-files/rootfs-${DEBIAN_ARCH}/waffle
-mv /waffle/build /lava-files/rootfs-${DEBIAN_ARCH}/waffle
-rm -rf /waffle
-
-
-############### Build renderdoc
-EXTRA_CMAKE_ARGS+=" -DENABLE_XCB=false"
-. .gitlab-ci/build-renderdoc.sh
-mkdir -p /lava-files/rootfs-${DEBIAN_ARCH}/renderdoc
-mv /renderdoc/build /lava-files/rootfs-${DEBIAN_ARCH}/renderdoc
-rm -rf /renderdoc
+############### Build piglit
+. .gitlab-ci/container/build-piglit.sh
+mv /piglit /lava-files/rootfs-${DEBIAN_ARCH}/.
 
 
 ############### 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
+. .gitlab-ci/container/build-libdrm.sh
 
 
 ############### Cross-build kernel
@@ -143,9 +139,6 @@ 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).
@@ -156,10 +149,12 @@ for i in /usr/bin/*-ld /usr/bin/ld; do
 done
 export PATH=`pwd`/ld-links:$PATH
 
-# Disable all modules in defconfig, so we only build the ones we want
-sed -i 's/=m/=n/g' ${DEFCONFIG}
+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
 
-./scripts/kconfig/merge_config.sh ${DEFCONFIG} ../.gitlab-ci/${KERNEL_ARCH}.config
+./scripts/kconfig/merge_config.sh ${DEFCONFIG} ../.gitlab-ci/container/${KERNEL_ARCH}.config
 make ${KERNEL_IMAGE_NAME}
 for image in ${KERNEL_IMAGE_NAME}; do
     cp arch/${KERNEL_ARCH}/boot/${image} /lava-files/.
@@ -170,10 +165,12 @@ if [[ -n ${DEVICE_TREES} ]]; then
     cp ${DEVICE_TREES} /lava-files/.
 fi
 
-make modules
-INSTALL_MOD_PATH=/lava-files/rootfs-${DEBIAN_ARCH}/ make modules_install
+if [ -n "$INSTALL_KERNEL_MODULES" ]; then
+    make modules
+    INSTALL_MOD_PATH=/lava-files/rootfs-${DEBIAN_ARCH}/ make modules_install
+fi
 
-if [[ ${DEBIAN_ARCH} = "arm64" ]] && which mkimage > /dev/null; then
+if [[ ${DEBIAN_ARCH} = "arm64" ]] && [[ ${MINIO_SUFFIX} = "baremetal" ]]; then
     make Image.lzma
     mkimage \
         -f auto \
@@ -183,86 +180,69 @@ if [[ ${DEBIAN_ARCH} = "arm64" ]] && which mkimage > /dev/null; then
         -C lzma\
         -b arch/arm64/boot/dts/qcom/sdm845-cheza-r3.dtb \
         /lava-files/cheza-kernel
+    KERNEL_IMAGE_NAME+=" cheza-kernel"
 fi
 
 popd
 rm -rf kernel
 
+############### Delete rust, since the tests won't be compiling anything.
+rm -rf /root/.cargo
+
 ############### Create rootfs
 set +e
-debootstrap \
-    --variant=minbase \
-    --arch=${DEBIAN_ARCH} \
+if ! debootstrap \
+     --variant=minbase \
+     --arch=${DEBIAN_ARCH} \
      --components main,contrib,non-free \
-    buster \
-    /lava-files/rootfs-${DEBIAN_ARCH}/ \
-    http://deb.debian.org/debian
-
-cat /lava-files/rootfs-${DEBIAN_ARCH}/debootstrap/debootstrap.log
+     bullseye \
+     /lava-files/rootfs-${DEBIAN_ARCH}/ \
+     http://deb.debian.org/debian; then
+    cat /lava-files/rootfs-${DEBIAN_ARCH}/debootstrap/debootstrap.log
+    exit 1
+fi
 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}/.
+cp .gitlab-ci/container/create-rootfs.sh /lava-files/rootfs-${DEBIAN_ARCH}/.
 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
-du -ah /lava-files/rootfs-${DEBIAN_ARCH} | sort -h | tail -100
-pushd /lava-files/rootfs-${DEBIAN_ARCH}
-  tar cvzf /lava-files/lava-rootfs.tgz .
-popd
 
-if [ ${DEBIAN_ARCH} = arm64 ]; then
-    # Pull down a specific build of qcomlt/release/qcomlt-5.4 8c79b3d12355
-    # ("Merge tag 'v5.4.23' into release/qcomlt-5.4"), where I used the
-    # .config from
-    # http://snapshots.linaro.org/96boards/dragonboard820c/linaro/debian/457/config-5.4.0-qcomlt-arm64
-    # with the following merged in:
-    #
-    # CONFIG_DRM=y
-    # CONFIG_DRM_MSM=y
-    # CONFIG_ATL1C=y
-    #
-    # Reason: 5.5 has a big stack of oopses and warns on db820c.  4.14-5.4
-    # linaro kernel binaries (see above .config link) have these as modules
-    # and distributed the modules only in the debian system, not the initrd,
-    # so they're very hard to extract (involving simg2img and loopback
-    # mounting).  4.11 is missing d72fea538fe6 ("drm/msm: Fix the check for
-    # the command size") so it can't actually run fredreno.  qcomlt-4.14 is
-    # unstable at boot (~10% instaboot rate).  The 5.4 qcomlt kernel with msm
-    # built in seems like the easiest way to go.
-    wget https://people.freedesktop.org/~anholt/qcomlt-5.4-msm-build/Image.gz -O Image.gz \
-         -O /lava-files/db820c-kernel
-    wget https://people.freedesktop.org/~anholt/qcomlt-5.4-msm-build/apq8096-db820c.dtb \
-         -O /lava-files/db820c.dtb
 
+############### 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
+
+
+if [ ${DEBIAN_ARCH} = arm64 ] && [ ${MINIO_SUFFIX} = baremetal ]; then
     # Make a gzipped copy of the Image for db410c.
     gzip -k /lava-files/Image
-
-    # Add missing a630 firmware, added to debian packge in apr 2020
-    wget https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/plain/qcom/a630_gmu.bin \
-         -O /lava-files/rootfs-arm64/lib/firmware/qcom/a630_gmu.bin
-    wget https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/plain/qcom/a630_sqe.fw \
-         -O /lava-files/rootfs-arm64/lib/firmware/qcom/a630_sqe.fw
+    KERNEL_IMAGE_NAME+=" Image.gz"
 fi
 
+du -ah /lava-files/rootfs-${DEBIAN_ARCH} | sort -h | tail -100
+pushd /lava-files/rootfs-${DEBIAN_ARCH}
+  tar czf /lava-files/lava-rootfs.tgz .
+popd
+
 . .gitlab-ci/container/container_post_build.sh
 
 ############### Upload the files!
-if [ -n "$UPLOAD_FOR_LAVA" ]; then
-    ci-fairy minio login $CI_JOB_JWT
-    FILES_TO_UPLOAD="lava-rootfs.tgz \
-                     $KERNEL_IMAGE_NAME"
+ci-fairy minio login $CI_JOB_JWT
+FILES_TO_UPLOAD="lava-rootfs.tgz \
+                 $KERNEL_IMAGE_NAME"
 
-    if [[ -n $DEVICE_TREES ]]; then
-        FILES_TO_UPLOAD="$FILES_TO_UPLOAD $(basename -a $DEVICE_TREES)"
-    fi
-
-    for f in $FILES_TO_UPLOAD; do
-        ci-fairy minio cp /lava-files/$f \
-            minio://${MINIO_PATH}/$f
-    done
-
-    touch /lava-files/done
-    ci-fairy minio cp /lava-files/done minio://${MINIO_PATH}/done
+if [[ -n $DEVICE_TREES ]]; then
+    FILES_TO_UPLOAD="$FILES_TO_UPLOAD $(basename -a $DEVICE_TREES)"
 fi
 
+for f in $FILES_TO_UPLOAD; do
+    ci-fairy minio cp /lava-files/$f \
+             minio://${MINIO_PATH}/$f
+done
+
+touch /lava-files/done
+ci-fairy minio cp /lava-files/done minio://${MINIO_PATH}/done

.gitlab-ci/container/llvm-snapshot.gpg.key

@@ -1,52 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.12 (GNU/Linux)
-
-mQINBFE9lCwBEADi0WUAApM/mgHJRU8lVkkw0CHsZNpqaQDNaHefD6Rw3S4LxNmM
-EZaOTkhP200XZM8lVdbfUW9xSjA3oPldc1HG26NjbqqCmWpdo2fb+r7VmU2dq3NM
-R18ZlKixiLDE6OUfaXWKamZsXb6ITTYmgTO6orQWYrnW6ckYHSeaAkW0wkDAryl2
-B5v8aoFnQ1rFiVEMo4NGzw4UX+MelF7rxaaregmKVTPiqCOSPJ1McC1dHFN533FY
-Wh/RVLKWo6npu+owtwYFQW+zyQhKzSIMvNujFRzhIxzxR9Gn87MoLAyfgKEzrbbT
-DhqqNXTxS4UMUKCQaO93TzetX/EBrRpJj+vP640yio80h4Dr5pAd7+LnKwgpTDk1
-G88bBXJAcPZnTSKu9I2c6KY4iRNbvRz4i+ZdwwZtdW4nSdl2792L7Sl7Nc44uLL/
-ZqkKDXEBF6lsX5XpABwyK89S/SbHOytXv9o4puv+65Ac5/UShspQTMSKGZgvDauU
-cs8kE1U9dPOqVNCYq9Nfwinkf6RxV1k1+gwtclxQuY7UpKXP0hNAXjAiA5KS5Crq
-7aaJg9q2F4bub0mNU6n7UI6vXguF2n4SEtzPRk6RP+4TiT3bZUsmr+1ktogyOJCc
-Ha8G5VdL+NBIYQthOcieYCBnTeIH7D3Sp6FYQTYtVbKFzmMK+36ERreL/wARAQAB
-tD1TeWx2ZXN0cmUgTGVkcnUgLSBEZWJpYW4gTExWTSBwYWNrYWdlcyA8c3lsdmVz
-dHJlQGRlYmlhbi5vcmc+iQI4BBMBAgAiBQJRPZQsAhsDBgsJCAcDAgYVCAIJCgsE
-FgIDAQIeAQIXgAAKCRAVz00Yr090Ibx+EADArS/hvkDF8juWMXxh17CgR0WZlHCC
-9CTBWkg5a0bNN/3bb97cPQt/vIKWjQtkQpav6/5JTVCSx2riL4FHYhH0iuo4iAPR
-udC7Cvg8g7bSPrKO6tenQZNvQm+tUmBHgFiMBJi92AjZ/Qn1Shg7p9ITivFxpLyX
-wpmnF1OKyI2Kof2rm4BFwfSWuf8Fvh7kDMRLHv+MlnK/7j/BNpKdozXxLcwoFBmn
-l0WjpAH3OFF7Pvm1LJdf1DjWKH0Dc3sc6zxtmBR/KHHg6kK4BGQNnFKujcP7TVdv
-gMYv84kun14pnwjZcqOtN3UJtcx22880DOQzinoMs3Q4w4o05oIF+sSgHViFpc3W
-R0v+RllnH05vKZo+LDzc83DQVrdwliV12eHxrMQ8UYg88zCbF/cHHnlzZWAJgftg
-hB08v1BKPgYRUzwJ6VdVqXYcZWEaUJmQAPuAALyZESw94hSo28FAn0/gzEc5uOYx
-K+xG/lFwgAGYNb3uGM5m0P6LVTfdg6vDwwOeTNIExVk3KVFXeSQef2ZMkhwA7wya
-KJptkb62wBHFE+o9TUdtMCY6qONxMMdwioRE5BYNwAsS1PnRD2+jtlI0DzvKHt7B
-MWd8hnoUKhMeZ9TNmo+8CpsAtXZcBho0zPGz/R8NlJhAWpdAZ1CmcPo83EW86Yq7
-BxQUKnNHcwj2ebkCDQRRPZQsARAA4jxYmbTHwmMjqSizlMJYNuGOpIidEdx9zQ5g
-zOr431/VfWq4S+VhMDhs15j9lyml0y4ok215VRFwrAREDg6UPMr7ajLmBQGau0Fc
-bvZJ90l4NjXp5p0NEE/qOb9UEHT7EGkEhaZ1ekkWFTWCgsy7rRXfZLxB6sk7pzLC
-DshyW3zjIakWAnpQ5j5obiDy708pReAuGB94NSyb1HoW/xGsGgvvCw4r0w3xPStw
-F1PhmScE6NTBIfLliea3pl8vhKPlCh54Hk7I8QGjo1ETlRP4Qll1ZxHJ8u25f/ta
-RES2Aw8Hi7j0EVcZ6MT9JWTI83yUcnUlZPZS2HyeWcUj+8nUC8W4N8An+aNps9l/
-21inIl2TbGo3Yn1JQLnA1YCoGwC34g8QZTJhElEQBN0X29ayWW6OdFx8MDvllbBV
-ymmKq2lK1U55mQTfDli7S3vfGz9Gp/oQwZ8bQpOeUkc5hbZszYwP4RX+68xDPfn+
-M9udl+qW9wu+LyePbW6HX90LmkhNkkY2ZzUPRPDHZANU5btaPXc2H7edX4y4maQa
-xenqD0lGh9LGz/mps4HEZtCI5CY8o0uCMF3lT0XfXhuLksr7Pxv57yue8LLTItOJ
-d9Hmzp9G97SRYYeqU+8lyNXtU2PdrLLq7QHkzrsloG78lCpQcalHGACJzrlUWVP/
-fN3Ht3kAEQEAAYkCHwQYAQIACQUCUT2ULAIbDAAKCRAVz00Yr090IbhWEADbr50X
-OEXMIMGRLe+YMjeMX9NG4jxs0jZaWHc/WrGR+CCSUb9r6aPXeLo+45949uEfdSsB
-pbaEdNWxF5Vr1CSjuO5siIlgDjmT655voXo67xVpEN4HhMrxugDJfCa6z97P0+ML
-PdDxim57uNqkam9XIq9hKQaurxMAECDPmlEXI4QT3eu5qw5/knMzDMZj4Vi6hovL
-wvvAeLHO/jsyfIdNmhBGU2RWCEZ9uo/MeerPHtRPfg74g+9PPfP6nyHD2Wes6yGd
-oVQwtPNAQD6Cj7EaA2xdZYLJ7/jW6yiPu98FFWP74FN2dlyEA2uVziLsfBrgpS4l
-tVOlrO2YzkkqUGrybzbLpj6eeHx+Cd7wcjI8CalsqtL6cG8cUEjtWQUHyTbQWAgG
-5VPEgIAVhJ6RTZ26i/G+4J8neKyRs4vz+57UGwY6zI4AB1ZcWGEE3Bf+CDEDgmnP
-LSwbnHefK9IljT9XU98PelSryUO/5UPw7leE0akXKB4DtekToO226px1VnGp3Bov
-1GBGvpHvL2WizEwdk+nfk8LtrLzej+9FtIcq3uIrYnsac47Pf7p0otcFeTJTjSq3
-krCaoG4Hx0zGQG2ZFpHrSrZTVy6lxvIdfi0beMgY6h78p6M9eYZHQHc02DjFkQXN
-bXb5c6gCHESH5PXwPU4jQEE7Ib9J6sbk7ZT2Mw==
-=j+4q
------END PGP PUBLIC KEY BLOCK-----

.gitlab-ci/container/ppc64el_build.sh

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

.gitlab-ci/container/x86_64.config

@@ -43,6 +43,8 @@ CONFIG_USB_NET_DRIVERS=y
 CONFIG_USB_RTL8152=y
 CONFIG_USB_NET_AX8817X=y
 CONFIG_USB_NET_SMSC95XX=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_ETH=y
 
 CONFIG_FW_LOADER_COMPRESS=y
 
@@ -63,3 +65,5 @@ CONFIG_PARPORT_SERIAL=y
 CONFIG_SERIAL_8250_DW=y
 CONFIG_CHROME_PLATFORMS=y
 
+#options for Intel devices
+CONFIG_MFD_INTEL_LPSS_PCI=y

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

@@ -5,21 +5,17 @@ set -o xtrace
 
 export DEBIAN_FRONTEND=noninteractive
 
-apt-get install -y \
-        ca-certificates \
-        gnupg \
+apt-get install -y ca-certificates
+
+sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list
+
+# Ephemeral packages (installed for this script and removed again at
+# the end)
+STABLE_EPHEMERAL=" \
         python3-pip \
         python3-setuptools \
         unzip \
-        wget
-
-# Upstream LLVM package repository
-apt-key add .gitlab-ci/container/llvm-snapshot.gpg.key
-echo "deb https://apt.llvm.org/buster/ llvm-toolchain-buster-9 main" >/etc/apt/sources.list.d/llvm9.list
-echo "deb https://apt.llvm.org/buster/ llvm-toolchain-buster-10 main" >/etc/apt/sources.list.d/llvm10.list
-
-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
+        "
 
 apt-get update
 
@@ -27,7 +23,6 @@ apt-get install -y --no-remove \
         $STABLE_EPHEMERAL \
         bison \
         ccache \
-        clang-10 \
         dpkg-cross \
         flex \
         g++ \
@@ -35,13 +30,15 @@ apt-get install -y --no-remove \
         gcc \
         git \
         kmod \
+        libclang-11-dev \
         libclang-9-dev \
-        libclang-10-dev \
         libclc-dev \
         libelf-dev \
         libepoxy-dev \
         libexpat1-dev \
         libgtk-3-dev \
+        libllvm11 \
+        libllvm9 \
         libomxil-bellagio-dev \
         libpciaccess-dev \
         libunwind-dev \
@@ -50,7 +47,6 @@ apt-get install -y --no-remove \
         libvulkan-dev \
         libx11-dev \
         libx11-xcb-dev \
-        libxdamage-dev \
         libxext-dev \
         libxml2-utils \
         libxrandr-dev \
@@ -59,29 +55,24 @@ apt-get install -y --no-remove \
         libxvmc-dev \
         libxxf86vm-dev \
         libz-mingw-w64-dev \
-        llvm-9-dev \
-        llvm-10-dev \
+        make \
+        meson \
         pkg-config \
-        python-mako \
+        python-is-python3 \
         python3-mako \
         python3-pil \
-        python3-pip \
         python3-requests \
-        python3-setuptools \
         qemu-user \
-        scons \
-        wine64-development \
+        valgrind \
+        wayland-protocols \
+        wget \
+        wine64 \
         x11proto-dri2-dev \
         x11proto-gl-dev \
         x11proto-randr-dev \
         xz-utils \
         zlib1g-dev
 
-apt-get install -y --no-remove -t buster-backports \
-        libclang-8-dev \
-        libllvm8 \
-        meson
-
 # Needed for ci-fairy, this revision is able to upload files to MinIO
 pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@6f5af7e5574509726c79109e3c147cee95e81366
 
@@ -94,8 +85,6 @@ rm bin/glslangValidator glslang-master-linux-Release.zip
 
 ############### Uninstall ephemeral packages
 
-apt-get purge -y \
-        gnupg \
-        unzip
+apt-get purge -y $STABLE_EPHEMERAL
 
 . .gitlab-ci/container/container_post_build.sh

.gitlab-ci/container/x86_build.sh

@@ -12,12 +12,9 @@ STABLE_EPHEMERAL=" \
       autotools-dev \
       bzip2 \
       cmake \
-      gnupg \
       libgbm-dev \
       libtool \
-      make \
       unzip \
-      wget \
       "
 
 # We need multiarch for Wine
@@ -26,16 +23,32 @@ apt-get update
 
 apt-get install -y --no-remove \
       $STABLE_EPHEMERAL \
+      clang \
+      libasan6 \
       libarchive-dev \
-      libclang-cpp10-dev \
+      libclang-cpp11-dev \
+      libglvnd-dev \
+      libllvmspirvlib-dev \
       liblua5.3-dev \
+      libxcb-dri2-0-dev \
+      libxcb-dri3-dev \
+      libxcb-glx0-dev \
+      libxcb-present-dev \
+      libxcb-randr0-dev \
+      libxcb-shm0-dev \
+      libxcb-sync-dev \
+      libxcb-xfixes0-dev \
+      libxcb1-dev \
       libxml2-dev \
+      llvm-11-dev \
+      llvm-9-dev \
       ocl-icd-opencl-dev \
-      wine-development \
-      wine32-development
-
-apt-get install -y --no-remove -t buster-backports \
-      llvm-8-dev
+      procps \
+      spirv-tools \
+      strace \
+      time \
+      wine \
+      wine32
 
 
 . .gitlab-ci/container/container_pre_build.sh
@@ -54,60 +67,23 @@ chmod +x /usr/local/bin/x86_64-w64-mingw32-pkg-config
 
 # dependencies where we want a specific version
 export              XORG_RELEASES=https://xorg.freedesktop.org/releases/individual
-export               XCB_RELEASES=https://xcb.freedesktop.org/dist
 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.17.0
-export  WAYLAND_PROTOCOLS_VERSION=wayland-protocols-1.12
+export         LIBWAYLAND_VERSION=wayland-1.18.0
 
 wget $XORG_RELEASES/util/$XORGMACROS_VERSION.tar.bz2
 tar -xvf $XORGMACROS_VERSION.tar.bz2 && rm $XORGMACROS_VERSION.tar.bz2
 cd $XORGMACROS_VERSION; ./configure; make install; cd ..
 rm -rf $XORGMACROS_VERSION
 
-wget $XCB_RELEASES/$XCBPROTO_VERSION.tar.bz2
-tar -xvf $XCBPROTO_VERSION.tar.bz2 && rm $XCBPROTO_VERSION.tar.bz2
-cd $XCBPROTO_VERSION; ./configure; make install; cd ..
-rm -rf $XCBPROTO_VERSION
-
-wget $XCB_RELEASES/$LIBXCB_VERSION.tar.bz2
-tar -xvf $LIBXCB_VERSION.tar.bz2 && rm $LIBXCB_VERSION.tar.bz2
-cd $LIBXCB_VERSION; ./configure; make install; cd ..
-rm -rf $LIBXCB_VERSION
-
-. .gitlab-ci/build-libdrm.sh
+. .gitlab-ci/container/build-libdrm.sh
 
 wget $WAYLAND_RELEASES/$LIBWAYLAND_VERSION.tar.xz
 tar -xvf $LIBWAYLAND_VERSION.tar.xz && rm $LIBWAYLAND_VERSION.tar.xz
 cd $LIBWAYLAND_VERSION; ./configure --enable-libraries --without-host-scanner --disable-documentation --disable-dtd-validation; make install; cd ..
 rm -rf $LIBWAYLAND_VERSION
 
-wget $WAYLAND_RELEASES/$WAYLAND_PROTOCOLS_VERSION.tar.xz
-tar -xvf $WAYLAND_PROTOCOLS_VERSION.tar.xz && rm $WAYLAND_PROTOCOLS_VERSION.tar.xz
-cd $WAYLAND_PROTOCOLS_VERSION; ./configure; make install; cd ..
-rm -rf $WAYLAND_PROTOCOLS_VERSION
-
-
-# The version of libglvnd-dev in debian is too old
-# Check this page to see when this local compilation can be dropped in favour of the package:
-# https://packages.debian.org/libglvnd-dev
-GLVND_VERSION=1.3.2
-wget https://gitlab.freedesktop.org/glvnd/libglvnd/-/archive/v$GLVND_VERSION/libglvnd-v$GLVND_VERSION.tar.gz
-tar -xvf libglvnd-v$GLVND_VERSION.tar.gz && rm libglvnd-v$GLVND_VERSION.tar.gz
-pushd libglvnd-v$GLVND_VERSION; ./autogen.sh; ./configure; make install; popd
-rm -rf libglvnd-v$GLVND_VERSION
-
-. .gitlab-ci/build-spirv-tools.sh
-
-git clone https://github.com/KhronosGroup/SPIRV-LLVM-Translator -b llvm_release_100 --depth 1
-pushd SPIRV-LLVM-Translator
-cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS=-fPIC -DCMAKE_CXX_FLAGS=-fPIC
-ninja
-ninja install
-popd
 
 pushd /usr/local
 git clone https://gitlab.freedesktop.org/mesa/shader-db.git --depth 1
@@ -116,6 +92,15 @@ 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

@@ -1,69 +0,0 @@
-#!/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

@@ -5,17 +5,19 @@ set -o xtrace
 
 export DEBIAN_FRONTEND=noninteractive
 
-apt-get install -y \
-      ca-certificates \
-      gnupg
-
-# Upstream LLVM package repository
-apt-key add .gitlab-ci/container/llvm-snapshot.gpg.key
-echo "deb https://apt.llvm.org/buster/ llvm-toolchain-buster-9 main" >/etc/apt/sources.list.d/llvm9.list
-echo "deb https://apt.llvm.org/buster/ llvm-toolchain-buster-10 main" >/etc/apt/sources.list.d/llvm10.list
+apt-get install -y ca-certificates
 
 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=" \
+      cargo \
+      python3-dev \
+      python3-pip \
+      python3-setuptools \
+      python3-wheel \
+      "
 
 apt-get update
 apt-get dist-upgrade -y
@@ -23,41 +25,47 @@ apt-get dist-upgrade -y
 apt-get install -y --no-remove \
       git \
       git-lfs \
+      libasan6 \
       libexpat1 \
+      libllvm11 \
       libllvm9 \
-      libllvm10 \
       liblz4-1 \
-      libpcre32-3 \
       libpng16-16 \
-      libpython3.7 \
+      libpython3.9 \
       libvulkan1 \
       libwayland-client0 \
       libwayland-server0 \
       libxcb-ewmh2 \
       libxcb-randr0 \
-      libxcb-keysyms1 \
       libxcb-xfixes0 \
       libxkbcommon0 \
       libxrandr2 \
       libxrender1 \
-      python \
+      python-is-python3 \
       python3-mako \
       python3-numpy \
+      python3-packaging \
       python3-pil \
-      python3-pytest \
       python3-requests \
       python3-six \
       python3-yaml \
-      python3.7 \
-      qt5-default \
-      qt5-qmake \
       vulkan-tools \
       waffle-utils \
       xauth \
       xvfb \
       zlib1g
 
-apt-get purge -y \
-      gnupg
+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
+
+############### Build dEQP runner
+. .gitlab-ci/container/build-deqp-runner.sh
+rm -rf ~/.cargo
+
+apt-get purge -y $STABLE_EPHEMERAL
 
 apt-get autoremove -y --purge

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

@@ -10,82 +10,72 @@ STABLE_EPHEMERAL=" \
       autoconf \
       automake \
       ccache \
-      clang-10 \
+      clang-11 \
       cmake \
       g++ \
-      libclang-cpp10-dev \
+      libclang-cpp11-dev \
       libgbm-dev \
       libgles2-mesa-dev \
-      libpcre3-dev \
+      libllvmspirvlib-dev \
       libpciaccess-dev \
-      libpng-dev \
+      libudev-dev \
       libvulkan-dev \
       libwaffle-dev \
-      libxcb-keysyms1-dev \
+      libwayland-dev \
+      libx11-xcb-dev \
       libxkbcommon-dev \
       libxrender-dev \
-      llvm-10-dev \
+      llvm-11-dev \
+      llvm-spirv \
       make \
       meson \
       ocl-icd-opencl-dev \
       patch \
       pkg-config \
       python3-distutils \
-      python3.7-dev \
       wget \
       xz-utils \
       "
 
 apt-get install -y --no-remove \
+      $STABLE_EPHEMERAL \
+      apitrace \
       clinfo \
-      libclang-common-10-dev \
-      libclang-cpp10 \
+      libclang-common-11-dev \
+      libclang-cpp11 \
+      libegl1 \
+      libllvmspirvlib11 \
       libxcb-shm0 \
       ocl-icd-libopencl1 \
       python3-lxml \
+      python3-renderdoc \
       python3-simplejson \
-      $STABLE_EPHEMERAL
+      spirv-tools
 
 
 . .gitlab-ci/container/container_pre_build.sh
 
 
-############### Build spirv-tools (debian too old)
+############### Build libdrm
 
-. .gitlab-ci/build-spirv-tools.sh
+. .gitlab-ci/container/build-libdrm.sh
 
 ############### Build libclc
 
-. .gitlab-ci/build-libclc.sh
+. .gitlab-ci/container/build-libclc.sh
 
 ############### Build virglrenderer
 
-. .gitlab-ci/build-virglrenderer.sh
+. .gitlab-ci/container/build-virglrenderer.sh
 
 ############### Build piglit
 
-INCLUDE_OPENCL_TESTS=1 . .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
-rm -rf /root/.rustup /root/.cargo
+INCLUDE_OPENCL_TESTS=1 . .gitlab-ci/container/build-piglit.sh
 
 ############### Build dEQP GL
 
-DEQP_TARGET=surfaceless . .gitlab-ci/build-deqp.sh
+DEQP_TARGET=surfaceless . .gitlab-ci/container/build-deqp.sh
 
-############### Build apitrace
-
-. .gitlab-ci/build-apitrace.sh
-
-############### Build renderdoc
-
-. .gitlab-ci/build-renderdoc.sh
-
-############### Build libdrm
-
-. .gitlab-ci/build-libdrm.sh
 
 ############### Uninstall the build software
 

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

@@ -13,28 +13,32 @@ STABLE_EPHEMERAL=" \
       libgbm-dev \
       libgles2-mesa-dev \
       liblz4-dev \
-      libpng-dev \
+      libpciaccess-dev \
+      libudev-dev \
       libvulkan-dev \
+      libwaffle-dev \
+      libwayland-dev \
+      libx11-xcb-dev \
       libxcb-ewmh-dev \
+      libxcb-keysyms1-dev \
       libxkbcommon-dev \
       libxrandr-dev \
       libxrender-dev \
       libzstd-dev \
       meson \
       p7zip \
+      patch \
       pkg-config \
       python3-distutils \
       wget \
+      xz-utils \
       "
 
-# Unfortunately, gfxreconstruct needs the -dev packages:
-# https://github.com/LunarG/gfxreconstruct/issues/402
 apt-get install -y --no-remove \
-      libwayland-dev \
-      libx11-xcb-dev \
-      libxcb-keysyms1-dev \
-      libxcb1-dev \
-      $STABLE_EPHEMERAL
+      $STABLE_EPHEMERAL \
+      libxcb-shm0 \
+      python3-lxml \
+      python3-simplejson
 
 # We need multiarch for Wine
 dpkg --add-architecture i386
@@ -75,7 +79,7 @@ rm crashdialog.reg
 # system.reg file, which fails.
 # Just giving it a bit more of time for it to be created solves the
 # problem ...
-test -f  "${WINEPREFIX}/system.reg" || sleep 2
+while ! test -f  "${WINEPREFIX}/system.reg"; do sleep 1; done
 
 wget "https://github.com/doitsujin/dxvk/releases/download/v${DXVK_VERSION}/dxvk-${DXVK_VERSION}.tar.gz"
 tar xzpf dxvk-"${DXVK_VERSION}".tar.gz
@@ -107,25 +111,24 @@ wine \
 
 . .gitlab-ci/container/container_pre_build.sh
 
-############### Build dEQP runner (and install rust temporarily for it)
-. .gitlab-ci/build-rust.sh
-. .gitlab-ci/build-deqp-runner.sh
-rm -rf /root/.rustup /root/.cargo
+############### Build piglit
+
+PIGLIT_BUILD_TARGETS="piglit_replayer" . .gitlab-ci/container/build-piglit.sh
 
 ############### Build Fossilize
 
-. .gitlab-ci/build-fossilize.sh
+. .gitlab-ci/container/build-fossilize.sh
 
 ############### Build dEQP VK
-. .gitlab-ci/build-deqp.sh
+. .gitlab-ci/container/build-deqp.sh
 
 ############### Build gfxreconstruct
 
-. .gitlab-ci/build-gfxreconstruct.sh
+. .gitlab-ci/container/build-gfxreconstruct.sh
 
-############### Build VulkanTools
+############### Build libdrm
 
-. .gitlab-ci/build-vulkantools.sh
+. .gitlab-ci/container/build-libdrm.sh
 
 ############### Uninstall the build software
 

.gitlab-ci/cross-xfail-ppc64el

@@ -1,4 +1 @@
 lp_test_arit
-roundeven
-u_format_test
-u_half_test

.gitlab-ci/cross-xfail-s390x

@@ -1,4 +1,3 @@
 lp_test_arit
 lp_test_format
-lp_test_printf
 u_format_test

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

@@ -1,15 +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.
-dEQP-GLES3.functional.occlusion_query.stencil_write
-dEQP-GLES3.functional.rasterization.fbo.rbo_.*
-dEQP-GLES3.functional.rasterization.fbo.texture_2d.interpolation.triangles
-dEQP-GLES3.functional.rasterization.fbo.texture_2d.primitives.points
-dEQP-GLES3.functional.rasterization.flatshading.lines_wide
-dEQP-GLES3.functional.rasterization.flatshading.triangles
-dEQP-GLES3.functional.shaders.linkage.varying.interpolation.centroid
-dEQP-GLES3.functional.shaders.texture_functions.texturegradoffset.*
-dEQP-GLES3.functional.shaders.texture_functions.textureprojgradoffset.*
-dEQP-GLES3.functional.texture.units.4_units.only_3d.*
-dEQP-GLES3.functional.transform_feedback.random.interleaved.triangles.8
-dEQP-GLES3.functional.vertex_arrays.single_attribute.*

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

@@ -1,64 +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.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
-dEQP-GLES2.functional.texture.specification.basic_copytexsubimage2d.2d_rgba,Fail
-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-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
-dEQP-GLES31.functional.image_load_store.cube.format_reinterpret.rgba8i_r32f,Fail
-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
-dEQP-GLES31.functional.texture.texture_buffer.render.as_vertex_array_as_index_array_as_fragment_texture.offset_1_alignments,Fail
-dEQP-GLES31.functional.texture.texture_buffer.render.as_vertex_texture_as_fragment_texture.range_size_98304,Fail
-dEQP-GLES31.functional.texture.texture_buffer.state_query.max_texture_buffer_size_getinteger,Fail

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

@@ -1,87 +0,0 @@
-
-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-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-fails.txt

@@ -1,26 +0,0 @@
-# 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-lima-skips.txt

@@ -1,38 +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
-
-# 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
-dEQP-GLES2.functional.negative_api.texture.generatemipmap_zero_level_array_compressed
-dEQP-GLES2.functional.shaders.builtin_variable.frontfacing
-dEQP-GLES2.functional.shaders.random.exponential.fragment.94
-dEQP-GLES2.functional.shaders.random.all_features.fragment.55
-dEQP-GLES2.functional.shaders.random.trigonometric.fragment.1
-dEQP-GLES2.functional.shaders.random.trigonometric.fragment.69
-
-# Hangs / OOM
-dEQP-GLES2.functional.shaders.indexing.varying_array.vec4_dynamic_loop_write_static_read
-dEQP-GLES2.functional.shaders.indexing.varying_array.vec4_dynamic_loop_write_dynamic_read
-dEQP-GLES2.functional.shaders.indexing.varying_array.vec4_dynamic_loop_write_static_loop_read
-dEQP-GLES2.functional.shaders.indexing.varying_array.vec4_dynamic_loop_write_dynamic_loop_read
-
-dEQP-GLES2.functional.shaders.indexing.tmp_array.vec4_dynamic_loop_write_static_read_vertex
-dEQP-GLES2.functional.shaders.indexing.tmp_array.vec4_dynamic_loop_write_dynamic_read_vertex
-dEQP-GLES2.functional.shaders.indexing.tmp_array.vec4_dynamic_loop_write_static_loop_read_vertex
-dEQP-GLES2.functional.shaders.indexing.tmp_array.vec4_dynamic_loop_write_dynamic_loop_read_vertex
-
-dEQP-GLES2.functional.shaders.indexing.matrix_subscript.mat4_dynamic_loop_write_static_read_vertex
-dEQP-GLES2.functional.shaders.indexing.matrix_subscript.mat4_dynamic_loop_write_dynamic_read_vertex
-dEQP-GLES2.functional.shaders.indexing.matrix_subscript.mat4_dynamic_loop_write_static_loop_read_vertex
-dEQP-GLES2.functional.shaders.indexing.matrix_subscript.mat4_dynamic_loop_write_dynamic_loop_read_vertex

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

@@ -1,78 +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.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_two.clip_neg_y_neg_z_and_neg_x_neg_y_pos_z,Fail
-dEQP-GLES2.functional.clipping.triangle_vertex.clip_two.clip_pos_y_pos_z_and_neg_x_neg_y_neg_z,Fail
-dEQP-GLES2.functional.fbo.render.color_clear.rbo_rgba4,Fail
-dEQP-GLES2.functional.fbo.render.color_clear.rbo_rgba4_depth_component16,Fail
-dEQP-GLES2.functional.fbo.render.color_clear.rbo_rgba4_stencil_index8,Fail
-dEQP-GLES2.functional.fbo.render.depth.rbo_rgba4_depth_component16,Fail
-dEQP-GLES2.functional.fbo.render.recreate_colorbuffer.no_rebind_rbo_rgba4,Fail
-dEQP-GLES2.functional.fbo.render.recreate_colorbuffer.no_rebind_rbo_rgba4_stencil_index8,Fail
-dEQP-GLES2.functional.fbo.render.recreate_colorbuffer.rebind_rbo_rgba4,Fail
-dEQP-GLES2.functional.fbo.render.recreate_colorbuffer.rebind_rbo_rgba4_stencil_index8,Fail
-dEQP-GLES2.functional.fbo.render.recreate_depthbuffer.no_rebind_rbo_rgba4_depth_component16,Fail
-dEQP-GLES2.functional.fbo.render.recreate_depthbuffer.rebind_rbo_rgba4_depth_component16,Fail
-dEQP-GLES2.functional.fbo.render.recreate_stencilbuffer.no_rebind_rbo_rgba4_stencil_index8,Fail
-dEQP-GLES2.functional.fbo.render.recreate_stencilbuffer.rebind_rbo_rgba4_stencil_index8,Fail
-dEQP-GLES2.functional.fbo.render.shared_colorbuffer.rbo_rgba4,Fail
-dEQP-GLES2.functional.fbo.render.shared_colorbuffer.rbo_rgba4_depth_component16,Fail
-dEQP-GLES2.functional.fbo.render.shared_depthbuffer.rbo_rgba4_depth_component16,Fail
-dEQP-GLES2.functional.polygon_offset.default_displacement_with_units,Fail
-dEQP-GLES2.functional.polygon_offset.fixed16_displacement_with_units,Fail
-dEQP-GLES2.functional.rasterization.interpolation.basic.line_loop_wide,Fail
-dEQP-GLES2.functional.rasterization.interpolation.basic.line_strip_wide,Fail
-dEQP-GLES2.functional.rasterization.interpolation.basic.lines_wide,Fail
-dEQP-GLES2.functional.rasterization.interpolation.projected.line_loop_wide,Fail
-dEQP-GLES2.functional.rasterization.interpolation.projected.line_strip_wide,Fail
-dEQP-GLES2.functional.rasterization.interpolation.projected.lines_wide,Fail
-dEQP-GLES2.functional.texture.filtering.2d.linear_mipmap_linear_linear_clamp_rgba8888,Fail
-dEQP-GLES2.functional.texture.filtering.2d.linear_mipmap_linear_linear_mirror_etc1,Fail
-dEQP-GLES2.functional.texture.filtering.2d.linear_mipmap_linear_linear_mirror_rgba8888,Fail
-dEQP-GLES2.functional.texture.filtering.2d.linear_mipmap_linear_linear_repeat_etc1,Fail
-dEQP-GLES2.functional.texture.filtering.2d.linear_mipmap_linear_linear_repeat_rgba8888,Fail
-dEQP-GLES2.functional.texture.filtering.2d.linear_mipmap_linear_nearest_clamp_rgba8888,Fail
-dEQP-GLES2.functional.texture.filtering.2d.linear_mipmap_linear_nearest_mirror_etc1,Fail
-dEQP-GLES2.functional.texture.filtering.2d.linear_mipmap_linear_nearest_mirror_rgba8888,Fail
-dEQP-GLES2.functional.texture.filtering.2d.linear_mipmap_linear_nearest_repeat_etc1,Fail
-dEQP-GLES2.functional.texture.filtering.2d.linear_mipmap_linear_nearest_repeat_l8,Fail
-dEQP-GLES2.functional.texture.filtering.2d.linear_mipmap_linear_nearest_repeat_rgb888,Fail
-dEQP-GLES2.functional.texture.filtering.2d.linear_mipmap_linear_nearest_repeat_rgba4444,Fail
-dEQP-GLES2.functional.texture.filtering.2d.linear_mipmap_linear_nearest_repeat_rgba8888,Fail
-dEQP-GLES2.functional.texture.filtering.2d.nearest_mipmap_linear_linear_clamp_rgba8888,Fail
-dEQP-GLES2.functional.texture.filtering.2d.nearest_mipmap_linear_linear_mirror_etc1,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_etc1,Fail
-dEQP-GLES2.functional.texture.filtering.2d.nearest_mipmap_linear_linear_repeat_rgba8888,Fail
-dEQP-GLES2.functional.texture.filtering.2d.nearest_mipmap_linear_nearest_clamp_rgba8888,Fail
-dEQP-GLES2.functional.texture.filtering.2d.nearest_mipmap_linear_nearest_mirror_etc1,Fail
-dEQP-GLES2.functional.texture.filtering.2d.nearest_mipmap_linear_nearest_mirror_rgba8888,Fail
-dEQP-GLES2.functional.texture.filtering.2d.nearest_mipmap_linear_nearest_repeat_etc1,Fail
-dEQP-GLES2.functional.texture.filtering.2d.nearest_mipmap_linear_nearest_repeat_l8,Fail
-dEQP-GLES2.functional.texture.filtering.2d.nearest_mipmap_linear_nearest_repeat_rgb888,Fail
-dEQP-GLES2.functional.texture.filtering.2d.nearest_mipmap_linear_nearest_repeat_rgba4444,Fail
-dEQP-GLES2.functional.texture.filtering.2d.nearest_mipmap_linear_nearest_repeat_rgba8888,Fail
-dEQP-GLES2.functional.texture.mipmap.2d.affine.linear_linear_repeat,Fail
-dEQP-GLES2.functional.texture.mipmap.2d.affine.nearest_linear_clamp,Fail
-dEQP-GLES2.functional.texture.mipmap.2d.affine.nearest_linear_mirror,Fail
-dEQP-GLES2.functional.texture.mipmap.2d.affine.nearest_linear_repeat,Fail
-dEQP-GLES2.functional.texture.mipmap.2d.basic.linear_linear_repeat,Fail
-dEQP-GLES2.functional.texture.mipmap.2d.basic.linear_linear_repeat_non_square,Fail
-dEQP-GLES2.functional.texture.mipmap.2d.basic.nearest_linear_clamp,Fail
-dEQP-GLES2.functional.texture.mipmap.2d.basic.nearest_linear_clamp_non_square,Fail
-dEQP-GLES2.functional.texture.mipmap.2d.basic.nearest_linear_mirror,Fail
-dEQP-GLES2.functional.texture.mipmap.2d.basic.nearest_linear_mirror_non_square,Fail
-dEQP-GLES2.functional.texture.mipmap.2d.basic.nearest_linear_repeat,Fail
-dEQP-GLES2.functional.texture.mipmap.2d.basic.nearest_linear_repeat_non_square,Fail
-dEQP-GLES2.functional.texture.mipmap.2d.projected.linear_linear_repeat,Fail
-dEQP-GLES2.functional.texture.mipmap.2d.projected.nearest_linear_clamp,Fail
-dEQP-GLES2.functional.texture.mipmap.2d.projected.nearest_linear_mirror,Fail
-dEQP-GLES2.functional.texture.mipmap.2d.projected.nearest_linear_repeat,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.projected.linear_linear,Fail
-dEQP-GLES2.functional.texture.mipmap.cube.projected.linear_nearest,Fail

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

@@ -1,105 +0,0 @@
-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-t720-fails.txt

@@ -1,49 +0,0 @@
-dEQP-GLES2.functional.depth_stencil_clear.depth_stencil_masked,Fail
-dEQP-GLES2.functional.fbo.render.recreate_colorbuffer.no_rebind_rbo_rgb565_depth_component16,Fail
-dEQP-GLES2.functional.fbo.render.recreate_colorbuffer.no_rebind_rbo_rgb565_stencil_index8,Fail
-dEQP-GLES2.functional.fbo.render.recreate_colorbuffer.no_rebind_rbo_rgb5_a1_depth_component16,Fail
-dEQP-GLES2.functional.fbo.render.recreate_colorbuffer.no_rebind_rbo_rgb5_a1_stencil_index8,Fail
-dEQP-GLES2.functional.fbo.render.recreate_colorbuffer.no_rebind_rbo_rgba4_depth_component16,Fail
-dEQP-GLES2.functional.fbo.render.recreate_colorbuffer.no_rebind_rbo_rgba4_stencil_index8,Fail
-dEQP-GLES2.functional.fbo.render.recreate_colorbuffer.no_rebind_tex2d_rgba_depth_component16,Fail
-dEQP-GLES2.functional.fbo.render.recreate_colorbuffer.no_rebind_tex2d_rgba_stencil_index8,Fail
-dEQP-GLES2.functional.fbo.render.recreate_colorbuffer.no_rebind_tex2d_rgb_depth_component16,Fail
-dEQP-GLES2.functional.fbo.render.recreate_colorbuffer.no_rebind_tex2d_rgb_stencil_index8,Fail
-dEQP-GLES2.functional.fbo.render.recreate_colorbuffer.rebind_rbo_rgb565_depth_component16,Fail
-dEQP-GLES2.functional.fbo.render.recreate_colorbuffer.rebind_rbo_rgb565_stencil_index8,Fail
-dEQP-GLES2.functional.fbo.render.recreate_colorbuffer.rebind_rbo_rgb5_a1_depth_component16,Fail
-dEQP-GLES2.functional.fbo.render.recreate_colorbuffer.rebind_rbo_rgb5_a1_stencil_index8,Fail
-dEQP-GLES2.functional.fbo.render.recreate_colorbuffer.rebind_rbo_rgba4_depth_component16,Fail
-dEQP-GLES2.functional.fbo.render.recreate_colorbuffer.rebind_rbo_rgba4_stencil_index8,Fail
-dEQP-GLES2.functional.fbo.render.recreate_colorbuffer.rebind_tex2d_rgba_depth_component16,Fail
-dEQP-GLES2.functional.fbo.render.recreate_colorbuffer.rebind_tex2d_rgba_stencil_index8,Fail
-dEQP-GLES2.functional.fbo.render.recreate_colorbuffer.rebind_tex2d_rgb_depth_component16,Fail
-dEQP-GLES2.functional.fbo.render.recreate_colorbuffer.rebind_tex2d_rgb_stencil_index8,Fail
-dEQP-GLES2.functional.fbo.render.shared_colorbuffer.rbo_rgb5_a1_depth_component16,Fail
-dEQP-GLES2.functional.fbo.render.shared_colorbuffer.rbo_rgba4_depth_component16,Fail
-dEQP-GLES2.functional.fbo.render.shared_colorbuffer.tex2d_rgb_depth_component16,Fail
-dEQP-GLES2.functional.fbo.render.shared_depthbuffer.rbo_rgb565_depth_component16,Fail
-dEQP-GLES2.functional.fbo.render.shared_depthbuffer.rbo_rgb5_a1_depth_component16,Fail
-dEQP-GLES2.functional.fbo.render.shared_depthbuffer.rbo_rgba4_depth_component16,Fail
-dEQP-GLES2.functional.fbo.render.shared_depthbuffer.tex2d_rgba_depth_component16,Fail
-dEQP-GLES2.functional.fbo.render.shared_depthbuffer.tex2d_rgb_depth_component16,Fail
-dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.add_src_color_one_minus_dst_alpha,Fail
-dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.reverse_subtract_one_minus_dst_alpha_one_minus_src_alpha,Fail
-dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.reverse_subtract_one_minus_dst_color_one_minus_src_alpha,Fail
-dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.subtract_constant_alpha_one_minus_constant_color,Fail
-dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.subtract_src_color_dst_color,Fail
-dEQP-GLES2.functional.fragment_ops.blend.rgb_func_alpha_func.dst.one_minus_constant_alpha_dst_color,Fail
-dEQP-GLES2.functional.fragment_ops.blend.rgb_func_alpha_func.dst.one_minus_constant_alpha_one_minus_dst_alpha,Fail
-dEQP-GLES2.functional.fragment_ops.blend.rgb_func_alpha_func.dst.src_color_one_minus_src_color,Fail
-dEQP-GLES2.functional.fragment_ops.blend.rgb_func_alpha_func.dst.src_color_zero,Fail
-dEQP-GLES2.functional.fragment_ops.blend.rgb_func_alpha_func.src.constant_alpha_constant_alpha,Fail
-dEQP-GLES2.functional.fragment_ops.blend.rgb_func_alpha_func.src.dst_alpha_constant_alpha,Fail
-dEQP-GLES2.functional.fragment_ops.blend.rgb_func_alpha_func.src.one_constant_color,Fail
-dEQP-GLES2.functional.fragment_ops.blend.rgb_func_alpha_func.src.one_minus_constant_color_one_minus_constant_alpha,Fail
-dEQP-GLES2.functional.fragment_ops.blend.rgb_func_alpha_func.src.src_alpha_saturate_one_minus_src_color,Fail
-dEQP-GLES2.functional.fragment_ops.interaction.basic_shader.18,Fail
-dEQP-GLES2.functional.fragment_ops.interaction.basic_shader.4,Fail
-dEQP-GLES2.functional.fragment_ops.interaction.basic_shader.62,Fail
-dEQP-GLES2.functional.fragment_ops.interaction.basic_shader.73,Fail
-dEQP-GLES2.functional.fragment_ops.interaction.basic_shader.81,Fail
-dEQP-GLES2.functional.fragment_ops.random.43,Fail

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

@@ -1,15 +0,0 @@
-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-t860-fails.txt

@@ -1,42 +0,0 @@
-dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_mag,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_dst_x,Fail
-dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_mag_reverse_src_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.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-radv-default-skips.txt

@@ -1,6 +0,0 @@
-# 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.*

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

@@ -1,29 +0,0 @@
-# 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
-dEQP-VK.renderpass2.depth_stencil_resolve.image_2d_16_64_6.samples_2.d32_sfloat_s8_uint_separate_layouts.stencil_max,Fail
-dEQP-VK.renderpass2.depth_stencil_resolve.image_2d_16_64_6.samples_2.d32_sfloat_s8_uint_separate_layouts.stencil_min,Fail
-dEQP-VK.renderpass2.depth_stencil_resolve.image_2d_16_64_6.samples_2.d32_sfloat_s8_uint_separate_layouts.stencil_zero,Fail
-dEQP-VK.renderpass2.depth_stencil_resolve.image_2d_16_64_6.samples_4.d32_sfloat_s8_uint.stencil_max,Fail
-dEQP-VK.renderpass2.depth_stencil_resolve.image_2d_16_64_6.samples_4.d32_sfloat_s8_uint.stencil_min,Fail
-dEQP-VK.renderpass2.depth_stencil_resolve.image_2d_16_64_6.samples_4.d32_sfloat_s8_uint.stencil_zero,Fail
-dEQP-VK.renderpass2.depth_stencil_resolve.image_2d_16_64_6.samples_4.d32_sfloat_s8_uint_separate_layouts.stencil_max,Fail
-dEQP-VK.renderpass2.depth_stencil_resolve.image_2d_16_64_6.samples_4.d32_sfloat_s8_uint_separate_layouts.stencil_min,Fail
-dEQP-VK.renderpass2.depth_stencil_resolve.image_2d_16_64_6.samples_4.d32_sfloat_s8_uint_separate_layouts.stencil_zero,Fail
-dEQP-VK.renderpass2.depth_stencil_resolve.image_2d_16_64_6.samples_8.d32_sfloat_s8_uint.stencil_max,Fail
-dEQP-VK.renderpass2.depth_stencil_resolve.image_2d_16_64_6.samples_8.d32_sfloat_s8_uint.stencil_min,Fail
-dEQP-VK.renderpass2.depth_stencil_resolve.image_2d_16_64_6.samples_8.d32_sfloat_s8_uint.stencil_zero,Fail
-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

@@ -1,9 +0,0 @@
-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

@@ -1,9 +0,0 @@
-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-pitcairn-aco-fails.txt

@@ -1,11 +0,0 @@
-dEQP-VK.pipeline.depth.format.d16_unorm.compare_ops.never_zerodepthbounds_depthdisabled_stencilenabled,Fail
-dEQP-VK.pipeline.depth.format.d32_sfloat.compare_ops.never_zerodepthbounds_depthdisabled_stencilenabled,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-polaris10-aco-fails.txt

@@ -1,9 +0,0 @@
-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

@@ -1,9 +0,0 @@
-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,3 +0,0 @@
-# This subset of CTS seems to randomly hangs on RAVEN only.
-# This needs to be investigated and fixed!
-dEQP-VK.synchronization.*

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

@@ -1,9 +0,0 @@
-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 "$DEQP_SKIPS" ]; then
-   echo 'DEQP_SKIPS must be set to something like "deqp-default-skips.txt"'
+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)'
    exit 1
 fi
 
@@ -34,7 +34,7 @@ INSTALL=`pwd`/install
 # Set up the driver environment.
 export LD_LIBRARY_PATH=`pwd`/install/lib/
 export EGL_PLATFORM=surfaceless
-export VK_ICD_FILENAMES=`pwd`/install/share/vulkan/icd.d/"$VK_DRIVER"_icd.`uname -m`.json
+export VK_ICD_FILENAMES=`pwd`/install/share/vulkan/icd.d/"$VK_DRIVER"_icd.${VK_CPU:-`uname -m`}.json
 
 # the runner was failing to look for libkms in /usr/local/lib for some reason
 # I never figured out.
@@ -57,8 +57,15 @@ else
    SUITE=KHR
 fi
 
-# 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 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 [ -n "$CI_NODE_INDEX" ]; then
    sed -ni $CI_NODE_INDEX~$CI_NODE_TOTAL"p" /tmp/case-list.txt
 fi
@@ -72,12 +79,18 @@ if [ ! -s /tmp/case-list.txt ]; then
     exit 1
 fi
 
-if [ -n "$DEQP_EXPECTED_FAILS" ]; then
-    BASELINE="--baseline $INSTALL/$DEQP_EXPECTED_FAILS"
+if [ -e "$INSTALL/deqp-$GPU_VERSION-fails.txt" ]; then
+    DEQP_RUNNER_OPTIONS="$DEQP_RUNNER_OPTIONS --baseline $INSTALL/deqp-$GPU_VERSION-fails.txt"
 fi
 
-if [ -n "$DEQP_FLAKES" ]; then
-    FLAKES="--flakes $INSTALL/$DEQP_FLAKES"
+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"
 fi
 
 set +e
@@ -91,13 +104,10 @@ else
 fi
 
 # If this CI lab lacks artifacts support, print the whole list of failures/flakes.
-if [ -z "$DEQP_NO_SAVE_RESULTS" ]; then
+if [ -n "$DEQP_NO_SAVE_RESULTS" ]; then
    SUMMARY_LIMIT="--summary-limit 0"
 fi
 
-# Silence the debug output for apps triggering GL errors, since dEQP will do a lot of that.
-export MESA_DEBUG=silent
-
 run_cts() {
     deqp=$1
     caselist=$2
@@ -107,9 +117,7 @@ run_cts() {
         --deqp $deqp \
         --output $RESULTS \
         --caselist $caselist \
-        --skips $INSTALL/$DEQP_SKIPS \
-        $BASELINE \
-        $FLAKES \
+        --testlog-to-xml  /deqp/executor/testlog-to-xml \
         $JOB \
         $SUMMARY_LIMIT \
 	$DEQP_RUNNER_OPTIONS \
@@ -160,31 +168,6 @@ 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'`
@@ -203,13 +186,17 @@ check_renderer() {
     # debug.
     # export EGL_LOG_LEVEL=debug
     VERSION=`echo $DEQP_VER | tr '[a-z]' '[A-Z]'`
+    export LD_PRELOAD=$TEST_LD_PRELOAD
     $DEQP $DEQP_OPTIONS --deqp-case=$SUITE-$VERSION.info.\* --deqp-log-filename=$RESULTS/deqp-info.qpa
+    export LD_PRELOAD=
     parse_renderer
 }
 
 check_vk_device_name() {
     echo "Capturing device info for VK driver sanity checks"
+    export LD_PRELOAD=$TEST_LD_PRELOAD
     $DEQP $DEQP_OPTIONS --deqp-case=dEQP-VK.info.device --deqp-log-filename=$RESULTS/deqp-info.qpa
+    export LD_PRELOAD=
     DEVICENAME=`grep deviceName $RESULTS/deqp-info.qpa | sed 's|deviceName: ||g'`
     echo "deviceName: $DEVICENAME"
     if [ -n "$DEQP_EXPECTED_RENDERER" -a "x$DEVICENAME" != "x$DEQP_EXPECTED_RENDERER" ]; then
@@ -218,6 +205,11 @@ 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
@@ -250,34 +242,32 @@ fi
 RESULTS_CSV=$RESULTS/results.csv
 FAILURES_CSV=$RESULTS/failures.csv
 
+export LD_PRELOAD=$TEST_LD_PRELOAD
+
 run_cts $DEQP /tmp/case-list.txt $RESULTS_CSV
 DEQP_EXITCODE=$?
 
-echo "System load: $(cut -d' ' -f1-3 < /proc/loadavg)"
-echo "# of CPU cores: $(cat /proc/cpuinfo | grep processor | wc -l)"
+export LD_PRELOAD=
+quiet report_load
 
-# Remove the shader cache, no need to include in the artifacts.
-find $RESULTS -name \*.shader_cache | xargs rm -f
+# 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
 
-# junit is disabled, because it overloads gitlab.freedesktop.org to parse it.
-# quiet generate_junit $RESULTS_CSV > $RESULTS/results.xml
+# 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
 
-# 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
+deqp-runner junit \
+   --testsuite $DEQP_VER \
+   --results $RESULTS/failures.csv \
+   --output $RESULTS/junit.xml \
+   --limit 50 \
+   --template "See https://$CI_PROJECT_ROOT_NAMESPACE.pages.freedesktop.org/-/$CI_PROJECT_NAME/-/jobs/$CI_JOB_ID/artifacts/results/{{testcase}}.xml"
 
 # Report the flakes to the IRC channel for monitoring (if configured):
 quiet report_flakes $RESULTS_CSV

.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-packet.freedesktop.org/git-cache/mesa/mesa/mesa.tar.gz
+              https://${MINIO_HOST}/git-cache/${FDO_UPSTREAM_REPO}/mesa.tar.gz
 
 # check wget error code
 if [[ $? -ne 0 ]]

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

@@ -1,29 +1,36 @@
-variables:
-  DISTRIBUTION_TAG: "2020-11-05-deqp-runner"
-
 .kernel+rootfs:
-  stage: container-2
   extends:
     - .ci-run-policy
+  stage: container-2
   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
+    DISTRIBUTION_TAG: &distribution-tag-arm "${MESA_ROOTFS_TAG}--${MESA_IMAGE_TAG}--${MESA_TEMPLATES_COMMIT}"
   script:
     - .gitlab-ci/container/lava_build.sh
 
+.kernel+rootfs-lava:
+  extends:
+    - .kernel+rootfs
+  variables:
+    KERNEL_URL: "https://gitlab.freedesktop.org/tomeu/linux/-/archive/v5.10-rc2-for-mesa-ci/linux-v5.10-rc2-for-mesa-ci.tar.gz"
+    INSTALL_KERNEL_MODULES: 1
+    MESA_ROOTFS_TAG: &lava-rootfs "2021-04-14-librenderdoc"
+    MINIO_SUFFIX: "lava"
+    PIGLIT_BUILD_TARGETS: "piglit_replayer"
+
 kernel+rootfs_amd64:
   extends:
     - .use-x86_build-base
-    - .kernel+rootfs
-  image: "$CI_REGISTRY_IMAGE/debian/x86_build-base:$BASE_TAG"
+    - .kernel+rootfs-lava
+  image: "$FDO_BASE_IMAGE"
   variables:
     DEBIAN_ARCH: "amd64"
+    DISTRIBUTION_TAG: &distribution-tag-amd64 "${MESA_ROOTFS_TAG}--${MESA_BASE_TAG}--${MESA_TEMPLATES_COMMIT}"
 
 kernel+rootfs_arm64:
   extends:
     - .use-arm_build
-    - .kernel+rootfs
+    - .kernel+rootfs-lava
   tags:
     - aarch64
   variables:
@@ -41,23 +48,25 @@ kernel+rootfs_armhf:
   # Cancel job if a newer commit is pushed to the same branch
   interruptible: true
   variables:
+    DISTRIBUTION_TAG: *distribution-tag-arm
     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} TRACIE_NO_UNIT_TESTS=1 TRACIE_UPLOAD_TO_MINIO=1 DRIVER_NAME=${DRIVER_NAME}"
+    FIXED_ENV_VARS: "CI_PIPELINE_ID=${CI_PIPELINE_ID} CI_JOB_ID=${CI_JOB_ID} CI_PAGES_DOMAIN=${CI_PAGES_DOMAIN} CI_PROJECT_NAME=${CI_PROJECT_NAME} CI_PROJECT_PATH=${CI_PROJECT_PATH} CI_PROJECT_ROOT_NAMESPACE=${CI_PROJECT_ROOT_NAMESPACE} 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} LAVA_TEST_SCRIPT=${LAVA_TEST_SCRIPT} TEST_SUITE=${TEST_SUITE}"
     DEQP_VERSION: gles2
-    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"
+    ARTIFACTS_PREFIX: "https://${MINIO_HOST}/mesa-lava/"
+    MESA_ROOTFS_TAG: *lava-rootfs
+    MESA_URL: "https://${MINIO_HOST}/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}/mesa/mesa/${DISTRIBUTION_TAG}/${ARCH}/done"; then
-        ARTIFACTS_URL="${ARTIFACTS_PREFIX}/mesa/mesa/${DISTRIBUTION_TAG}/${ARCH}"
+      if wget -q --method=HEAD "${ARTIFACTS_PREFIX}/${FDO_UPSTREAM_REPO}/lava/${DISTRIBUTION_TAG}/${ARCH}/done"; then
+        ARTIFACTS_URL="${ARTIFACTS_PREFIX}/${FDO_UPSTREAM_REPO}/lava/${DISTRIBUTION_TAG}/${ARCH}"
       else
-        ARTIFACTS_URL="${ARTIFACTS_PREFIX}/${CI_PROJECT_PATH}/${DISTRIBUTION_TAG}/${ARCH}"
+        ARTIFACTS_URL="${ARTIFACTS_PREFIX}/${CI_PROJECT_PATH}/lava/${DISTRIBUTION_TAG}/${ARCH}"
       fi
     - >
       artifacts/generate_lava.py \
-        --template artifacts/lava-${TEST_SUITE}.yml.jinja2 \
+        --template artifacts/lava.yml.jinja2 \
         --pipeline-info "$CI_PIPELINE_URL on $CI_COMMIT_REF_NAME ${CI_NODE_INDEX}/${CI_NODE_TOTAL}" \
         --base-artifacts-url ${ARTIFACTS_URL} \
         --mesa-url ${MESA_URL} \
@@ -72,13 +81,13 @@ kernel+rootfs_armhf:
         --lava-tags "${LAVA_TAGS}" \
         --ci-node-index "${CI_NODE_INDEX}" \
         --ci-node-total "${CI_NODE_TOTAL}"
-    - lava_job_id=`lavacli jobs submit lava-${TEST_SUITE}.yml` || lavacli jobs submit lava-${TEST_SUITE}.yml
+    - lava_job_id=`lavacli jobs submit lava.yml` || lavacli jobs submit lava.yml
     - echo $lava_job_id
     - rm -rf artifacts/*
-    - cp lava-${TEST_SUITE}.yml artifacts/.
-    - lavacli jobs logs $lava_job_id | tee artifacts/lava-${TEST_SUITE}-$lava_job_id.log
+    - cp lava.yml artifacts/.
+    - lavacli jobs logs $lava_job_id | tee artifacts/lava-$lava_job_id.log
     - lavacli jobs show $lava_job_id
-    - result=`lavacli results $lava_job_id 0_${TEST_SUITE} ${TEST_SUITE} | head -1`
+    - result=`lavacli results $lava_job_id 0_mesa mesa | head -1`
     - echo $result
     - '[[ "$result" == "pass" ]]'
   artifacts:
@@ -94,6 +103,7 @@ kernel+rootfs_armhf:
     KERNEL_IMAGE_TYPE: "type:\ zimage"
     BOOT_METHOD: u-boot
     TEST_SUITE: "deqp"
+    LAVA_TEST_SCRIPT: "/install/deqp-runner.sh"
   extends:
     - .lava-test
     - .use-arm_build
@@ -108,6 +118,7 @@ kernel+rootfs_armhf:
     KERNEL_IMAGE_TYPE: "type:\ image"
     BOOT_METHOD: u-boot
     TEST_SUITE: "deqp"
+    LAVA_TEST_SCRIPT: "/install/deqp-runner.sh"
   extends:
     - .lava-test
     - .use-arm_build
@@ -120,15 +131,19 @@ kernel+rootfs_armhf:
 .lava-test:amd64:
   variables:
     ARCH: amd64
+    DISTRIBUTION_TAG: *distribution-tag-amd64
     KERNEL_IMAGE_NAME: bzImage
     KERNEL_IMAGE_TYPE: "type:\ zimage"
     BOOT_METHOD: u-boot
     TEST_SUITE: "deqp"
+    LAVA_TEST_SCRIPT: "/install/deqp-runner.sh"
   extends:
+    - .use-x86_build-base # for same $MESA_BASE_TAG as in kernel+rootfs_amd64
+    - .use-arm_build # ARM because it must match the architecture of the runner
     - .lava-test
-    - .use-arm_build
   needs:
     - kernel+rootfs_amd64
+    - arm_build # ARM because it must match the architecture of the runner
     - meson-testing
 
 .lava-traces-base:
@@ -139,198 +154,25 @@ kernel+rootfs_armhf:
     reports:
       junit: artifacts/junit.xml
 
-.lava-traces:amd64:
+.lava-piglit:
   variables:
-    TEST_SUITE: "tracie"
+    TEST_SUITE: "piglit"
+    LAVA_TEST_SCRIPT: "/install/piglit/run.sh"
+
+.lava-piglit-traces:amd64:
   extends:
     - .lava-test:amd64
+    - .lava-piglit
     - .lava-traces-base
 
-.lava-traces:armhf:
-  variables:
-    TEST_SUITE: "tracie"
+.lava-piglit-traces:armhf:
   extends:
     - .lava-test:armhf
+    - .lava-piglit
     - .lava-traces-base
 
-.lava-traces:arm64:
-  variables:
-    TEST_SUITE: "tracie"
+.lava-piglit-traces:arm64:
   extends:
     - .lava-test:arm64
+    - .lava-piglit
     - .lava-traces-base
-
-panfrost-t720-gles2:arm64:
-  extends:
-    - .lava-test:arm64
-    - .panfrost-rules
-  variables:
-    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 DEQP_FLAKES=deqp-panfrost-t720-flakes.txt"
-  tags:
-    - mesa-ci-aarch64-lava-collabora
-
-.panfrost-t760-gles2:armhf:
-  extends:
-    - .lava-test:armhf
-    - .panfrost-rules
-  variables:
-    DEVICE_TYPE: rk3288-veyron-jaq
-    DTB: ${DEVICE_TYPE}
-    GPU_VERSION: panfrost-t760
-    BOOT_METHOD: depthcharge
-    KERNEL_IMAGE_TYPE: ""
-    ENV_VARS: "PAN_MESA_DEBUG=gles3 DEQP_PARALLEL=6 DEQP_EXPECTED_RENDERER=T760"
-  tags:
-    - mesa-ci-aarch64-lava-collabora
-
-.panfrost-t760-traces:armhf:
-  extends:
-    - .lava-traces:armhf
-    - .panfrost-rules
-  variables:
-    DEVICE_TYPE: rk3288-veyron-jaq
-    DTB: ${DEVICE_TYPE}
-    GPU_VERSION: panfrost-t760
-    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"
-  tags:
-    - mesa-ci-aarch64-lava-collabora
-
-.lava-rk3399-gru-kevin:
-  extends:
-    - .panfrost-rules
-  variables:
-    DEVICE_TYPE: rk3399-gru-kevin
-    DTB: ${DEVICE_TYPE}
-    GPU_VERSION: panfrost-t860
-    DRIVER_NAME: panfrost
-    BOOT_METHOD: depthcharge
-    KERNEL_IMAGE_TYPE: ""
-  tags:
-    - mesa-ci-aarch64-lava-collabora
-
-panfrost-t860-gles2:arm64:
-  extends:
-    - .lava-test:arm64
-    - .lava-rk3399-gru-kevin
-  variables:
-    ENV_VARS: "PAN_MESA_DEBUG=gles3 DEQP_PARALLEL=6 DEQP_EXPECTED_RENDERER=T860"
-
-panfrost-t860-gles3:arm64:
-  parallel: 2
-  extends:
-    - .lava-test:arm64
-    - .lava-rk3399-gru-kevin
-  variables:
-    DEQP_VERSION: gles3
-    ENV_VARS: "PAN_MESA_DEBUG=gles3 DEQP_PARALLEL=6 DEQP_EXPECTED_RENDERER=T860"
-
-panfrost-t860-traces:arm64:
-  extends:
-    - .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"
-
-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-t820-gles2:arm64:
-  extends:
-    - .lava-test:arm64
-    - .panfrost-rules
-  variables:
-    DEVICE_TYPE: meson-gxm-khadas-vim2
-    DTB: ${DEVICE_TYPE}
-    GPU_VERSION: panfrost-t820
-    LAVA_TAGS: panfrost
-    ENV_VARS: "PAN_MESA_DEBUG=gles3 DEQP_PARALLEL=6 DEQP_EXPECTED_RENDERER=T820"
-  tags:
-    - mesa-ci-aarch64-lava-baylibre
-
-.lima-mali400-test:armhf:
-  parallel: 2
-  extends:
-    - .lava-test:armhf
-    - .lima-rules
-  variables:
-    DEVICE_TYPE: sun8i-h3-libretech-all-h3-cc
-    DTB: ${DEVICE_TYPE}
-    GPU_VERSION: lima
-    ENV_VARS: "DEQP_PARALLEL=3 DEQP_EXPECTED_RENDERER=Mali400"
-  tags:
-    - mesa-ci-aarch64-lava-baylibre
-
-.lima-mali450-test:arm64:
-  extends:
-    - .lava-test:arm64
-    - .lima-rules
-  variables:
-    DEVICE_TYPE: meson-gxl-s905x-libretech-cc
-    DTB: ${DEVICE_TYPE}
-    GPU_VERSION: lima
-    ENV_VARS: "DEQP_PARALLEL=6 DEQP_EXPECTED_RENDERER=Mali450"
-  tags:
-    - mesa-ci-aarch64-lava-baylibre
-
-radeonsi-stoney-gles2:amd64:
-  extends:
-    - .lava-test:amd64
-    - .radeonsi-rules
-  variables:
-    DEVICE_TYPE: hp-11A-G6-EE-grunt
-    DTB: ""
-    GPU_VERSION: radeonsi-stoney
-    BOOT_METHOD: depthcharge
-    KERNEL_IMAGE_TYPE: ""
-    ENV_VARS: "DEQP_PARALLEL=4 DEQP_EXPECTED_RENDERER=STONEY"
-  tags:
-    - mesa-ci-aarch64-lava-collabora
-
-radeonsi-stoney-gles3:amd64:
-  extends:
-    - radeonsi-stoney-gles2:amd64
-  variables:
-    DEQP_VERSION: gles3
-    CI_NODE_INDEX: 1
-    CI_NODE_TOTAL: 4
-  tags:
-    - mesa-ci-aarch64-lava-collabora
-
-radeonsi-stoney-gles31:amd64:
-  extends:
-    - radeonsi-stoney-gles2:amd64
-  variables:
-    DEQP_VERSION: gles31
-    CI_NODE_INDEX: 1
-    CI_NODE_TOTAL: 5
-  tags:
-    - mesa-ci-aarch64-lava-collabora
-
-radeonsi-stoney-traces:amd64:
-  extends:
-    - .lava-traces:amd64
-    - .radeonsi-rules
-  variables:
-    DEVICE_TYPE: hp-11A-G6-EE-grunt
-    DTB: ""
-    GPU_VERSION: radeonsi-stoney
-    DRIVER_NAME: radeonsi
-    BOOT_METHOD: depthcharge
-    KERNEL_IMAGE_TYPE: ""
-  tags:
-    - mesa-ci-aarch64-lava-collabora

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

@@ -1,103 +0,0 @@
-job_name: mesa-tracie-{{ gpu_version }} {{ pipeline_info }}
-device_type: {{ device_type }}
-context:
-  extra_nfsroot_args: " init=/init rootwait"
-timeouts:
-  job:
-    minutes: 40
-  action:
-   minutes: 10
-  actions:
-    power-off:
-      seconds: 30
-priority: 75
-visibility: public
-{% if tags %}
-{% set lavatags = tags.split(',') %}
-tags:
-{% for tag in lavatags %}
-  - {{ tag }}
-{% endfor %}
-{% endif %}
-actions:
-- deploy:
-    timeout:
-      minutes: 10
-    to: tftp
-    kernel:
-      url: {{ base_artifacts_url }}/{{ kernel_image_name }}
-{% if kernel_image_type %}
-      {{ kernel_image_type }}
-{% endif %}
-    nfsrootfs:
-      url: {{ base_artifacts_url }}/lava-rootfs.tgz
-      compression: gz
-{% if dtb %}
-    dtb:
-      url: {{ base_artifacts_url }}/{{ dtb }}.dtb
-{% endif %}
-    os: oe
-- boot:
-    timeout:
-      minutes: 5
-    method: {{ boot_method }}
-{% if boot_method == "fastboot" %}
-{#
-   For fastboot, LAVA doesn't know how to unpack the rootfs/apply overlay/repack,
-   so we transfer the overlay over the network after boot.
-#}
-    transfer_overlay:
-      download_command: wget -S --progress=dot:giga
-      unpack_command: tar -C / -xzf
-{% else %}
-    commands: nfs
-{% endif %}
-    prompts:
-      - 'lava-shell:'
-- test:
-    timeout:
-      minutes: 60
-    definitions:
-    - repository:
-        metadata:
-          format: Lava-Test Test Definition 1.0
-          name: tracie
-          description: "Mesa tracie test plan"
-          os:
-          - oe
-          scope:
-          - functional
-        run:
-          steps:
-          - mount -t proc none /proc
-          - mount -t sysfs none /sys
-          - mount -t devtmpfs none /dev || echo possibly already mounted
-          - mkdir -p /dev/pts
-          - mount -t devpts devpts /dev/pts
-          - echo "nameserver 8.8.8.8" > /etc/resolv.conf
-          - for i in 1 2 3; do sntp -sS pool.ntp.org && break || sleep 2; done
-
-          - modprobe amdgpu || true
-
-{% if env_vars %}
-          - export {{ env_vars }}
-{% endif %}
-          # 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 DEVICE_NAME="gl-{{ gpu_version }}"
-
-          - "if sh /install/tracie-runner-gl.sh; then
-                  echo 'tracie: pass';
-             else
-                  echo 'tracie: fail';
-             fi"
-        parse:
-          pattern: '(?P<test_case_id>\S*):\s+(?P<result>(pass|fail))'
-      from: inline
-      name: tracie
-      path: inline/mesa-tracie.yaml

.gitlab-ci/lava.yml.jinja2

@@ -1,17 +1,14 @@
-job_name: mesa-deqp-{{ deqp_version }}-{{ gpu_version }} {{ pipeline_info }}
+job_name: mesa-{{ test_suite }}-{{ deqp_version }}-{{ gpu_version }} {{ pipeline_info }}
 device_type: {{ device_type }}
 context:
   extra_nfsroot_args: " init=/init rootwait"
 timeouts:
   job:
-    minutes: 40
-  action:
-   minutes: 10
-  actions:
-    power-off:
-      seconds: 30
+    minutes: 30
 priority: 75
-visibility: public
+visibility:
+    group:
+      - "Collabora+fdo"
 {% if tags %}
 {% set lavatags = tags.split(',') %}
 tags:
@@ -39,7 +36,7 @@ actions:
     os: oe
 - boot:
     timeout:
-      minutes: 5
+      minutes: 25
     method: {{ boot_method }}
 {% if boot_method == "fastboot" %}
 {#
@@ -56,13 +53,14 @@ actions:
       - 'lava-shell:'
 - test:
     timeout:
-      minutes: 60
+      minutes: 30
+    failure_retry: 1
     definitions:
     - repository:
         metadata:
           format: Lava-Test Test Definition 1.0
-          name: deqp
-          description: "Mesa dEQP test plan"
+          name: mesa
+          description: "Mesa test plan"
           os:
           - oe
           scope:
@@ -70,10 +68,12 @@ actions:
         run:
           steps:
           - mount -t proc none /proc
-          - mount -t sysfs none /sys 
+          - mount -t sysfs none /sys
           - mount -t devtmpfs none /dev || echo possibly already mounted
           - mkdir -p /dev/pts
           - mount -t devpts devpts /dev/pts
+          - mkdir -p /dev/shm
+          - mount -t tmpfs tmpfs /dev/shm
           - echo "nameserver 8.8.8.8" > /etc/resolv.conf
           - for i in 1 2 3; do sntp -sS pool.ntp.org && break || sleep 2; done
 
@@ -89,24 +89,32 @@ actions:
           - export {{ env_vars }}
 {% endif %}
 
-          # deqp-runner.sh assumes some stuff is in pwd
+          # runner script assumes some stuff is in pwd
           - cd /
 
           - wget -S --progress=dot:giga -O- {{ mesa_url }} | tar -xz
 
           - export DEQP_NO_SAVE_RESULTS=1
-          - export DEQP_EXPECTED_FAILS=deqp-{{ gpu_version }}-fails.txt
-          - export DEQP_SKIPS=deqp-{{ gpu_version }}-skips.txt
+          - export GPU_VERSION={{ gpu_version }}
           - export DEQP_VER={{ deqp_version }}
+
+          - export PYTHONPATH=$(python3 -c "import sys;print(\":\".join(sys.path))")
+          - 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 LIBGL_DRIVERS_PATH=`pwd`/install/lib/dri
 
-          - "if sh /install/deqp-runner.sh; then
-                  echo 'deqp: pass';
+          - "if sh $LAVA_TEST_SCRIPT; then
+                  echo 'mesa: pass';
              else
-                  echo 'deqp: fail';
+                  echo 'mesa: fail';
              fi"
         parse:
           pattern: '(?P<test_case_id>\S*):\s+(?P<result>(pass|fail))'
       from: inline
-      name: deqp
-      path: inline/mesa-deqp.yaml
+      name: mesa
+      path: inline/mesa.yaml

.gitlab-ci/meson-build.bat

@@ -1,13 +0,0 @@
-call "C:\Program Files (x86)\Microsoft Visual Studio\%VERSION%\Common7\Tools\VsDevCmd.bat" -arch=%ARCH%
-
-del /Q /S _build
-meson _build ^
-        -Dbuild-tests=true ^
-        -Db_vscrt=mtd ^
-        -Dbuildtype=release ^
-        -Dllvm=false ^
-        -Dgallium-drivers=swrast ^
-        -Dosmesa=gallium
-meson configure _build
-ninja -C _build
-ninja -C _build test

.gitlab-ci/meson/build.sh

@@ -40,6 +40,22 @@ if [ -n "$CROSS" ]; then
     fi
 fi
 
+# Only use GNU time if available, not any shell built-in command
+case $CI_JOB_NAME in
+    # strace and wine don't seem to mix well
+    # ASAN leak detection is incompatible with strace
+    meson-mingw32-x86_64|*-asan*)
+        if test -f /usr/bin/time; then
+            MESON_TEST_ARGS+=--wrapper=$PWD/.gitlab-ci/meson/time.sh
+        fi
+        ;;
+    *)
+        if test -f /usr/bin/time -a -f /usr/bin/strace; then
+            MESON_TEST_ARGS+=--wrapper=$PWD/.gitlab-ci/meson/time-strace.sh
+        fi
+        ;;
+esac
+
 rm -rf _build
 meson _build --native-file=native.file \
       --wrap-mode=nofallback \
@@ -58,6 +74,6 @@ meson _build --native-file=native.file \
 cd _build
 meson configure
 ninja
-LC_ALL=C.UTF-8 ninja test
+LC_ALL=C.UTF-8 meson test --num-processes ${FDO_CI_CONCURRENT:-4} ${MESON_TEST_ARGS}
 ninja install
 cd ..

.gitlab-ci/meson/time-strace.sh

@@ -0,0 +1,27 @@
+#!/bin/sh
+
+STRACEDIR=meson-logs/strace/$(for i in $@; do basename -z -- $i; echo -n _; done)
+
+mkdir -p $STRACEDIR
+
+# If the test times out, meson sends SIGTERM to this process.
+# Simply exec'ing "time" would result in no output from that in this case.
+# Instead, we need to run "time" in the background, catch the signals and
+# propagate them to the actual test process.
+
+/usr/bin/time -v strace -ff -tt -T -o $STRACEDIR/log "$@" &
+TIMEPID=$!
+STRACEPID=$(ps --ppid $TIMEPID -o pid=)
+TESTPID=$(ps --ppid $STRACEPID -o pid=)
+
+if test "x$TESTPID" != x; then
+    trap 'kill -TERM $TESTPID; wait $TIMEPID; exit $?' TERM
+fi
+
+wait $TIMEPID
+EXITCODE=$?
+
+# Only keep strace logs if the test timed out
+rm -rf $STRACEDIR &
+
+exit $EXITCODE

.gitlab-ci/meson/time.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+# If the test times out, meson sends SIGTERM to this process.
+# Simply exec'ing "time" would result in no output from that in this case.
+# Instead, we need to run "time" in the background, catch the signals and
+# propagate them to the actual test process.
+
+/usr/bin/time -v "$@" &
+TIMEPID=$!
+TESTPID=$(ps --ppid $TIMEPID -o pid=)
+
+if test "x$TESTPID" != x; then
+    trap 'kill -TERM $TESTPID; wait $TIMEPID; exit $?' TERM
+fi
+
+wait $TIMEPID
+exit $?

.gitlab-ci/piglit/piglit-runner.sh

@@ -0,0 +1,134 @@
+#!/bin/sh
+
+set -ex
+
+if [ -z "$GPU_VERSION" ]; then
+   echo 'GPU_VERSION must be set to something like "llvmpipe" or "freedreno-a630" (the name used in your ci/piglit-gpu-version-*.txt)'
+   exit 1
+fi
+
+INSTALL=`pwd`/install
+
+# Set up the driver environment.
+export LD_LIBRARY_PATH=`pwd`/install/lib/
+export EGL_PLATFORM=surfaceless
+export VK_ICD_FILENAMES=`pwd`/install/share/vulkan/icd.d/"$VK_DRIVER"_icd.${VK_CPU:-`uname -m`}.json
+
+RESULTS=`pwd`/${PIGLIT_RESULTS_DIR:-results}
+mkdir -p $RESULTS
+
+if [ -n "$PIGLIT_FRACTION" -o -n "$CI_NODE_INDEX" ]; then
+   FRACTION=`expr ${PIGLIT_FRACTION:-1} \* ${CI_NODE_TOTAL:-1}`
+PIGLIT_RUNNER_OPTIONS="$PIGLIT_RUNNER_OPTIONS --fraction $FRACTION"
+fi
+
+# If the job is parallel at the gitab job level, take the corresponding fraction
+# of the caselist.
+if [ -n "$CI_NODE_INDEX" ]; then
+   PIGLIT_RUNNER_OPTIONS="$PIGLIT_RUNNER_OPTIONS --fraction-start ${CI_NODE_INDEX}"
+fi
+
+if [ -e "$INSTALL/piglit-$GPU_VERSION-fails.txt" ]; then
+    PIGLIT_RUNNER_OPTIONS="$PIGLIT_RUNNER_OPTIONS --baseline $INSTALL/piglit-$GPU_VERSION-fails.txt"
+fi
+
+if [ -e "$INSTALL/piglit-$GPU_VERSION-flakes.txt" ]; then
+    PIGLIT_RUNNER_OPTIONS="$PIGLIT_RUNNER_OPTIONS --flakes $INSTALL/piglit-$GPU_VERSION-flakes.txt"
+fi
+
+if [ -e "$INSTALL/piglit-$GPU_VERSION-skips.txt" ]; then
+    PIGLIT_RUNNER_OPTIONS="$PIGLIT_RUNNER_OPTIONS --skips $INSTALL/piglit-$GPU_VERSION-skips.txt"
+fi
+
+set +e
+
+if [ -n "$PIGLIT_PARALLEL" ]; then
+   PIGLIT_RUNNER_OPTIONS="$PIGLIT_RUNNER_OPTIONS --jobs $PIGLIT_PARALLEL"
+elif [ -n "$FDO_CI_CONCURRENT" ]; then
+   PIGLIT_RUNNER_OPTIONS="$PIGLIT_RUNNER_OPTIONS --jobs $FDO_CI_CONCURRENT"
+else
+   PIGLIT_RUNNER_OPTIONS="$PIGLIT_RUNNER_OPTIONS --jobs 4"
+fi
+
+report_flakes() {
+    # Replace spaces in test names with _ to make the channel reporting not
+    # split it across lines, even though it makes it so you can't copy and
+    # paste from IRC into your flakes list.
+    flakes=`grep ",Flake" $1 | sed 's|,Flake.*||g' | sed 's| |_|g'`
+    if [ -z "$flakes" ]; then
+        return 0
+    fi
+
+    if [ -z "$FLAKES_CHANNEL" ]; then
+        return 0
+    fi
+
+    # The nick needs to be something unique so that multiple runners
+    # connecting at the same time don't race for one nick and get blocked.
+    # freenode has a 16-char limit on nicks (9 is the IETF standard, but
+    # various servers extend that).  So, trim off the common prefixes of the
+    # runner name, and append the job ID so that software runners with more
+    # than one concurrent job (think swrast) don't collide.  For freedreno,
+    # that gives us a nick as long as db410c-N-JJJJJJJJ, and it'll be a while
+    # before we make it to 9-digit jobs (we're at 7 so far).
+    runner=`echo $CI_RUNNER_DESCRIPTION | sed 's|mesa-||' | sed 's|google-freedreno-||g'`
+    bot="$runner-$CI_JOB_ID"
+    channel="$FLAKES_CHANNEL"
+    (
+    echo NICK $bot
+    echo USER $bot unused unused :Gitlab CI Notifier
+    sleep 10
+    echo "JOIN $channel"
+    sleep 1
+    desc="Flakes detected in job: $CI_JOB_URL on $CI_RUNNER_DESCRIPTION"
+    if [ -n "$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" ]; then
+        desc="$desc on branch $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME ($CI_MERGE_REQUEST_TITLE)"
+    elif [ -n "$CI_COMMIT_BRANCH" ]; then
+        desc="$desc on branch $CI_COMMIT_BRANCH ($CI_COMMIT_TITLE)"
+    fi
+    echo "PRIVMSG $channel :$desc"
+    for flake in $flakes; do
+        echo "PRIVMSG $channel :$flake"
+    done
+    echo "PRIVMSG $channel :See $CI_JOB_URL/artifacts/browse/results/"
+    echo "QUIT"
+    ) | nc irc.freenode.net 6667 > /dev/null
+
+}
+
+# wrapper to supress +x to avoid spamming the log
+quiet() {
+    set +x
+    "$@"
+    set -x
+}
+
+RESULTS_CSV=$RESULTS/results.csv
+FAILURES_CSV=$RESULTS/failures.csv
+
+export LD_PRELOAD=$TEST_LD_PRELOAD
+
+    piglit-runner \
+        run \
+        --piglit-folder /piglit \
+        --output $RESULTS \
+        --profile $PIGLIT_PROFILES \
+        --process-isolation \
+	$PIGLIT_RUNNER_OPTIONS \
+        -v -v
+
+PIGLIT_EXITCODE=$?
+
+export LD_PRELOAD=
+
+deqp-runner junit \
+   --testsuite $PIGLIT_PROFILES \
+   --results $RESULTS/failures.csv \
+   --output $RESULTS/junit.xml \
+   --limit 50 \
+   --template "See https://$CI_PROJECT_ROOT_NAMESPACE.pages.freedesktop.org/-/$CI_PROJECT_NAME/-/jobs/$CI_JOB_ID/artifacts/results/{{testcase}}.xml"
+
+# Report the flakes to the IRC channel for monitoring (if configured):
+quiet report_flakes $RESULTS_CSV
+
+exit $PIGLIT_EXITCODE

.gitlab-ci/piglit/run.sh

@@ -1,36 +1,278 @@
-#!/bin/bash
+#!/bin/sh
 
-set -e
-set -o xtrace
+set -ex
 
-VERSION=`cat install/VERSION`
+INSTALL=$(realpath -s "$PWD"/install)
+
+RESULTS=$(realpath -s "$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 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 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.
+
+    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"
+    elif [ "x$PIGLIT_PLATFORM" = "xmixed_glx_egl" ]; then
+        # It is assumed that you have already brought up your X server before
+        # calling this script.
+        SANITY_MESA_VERSION_CMD="$SANITY_MESA_VERSION_CMD --platform glx --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
+
+if [ "$ZINK_USE_LAVAPIPE" ]; then
+    export VK_ICD_FILENAMES="$INSTALL/share/vulkan/icd.d/lvp_icd.x86_64.json"
+fi
+
+# If the job is parallel at the  gitlab job level, will take the corresponding
+# fraction of the caselist.
+if [ -n "$CI_NODE_INDEX" ]; then
+
+    if [ "$PIGLIT_PROFILES" != "${PIGLIT_PROFILES% *}" ]; then
+        FAILURE_MESSAGE=$(printf "%s" "Can't parallelize piglit with multiple profiles")
+        quiet print_red printf "%s\n" "$FAILURE_MESSAGE"
+        exit 1
+    fi
+
+    USE_CASELIST=1
+fi
+
+print_red() {
+    RED='\033[0;31m'
+    NC='\033[0m' # No Color
+    printf "${RED}"
+    "$@"
+    printf "${NC}"
+}
+
+# wrapper to supress +x to avoid spamming the log
+quiet() {
+    set +x
+    "$@"
+    set -x
+}
+
+replay_minio_upload_images() {
+    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}"
+            __START_TEST_PATTERN='<testcase classname="'"${__PIGLIT_TESTCASE_CLASSNAME}"'" name="'"${__PIGLIT_TESTCASE_NAME}"'" status="fail"'
+            __REPLACE_TEST_PATTERN='</system-out><failure type="fail"/></testcase>'
+            # Replace in the range between __START_TEST_PATTERN and
+            # __REPLACE_TEST_PATTERN leaving __START_TEST_PATTERN out
+            # from the substitution
+            sed '\%'"${__START_TEST_PATTERN}"'%,\%'"${__REPLACE_TEST_PATTERN}"'%{\%'"${__START_TEST_PATTERN}"'%b;s%'"${__REPLACE_TEST_PATTERN}"'%</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
+}
+
+SANITY_MESA_VERSION_CMD="$SANITY_MESA_VERSION_CMD | tee /tmp/version.txt | grep \"Mesa $MESA_VERSION\(\s\|$\)\""
 
 rm -rf results
 cd /piglit
 
-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"
+if [ -n "$USE_CASELIST" ]; then
+    PIGLIT_TESTS=$(printf "%s" "$PIGLIT_TESTS")
+    PIGLIT_GENTESTS="./piglit print-cmd $PIGLIT_TESTS $PIGLIT_PROFILES --format \"{name}\" > /tmp/case-list.txt"
+    RUN_GENTESTS="export LD_LIBRARY_PATH=$__LD_LIBRARY_PATH; $PIGLIT_GENTESTS"
+
+    eval $RUN_GENTESTS
+
+    sed -ni $CI_NODE_INDEX~$CI_NODE_TOTAL"p" /tmp/case-list.txt
+
+    PIGLIT_TESTS="--test-list /tmp/case-list.txt"
 fi
-set -e
 
-PIGLIT_RESULTS=${PIGLIT_RESULTS:-$PIGLIT_PROFILES}
+PIGLIT_OPTIONS=$(printf "%s" "$PIGLIT_OPTIONS")
+
+PIGLIT_TESTS=$(printf "%s" "$PIGLIT_TESTS")
+
+PIGLIT_CMD="./piglit run -j${FDO_CI_CONCURRENT:-4} $PIGLIT_OPTIONS $PIGLIT_TESTS $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"
+fi
+
+FAILURE_MESSAGE=$(printf "%s" "Unexpected change in results:")
+
+eval $RUN_CMD
+
+if [ $? -ne 0 ]; then
+    printf "%s\n" "Found $(cat /tmp/version.txt), expected $MESA_VERSION"
+fi
+
+ARTIFACTS_BASE_URL="https://${CI_PROJECT_ROOT_NAMESPACE}.${CI_PAGES_DOMAIN}/-/${CI_PROJECT_NAME}/-/jobs/${CI_JOB_ID}/artifacts"
+
+if [ ${PIGLIT_JUNIT_RESULTS:-0} -eq 1 ]; then
+    ./piglit summary aggregate "$RESULTS" -o junit.xml
+    FAILURE_MESSAGE=$(printf "${FAILURE_MESSAGE}\n%s" "Check the JUnit report for failures at: ${ARTIFACTS_BASE_URL}/results/junit.xml")
+fi
+
+PIGLIT_RESULTS="${PIGLIT_RESULTS:-$PIGLIT_PROFILES}"
+RESULTSFILE="$RESULTS/$PIGLIT_RESULTS.txt"
 mkdir -p .gitlab-ci/piglit
-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
+./piglit summary console "$RESULTS"/results.json.bz2 \
+    | tee ".gitlab-ci/piglit/$PIGLIT_RESULTS.txt.orig" \
+    | head -n -1 | grep -v ": pass" \
+    | sed '/^summary:/Q' \
+    > $RESULTSFILE
 
-if diff -q .gitlab-ci/piglit/$PIGLIT_RESULTS.txt{.baseline,}; then
+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"
+
+    quiet replay_minio_upload_images
+
+    ci-fairy minio cp "$RESULTS"/junit.xml \
+        "minio://${MINIO_HOST}${__MINIO_PATH}/${__MINIO_TRACES_PREFIX}/junit.xml"
+fi
+
+if [ -n "$USE_CASELIST" ]; then
+    # Just filter the expected results based on the tests that were actually
+    # executed, and switch to the version with no summary
+    cat ".gitlab-ci/piglit/$PIGLIT_RESULTS.txt.orig" | sed '/^summary:/Q' | rev \
+        | cut -f2- -d: | rev | sed "s/$/:/g" > /tmp/executed.txt
+
+    grep -F -f /tmp/executed.txt "$INSTALL/$PIGLIT_RESULTS.txt" \
+       > ".gitlab-ci/piglit/$PIGLIT_RESULTS.txt.baseline" || true
+else
+    cp "$INSTALL/$PIGLIT_RESULTS.txt" \
+       ".gitlab-ci/piglit/$PIGLIT_RESULTS.txt.baseline"
+fi
+
+if diff -q ".gitlab-ci/piglit/$PIGLIT_RESULTS.txt.baseline" $RESULTSFILE; then
     exit 0
 fi
 
-./piglit summary html --exclude-details=pass $OLDPWD/summary $OLDPWD/results
+if [ ${PIGLIT_HTML_SUMMARY:-1} -eq 1 ]; then
+    ./piglit summary html --exclude-details=pass \
+        "$RESULTS"/summary "$RESULTS"/results.json.bz2
 
-echo Unexpected change in results:
-diff -u .gitlab-ci/piglit/$PIGLIT_RESULTS.txt{.baseline,}
+    if [ "x$PIGLIT_PROFILES" = "xreplay" ]; then
+        find "$RESULTS"/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 "$RESULTS"/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
+
+    FAILURE_MESSAGE=$(printf "${FAILURE_MESSAGE}\n%s" "Check the HTML summary for problems at: ${ARTIFACTS_BASE_URL}/results/summary/problems.html")
+fi
+
+quiet print_red printf "%s\n" "$FAILURE_MESSAGE"
+quiet diff --color=always -u ".gitlab-ci/piglit/$PIGLIT_RESULTS.txt.baseline" $RESULTSFILE
 exit 1

.gitlab-ci/piglit/run_cl.sh

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

.gitlab-ci/prepare-artifacts.sh

@@ -18,37 +18,37 @@ if [ -n "$CROSS" ]; then
 else
     STRIP="strip"
 fi
-find install -name \*.so -exec $STRIP {} \;
+if [ -z "$ARTIFACTS_DEBUG_SYMBOLS"]; then
+    find install -name \*.so -exec $STRIP {} \;
+fi
 
 # Test runs don't pull down the git tree, so put the dEQP helper
 # script and associated bits there.
 echo "$(cat VERSION) (git-$(git rev-parse HEAD | cut -b -10))" >> install/VERSION
 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/
 cp -Rp .gitlab-ci/deqp-runner.sh install/
 cp -Rp .gitlab-ci/deqp-*.txt install/
+find . -path \*/ci/\*.txt \
+    -o -path \*/ci/\*traces\*.yml \
+    | xargs -I '{}' cp -p '{}' install/
 
 # Tar up the install dir so that symlinks and hardlinks aren't each
 # packed separately in the zip file.
 mkdir -p artifacts/
 tar -cf artifacts/install.tar install
 
-if [ -n "$UPLOAD_FOR_LAVA" ]; then
+if [ -n "$MINIO_ARTIFACT_NAME" ]; 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-deqp.yml.jinja2 artifacts/.
-    cp $CI_PROJECT_DIR/.gitlab-ci/lava-tracie.yml.jinja2 artifacts/.
+    cp $CI_PROJECT_DIR/.gitlab-ci/lava.yml.jinja2 artifacts/.
 
-    gzip -c artifacts/install.tar > mesa-${DEBIAN_ARCH}.tar.gz
-    MINIO_PATH=minio-packet.freedesktop.org/artifacts/${CI_PROJECT_PATH}/${CI_PIPELINE_ID}
+    MINIO_ARTIFACT_NAME="$MINIO_ARTIFACT_NAME.tar.gz"
+    gzip -c artifacts/install.tar > ${MINIO_ARTIFACT_NAME}
+    MINIO_PATH=${MINIO_HOST}/artifacts/${CI_PROJECT_PATH}/${CI_PIPELINE_ID}
     ci-fairy minio login $CI_JOB_JWT
-    ci-fairy minio cp mesa-${DEBIAN_ARCH}.tar.gz minio://${MINIO_PATH}/mesa-${DEBIAN_ARCH}.tar.gz
+    ci-fairy minio cp ${MINIO_ARTIFACT_NAME} minio://${MINIO_PATH}/${MINIO_ARTIFACT_NAME}
 fi

.gitlab-ci/scons-build.sh

@@ -1,12 +0,0 @@
-#!/bin/bash
-
-set -e
-set -o xtrace
-
-if test -n "$LLVM_VERSION"; then
-    export LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
-fi
-
-rm -rf build
-scons $SCONS_TARGET force_scons=on
-eval $SCONS_CHECK_COMMAND 

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

@@ -1,16 +1,23 @@
 # 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/**/*
       - include/**/*
       - meson.build
-      - SConstruct
       - src/*
       - src/compiler/**/*
       - src/drm-shim/**/*
@@ -22,13 +29,38 @@
       - src/include/**/*
       - src/loader/**/*
       - src/mapi/**/*
-      - src/mesa/**/*
+      - src/mesa/*
+      - src/mesa/drivers/*
+      - src/mesa/drivers/common/**/*
+      - src/mesa/drivers/dri/*
+      - src/mesa/drivers/dri/common/**/*
+      - src/mesa/main/**/*
+      - src/mesa/math/**/*
+      - src/mesa/program/**/*
+      - src/mesa/sparc/**/*
+      - src/mesa/state_tracker/**/*
+      - src/mesa/swrast/**/*
+      - src/mesa/swrast_setup/**/*
+      - src/mesa/tnl/**/*
+      - src/mesa/tnl_dd/**/*
+      - src/mesa/vbo/**/*
+      - src/mesa/x86/**/*
+      - src/mesa/x86-64/**/*
       - src/util/**/*
 
+.vulkan-rules:
+  rules:
+    - *ignore_scheduled_pipelines
+    - changes: &vulkan_file_list
+      - src/vulkan/**/*
+      when: on_success
+    - when: never
+
 # Gallium core source file dependencies
 # -------------------------------------
 .gallium-rules:
   rules:
+    - *ignore_scheduled_pipelines
     - changes: &gallium_core_file_list
       - src/gallium/*
       - src/gallium/auxiliary/**/*
@@ -39,15 +71,8 @@
       - 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: softpipe
+  stage: software-renderer
   rules:
     - *ignore_scheduled_pipelines
     - changes:
@@ -63,7 +88,7 @@
     - when: never
 
 .llvmpipe-rules:
-  stage: llvmpipe
+  stage: software-renderer
   rules:
     - *ignore_scheduled_pipelines
     - changes:
@@ -78,8 +103,25 @@
       when: on_success
     - when: never
 
+.lavapipe-rules:
+  stage: software-renderer
+  rules:
+    - *ignore_scheduled_pipelines
+    - changes:
+        *mesa_core_file_list
+      when: on_success
+    - changes:
+        *gallium_core_file_list
+      when: on_success
+    - changes: &lavapipe_file_list
+      - src/gallium/drivers/llvmpipe/**/*
+      - src/gallium/frontends/lavapipe/**/*
+      - src/gallium/winsys/sw/**/*
+      when: on_success
+    - when: never
+
 .llvmpipe-cl-rules:
-  stage: llvmpipe
+  stage: software-renderer
   rules:
     - *ignore_scheduled_pipelines
     - changes:
@@ -115,23 +157,15 @@
     - changes:
       # Note: when https://gitlab.com/gitlab-org/gitlab/-/issues/198688
       # is supported, we can change the src/freedreno/ rule to explicitly
-      # exclude tools, rather than having to explicitly list everything
-      # else
-      - src/freedreno/common/**/*
-      - src/freedreno/drm/**/*
-      - src/freedreno/fdl/**/*
-      - src/freedreno/ir2/**/*
-      - src/freedreno/ir3/**/*
-      - src/freedreno/perfcntrs/**/*
-      - src/freedreno/registers/**/*
-      - src/freedreno/vulkan/**/*
+      # exclude tools
+      - src/freedreno/**/*
       - src/gallium/drivers/freedreno/**/*
       - src/gallium/winsys/freedreno/**/*
       when: on_success
     - when: never
 
 .panfrost-rules:
-  stage: panfrost
+  stage: arm
   rules:
     - *ignore_scheduled_pipelines
     - changes:
@@ -147,8 +181,56 @@
       when: on_success
     - when: never
 
+.vc4-rules:
+  stage: broadcom
+  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
+
+.v3d-rules:
+  stage: broadcom
+  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/v3d/**/*
+      - src/gallium/winsys/kmsro/**/*
+      - src/gallium/winsys/v3d/**/*
+      when: on_success
+    - when: never
+
+.v3dv-rules:
+  stage: broadcom
+  rules:
+    - *ignore_scheduled_pipelines
+    - changes:
+        *mesa_core_file_list
+      when: on_success
+    - changes:
+      - src/broadcom/**/*
+      when: on_success
+    - when: never
+
 .lima-rules:
-  stage: lima
+  stage: arm
   rules:
     - *ignore_scheduled_pipelines
     - changes:
@@ -177,7 +259,7 @@
     - when: never
 
 .virgl-rules:
-  stage: virgl
+  stage: layered-backends
   rules:
     - *ignore_scheduled_pipelines
     - changes:
@@ -196,7 +278,7 @@
     - when: never
 
 .radeonsi-rules:
-  stage: radeonsi
+  stage: amd
   rules:
     - *ignore_scheduled_pipelines
     - changes:
@@ -215,3 +297,84 @@
       - src/amd/registers/**/*
       when: on_success
     - when: never
+
+.iris-rules:
+  stage: intel
+  rules:
+    - *ignore_scheduled_pipelines
+    - changes:
+        *mesa_core_file_list
+      when: on_success
+    - changes:
+        *gallium_core_file_list
+      when: on_success
+    - changes:
+      - src/gallium/drivers/iris/**/*
+      - src/gallium/winsys/iris/**/*
+      - src/intel/**/*
+      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:
+        *lavapipe_file_list
+      when: on_success
+    - changes:
+        *vulkan_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:
+        *lavapipe_file_list
+      when: on_success
+    - changes:
+        *vulkan_file_list
+      when: on_success
+    - changes: *d3d12_file_list
+      when: on_success
+    - when: never
+
+.zink-rules:
+  stage: layered-backends
+  rules:
+    - *ignore_scheduled_pipelines
+    - changes:
+        *mesa_core_file_list
+      when: on_success
+    - changes:
+        *gallium_core_file_list
+      when: on_success
+    - changes:
+        *lavapipe_file_list
+      when: on_success
+    - changes:
+      - src/gallium/drivers/zink/**/*
+      when: on_success
+    - when: never

.gitlab-ci/traces-freedreno.yml

@@ -1,272 +0,0 @@
-traces-db:
-  download-url: "https://minio-packet.freedesktop.org/mesa-tracie-public/"
-
-traces:
-  - path: 0ad/0ad.trace
-    expectations:
-      - device: freedreno-a630
-        checksum: ea2b03e0768e8400c0badd46e4d26087
-  - path: glmark2/buffer-columns=200:interleave=false:update-dispersion=0.9:update-fraction=0.5:update-method=map.rdc
-    expectations:
-      - device: freedreno-a630
-        checksum: 1d04a606014f00663e0d078903d190c8
-  - path: glmark2/buffer-columns=200:interleave=false:update-dispersion=0.9:update-fraction=0.5:update-method=subdata.rdc
-    expectations:
-      - device: freedreno-a630
-        checksum: 6c00e3f05fab4b0df449451803b2749a
-  - path: glmark2/buffer-columns=200:interleave=true:update-dispersion=0.9:update-fraction=0.5:update-method=map.rdc
-    expectations:
-      - device: freedreno-a630
-        checksum: 5706da41ae1877086e7ac2dc9af66e81
-  - path: glmark2/bump-bump-render=height.rdc
-    expectations:
-      - device: freedreno-a630
-        checksum: bfa8557cd352b832e915c3c553b14c1f
-  - path: glmark2/bump-bump-render=high-poly.rdc
-    expectations:
-      - device: freedreno-a630
-        checksum: 737a729713c894596b7cb4c1726239af
-  - path: glmark2/bump-bump-render=normals.rdc
-    expectations:
-      - device: freedreno-a630
-        checksum: 8f81c0d4aa531277784872935523efd8
-  - path: glmark2/conditionals-fragment-steps=0:vertex-steps=0.rdc
-    expectations:
-      # Incorrect rendering, a bunch of the area is uniform gray when it should
-      # continue the pattern
-      - device: freedreno-a630
-        checksum: 4d654718f516adb891e6adef04924896
-  - path: glmark2/conditionals-fragment-steps=5:vertex-steps=0.rdc
-    expectations:
-      # Incorrect rendering, a bunch of the area is uniform gray when it should
-      # continue the pattern
-      - device: freedreno-a630
-        checksum: 7937cc1cb07b980da11a7c892a97bcdc
-  - path: glmark2/conditionals-fragment-steps=0:vertex-steps=5.rdc
-    expectations:
-      # Incorrect rendering, a bunch of the area is uniform gray when it should
-      # continue the pattern
-      - device: freedreno-a630
-        checksum: 2977a3bb963096a4ed421dff7001d498
-  - path: glmark2/desktop-blur-radius=5:effect=blur:passes=1:separable=true:windows=4.rdc
-    expectations:
-      - device: freedreno-a630
-        checksum: d750bb0972cf14a4c0bc35896d87da16
-  - path: glmark2/desktop-effect=shadow:windows=4.rdc
-    expectations:
-      - device: freedreno-a630
-        checksum: 5ff3fe9ab8ad3a53ce4b8bfe7a61900a
-  - path: glmark2/effect2d-kernel=0,1,0;1,-4,1;0,1,0.rdc
-    expectations:
-      - device: freedreno-a630
-        checksum: b38d1d3ebe30ea3df97713515dab3df0
-  - path: glmark2/effect2d-kernel=1,1,1,1,1;1,1,1,1,1;1,1,1,1,1;.rdc
-    expectations:
-      - device: freedreno-a630
-        checksum: 2964d37446db126a5fe462b1ba4542cd
-  - path: glmark2/function-fragment-complexity=low:fragment-steps=5.rdc
-    expectations:
-      # Incorrect rendering, a bunch of the area is uniform gray when it should
-      # continue the pattern
-      - device: freedreno-a630
-        checksum: d479556facd21af43d526b3cc95bed8b
-  - path: glmark2/function-fragment-complexity=medium:fragment-steps=5.rdc
-    expectations:
-      # Incorrect rendering, a bunch of the area is uniform gray when it should
-      # continue the pattern
-      - device: freedreno-a630
-        checksum: 17895715bdb496faa73bba89b06347f6
-  - path: glmark2/glmark2-build-use-vbo-false.rdc
-    expectations:
-      - device: freedreno-a630
-        checksum: ecb647d14dae3876eb2a4282633d84f5
-  - path: glmark2/glmark2-build-use-vbo-true.rdc
-    expectations:
-      - device: freedreno-a630
-        checksum: b2608bba0f80ef93809e42399fb77124
-  - path: glmark2/ideas-speed=duration.rdc
-    expectations:
-      - device: freedreno-a630
-        checksum: e2c3f5163ef85818b85f1af634077f30
-  - path: glmark2/jellyfish.rdc
-    expectations:
-      - device: freedreno-a630
-        checksum: 117212f2d89cbf09f0d81ca0d6b9e3f3
-  - path: glmark2/loop-fragment-loop=false:fragment-steps=5:vertex-steps=5.rdc
-    expectations:
-      # Incorrect rendering, a bunch of the area is uniform gray when it should
-      # continue the pattern
-      - device: freedreno-a630
-        checksum: 52397a2278680b28ccfac4d8ba7340dd
-  - path: glmark2/loop-fragment-steps=5:fragment-uniform=false:vertex-steps=5.rdc
-    expectations:
-      # Incorrect rendering, a bunch of the area is uniform gray when it should
-      # continue the pattern
-      - device: freedreno-a630
-        checksum: 45ce9b6056ec0e0e4276e7738eaa7fa1
-  - path: glmark2/loop-fragment-steps=5:fragment-uniform=true:vertex-steps=5.rdc
-    expectations:
-      # Incorrect rendering, a bunch of the area is uniform gray when it should
-      # continue the pattern
-      - device: freedreno-a630
-        checksum: ec5ea3eab5b54524748a0c883cc929d6
-  - path: glmark2/pulsar-light=false:quads=5:texture=false.rdc
-    expectations:
-      - device: freedreno-a630
-        checksum: e482fd686d39decbec52ada682d93890
-  - path: glmark2/refract.rdc
-    expectations:
-      - device: freedreno-a630
-        checksum: 48a9bdb712ad04476ffb397e9a63cd1c
-  - path: glmark2/shading-shading=blinn-phong-inf.rdc
-    expectations:
-      - device: freedreno-a630
-        checksum: 562772bffd90b5e85375dfe4eff28d81
-  - path: glmark2/shading-shading=cel.rdc
-    expectations:
-      - device: freedreno-a630
-        checksum: 168fd41e4a8c1064d8e37353e2b2a887
-  - path: glmark2/shading-shading=gouraud.rdc
-    expectations:
-      - device: freedreno-a630
-        checksum: bd9058f041bd2d59c039cccdb7d50bf7
-  - path: glmark2/shading-shading=phong.rdc
-    # Some speckling on the main specular highlight that may just be
-    # mediump artifacts
-    expectations:
-      - device: freedreno-a630
-        checksum: f227a5d0471b5bf2de636f519e38f1cb
-  - path: glmark2/shadow.rdc
-    expectations:
-      - device: freedreno-a630
-        checksum: d8b5931669733240797f1acf5d98db25
-  - path: glmark2/texture-texture-filter=linear.rdc
-    expectations:
-      - device: freedreno-a630
-        checksum: b4beeda82884d2e6de549b16cd9b90e8
-  - path: glmark2/texture-texture-filter=mipmap.rdc
-    expectations:
-      - device: freedreno-a630
-        checksum: 27e1cdb7e8f3f5bb6a61ebf02927d201
-  - path: glmark2/texture-texture-filter=nearest.rdc
-    expectations:
-      - device: freedreno-a630
-        checksum: 84409b1b3c75e52ef43fa331f60c549f
-  - path: glxgears/glxgears.trace
-    expectations:
-      - device: freedreno-a630
-        checksum: 5599d6e8e43384c59196b9c9b0161268
-  - path: gputest/furmark.trace
-    expectations:
-      - device: freedreno-a630
-        checksum: 751e0e784ba2f003cfc456fe8699f1fa
-# Note: Requires GL3.3
-  - path: gputest/gimark.trace
-    expectations:
-      - device: freedreno-a630
-        checksum: 2cf40180a1315795389d0dfc18aad988
-  - path: gputest/pixmark-julia-fp32.trace
-    expectations:
-      - device: freedreno-a630
-        checksum: 4a02628395948c34d95d035a9c9735cb
-# Note: Requires GL4 (fp64).
-#  - path: gputest/pixmark-julia-fp64.trace
-#    expectations:
-#      - device: freedreno-a630
-#        checksum: 0
-# Intermittent GPU hangs on a630 result in test failures for this.
-#  - path: gputest/pixmark-piano.trace
-#    expectations:
-#      # One of the material textures appears brighter on freedreno than
-#      # i965 in a way that is probably wrong.
-#      - device: freedreno-a630
-#        checksum: 1aad6e1ffe23cae71acdb70695a6184b
-  - path: gputest/pixmark-volplosion.trace
-    expectations:
-      # Looks fine, but totally different shape from the rendering on i965.
-      - device: freedreno-a630
-        checksum: 2d1cf314b5ef2e0a79f5f98eee8de446
-  - path: gputest/plot3d.trace
-    expectations:
-      - device: freedreno-a630
-        checksum: 42aba3ab943dae2fe952cae1ff91c354
-# Note: Requires GL4 for tess.
-  - path: gputest/tessmark.trace
-    expectations:
-      - device: freedreno-a630
-        checksum: 5d04b8d71517238b9bc8a527574e884b
-  - path: gputest/triangle.trace
-    expectations:
-      - device: freedreno-a630
-        checksum: 1dc6abfb1cfbc5b16adc6f4abf76eec8
-  - path: humus/AmbientAperture.trace
-    expectations:
-      - device: freedreno-a630
-        checksum: 83fd7bce0fc1e1f30bd143b7d30ca890
-  - path: humus/CelShading.trace
-    expectations:
-      - device: freedreno-a630
-        checksum: b0ac8fb4b2b2268cfb87944730125886
-  - path: humus/DynamicBranching3.trace
-    expectations:
-      - device: freedreno-a630
-        checksum: 238f06550db39c36e5b880d3b3d7440f
-  - path: humus/HDR.trace
-    expectations:
-      - device: freedreno-a630
-        checksum: 40387a4e89ef71c472a94413b175ff59
-  - 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
-        checksum: 5f1a655e62eab99d53dab88b634afed3
-  - path: humus/VolumetricFogging2.trace
-    expectations:
-      - device: freedreno-a630
-        checksum: e5d2b54f49ba1c24279d5ff84e0f002b
-# Fails trying to use a GLX symbol
-#  - path: itoral-gl-terrain-demo/demo.trace
-#    expectations:
-#      - device: freedreno-a630
-#        checksum: 0
-  - path: neverball/neverball.trace
-    expectations:
-      - device: freedreno-a630
-        checksum: 57fd57aef14d37043a7b56a16dbf50b6
-  - path: pathfinder/canvas_moire.trace
-    expectations:
-      - device: freedreno-a630
-        checksum: 0e32ca8fc815a7250f38a07faeafb21b
-  - path: pathfinder/canvas_text.trace
-    expectations:
-      - device: freedreno-a630
-        checksum: 74129b650bd3ca806ff2dd46813ba6e6
-  - path: pathfinder/demo.trace
-    expectations:
-      - device: freedreno-a630
-        checksum: f6661ed4de9e0a444c6338ebd0cd3768
-  - path: xonotic/xonotic-keybench-high.trace
-    expectations:
-      - device: freedreno-a630
-        checksum: 0efd30250af93d0b5f03eeabd079e8ee
-# Throws errors on freedreno
-#  - path: supertuxkart/supertuxkart-antediluvian-abyss.rdc
-#    expectations:
-#      - device: freedreno-a630
-#        checksum: 0
-#  - path: supertuxkart/supertuxkart-menu.rdc
-#    expectations:
-#      - device: freedreno-a630
-#        checksum: 0
-#  - path: supertuxkart/supertuxkart-ravenbridge-mansion.rdc
-#    expectations:
-#      - device: freedreno-a630
-#        checksum: 0
-#  - path: godot/Material Testers.x86_64_2020.04.08_13.38_frame799.rdc
-#    expectations:
-#      - device: freedreno-a630
-#        checksum: 0

.gitlab-ci/tracie-runner-gl.sh

@@ -1,57 +0,0 @@
-#!/bin/sh
-
-set -ex
-
-INSTALL="$(pwd)/install"
-
-# Set up the driver environment.
-export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$(pwd)/install/lib/"
-
-# Set environment for renderdoc libraries.
-export PYTHONPATH="$PYTHONPATH:/renderdoc/build/lib"
-export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/renderdoc/build/lib"
-
-# Set environment for the waffle library.
-export LD_LIBRARY_PATH="/waffle/build/lib:$LD_LIBRARY_PATH"
-
-# Set environment for apitrace executable.
-export PATH="/apitrace/build:$PATH"
-
-# Set environment for wflinfo executable.
-export PATH="/waffle/build/bin:$PATH"
-
-# Use the surfaceless EGL platform.
-export EGL_PLATFORM="surfaceless"
-export DISPLAY=
-export WAFFLE_PLATFORM="surfaceless_egl"
-
-# Our rootfs may not have "less", which apitrace uses during apitrace dump
-export PAGER=cat
-
-RESULTS=`pwd`/results
-mkdir -p $RESULTS
-
-# Perform a self-test to ensure tracie is working properly.
-if [ -z "$TRACIE_NO_UNIT_TESTS" ]; then
-    python3 -m pytest -v --pyargs $INSTALL/tracie/tests/test.py
-fi
-
-if [ "$GALLIUM_DRIVER" = "virpipe" ]; then
-    # tracie is to use virpipe, and virgl_test_server llvmpipe
-    export GALLIUM_DRIVER="$GALLIUM_DRIVER"
-
-    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
-
-# 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')
-wflinfo --platform surfaceless_egl --api gles2 | grep "Mesa $MESA_VERSION\(\s\|$\)"
-
-python3 "$INSTALL/tracie/tracie.py" --file "$INSTALL/traces-$DRIVER_NAME.yml" --device-name "$DEVICE_NAME"

.gitlab-ci/tracie-runner-vk.sh

@@ -1,37 +0,0 @@
-#!/bin/sh
-
-set -ex
-
-INSTALL="$(pwd)/install"
-
-# Set the Vulkan driver to use.
-export VK_ICD_FILENAMES="$(pwd)/install/share/vulkan/icd.d/${VK_DRIVER}_icd.x86_64.json"
-
-# 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
-
-# Perform a self-test to ensure tracie is working properly.
-python3 -m pytest -v --pyargs $INSTALL/tracie/tests/test.py
-
-# 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')
-vulkaninfo | grep "Mesa $MESA_VERSION\(\s\|$\)"
-
-# Run gfxreconstruct traces 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
-PATH="/gfxreconstruct/build/bin:$PATH" \
-    python3 "$INSTALL/tracie/tracie.py" --file "$INSTALL/traces-$DRIVER_NAME.yml" --device-name "$DEVICE_NAME"

.gitlab-ci/tracie/README.md

@@ -1,159 +0,0 @@
-Tracie - Mesa Traces Continuous Integration System
-==================================================
-
-Home of the Mesa trace testing effort.
-
-### Traces definition file
-
-The trace definition file contains information about the traces to run along
-with their expected image checksums on each device, and optionally from where to
-download them. An example:
-
-```yaml
-traces-db:
-  download-url: https://minio-packet.freedesktop.org/mesa-tracie-public/
-
-traces:
-  - path: glmark2/jellyfish.rdc
-    expectations:
-      - device: gl-intel-0x3185
-        checksum: 58359ea4caf6ad44c6b65526881bbd17
-      - device: gl-vmware-llvmpipe
-        checksum: d82267c25a0decdad7b563c56bb81106
-  - path: supertuxkart/supertuxkart-antediluvian-abyss.rdc
-    expectations:
-      - device: gl-intel-0x3185
-        checksum: ff827f7eb069afd87cc305a422cba939
-```
-
-The `traces-db` entry can be absent, in which case it is assumed that
-the traces can be found in the `CWD/traces-db` directory.
-
-Traces that don't have an expectation for the current device are skipped
-during trace replay.
-
-Adding a new trace to the list involves commiting the trace to the git repo and
-adding an entry to the `traces` list. The reference checksums can be calculated
-with the [image_checksum.py](.gitlab-ci/tracie/image_checksum.py) script.
-Alternatively, an arbitrary checksum can be used, and during replay (see below)
-the scripts will report the mismatch and expected checksum.
-
-### Trace-db download urls
-
-The trace-db:download-url property contains an HTTPS url from which traces can
-be downloaded, by appending traces:path properties to it.
-
-### Enabling trace testing on a new device
-
-To enable trace testing on a new device:
-
-1. Create a new job in .gitlab-ci.yml. The job will need to be tagged
-   to run on runners with the appropriate hardware.
-
-   1. If you mean to test GL traces, use the `.traces-test-gl`
-      template jobs as a base, and make sure you set a unique value for the
-     `DEVICE_NAME` variable and the name of the Mesa driver as `DRIVER_NAME`:
-
-   ```yaml
-   my-hardware-gl-traces:
-     extends: .traces-test-gl
-     variables:
-       DEVICE_NAME: "gl-myhardware"
-       DRIVER_NAME: "mydriver"
-   ```
-
-   2. If you mean to test Vulkan traces, use the `.traces-test-vk`
-      template jobs as a base, set the `VK_DRIVER` variable, and make
-      sure you set a unique value for the `DEVICE_NAME` variable:
-
-   ```yaml
-   my-hardware-vk-traces:
-     extends: .traces-test-vk
-     variables:
-       VK_DRIVER: "radeon"
-       DEVICE_NAME: "vk-myhardware"
-       DRIVER_NAME: "radv"
-   ```
-
-2. Update the .gitlab-ci/traces-$DRIVER_NAME.yml file with expectations for
-   the new device. Ensure that the device name used in the expectations
-   matches the one set in the job. For more information, and tips about how to
-   calculate the checksums, see the section describing the trace definition
-   files.
-
-### Trace files
-
-Tracie supports renderdoc (.rdc), apitrace (.trace) and gfxreconstruct
-(.gfxr) files. Trace files need to have the correct extension so that
-tracie can detect them properly.
-
-The trace files that are contained in public traces-db repositories must be
-legally redistributable. This is typically true for FOSS games and
-applications. Traces for proprietary games and application are typically not
-redistributable, unless specific redistribution rights have been granted by the
-publisher.
-
-Trace files in a given repository are expected to be immutable once committed
-for the first time, so any changes need to be accompanied by a change in the
-file name (eg. by appending a _v2 suffix to the file).
-
-### Replaying traces
-
-Mesa traces CI uses a set of scripts to replay traces and check the output
-against reference checksums.
-
-The high level script [tracie.py](.gitlab-ci/tracie/tracie.py) accepts
-a traces definition file and the name of the device to be tested:
-
-    tracie.py --file .gitlab-ci/traces-llvmpipe.yml --device-name gl-vmware-llvmpipe
-
-tracie.py copies the produced artifacts to the `$CI_PROJECT_DIR/result`
-directory. By default, created images from traces are only stored in case of a
-checksum mismatch. The `TRACIE_STORE_IMAGES` CI/environment variable can be set
-to `1` to force storing images, e.g., to get a complete set of reference
-images.
-
-At a lower level the
-[dump_trace_images.py](.gitlab-ci/tracie/dump_trace_images.py) script is
-called, which replays a trace, dumping a set of images in the process. By
-default only the image corresponding to the last frame of the trace is dumped,
-but this can be changed with the `--calls` parameter. The dumped images are
-stored in a subdirectory `test/<device-name>` next to the trace file itself,
-with names of the form `tracefilename-callnum.png`.  The full log of any
-commands used while dumping the images is also saved in a file in the
-'test/<device-name>' subdirectory, named after the trace name with '.log'
-appended.
-
-Examples:
-
-    python3 dump_traces_images.py --device-name=gl-vmware-llvmpipe mytrace.trace
-    python3 dump_traces_images.py --device-name=gl-vmware-llvmpipe --calls=2075,3300 mytrace.trace
-
-### Running the replay scripts locally
-
-It's often useful, especially during development, to be able to run the scripts
-locally.
-
-Depending on the target 3D API, the scripts require a recent version
-of apitrace being in the path, and also the renderdoc python module
-being available, for GL traces.
-
-To ensure python3 can find the renderdoc python module you need to set
-`PYTHONPATH` to point to the location of `renderdoc.so` (binary python modules)
-and `LD_LIBRARY_PATH` to point to the location of `librenderdoc.so`. In the
-renderdoc build tree, both of these are in `renderdoc/<builddir>/lib`. Note
-that renderdoc doesn't install the `renderdoc.so` python module.
-
-In the case of Vulkan traces, the scripts need a recent version of
-gfxrecon-replay being in the path, and also the
-`VK_LAYER_LUNARG_screenshot` Vulkan layer from LunarG's VulkanTools.
-
-To ensure that this layer can be found when running the trace you need
-to set `VK_LAYER_PATH` to point to the location of
-`VkLayer_screenshot.json` and `LD_LIBRARY_PATH` to point to the
-location of `libVkLayer_screenshot.so`.
-
-In the case of DXGI traces, the scripts require Wine, a recent version
-of DXVK installed in the default `WINEPREFIX`, and a recent binary
-version of apitrace for Windows which should be reachable through
-Windows' `PATH` environment variable.

.gitlab-ci/tracie/dump_trace_images.py

@@ -1,176 +0,0 @@
-#!/usr/bin/python3
-
-# Copyright (c) 2019 Collabora Ltd
-# Copyright © 2019-2020 Valve Corporation.
-#
-# 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 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.
-#
-# SPDX-License-Identifier: MIT
-
-import argparse
-import os
-import sys
-import subprocess
-from pathlib import Path
-from traceutil import trace_type_from_filename, TraceType
-
-def log(severity, msg, end='\n'):
-    print("[dump_trace_images] %s: %s" % (severity, msg), flush=True, end=end)
-
-def log_result(msg):
-    print(msg, flush=True)
-
-def run_logged_command(cmd, env, log_path):
-    ret = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, env=env)
-    logoutput = ("[dump_trace_images] Running: %s\n" % " ".join(cmd)).encode() + \
-                ret.stdout
-    log_path.parent.mkdir(parents=True, exist_ok=True)
-    with log_path.open(mode='wb') as log:
-        log.write(logoutput)
-    if ret.returncode:
-        raise RuntimeError(
-            logoutput.decode(errors='replace') +
-            "[dump_traces_images] Process failed with error code: %d" % ret.returncode)
-
-def get_last_apitrace_frame_call(cmd_wrapper, trace_path):
-    cmd = cmd_wrapper + ["apitrace", "dump", "--calls=frame", str(trace_path)]
-    ret = subprocess.run(cmd, stdout=subprocess.PIPE)
-    for l in reversed(ret.stdout.decode(errors='replace').splitlines()):
-        s = l.split(None, 1)
-        if len(s) >= 1 and s[0].isnumeric():
-            return int(s[0])
-    return -1
-
-def get_last_gfxreconstruct_frame_call(trace_path):
-    cmd = ["gfxrecon-info", str(trace_path)]
-    ret = subprocess.run(cmd, stdout=subprocess.PIPE)
-    lines = ret.stdout.decode(errors='replace').splitlines()
-    if len(lines) >= 1:
-        c = lines[0].split(": ", 1)
-        if len(c) >= 2 and c[1].isnumeric():
-            return int(c[1])
-    return -1
-
-def dump_with_apitrace(retrace_cmd, trace_path, calls, device_name):
-    outputdir = str(trace_path.parent / "test" / device_name)
-    os.makedirs(outputdir, exist_ok=True)
-    outputprefix = str(Path(outputdir) / trace_path.name) + "-"
-    if len(calls) == 0:
-        calls = [str(get_last_apitrace_frame_call(retrace_cmd[:-1], trace_path))]
-    cmd = retrace_cmd + ["--headless",
-                         "--snapshot=" + ','.join(calls),
-                         "--snapshot-prefix=" + outputprefix, str(trace_path)]
-    log_path = Path(outputdir) / (trace_path.name + ".log")
-    run_logged_command(cmd, None, log_path)
-
-def dump_with_renderdoc(trace_path, calls, device_name):
-    outputdir = str(trace_path.parent / "test" / device_name)
-    script_path = Path(os.path.dirname(os.path.abspath(__file__)))
-    cmd = [str(script_path / "renderdoc_dump_images.py"), str(trace_path), outputdir]
-    cmd.extend(calls)
-    log_path = Path(outputdir) / (trace_path.name + ".log")
-    run_logged_command(cmd, None, log_path)
-
-def dump_with_gfxreconstruct(trace_path, calls, device_name):
-    from PIL import Image
-    outputdir_path = trace_path.parent / "test" / device_name
-    outputdir_path.mkdir(parents=True, exist_ok=True)
-    outputprefix = str(outputdir_path / trace_path.name) + "-"
-    if len(calls) == 0:
-        # FIXME: The VK_LAYER_LUNARG_screenshot numbers the calls from
-        # 0 to (total-num-calls - 1) while gfxreconstruct does it from
-        # 1 to total-num-calls:
-        # https://github.com/LunarG/gfxreconstruct/issues/284
-        calls = [str(get_last_gfxreconstruct_frame_call(trace_path) - 1)]
-    cmd = ["gfxrecon-replay", str(trace_path)]
-    log_path = outputdir_path / (trace_path.name + ".log")
-    env = os.environ.copy()
-    env["VK_INSTANCE_LAYERS"] = "VK_LAYER_LUNARG_screenshot"
-    env["VK_SCREENSHOT_FRAMES"] = ",".join(calls)
-    env["VK_SCREENSHOT_DIR"] = str(outputdir_path)
-    run_logged_command(cmd, env, log_path)
-    for c in calls:
-        ppm = str(outputdir_path / c) + ".ppm"
-        outputfile = outputprefix + c + ".png"
-        with log_path.open(mode='w') as log:
-            log.write("Writing: %s to %s" % (ppm, outputfile))
-        Image.open(ppm).save(outputfile)
-        os.remove(ppm)
-
-def dump_with_testtrace(trace_path, calls, device_name):
-    from PIL import Image
-    outputdir_path = trace_path.parent / "test" / device_name
-    outputdir_path.mkdir(parents=True, exist_ok=True)
-    with trace_path.open() as f:
-        rgba = f.read()
-    color = [int(rgba[0:2], 16), int(rgba[2:4], 16),
-             int(rgba[4:6], 16), int(rgba[6:8], 16)]
-    if len(calls) == 0: calls = ["0"]
-    for c in calls:
-        outputfile = str(outputdir_path / trace_path.name) + "-" + c + ".png"
-        log_path = outputdir_path / (trace_path.name + ".log")
-        with log_path.open(mode='w') as log:
-            log.write("Writing RGBA: %s to %s" % (rgba, outputfile))
-        Image.frombytes('RGBA', (32, 32), bytes(color * 32 * 32)).save(outputfile)
-
-def dump_from_trace(trace_path, calls, device_name):
-    log("Info", "Dumping trace %s" % trace_path, end='... ')
-    trace_type = trace_type_from_filename(trace_path.name)
-    try:
-        if trace_type == TraceType.APITRACE:
-            dump_with_apitrace(["eglretrace"], trace_path, calls, device_name)
-        elif trace_type == TraceType.APITRACE_DXGI:
-            dump_with_apitrace(["wine", "d3dretrace"], trace_path, calls, device_name)
-        elif trace_type == TraceType.RENDERDOC:
-            dump_with_renderdoc(trace_path, calls, device_name)
-        elif trace_type == TraceType.GFXRECONSTRUCT:
-            dump_with_gfxreconstruct(trace_path, calls, device_name)
-        elif trace_type == TraceType.TESTTRACE:
-            dump_with_testtrace(trace_path, calls, device_name)
-        else:
-            raise RuntimeError("Unknown tracefile extension")
-        log_result("OK")
-        return True
-    except Exception as e:
-        log_result("ERROR")
-        log("Debug", "=== Failure log start ===")
-        print(e)
-        log("Debug", "=== Failure log end ===")
-        return False
-
-def main():
-    parser = argparse.ArgumentParser()
-    parser.add_argument('tracepath', help="trace to dump")
-    parser.add_argument('--device-name', required=True,
-                        help="the name of the graphics device used to produce images")
-    parser.add_argument('--calls', required=False,
-                        help="the call numbers from the trace to dump (default: last frame)")
-
-    args = parser.parse_args()
-    if args.calls is not None:
-        args.calls = args.calls.split(",")
-    else:
-        args.calls = []
-
-    success = dump_from_trace(Path(args.tracepath), args.calls, args.device_name)
-
-    sys.exit(0 if success else 1)
-
-if __name__ == "__main__":
-    main()

.gitlab-ci/tracie/image_checksum.py

@@ -1,39 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (c) 2019 Collabora Ltd
-#
-# 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 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.
-#
-# SPDX-License-Identifier: MIT
-
-import argparse
-import hashlib
-from PIL import Image
-
-def main():
-    parser = argparse.ArgumentParser()
-    parser.add_argument('imagefile', help='image file to calculate checksum for')
-
-    args = parser.parse_args()
-
-    md5 = hashlib.md5(Image.open(args.imagefile).tobytes())
-    print(md5.hexdigest())
-
-if __name__ == "__main__":
-    main()

.gitlab-ci/tracie/query_traces_yaml.py

@@ -1,108 +0,0 @@
-#!/usr/bin/python3
-
-# Copyright (c) 2019 Collabora Ltd
-# Copyright © 2020 Valve Corporation.
-#
-# 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 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.
-#
-# SPDX-License-Identifier: MIT
-
-import argparse
-import yaml
-from traceutil import all_trace_type_names, trace_type_from_name
-from traceutil import trace_type_from_filename
-
-def trace_devices(trace):
-    return [e['device'] for e in trace['expectations']]
-
-def cmd_traces_db_gitlab_project_url(args):
-    with open(args.file, 'r') as f:
-        y = yaml.safe_load(f)
-    print(y['traces-db']['gitlab-project-url'])
-
-def cmd_traces_db_commit(args):
-    with open(args.file, 'r') as f:
-        y = yaml.safe_load(f)
-    print(y['traces-db']['commit'])
-
-def cmd_traces(args):
-    with open(args.file, 'r') as f:
-        y = yaml.safe_load(f)
-
-    traces = y['traces']
-    traces = filter(lambda t: trace_type_from_filename(t['path']) in args.trace_types,
-                    traces)
-    if args.device_name:
-        traces = filter(lambda t: args.device_name in trace_devices(t), traces)
-
-    traces = list(traces)
-
-    if len(traces) == 0:
-        return
-
-    print('\n'.join((t['path'] for t in traces)))
-
-def cmd_checksum(args):
-    with open(args.file, 'r') as f:
-        y = yaml.safe_load(f)
-
-    traces = y['traces']
-    trace = next(t for t in traces if t['path'] == args.trace_path)
-    expectation = next(e for e in trace['expectations'] if e['device'] == args.device_name)
-
-    print(expectation['checksum'])
-
-def main():
-    parser = argparse.ArgumentParser()
-    parser.add_argument('--file', required=True,
-                        help='the name of the yaml file')
-
-    subparsers = parser.add_subparsers(help='sub-command help')
-
-    parser_traces_db_gitlab_project_url = subparsers.add_parser('traces_db_gitlab_project_url')
-    parser_traces_db_gitlab_project_url.set_defaults(func=cmd_traces_db_gitlab_project_url)
-
-    parser_traces_db_commit = subparsers.add_parser('traces_db_commit')
-    parser_traces_db_commit.set_defaults(func=cmd_traces_db_commit)
-
-    parser_traces = subparsers.add_parser('traces')
-    parser_traces.add_argument('--device-name', required=False,
-                               help="the name of the graphics device used to "
-                                     "produce images")
-    parser_traces.add_argument('--trace-types', required=False,
-                               default=",".join(all_trace_type_names()),
-                               help="the types of traces to look for in recursive "
-                                    "dir walks " "(by default all types)")
-    parser_traces.set_defaults(func=cmd_traces)
-
-    parser_checksum = subparsers.add_parser('checksum')
-    parser_checksum.add_argument('--device-name', required=True,
-                               help="the name of the graphics device used to "
-                                     "produce images")
-    parser_checksum.add_argument('trace_path')
-    parser_checksum.set_defaults(func=cmd_checksum)
-
-    args = parser.parse_args()
-    if hasattr(args, 'trace_types'):
-        args.trace_types = [trace_type_from_name(t) for t in args.trace_types.split(",")]
-
-    args.func(args)
-
-if __name__ == "__main__":
-    main()

.gitlab-ci/tracie/renderdoc_dump_images.py

@@ -1,125 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (c) 2019 Collabora Ltd
-#
-# 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 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.
-#
-# SPDX-License-Identifier: MIT
-
-import atexit
-import os
-import shutil
-import sys
-import tempfile
-from pathlib import Path
-
-def cleanup(dirpath):
-        shutil.rmtree(dirpath)
-
-dirpath = tempfile.mkdtemp()
-atexit.register(cleanup, dirpath)
-RENDERDOC_DEBUG_FILE = dirpath + "/renderdoc.log"
-
-# Needs to be in the environment before importing the module
-os.environ['RENDERDOC_DEBUG_LOG_FILE'] = RENDERDOC_DEBUG_FILE
-import renderdoc as rd
-
-def findDrawWithEventId(controller, eventId):
-   for d in controller.GetDrawcalls():
-      if d.eventId == eventId:
-         return d
-
-   return None
-
-def dumpImage(controller, eventId, outputDir, tracefile):
-    draw = findDrawWithEventId(controller, eventId)
-    if draw is None:
-        raise RuntimeError("Couldn't find draw call with eventId " + str(eventId))
-
-    controller.SetFrameEvent(draw.eventId, True)
-
-    texsave = rd.TextureSave()
-
-    # Select the first color output
-    texsave.resourceId = draw.outputs[0]
-
-    if texsave.resourceId == rd.ResourceId.Null():
-        return
-
-    filepath = Path(outputDir)
-    filepath.mkdir(parents = True, exist_ok = True)
-    filepath = filepath / (tracefile + "-" + str(int(draw.eventId)) + ".png")
-
-    print("Saving image at eventId %d: %s to %s" % (draw.eventId, draw.name, filepath))
-
-    # Most formats can only display a single image per file, so we select the
-    # first mip and first slice
-    texsave.mip = 0
-    texsave.slice.sliceIndex = 0
-
-    # For formats with an alpha channel, preserve it
-    texsave.alpha = rd.AlphaMapping.Preserve
-    texsave.destType = rd.FileType.PNG
-    controller.SaveTexture(texsave, str(filepath))
-
-def loadCapture(filename):
-    cap = rd.OpenCaptureFile()
-
-    status = cap.OpenFile(filename, '', None)
-
-    if status != rd.ReplayStatus.Succeeded:
-        raise RuntimeError("Couldn't open file: " + str(status))
-    if not cap.LocalReplaySupport():
-        raise RuntimeError("Capture cannot be replayed")
-
-    status, controller = cap.OpenCapture(rd.ReplayOptions(), None)
-
-    if status != rd.ReplayStatus.Succeeded:
-        if os.path.exists(RENDERDOC_DEBUG_FILE):
-            print(open(RENDERDOC_DEBUG_FILE, "r").read())
-        raise RuntimeError("Couldn't initialise replay: " + str(status))
-
-    if os.path.exists(RENDERDOC_DEBUG_FILE):
-        open(RENDERDOC_DEBUG_FILE, "w").write("")
-
-    return (cap, controller)
-
-def renderdoc_dump_images(filename, eventIds, outputDir):
-   rd.InitialiseReplay(rd.GlobalEnvironment(), [])
-   cap, controller = loadCapture(filename);
-
-   tracefile = Path(filename).name
-
-   if len(eventIds) == 0:
-      eventIds.append(controller.GetDrawcalls()[-1].eventId)
-
-   for eventId in eventIds:
-      dumpImage(controller, eventId, outputDir, tracefile)
-
-   cap.Shutdown()
-
-   rd.ShutdownReplay()
-
-if __name__ == "__main__":
-   if len(sys.argv) < 3:
-      raise RuntimeError("Usage: renderdoc_dump_images.py <trace> <outputdir> [<draw-id>...]")
-
-   eventIds = [int(e) for e in sys.argv[3:]]
-
-   renderdoc_dump_images(sys.argv[1], eventIds, sys.argv[2])

.gitlab-ci/tracie/tests/test-data/trace1/magenta.testtrace

@@ -1 +0,0 @@
-ff00ffff

.gitlab-ci/tracie/tests/test-data/trace2/olive.testtrace

@@ -1 +0,0 @@
-80800080