ci: Enable testing radeonsi's libva using libva-util unit tests.

We've noticed issues with these tests when uprevving Mesa in Chrome OS. This CI catches some existing failures, and some debug-build assertion failures as well. To do this, uprev deqp-runner for its new gtest-runner command. This runner is not as efficient as I would hope, due to some expensive code in gtest. I've reported the issue to gtest and it should be easily fixable, but for now it at least means we get to use the same baseline/skip/flake handling we have from deqp and piglit runners. I also fixed build-libdrm for our rootfses to not throw away libdrm's share directory, which was causing a bunch of test-time spam from radeon's libdrm when trying to look up its marketing name tables (not that big of a deal for deqp-runner, but really noisy for piglit and libva-utils which make gallium screens approximatly per-test). Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13419>
2021-10-08 13:17:27 -07:00
parent e6ae0e9b95
commit 8fb850651c
11 changed files with 174 additions and 9 deletions
--- a/.gitlab-ci/common/generate-env.sh
+++ b/.gitlab-ci/common/generate-env.sh
@@ -41,6 +41,12 @@ for var in \
    FD_MESA_DEBUG \
    FLAKES_CHANNEL \
    GPU_VERSION \
+    GTEST \
+    GTEST_FAILS \
+    GTEST_FRACTION \
+    GTEST_RESULTS_DIR \
+    GTEST_RUNNER_OPTIONS \
+    GTEST_SKIPS \
    HWCI_FREQ_MAX \
    HWCI_KERNEL_MODULES \
    HWCI_START_XORG \
--- a/.gitlab-ci/container/build-deqp-runner.sh
+++ b/.gitlab-ci/container/build-deqp-runner.sh
@@ -4,6 +4,6 @@ set -ex

 cargo install --locked deqp-runner \
  -j ${FDO_CI_CONCURRENT:-4} \
-  --version 0.9.0 \
+  --version 0.10.0 \
  --root /usr/local \
  $EXTRA_CARGO_ARGS
--- a/.gitlab-ci/container/build-va-tools.sh
+++ b/.gitlab-ci/container/build-va-tools.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -ex
+
+git config --global user.email "mesa@example.com"
+git config --global user.name "Mesa CI"
+git clone \
+    https://github.com/intel/libva-utils.git \
+    -b 2.13.0 \
+    --depth 1 \
+    /va-utils
+
+pushd /va-utils
+meson build -D tests=true  -Dprefix=/va $EXTRA_MESON_ARGS
+ninja -C build install
+popd
+rm -rf /va-utils
--- a/.gitlab-ci/container/create-rootfs.sh
+++ b/.gitlab-ci/container/create-rootfs.sh
@@ -8,6 +8,8 @@ elif [ $DEBIAN_ARCH = amd64 ]; then
    ARCH_PACKAGES="firmware-amd-graphics
                   libelf1
                   libllvm11
+                   libva2
+                   libva-drm2
                  "
 fi

--- a/.gitlab-ci/container/lava_build.sh
+++ b/.gitlab-ci/container/lava_build.sh
@@ -50,6 +50,7 @@ else
    DEFCONFIG="arch/x86/configs/x86_64_defconfig"
    DEVICE_TREES=""
    KERNEL_IMAGE_NAME="bzImage"
+    ARCH_PACKAGES="libva-dev"
 fi

 # Determine if we're in a cross build.
@@ -71,6 +72,7 @@ fi

 apt-get update
 apt-get install -y --no-remove \
+                   ${ARCH_PACKAGES} \
                   automake \
                   bc \
                   cmake \
@@ -129,8 +131,7 @@ rm -rf /apitrace
 ############### 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/.
+mv /usr/local/bin/*-runner /lava-files/rootfs-${DEBIAN_ARCH}/usr/bin/.


 ############### Build dEQP
@@ -143,6 +144,11 @@ mv /deqp /lava-files/rootfs-${DEBIAN_ARCH}/.
 PIGLIT_OPTS="-DPIGLIT_BUILD_DMA_BUF_TESTS=ON" . .gitlab-ci/container/build-piglit.sh
 mv /piglit /lava-files/rootfs-${DEBIAN_ARCH}/.

+############### Build libva tests
+if [[ "$DEBIAN_ARCH" = "amd64" ]]; then
+    . .gitlab-ci/container/build-va-tools.sh
+    mv /va/bin/* /lava-files/rootfs-${DEBIAN_ARCH}/usr/bin/
+fi

 ############### Build libdrm
 EXTRA_MESON_ARGS+=" -D prefix=/libdrm"
@@ -179,6 +185,8 @@ rm /lava-files/rootfs-${DEBIAN_ARCH}/create-rootfs.sh
 # 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/.
+mkdir -p /lava-files/rootfs-${DEBIAN_ARCH}/libdrm/
+cp -Rp /libdrm/share /lava-files/rootfs-${DEBIAN_ARCH}/libdrm/share
 rm -rf /libdrm


--- a/.gitlab-ci/gtest-runner.sh
+++ b/.gitlab-ci/gtest-runner.sh
@@ -0,0 +1,70 @@
+#!/bin/sh
+
+set -ex
+
+INSTALL=`pwd`/install
+
+# Set up the driver environment.
+export LD_LIBRARY_PATH=`pwd`/install/lib/
+export LIBVA_DRIVERS_PATH=`pwd`/install/lib/dri/
+# libva spams driver open info by default, and that happens per testcase.
+export LIBVA_MESSAGING_LEVEL=1
+
+if [ -e "$INSTALL/$GPU_VERSION-fails.txt" ]; then
+    GTEST_RUNNER_OPTIONS="$GTEST_RUNNER_OPTIONS --baseline $INSTALL/$GPU_VERSION-fails.txt"
+fi
+
+# Default to an empty known flakes file if it doesn't exist.
+touch $INSTALL/$GPU_VERSION-flakes.txt
+
+if [ -n "$GALLIUM_DRIVER" ] && [ -e "$INSTALL/$GALLIUM_DRIVER-skips.txt" ]; then
+    GTEST_SKIPS="$GTEST_SKIPS --skips $INSTALL/$GALLIUM_DRIVER-skips.txt"
+fi
+
+if [ -n "$DRIVER_NAME" ] && [ -e "$INSTALL/$DRIVER_NAME-skips.txt" ]; then
+    GTEST_SKIPS="$GTEST_SKIPS --skips $INSTALL/$DRIVER_NAME-skips.txt"
+fi
+
+if [ -e "$INSTALL/$GPU_VERSION-skips.txt" ]; then
+    GTEST_SKIPS="$GTEST_SKIPS --skips $INSTALL/$GPU_VERSION-skips.txt"
+fi
+
+set +e
+
+gtest-runner \
+    run \
+    --gtest $GTEST \
+    --output ${GTEST_RESULTS_DIR:-results} \
+    --jobs ${FDO_CI_CONCURRENT:-4} \
+    $GTEST_SKIPS \
+    --flakes $INSTALL/$GPU_VERSION-flakes.txt \
+    --fraction-start ${CI_NODE_INDEX:-1} \
+    --fraction $((${CI_NODE_TOTAL:-1} * ${GTEST_FRACTION:-1})) \
+    --env "LD_PRELOAD=$TEST_LD_PRELOAD" \
+    $GTEST_RUNNER_OPTIONS
+
+GTEST_EXITCODE=$?
+
+deqp-runner junit \
+   --testsuite gtest \
+   --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):
+if [ -n "$FLAKES_CHANNEL" ]; then
+  python3 $INSTALL/report-flakes.py \
+         --host irc.oftc.net \
+         --port 6667 \
+         --results $RESULTS/results.csv \
+         --known-flakes $INSTALL/$GPU_VERSION-flakes.txt \
+         --channel "$FLAKES_CHANNEL" \
+         --runner "$CI_RUNNER_DESCRIPTION" \
+         --job "$CI_JOB_ID" \
+         --url "$CI_JOB_URL" \
+         --branch "${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME:-$CI_COMMIT_BRANCH}" \
+         --branch-title "${CI_MERGE_REQUEST_TITLE:-$CI_COMMIT_TITLE}"
+fi
+
+exit $GTEST_EXITCODE
--- a/.gitlab-ci/prepare-artifacts.sh
+++ b/.gitlab-ci/prepare-artifacts.sh
@@ -31,12 +31,11 @@ cp -Rp .gitlab-ci/piglit 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/crosvm-runner.sh install/
 cp -Rp .gitlab-ci/crosvm-init.sh install/
 cp -Rp .gitlab-ci/*.txt install/
 cp -Rp .gitlab-ci/report-flakes.py install/
 cp -Rp .gitlab-ci/vkd3d-proton install/
+cp -Rp .gitlab-ci/*-runner.sh install/
 find . -path \*/ci/\*.txt \
    -o -path \*/ci/\*.toml \
    -o -path \*/ci/\*traces\*.yml \
--- a/.gitlab-ci/test-source-dep.yml
+++ b/.gitlab-ci/test-source-dep.yml
@@ -398,6 +398,25 @@
      when: on_success
    - when: never

+.radeonsi-vaapi-rules:
+  stage: amd
+  rules:
+    - *ignore_scheduled_pipelines
+    - changes:
+        *mesa_core_file_list
+      when: on_success
+    - changes:
+        *gallium_core_file_list
+      when: on_success
+    - changes:
+        *radeonsi_file_list
+      when: on_success
+    - changes: &radeon_vcn_file_list
+      - src/gallium/frontends/va/**/*
+      - src/gallium/drivers/radeon/**/*
+      when: on_success
+    - when: never
+
 .i915g-rules:
  stage: intel
  rules: