Merge branch 'byzantium-21.2' into 'pureos/byzantium'

byzantium: Update to 21.2.6

See merge request Librem5/mesa!11

.appveyor/appveyor_msvc.bat

-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

-# 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')

.editorconfig

@@ -36,6 +36,10 @@ indent_size = 2
 indent_style = space
 indent_size = 2
 
+[*.rst]
+indent_style = space
+indent_size = 3
+
 [*.patch]
 trim_trailing_whitespace = false
 

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

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

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

+#!/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/bm-init.sh

+#!/bin/sh
+
+# Init entrypoint for bare-metal devices; calls common init code.
+
+# First stage: very basic setup to bring up network and /dev etc
+/init-stage1.sh
+
+# Second stage: run jobs
+test $? -eq 0 && /init-stage2.sh
+
+# Wait until the job would have timed out anyway, so we don't spew a "init
+# exited" panic.
+sleep 6000

.gitlab-ci/bare-metal/cros-servo.sh

@@ -5,6 +5,7 @@
 
 # We're run from the root of the repo, make a helper var for our paths
 BM=$CI_PROJECT_DIR/install/bare-metal
+CI_COMMON=$CI_PROJECT_DIR/install/common
 
 # Runner config checks
 if [ -z "$BM_SERIAL" ]; then

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

+
 #!/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,17 +117,36 @@ 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
 
-            result = re.search("bare-metal result: (\S*)", line)
+            # 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("hwci: mesa: (\S*)", line)
             if result:
                 if result.group(1) == "pass":
                     return 0
                 else:
                     return 1
 
-        print("Reached the end of the CPU serial log without finding a result")
+        self.print_error("Reached the end of the CPU serial log without finding a result")
         return 1
 
 

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

 #!/bin/bash
 
 BM=$CI_PROJECT_DIR/install/bare-metal
+CI_COMMON=$CI_PROJECT_DIR/install/common
 
 if [ -z "$BM_SERIAL" -a -z "$BM_SERIAL_SCRIPT" ]; then
   echo "Must set BM_SERIAL OR BM_SERIAL_SCRIPT in your gitlab-runner config.toml [[runners]] environment"
@@ -45,32 +46,50 @@ 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
 
 set -ex
 
 # Clear out any previous run's artifacts.
 rm -rf results/
-mkdir -p results
-
-# 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.
-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
+mkdir -p results/
+
+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
+
+  # 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
+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,34 +111,38 @@ else
   cat $BM_KERNEL $BM_DTB > Image.gz-dtb
 fi
 
+mkdir -p artifacts
 abootimg \
   --create artifacts/fastboot.img \
   -k Image.gz-dtb \
   -r rootfs.cpio.gz \
-  -c cmdline="$BM_CMDLINE $WEBDAV_CMDLINE"
+  -c cmdline="$BM_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

@@ -31,9 +31,16 @@ import threading
 class FastbootRun:
     def __init__(self, args):
         self.powerup = args.powerup
-        self.ser = SerialBuffer(args.dev, "results/serial-output.txt", "R SERIAL> ")
+        # We would like something like a 1 minute timeout, but the piglit traces
+        # jobs stall out for long periods of time.
+        self.ser = SerialBuffer(args.dev, "results/serial-output.txt", "R SERIAL> ", timeout=600)
         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)
@@ -50,11 +57,12 @@ class FastbootRun:
                 break
 
             if re.search("data abort", line):
-                return 1
+                self.print_error("Detected crash during boot, restarting run...")
+                return 2
 
         if not fastboot_ready:
-            print("Failed to get to fastboot prompt")
-            return 1
+            self.print_error("Failed to get to fastboot prompt, restarting run...")
+            return 2
 
         if self.logged_system(self.fastboot) != 0:
             return 1
@@ -66,18 +74,24 @@ 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
 
-            result = re.search("bare-metal result: (\S*)", line)
+            # 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("hwci: mesa: (\S*)", line)
             if result:
                 if result.group(1) == "pass":
                     return 0
                 else:
                     return 1
 
-        print("Reached the end of the CPU serial log without finding a result")
-        return 1
+        self.print_error("Reached the end of the CPU serial log without finding a result, restarting run...")
+        return 2
 
 def main():
     parser = argparse.ArgumentParser()
@@ -94,6 +108,8 @@ def main():
         if retval != 2:
             break
 
+        fastboot = FastbootRun(args)
+
     fastboot.logged_system(args.powerdown)
 
     sys.exit(retval)

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

-#!/bin/sh
-
-set -ex
-
-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
-mount -t tmpfs tmpfs /tmp
-
-. /set-job-env-vars.sh
-
-# Store Mesa's disk cache under /tmp, rather than sending it out over NFS.
-export XDG_CACHE_HOME=/tmp
-
-echo "nameserver 8.8.8.8" > /etc/resolv.conf
-
-# Not all DUTs have network
-sntp -sS pool.ntp.org || true
-
-# Start a little daemon to capture the first devcoredump we encounter.  (They
-# expire after 5 minutes, so we poll for them).
-./capture-devcoredump.sh &
-
-if sh $BARE_METAL_TEST_SCRIPT; then
-  OK=1
-else
-  OK=0
-fi
-
-# upload artifacts via webdav
-WEBDAV=$(cat /proc/cmdline | tr " " "\n" | grep webdav | cut -d '=' -f 2 || true)
-if [ -n "$WEBDAV" ]; then
-  find /results -type f -exec curl -T {} $WEBDAV/{} \;
-fi
-
-if [ $OK -eq 1 ]; then
-    echo "bare-metal result: pass"
-else
-    echo "bare-metal result: fail"
-fi
-
-# Wait until the job would have timed out anyway, so we don't spew a "init
-# exited" panic.
-sleep 6000

.gitlab-ci/bare-metal/nginx-default-site

-server {
-    listen 80 default_server;
-    listen [::]:80 default_server;
-
-    server_name _;
-
-    location / {
-        dav_methods     PUT;
-        dav_ext_methods PROPFIND OPTIONS;
-        dav_access      user:rw group:rw all:r;
-
-        client_body_temp_path   /tmp;
-        client_max_body_size    0;
-        create_full_put_path    on;
-
-        root /results;
-
-        autoindex     on;
-    }
-}

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

+#!/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

+#!/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"