ci: skqp: Add Vulkan support for a630_skqp job

This commit adds support for Vulkan backend on a630_skqp job.

= Needed changes
- Needed to install libvulkan-dev package on system
- Refactored the way the available skqp reports are printed
  tested in development builds with skia tools

Piglit expectations had to be updated in various drivers due to !14750 not
having bumped the tags when it tried to uprev.

Signed-off-by: Guilherme Gallo <guilherme.gallo@collabora.com>
Reviewed-by: Emma Anholt <emma@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14686>

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

@@ -7,6 +7,7 @@ if [ $DEBIAN_ARCH = arm64 ]; then
                    libfontconfig1
                    libgl1
                    libglu1-mesa
+                   libvulkan-dev
     "
 elif [ $DEBIAN_ARCH = amd64 ]; then
     ARCH_PACKAGES="firmware-amd-graphics

.gitlab-ci/image-tags.yml

@@ -12,7 +12,7 @@ variables:
    DEBIAN_X86_TEST_VK_TAG: "2022-02-21-libdrm"
 
    FEDORA_X86_BUILD_TAG: "2022-02-21-libdrm"
-   KERNEL_ROOTFS_TAG: "2022-02-21-libdrm"
+   KERNEL_ROOTFS_TAG: "2022-02-23-skqp"
 
    WINDOWS_X64_BUILD_PATH: "windows/x64_build"
    WINDOWS_X64_BUILD_TAG: "2022-20-02-base_split"

.gitlab-ci/skqp-runner.sh

@@ -22,13 +22,19 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+
 copy_tests_files() (
+    # Copy either unit test or render test files from a specific driver given by
+    # GPU VERSION variable.
+    # If there is no test file at the expected location, this function will
+    # return error_code 1
     SKQP_BACKEND="${1}"
     SKQP_FILE_PREFIX="${INSTALL}/${GPU_VERSION}-skqp"
 
-    if echo "${SKQP_BACKEND}" | grep -qE 'gl(es)?'
+    if echo "${SKQP_BACKEND}" | grep -qE 'vk|gl(es)?'
     then
         SKQP_RENDER_TESTS_FILE="${SKQP_FILE_PREFIX}-${SKQP_BACKEND}_rendertests.txt"
+        [ -f "${SKQP_RENDER_TESTS_FILE}" ] || return 1
         cp "${SKQP_RENDER_TESTS_FILE}" "${SKQP_ASSETS_DIR}"/skqp/rendertests.txt
         return 0
     fi
@@ -37,37 +43,75 @@ copy_tests_files() (
     # that is why it needs to be a special case.
     if echo "${SKQP_BACKEND}" | grep -qE "unitTest"
     then
-        cp "${SKQP_FILE_PREFIX}_unittests.txt" "${SKQP_ASSETS_DIR}"/skqp/unittests.txt
+        SKQP_UNIT_TESTS_FILE="${SKQP_FILE_PREFIX}_unittests.txt"
+        [ -f "${SKQP_UNIT_TESTS_FILE}" ] || return 1
+        cp "${SKQP_UNIT_TESTS_FILE}" "${SKQP_ASSETS_DIR}"/skqp/unittests.txt
     fi
 )
 
+test_vk_backend() {
+    if echo "${SKQP_BACKENDS}" | grep -qE 'vk'
+    then
+        if [ -n "$VK_DRIVER" ]; then
+            return 0
+        fi
+
+        echo "VK_DRIVER environment variable is missing."
+        VK_DRIVERS=$(ls "$INSTALL"/share/vulkan/icd.d/ | cut -f 1 -d '_')
+        if [ -n "${VK_DRIVERS}" ]
+        then
+            echo "Please set VK_DRIVER to the correct driver from the list:"
+            echo "${VK_DRIVERS}"
+        fi
+        echo "No Vulkan tests will be executed, but it was requested in SKQP_BACKENDS variable. Exiting."
+        exit 2
+    fi
+
+    # Vulkan environment is not configured, but it was not requested by the job
+    return 1
+}
+
+setup_backends() {
+    if test_vk_backend
+    then
+        export VK_ICD_FILENAMES="$INSTALL"/share/vulkan/icd.d/"$VK_DRIVER"_icd."${VK_CPU:-$(uname -m)}".json
+    fi
+}
+
 set -ex
 
 # Needed so configuration files can contain paths to files in /install
 ln -sf "$CI_PROJECT_DIR"/install /install
-
 INSTALL=${PWD}/install
 
 if [ -z "$GPU_VERSION" ]; then
-    echo 'GPU_VERSION must be set to something like "llvmpipe" or "freedreno-a630" (the name used in .gitlab-ci/gpu-version-*.txt)'
+    echo 'GPU_VERSION must be set to something like "llvmpipe" or
+"freedreno-a630" (it will serve as a component to find the path for files
+residing in src/**/ci/*.txt)'
     exit 1
 fi
 
-SKQP_ASSETS_DIR=/skqp/assets
-SKQP_RESULTS_DIR="${SKQP_RESULTS_DIR:-results}"
+LD_LIBRARY_PATH=$INSTALL:$LD_LIBRARY_PATH
+setup_backends
 
-mkdir "${SKQP_ASSETS_DIR}"/skqp
+SKQP_ASSETS_DIR=/skqp/assets
+SKQP_RESULTS_DIR="${SKQP_RESULTS_DIR:-$PWD/results}"
+
+mkdir -p "${SKQP_ASSETS_DIR}"/skqp
 
 SKQP_EXITCODE=0
 for SKQP_BACKEND in ${SKQP_BACKENDS}
 do
     set -e
-    copy_tests_files "${SKQP_BACKEND}"
+    if !  copy_tests_files "${SKQP_BACKEND}"
+    then
+        echo "No override test file found for ${SKQP_BACKEND}. Using the default one."
+    fi
 
     set +e
     SKQP_BACKEND_RESULTS_DIR="${SKQP_RESULTS_DIR}"/"${SKQP_BACKEND}"
     mkdir -p "${SKQP_BACKEND_RESULTS_DIR}"
-    /skqp/skqp "${SKQP_ASSETS_DIR}" '' "${SKQP_BACKEND_RESULTS_DIR}" "${SKQP_BACKEND}_"
+    /skqp/skqp "${SKQP_ASSETS_DIR}" "${SKQP_BACKEND_RESULTS_DIR}" "${SKQP_BACKEND}_"
     BACKEND_EXITCODE=$?
 
     if [ ! $BACKEND_EXITCODE -eq 0 ]
@@ -91,15 +135,17 @@ then
     echo "https://$CI_PROJECT_ROOT_NAMESPACE.pages.freedesktop.org/-/$CI_PROJECT_NAME/-/jobs/$CI_JOB_ID/artifacts/${SKQP_RESULTS_DIR}/unitTest/unit_tests.txt"
 fi
 
-for REPORT in "${SKQP_RESULTS_DIR}"/**/report.html
+REPORT_FILES=$(mktemp)
+find "${SKQP_RESULTS_DIR}"/**/report.html -type f > "${REPORT_FILES}"
+while read -r REPORT
 do
     BACKEND_NAME=$(echo "${REPORT}" | sed  's@.*/\([^/]*\)/report.html@\1@')
     echo "See skqp ${BACKEND_NAME} render tests report at:"
     echo "https://$CI_PROJECT_ROOT_NAMESPACE.pages.freedesktop.org/-/$CI_PROJECT_NAME/-/jobs/$CI_JOB_ID/artifacts/${REPORT}"
-done
+done < "${REPORT_FILES}"
 
 # If there is no report available, tell the user that something is wrong.
-if [ ! -f "${REPORT}" ]
+if [ ! -s "${REPORT_FILES}" ]
 then
     echo "No skqp report available. Probably some fatal error has occured during the skqp execution."
 fi