From af0fde955c518447ccd92134517b4e69308e10b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Date: Fri, 19 Mar 2021 12:52:35 +0100 Subject: [PATCH] ci: Move docker images from Debian buster to bullseye Among other things, this gets us GCC 10 (was 6). Requires some changes to third party components we use: * Install apitrace (& waffle) from Debian; was hitting issues with the local build, and it's the same version 9.0 anyway. * Update Fossilize to a newer commit which builds with GCC 10. * apt.llvm.org repositories are no longer needed. * Use an SPIRV-LLVM-Translator commit which builds with LLVM 11.0.1. * Install XCB packages from Debian, 1.13 fails to build with Python 3.9. * Install wayland-protocols from Debian, 1.12 is too old for libgtk-3-dev in bullseye. LLVM 7/8 packages are no longer available. Also adapt expected test results to Xvfb now exposing multi-samle GLXFBConfigs. v2: * Install clang instead of clang-11. Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3124 Reviewed-by: Eric Anholt # v1 Part-of: --- .gitlab-ci.yml | 58 +++++++++---------- .gitlab-ci/container/arm_build.sh | 17 +++--- .gitlab-ci/container/arm_test.sh | 6 +- .gitlab-ci/container/build-apitrace.sh | 36 ------------ .gitlab-ci/container/build-fossilize.sh | 2 +- .gitlab-ci/container/build-libclc.sh | 4 +- .gitlab-ci/container/create-rootfs.sh | 28 ++++----- .gitlab-ci/container/cross_build.sh | 28 +++++++-- .gitlab-ci/container/lava_build.sh | 53 +++++++---------- .gitlab-ci/container/llvm-snapshot.gpg.key | 52 ----------------- .gitlab-ci/container/x86_build-base.sh | 29 +++------- .gitlab-ci/container/x86_build.sh | 46 ++++++--------- .gitlab-ci/container/x86_test-base.sh | 23 ++------ .gitlab-ci/container/x86_test-gl.sh | 19 +++--- .gitlab-ci/container/x86_test-vk.sh | 6 +- .gitlab-ci/lava-gitlab-ci.yml | 2 +- .gitlab-ci/lava.yml.jinja2 | 2 + .gitlab-ci/piglit/run.sh | 6 -- src/broadcom/ci/piglit-v3d-rpi4-fails.txt | 1 - src/broadcom/ci/piglit-vc4-rpi3-fails.txt | 1 - .../ci/deqp-freedreno-a630-fails.txt | 26 +++++++++ .../ci/piglit-freedreno-a530-fails.txt | 1 - .../ci/piglit-freedreno-a630-fails.txt | 1 - .../drivers/llvmpipe/ci/llvmpipe-cl.txt | 4 +- .../drivers/llvmpipe/ci/llvmpipe-quick_gl.txt | 47 +++++---------- src/gallium/drivers/softpipe/ci/gitlab-ci.yml | 2 +- .../drivers/softpipe/ci/softpipe-quick.txt | 1 - .../drivers/virgl/ci/deqp-virgl-gl-fails.txt | 5 ++ .../drivers/zink/ci/piglit-zink-lvp-fails.txt | 29 +++++++++- 29 files changed, 225 insertions(+), 310 deletions(-) delete mode 100644 .gitlab-ci/container/build-apitrace.sh delete mode 100644 .gitlab-ci/container/llvm-snapshot.gpg.key diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cdc55edcc0a..714a9308507 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -276,7 +276,7 @@ success: # Otherwise, container jobs won't run - when: never variables: - FDO_DISTRIBUTION_VERSION: buster-slim + FDO_DISTRIBUTION_VERSION: bullseye-slim FDO_REPO_SUFFIX: "debian/$CI_JOB_NAME" FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/container/${CI_JOB_NAME}.sh' # no need to pull the whole repo to build the container image @@ -290,13 +290,13 @@ success: - .ci-run-policy stage: container-2 -# Debian 10 based x86 build image base +# Debian 11 based x86 build image base x86_build-base: extends: - .fdo.container-build@debian - .container variables: - MESA_IMAGE_TAG: &x86_build-base "2021-03-31-llvm11" + MESA_IMAGE_TAG: &x86_build-base "2021-03-31-bullseye" .use-x86_build-base: extends: @@ -308,12 +308,12 @@ x86_build-base: needs: - x86_build-base -# Debian 10 based x86 main build image +# Debian 11 based x86 main build image x86_build: extends: - .use-x86_build-base variables: - MESA_IMAGE_TAG: &x86_build "2021-04-13-llvm11" + MESA_IMAGE_TAG: &x86_build "2021-04-13-bullseye" .use-x86_build: extends: @@ -325,12 +325,12 @@ x86_build: needs: - x86_build -# Debian 10 based i386 cross-build image +# Debian 11 based i386 cross-build image i386_build: extends: - .use-x86_build-base variables: - MESA_IMAGE_TAG: &i386_build "2021-04-13-armhf-no-llvm" + MESA_IMAGE_TAG: &i386_build "2021-04-13-bullseye" .use-i386_build: extends: @@ -342,12 +342,12 @@ i386_build: needs: - i386_build -# Debian 10 based ppc64el cross-build image +# Debian 11 based ppc64el cross-build image ppc64el_build: extends: - .use-x86_build-base variables: - MESA_IMAGE_TAG: &ppc64el_build "2021-04-13-armhf-no-llvm" + MESA_IMAGE_TAG: &ppc64el_build "2021-04-13-bullseye" .use-ppc64el_build: extends: @@ -359,12 +359,12 @@ ppc64el_build: needs: - ppc64el_build -# Debian 10 based s390x cross-build image +# Debian 11 based s390x cross-build image s390x_build: extends: - .use-x86_build-base variables: - MESA_IMAGE_TAG: &s390x_build "2021-04-13-armhf-no-llvm" + MESA_IMAGE_TAG: &s390x_build "2021-04-13-bullseye" .use-s390x_build: extends: @@ -393,11 +393,11 @@ android_build: needs: - android_build -# Debian 10 based x86 test image base +# Debian 11 based x86 test image base x86_test-base: extends: x86_build-base variables: - MESA_IMAGE_TAG: &x86_test-base "2021-03-22-llvm11" + MESA_IMAGE_TAG: &x86_test-base "2021-03-22-bullseye" .use-x86_test-base: extends: @@ -409,25 +409,25 @@ x86_test-base: needs: - x86_test-base -# Debian 10 based x86 test image for GL +# Debian 11 based x86 test image for GL x86_test-gl: extends: .use-x86_test-base variables: - MESA_IMAGE_TAG: &x86_test-gl "2021-04-14-llvm11" + MESA_IMAGE_TAG: &x86_test-gl "2021-04-14-bullseye" -# Debian 10 based x86 test image for VK +# Debian 11 based x86 test image for VK x86_test-vk: extends: .use-x86_test-base variables: - MESA_IMAGE_TAG: &x86_test-vk "2021-04-13-vkglcts-1.2.6.0" + MESA_IMAGE_TAG: &x86_test-vk "2021-04-14-bullseye" -# Debian 10 based ARM build image +# Debian 11 based ARM build image arm_build: extends: - .fdo.container-build@debian@arm64v8 - .container variables: - MESA_IMAGE_TAG: &arm_build "2021-04-13-armhf-no-llvm" + MESA_IMAGE_TAG: &arm_build "2021-04-13-bullseye" .use-arm_build: extends: @@ -448,7 +448,7 @@ kernel+rootfs_arm64-baremetal: variables: DEBIAN_ARCH: "arm64" KERNEL_URL: "https://github.com/anholt/linux/archive/mesa-ci-2021-04-01-5.11.tar.gz" - MESA_ROOTFS_TAG: &arm-baremetal "2021-04-14-llvm11" + MESA_ROOTFS_TAG: &arm-baremetal "2021-04-14-bullseye" MINIO_SUFFIX: "baremetal" # Kernel & rootfs for armhf baremetal testing @@ -474,7 +474,7 @@ arm_test: FDO_DISTRIBUTION_EXEC: 'env ARTIFACTS_PREFIX=https://${MINIO_HOST}/mesa-lava ARTIFACTS_SUFFIX=baremetal/${MESA_ROOTFS_TAG}--${MESA_ARM_BUILD_TAG}--${MESA_TEMPLATES_COMMIT} CI_PROJECT_PATH=${CI_PROJECT_PATH} FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} FDO_UPSTREAM_REPO=${FDO_UPSTREAM_REPO} bash .gitlab-ci/container/${CI_JOB_NAME}.sh' FDO_DISTRIBUTION_TAG: "${MESA_IMAGE_TAG}--${MESA_ROOTFS_TAG}--${MESA_ARM_BUILD_TAG}--${MESA_TEMPLATES_COMMIT}" MESA_ARM_BUILD_TAG: *arm_build - MESA_IMAGE_TAG: &arm_test "2021-04-06-snmp" + MESA_IMAGE_TAG: &arm_test "2021-04-14-bullseye" MESA_ROOTFS_TAG: *arm-baremetal .use-arm_test: @@ -665,7 +665,6 @@ meson-clover-testing: - .ci-deqp-artifacts variables: UNWIND: "enabled" - LLVM_VERSION: 11 DRI_LOADERS: > -D glx=disabled -D egl=disabled @@ -797,7 +796,6 @@ meson-android: -D gallium-va=disabled -D gallium-xa=disabled -D gallium-nine=false - LLVM_VERSION: "8" .meson-arm: extends: @@ -873,8 +871,8 @@ meson-clang: DRI_DRIVERS: "auto" GALLIUM_DRIVERS: "iris,nouveau,kmsro,r300,r600,freedreno,swr,swrast,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,radeonsi,tegra,d3d12" VULKAN_DRIVERS: intel,amd,freedreno,broadcom,virtio-experimental - CC: "ccache clang-11" - CXX: "ccache clang++-11" + CC: clang + CXX: clang++ meson-windows-vs2019: extends: @@ -933,7 +931,6 @@ meson-clover: -D valgrind=false -D werror=true script: - - LLVM_VERSION=8 .gitlab-ci/meson/build.sh - LLVM_VERSION=9 .gitlab-ci/meson/build.sh - .gitlab-ci/meson/build.sh @@ -972,7 +969,6 @@ meson-i386: - .use-i386_build variables: CROSS: i386 - LLVM_VERSION: 11 VULKAN_DRIVERS: intel,amd,swrast,virtio-experimental GALLIUM_DRIVERS: "iris,nouveau,r300,r600,radeonsi,swrast,virgl,zink" DRI_DRIVERS: "i915,i965,r100,r200,nouveau" @@ -982,7 +978,7 @@ meson-i386: meson-s390x: extends: - - .meson-cross + - meson-ppc64el - .use-s390x_build tags: - kvm @@ -991,11 +987,13 @@ meson-s390x: EXTRA_OPTION: > -D werror=true GALLIUM_DRIVERS: "swrast,zink" + # The lp_test_blend test times out with LLVM 11 + LLVM_VERSION: 9 VULKAN_DRIVERS: "swrast" meson-ppc64el: extends: - - meson-s390x + - .meson-cross - .use-ppc64el_build variables: CROSS: ppc64el @@ -1175,7 +1173,7 @@ meson-mingw32-x86_64: .baremetal-arm64-asan-test: variables: - TEST_LD_PRELOAD: libasan.so.5 + TEST_LD_PRELOAD: libasan.so.6 MINIO_ARTIFACT_NAME: mesa-arm64-asan needs: - arm_test diff --git a/.gitlab-ci/container/arm_build.sh b/.gitlab-ci/container/arm_build.sh index 89a06c52806..34688a95633 100644 --- a/.gitlab-ci/container/arm_build.sh +++ b/.gitlab-ci/container/arm_build.sh @@ -5,7 +5,7 @@ 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=" @@ -15,7 +15,6 @@ EPHEMERAL=" apt-get -y install \ abootimg \ - android-sdk-ext4-utils \ autoconf \ automake \ bc \ @@ -28,7 +27,7 @@ apt-get -y install \ g++ \ git \ kmod \ - libasan5 \ + libasan6 \ libdrm-dev \ libelf-dev \ libexpat1-dev \ @@ -46,9 +45,10 @@ apt-get -y install \ libxrandr-dev \ libxshmfence-dev \ libxxf86vm-dev \ - llvm-8-dev \ + llvm-11-dev \ + meson \ pkg-config \ - python \ + python-is-python3 \ python3-aiohttp \ python3-jinja2 \ python3-mako \ @@ -68,10 +68,11 @@ apt-get -y install \ # Update lavacli to v1.1+ pip3 install git+https://git.lavasoftware.org/lava/lavacli@3db3ddc45e5358908bc6a17448059ea2340492b7 -pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@6f5af7e5574509726c79109e3c147cee95e81366 +# Not available anymore in bullseye +apt-get install -y --no-remove -t buster \ + android-sdk-ext4-utils -apt install -y --no-remove -t buster-backports \ - meson +pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@6f5af7e5574509726c79109e3c147cee95e81366 apt-get purge -y $EPHEMERAL diff --git a/.gitlab-ci/container/arm_test.sh b/.gitlab-ci/container/arm_test.sh index 9a53c8b6370..82744afd4db 100644 --- a/.gitlab-ci/container/arm_test.sh +++ b/.gitlab-ci/container/arm_test.sh @@ -15,10 +15,10 @@ apt-get install -y --no-remove \ netcat \ nginx-full \ procps \ + python-is-python3 \ python3-distutils \ python3-minimal \ python3-serial \ - python3.7 \ rsync \ snmp \ unzip \ @@ -34,3 +34,7 @@ wget https://raw.githubusercontent.com/net-snmp/net-snmp/master/mibs/SNMPv2-SMI. 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 diff --git a/.gitlab-ci/container/build-apitrace.sh b/.gitlab-ci/container/build-apitrace.sh deleted file mode 100644 index 78a633c6a43..00000000000 --- a/.gitlab-ci/container/build-apitrace.sh +++ /dev/null @@ -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 -S . -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 -S . -B _build -G Ninja -DCMAKE_BUILD_TYPE=Release -DENABLE_GUI=False -DENABLE_WAFFLE=on -DWaffle_DIR=/usr/local/lib/cmake/Waffle/ $EXTRA_CMAKE_ARGS -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 diff --git a/.gitlab-ci/container/build-fossilize.sh b/.gitlab-ci/container/build-fossilize.sh index 43a879e988e..2195c4bf570 100644 --- a/.gitlab-ci/container/build-fossilize.sh +++ b/.gitlab-ci/container/build-fossilize.sh @@ -4,7 +4,7 @@ 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 diff --git a/.gitlab-ci/container/build-libclc.sh b/.gitlab-ci/container/build-libclc.sh index 596a4c88bcf..d534f147d20 100644 --- a/.gitlab-ci/container/build-libclc.sh +++ b/.gitlab-ci/container/build-libclc.sh @@ -6,8 +6,10 @@ export LLVM_CONFIG="llvm-config-11" $LLVM_CONFIG --version -git clone https://github.com/KhronosGroup/SPIRV-LLVM-Translator -b llvm_release_110 --depth 1 /SPIRV-LLVM-Translator +git clone https://github.com/KhronosGroup/SPIRV-LLVM-Translator -b llvm_release_110 --single-branch --shallow-since=2020-11-12 /SPIRV-LLVM-Translator pushd /SPIRV-LLVM-Translator +# Last commit before bumping required LLVM version to 11.1.0 +git checkout 93032d36d2fe17befb7994714c07c67ea68efbea cmake -S . -B . -G Ninja -DLLVM_BUILD_TOOLS=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS=-fPIC -DCMAKE_CXX_FLAGS=-fPIC -DCMAKE_INSTALL_PREFIX=`$LLVM_CONFIG --prefix` ninja ninja install diff --git a/.gitlab-ci/container/create-rootfs.sh b/.gitlab-ci/container/create-rootfs.sh index ab4fc33795e..5fb7f1a092d 100644 --- a/.gitlab-ci/container/create-rootfs.sh +++ b/.gitlab-ci/container/create-rootfs.sh @@ -5,12 +5,6 @@ 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-11 main" >/etc/apt/sources.list.d/llvm11.list - apt-get update - ARCH_PACKAGES="firmware-amd-graphics libelf1 libllvm11 @@ -27,13 +21,15 @@ INSTALL_CI_FAIRY_PACKAGES="git apt-get -y install --no-install-recommends \ $ARCH_PACKAGES \ $INSTALL_CI_FAIRY_PACKAGES \ + apitrace \ ca-certificates \ curl \ + firmware-realtek \ initramfs-tools \ - libasan5 \ + libasan6 \ libexpat1 \ libpng16-16 \ - libpython3.7 \ + libpython3.9 \ libsensors5 \ libvulkan1 \ libwaffle-1-0 \ @@ -66,6 +62,7 @@ apt-get -y install --no-install-recommends \ python3-yaml \ sntp \ strace \ + waffle-utils \ wget \ xinit \ xserver-xorg-core \ @@ -88,9 +85,6 @@ 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. @@ -103,10 +97,9 @@ find /lib/firmware -type f -print0 | \ 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 @@ -184,7 +177,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} @@ -220,8 +212,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 diff --git a/.gitlab-ci/container/cross_build.sh b/.gitlab-ci/container/cross_build.sh index c3831c80dda..29706fb737a 100644 --- a/.gitlab-ci/container/cross_build.sh +++ b/.gitlab-ci/container/cross_build.sh @@ -17,10 +17,8 @@ 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 \ @@ -39,8 +37,23 @@ apt-get install -y --no-remove \ wget if [[ $arch != "armhf" ]]; then - apt-get install -y --no-remove -t buster-backports \ - llvm-8-dev:$arch + 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 . .gitlab-ci/container/create-cross-file.sh $arch @@ -57,3 +70,10 @@ 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 diff --git a/.gitlab-ci/container/lava_build.sh b/.gitlab-ci/container/lava_build.sh index ef6e0593b25..079321181cd 100755 --- a/.gitlab-ci/container/lava_build.sh +++ b/.gitlab-ci/container/lava_build.sh @@ -3,6 +3,8 @@ set -e set -o xtrace +export DEBIAN_FRONTEND=noninteractive + check_minio() { MINIO_PATH="${MINIO_HOST}/mesa-lava/$1/${MINIO_SUFFIX}/${DISTRIBUTION_TAG}/${DEBIAN_ARCH}" @@ -65,7 +67,8 @@ if [[ -e /cross_file-$DEBIAN_ARCH.txt ]]; then fi apt-get update -apt-get install -y automake \ +apt-get install -y --no-remove \ + automake \ bc \ cmake \ debootstrap \ @@ -75,11 +78,13 @@ apt-get install -y automake \ libgbm-dev \ libgles2-mesa-dev \ libpcre3-dev \ - libpng-dev \ libpython3-dev \ libssl-dev \ + libudev-dev \ libvulkan-dev \ libwaffle-dev \ + libwayland-dev \ + libx11-xcb-dev \ libxcb-keysyms1-dev \ libxkbcommon-dev \ patch \ @@ -88,23 +93,25 @@ apt-get install -y automake \ 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 \ + apt-get install -y --no-remove \ + 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 \ + libudev-dev:armhf \ libvulkan-dev:armhf \ libwaffle-dev:armhf \ + libwayland-dev:armhf \ + libx11-xcb-dev:armhf \ libxcb-keysyms1-dev:armhf \ libxkbcommon-dev:armhf \ qtbase5-dev:armhf @@ -134,17 +141,6 @@ mv /deqp /lava-files/rootfs-${DEBIAN_ARCH}/. mv /piglit /lava-files/rootfs-${DEBIAN_ARCH}/. -############### Build apitrace -. .gitlab-ci/container/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/container/build-renderdoc.sh @@ -215,22 +211,21 @@ rm -rf /root/.rustup /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/container/create-rootfs.sh /lava-files/rootfs-${DEBIAN_ARCH}/. -cp .gitlab-ci/container/llvm-snapshot.gpg.key /lava-files/rootfs-${DEBIAN_ARCH}/. chroot /lava-files/rootfs-${DEBIAN_ARCH} sh /create-rootfs.sh rm /lava-files/rootfs-${DEBIAN_ARCH}/create-rootfs.sh -rm /lava-files/rootfs-${DEBIAN_ARCH}/llvm-snapshot.gpg.key ############### Install the built libdrm @@ -246,12 +241,6 @@ if [ ${DEBIAN_ARCH} = arm64 ] && [ ${MINIO_SUFFIX} = baremetal ]; then # Make a gzipped copy of the Image for db410c. gzip -k /lava-files/Image KERNEL_IMAGE_NAME+=" Image.gz" - - # 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 fi du -ah /lava-files/rootfs-${DEBIAN_ARCH} | sort -h | tail -100 diff --git a/.gitlab-ci/container/llvm-snapshot.gpg.key b/.gitlab-ci/container/llvm-snapshot.gpg.key deleted file mode 100644 index aa6b105aa3d..00000000000 --- a/.gitlab-ci/container/llvm-snapshot.gpg.key +++ /dev/null @@ -1,52 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.12 (GNU/Linux) - -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 -bXb5c6gCHESH5PXwPU4jQEE7Ib9J6sbk7ZT2Mw== -=j+4q ------END PGP PUBLIC KEY BLOCK----- diff --git a/.gitlab-ci/container/x86_build-base.sh b/.gitlab-ci/container/x86_build-base.sh index 61017cde904..ed815067b7f 100644 --- a/.gitlab-ci/container/x86_build-base.sh +++ b/.gitlab-ci/container/x86_build-base.sh @@ -5,17 +5,9 @@ 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-11 main" >/etc/apt/sources.list.d/llvm11.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) @@ -31,7 +23,6 @@ apt-get install -y --no-remove \ $STABLE_EPHEMERAL \ bison \ ccache \ - clang-11 \ dpkg-cross \ flex \ g++ \ @@ -47,6 +38,7 @@ apt-get install -y --no-remove \ libexpat1-dev \ libgtk-3-dev \ libllvm11 \ + libllvm9 \ libomxil-bellagio-dev \ libpciaccess-dev \ libunwind-dev \ @@ -63,27 +55,24 @@ apt-get install -y --no-remove \ libxvmc-dev \ libxxf86vm-dev \ libz-mingw-w64-dev \ - llvm-9-dev \ + make \ + meson \ pkg-config \ - python-mako \ + python-is-python3 \ python3-mako \ python3-pil \ python3-requests \ qemu-user \ valgrind \ + wayland-protocols \ wget \ - wine64-development \ + 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 @@ -96,8 +85,6 @@ rm bin/glslangValidator glslang-master-linux-Release.zip ############### Uninstall ephemeral packages -apt-get purge -y \ - $STABLE_EPHEMERAL \ - gnupg +apt-get purge -y $STABLE_EPHEMERAL . .gitlab-ci/container/container_post_build.sh diff --git a/.gitlab-ci/container/x86_build.sh b/.gitlab-ci/container/x86_build.sh index 462a974698f..9fc58447934 100644 --- a/.gitlab-ci/container/x86_build.sh +++ b/.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,21 +23,29 @@ apt-get update apt-get install -y --no-remove \ $STABLE_EPHEMERAL \ - libasan5 \ + clang \ + libasan6 \ libarchive-dev \ libclang-cpp11-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 \ procps \ strace \ time \ - wine-development \ - wine32-development - -apt-get install -y --no-remove -t buster-backports \ - llvm-8-dev + wine \ + wine32 . .gitlab-ci/container/container_pre_build.sh @@ -59,30 +64,16 @@ 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.18.0 -export WAYLAND_PROTOCOLS_VERSION=wayland-protocols-1.12 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/container/build-libdrm.sh wget $WAYLAND_RELEASES/$LIBWAYLAND_VERSION.tar.xz @@ -90,11 +81,6 @@ 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: @@ -107,8 +93,10 @@ rm -rf libglvnd-v$GLVND_VERSION . .gitlab-ci/container/build-spirv-tools.sh -git clone https://github.com/KhronosGroup/SPIRV-LLVM-Translator -b llvm_release_110 --depth 1 +git clone https://github.com/KhronosGroup/SPIRV-LLVM-Translator -b llvm_release_110 --single-branch --shallow-since=2020-11-12 pushd SPIRV-LLVM-Translator +# Last commit before bumping required LLVM version to 11.1.0 +git checkout 93032d36d2fe17befb7994714c07c67ea68efbea cmake -S . -B . -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS=-fPIC -DCMAKE_CXX_FLAGS=-fPIC ninja ninja install diff --git a/.gitlab-ci/container/x86_test-base.sh b/.gitlab-ci/container/x86_test-base.sh index c1e2e467f4d..d0c3f1a05f4 100644 --- a/.gitlab-ci/container/x86_test-base.sh +++ b/.gitlab-ci/container/x86_test-base.sh @@ -5,17 +5,9 @@ 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-11 main" >/etc/apt/sources.list.d/llvm11.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) @@ -32,14 +24,14 @@ apt-get dist-upgrade -y apt-get install -y --no-remove \ git \ git-lfs \ - libasan5 \ + libasan6 \ libexpat1 \ libllvm11 \ libllvm9 \ liblz4-1 \ libpcre32-3 \ libpng16-16 \ - libpython3.7 \ + libpython3.9 \ libvulkan1 \ libwayland-client0 \ libwayland-server0 \ @@ -50,7 +42,7 @@ apt-get install -y --no-remove \ libxkbcommon0 \ libxrandr2 \ libxrender1 \ - python \ + python-is-python3 \ python3-mako \ python3-numpy \ python3-packaging \ @@ -58,8 +50,7 @@ apt-get install -y --no-remove \ python3-requests \ python3-six \ python3-yaml \ - python3.7 \ - qt5-default \ + qtbase5-dev \ qt5-qmake \ vulkan-tools \ waffle-utils \ @@ -74,8 +65,6 @@ apt-get install -y --no-install-recommends \ # and doesn't depend on git pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@0f1abc24c043e63894085a6bd12f14263e8b29eb -apt-get purge -y \ - $STABLE_EPHEMERAL \ - gnupg +apt-get purge -y $STABLE_EPHEMERAL apt-get autoremove -y --purge diff --git a/.gitlab-ci/container/x86_test-gl.sh b/.gitlab-ci/container/x86_test-gl.sh index fa53f910626..4149a82eee0 100644 --- a/.gitlab-ci/container/x86_test-gl.sh +++ b/.gitlab-ci/container/x86_test-gl.sh @@ -18,9 +18,11 @@ STABLE_EPHEMERAL=" \ libgles2-mesa-dev \ libpcre3-dev \ libpciaccess-dev \ - libpng-dev \ + libudev-dev \ libvulkan-dev \ libwaffle-dev \ + libwayland-dev \ + libx11-xcb-dev \ libxcb-keysyms1-dev \ libxkbcommon-dev \ libxrender-dev \ @@ -31,13 +33,14 @@ STABLE_EPHEMERAL=" \ patch \ pkg-config \ python3-distutils \ - python3.7-dev \ + python3-dev \ wget \ xz-utils \ " apt-get install -y --no-remove \ $STABLE_EPHEMERAL \ + apitrace \ clinfo \ libclang-common-11-dev \ libclang-cpp11 \ @@ -50,6 +53,10 @@ apt-get install -y --no-remove \ . .gitlab-ci/container/container_pre_build.sh +############### Build libdrm + +. .gitlab-ci/container/build-libdrm.sh + ############### Build spirv-tools (debian too old) . .gitlab-ci/container/build-spirv-tools.sh @@ -75,18 +82,10 @@ rm -rf /root/.rustup /root/.cargo DEQP_TARGET=surfaceless . .gitlab-ci/container/build-deqp.sh -############### Build apitrace - -. .gitlab-ci/container/build-apitrace.sh - ############### Build renderdoc . .gitlab-ci/container/build-renderdoc.sh -############### Build libdrm - -. .gitlab-ci/container/build-libdrm.sh - ############### Uninstall the build software ccache --show-stats diff --git a/.gitlab-ci/container/x86_test-vk.sh b/.gitlab-ci/container/x86_test-vk.sh index 7d41fa78c75..7274a2ba563 100644 --- a/.gitlab-ci/container/x86_test-vk.sh +++ b/.gitlab-ci/container/x86_test-vk.sh @@ -14,9 +14,11 @@ STABLE_EPHEMERAL=" \ libgles2-mesa-dev \ liblz4-dev \ libpciaccess-dev \ - libpng-dev \ + libudev-dev \ libvulkan-dev \ libwaffle-dev \ + libwayland-dev \ + libx11-xcb-dev \ libxcb-ewmh-dev \ libxcb-keysyms1-dev \ libxkbcommon-dev \ @@ -77,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 diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml index aa9573f4f59..b6f9283804f 100644 --- a/.gitlab-ci/lava-gitlab-ci.yml +++ b/.gitlab-ci/lava-gitlab-ci.yml @@ -14,7 +14,7 @@ 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-llvm11" + MESA_ROOTFS_TAG: &lava-rootfs "2021-04-14-bullseye" MINIO_SUFFIX: "lava" PIGLIT_BUILD_TARGETS: "piglit_replayer" diff --git a/.gitlab-ci/lava.yml.jinja2 b/.gitlab-ci/lava.yml.jinja2 index cee4529c306..a36c1392447 100644 --- a/.gitlab-ci/lava.yml.jinja2 +++ b/.gitlab-ci/lava.yml.jinja2 @@ -72,6 +72,8 @@ actions: - 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 diff --git a/.gitlab-ci/piglit/run.sh b/.gitlab-ci/piglit/run.sh index 6bc3fc9ed94..a7b49a91d21 100755 --- a/.gitlab-ci/piglit/run.sh +++ b/.gitlab-ci/piglit/run.sh @@ -74,12 +74,6 @@ else # Set up the platform windowing system. - # Set environment for the waffle library. - export __LD_LIBRARY_PATH="/waffle/build/lib:$__LD_LIBRARY_PATH" - - # Set environment for wflinfo executable. - export PATH="/waffle/build/bin:$PATH" - if [ "x$EGL_PLATFORM" = "xsurfaceless" ]; then # Use the surfaceless EGL platform. diff --git a/src/broadcom/ci/piglit-v3d-rpi4-fails.txt b/src/broadcom/ci/piglit-v3d-rpi4-fails.txt index b0d74801f4d..8995547e124 100644 --- a/src/broadcom/ci/piglit-v3d-rpi4-fails.txt +++ b/src/broadcom/ci/piglit-v3d-rpi4-fails.txt @@ -1,5 +1,4 @@ glx@glx-multithread-buffer,Fail -glx@glx-query-drawable-glx_fbconfig_id-window,Fail glx@glx-swap-pixmap-bad,Fail glx@glx-visuals-depth -pixmap,Crash glx@glx-visuals-stencil -pixmap,Crash diff --git a/src/broadcom/ci/piglit-vc4-rpi3-fails.txt b/src/broadcom/ci/piglit-vc4-rpi3-fails.txt index 6ba0bebdfe9..9aa0d544836 100644 --- a/src/broadcom/ci/piglit-vc4-rpi3-fails.txt +++ b/src/broadcom/ci/piglit-vc4-rpi3-fails.txt @@ -6,7 +6,6 @@ glx@glx-copy-sub-buffer samples=2,Crash glx@glx-copy-sub-buffer samples=4,Crash glx@glx-multithread-buffer,Fail glx@glx-multithread-texture,Timeout -glx@glx-query-drawable-glx_fbconfig_id-window,Fail glx@glx-swap-pixmap-bad,Fail glx@glx-visuals-depth -pixmap,Crash glx@glx-visuals-depth,Crash diff --git a/src/freedreno/ci/deqp-freedreno-a630-fails.txt b/src/freedreno/ci/deqp-freedreno-a630-fails.txt index 26e827a2fd8..f3639f35712 100644 --- a/src/freedreno/ci/deqp-freedreno-a630-fails.txt +++ b/src/freedreno/ci/deqp-freedreno-a630-fails.txt @@ -11,8 +11,13 @@ dEQP-VK.api.command_buffers.record_many_draws_secondary_2,Fail dEQP-VK.api.copy_and_blit.core.resolve_image.whole_array_image_one_region.4_bit,Fail dEQP-VK.api.copy_and_blit.core.resolve_image.whole_copy_before_resolving.4_bit,Fail dEQP-VK.api.device_init.create_instance_device_intentional_alloc_fail,Fail +dEQP-VK.api.driver_properties.conformance_version,Fail +dEQP-VK.api.driver_properties.driver_id_match,Fail dEQP-VK.api.info.format_properties.g8b8g8r8_422_unorm,Fail +dEQP-VK.api.info.get_physical_device_properties2.features,Fail dEQP-VK.api.info.get_physical_device_properties2.memory_properties,Fail +dEQP-VK.api.info.vulkan1p2.property_extensions_consistency,Fail +dEQP-VK.api.info.vulkan1p2_limits_validation.khr_multiview,Fail dEQP-VK.compute.basic.max_local_size_x,Crash dEQP-VK.compute.basic.max_local_size_y,Crash dEQP-VK.draw.shader_viewport_index.fragment_shader_10,Fail @@ -49,6 +54,11 @@ dEQP-VK.glsl.atomic_operations.or_signed_geometry,Fail dEQP-VK.glsl.atomic_operations.or_unsigned_geometry,Fail dEQP-VK.glsl.atomic_operations.xor_signed_geometry,Fail dEQP-VK.glsl.atomic_operations.xor_unsigned_geometry,Fail +dEQP-VK.image.extend_operands_spirv1p4.r16_sint_relaxed_force_sign_extend,Fail +dEQP-VK.image.extend_operands_spirv1p4.r16g16_sint_relaxed_force_sign_extend,Fail +dEQP-VK.image.extend_operands_spirv1p4.r32g32_sint_force_sign_extend,Fail +dEQP-VK.image.extend_operands_spirv1p4.r8_sint_relaxed_force_sign_extend,Fail +dEQP-VK.image.extend_operands_spirv1p4.r8g8_sint_relaxed_force_sign_extend,Fail dEQP-VK.image.subresource_layout.2d.1_level.b8g8r8a8_snorm,Fail dEQP-VK.image.subresource_layout.2d.1_level.r16g16_snorm,Fail dEQP-VK.image.subresource_layout.2d.1_level.r8_snorm,Fail @@ -118,6 +128,7 @@ dEQP-VK.image.subresource_layout.3d.all_levels.r16g16_snorm,Fail dEQP-VK.image.subresource_layout.3d.all_levels.r16g16b16a16_snorm,Fail dEQP-VK.image.subresource_layout.3d.all_levels.r8_snorm,Fail dEQP-VK.image.subresource_layout.3d.all_levels.r8g8b8a8_snorm,Fail +dEQP-VK.info.device_mandatory_features,Fail dEQP-VK.memory_model.message_passing.core11.u32.coherent.fence_fence.atomicwrite.device.payload_local.image.guard_nonlocal.workgroup.comp,Fail dEQP-VK.memory_model.message_passing.core11.u32.coherent.fence_fence.atomicwrite.device.payload_nonlocal.workgroup.guard_local.image.comp,Fail dEQP-VK.pipeline.extended_dynamic_state.after_pipelines.depth_compare_always_greater,Fail @@ -145,12 +156,27 @@ dEQP-VK.renderpass.suballocation.subpass_dependencies.implicit_dependencies.rend dEQP-VK.renderpass2.dedicated_allocation.attachment_allocation.input_output.7,Fail dEQP-VK.renderpass2.suballocation.attachment_allocation.input_output.7,Fail dEQP-VK.spirv_assembly.instruction.compute.float16.opvectorshuffle.344,Crash +dEQP-VK.spirv_assembly.instruction.compute.float_controls.fp32.input_args.denorm_clamp_denorm_preserve,Fail +dEQP-VK.spirv_assembly.instruction.compute.float_controls.fp32.input_args.rounding_rtz_dot,Fail +dEQP-VK.spirv_assembly.instruction.compute.float_controls.fp32.input_args.rounding_rtz_mmulm,Fail +dEQP-VK.spirv_assembly.instruction.compute.float_controls.fp32.input_args.rounding_rtz_mmuls,Fail +dEQP-VK.spirv_assembly.instruction.compute.float_controls.fp32.input_args.rounding_rtz_sub,Fail +dEQP-VK.spirv_assembly.instruction.compute.float_controls.fp32.input_args.rounding_rtz_vmulm,Fail +dEQP-VK.spirv_assembly.instruction.compute.float_controls.fp32.input_args.sign_denorm_preserve,Fail dEQP-VK.spirv_assembly.instruction.compute.opcopymemory.array,Fail dEQP-VK.spirv_assembly.instruction.compute.opquantize.infinities,Fail dEQP-VK.spirv_assembly.instruction.graphics.float16.opvectorshuffle.244_tessc,Crash dEQP-VK.spirv_assembly.instruction.graphics.float16.opvectorshuffle.344_frag,Crash dEQP-VK.spirv_assembly.instruction.graphics.float16.opvectorshuffle.344_vert,Crash dEQP-VK.spirv_assembly.instruction.graphics.float16.opvectorshuffle.444_geom,Crash +dEQP-VK.spirv_assembly.instruction.graphics.float_controls.fp32.input_args.abs_denorm_preserve_frag,Fail +dEQP-VK.spirv_assembly.instruction.graphics.float_controls.fp32.input_args.abs_denorm_preserve_vert,Fail +dEQP-VK.spirv_assembly.instruction.graphics.float_controls.fp32.input_args.denorm_nclamp_denorm_preserve_frag,Fail +dEQP-VK.spirv_assembly.instruction.graphics.float_controls.fp32.input_args.denorm_nclamp_denorm_preserve_vert,Fail +dEQP-VK.spirv_assembly.instruction.graphics.float_controls.fp32.input_args.denorm_nmax_denorm_preserve_frag,Fail +dEQP-VK.spirv_assembly.instruction.graphics.float_controls.fp32.input_args.denorm_nmax_denorm_preserve_vert,Fail +dEQP-VK.spirv_assembly.instruction.graphics.float_controls.fp32.input_args.denorm_nmin_denorm_preserve_frag,Fail +dEQP-VK.spirv_assembly.instruction.graphics.float_controls.fp32.input_args.denorm_nmin_denorm_preserve_vert,Fail dEQP-VK.spirv_assembly.instruction.graphics.opquantize.carry_bit_geom,Fail dEQP-VK.spirv_assembly.instruction.graphics.opquantize.carry_bit_tessc,Fail dEQP-VK.spirv_assembly.instruction.graphics.opquantize.carry_to_exponent_frag,Fail diff --git a/src/gallium/drivers/freedreno/ci/piglit-freedreno-a530-fails.txt b/src/gallium/drivers/freedreno/ci/piglit-freedreno-a530-fails.txt index d3d2de567d8..69239996ffc 100644 --- a/src/gallium/drivers/freedreno/ci/piglit-freedreno-a530-fails.txt +++ b/src/gallium/drivers/freedreno/ci/piglit-freedreno-a530-fails.txt @@ -1,6 +1,5 @@ fast_color_clear@fcc-read-after-clear copy rb,Fail fast_color_clear@fcc-read-after-clear copy tex,Fail -glx@glx-query-drawable-glx_fbconfig_id-window,Fail glx@glx-swap-pixmap-bad,Fail glx@glx-visuals-depth -pixmap,Crash glx@glx-visuals-stencil -pixmap,Crash diff --git a/src/gallium/drivers/freedreno/ci/piglit-freedreno-a630-fails.txt b/src/gallium/drivers/freedreno/ci/piglit-freedreno-a630-fails.txt index 9b6686bab86..4739beb25a8 100644 --- a/src/gallium/drivers/freedreno/ci/piglit-freedreno-a630-fails.txt +++ b/src/gallium/drivers/freedreno/ci/piglit-freedreno-a630-fails.txt @@ -1,7 +1,6 @@ glx@glx_arb_sync_control@timing -fullscreen -msc-delta 1,Fail glx@glx_arb_sync_control@timing -waitformsc -msc-delta 2,Fail glx@glx-copy-sub-buffer samples=2,Fail -glx@glx-query-drawable-glx_fbconfig_id-window,Fail glx@glx-swap-pixmap-bad,Fail glx@glx-visuals-depth -pixmap,Crash glx@glx-visuals-stencil -pixmap,Crash diff --git a/src/gallium/drivers/llvmpipe/ci/llvmpipe-cl.txt b/src/gallium/drivers/llvmpipe/ci/llvmpipe-cl.txt index 9acabaa4d44..8f16479afaa 100644 --- a/src/gallium/drivers/llvmpipe/ci/llvmpipe-cl.txt +++ b/src/gallium/drivers/llvmpipe/ci/llvmpipe-cl.txt @@ -9,6 +9,7 @@ api/cllinkprogram: skip api/clsetkernelarg/set kernel argument for cl_int3: fail interop/egl_khr_cl_event2: skip program/build/include-directories: fail +program/build/math-intrinsics: fail program/build/printf: skip program/check predefined preprocessor macros/__opencl_c_version__ must be consistent with host (if defined): skip program/check predefined preprocessor macros/__opencl_c_version__ must be defined for opencl 1.2 and later: skip @@ -16,7 +17,7 @@ program/check predefined preprocessor macros/cl_version_1_2 must be defined for program/check predefined preprocessor macros/cl_version_2_0 must be defined for opencl 2.0 and later: skip program/execute/amdgcn-callee-saved-registers: skip program/execute/amdgcn-f16-inline-immediates: skip -program/execute/amdgcn-f32-inline-immediates/add integer 64: fail +program/execute/amdgcn-f32-inline-immediates: fail program/execute/amdgcn-i16-inline-immediates: skip program/execute/atomic_int64_add-global: skip program/execute/atomic_int64_add-global-return: skip @@ -72,6 +73,7 @@ program/execute/call-clobbers-amdgcn: skip program/execute/calls-large-struct: crash program/execute/calls-struct/regs struct: fail program/execute/calls-struct/small struct in regs: fail +program/execute/fdiv-modifiers-f32: fail program/execute/global-offset/3d, input dependent: fail program/execute/image-attributes: crash program/execute/image-read-2d/read float from cl_float cl_rgba image.: fail diff --git a/src/gallium/drivers/llvmpipe/ci/llvmpipe-quick_gl.txt b/src/gallium/drivers/llvmpipe/ci/llvmpipe-quick_gl.txt index d2273d2cc93..ef19243aaf6 100644 --- a/src/gallium/drivers/llvmpipe/ci/llvmpipe-quick_gl.txt +++ b/src/gallium/drivers/llvmpipe/ci/llvmpipe-quick_gl.txt @@ -4,9 +4,9 @@ glx/glx-buffer-age: skip glx/glx-buffer-age vblank_mode=0: skip glx/glx-copy-sub-buffer: fail glx/glx-copy-sub-buffer samples=16: skip -glx/glx-copy-sub-buffer samples=2: skip +glx/glx-copy-sub-buffer samples=2: fail glx/glx-copy-sub-buffer samples=32: skip -glx/glx-copy-sub-buffer samples=4: skip +glx/glx-copy-sub-buffer samples=4: fail glx/glx-copy-sub-buffer samples=6: skip glx/glx-copy-sub-buffer samples=8: skip glx/glx-multithread-makecurrent-1: skip @@ -14,7 +14,6 @@ glx/glx-multithread-makecurrent-2: skip glx/glx-multithread-makecurrent-3: skip glx/glx-multithread-makecurrent-4: skip glx/glx-multithread-texture: fail -glx/glx-query-drawable-glx_fbconfig_id-window: fail glx/glx-swap-copy: fail glx/glx-swap-event_async: skip glx/glx-swap-event_event: skip @@ -98,57 +97,39 @@ spec/!opengl 1.0/rasterpos/glsl_vs_ssbo: skip spec/!opengl 1.0/rasterpos/glsl_vs_tes_linked: skip spec/!opengl 1.0/rasterpos/glsl_vs_tes_sso: skip spec/!opengl 1.1/depthstencil-default_fb-blit samples=16: skip -spec/!opengl 1.1/depthstencil-default_fb-blit samples=2: skip spec/!opengl 1.1/depthstencil-default_fb-blit samples=32: skip -spec/!opengl 1.1/depthstencil-default_fb-blit samples=4: skip spec/!opengl 1.1/depthstencil-default_fb-blit samples=6: skip spec/!opengl 1.1/depthstencil-default_fb-blit samples=8: skip spec/!opengl 1.1/depthstencil-default_fb-clear samples=16: skip -spec/!opengl 1.1/depthstencil-default_fb-clear samples=2: skip spec/!opengl 1.1/depthstencil-default_fb-clear samples=32: skip -spec/!opengl 1.1/depthstencil-default_fb-clear samples=4: skip spec/!opengl 1.1/depthstencil-default_fb-clear samples=6: skip spec/!opengl 1.1/depthstencil-default_fb-clear samples=8: skip spec/!opengl 1.1/depthstencil-default_fb-copypixels samples=16: skip -spec/!opengl 1.1/depthstencil-default_fb-copypixels samples=2: skip spec/!opengl 1.1/depthstencil-default_fb-copypixels samples=32: skip -spec/!opengl 1.1/depthstencil-default_fb-copypixels samples=4: skip spec/!opengl 1.1/depthstencil-default_fb-copypixels samples=6: skip spec/!opengl 1.1/depthstencil-default_fb-copypixels samples=8: skip spec/!opengl 1.1/depthstencil-default_fb-drawpixels-24_8 samples=16: skip -spec/!opengl 1.1/depthstencil-default_fb-drawpixels-24_8 samples=2: skip spec/!opengl 1.1/depthstencil-default_fb-drawpixels-24_8 samples=32: skip -spec/!opengl 1.1/depthstencil-default_fb-drawpixels-24_8 samples=4: skip spec/!opengl 1.1/depthstencil-default_fb-drawpixels-24_8 samples=6: skip spec/!opengl 1.1/depthstencil-default_fb-drawpixels-24_8 samples=8: skip spec/!opengl 1.1/depthstencil-default_fb-drawpixels-32f_24_8_rev samples=16: skip -spec/!opengl 1.1/depthstencil-default_fb-drawpixels-32f_24_8_rev samples=2: skip spec/!opengl 1.1/depthstencil-default_fb-drawpixels-32f_24_8_rev samples=32: skip -spec/!opengl 1.1/depthstencil-default_fb-drawpixels-32f_24_8_rev samples=4: skip spec/!opengl 1.1/depthstencil-default_fb-drawpixels-32f_24_8_rev samples=6: skip spec/!opengl 1.1/depthstencil-default_fb-drawpixels-32f_24_8_rev samples=8: skip spec/!opengl 1.1/depthstencil-default_fb-drawpixels-float-and-ushort samples=16: skip -spec/!opengl 1.1/depthstencil-default_fb-drawpixels-float-and-ushort samples=2: skip spec/!opengl 1.1/depthstencil-default_fb-drawpixels-float-and-ushort samples=32: skip -spec/!opengl 1.1/depthstencil-default_fb-drawpixels-float-and-ushort samples=4: skip spec/!opengl 1.1/depthstencil-default_fb-drawpixels-float-and-ushort samples=6: skip spec/!opengl 1.1/depthstencil-default_fb-drawpixels-float-and-ushort samples=8: skip spec/!opengl 1.1/depthstencil-default_fb-readpixels-24_8 samples=16: skip -spec/!opengl 1.1/depthstencil-default_fb-readpixels-24_8 samples=2: skip spec/!opengl 1.1/depthstencil-default_fb-readpixels-24_8 samples=32: skip -spec/!opengl 1.1/depthstencil-default_fb-readpixels-24_8 samples=4: skip spec/!opengl 1.1/depthstencil-default_fb-readpixels-24_8 samples=6: skip spec/!opengl 1.1/depthstencil-default_fb-readpixels-24_8 samples=8: skip spec/!opengl 1.1/depthstencil-default_fb-readpixels-32f_24_8_rev samples=16: skip -spec/!opengl 1.1/depthstencil-default_fb-readpixels-32f_24_8_rev samples=2: skip spec/!opengl 1.1/depthstencil-default_fb-readpixels-32f_24_8_rev samples=32: skip -spec/!opengl 1.1/depthstencil-default_fb-readpixels-32f_24_8_rev samples=4: skip spec/!opengl 1.1/depthstencil-default_fb-readpixels-32f_24_8_rev samples=6: skip spec/!opengl 1.1/depthstencil-default_fb-readpixels-32f_24_8_rev samples=8: skip spec/!opengl 1.1/depthstencil-default_fb-readpixels-float-and-ushort samples=16: skip -spec/!opengl 1.1/depthstencil-default_fb-readpixels-float-and-ushort samples=2: skip spec/!opengl 1.1/depthstencil-default_fb-readpixels-float-and-ushort samples=32: skip -spec/!opengl 1.1/depthstencil-default_fb-readpixels-float-and-ushort samples=4: skip spec/!opengl 1.1/depthstencil-default_fb-readpixels-float-and-ushort samples=6: skip spec/!opengl 1.1/depthstencil-default_fb-readpixels-float-and-ushort samples=8: skip spec/!opengl 1.1/draw-pixels samples=16: skip @@ -174,15 +155,15 @@ spec/!opengl 1.1/polygon-mode-offset/config 4: expected white pixel on top edge: spec/!opengl 1.1/read-front: fail spec/!opengl 1.1/read-front clear-front-first: fail spec/!opengl 1.1/read-front clear-front-first samples=16: skip -spec/!opengl 1.1/read-front clear-front-first samples=2: skip +spec/!opengl 1.1/read-front clear-front-first samples=2: fail spec/!opengl 1.1/read-front clear-front-first samples=32: skip -spec/!opengl 1.1/read-front clear-front-first samples=4: skip +spec/!opengl 1.1/read-front clear-front-first samples=4: fail spec/!opengl 1.1/read-front clear-front-first samples=6: skip spec/!opengl 1.1/read-front clear-front-first samples=8: skip spec/!opengl 1.1/read-front samples=16: skip -spec/!opengl 1.1/read-front samples=2: skip +spec/!opengl 1.1/read-front samples=2: fail spec/!opengl 1.1/read-front samples=32: skip -spec/!opengl 1.1/read-front samples=4: skip +spec/!opengl 1.1/read-front samples=4: fail spec/!opengl 1.1/read-front samples=6: skip spec/!opengl 1.1/read-front samples=8: skip spec/!opengl 1.1/teximage-colors gl_alpha12/exact upload-download of gl_alpha12: skip @@ -734,9 +715,9 @@ spec/arb_sparse_buffer/minmax: skip spec/arb_tessellation_shader/arb_tessellation_shader-immediate-mode-draw-patches: skip spec/arb_texture_buffer_object/negative-unsupported: skip spec/arb_texture_cube_map/copyteximage cube samples=16: skip -spec/arb_texture_cube_map/copyteximage cube samples=2: skip +spec/arb_texture_cube_map/copyteximage cube samples=2: fail spec/arb_texture_cube_map/copyteximage cube samples=32: skip -spec/arb_texture_cube_map/copyteximage cube samples=4: skip +spec/arb_texture_cube_map/copyteximage cube samples=4: fail spec/arb_texture_cube_map/copyteximage cube samples=6: skip spec/arb_texture_cube_map/copyteximage cube samples=8: skip spec/arb_texture_float/multisample-formats 16 gl_arb_texture_float: skip @@ -830,9 +811,9 @@ spec/arb_texture_multisample/texelfetch/8-vs-sampler2dmsarray: skip spec/arb_texture_multisample/texelfetch/8-vs-usampler2dms: skip spec/arb_texture_multisample/texelfetch/8-vs-usampler2dmsarray: skip spec/arb_texture_rectangle/copyteximage rect samples=16: skip -spec/arb_texture_rectangle/copyteximage rect samples=2: skip +spec/arb_texture_rectangle/copyteximage rect samples=2: fail spec/arb_texture_rectangle/copyteximage rect samples=32: skip -spec/arb_texture_rectangle/copyteximage rect samples=4: skip +spec/arb_texture_rectangle/copyteximage rect samples=4: fail spec/arb_texture_rectangle/copyteximage rect samples=6: skip spec/arb_texture_rectangle/copyteximage rect samples=8: skip spec/arb_texture_rg/multisample-formats 16 gl_arb_texture_rg: skip @@ -1448,15 +1429,15 @@ spec/ext_shader_samples_identical/ext_shader_samples_identical-simple-fs 4: skip spec/ext_shader_samples_identical/ext_shader_samples_identical-simple-fs 6: skip spec/ext_shader_samples_identical/ext_shader_samples_identical-simple-fs 8: skip spec/ext_texture_array/copyteximage 1d_array samples=16: skip -spec/ext_texture_array/copyteximage 1d_array samples=2: skip +spec/ext_texture_array/copyteximage 1d_array samples=2: fail spec/ext_texture_array/copyteximage 1d_array samples=32: skip -spec/ext_texture_array/copyteximage 1d_array samples=4: skip +spec/ext_texture_array/copyteximage 1d_array samples=4: fail spec/ext_texture_array/copyteximage 1d_array samples=6: skip spec/ext_texture_array/copyteximage 1d_array samples=8: skip spec/ext_texture_array/copyteximage 2d_array samples=16: skip -spec/ext_texture_array/copyteximage 2d_array samples=2: skip +spec/ext_texture_array/copyteximage 2d_array samples=2: fail spec/ext_texture_array/copyteximage 2d_array samples=32: skip -spec/ext_texture_array/copyteximage 2d_array samples=4: skip +spec/ext_texture_array/copyteximage 2d_array samples=4: fail spec/ext_texture_array/copyteximage 2d_array samples=6: skip spec/ext_texture_array/copyteximage 2d_array samples=8: skip spec/ext_texture_integer/fbo-integer: fail diff --git a/src/gallium/drivers/softpipe/ci/gitlab-ci.yml b/src/gallium/drivers/softpipe/ci/gitlab-ci.yml index 68ef54f2000..98e3b504c73 100644 --- a/src/gallium/drivers/softpipe/ci/gitlab-ci.yml +++ b/src/gallium/drivers/softpipe/ci/gitlab-ci.yml @@ -23,7 +23,7 @@ softpipe-asan-gles31: GPU_VERSION: softpipe-asan DEQP_FRACTION: 10 DEQP_VER: gles31 - TEST_LD_PRELOAD: libasan.so.5 + TEST_LD_PRELOAD: libasan.so.6 extends: softpipe-gles2 needs: - x86_test-gl diff --git a/src/gallium/drivers/softpipe/ci/softpipe-quick.txt b/src/gallium/drivers/softpipe/ci/softpipe-quick.txt index 5db94e98d88..26d6a000b8e 100644 --- a/src/gallium/drivers/softpipe/ci/softpipe-quick.txt +++ b/src/gallium/drivers/softpipe/ci/softpipe-quick.txt @@ -15,7 +15,6 @@ glx/glx-multithread-makecurrent-1: skip glx/glx-multithread-makecurrent-2: skip glx/glx-multithread-makecurrent-3: skip glx/glx-multithread-makecurrent-4: skip -glx/glx-query-drawable-glx_fbconfig_id-window: fail glx/glx-swap-copy: fail glx/glx-swap-event_async: skip glx/glx-swap-event_event: skip diff --git a/src/gallium/drivers/virgl/ci/deqp-virgl-gl-fails.txt b/src/gallium/drivers/virgl/ci/deqp-virgl-gl-fails.txt index 14d224785dd..0e3ea8dfa0d 100644 --- a/src/gallium/drivers/virgl/ci/deqp-virgl-gl-fails.txt +++ b/src/gallium/drivers/virgl/ci/deqp-virgl-gl-fails.txt @@ -2507,6 +2507,11 @@ dEQP-GLES31.functional.synchronization.inter_invocation.ssbo_atomic_read_write,F dEQP-GLES31.functional.synchronization.inter_invocation.ssbo_overwrite,Fail dEQP-GLES31.functional.synchronization.inter_invocation.ssbo_read_write,Fail dEQP-GLES31.functional.synchronization.inter_invocation.ssbo_write_read,Fail +KHR-GL30.shaders30.glsl_constructors.bvec4_from_bool_mat2_vs,Crash +KHR-GL30.shaders30.glsl_constructors.bvec4_from_bool_mat3_vs,Crash +KHR-GL30.shaders30.glsl_constructors.bvec4_from_bool_mat4x2_vs,Crash +KHR-GL30.shaders30.glsl_constructors.bvec4_from_bool_mat4x3_fs,Crash +KHR-GL30.shaders30.glsl_constructors.bvec4_from_mat4x2_vs,Crash 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 diff --git a/src/gallium/drivers/zink/ci/piglit-zink-lvp-fails.txt b/src/gallium/drivers/zink/ci/piglit-zink-lvp-fails.txt index 88f2bc5531a..08ad70dc444 100644 --- a/src/gallium/drivers/zink/ci/piglit-zink-lvp-fails.txt +++ b/src/gallium/drivers/zink/ci/piglit-zink-lvp-fails.txt @@ -1,8 +1,9 @@ glx@extension string sanity,Fail glx@glx-copy-sub-buffer,Fail +glx@glx-copy-sub-buffer samples=2,Fail +glx@glx-copy-sub-buffer samples=4,Fail glx@glx-multithread-buffer,Fail glx@glx-multithread-texture,Fail -glx@glx-query-drawable-glx_fbconfig_id-window,Fail glx@glx-swap-copy,Fail glx@glx-swap-pixmap-bad,Fail glx@glx-tfp,Crash @@ -47,6 +48,10 @@ spec@!opengl 1.1@polygon-offset,Fail spec@!opengl 1.1@ppgtt_memory_alignment,Crash spec@!opengl 1.1@read-front,Fail spec@!opengl 1.1@read-front clear-front-first,Fail +spec@!opengl 1.1@read-front clear-front-first samples=2,Fail +spec@!opengl 1.1@read-front clear-front-first samples=4,Fail +spec@!opengl 1.1@read-front samples=2,Fail +spec@!opengl 1.1@read-front samples=4,Fail spec@!opengl 1.1@texwrap 1d bordercolor,Fail spec@!opengl 1.1@texwrap 1d proj bordercolor,Fail spec@!opengl 1.1@texwrap 2d bordercolor,Fail @@ -164,6 +169,28 @@ spec@ext_framebuffer_multisample@sample-coverage 2 non-inverted,Fail spec@ext_framebuffer_multisample@sample-coverage 4 non-inverted,Fail spec@ext_framebuffer_object@fbo-blending-format-quirks,Fail spec@ext_framebuffer_object@fbo-blending-formats,Fail +spec@ext_image_dma_buf_import@ext_image_dma_buf_import-export,Fail +spec@ext_image_dma_buf_import@ext_image_dma_buf_import-export-tex,Fail +spec@ext_image_dma_buf_import@ext_image_dma_buf_import-intel_external_sampler_only,Fail +spec@ext_image_dma_buf_import@ext_image_dma_buf_import-invalid_attributes,Fail +spec@ext_image_dma_buf_import@ext_image_dma_buf_import-invalid_hints,Fail +spec@ext_image_dma_buf_import@ext_image_dma_buf_import-missing_attributes,Fail +spec@ext_image_dma_buf_import@ext_image_dma_buf_import-ownership_transfer,Fail +spec@ext_image_dma_buf_import@ext_image_dma_buf_import-refcount,Fail +spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_argb8888,Fail +spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_ayuv,Fail +spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_nv12,Fail +spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_p010,Fail +spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_p012,Fail +spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_p016,Fail +spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_uyvy,Fail +spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_xrgb8888,Fail +spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_xyuv,Fail +spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_yuv420,Fail +spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_yuyv,Fail +spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_yvu420,Fail +spec@ext_image_dma_buf_import@ext_image_dma_buf_import-transcode-nv12-as-r8-gr88,Fail +spec@ext_image_dma_buf_import@ext_image_dma_buf_import-unsupported_format,Fail spec@ext_packed_depth_stencil@texwrap formats bordercolor,Fail spec@ext_packed_depth_stencil@texwrap formats bordercolor-swizzled,Fail spec@ext_packed_float@query-rgba-signed-components,Fail