radeonsi: implement user_data_amd for 5, 6, and 7 components correctly

NIR can't handle those component counts, so we have to split it into 2
SGPR vectors where each has max 4 components.

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28725>

.clang-format-include

@@ -2,6 +2,7 @@
 # enforcement in the CI.
 
 src/gallium/drivers/i915
+src/gallium/targets/teflon/**/*
 src/amd/vulkan/**/*
 src/amd/compiler/**/*
 src/egl/**/*

.gitignore

@@ -3,3 +3,4 @@
 *.pyo
 *.out
 /build
+.venv/

.gitlab-ci.yml

@@ -87,6 +87,10 @@ variables:
   ARTIFACTS_BASE_URL: https://${CI_PROJECT_ROOT_NAMESPACE}.${CI_PAGES_DOMAIN}/-/${CI_PROJECT_NAME}/-/jobs/${CI_JOB_ID}/artifacts
   # Python scripts for structured logger
   PYTHONPATH: "$PYTHONPATH:$CI_PROJECT_DIR/install"
+  # Drop once deqp-runner is upgraded to > 0.18.0
+  MESA_VK_ABORT_ON_DEVICE_LOSS: 1
+  # Avoid the wall of "Unsupported SPIR-V capability" warnings in CI job log, hiding away useful output
+  MESA_SPIRV_LOG_LEVEL: error
 
 default:
   before_script:
@@ -160,25 +164,7 @@ include:
   - local: '.gitlab-ci/farm-rules.yml'
   - local: '.gitlab-ci/test-source-dep.yml'
   - local: 'docs/gitlab-ci.yml'
-  - local: 'src/amd/ci/gitlab-ci.yml'
-  - local: 'src/broadcom/ci/gitlab-ci.yml'
-  - local: 'src/etnaviv/ci/gitlab-ci.yml'
-  - local: 'src/freedreno/ci/gitlab-ci.yml'
-  - local: 'src/gallium/drivers/crocus/ci/gitlab-ci.yml'
-  - local: 'src/gallium/drivers/d3d12/ci/gitlab-ci.yml'
-  - local: 'src/gallium/drivers/i915/ci/gitlab-ci.yml'
-  - local: 'src/gallium/drivers/r300/ci/gitlab-ci.yml'
-  - local: 'src/gallium/drivers/lima/ci/gitlab-ci.yml'
-  - local: 'src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml'
-  - local: 'src/gallium/drivers/nouveau/ci/gitlab-ci.yml'
-  - local: 'src/gallium/drivers/softpipe/ci/gitlab-ci.yml'
-  - local: 'src/gallium/drivers/virgl/ci/gitlab-ci.yml'
-  - local: 'src/gallium/drivers/zink/ci/gitlab-ci.yml'
-  - local: 'src/gallium/frontends/lavapipe/ci/gitlab-ci.yml'
-  - local: 'src/intel/ci/gitlab-ci.yml'
-  - local: 'src/microsoft/ci/gitlab-ci.yml'
-  - local: 'src/panfrost/ci/gitlab-ci.yml'
-  - local: 'src/virtio/ci/gitlab-ci.yml'
+  - local: 'src/**/ci/gitlab-ci.yml'
 
 
 # YAML anchors for rule conditions
@@ -294,6 +280,32 @@ sanity:
   script:
     # ci-fairy check-commits --junit-xml=check-commits.xml
     - ci-fairy check-merge-request --require-allow-collaboration --junit-xml=check-merge-request.xml
+    - |
+      set -eu
+      image_tags=(
+        DEBIAN_BASE_TAG
+        DEBIAN_BUILD_TAG
+        DEBIAN_X86_64_TEST_ANDROID_TAG
+        DEBIAN_X86_64_TEST_GL_TAG
+        DEBIAN_X86_64_TEST_VK_TAG
+        ALPINE_X86_64_BUILD_TAG
+        ALPINE_X86_64_LAVA_SSH_TAG
+        FEDORA_X86_64_BUILD_TAG
+        KERNEL_ROOTFS_TAG
+        KERNEL_TAG
+        PKG_REPO_REV
+        WINDOWS_X64_MSVC_TAG
+        WINDOWS_X64_BUILD_TAG
+        WINDOWS_X64_TEST_TAG
+      )
+      for var in "${image_tags[@]}"
+      do
+        if [ "$(echo -n "${!var}" | wc -c)" -gt 20 ]
+        then
+          echo "$var is too long; please make sure it is at most 20 chars."
+          exit 1
+        fi
+      done
   artifacts:
     when: on_failure
     reports:
@@ -302,6 +314,22 @@ sanity:
     - placeholder-job
 
 
+mr-label-maker-test:
+  extends:
+    - .fdo.ci-fairy
+  stage: sanity
+  rules:
+    - !reference [.mr-label-maker-rules, rules]
+  variables:
+    GIT_STRATEGY: fetch
+  timeout: 10m
+  script:
+    - set -eu
+    - python3 -m venv .venv
+    - source .venv/bin/activate
+    - pip install git+https://gitlab.freedesktop.org/freedesktop/mr-label-maker
+    - mr-label-maker --dry-run --mr $CI_MERGE_REQUEST_IID
+
 # Jobs that need to pass before spending hardware resources on further testing
 .required-for-hardware-jobs:
   needs:

.gitlab-ci/all-skips.txt

@@ -9,6 +9,9 @@
 # submission, so skip it in the regular CI.
 dEQP-VK.api.driver_properties.conformance_version
 
+# Exclude this test which might fail when a new extension is implemented.
+dEQP-VK.info.device_extensions
+
 # These are tremendously slow (pushing toward a minute), and aren't
 # reliable to be run in parallel with other tests due to CPU-side timing.
 dEQP-GLES[0-9]*.functional.flush_finish.*

.gitlab-ci/b2c/b2c.yml.jinja2.jinja2

@@ -61,3 +61,7 @@ deployment:
     initramfs:
       url: '{{ initramfs_url }}'
 
+{% if dtb_url is defined %}
+    dtb:
+      url: '{{ dtb_url }}'
+{% endif %}

.gitlab-ci/build/gitlab-ci.yml

@@ -17,7 +17,6 @@
     paths:
       - _build/meson-logs/*.txt
       - _build/meson-logs/strace
-      - shader-db
       - artifacts
 
 # Just Linux
@@ -71,13 +70,15 @@ debian-testing:
       -D glx=dri
       -D gbm=enabled
       -D egl=enabled
+      -D glvnd=disabled
       -D platforms=x11,wayland
     GALLIUM_ST: >
       -D dri3=enabled
+      -D gallium-nine=true
       -D gallium-va=enabled
       -D gallium-rusticl=true
-    GALLIUM_DRIVERS: "swrast,virgl,radeonsi,zink,crocus,iris,i915,r300"
-    VULKAN_DRIVERS: "swrast,amd,intel,intel_hasvk,virtio,nouveau-experimental"
+    GALLIUM_DRIVERS: "swrast,virgl,radeonsi,zink,crocus,iris,i915,r300,svga"
+    VULKAN_DRIVERS: "swrast,amd,intel,intel_hasvk,virtio,nouveau"
     BUILDTYPE: "debugoptimized"
     EXTRA_OPTION: >
       -D spirv-to-dxil=true
@@ -103,8 +104,22 @@ debian-testing-asan:
       -D b_sanitize=address
       -D valgrind=disabled
       -D tools=dlclose-skip
+      -D intel-clc=system
     S3_ARTIFACT_NAME: ""
     ARTIFACTS_DEBUG_SYMBOLS: 1
+    # Do a host build for intel-clc (asan complains not being loaded
+    # as the first library)
+    HOST_BUILD_OPTIONS: >
+      -D build-tests=false
+      -D enable-glcpp-tests=false
+      -D gallium-opencl=disabled
+      -D gallium-drivers=
+      -D vulkan-drivers=
+      -D video-codecs=
+      -D glx=disabled
+      -D platforms=
+      -D intel-clc=enabled
+      -D install-intel-clc=true
 
 debian-testing-msan:
   # https://github.com/google/sanitizers/wiki/MemorySanitizerLibcxxHowTo
@@ -116,6 +131,7 @@ debian-testing-msan:
     EXTRA_OPTION:
       -D b_sanitize=memory
       -D b_lundef=false
+      -D intel-clc=system
     S3_ARTIFACT_NAME: ""
     ARTIFACTS_DEBUG_SYMBOLS: 1
     # Don't run all the tests yet:
@@ -124,6 +140,19 @@ debian-testing-msan:
     MESON_TEST_ARGS: "--suite glcpp --suite format"
     GALLIUM_DRIVERS: "freedreno,iris,nouveau,kmsro,r300,r600,swrast,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,radeonsi,tegra,d3d12,crocus"
     VULKAN_DRIVERS: intel,amd,broadcom,virtio
+    # Do a host build for intel-clc (msan complains about
+    # uninitialized values in the LLVM libs)
+    HOST_BUILD_OPTIONS: >
+      -D build-tests=false
+      -D enable-glcpp-tests=false
+      -D gallium-opencl=disabled
+      -D gallium-drivers=
+      -D vulkan-drivers=
+      -D video-codecs=
+      -D glx=disabled
+      -D platforms=
+      -D intel-clc=enabled
+      -D install-intel-clc=true
 
 debian-build-testing:
   extends: .meson-build
@@ -134,6 +163,7 @@ debian-build-testing:
       -D glx=dri
       -D gbm=enabled
       -D egl=enabled
+      -D glvnd=disabled
       -D platforms=x11,wayland
     GALLIUM_ST: >
       -D dri3=enabled
@@ -152,6 +182,7 @@ debian-build-testing:
       -D tools=drm-shim,etnaviv,freedreno,glsl,intel,intel-ui,nir,nouveau,lima,panfrost,asahi
       -D b_lto=true
     LLVM_VERSION: 15
+    S3_ARTIFACT_NAME: debian-build-testing
   script: |
     section_start lava-pytest "lava-pytest"
     .gitlab-ci/lava/lava-pytest.sh
@@ -161,9 +192,27 @@ debian-build-testing:
     .gitlab-ci/run-yamllint.sh
     section_switch meson "meson"
     .gitlab-ci/meson/build.sh
+    .gitlab-ci/prepare-artifacts.sh
+  timeout: 15m
+
+shader-db:
+  stage: code-validation
+  extends:
+    - .use-debian/x86_64_build
+    - .container+build-rules
+  needs:
+    - debian-build-testing
+  variables:
+    S3_ARTIFACT_NAME: debian-build-testing
+  before_script:
+    - !reference [.download_s3, before_script]
+  script: |
     section_switch shader-db "shader-db"
     .gitlab-ci/run-shader-db.sh
-  timeout: 30m
+  artifacts:
+    paths:
+      - shader-db
+  timeout: 15m
 
 # Test a release build with -Werror so new warnings don't sneak in.
 debian-release:
@@ -177,6 +226,7 @@ debian-release:
       -D glx=dri
       -D gbm=enabled
       -D egl=enabled
+      -D glvnd=disabled
       -D platforms=x11,wayland
     GALLIUM_ST: >
       -D dri3=enabled
@@ -195,6 +245,7 @@ debian-release:
       -D osmesa=true
       -D tools=all
       -D intel-clc=enabled
+      -D intel-rt=enabled
       -D imagination-srv=true
     BUILDTYPE: "release"
     S3_ARTIFACT_NAME: "mesa-x86_64-default-${BUILDTYPE}"
@@ -217,9 +268,9 @@ alpine-build-testing:
       -D glx=disabled
       -D gbm=enabled
       -D egl=enabled
-      -D glvnd=false
+      -D glvnd=disabled
       -D platforms=wayland
-    LLVM_VERSION: ""
+    LLVM_VERSION: "16"
     GALLIUM_DRIVERS: "crocus,etnaviv,freedreno,iris,kmsro,lima,nouveau,panfrost,r300,r600,radeonsi,svga,swrast,tegra,v3d,vc4,virgl,zink"
     GALLIUM_ST: >
       -D dri3=enabled
@@ -257,7 +308,7 @@ fedora-release:
       -D glx=dri
       -D gbm=enabled
       -D egl=enabled
-      -D glvnd=true
+      -D glvnd=enabled
       -D platforms=x11,wayland
     EXTRA_OPTION: >
       -D b_lto=true
@@ -265,8 +316,9 @@ fedora-release:
       -D selinux=true
       -D tools=drm-shim,etnaviv,freedreno,glsl,intel,nir,nouveau,lima,panfrost,imagination
       -D vulkan-layers=device-select,overlay
-      -D intel-clc=enabled
+      -D intel-rt=enabled
       -D imagination-srv=true
+      -D teflon=true
     GALLIUM_DRIVERS: "crocus,etnaviv,freedreno,i915,iris,kmsro,lima,nouveau,panfrost,r300,r600,radeonsi,svga,swrast,tegra,v3d,vc4,virgl,zink"
     GALLIUM_ST: >
       -D dri3=enabled
@@ -309,6 +361,7 @@ debian-android:
       -D glx=disabled
       -D gbm=disabled
       -D egl=enabled
+      -D glvnd=disabled
       -D platforms=android
     EXTRA_OPTION: >
       -D android-stub=true
@@ -316,6 +369,7 @@ debian-android:
       -D platform-sdk-version=33
       -D valgrind=disabled
       -D android-libbacktrace=disabled
+      -D intel-clc=system
     GALLIUM_ST: >
       -D dri3=disabled
       -D gallium-vdpau=disabled
@@ -324,8 +378,19 @@ debian-android:
       -D gallium-xa=disabled
       -D gallium-nine=false
       -D gallium-rusticl=false
-    LLVM_VERSION: ""
+    LLVM_VERSION: "15"
     PKG_CONFIG_LIBDIR: "/disable/non/android/system/pc/files"
+    HOST_BUILD_OPTIONS: >
+      -D build-tests=false
+      -D enable-glcpp-tests=false
+      -D gallium-opencl=disabled
+      -D gallium-drivers=
+      -D vulkan-drivers=
+      -D video-codecs=
+      -D glx=disabled
+      -D platforms=
+      -D intel-clc=enabled
+      -D install-intel-clc=true
     ARTIFACTS_DEBUG_SYMBOLS: 1
     S3_ARTIFACT_NAME: mesa-x86_64-android-${BUILDTYPE}
   script:
@@ -377,6 +442,8 @@ debian-arm32:
     - .ci-deqp-artifacts
   variables:
     CROSS: armhf
+    DRI_LOADERS:
+      -D glvnd=disabled
     EXTRA_OPTION: >
       -D llvm=disabled
       -D valgrind=disabled
@@ -392,6 +459,8 @@ debian-arm32-asan:
   extends:
     - debian-arm32
   variables:
+    DRI_LOADERS:
+      -D glvnd=disabled
     EXTRA_OPTION: >
       -D llvm=disabled
       -D b_sanitize=address
@@ -410,12 +479,15 @@ debian-arm64:
       -Wno-error=array-bounds
       -Wno-error=stringop-truncation
     VULKAN_DRIVERS: "freedreno,broadcom,panfrost,imagination-experimental"
+    DRI_LOADERS:
+      -D glvnd=disabled
     EXTRA_OPTION: >
       -D llvm=disabled
       -D valgrind=disabled
       -D imagination-srv=true
       -D perfetto=true
       -D freedreno-kmds=msm,virtio
+      -D teflon=true
     S3_ARTIFACT_NAME: mesa-arm64-default-${BUILDTYPE}
   script:
     - .gitlab-ci/meson/build.sh
@@ -425,6 +497,8 @@ debian-arm64-asan:
   extends:
     - debian-arm64
   variables:
+    DRI_LOADERS:
+      -D glvnd=disabled
     EXTRA_OPTION: >
       -D llvm=disabled
       -D b_sanitize=address
@@ -440,6 +514,8 @@ debian-arm64-build-test:
     - .ci-deqp-artifacts
   variables:
     VULKAN_DRIVERS: "amd"
+    DRI_LOADERS:
+      -D glvnd=disabled
     EXTRA_OPTION: >
       -Dtools=panfrost,imagination
 
@@ -463,7 +539,6 @@ debian-clang:
     BUILDTYPE: debug
     LLVM_VERSION: 15
     UNWIND: "enabled"
-    GALLIUM_DUMP_CPU: "true"
     C_ARGS: >
       -Wno-error=constant-conversion
       -Wno-error=enum-conversion
@@ -479,7 +554,7 @@ debian-clang:
       -D glx=dri
       -D gbm=enabled
       -D egl=enabled
-      -D glvnd=true
+      -D glvnd=enabled
       -D platforms=x11,wayland
     GALLIUM_ST: >
       -D dri3=enabled
@@ -497,7 +572,7 @@ debian-clang:
       -D opencl-spirv=true
       -D shared-glapi=enabled
     GALLIUM_DRIVERS: "iris,nouveau,kmsro,r300,r600,freedreno,swrast,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,radeonsi,tegra,d3d12,crocus,i915,asahi"
-    VULKAN_DRIVERS: intel,amd,freedreno,broadcom,virtio,swrast,panfrost,imagination-experimental,microsoft-experimental,nouveau-experimental
+    VULKAN_DRIVERS: intel,amd,freedreno,broadcom,virtio,swrast,panfrost,imagination-experimental,microsoft-experimental,nouveau
     EXTRA_OPTION:
       -D spirv-to-dxil=true
       -D osmesa=true
@@ -506,7 +581,9 @@ debian-clang:
       -D vulkan-layers=device-select,overlay
       -D build-aco-tests=true
       -D intel-clc=enabled
+      -D intel-rt=enabled
       -D imagination-srv=true
+      -D teflon=true
     CC: clang-${LLVM_VERSION}
     CXX: clang++-${LLVM_VERSION}
 
@@ -559,6 +636,7 @@ debian-vulkan:
       -D opengl=false
       -D gles1=disabled
       -D gles2=disabled
+      -D glvnd=disabled
       -D platforms=x11,wayland
       -D osmesa=false
     GALLIUM_ST: >
@@ -573,11 +651,11 @@ debian-vulkan:
       -D c_args=-fno-sanitize-recover=all
       -D cpp_args=-fno-sanitize-recover=all
     UBSAN_OPTIONS: "print_stacktrace=1"
-    VULKAN_DRIVERS: amd,broadcom,freedreno,intel,intel_hasvk,virtio,imagination-experimental,microsoft-experimental
+    VULKAN_DRIVERS: amd,broadcom,freedreno,intel,intel_hasvk,panfrost,virtio,imagination-experimental,microsoft-experimental,nouveau
     EXTRA_OPTION: >
       -D vulkan-layers=device-select,overlay
       -D build-aco-tests=true
-      -D intel-clc=disabled
+      -D intel-rt=disabled
       -D imagination-srv=true
 
 debian-x86_32:
@@ -590,8 +668,22 @@ debian-x86_32:
     VULKAN_DRIVERS: intel,amd,swrast,virtio
     GALLIUM_DRIVERS: "iris,nouveau,r300,r600,radeonsi,swrast,virgl,zink,crocus,d3d12"
     LLVM_VERSION: 15
+    DRI_LOADERS:
+      -D glvnd=disabled
     EXTRA_OPTION: >
       -D vulkan-layers=device-select,overlay
+      -D intel-clc=system
+    HOST_BUILD_OPTIONS: >
+      -D build-tests=false
+      -D enable-glcpp-tests=false
+      -D gallium-opencl=disabled
+      -D gallium-drivers=
+      -D vulkan-drivers=
+      -D video-codecs=
+      -D glx=disabled
+      -D platforms=
+      -D intel-clc=enabled
+      -D install-intel-clc=true
 
 debian-s390x:
   extends:
@@ -605,6 +697,8 @@ debian-s390x:
     GALLIUM_DRIVERS: "swrast,zink"
     LLVM_VERSION: 15
     VULKAN_DRIVERS: "swrast"
+    DRI_LOADERS:
+      -D glvnd=disabled
 
 debian-ppc64el:
   extends:
@@ -616,3 +710,5 @@ debian-ppc64el:
     CROSS: ppc64el
     GALLIUM_DRIVERS: "nouveau,radeonsi,swrast,virgl,zink"
     VULKAN_DRIVERS: "amd,swrast"
+    DRI_LOADERS:
+      -D glvnd=disabled

.gitlab-ci/common/generate-env.sh

@@ -1,130 +1,135 @@
 #!/bin/bash
 
-for var in \
-    ACO_DEBUG \
-    ARTIFACTS_BASE_URL \
-    ASAN_OPTIONS \
-    BASE_SYSTEM_FORK_HOST_PREFIX \
-    BASE_SYSTEM_MAINLINE_HOST_PREFIX \
-    CI_COMMIT_BRANCH \
-    CI_COMMIT_REF_NAME \
-    CI_COMMIT_TITLE \
-    CI_JOB_ID \
-    CI_JOB_JWT_FILE \
-    CI_JOB_STARTED_AT \
-    CI_JOB_NAME \
-    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_PIPELINE_URL \
-    CI_PROJECT_DIR \
-    CI_PROJECT_NAME \
-    CI_PROJECT_PATH \
-    CI_PROJECT_ROOT_NAMESPACE \
-    CI_RUNNER_DESCRIPTION \
-    CI_SERVER_URL \
-    CROSVM_GALLIUM_DRIVER \
-    CROSVM_GPU_ARGS \
-    CURRENT_SECTION \
-    DEQP_BIN_DIR \
-    DEQP_CONFIG \
-    DEQP_EXPECTED_RENDERER \
-    DEQP_FRACTION \
-    DEQP_HEIGHT \
-    DEQP_RESULTS_DIR \
-    DEQP_RUNNER_OPTIONS \
-    DEQP_SUITE \
-    DEQP_TEMP_DIR \
-    DEQP_VARIANT \
-    DEQP_VER \
-    DEQP_WIDTH \
-    DEVICE_NAME \
-    DRIVER_NAME \
-    EGL_PLATFORM \
-    ETNA_MESA_DEBUG \
-    FDO_CI_CONCURRENT \
-    FDO_UPSTREAM_REPO \
-    FD_MESA_DEBUG \
-    FLAKES_CHANNEL \
-    FREEDRENO_HANGCHECK_MS \
-    GALLIUM_DRIVER \
-    GALLIVM_PERF \
-    GPU_VERSION \
-    GTEST \
-    GTEST_FAILS \
-    GTEST_FRACTION \
-    GTEST_RESULTS_DIR \
-    GTEST_RUNNER_OPTIONS \
-    GTEST_SKIPS \
-    HWCI_FREQ_MAX \
-    HWCI_KERNEL_MODULES \
-    HWCI_KVM \
-    HWCI_START_WESTON \
-    HWCI_START_XORG \
-    HWCI_TEST_SCRIPT \
-    IR3_SHADER_DEBUG \
-    JOB_ARTIFACTS_BASE \
-    JOB_RESULTS_PATH \
-    JOB_ROOTFS_OVERLAY_PATH \
-    KERNEL_IMAGE_BASE \
-    KERNEL_IMAGE_NAME \
-    LD_LIBRARY_PATH \
-    LP_NUM_THREADS \
-    MESA_BASE_TAG \
-    MESA_BUILD_PATH \
-    MESA_DEBUG \
-    MESA_GLES_VERSION_OVERRIDE \
-    MESA_GLSL_VERSION_OVERRIDE \
-    MESA_GL_VERSION_OVERRIDE \
-    MESA_IMAGE \
-    MESA_IMAGE_PATH \
-    MESA_IMAGE_TAG \
-    MESA_LOADER_DRIVER_OVERRIDE \
-    MESA_TEMPLATES_COMMIT \
-    MESA_VK_IGNORE_CONFORMANCE_WARNING \
-    S3_HOST \
-    S3_RESULTS_UPLOAD \
-    NIR_DEBUG \
-    PAN_I_WANT_A_BROKEN_VULKAN_DRIVER \
-    PAN_MESA_DEBUG \
-    PANVK_DEBUG \
-    PIGLIT_FRACTION \
-    PIGLIT_NO_WINDOW \
-    PIGLIT_OPTIONS \
-    PIGLIT_PLATFORM \
-    PIGLIT_PROFILES \
-    PIGLIT_REPLAY_ARTIFACTS_BASE_URL \
-    PIGLIT_REPLAY_DEVICE_NAME \
-    PIGLIT_REPLAY_EXTRA_ARGS \
-    PIGLIT_REPLAY_LOOP_TIMES \
-    PIGLIT_REPLAY_REFERENCE_IMAGES_BASE \
-    PIGLIT_REPLAY_SUBCOMMAND \
-    PIGLIT_RESULTS \
-    PIGLIT_TESTS \
-    PIGLIT_TRACES_FILE \
-    PIPELINE_ARTIFACTS_BASE \
-    RADEON_DEBUG \
-    RADV_DEBUG \
-    RADV_PERFTEST \
-    SKQP_ASSETS_DIR \
-    SKQP_BACKENDS \
-    TU_DEBUG \
-    USE_ANGLE \
-    VIRGL_HOST_API \
-    WAFFLE_PLATFORM \
-    VK_CPU \
-    VK_DRIVER \
-    VK_ICD_FILENAMES \
-    VKD3D_PROTON_RESULTS \
-    VKD3D_CONFIG \
-    ZINK_DESCRIPTORS \
-    ZINK_DEBUG \
-    LVP_POISON_MEMORY \
-    ; do
+VARS=(
+    ACO_DEBUG
+    ARTIFACTS_BASE_URL
+    ASAN_OPTIONS
+    BASE_SYSTEM_FORK_HOST_PREFIX
+    BASE_SYSTEM_MAINLINE_HOST_PREFIX
+    CI_COMMIT_BRANCH
+    CI_COMMIT_REF_NAME
+    CI_COMMIT_TITLE
+    CI_JOB_ID
+    CI_JOB_JWT_FILE
+    CI_JOB_STARTED_AT
+    CI_JOB_NAME
+    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_PIPELINE_URL
+    CI_PROJECT_DIR
+    CI_PROJECT_NAME
+    CI_PROJECT_PATH
+    CI_PROJECT_ROOT_NAMESPACE
+    CI_RUNNER_DESCRIPTION
+    CI_SERVER_URL
+    CROSVM_GALLIUM_DRIVER
+    CROSVM_GPU_ARGS
+    CURRENT_SECTION
+    DEQP_BIN_DIR
+    DEQP_CONFIG
+    DEQP_EXPECTED_RENDERER
+    DEQP_FRACTION
+    DEQP_HEIGHT
+    DEQP_RESULTS_DIR
+    DEQP_RUNNER_OPTIONS
+    DEQP_SUITE
+    DEQP_TEMP_DIR
+    DEQP_VER
+    DEQP_WIDTH
+    DEVICE_NAME
+    DRIVER_NAME
+    EGL_PLATFORM
+    ETNA_MESA_DEBUG
+    FDO_CI_CONCURRENT
+    FDO_UPSTREAM_REPO
+    FD_MESA_DEBUG
+    FLAKES_CHANNEL
+    FREEDRENO_HANGCHECK_MS
+    GALLIUM_DRIVER
+    GALLIVM_PERF
+    GPU_VERSION
+    GTEST
+    GTEST_FAILS
+    GTEST_FRACTION
+    GTEST_RESULTS_DIR
+    GTEST_RUNNER_OPTIONS
+    GTEST_SKIPS
+    HWCI_FREQ_MAX
+    HWCI_KERNEL_MODULES
+    HWCI_KVM
+    HWCI_START_WESTON
+    HWCI_START_XORG
+    HWCI_TEST_SCRIPT
+    IR3_SHADER_DEBUG
+    JOB_ARTIFACTS_BASE
+    JOB_RESULTS_PATH
+    JOB_ROOTFS_OVERLAY_PATH
+    KERNEL_IMAGE_BASE
+    KERNEL_IMAGE_NAME
+    LD_LIBRARY_PATH
+    LIBGL_ALWAYS_SOFTWARE
+    LP_NUM_THREADS
+    MESA_BASE_TAG
+    MESA_BUILD_PATH
+    MESA_DEBUG
+    MESA_GLES_VERSION_OVERRIDE
+    MESA_GLSL_VERSION_OVERRIDE
+    MESA_GL_VERSION_OVERRIDE
+    MESA_IMAGE
+    MESA_IMAGE_PATH
+    MESA_IMAGE_TAG
+    MESA_LOADER_DRIVER_OVERRIDE
+    MESA_TEMPLATES_COMMIT
+    MESA_VK_IGNORE_CONFORMANCE_WARNING
+    S3_HOST
+    S3_RESULTS_UPLOAD
+    NIR_DEBUG
+    PAN_I_WANT_A_BROKEN_VULKAN_DRIVER
+    PAN_MESA_DEBUG
+    PANVK_DEBUG
+    PIGLIT_FRACTION
+    PIGLIT_NO_WINDOW
+    PIGLIT_OPTIONS
+    PIGLIT_PLATFORM
+    PIGLIT_PROFILES
+    PIGLIT_REPLAY_ANGLE_TAG
+    PIGLIT_REPLAY_ARTIFACTS_BASE_URL
+    PIGLIT_REPLAY_DEVICE_NAME
+    PIGLIT_REPLAY_EXTRA_ARGS
+    PIGLIT_REPLAY_LOOP_TIMES
+    PIGLIT_REPLAY_REFERENCE_IMAGES_BASE
+    PIGLIT_REPLAY_SUBCOMMAND
+    PIGLIT_RESULTS
+    PIGLIT_TESTS
+    PIGLIT_TRACES_FILE
+    PIPELINE_ARTIFACTS_BASE
+    RADEON_DEBUG
+    RADV_DEBUG
+    RADV_PERFTEST
+    SKQP_ASSETS_DIR
+    SKQP_BACKENDS
+    TU_DEBUG
+    USE_ANGLE
+    VIRGL_HOST_API
+    WAFFLE_PLATFORM
+    VK_CPU
+    VK_DRIVER
+    # required by virglrender CI
+    VK_DRIVER_FILES
+    VKD3D_PROTON_RESULTS
+    VKD3D_CONFIG
+    VKD3D_TEST_EXCLUDE
+    ZINK_DESCRIPTORS
+    ZINK_DEBUG
+    LVP_POISON_MEMORY
+)
+
+for var in "${VARS[@]}"; do
   if [ -n "${!var+x}" ]; then
     echo "export $var=${!var@Q}"
   fi

.gitlab-ci/common/init-stage2.sh

@@ -7,6 +7,8 @@
 # Second-stage init, used to set up devices and our job environment before
 # running tests.
 
+shopt -s extglob
+
 # Make sure to kill itself and all the children process from this script on
 # exiting, since any console output may interfere with LAVA signals handling,
 # which based on the log console.
@@ -106,6 +108,13 @@ export XDG_CACHE_HOME=/tmp
 # Make sure Python can find all our imports
 export PYTHONPATH=$(python3 -c "import sys;print(\":\".join(sys.path))")
 
+# If we need to specify a driver, it means several drivers could pick up this gpu;
+# ensure that the other driver can't accidentally be used
+if [ -n "$MESA_LOADER_DRIVER_OVERRIDE" ]; then
+  rm /install/lib/dri/!($MESA_LOADER_DRIVER_OVERRIDE)_dri.so
+fi
+ls -1 /install/lib/dri/*_dri.so || true
+
 if [ "$HWCI_FREQ_MAX" = "true" ]; then
   # Ensure initialization of the DRM device (needed by MSM)
   head -0 /dev/dri/renderD128
@@ -156,7 +165,7 @@ fi
 if [ -n "$HWCI_START_XORG" ]; then
   echo "touch /xorg-started; sleep 100000" > /xorg-script
   env \
-    VK_ICD_FILENAMES="/install/share/vulkan/icd.d/${VK_DRIVER}_icd.$(uname -m).json" \
+    VK_DRIVER_FILES="/install/share/vulkan/icd.d/${VK_DRIVER}_icd.$(uname -m).json" \
     xinit /bin/sh /xorg-script -- /usr/bin/Xorg -noreset -s 0 -dpms -logfile /Xorg.0.log &
   BACKGROUND_PIDS="$! $BACKGROUND_PIDS"
 
@@ -183,7 +192,7 @@ if [ -n "$HWCI_START_WESTON" ]; then
   mkdir -p /tmp/.X11-unix
 
   env \
-    VK_ICD_FILENAMES="/install/share/vulkan/icd.d/${VK_DRIVER}_icd.$(uname -m).json" \
+    VK_DRIVER_FILES="/install/share/vulkan/icd.d/${VK_DRIVER}_icd.$(uname -m).json" \
     weston -Bheadless-backend.so --use-gl -Swayland-0 --xwayland --idle-time=0 &
   BACKGROUND_PIDS="$! $BACKGROUND_PIDS"
 

.gitlab-ci/container/alpine/x86_64_build.sh

@@ -8,6 +8,8 @@
 set -e
 set -o xtrace
 
+export LLVM_VERSION="${LLVM_VERSION:=16}"
+
 EPHEMERAL=(
 )
 
@@ -16,6 +18,7 @@ DEPS=(
     bash
     bison
     ccache
+    clang16-dev
     cmake
     clang-dev
     coreutils
@@ -27,6 +30,7 @@ DEPS=(
     gettext
     glslang
     linux-headers
+    llvm16-static
     llvm16-dev
     meson
     expat-dev
@@ -37,6 +41,7 @@ DEPS=(
     libpciaccess-dev
     zlib-dev
     python3-dev
+    py3-cparser
     py3-mako
     py3-ply
     vulkan-headers
@@ -48,6 +53,10 @@ DEPS=(
 
 apk --no-cache add "${DEPS[@]}" "${EPHEMERAL[@]}"
 
+. .gitlab-ci/container/build-llvm-spirv.sh
+
+. .gitlab-ci/container/build-libclc.sh
+
 . .gitlab-ci/container/container_pre_build.sh
 
 

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

@@ -6,13 +6,13 @@ set -ex
 git config --global user.email "mesa@example.com"
 git config --global user.name "Mesa CI"
 
-CROSVM_VERSION=e3815e62d675ef436956a992e0ed58b7309c759d
+CROSVM_VERSION=1641c55bcc922588e24de73e9cca7b5e4005bd6d
 git clone --single-branch -b main --no-checkout https://chromium.googlesource.com/crosvm/crosvm /platform/crosvm
 pushd /platform/crosvm
 git checkout "$CROSVM_VERSION"
 git submodule update --init
 
-VIRGLRENDERER_VERSION=747c6ae5b194ca551a79958a9a86c42bddcc4553
+VIRGLRENDERER_VERSION=d9c002fac153b834a2c17731f2b85c36e333e102
 rm -rf third_party/virglrenderer
 git clone --single-branch -b main --no-checkout https://gitlab.freedesktop.org/virgl/virglrenderer.git third_party/virglrenderer
 pushd third_party/virglrenderer
@@ -31,10 +31,10 @@ RUSTFLAGS='-L native=/usr/local/lib' cargo install \
   --version 0.65.1 \
   $EXTRA_CARGO_ARGS
 
-CROSVM_USE_SYSTEM_VIRGLRENDERER=1 RUSTFLAGS='-L native=/usr/local/lib' cargo install \
+CROSVM_USE_SYSTEM_MINIGBM=1 CROSVM_USE_SYSTEM_VIRGLRENDERER=1 RUSTFLAGS='-L native=/usr/local/lib' cargo install \
   -j ${FDO_CI_CONCURRENT:-4} \
   --locked \
-  --features 'default-no-sandbox gpu x virgl_renderer virgl_renderer_next' \
+  --features 'default-no-sandbox gpu x virgl_renderer' \
   --path . \
   --root /usr/local \
   $EXTRA_CARGO_ARGS

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

@@ -3,29 +3,37 @@
 
 # When changing this file, you need to bump the following
 # .gitlab-ci/image-tags.yml tags:
-# DEBIAN_BASE_TAG
 # DEBIAN_X86_64_TEST_ANDROID_TAG
+# DEBIAN_X86_64_TEST_GL_TAG
+# DEBIAN_X86_64_TEST_VK_TAG
 # KERNEL_ROOTFS_TAG
 
 set -ex
 
+DEQP_RUNNER_VERSION=0.18.0
+
+DEQP_RUNNER_GIT_URL="${DEQP_RUNNER_GIT_URL:-https://gitlab.freedesktop.org/mesa/deqp-runner.git}"
+
 if [ -n "${DEQP_RUNNER_GIT_TAG}${DEQP_RUNNER_GIT_REV}" ]; then
     # Build and install from source
-    DEQP_RUNNER_CARGO_ARGS="--git ${DEQP_RUNNER_GIT_URL:-https://gitlab.freedesktop.org/anholt/deqp-runner.git}"
+    DEQP_RUNNER_CARGO_ARGS="--git $DEQP_RUNNER_GIT_URL"
 
     if [ -n "${DEQP_RUNNER_GIT_TAG}" ]; then
         DEQP_RUNNER_CARGO_ARGS="--tag ${DEQP_RUNNER_GIT_TAG} ${DEQP_RUNNER_CARGO_ARGS}"
+        DEQP_RUNNER_GIT_CHECKOUT="$DEQP_RUNNER_GIT_TAG"
     else
         DEQP_RUNNER_CARGO_ARGS="--rev ${DEQP_RUNNER_GIT_REV} ${DEQP_RUNNER_CARGO_ARGS}"
+        DEQP_RUNNER_GIT_CHECKOUT="$DEQP_RUNNER_GIT_REV"
     fi
 
     DEQP_RUNNER_CARGO_ARGS="${DEQP_RUNNER_CARGO_ARGS} ${EXTRA_CARGO_ARGS}"
 else
     # Install from package registry
-    DEQP_RUNNER_CARGO_ARGS="--version 0.16.0 ${EXTRA_CARGO_ARGS} -- deqp-runner"
+    DEQP_RUNNER_CARGO_ARGS="--version ${DEQP_RUNNER_VERSION} ${EXTRA_CARGO_ARGS} -- deqp-runner"
+    DEQP_RUNNER_GIT_CHECKOUT="v$DEQP_RUNNER_VERSION"
 fi
 
-if [ -z "$ANDROID_NDK_HOME" ]; then
+if [[ "$RUST_TARGET" != *-android ]]; then
     cargo install --locked  \
         -j ${FDO_CI_CONCURRENT:-4} \
         --root /usr/local \
@@ -33,7 +41,7 @@ if [ -z "$ANDROID_NDK_HOME" ]; then
 else
     mkdir -p /deqp-runner
     pushd /deqp-runner
-    git clone --branch v0.18.0 --depth 1 https://gitlab.freedesktop.org/anholt/deqp-runner.git deqp-runner-git
+    git clone --branch "$DEQP_RUNNER_GIT_CHECKOUT" --depth 1 "$DEQP_RUNNER_GIT_URL" deqp-runner-git
     pushd deqp-runner-git
 
     cargo install --locked  \
@@ -41,10 +49,10 @@ else
         --root /usr/local --version 2.10.0 \
         cargo-ndk
 
-    rustup target add x86_64-linux-android
-    RUSTFLAGS='-C target-feature=+crt-static' cargo ndk --target x86_64-linux-android build
+    rustup target add $RUST_TARGET
+    RUSTFLAGS='-C target-feature=+crt-static' cargo ndk --target $RUST_TARGET build --release
 
-    mv target/x86_64-linux-android/debug/deqp-runner /deqp-runner
+    mv target/$RUST_TARGET/release/deqp-runner /deqp-runner
 
     cargo uninstall --locked  \
         --root /usr/local \

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

@@ -10,10 +10,89 @@
 
 set -ex -o pipefail
 
-DEQP_VERSION=vulkan-cts-1.3.7.0
+# See `deqp_build_targets` below for which release is used to produce which
+# binary. Unless this comment has bitrotten:
+# - the VK release produces `deqp-vk`,
+# - the GL release produces `glcts`, and
+# - the GLES release produces `deqp-gles*` and `deqp-egl`
+
+DEQP_VK_VERSION=1.3.8.2
+DEQP_GL_VERSION=4.6.4.0
+DEQP_GLES_VERSION=3.2.10.0
+
+# Patches to VulkanCTS may come from commits in their repo (listed in
+# cts_commits_to_backport) or patch files stored in our repo (in the patch
+# directory `$OLDPWD/.gitlab-ci/container/patches/` listed in cts_patch_files).
+# Both list variables would have comments explaining the reasons behind the
+# patches.
+
+# shellcheck disable=SC2034
+vk_cts_commits_to_backport=(
+    # Fix more ASAN errors due to missing virtual destructors
+    dd40bcfef1b4035ea55480b6fd4d884447120768
+
+    # Remove "unused shader stages" tests
+    7dac86c6bbd15dec91d7d9a98cd6dd57c11092a7
+)
+
+# shellcheck disable=SC2034
+vk_cts_patch_files=(
+)
+
+if [ "${DEQP_TARGET}" = 'android' ]; then
+  vk_cts_patch_files+=(
+    build-deqp-vk_Allow-running-on-Android-from-the-command-line.patch
+    build-deqp-vk_Android-prints-to-stdout-instead-of-logcat.patch
+  )
+fi
+
+# shellcheck disable=SC2034
+gl_cts_commits_to_backport=(
+)
+
+# shellcheck disable=SC2034
+gl_cts_patch_files=(
+)
+
+if [ "${DEQP_TARGET}" = 'android' ]; then
+  gl_cts_patch_files+=(
+    build-deqp-gl_Allow-running-on-Android-from-the-command-line.patch
+    build-deqp-gl_Android-prints-to-stdout-instead-of-logcat.patch
+  )
+fi
+
+# shellcheck disable=SC2034
+# GLES builds also EGL
+gles_cts_commits_to_backport=(
+  # Implement support for the EGL_EXT_config_select_group extension
+  88ba9ac270db5be600b1ecacbc6d9db0c55d5be4
+)
+
+# shellcheck disable=SC2034
+gles_cts_patch_files=(
+)
+
+if [ "${DEQP_TARGET}" = 'android' ]; then
+  gles_cts_patch_files+=(
+    build-deqp-gles_Allow-running-on-Android-from-the-command-line.patch
+    build-deqp-gles_Android-prints-to-stdout-instead-of-logcat.patch
+  )
+fi
+
+
+### Careful editing anything below this line
+
 
 git config --global user.email "mesa@example.com"
 git config --global user.name "Mesa CI"
+
+# shellcheck disable=SC2153
+case "${DEQP_API}" in
+  VK) DEQP_VERSION="vulkan-cts-$DEQP_VK_VERSION";;
+  GL) DEQP_VERSION="opengl-cts-$DEQP_GL_VERSION";;
+  GLES) DEQP_VERSION="opengl-es-cts-$DEQP_GLES_VERSION";;
+esac
+
 git clone \
     https://github.com/KhronosGroup/VK-GL-CTS.git \
     -b $DEQP_VERSION \
@@ -23,50 +102,30 @@ pushd /VK-GL-CTS
 
 mkdir -p /deqp
 
-echo "dEQP base version $DEQP_VERSION" > /deqp/version-log
+# shellcheck disable=SC2153
+deqp_api=${DEQP_API,,}
 
-# Patches to VulkanCTS may come from commits in their repo (listed in
-# cts_commits_to_backport) or patch files stored in our repo (in the patch
-# directory `$OLDPWD/.gitlab-ci/container/patches/` listed in cts_patch_files).
-# Both list variables would have comments explaining the reasons behind the
-# patches.
-
-cts_commits_to_backport=(
-    # Take multiview into account for task shader inv. stats
-    22aa3f4c59f6e1d4daebd5a8c9c05bce6cd3b63b
-
-    # Remove illegal mesh shader query tests
-    2a87f7b25dc27188be0f0a003b2d7aef69d9002e
-
-    # Relax fragment shader invocations result verifications
-    0d8bf6a2715f95907e9cf86a86876ff1f26c66fe
-
-    # Fix several issues in dynamic rendering basic tests
-    c5453824b498c981c6ba42017d119f5de02a3e34
-)
-
-for commit in "${cts_commits_to_backport[@]}"
+cts_commits_to_backport="${deqp_api}_cts_commits_to_backport[@]"
+for commit in "${!cts_commits_to_backport}"
 do
   PATCH_URL="https://github.com/KhronosGroup/VK-GL-CTS/commit/$commit.patch"
-  echo "Apply patch to VK-GL-CTS from $PATCH_URL"
+  echo "Apply patch to ${DEQP_API} CTS from $PATCH_URL"
   curl -L --retry 4 -f --retry-all-errors --retry-delay 60 $PATCH_URL | \
     git am -
 done
 
-cts_patch_files=(
-  # Android specific patches.
-  build-deqp_Allow-running-on-Android-from-the-command-line.patch
-  build-deqp_Android-prints-to-stdout-instead-of-logcat.patch
-)
-
-for patch in "${cts_patch_files[@]}"
+cts_patch_files="${deqp_api}_cts_patch_files[@]"
+for patch in "${!cts_patch_files}"
 do
-  echo "Apply patch to VK-GL-CTS from $patch"
+  echo "Apply patch to ${DEQP_API} CTS from $patch"
   git am < $OLDPWD/.gitlab-ci/container/patches/$patch
 done
 
-echo "The following local patches are applied on top:" >> /deqp/version-log
-git log --reverse --oneline $DEQP_VERSION.. --format=%s | sed 's/^/- /' >> /deqp/version-log
+{
+  echo "dEQP base version $DEQP_VERSION"
+  echo "The following local patches are applied on top:"
+  git log --reverse --oneline $DEQP_VERSION.. --format=%s | sed 's/^/- /'
+} > /deqp/version-$deqp_api
 
 # --insecure is due to SSL cert failures hitting sourceforge for zlib and
 # libpng (sigh).  The archives get their checksums checked anyway, and git
@@ -79,57 +138,97 @@ popd
 
 pushd /deqp
 
-if [ "${DEQP_TARGET}" != 'android' ]; then
+if [ "${DEQP_API}" = 'GLES' ]; then
+  if [ "${DEQP_TARGET}" = 'android' ]; then
+    cmake -S /VK-GL-CTS -B . -G Ninja \
+        -DDEQP_TARGET=android \
+        -DCMAKE_BUILD_TYPE=Release \
+        $EXTRA_CMAKE_ARGS
+    mold --run ninja modules/egl/deqp-egl
+    mv /deqp/modules/egl/deqp-egl /deqp/modules/egl/deqp-egl-android
+  else
     # When including EGL/X11 testing, do that build first and save off its
     # deqp-egl binary.
     cmake -S /VK-GL-CTS -B . -G Ninja \
         -DDEQP_TARGET=x11_egl_glx \
         -DCMAKE_BUILD_TYPE=Release \
         $EXTRA_CMAKE_ARGS
-    ninja modules/egl/deqp-egl
+    mold --run ninja modules/egl/deqp-egl
     mv /deqp/modules/egl/deqp-egl /deqp/modules/egl/deqp-egl-x11
 
     cmake -S /VK-GL-CTS -B . -G Ninja \
         -DDEQP_TARGET=wayland \
         -DCMAKE_BUILD_TYPE=Release \
         $EXTRA_CMAKE_ARGS
-    ninja modules/egl/deqp-egl
+    mold --run ninja modules/egl/deqp-egl
     mv /deqp/modules/egl/deqp-egl /deqp/modules/egl/deqp-egl-wayland
+  fi
 fi
 
 cmake -S /VK-GL-CTS -B . -G Ninja \
-      -DDEQP_TARGET=${DEQP_TARGET:-default} \
+      -DDEQP_TARGET=${DEQP_TARGET} \
       -DCMAKE_BUILD_TYPE=Release \
       $EXTRA_CMAKE_ARGS
-mold --run ninja
 
-if [ "${DEQP_TARGET}" = 'android' ]; then
-    mv /deqp/modules/egl/deqp-egl /deqp/modules/egl/deqp-egl-android
+# Make sure `default` doesn't silently stop detecting one of the platforms we care about
+if [ "${DEQP_TARGET}" = 'default' ]; then
+  grep -q DEQP_SUPPORT_WAYLAND=1 build.ninja
+  grep -q DEQP_SUPPORT_X11=1 build.ninja
+  grep -q DEQP_SUPPORT_XCB=1 build.ninja
 fi
 
-# Copy out the mustpass lists we want.
-mkdir /deqp/mustpass
-for mustpass in $(< /VK-GL-CTS/external/vulkancts/mustpass/main/vk-default.txt) ; do
-    cat /VK-GL-CTS/external/vulkancts/mustpass/main/$mustpass \
-        >> /deqp/mustpass/vk-master.txt
-done
+deqp_build_targets=()
+case "${DEQP_API}" in
+  VK)
+    deqp_build_targets+=(deqp-vk)
+    ;;
+  GL)
+    deqp_build_targets+=(glcts)
+    ;;
+  GLES)
+    deqp_build_targets+=(deqp-gles{2,3,31})
+    # deqp-egl also comes from this build, but it is handled separately above.
+    ;;
+esac
+if [ "${DEQP_TARGET}" != 'android' ]; then
+  deqp_build_targets+=(testlog-to-xml)
+  deqp_build_targets+=(testlog-to-csv)
+  deqp_build_targets+=(testlog-to-junit)
+fi
+
+mold --run ninja "${deqp_build_targets[@]}"
 
 if [ "${DEQP_TARGET}" != 'android' ]; then
-    cp \
-        /deqp/external/openglcts/modules/gl_cts/data/mustpass/gles/aosp_mustpass/3.2.6.x/*.txt \
-        /deqp/mustpass/.
-    cp \
-        /deqp/external/openglcts/modules/gl_cts/data/mustpass/egl/aosp_mustpass/3.2.6.x/egl-master.txt \
-        /deqp/mustpass/.
-    cp \
-        /deqp/external/openglcts/modules/gl_cts/data/mustpass/gles/khronos_mustpass/3.2.6.x/*-master.txt \
-        /deqp/mustpass/.
-    cp \
-        /deqp/external/openglcts/modules/gl_cts/data/mustpass/gl/khronos_mustpass/4.6.1.x/*-master.txt \
-        /deqp/mustpass/.
-    cp \
-        /deqp/external/openglcts/modules/gl_cts/data/mustpass/gl/khronos_mustpass_single/4.6.1.x/*-single.txt \
-        /deqp/mustpass/.
+    # Copy out the mustpass lists we want.
+    mkdir -p /deqp/mustpass
+
+    if [ "${DEQP_API}" = 'VK' ]; then
+        for mustpass in $(< /VK-GL-CTS/external/vulkancts/mustpass/main/vk-default.txt) ; do
+            cat /VK-GL-CTS/external/vulkancts/mustpass/main/$mustpass \
+                >> /deqp/mustpass/vk-main.txt
+        done
+    fi
+
+    if [ "${DEQP_API}" = 'GL' ]; then
+        cp \
+            /VK-GL-CTS/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.1.x/*-main.txt \
+            /deqp/mustpass/
+        cp \
+            /VK-GL-CTS/external/openglcts/data/mustpass/gl/khronos_mustpass_single/4.6.1.x/*-single.txt \
+            /deqp/mustpass/
+    fi
+
+    if [ "${DEQP_API}" = 'GLES' ]; then
+        cp \
+            /VK-GL-CTS/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.6.x/*.txt \
+            /deqp/mustpass/
+        cp \
+            /VK-GL-CTS/external/openglcts/data/mustpass/egl/aosp_mustpass/3.2.6.x/egl-main.txt \
+            /deqp/mustpass/
+        cp \
+            /VK-GL-CTS/external/openglcts/data/mustpass/gles/khronos_mustpass/3.2.6.x/*-main.txt \
+            /deqp/mustpass/
+    fi
 
     # Save *some* executor utils, but otherwise strip things down
     # to reduct deqp build size:
@@ -140,8 +239,8 @@ if [ "${DEQP_TARGET}" != 'android' ]; then
 fi
 
 # Remove other mustpass files, since we saved off the ones we wanted to conventient locations above.
-rm -rf /deqp/external/openglcts/modules/gl_cts/data/mustpass
-rm -rf /deqp/external/vulkancts/modules/vulkan/vk-master*
+rm -rf /deqp/external/**/mustpass/
+rm -rf /deqp/external/vulkancts/modules/vulkan/vk-main*
 rm -rf /deqp/external/vulkancts/modules/vulkan/vk-default
 
 rm -rf /deqp/external/openglcts/modules/cts-runner
@@ -149,9 +248,15 @@ rm -rf /deqp/modules/internal
 rm -rf /deqp/execserver
 rm -rf /deqp/framework
 find . -depth \( -iname '*cmake*' -o -name '*ninja*' -o -name '*.o' -o -name '*.a' \) -exec rm -rf {} \;
-${STRIP_CMD:-strip} external/vulkancts/modules/vulkan/deqp-vk
-${STRIP_CMD:-strip} external/openglcts/modules/glcts
-${STRIP_CMD:-strip} modules/*/deqp-*
+if [ "${DEQP_API}" = 'VK' ]; then
+  ${STRIP_CMD:-strip} external/vulkancts/modules/vulkan/deqp-vk
+fi
+if [ "${DEQP_API}" = 'GL' ]; then
+  ${STRIP_CMD:-strip} external/openglcts/modules/glcts
+fi
+if [ "${DEQP_API}" = 'GLES' ]; then
+  ${STRIP_CMD:-strip} modules/*/deqp-*
+fi
 du -sh ./*
 rm -rf /VK-GL-CTS
 popd

.gitlab-ci/container/build-directx-headers.sh

@@ -7,7 +7,7 @@
 
 set -ex
 
-git clone https://github.com/microsoft/DirectX-Headers -b v1.611.0 --depth 1
+git clone https://github.com/microsoft/DirectX-Headers -b v1.613.1 --depth 1
 pushd DirectX-Headers
 meson setup build --backend=ninja --buildtype=release -Dbuild-test=false $EXTRA_MESON_ARGS
 meson install -C build

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

@@ -2,7 +2,14 @@
 
 set -ex
 
-MOLD_VERSION="1.11.0"
+# When changing this file, you need to bump the following
+# .gitlab-ci/image-tags.yml tags:
+# DEBIAN_BASE_TAG
+# DEBIAN_BUILD_TAG
+# FEDORA_X86_64_BUILD_TAG
+# KERNEL_ROOTFS_TAG
+
+MOLD_VERSION="2.4.1"
 
 git clone -b v"$MOLD_VERSION" --single-branch --depth 1 https://github.com/rui314/mold.git
 pushd mold

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

@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+
+# When changing this file, you need to bump the following
+# .gitlab-ci/image-tags.yml tags:
+# DEBIAN_X86_64_TEST_GL_TAG
+
+set -ex -o pipefail
+
+### Careful editing anything below this line
+
+git config --global user.email "mesa@example.com"
+git config --global user.name "Mesa CI"
+git clone https://github.com/axeldavy/Xnine.git /Xnine
+mkdir /Xnine/build
+pushd /Xnine/build
+git checkout c64753d224c08006bcdcfa7880ada826f27164b1
+
+cmake .. -DBUILD_TESTS=1 -DWITH_DRI3=1 -DD3DADAPTER9_LOCATION=/install/lib/d3d/d3dadapter9.so
+make
+
+mkdir -p /NineTests/
+mv NineTests/NineTests /NineTests/
+
+popd
+rm -rf /Xnine

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

@@ -8,7 +8,7 @@ set -ex
 # DEBIAN_X86_64_TEST_VK_TAG
 # KERNEL_ROOTFS_TAG
 
-REV="f7db20b03de6896d013826c0a731bc4417c1a5a0"
+REV="f7ece74a107a2f99b2f494d978c84f8d51faa703"
 
 git clone https://gitlab.freedesktop.org/mesa/piglit.git --single-branch --no-checkout /piglit
 pushd /piglit

.gitlab-ci/container/build-vkd3d-proton.sh

@@ -6,7 +6,7 @@
 # KERNEL_ROOTFS_TAG
 set -ex
 
-VKD3D_PROTON_COMMIT="a0ccc383937903f4ca0997ce53e41ccce7f2f2ec"
+VKD3D_PROTON_COMMIT="c3b385606a93baed42482d822805e0d9c2f3f603"
 
 VKD3D_PROTON_DST_DIR="/vkd3d-proton-tests"
 VKD3D_PROTON_SRC_DIR="/vkd3d-proton-src"

.gitlab-ci/container/build-vulkan-validation.sh

@@ -7,7 +7,7 @@
 
 set -ex
 
-VALIDATION_TAG="v1.3.269"
+VALIDATION_TAG="v1.3.281"
 
 git clone -b "$VALIDATION_TAG" --single-branch --depth 1 https://github.com/KhronosGroup/Vulkan-ValidationLayers.git
 pushd Vulkan-ValidationLayers

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

@@ -3,8 +3,17 @@
 
 set -ex
 
+# When changing this file, you need to bump the following
+# .gitlab-ci/image-tags.yml tags:
+# DEBIAN_BUILD_TAG
+# DEBIAN_X86_64_TEST_ANDROID_TAG
+# DEBIAN_X86_64_TEST_GL_TAG
+# DEBIAN_X86_64_TEST_VK_TAG
+# FEDORA_X86_64_BUILD_TAG
+# KERNEL_ROOTFS_TAG
+
 export LIBWAYLAND_VERSION="1.21.0"
-export WAYLAND_PROTOCOLS_VERSION="1.31"
+export WAYLAND_PROTOCOLS_VERSION="1.34"
 
 git clone https://gitlab.freedesktop.org/wayland/wayland
 cd wayland

.gitlab-ci/container/cross_build.sh

@@ -52,7 +52,8 @@ if [[ $arch != "armhf" ]]; then
     # We don't need clang-format for the crossbuilds, but the installed amd64
     # package will conflict with libclang. Uninstall clang-format (and its
     # problematic dependency) to fix.
-    apt-get remove -y "clang-format-${LLVM_VERSION}" "libclang-cpp${LLVM_VERSION}"
+    apt-get remove -y "clang-format-${LLVM_VERSION}" "libclang-cpp${LLVM_VERSION}" \
+            "llvm-${LLVM_VERSION}-runtime" "llvm-${LLVM_VERSION}-linker-tools"
 
     # llvm-*-tools:$arch conflicts with python3:amd64. Install dependencies only
     # with apt-get, then force-install llvm-*-{dev,tools}:$arch with dpkg to get

.gitlab-ci/container/debian/arm64_build.sh

@@ -27,6 +27,7 @@ DEPS=(
     cmake
     curl
     fastboot
+    flatbuffers-compiler
     flex
     g++
     git
@@ -36,6 +37,7 @@ DEPS=(
     libdrm-dev
     libelf-dev
     libexpat1-dev
+    libflatbuffers-dev
     libvulkan-dev
     libx11-dev
     libx11-xcb-dev
@@ -50,6 +52,7 @@ DEPS=(
     libxext-dev
     libxrandr-dev
     libxshmfence-dev
+    libxtensor-dev
     libxxf86vm-dev
     libwayland-dev
     libwayland-egl-backend-dev
@@ -61,6 +64,7 @@ DEPS=(
     python3-mako
     python3-pil
     python3-pip
+    python3-pycparser
     python3-requests
     python3-setuptools
     u-boot-tools

.gitlab-ci/container/debian/x86_64_build-base.sh

@@ -25,10 +25,12 @@ DEPS=(
     bison
     ccache
     curl
+    "clang-${LLVM_VERSION}"
     "clang-format-${LLVM_VERSION}"
     dpkg-cross
     findutils
     flex
+    flatbuffers-compiler
     g++
     cmake
     gcc
@@ -41,6 +43,7 @@ DEPS=(
     libelf-dev
     libepoxy-dev
     libexpat1-dev
+    libflatbuffers-dev
     libgtk-3-dev
     "libllvm${LLVM_VERSION}"
     libomxil-bellagio-dev
@@ -56,6 +59,7 @@ DEPS=(
     libxrandr-dev
     libxrender-dev
     libxshmfence-dev
+    libxtensor-dev
     libxxf86vm-dev
     libwayland-egl-backend-dev
     make
@@ -66,6 +70,7 @@ DEPS=(
     python3-pil
     python3-pip
     python3-ply
+    python3-pycparser
     python3-requests
     python3-setuptools
     qemu-user
@@ -83,6 +88,10 @@ apt-get update
 apt-get install -y --no-remove "${DEPS[@]}" "${EPHEMERAL[@]}" \
         $EXTRA_LOCAL_PACKAGES
 
+. .gitlab-ci/container/build-llvm-spirv.sh
+
+. .gitlab-ci/container/build-libclc.sh
+
 # Needed for ci-fairy, this revision is able to upload files to S3
 pip3 install --break-system-packages git+http://gitlab.freedesktop.org/freedesktop/ci-templates@ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2
 

.gitlab-ci/container/debian/x86_64_build.sh

@@ -75,10 +75,6 @@ tar -xvf $XORGMACROS_VERSION.tar.bz2 && rm $XORGMACROS_VERSION.tar.bz2
 cd $XORGMACROS_VERSION; ./configure; make install; cd ..
 rm -rf $XORGMACROS_VERSION
 
-. .gitlab-ci/container/build-llvm-spirv.sh
-
-. .gitlab-ci/container/build-libclc.sh
-
 . .gitlab-ci/container/build-wayland.sh
 
 . .gitlab-ci/container/build-shader-db.sh
@@ -94,6 +90,13 @@ RUSTFLAGS='-L native=/usr/local/lib' cargo install \
   -j ${FDO_CI_CONCURRENT:-4} \
   --root /usr/local
 
+# install cbindgen
+RUSTFLAGS='-L native=/usr/local/lib' cargo install \
+  cbindgen --version 0.26.0 \
+  --locked \
+  -j ${FDO_CI_CONCURRENT:-4} \
+  --root /usr/local
+
 ############### Uninstall the build software
 
 apt-get purge -y "${EPHEMERAL[@]}"

.gitlab-ci/container/debian/x86_64_test-android.sh

@@ -41,6 +41,7 @@ rm "$ndk.zip"
 ############### Build dEQP runner
 
 export ANDROID_NDK_HOME=/$ndk
+export RUST_TARGET=x86_64-linux-android
 . .gitlab-ci/container/build-rust.sh
 . .gitlab-ci/container/build-deqp-runner.sh
 
@@ -49,6 +50,12 @@ rm -rf /root/.rustup
 
 ############### Build dEQP GL
 
+DEQP_API=GL \
+DEQP_TARGET="android" \
+EXTRA_CMAKE_ARGS="-DDEQP_TARGET_TOOLCHAIN=ndk-modern -DANDROID_NDK_PATH=/$ndk -DANDROID_ABI=x86_64 -DDE_ANDROID_API=28" \
+. .gitlab-ci/container/build-deqp.sh
+
+DEQP_API=GLES \
 DEQP_TARGET="android" \
 EXTRA_CMAKE_ARGS="-DDEQP_TARGET_TOOLCHAIN=ndk-modern -DANDROID_NDK_PATH=/$ndk -DANDROID_ABI=x86_64 -DDE_ANDROID_API=28" \
 . .gitlab-ci/container/build-deqp.sh
@@ -73,8 +80,14 @@ popd
 
 ############### Building and installing Debian package ...
 
-git clone --depth 1 https://github.com/google/android-cuttlefish.git
+ANDROID_CUTTLEFISH_VERSION=f6494d9fbeaa9974b56923e3029909e5d5f440dd
+
+mkdir android-cuttlefish
 pushd android-cuttlefish
+git init
+git remote add origin https://github.com/google/android-cuttlefish.git
+git fetch --depth 1 origin "$ANDROID_CUTTLEFISH_VERSION"
+git checkout FETCH_HEAD
 
 pushd base
 dpkg-buildpackage -uc -us

.gitlab-ci/container/debian/x86_64_test-gl.sh

@@ -22,6 +22,7 @@ EPHEMERAL=(
     "libclang-cpp${LLVM_VERSION}-dev"
     libdrm-dev
     libgles2-mesa-dev
+    libgtest-dev
     libpciaccess-dev
     libpng-dev
     libudev-dev
@@ -30,6 +31,9 @@ EPHEMERAL=(
     libwayland-dev
     libx11-xcb-dev
     libxcb-dri2-0-dev
+    libxcb-dri3-dev
+    libxcb-present-dev
+    libxfixes-dev
     libxkbcommon-dev
     libxrandr-dev
     libxrender-dev
@@ -46,6 +50,7 @@ EPHEMERAL=(
 DEPS=(
     clinfo
     iptables
+    kmod
     "libclang-common-${LLVM_VERSION}-dev"
     "libclang-cpp${LLVM_VERSION}"
     libcap2
@@ -60,6 +65,7 @@ DEPS=(
     spirv-tools
     sysvinit-core
     weston
+    xwayland
 )
 
 apt-get update
@@ -76,7 +82,13 @@ PIGLIT_OPTS="-DPIGLIT_BUILD_GLX_TESTS=ON -DPIGLIT_BUILD_CL_TESTS=ON -DPIGLIT_BUI
 
 ############### Build dEQP GL
 
-DEQP_TARGET=surfaceless . .gitlab-ci/container/build-deqp.sh
+DEQP_API=GL \
+DEQP_TARGET=surfaceless \
+. .gitlab-ci/container/build-deqp.sh
+
+DEQP_API=GLES \
+DEQP_TARGET=surfaceless \
+. .gitlab-ci/container/build-deqp.sh
 
 ############### Build apitrace
 
@@ -86,6 +98,10 @@ DEQP_TARGET=surfaceless . .gitlab-ci/container/build-deqp.sh
 
 . .gitlab-ci/container/build-vulkan-validation.sh
 
+############### Build nine tests
+
+. .gitlab-ci/container/build-ninetests.sh
+
 ############### Uninstall the build software
 
 apt-get purge -y "${EPHEMERAL[@]}"

.gitlab-ci/container/debian/x86_64_test-vk.sh

@@ -27,6 +27,7 @@ EPHEMERAL=(
     libvulkan-dev
     libwaffle-dev
     libx11-xcb-dev
+    libxcb-dri2-0-dev
     libxcb-ewmh-dev
     libxcb-keysyms1-dev
     libxkbcommon-dev
@@ -103,6 +104,8 @@ PIGLIT_BUILD_TARGETS="piglit_replayer" . .gitlab-ci/container/build-piglit.sh
 
 ############### Build dEQP VK
 
+DEQP_API=VK \
+DEQP_TARGET=default \
 . .gitlab-ci/container/build-deqp.sh
 
 ############### Build apitrace

.gitlab-ci/container/fedora/x86_64_build.sh

@@ -27,9 +27,11 @@ EPHEMERAL=(
 DEPS=(
     bindgen
     bison
+    cbindgen
     ccache
     clang-devel
     flex
+    flatbuffers-compiler
     gcc
     gcc-c++
     gettext
@@ -41,6 +43,7 @@ DEPS=(
     "pkgconfig(SPIRV-Tools)"
     "pkgconfig(dri2proto)"
     "pkgconfig(expat)"
+    "pkgconfig(flatbuffers)"
     "pkgconfig(glproto)"
     "pkgconfig(libclc)"
     "pkgconfig(libelf)"
@@ -66,6 +69,7 @@ DEPS=(
     "pkgconfig(xfixes)"
     "pkgconfig(xrandr)"
     "pkgconfig(xshmfence)"
+    "pkgconfig(xtensor)"
     "pkgconfig(xxf86vm)"
     "pkgconfig(zlib)"
     procps-ng
@@ -73,6 +77,7 @@ DEPS=(
     python3-devel
     python3-mako
     python3-ply
+    python3-pycparser
     rust-packaging
     vulkan-headers
     spirv-tools-devel

.gitlab-ci/container/gitlab-ci.yml

@@ -68,6 +68,10 @@ debian/x86_64_build-base:
     - .debian-container
   variables:
     MESA_IMAGE_TAG: &debian-x86_64_build-base "${DEBIAN_BASE_TAG}--${PKG_REPO_REV}"
+  rules:
+    # python-test requires debian/x86_64_build, which requires this job
+    - !reference [python-test, rules]
+    - !reference [.container, rules]
 
 .use-debian/x86_64_build-base:
   extends:
@@ -88,9 +92,9 @@ debian/x86_64_build:
   variables:
     MESA_IMAGE_TAG: &debian-x86_64_build ${DEBIAN_BUILD_TAG}
   rules:
-    - !reference [.use-debian/x86_64_build-base, rules]
     # python-test requires this job
     - !reference [python-test, rules]
+    - !reference [.use-debian/x86_64_build-base, rules]
 
 .use-debian/x86_64_build:
   extends:
@@ -222,7 +226,7 @@ debian/x86_64_test-vk:
     - debian/x86_64_test-vk
 
 # Debian based x86_64 test image for Android
-debian/x86_64_test-android:
+.debian/x86_64_test-android:
   extends: .use-debian/x86_64_test-base
   variables:
     MESA_IMAGE_TAG: &debian-x86_64_test-android ${DEBIAN_X86_64_TEST_ANDROID_TAG}

.gitlab-ci/container/lava_build.sh

@@ -272,7 +272,17 @@ mv /usr/local/bin/*-runner $ROOTFS/usr/bin/.
 
 
 ############### Build dEQP
-DEQP_TARGET=surfaceless . .gitlab-ci/container/build-deqp.sh
+DEQP_API=GL \
+DEQP_TARGET=surfaceless \
+. .gitlab-ci/container/build-deqp.sh
+
+DEQP_API=GLES \
+DEQP_TARGET=surfaceless \
+. .gitlab-ci/container/build-deqp.sh
+
+DEQP_API=VK \
+DEQP_TARGET=default \
+. .gitlab-ci/container/build-deqp.sh
 
 mv /deqp $ROOTFS/.
 

.gitlab-ci/container/patches/build-deqp-gl_Allow-running-on-Android-from-the-command-line.patch

@@ -0,0 +1,182 @@
+From dc97ee83a813f6b170079ddf2a04bbb06221a5a7 Mon Sep 17 00:00:00 2001
+From: Tomeu Vizoso <tomeu.vizoso@collabora.com>
+Date: Fri, 26 Aug 2022 18:24:27 +0200
+Subject: [PATCH 1/2] Allow running on Android from the command line
+
+For testing the Android EGL platform without having to go via the
+Android activity manager, build deqp-egl.
+
+Tests that render to native windows are unsupported, as command line
+programs cannot create windows on Android.
+
+$ cmake -S . -B build/ -DDEQP_TARGET=android -DDEQP_TARGET_TOOLCHAIN=ndk-modern -DCMAKE_C_FLAGS=-Werror -DCMAKE_CXX_FLAGS=-Werror -DANDROID_NDK_PATH=./android-ndk-r21d -DANDROID_ABI=x86_64 -DDE_ANDROID_API=28 -DGLCTS_GTF_TARGET=gles32 -G Ninja
+$ ninja -C build modules/egl/deqp-egl
+
+Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
+---
+ CMakeLists.txt                                | 38 ++-----------------
+ .../android/tcuAndroidNativeActivity.cpp      | 36 +++++++++---------
+ .../platform/android/tcuAndroidPlatform.cpp   | 12 +++++-
+ 3 files changed, 34 insertions(+), 52 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index eb58cc7ba..98b8fc6cc 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -272,7 +272,7 @@ include_directories(
+ 	external/vulkancts/framework/vulkan
+ 	)
+ 
+-if (DE_OS_IS_ANDROID OR DE_OS_IS_IOS)
++if (DE_OS_IS_IOS)
+ 	# On Android deqp modules are compiled as libraries and linked into final .so
+ 	set(DEQP_MODULE_LIBRARIES )
+ 	set(DEQP_MODULE_ENTRY_POINTS )
+@@ -316,7 +316,7 @@ macro (add_deqp_module MODULE_NAME SRCS LIBS EXECLIBS ENTRY)
+ 	set(DEQP_MODULE_LIBRARIES		${DEQP_MODULE_LIBRARIES} PARENT_SCOPE)
+ 	set(DEQP_MODULE_ENTRY_POINTS	${DEQP_MODULE_ENTRY_POINTS} PARENT_SCOPE)
+ 
+-	if (NOT DE_OS_IS_ANDROID AND NOT DE_OS_IS_IOS)
++	if (NOT DE_OS_IS_IOS)
+ 		# Executable target
+ 		add_executable(${MODULE_NAME} ${PROJECT_SOURCE_DIR}/framework/platform/tcuMain.cpp ${ENTRY})
+ 		target_link_libraries(${MODULE_NAME} PUBLIC "${EXECLIBS}" "${MODULE_NAME}${MODULE_LIB_TARGET_POSTFIX}")
+@@ -338,7 +338,7 @@ macro (add_deqp_module_skip_android MODULE_NAME SRCS LIBS EXECLIBS ENTRY)
+ 	add_library("${MODULE_NAME}${MODULE_LIB_TARGET_POSTFIX}" STATIC ${SRCS})
+ 	target_link_libraries("${MODULE_NAME}${MODULE_LIB_TARGET_POSTFIX}" ${LIBS})
+ 
+-	if (NOT DE_OS_IS_ANDROID AND NOT DE_OS_IS_IOS)
++	if (NOT DE_OS_IS_IOS)
+ 		# Executable target
+ 		add_executable(${MODULE_NAME} ${PROJECT_SOURCE_DIR}/framework/platform/tcuMain.cpp ${ENTRY})
+ 		target_link_libraries(${MODULE_NAME} PUBLIC "${EXECLIBS}" "${MODULE_NAME}${MODULE_LIB_TARGET_POSTFIX}")
+@@ -390,37 +390,7 @@ add_subdirectory(external/vulkancts/vkscpc ${MAYBE_EXCLUDE_FROM_ALL})
+ add_subdirectory(external/openglcts ${MAYBE_EXCLUDE_FROM_ALL})
+ 
+ # Single-binary targets
+-if (DE_OS_IS_ANDROID)
+-	include_directories(executor)
+-	include_directories(${PROJECT_BINARY_DIR}/external/vulkancts/framework/vulkan)
+-
+-	set(DEQP_SRCS
+-		framework/platform/android/tcuAndroidMain.cpp
+-		framework/platform/android/tcuAndroidJNI.cpp
+-		framework/platform/android/tcuAndroidPlatformCapabilityQueryJNI.cpp
+-		framework/platform/android/tcuTestLogParserJNI.cpp
+-		${DEQP_MODULE_ENTRY_POINTS}
+-		)
+-
+-	set(DEQP_LIBS
+-		tcutil-platform
+-		xecore
+-		${DEQP_MODULE_LIBRARIES}
+-		)
+-
+-	add_library(deqp SHARED ${DEQP_SRCS})
+-	target_link_libraries(deqp ${DEQP_LIBS})
+-
+-	# Separate out the debug information because it's enormous
+-	add_custom_command(TARGET deqp POST_BUILD
+-		COMMAND ${CMAKE_STRIP} --only-keep-debug -o $<TARGET_FILE:deqp>.debug $<TARGET_FILE:deqp>
+-		COMMAND ${CMAKE_STRIP} -g $<TARGET_FILE:deqp>)
+-
+-	# Needed by OpenGL CTS that defines its own activity but depends on
+-	# common Android support code.
+-	target_include_directories(deqp PRIVATE framework/platform/android)
+-
+-elseif (DE_OS_IS_IOS)
++if (DE_OS_IS_IOS)
+ 	# Code sign identity
+ 	set(DEQP_IOS_CODE_SIGN_IDENTITY "drawElements" CACHE STRING "Code sign identity for iOS build")
+ 
+diff --git a/framework/platform/android/tcuAndroidNativeActivity.cpp b/framework/platform/android/tcuAndroidNativeActivity.cpp
+index 6f8cd8fc5..b83e30f41 100644
+--- a/framework/platform/android/tcuAndroidNativeActivity.cpp
++++ b/framework/platform/android/tcuAndroidNativeActivity.cpp
+@@ -116,23 +116,25 @@ namespace Android
+ NativeActivity::NativeActivity (ANativeActivity* activity)
+ 	: m_activity(activity)
+ {
+-	activity->instance								= (void*)this;
+-	activity->callbacks->onStart					= onStartCallback;
+-	activity->callbacks->onResume					= onResumeCallback;
+-	activity->callbacks->onSaveInstanceState		= onSaveInstanceStateCallback;
+-	activity->callbacks->onPause					= onPauseCallback;
+-	activity->callbacks->onStop						= onStopCallback;
+-	activity->callbacks->onDestroy					= onDestroyCallback;
+-	activity->callbacks->onWindowFocusChanged		= onWindowFocusChangedCallback;
+-	activity->callbacks->onNativeWindowCreated		= onNativeWindowCreatedCallback;
+-	activity->callbacks->onNativeWindowResized		= onNativeWindowResizedCallback;
+-	activity->callbacks->onNativeWindowRedrawNeeded	= onNativeWindowRedrawNeededCallback;
+-	activity->callbacks->onNativeWindowDestroyed	= onNativeWindowDestroyedCallback;
+-	activity->callbacks->onInputQueueCreated		= onInputQueueCreatedCallback;
+-	activity->callbacks->onInputQueueDestroyed		= onInputQueueDestroyedCallback;
+-	activity->callbacks->onContentRectChanged		= onContentRectChangedCallback;
+-	activity->callbacks->onConfigurationChanged		= onConfigurationChangedCallback;
+-	activity->callbacks->onLowMemory				= onLowMemoryCallback;
++	if (activity) {
++		activity->instance								= (void*)this;
++		activity->callbacks->onStart					= onStartCallback;
++		activity->callbacks->onResume					= onResumeCallback;
++		activity->callbacks->onSaveInstanceState		= onSaveInstanceStateCallback;
++		activity->callbacks->onPause					= onPauseCallback;
++		activity->callbacks->onStop						= onStopCallback;
++		activity->callbacks->onDestroy					= onDestroyCallback;
++		activity->callbacks->onWindowFocusChanged		= onWindowFocusChangedCallback;
++		activity->callbacks->onNativeWindowCreated		= onNativeWindowCreatedCallback;
++		activity->callbacks->onNativeWindowResized		= onNativeWindowResizedCallback;
++		activity->callbacks->onNativeWindowRedrawNeeded	= onNativeWindowRedrawNeededCallback;
++		activity->callbacks->onNativeWindowDestroyed	= onNativeWindowDestroyedCallback;
++		activity->callbacks->onInputQueueCreated		= onInputQueueCreatedCallback;
++		activity->callbacks->onInputQueueDestroyed		= onInputQueueDestroyedCallback;
++		activity->callbacks->onContentRectChanged		= onContentRectChangedCallback;
++		activity->callbacks->onConfigurationChanged		= onConfigurationChangedCallback;
++		activity->callbacks->onLowMemory				= onLowMemoryCallback;
++	}
+ }
+ 
+ NativeActivity::~NativeActivity (void)
+diff --git a/framework/platform/android/tcuAndroidPlatform.cpp b/framework/platform/android/tcuAndroidPlatform.cpp
+index b8a35898c..cf02e6b70 100644
+--- a/framework/platform/android/tcuAndroidPlatform.cpp
++++ b/framework/platform/android/tcuAndroidPlatform.cpp
+@@ -22,6 +22,7 @@
+  *//*--------------------------------------------------------------------*/
+ 
+ #include "tcuAndroidPlatform.hpp"
++#include "tcuAndroidNativeActivity.hpp"
+ #include "tcuAndroidUtil.hpp"
+ #include "gluRenderContext.hpp"
+ #include "egluNativeDisplay.hpp"
+@@ -170,7 +171,7 @@ eglu::NativeWindow* NativeWindowFactory::createWindow (const eglu::WindowParams&
+ 	Window* window = m_windowRegistry.tryAcquireWindow();
+ 
+ 	if (!window)
+-		throw ResourceError("Native window is not available", DE_NULL, __FILE__, __LINE__);
++		throw NotSupportedError("Native window is not available", DE_NULL, __FILE__, __LINE__);
+ 
+ 	return new NativeWindow(window, params.width, params.height, format);
+ }
+@@ -292,6 +293,9 @@ static size_t getTotalSystemMemory (ANativeActivity* activity)
+ 
+ 	try
+ 	{
++		if (!activity)
++			throw tcu::InternalError("No activity (running from command line?");
++
+ 		const size_t totalMemory = getTotalAndroidSystemMemory(activity);
+ 		print("Device has %.2f MiB of system memory\n", static_cast<double>(totalMemory) / static_cast<double>(MiB));
+ 		return totalMemory;
+@@ -388,3 +392,9 @@ bool Platform::hasDisplay (vk::wsi::Type wsiType) const
+ 
+ } // Android
+ } // tcu
++
++tcu::Platform* createPlatform (void)
++{
++	tcu::Android::NativeActivity activity(NULL);
++	return new tcu::Android::Platform(activity);
++}
+-- 
+2.42.0
+

.gitlab-ci/container/patches/build-deqp-gles_Allow-running-on-Android-from-the-command-line.patch

@@ -0,0 +1,182 @@
+From dc97ee83a813f6b170079ddf2a04bbb06221a5a7 Mon Sep 17 00:00:00 2001
+From: Tomeu Vizoso <tomeu.vizoso@collabora.com>
+Date: Fri, 26 Aug 2022 18:24:27 +0200
+Subject: [PATCH 1/2] Allow running on Android from the command line
+
+For testing the Android EGL platform without having to go via the
+Android activity manager, build deqp-egl.
+
+Tests that render to native windows are unsupported, as command line
+programs cannot create windows on Android.
+
+$ cmake -S . -B build/ -DDEQP_TARGET=android -DDEQP_TARGET_TOOLCHAIN=ndk-modern -DCMAKE_C_FLAGS=-Werror -DCMAKE_CXX_FLAGS=-Werror -DANDROID_NDK_PATH=./android-ndk-r21d -DANDROID_ABI=x86_64 -DDE_ANDROID_API=28 -DGLCTS_GTF_TARGET=gles32 -G Ninja
+$ ninja -C build modules/egl/deqp-egl
+
+Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
+---
+ CMakeLists.txt                                | 38 ++-----------------
+ .../android/tcuAndroidNativeActivity.cpp      | 36 +++++++++---------
+ .../platform/android/tcuAndroidPlatform.cpp   | 12 +++++-
+ 3 files changed, 34 insertions(+), 52 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index eb58cc7ba..98b8fc6cc 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -272,7 +272,7 @@ include_directories(
+ 	external/vulkancts/framework/vulkan
+ 	)
+ 
+-if (DE_OS_IS_ANDROID OR DE_OS_IS_IOS)
++if (DE_OS_IS_IOS)
+ 	# On Android deqp modules are compiled as libraries and linked into final .so
+ 	set(DEQP_MODULE_LIBRARIES )
+ 	set(DEQP_MODULE_ENTRY_POINTS )
+@@ -316,7 +316,7 @@ macro (add_deqp_module MODULE_NAME SRCS LIBS EXECLIBS ENTRY)
+ 	set(DEQP_MODULE_LIBRARIES		${DEQP_MODULE_LIBRARIES} PARENT_SCOPE)
+ 	set(DEQP_MODULE_ENTRY_POINTS	${DEQP_MODULE_ENTRY_POINTS} PARENT_SCOPE)
+ 
+-	if (NOT DE_OS_IS_ANDROID AND NOT DE_OS_IS_IOS)
++	if (NOT DE_OS_IS_IOS)
+ 		# Executable target
+ 		add_executable(${MODULE_NAME} ${PROJECT_SOURCE_DIR}/framework/platform/tcuMain.cpp ${ENTRY})
+ 		target_link_libraries(${MODULE_NAME} PUBLIC "${EXECLIBS}" "${MODULE_NAME}${MODULE_LIB_TARGET_POSTFIX}")
+@@ -338,7 +338,7 @@ macro (add_deqp_module_skip_android MODULE_NAME SRCS LIBS EXECLIBS ENTRY)
+ 	add_library("${MODULE_NAME}${MODULE_LIB_TARGET_POSTFIX}" STATIC ${SRCS})
+ 	target_link_libraries("${MODULE_NAME}${MODULE_LIB_TARGET_POSTFIX}" ${LIBS})
+ 
+-	if (NOT DE_OS_IS_ANDROID AND NOT DE_OS_IS_IOS)
++	if (NOT DE_OS_IS_IOS)
+ 		# Executable target
+ 		add_executable(${MODULE_NAME} ${PROJECT_SOURCE_DIR}/framework/platform/tcuMain.cpp ${ENTRY})
+ 		target_link_libraries(${MODULE_NAME} PUBLIC "${EXECLIBS}" "${MODULE_NAME}${MODULE_LIB_TARGET_POSTFIX}")
+@@ -390,37 +390,7 @@ add_subdirectory(external/vulkancts/vkscpc ${MAYBE_EXCLUDE_FROM_ALL})
+ add_subdirectory(external/openglcts ${MAYBE_EXCLUDE_FROM_ALL})
+ 
+ # Single-binary targets
+-if (DE_OS_IS_ANDROID)
+-	include_directories(executor)
+-	include_directories(${PROJECT_BINARY_DIR}/external/vulkancts/framework/vulkan)
+-
+-	set(DEQP_SRCS
+-		framework/platform/android/tcuAndroidMain.cpp
+-		framework/platform/android/tcuAndroidJNI.cpp
+-		framework/platform/android/tcuAndroidPlatformCapabilityQueryJNI.cpp
+-		framework/platform/android/tcuTestLogParserJNI.cpp
+-		${DEQP_MODULE_ENTRY_POINTS}
+-		)
+-
+-	set(DEQP_LIBS
+-		tcutil-platform
+-		xecore
+-		${DEQP_MODULE_LIBRARIES}
+-		)
+-
+-	add_library(deqp SHARED ${DEQP_SRCS})
+-	target_link_libraries(deqp ${DEQP_LIBS})
+-
+-	# Separate out the debug information because it's enormous
+-	add_custom_command(TARGET deqp POST_BUILD
+-		COMMAND ${CMAKE_STRIP} --only-keep-debug -o $<TARGET_FILE:deqp>.debug $<TARGET_FILE:deqp>
+-		COMMAND ${CMAKE_STRIP} -g $<TARGET_FILE:deqp>)
+-
+-	# Needed by OpenGL CTS that defines its own activity but depends on
+-	# common Android support code.
+-	target_include_directories(deqp PRIVATE framework/platform/android)
+-
+-elseif (DE_OS_IS_IOS)
++if (DE_OS_IS_IOS)
+ 	# Code sign identity
+ 	set(DEQP_IOS_CODE_SIGN_IDENTITY "drawElements" CACHE STRING "Code sign identity for iOS build")
+ 
+diff --git a/framework/platform/android/tcuAndroidNativeActivity.cpp b/framework/platform/android/tcuAndroidNativeActivity.cpp
+index 6f8cd8fc5..b83e30f41 100644
+--- a/framework/platform/android/tcuAndroidNativeActivity.cpp
++++ b/framework/platform/android/tcuAndroidNativeActivity.cpp
+@@ -116,23 +116,25 @@ namespace Android
+ NativeActivity::NativeActivity (ANativeActivity* activity)
+ 	: m_activity(activity)
+ {
+-	activity->instance								= (void*)this;
+-	activity->callbacks->onStart					= onStartCallback;
+-	activity->callbacks->onResume					= onResumeCallback;
+-	activity->callbacks->onSaveInstanceState		= onSaveInstanceStateCallback;
+-	activity->callbacks->onPause					= onPauseCallback;
+-	activity->callbacks->onStop						= onStopCallback;
+-	activity->callbacks->onDestroy					= onDestroyCallback;
+-	activity->callbacks->onWindowFocusChanged		= onWindowFocusChangedCallback;
+-	activity->callbacks->onNativeWindowCreated		= onNativeWindowCreatedCallback;
+-	activity->callbacks->onNativeWindowResized		= onNativeWindowResizedCallback;
+-	activity->callbacks->onNativeWindowRedrawNeeded	= onNativeWindowRedrawNeededCallback;
+-	activity->callbacks->onNativeWindowDestroyed	= onNativeWindowDestroyedCallback;
+-	activity->callbacks->onInputQueueCreated		= onInputQueueCreatedCallback;
+-	activity->callbacks->onInputQueueDestroyed		= onInputQueueDestroyedCallback;
+-	activity->callbacks->onContentRectChanged		= onContentRectChangedCallback;
+-	activity->callbacks->onConfigurationChanged		= onConfigurationChangedCallback;
+-	activity->callbacks->onLowMemory				= onLowMemoryCallback;
++	if (activity) {
++		activity->instance								= (void*)this;
++		activity->callbacks->onStart					= onStartCallback;
++		activity->callbacks->onResume					= onResumeCallback;
++		activity->callbacks->onSaveInstanceState		= onSaveInstanceStateCallback;
++		activity->callbacks->onPause					= onPauseCallback;
++		activity->callbacks->onStop						= onStopCallback;
++		activity->callbacks->onDestroy					= onDestroyCallback;
++		activity->callbacks->onWindowFocusChanged		= onWindowFocusChangedCallback;
++		activity->callbacks->onNativeWindowCreated		= onNativeWindowCreatedCallback;
++		activity->callbacks->onNativeWindowResized		= onNativeWindowResizedCallback;
++		activity->callbacks->onNativeWindowRedrawNeeded	= onNativeWindowRedrawNeededCallback;
++		activity->callbacks->onNativeWindowDestroyed	= onNativeWindowDestroyedCallback;
++		activity->callbacks->onInputQueueCreated		= onInputQueueCreatedCallback;
++		activity->callbacks->onInputQueueDestroyed		= onInputQueueDestroyedCallback;
++		activity->callbacks->onContentRectChanged		= onContentRectChangedCallback;
++		activity->callbacks->onConfigurationChanged		= onConfigurationChangedCallback;
++		activity->callbacks->onLowMemory				= onLowMemoryCallback;
++	}
+ }
+ 
+ NativeActivity::~NativeActivity (void)
+diff --git a/framework/platform/android/tcuAndroidPlatform.cpp b/framework/platform/android/tcuAndroidPlatform.cpp
+index b8a35898c..cf02e6b70 100644
+--- a/framework/platform/android/tcuAndroidPlatform.cpp
++++ b/framework/platform/android/tcuAndroidPlatform.cpp
+@@ -22,6 +22,7 @@
+  *//*--------------------------------------------------------------------*/
+ 
+ #include "tcuAndroidPlatform.hpp"
++#include "tcuAndroidNativeActivity.hpp"
+ #include "tcuAndroidUtil.hpp"
+ #include "gluRenderContext.hpp"
+ #include "egluNativeDisplay.hpp"
+@@ -170,7 +171,7 @@ eglu::NativeWindow* NativeWindowFactory::createWindow (const eglu::WindowParams&
+ 	Window* window = m_windowRegistry.tryAcquireWindow();
+ 
+ 	if (!window)
+-		throw ResourceError("Native window is not available", DE_NULL, __FILE__, __LINE__);
++		throw NotSupportedError("Native window is not available", DE_NULL, __FILE__, __LINE__);
+ 
+ 	return new NativeWindow(window, params.width, params.height, format);
+ }
+@@ -292,6 +293,9 @@ static size_t getTotalSystemMemory (ANativeActivity* activity)
+ 
+ 	try
+ 	{
++		if (!activity)
++			throw tcu::InternalError("No activity (running from command line?");
++
+ 		const size_t totalMemory = getTotalAndroidSystemMemory(activity);
+ 		print("Device has %.2f MiB of system memory\n", static_cast<double>(totalMemory) / static_cast<double>(MiB));
+ 		return totalMemory;
+@@ -388,3 +392,9 @@ bool Platform::hasDisplay (vk::wsi::Type wsiType) const
+ 
+ } // Android
+ } // tcu
++
++tcu::Platform* createPlatform (void)
++{
++	tcu::Android::NativeActivity activity(NULL);
++	return new tcu::Android::Platform(activity);
++}
+-- 
+2.42.0
+

.gitlab-ci/container/patches/build-deqp-gles_Android-prints-to-stdout-instead-of-logcat.patch

@@ -0,0 +1,26 @@
+From a602822c53e22e985f942f843ccadbfb64613212 Mon Sep 17 00:00:00 2001
+From: Helen Koike <helen.koike@collabora.com>
+Date: Tue, 27 Sep 2022 12:35:22 -0300
+Subject: [PATCH 2/2] Android prints to stdout instead of logcat
+
+Signed-off-by: Helen Koike <helen.koike@collabora.com>
+---
+ framework/qphelper/qpDebugOut.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/framework/qphelper/qpDebugOut.c b/framework/qphelper/qpDebugOut.c
+index 6579e9f48..c200c6f6b 100644
+--- a/framework/qphelper/qpDebugOut.c
++++ b/framework/qphelper/qpDebugOut.c
+@@ -98,7 +98,7 @@ void qpDiev (const char* format, va_list args)
+ }
+ 
+ /* print() implementation. */
+-#if (DE_OS == DE_OS_ANDROID)
++#if (0)
+ 
+ #include <android/log.h>
+ 
+-- 
+2.42.0
+

.gitlab-ci/container/patches/build-deqp-vk_Android-prints-to-stdout-instead-of-logcat.patch

@@ -0,0 +1,26 @@
+From a602822c53e22e985f942f843ccadbfb64613212 Mon Sep 17 00:00:00 2001
+From: Helen Koike <helen.koike@collabora.com>
+Date: Tue, 27 Sep 2022 12:35:22 -0300
+Subject: [PATCH 2/2] Android prints to stdout instead of logcat
+
+Signed-off-by: Helen Koike <helen.koike@collabora.com>
+---
+ framework/qphelper/qpDebugOut.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/framework/qphelper/qpDebugOut.c b/framework/qphelper/qpDebugOut.c
+index 6579e9f48..c200c6f6b 100644
+--- a/framework/qphelper/qpDebugOut.c
++++ b/framework/qphelper/qpDebugOut.c
+@@ -98,7 +98,7 @@ void qpDiev (const char* format, va_list args)
+ }
+ 
+ /* print() implementation. */
+-#if (DE_OS == DE_OS_ANDROID)
++#if (0)
+ 
+ #include <android/log.h>
+ 
+-- 
+2.42.0
+

.gitlab-ci/crosvm-runner.sh

@@ -96,7 +96,7 @@ set +e -x
 NIR_DEBUG="novalidate" \
 LIBGL_ALWAYS_SOFTWARE=${CROSVM_LIBGL_ALWAYS_SOFTWARE} \
 GALLIUM_DRIVER=${CROSVM_GALLIUM_DRIVER} \
-VK_ICD_FILENAMES=$CI_PROJECT_DIR/install/share/vulkan/icd.d/${CROSVM_VK_DRIVER}_icd.x86_64.json \
+VK_DRIVER_FILES=$CI_PROJECT_DIR/install/share/vulkan/icd.d/${CROSVM_VK_DRIVER}_icd.x86_64.json \
 crosvm --no-syslog run \
     --gpu "${CROSVM_GPU_ARGS}" --gpu-render-server "path=/usr/local/libexec/virgl_render_server" \
     -m "${CROSVM_MEMORY:-4096}" -c "${CROSVM_CPU:-2}" --disable-sandbox \

.gitlab-ci/cuttlefish-runner.sh

@@ -48,7 +48,7 @@ $ADB shell setenforce 0
 # deqp
 
 $ADB push /deqp/modules/egl/deqp-egl-android /data/.
-$ADB push /deqp/assets/gl_cts/data/mustpass/egl/aosp_mustpass/3.2.6.x/egl-master.txt /data/.
+$ADB push /deqp/assets/gl_cts/data/mustpass/egl/aosp_mustpass/3.2.6.x/egl-main.txt /data/
 $ADB push /deqp-runner/deqp-runner /data/.
 
 # download Android Mesa from S3

.gitlab-ci/deqp-runner.sh

@@ -18,7 +18,7 @@ INSTALL=$(realpath -s "$PWD"/install)
 # Set up the driver environment.
 export LD_LIBRARY_PATH="$INSTALL"/lib/:$LD_LIBRARY_PATH
 export EGL_PLATFORM=surfaceless
-export VK_ICD_FILENAMES="$PWD"/install/share/vulkan/icd.d/"$VK_DRIVER"_icd.${VK_CPU:-$(uname -m)}.json
+export VK_DRIVER_FILES="$PWD"/install/share/vulkan/icd.d/"$VK_DRIVER"_icd.${VK_CPU:-$(uname -m)}.json
 export OCL_ICD_VENDORS="$PWD"/install/etc/OpenCL/vendors/
 
 if [ -n "$USE_ANGLE" ]; then
@@ -46,7 +46,6 @@ if [ -z "$DEQP_SUITE" ]; then
     DEQP_WIDTH=${DEQP_WIDTH:-256}
     DEQP_HEIGHT=${DEQP_HEIGHT:-256}
     DEQP_CONFIG=${DEQP_CONFIG:-rgba8888d24s8ms0}
-    DEQP_VARIANT=${DEQP_VARIANT:-master}
 
     DEQP_OPTIONS="$DEQP_OPTIONS --deqp-surface-width=$DEQP_WIDTH --deqp-surface-height=$DEQP_HEIGHT"
     DEQP_OPTIONS="$DEQP_OPTIONS --deqp-surface-type=${DEQP_SURFACE_TYPE:-pbuffer}"
@@ -60,16 +59,16 @@ if [ -z "$DEQP_SUITE" ]; then
 
     # Generate test case list file.
     if [ "$DEQP_VER" = "vk" ]; then
-       MUSTPASS=/deqp/mustpass/vk-$DEQP_VARIANT.txt
+       MUSTPASS=/deqp/mustpass/vk-main.txt
        DEQP=/deqp/external/vulkancts/modules/vulkan/deqp-vk
     elif [ "$DEQP_VER" = "gles2" ] || [ "$DEQP_VER" = "gles3" ] || [ "$DEQP_VER" = "gles31" ] || [ "$DEQP_VER" = "egl" ]; then
-       MUSTPASS=/deqp/mustpass/$DEQP_VER-$DEQP_VARIANT.txt
+       MUSTPASS=/deqp/mustpass/$DEQP_VER-main.txt
        DEQP=/deqp/modules/$DEQP_VER/deqp-$DEQP_VER
     elif [ "$DEQP_VER" = "gles2-khr" ] || [ "$DEQP_VER" = "gles3-khr" ] || [ "$DEQP_VER" = "gles31-khr" ] || [ "$DEQP_VER" = "gles32-khr" ]; then
-       MUSTPASS=/deqp/mustpass/$DEQP_VER-$DEQP_VARIANT.txt
+       MUSTPASS=/deqp/mustpass/$DEQP_VER-main.txt
        DEQP=/deqp/external/openglcts/modules/glcts
     else
-       MUSTPASS=/deqp/mustpass/$DEQP_VER-$DEQP_VARIANT.txt
+       MUSTPASS=/deqp/mustpass/$DEQP_VER-main.txt
        DEQP=/deqp/external/openglcts/modules/glcts
     fi
 
@@ -169,7 +168,13 @@ fi
 
 uncollapsed_section_switch deqp "deqp: deqp-runner"
 
-cat /deqp/version-log
+# Print the detailed version with the list of backports and local patches
+for api in vk gl gles; do
+  deqp_version_log=/deqp/version-$api
+  if [ -r "$deqp_version_log" ]; then
+    cat "$deqp_version_log"
+  fi
+done
 
 set +e
 if [ -z "$DEQP_SUITE" ]; then

.gitlab-ci/farm-rules.yml

@@ -237,6 +237,25 @@
       when: never
     - !reference [.freedreno-farm-rules, rules]
 
+.vmware-farm-rules:
+  rules:
+    - exists: [ .ci-farms-disabled/vmware ]
+      when: never
+    - changes: [ .ci-farms-disabled/vmware ]
+      if: '$CI_PIPELINE_SOURCE != "schedule"'
+      when: on_success
+    - changes: [ .ci-farms-disabled/* ]
+      if: '$CI_PIPELINE_SOURCE != "schedule"'
+      when: never
+
+.vmware-farm-manual-rules:
+  rules:
+    - exists: [ .ci-farms-disabled/vmware ]
+      when: never
+    - changes: [ .ci-farms-disabled/vmware ]
+      if: '$CI_PIPELINE_SOURCE != "schedule"'
+      when: never
+    - !reference [.vmware-farm-rules, rules]
 
 .ondracka-farm-rules:
   rules:
@@ -311,6 +330,10 @@
       changes: [ .ci-farms-disabled/ondracka ]
       exists: [ .ci-farms-disabled/ondracka ]
       when: never
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+      changes: [ .ci-farms-disabled/vmware ]
+      exists: [ .ci-farms-disabled/vmware ]
+      when: never
     # Any other change to ci-farms/* means some farm is getting re-enabled.
     # Run jobs in Marge pipelines (and let it fallback to manual otherwise)
     - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "marge-bot"'

.gitlab-ci/fossilize-runner.sh

@@ -11,7 +11,7 @@ INSTALL=$PWD/install
 
 # Set up the driver environment.
 export LD_LIBRARY_PATH="$INSTALL/lib/"
-export VK_ICD_FILENAMES="$INSTALL/share/vulkan/icd.d/${VK_DRIVER}_icd.x86_64.json"
+export VK_DRIVER_FILES="$INSTALL/share/vulkan/icd.d/${VK_DRIVER}_icd.x86_64.json"
 
 # To store Fossilize logs on failure.
 RESULTS="$PWD/results"

.gitlab-ci/image-tags.yml

@@ -1,16 +1,22 @@
-# Keep the tags below under 25-30 chars each, as they end up combined into
+# Keep the tags below under 20 chars each, as they end up combined into
 # docker image tags, and docker has a length limit of 128 chars total in tags.
 #
+# The word after the date doesn't need to be overly descriptive, it exists
+# purely to avoid the risk of two people updating an image tag on the same day
+# while working on different changes, so it doesn't matter whether that word
+# will make sense to someone else. Aim for "nobody else will pick that word
+# for their change".
+#
 # If you update a tag and you get an error like this:
 #     cannot parse input: "$image:$tag": invalid reference format
 # check the length of $tag; if it's > 128 chars you need to shorten your tag.
 
 variables:
    DEBIAN_X86_64_BUILD_BASE_IMAGE: "debian/x86_64_build-base"
-   DEBIAN_BASE_TAG: "2024-01-10-deb-fix"
+   DEBIAN_BASE_TAG: "20240412-pycparser"
 
    DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build"
-   DEBIAN_BUILD_TAG: "2024-01-04-find"
+   DEBIAN_BUILD_TAG: "20240408-cbindgen"
 
    DEBIAN_X86_64_TEST_BASE_IMAGE: "debian/x86_64_test-base"
 
@@ -18,23 +24,23 @@ variables:
    DEBIAN_X86_64_TEST_IMAGE_VK_PATH: "debian/x86_64_test-vk"
    DEBIAN_X86_64_TEST_ANDROID_IMAGE_PATH: "debian/x86_64_test-android"
 
-   DEBIAN_X86_64_TEST_ANDROID_TAG: "2024-01-04-default"
-   DEBIAN_X86_64_TEST_GL_TAG: "2024-01-04-default"
-   DEBIAN_X86_64_TEST_VK_TAG: "2024-01-04-default"
+   DEBIAN_X86_64_TEST_ANDROID_TAG: "20240423-deqp"
+   DEBIAN_X86_64_TEST_GL_TAG: "20240423-deqp"
+   DEBIAN_X86_64_TEST_VK_TAG: "20240423-deqp"
+   KERNEL_ROOTFS_TAG: "20240423-deqp"
 
-   ALPINE_X86_64_BUILD_TAG: "2023-01-07-libdrm2_4_119"
-   ALPINE_X86_64_LAVA_SSH_TAG: "2023-06-26-first-version"
-   FEDORA_X86_64_BUILD_TAG: "2024-01-06-libdrm"
-   KERNEL_ROOTFS_TAG: "2024-01-10-default"
-   KERNEL_TAG: "v6.6.4-for-mesa-ci-e4f4c500f7fb"
+   ALPINE_X86_64_BUILD_TAG: "20240412-pycparser"
+   ALPINE_X86_64_LAVA_SSH_TAG: "20240401-wlproto"
+   FEDORA_X86_64_BUILD_TAG: "20240412-pycparser"
+   KERNEL_TAG: "v6.6.21-mesa-19fc"
    KERNEL_REPO: "gfx-ci/linux"
-   PKG_REPO_REV: "67f2c46b"
+   PKG_REPO_REV: "3cc12a2a"
 
    WINDOWS_X64_MSVC_PATH: "windows/x86_64_msvc"
-   WINDOWS_X64_MSVC_TAG: "2023-12-22-msvc"
+   WINDOWS_X64_MSVC_TAG: "20231222-msvc"
 
    WINDOWS_X64_BUILD_PATH: "windows/x86_64_build"
-   WINDOWS_X64_BUILD_TAG: "2023-12-22-msvc"
+   WINDOWS_X64_BUILD_TAG: "20240405-vainfo-ci-1"
 
    WINDOWS_X64_TEST_PATH: "windows/x86_64_test"
-   WINDOWS_X64_TEST_TAG: "2023-12-22-msvc"
+   WINDOWS_X64_TEST_TAG: "20240405-vainfo-ci-1"

.gitlab-ci/lava/exceptions.py

@@ -5,24 +5,36 @@ class MesaCIException(Exception):
     pass
 
 
-class MesaCITimeoutError(MesaCIException):
+class MesaCIRetriableException(MesaCIException):
+    pass
+
+
+class MesaCITimeoutError(MesaCIRetriableException):
     def __init__(self, *args, timeout_duration: timedelta) -> None:
         super().__init__(*args)
         self.timeout_duration = timeout_duration
 
 
-class MesaCIRetryError(MesaCIException):
+class MesaCIRetryError(MesaCIRetriableException):
     def __init__(self, *args, retry_count: int, last_job: None) -> None:
         super().__init__(*args)
         self.retry_count = retry_count
         self.last_job = last_job
 
 
-class MesaCIParseException(MesaCIException):
+class MesaCIFatalException(MesaCIException):
+    """Exception raised when the Mesa CI script encounters a fatal error that
+    prevents the script from continuing."""
+
+    def __init__(self, *args) -> None:
+        super().__init__(*args)
+
+
+class MesaCIParseException(MesaCIRetriableException):
     pass
 
 
-class MesaCIKnownIssueException(MesaCIException):
+class MesaCIKnownIssueException(MesaCIRetriableException):
     """Exception raised when the Mesa CI script finds something in the logs that
     is known to cause the LAVA job to eventually fail"""
 

.gitlab-ci/lava/lava_job_submitter.py

@@ -16,7 +16,7 @@ import sys
 import time
 from collections import defaultdict
 from dataclasses import dataclass, fields
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 from os import environ, getenv, path
 from typing import Any, Optional
 
@@ -25,6 +25,8 @@ from lavacli.utils import flow_yaml as lava_yaml
 
 from lava.exceptions import (
     MesaCIException,
+    MesaCIFatalException,
+    MesaCIRetriableException,
     MesaCIParseException,
     MesaCIRetryError,
     MesaCITimeoutError,
@@ -58,7 +60,7 @@ except ImportError as e:
 
 # Timeout in seconds to decide if the device from the dispatched LAVA job has
 # hung or not due to the lack of new log output.
-DEVICE_HANGING_TIMEOUT_SEC = int(getenv("DEVICE_HANGING_TIMEOUT_SEC",  5*60))
+DEVICE_HANGING_TIMEOUT_SEC = int(getenv("DEVICE_HANGING_TIMEOUT_SEC", 5 * 60))
 
 # How many seconds the script should wait before try a new polling iteration to
 # check if the dispatched LAVA job is running or waiting in the job queue.
@@ -81,18 +83,29 @@ NUMBER_OF_RETRIES_TIMEOUT_DETECTION = int(
     getenv("LAVA_NUMBER_OF_RETRIES_TIMEOUT_DETECTION", 2)
 )
 
+CI_JOB_TIMEOUT_SEC = int(getenv("CI_JOB_TIMEOUT", 3600))
+# How many seconds the script will wait to let LAVA run the job and give the final details.
+EXPECTED_JOB_DURATION_SEC = int(getenv("EXPECTED_JOB_DURATION_SEC", 60 * 10))
+# CI_JOB_STARTED is given by GitLab CI/CD in UTC timezone by default.
+CI_JOB_STARTED_AT_RAW = getenv("CI_JOB_STARTED_AT", "")
+CI_JOB_STARTED_AT: datetime = (
+    datetime.fromisoformat(CI_JOB_STARTED_AT_RAW)
+    if CI_JOB_STARTED_AT_RAW
+    else datetime.now(timezone.utc)
+)
+
 
 def raise_exception_from_metadata(metadata: dict, job_id: int) -> None:
     """
     Investigate infrastructure errors from the job metadata.
-    If it finds an error, raise it as MesaCIException.
+    If it finds an error, raise it as MesaCIRetriableException.
     """
     if "result" not in metadata or metadata["result"] != "fail":
         return
     if "error_type" in metadata:
         error_type = metadata["error_type"]
         if error_type == "Infrastructure":
-            raise MesaCIException(
+            raise MesaCIRetriableException(
                 f"LAVA job {job_id} failed with Infrastructure Error. Retry."
             )
         if error_type == "Job":
@@ -100,12 +113,12 @@ def raise_exception_from_metadata(metadata: dict, job_id: int) -> None:
             # with mal-formed job definitions. As we are always validating the
             # jobs, only the former is probable to happen. E.g.: When some LAVA
             # action timed out more times than expected in job definition.
-            raise MesaCIException(
+            raise MesaCIRetriableException(
                 f"LAVA job {job_id} failed with JobError "
                 "(possible LAVA timeout misconfiguration/bug). Retry."
             )
     if "case" in metadata and metadata["case"] == "validate":
-        raise MesaCIException(
+        raise MesaCIRetriableException(
             f"LAVA job {job_id} failed validation (possible download error). Retry."
         )
 
@@ -182,7 +195,6 @@ def is_job_hanging(job, max_idle_time):
 
 
 def parse_log_lines(job, log_follower, new_log_lines):
-
     if log_follower.feed(new_log_lines):
         # If we had non-empty log data, we can assure that the device is alive.
         job.heartbeat()
@@ -200,7 +212,6 @@ def parse_log_lines(job, log_follower, new_log_lines):
 
 
 def fetch_new_log_lines(job):
-
     # The XMLRPC binary packet may be corrupted, causing a YAML scanner error.
     # Retry the log fetching several times before exposing the error.
     for _ in range(5):
@@ -216,14 +227,28 @@ def submit_job(job):
     try:
         job.submit()
     except Exception as mesa_ci_err:
-        raise MesaCIException(
+        raise MesaCIRetriableException(
             f"Could not submit LAVA job. Reason: {mesa_ci_err}"
         ) from mesa_ci_err
 
 
-def wait_for_job_get_started(job):
+def wait_for_job_get_started(job, attempt_no):
     print_log(f"Waiting for job {job.job_id} to start.")
     while not job.is_started():
+        current_job_duration_sec: int = int(
+            (datetime.now(timezone.utc) - CI_JOB_STARTED_AT).total_seconds()
+        )
+        remaining_time_sec: int = max(0, CI_JOB_TIMEOUT_SEC - current_job_duration_sec)
+        if remaining_time_sec < EXPECTED_JOB_DURATION_SEC:
+            job.cancel()
+            raise MesaCIFatalException(
+                f"{CONSOLE_LOG['BOLD']}"
+                f"{CONSOLE_LOG['FG_YELLOW']}"
+                f"Job {job.job_id} only has {remaining_time_sec} seconds "
+                "remaining to run, but it is expected to take at least "
+                f"{EXPECTED_JOB_DURATION_SEC} seconds."
+                f"{CONSOLE_LOG['RESET']}",
+            )
         time.sleep(WAIT_FOR_DEVICE_POLLING_TIME_SEC)
     job.refresh_log()
     print_log(f"Job {job.job_id} started.")
@@ -299,7 +324,7 @@ def execute_job_with_retries(
         try:
             job_log["submitter_start_time"] = datetime.now().isoformat()
             submit_job(job)
-            wait_for_job_get_started(job)
+            wait_for_job_get_started(job, attempt_no)
             log_follower: LogFollower = bootstrap_log_follower()
             follow_job_execution(job, log_follower)
             return job
@@ -318,6 +343,8 @@ def execute_job_with_retries(
                 f"Finished executing LAVA job in the attempt #{attempt_no}"
                 f"{CONSOLE_LOG['RESET']}"
             )
+            if job.exception and not isinstance(job.exception, MesaCIRetriableException):
+                break
 
     return last_failed_job
 
@@ -471,8 +498,9 @@ class LAVAJobSubmitter(PathResolver):
         if not last_attempt_job:
             # No job was run, something bad happened
             STRUCTURAL_LOG["job_combined_status"] = "script_crash"
-            current_exception = str(sys.exc_info()[0])
+            current_exception = str(sys.exc_info()[1])
             STRUCTURAL_LOG["job_combined_fail_reason"] = current_exception
+            print(f"Interrupting the script. Reason: {current_exception}")
             raise SystemExit(1)
 
         STRUCTURAL_LOG["job_combined_status"] = last_attempt_job.status
@@ -509,7 +537,6 @@ class StructuredLoggerWrapper:
     def logger_context(self):
         context = contextlib.nullcontext()
         try:
-
             global STRUCTURAL_LOG
             STRUCTURAL_LOG = StructuredLogger(
                 self.__submitter.structured_log_file, truncate=True

.gitlab-ci/lava/utils/constants.py

@@ -12,3 +12,14 @@ JOB_PRIORITY = int(getenv("JOB_PRIORITY", 75))
 # Use UART over the default SSH mechanism to follow logs.
 # Caution: this can lead to device silence in some devices in Mesa CI.
 FORCE_UART = bool(getenv("LAVA_FORCE_UART", False))
+
+# How many times the r8152 error may happen to consider it a known issue.
+KNOWN_ISSUE_R8152_MAX_CONSECUTIVE_COUNTER: int = 10
+KNOWN_ISSUE_R8152_PATTERNS: tuple[str, ...] = (
+    r"r8152 \S+ eth0: Tx status -71",
+    r"nfs: server \d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3} not responding, still trying",
+)
+
+# This is considered noise, since LAVA produces this log after receiving a package of feedback
+# messages.
+LOG_DEBUG_FEEDBACK_NOISE = "Listened to connection for namespace 'dut' done"

.gitlab-ci/lava/utils/lava_job.py

@@ -6,6 +6,7 @@ from typing import Any, Optional
 
 from lava.exceptions import (
     MesaCIException,
+    MesaCIRetriableException,
     MesaCIKnownIssueException,
     MesaCIParseException,
     MesaCITimeoutError,
@@ -34,7 +35,7 @@ class LAVAJob:
         self._is_finished = False
         self.log: dict[str, Any] = log
         self.status = "not_submitted"
-        self.__exception: Optional[str] = None
+        self.__exception: Optional[Exception] = None
 
     def heartbeat(self) -> None:
         self.last_log_time: datetime = datetime.now()
@@ -63,13 +64,13 @@ class LAVAJob:
         return self._is_finished
 
     @property
-    def exception(self) -> str:
+    def exception(self) -> Optional[Exception]:
         return self.__exception
 
     @exception.setter
     def exception(self, exception: Exception) -> None:
-        self.__exception = repr(exception)
-        self.log["dut_job_fail_reason"] = self.__exception
+        self.__exception = exception
+        self.log["dut_job_fail_reason"] = repr(self.__exception)
 
     def validate(self) -> Optional[dict]:
         """Returns a dict with errors, if the validation fails.
@@ -176,11 +177,15 @@ class LAVAJob:
             self.status = "canceled"
         elif isinstance(exception, MesaCITimeoutError):
             self.status = "hung"
-        elif isinstance(exception, MesaCIException):
+        elif isinstance(exception, MesaCIRetriableException):
             self.status = "failed"
         elif isinstance(exception, KeyboardInterrupt):
             self.status = "interrupted"
             print_log("LAVA job submitter was interrupted. Cancelling the job.")
             raise
+        elif isinstance(exception, MesaCIException):
+            self.status = "interrupted"
+            print_log("LAVA job submitter was interrupted. Cancelling the job.")
+            raise
         else:
             self.status = "job_submitter_error"

.gitlab-ci/lava/utils/lava_job_definition.py

@@ -15,6 +15,8 @@ from lava.utils.uart_job_definition import (
     fastboot_deploy_actions,
     tftp_boot_action,
     tftp_deploy_actions,
+    qemu_boot_action,
+    qemu_deploy_actions,
     uart_test_actions,
 )
 
@@ -71,6 +73,9 @@ class LAVAJobDefinition:
         if args.boot_method == "fastboot":
             deploy_actions = fastboot_deploy_actions(self, nfsrootfs)
             boot_action = fastboot_boot_action(args)
+        elif args.boot_method == "qemu-nfs":
+            deploy_actions = qemu_deploy_actions(self, nfsrootfs)
+            boot_action = qemu_boot_action(args)
         else:  # tftp
             deploy_actions = tftp_deploy_actions(self, nfsrootfs)
             boot_action = tftp_boot_action(args)
@@ -142,6 +147,10 @@ class LAVAJobDefinition:
         if self.job_submitter.lava_tags:
             values["tags"] = self.job_submitter.lava_tags.split(",")
 
+        # QEMU lava jobs mandate proper arch value in the context
+        if self.job_submitter.boot_method == "qemu-nfs":
+            values["context"]["arch"] = self.job_submitter.mesa_job_name.split(":")[1]
+
         return values
 
     def attach_kernel_and_dtb(self, deploy_field):
@@ -203,7 +212,13 @@ class LAVAJobDefinition:
         #   - exec .gitlab-ci/common/init-stage2.sh
 
         with open(self.job_submitter.first_stage_init, "r") as init_sh:
-            run_steps += [x.rstrip() for x in init_sh if not x.startswith("#") and x.rstrip()]
+            # For vmware farm, patch nameserver as 8.8.8.8 is off limit.
+            # This is temporary and will be reverted once the farm is moved.
+            if self.job_submitter.mesa_job_name.startswith("vmware-"):
+                run_steps += [x.rstrip().replace("nameserver 8.8.8.8", "nameserver 10.25.198.110") for x in init_sh if not x.startswith("#") and x.rstrip()]
+            else:
+                run_steps += [x.rstrip() for x in init_sh if not x.startswith("#") and x.rstrip()]
+
         # We cannot distribute the Adreno 660 shader firmware inside rootfs,
         # since the license isn't bundled inside the repository
         if self.job_submitter.device_type == "sm8350-hdk":

.gitlab-ci/lava/utils/lava_log_hints.py

@@ -2,42 +2,78 @@ from __future__ import annotations
 
 import re
 from dataclasses import dataclass, field
-from typing import TYPE_CHECKING, Any
+from typing import TYPE_CHECKING, Any, Sequence
 
 if TYPE_CHECKING:
     from lava.utils import LogFollower
 
 from lava.exceptions import MesaCIKnownIssueException
 from lava.utils.console_format import CONSOLE_LOG
+from lava.utils.constants import (
+    KNOWN_ISSUE_R8152_MAX_CONSECUTIVE_COUNTER,
+    LOG_DEBUG_FEEDBACK_NOISE,
+    KNOWN_ISSUE_R8152_PATTERNS,
+)
 from lava.utils.log_section import LogSectionType
 
 
+def search_known_issue_patterns(patterns: Sequence[str], line: str) -> str:
+    for pattern in patterns:
+        if re.search(pattern, line):
+            return pattern
+    return ""
+
+
 @dataclass
 class LAVALogHints:
     log_follower: LogFollower
-    has_r8152_issue_history: bool = field(default=False, init=False)
+    r8152_issue_consecutive_counter: int = field(default=0, init=False)
+    reboot_counter: int = field(default=0, init=False)
+
+    def raise_known_issue(self, message) -> None:
+        raise MesaCIKnownIssueException(
+            "Found known issue: "
+            f"{CONSOLE_LOG['FG_MAGENTA']}"
+            f"{message}"
+            f"{CONSOLE_LOG['RESET']}"
+        )
 
     def detect_failure(self, new_lines: list[dict[str, Any]]):
         for line in new_lines:
+            if line["msg"] == LOG_DEBUG_FEEDBACK_NOISE:
+                continue
             self.detect_r8152_issue(line)
+            self.detect_forced_reboot(line)
 
     def detect_r8152_issue(self, line):
-        if (
-            self.log_follower.phase == LogSectionType.TEST_CASE
-            and line["lvl"] == "target"
-        ):
-            if re.search(r"r8152 \S+ eth0: Tx status -71", line["msg"]):
-                self.has_r8152_issue_history = True
-                return
+        if self.log_follower.phase in (
+            LogSectionType.LAVA_BOOT,
+            LogSectionType.TEST_CASE,
+        ) and line["lvl"] in ("feedback", "target"):
+            if search_known_issue_patterns(KNOWN_ISSUE_R8152_PATTERNS, line["msg"]):
+                if (
+                    self.r8152_issue_consecutive_counter
+                    < KNOWN_ISSUE_R8152_MAX_CONSECUTIVE_COUNTER
+                ):
+                    self.r8152_issue_consecutive_counter += 1
+                    return
 
-            if self.has_r8152_issue_history and re.search(
-                r"nfs: server \d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3} not responding, still trying",
-                line["msg"],
-            ):
-                raise MesaCIKnownIssueException(
-                    f"{CONSOLE_LOG['FG_MAGENTA']}"
+                self.raise_known_issue(
                     "Probable network issue failure encountered, retrying the job"
-                    f"{CONSOLE_LOG['RESET']}"
                 )
 
-        self.has_r8152_issue_history = False
+        # Reset the status, as the `nfs... still trying` complaint was not detected
+        self.r8152_issue_consecutive_counter = 0
+
+    def detect_forced_reboot(self, line: dict[str, Any]) -> None:
+        if (
+            self.log_follower.phase == LogSectionType.TEST_CASE
+            and line["lvl"] == "feedback"
+        ):
+            if re.search(r"^Reboot requested", line["msg"]):
+                self.reboot_counter += 1
+
+                if self.reboot_counter > 0:
+                    self.raise_known_issue(
+                        "Forced reboot detected during test phase, failing the job..."
+                    )

.gitlab-ci/lava/utils/log_follower.py

@@ -187,6 +187,25 @@ class LogFollower:
 
         return False
 
+    def ignore_dut_feedback_lines(self, line: dict[str, str]) -> bool:
+        """
+        Ignores feedback lines from LAVA.
+        If we only receive this level of message for some time, it means that the job is
+        misbehaving. E.g Rebooting.
+
+        Args:
+            line: A dictionary representing a single log line.
+
+        Returns:
+            A boolean indicating whether the current line is a feedback line.
+        """
+        if line["lvl"] == "feedback" and line["ns"] == "dut":
+            return True
+        if line["lvl"] == "debug":
+            # This message happens after LAVA end receiving the feedback from the DUT
+            if line["msg"] == "Listened to connection for namespace 'dut' done":
+                return True
+        return False
 
     def feed(self, new_lines: list[dict[str, str]]) -> bool:
         """Input data to be processed by LogFollower instance
@@ -207,6 +226,9 @@ class LogFollower:
             if self.merge_carriage_return_lines(line):
                 continue
 
+            if self.ignore_dut_feedback_lines(line):
+                continue
+
             # At least we are fed with a non-kernel dump log, it seems that the
             # job is progressing
             is_job_healthy = True

.gitlab-ci/lava/utils/uart_job_definition.py

@@ -82,6 +82,24 @@ def tftp_deploy_actions(job_definition: "LAVAJobDefinition", nfsrootfs) -> tuple
     return (tftp_deploy,)
 
 
+def qemu_deploy_actions(job_definition: "LAVAJobDefinition", nfsrootfs) -> tuple[dict[str, Any]]:
+    args = job_definition.job_submitter
+    qemu_deploy = {
+        "timeout": {"minutes": 5},
+        "to": "nfs",
+        "images": {
+            "kernel": {
+                "image_arg": "-kernel {kernel}",
+                "url": f"{args.kernel_url_prefix}/{args.kernel_image_name}",
+            },
+            "nfsrootfs": nfsrootfs,
+        },
+    }
+    job_definition.attach_external_modules(qemu_deploy)
+
+    return (qemu_deploy,)
+
+
 def uart_test_actions(
     args: "LAVAJobSubmitter", init_stage1_steps: list[str], artifact_download_steps: list[str]
 ) -> tuple[dict[str, Any]]:
@@ -140,6 +158,16 @@ def tftp_boot_action(args: "LAVAJobSubmitter") -> dict[str, Any]:
     return tftp_boot
 
 
+def qemu_boot_action(args: "LAVAJobSubmitter") -> dict[str, Any]:
+    qemu_boot = {
+        "failure_retry": NUMBER_OF_ATTEMPTS_LAVA_BOOT,
+        "method": args.boot_method,
+        "prompts": ["lava-shell:"],
+    }
+
+    return qemu_boot
+
+
 def fastboot_boot_action(args: "LAVAJobSubmitter") -> dict[str, Any]:
     fastboot_boot = {
         "timeout": {"minutes": 2},

.gitlab-ci/meson/build.sh

@@ -2,7 +2,7 @@
 # shellcheck disable=SC1003 # works for us now...
 # shellcheck disable=SC2086 # we want word splitting
 
-section_switch meson-configure "meson: configure"
+section_switch meson-cross-file "meson: cross file generate"
 
 set -e
 set -o xtrace
@@ -49,6 +49,38 @@ if [ -n "$CROSS" ]; then
     fi
 fi
 
+if [ -n "$HOST_BUILD_OPTIONS" ]; then
+    section_switch meson-host-configure "meson: host configure"
+
+    # Stash the PKG_CONFIG_LIBDIR so that we can use the base x86_64 image
+    # libraries.
+    tmp_pkg_config_libdir=$PKG_CONFIG_LIBDIR
+    unset PKG_CONFIG_LIBDIR
+
+    # Compile a host version for the few tools we need for a cross build (for
+    # now just intel-clc)
+    rm -rf _host_build
+    meson setup _host_build \
+          --native-file=native.file \
+          -D prefix=/usr \
+          -D libdir=lib \
+          ${HOST_BUILD_OPTIONS}
+
+    pushd _host_build
+
+    section_switch meson-host-build "meson: host build"
+
+    meson configure
+    ninja
+    ninja install
+    popd
+
+    # Restore PKG_CONFIG_LIBDIR
+    if [ -n "$tmp_pkg_config_libdir" ]; then
+        export PKG_CONFIG_LIBDIR=$tmp_pkg_config_libdir
+    fi
+fi
+
 # Only use GNU time if available, not any shell built-in command
 case $CI_JOB_NAME in
     # ASAN leak detection is incompatible with strace
@@ -66,11 +98,13 @@ case $CI_JOB_NAME in
         ;;
 esac
 
+section_switch meson-configure "meson: configure"
+
 rm -rf _build
 meson setup _build \
       --native-file=native.file \
       --wrap-mode=nofallback \
-      --force-fallback-for perfetto,syn \
+      --force-fallback-for perfetto,syn,paste \
       ${CROSS+--cross "$CROSS_FILE"} \
       -D prefix=$PWD/install \
       -D libdir=lib \

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

@@ -13,7 +13,7 @@ INSTALL="$PWD/install"
 # Set up the driver environment.
 export LD_LIBRARY_PATH="$INSTALL/lib/"
 export EGL_PLATFORM=surfaceless
-export VK_ICD_FILENAMES="$INSTALL/share/vulkan/icd.d/${VK_DRIVER}_icd.${VK_CPU:-$(uname -m)}.json"
+export VK_DRIVER_FILES="$INSTALL/share/vulkan/icd.d/${VK_DRIVER}_icd.${VK_CPU:-$(uname -m)}.json"
 
 RESULTS=$PWD/${PIGLIT_RESULTS_DIR:-results}
 mkdir -p $RESULTS

.gitlab-ci/piglit/piglit-traces.sh

@@ -15,6 +15,10 @@ mkdir -p "$RESULTS"
 
 export PIGLIT_REPLAY_DESCRIPTION_FILE="$INSTALL/$PIGLIT_TRACES_FILE"
 
+# FIXME: guess why /usr/local/bin is not included in all runners PATH.
+# Needed because yq and ci-fairy are installed there.
+PATH="/usr/local/bin:$PATH"
+
 if [ "$PIGLIT_REPLAY_SUBCOMMAND" = "profile" ]; then
     yq -iY 'del(.traces[][] | select(.label[]? == "no-perf"))' \
       "$PIGLIT_REPLAY_DESCRIPTION_FILE"
@@ -50,7 +54,7 @@ if [ -n "${VK_DRIVER}" ]; then
   export DXVK_LOG="$RESULTS/dxvk"
   [ -d "$DXVK_LOG" ] || mkdir -pv "$DXVK_LOG"
   export DXVK_STATE_CACHE=0
-  export VK_ICD_FILENAMES="$INSTALL/share/vulkan/icd.d/${VK_DRIVER}_icd.${VK_CPU:-$(uname -m)}.json"
+  export VK_DRIVER_FILES="$INSTALL/share/vulkan/icd.d/${VK_DRIVER}_icd.${VK_CPU:-$(uname -m)}.json"
 fi
 
 # Sanity check to ensure that our environment is sufficient to make our tests
@@ -113,7 +117,7 @@ else
       mkdir -p /tmp/.X11-unix
 
       env \
-        VK_ICD_FILENAMES="/install/share/vulkan/icd.d/${VK_DRIVER}_icd.$(uname -m).json" \
+        VK_DRIVER_FILES="/install/share/vulkan/icd.d/${VK_DRIVER}_icd.$(uname -m).json" \
 	weston -Bheadless-backend.so --use-gl -Swayland-0 --xwayland --idle-time=0 &
 
       while [ ! -S "$WESTON_X11_SOCK" ]; do sleep 1; done
@@ -185,6 +189,15 @@ RUN_CMD="export LD_LIBRARY_PATH=$__LD_LIBRARY_PATH; $SANITY_MESA_VERSION_CMD &&
 # run.
 rm -rf replayer-db
 
+# ANGLE: download compiled ANGLE runtime and the compiled restricted traces (all-in-one package)
+if [ -n "$PIGLIT_REPLAY_ANGLE_TAG" ]; then
+  ARCH="amd64"
+  FILE="angle-bin-${ARCH}-${PIGLIT_REPLAY_ANGLE_TAG}.tar.zst"
+  ci-fairy s3cp $S3_ARGS "https://s3.freedesktop.org/mesa-tracie-private/${FILE}" "${FILE}"
+  mkdir -p replayer-db/angle
+  tar --zstd -xf ${FILE} -C replayer-db/angle/
+fi
+
 if ! eval $RUN_CMD;
 then
     printf "%s\n" "Found $(cat /tmp/version.txt), expected $MESA_VERSION"

.gitlab-ci/prepare-artifacts.sh

@@ -38,7 +38,6 @@ cp -Rp .gitlab-ci/fossilize-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/valve install/
 cp -Rp .gitlab-ci/vkd3d-proton install/
 cp -Rp .gitlab-ci/setup-test-env.sh install/
 cp -Rp .gitlab-ci/*-runner.sh install/

.gitlab-ci/run-shader-db.sh

@@ -10,7 +10,7 @@ export LD_LIBRARY_PATH=$LIBDIR
 
 cd /usr/local/shader-db
 
-for driver in freedreno intel v3d vc4; do
+for driver in freedreno intel lima v3d vc4; do
     section_start shader-db-${driver} "Running shader-db for $driver"
     env LD_PRELOAD="$LIBDIR/lib${driver}_noop_drm_shim.so" \
         ./run -j"${FDO_CI_CONCURRENT:-4}" ./shaders \

.gitlab-ci/setup-test-env.sh

@@ -14,6 +14,14 @@ function x_off {
 
 # TODO: implement x_on !
 
+export JOB_START_S=$(date -u +"%s" -d "${CI_JOB_STARTED_AT:?}")
+
+function get_current_minsec {
+    DATE_S=$(date -u +"%s")
+    CURR_TIME=$((DATE_S-JOB_START_S))
+    printf "%02d:%02d" $((CURR_TIME/60)) $((CURR_TIME%60))
+}
+
 function error {
     x_off 2>/dev/null
     RED="\e[0;31m"
@@ -21,10 +29,7 @@ function error {
     # we force the following to be not in a section
     section_end $CURRENT_SECTION
 
-    DATE_S=$(date -u +"%s")
-    JOB_START_S=$(date -u +"%s" -d "${CI_JOB_STARTED_AT:?}")
-    CURR_TIME=$((DATE_S-JOB_START_S))
-    CURR_MINSEC="$(printf "%02d" $((CURR_TIME/60))):$(printf "%02d" $((CURR_TIME%60)))"
+    CURR_MINSEC=$(get_current_minsec)
     echo -e "\n${RED}[${CURR_MINSEC}] ERROR: $*${ENDCOLOR}\n"
     [ "$state_x" -eq 0 ] || set -x
 }
@@ -42,10 +47,7 @@ function build_section_start {
     CYAN="\e[0;36m"
     ENDCOLOR="\e[0m"
 
-    DATE_S=$(date -u +"%s")
-    JOB_START_S=$(date -u +"%s" -d "${CI_JOB_STARTED_AT:?}")
-    CURR_TIME=$((DATE_S-JOB_START_S))
-    CURR_MINSEC="$(printf "%02d" $((CURR_TIME/60))):$(printf "%02d" $((CURR_TIME%60)))"
+    CURR_MINSEC=$(get_current_minsec)
     echo -e "\n\e[0Ksection_start:$(date +%s):$section_name$section_params\r\e[0K${CYAN}[${CURR_MINSEC}] $*${ENDCOLOR}\n"
 }
 
@@ -87,6 +89,7 @@ function uncollapsed_section_switch {
 }
 
 export -f x_off
+export -f get_current_minsec
 export -f error
 export -f trap_err
 export -f build_section_start

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

@@ -227,7 +227,10 @@
 .lint-rustfmt-rules:
   rules:
     - !reference [.never-post-merge-rules, rules]
-    - !reference [.core-rules, rules]
+    - !reference [.no_scheduled_pipelines-rules, rules]
+    - changes:
+        - .gitlab-ci.yml
+        - .gitlab-ci/**/*
     # in merge pipeline, formatting checks are not allowed to fail
     - if: $GITLAB_USER_LOGIN == "marge-bot" && $CI_PIPELINE_SOURCE == "merge_request_event"
       changes: &rust_file_list
@@ -239,24 +242,12 @@
       when: on_success
       allow_failure: true
 
-.lint-clang-format-rules:
+# Rules for .mr-label-maker.yml
+.mr-label-maker-rules:
   rules:
     - !reference [.never-post-merge-rules, rules]
-    - !reference [.core-rules, rules]
-    # in merge pipeline, formatting checks are not allowed to fail
-    - if: $GITLAB_USER_LOGIN == "marge-bot" && $CI_PIPELINE_SOURCE == "merge_request_event"
-      changes: &clang_format_file_list
-        - .clang-format
-        - .clang-format-include
-        - .clang-format-ignore
-        - src/**/.clang-format
-        - src/egl/**/*
-        - src/amd/vulkan/**/*
-        - src/amd/compiler/**/*
-        - src/etnaviv/isa/**/*
+    - !reference [.no_scheduled_pipelines-rules, rules]
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+      changes:
+        - .mr-label-maker.yml
       when: on_success
-      allow_failure: false
-    # in other pipelines, formatting checks are allowed to fail
-    - changes: *clang_format_file_list
-      when: on_success
-      allow_failure: true

.gitlab-ci/test/gitlab-ci.yml

@@ -43,21 +43,7 @@ rustfmt:
     - rustfmt --verbose src/**/lib.rs
     - rustfmt --verbose src/**/main.rs
 
-clang-format:
-  extends:
-    - .formatting-check
-    - .lint-clang-format-rules
-  variables:
-    LLVM_VERSION: 15
-  before_script:
-    - shopt -s globstar
-    # We need a meson build dir, but its config doesn't actually matter, so
-    # let's just use the default.
-    - meson setup build
-    - clang-format-${LLVM_VERSION} --version
-    - ninja -C build clang-format
-
-.test-check:
+python-test:
   # Cancel job if a newer commit is pushed to the same branch
   interruptible: true
   stage: code-validation
@@ -66,10 +52,6 @@ clang-format:
   variables:
     GIT_STRATEGY: fetch
   timeout: 10m
-
-python-test:
-  extends:
-    - .test-check
   script:
     - cd bin/ci
     - pip install --break-system-packages -r test/requirements.txt
@@ -77,8 +59,16 @@ python-test:
   rules:
     - !reference [.disable-farm-mr-rules, rules]
     - !reference [.never-post-merge-rules, rules]
-    - changes:
+    - if: $CI_PIPELINE_SOURCE == "schedule"
+      when: on_success
+    - if: $GITLAB_USER_LOGIN == "marge-bot"
+      changes: &bin_ci_files
+        - .gitlab-ci.yml
+        - .gitlab-ci/**/*
         - bin/ci/**/*
+      when: on_success
+    - changes: *bin_ci_files
+      when: manual
 
 .test-gl:
   extends:
@@ -185,12 +175,6 @@ python-test:
     reports:
       junit: results/junit.xml
 
-.deqp-test-vk:
-  extends:
-    - .deqp-test
-  variables:
-    DEQP_VER: vk
-
 .fossilize-test:
   script:
     - ./install/fossilize-runner.sh
@@ -200,11 +184,7 @@ python-test:
     paths:
       - results/
 
-.baremetal-test:
-  extends:
-    - .test
-  # Cancel job if a newer commit is pushed to the same branch
-  interruptible: true
+.download_s3:
   before_script:
     - !reference [default, before_script]
     # Use this instead of gitlab's artifacts download because it hits packet.net
@@ -216,6 +196,14 @@ python-test:
     - rm -rf install
     - (set -x; curl -L --retry 4 -f --retry-all-errors --retry-delay 60 ${FDO_HTTP_CACHE_URI:-}https://${PIPELINE_ARTIFACTS_BASE}/${S3_ARTIFACT_NAME}.tar.zst | tar --zstd -x)
     - section_end artifacts_download
+
+.baremetal-test:
+  extends:
+    - .test
+  # Cancel job if a newer commit is pushed to the same branch
+  interruptible: true
+  before_script:
+    - !reference [.download_s3, before_script]
   variables:
     BM_ROOTFS: /rootfs-${DEBIAN_ARCH}
   artifacts:
@@ -417,7 +405,7 @@ python-test:
     reports:
       junit: results/**/junit.xml
 
-.b2c-test-vk:
+.b2c-x86_64-test-vk:
   extends:
     - .use-debian/x86_64_test-vk
     - .b2c-test
@@ -426,7 +414,7 @@ python-test:
     - debian-testing
     - !reference [.required-for-hardware-jobs, needs]
 
-.b2c-test-gl:
+.b2c-x86_64-test-gl:
   extends:
     - .use-debian/x86_64_test-gl
     - .b2c-test

.gitlab-ci/tests/test_lava_job_submitter.py

@@ -9,12 +9,13 @@ import os
 import xmlrpc.client
 from contextlib import nullcontext as does_not_raise
 from datetime import datetime
-from itertools import chain, repeat
+from itertools import islice, repeat
 from pathlib import Path
+from typing import Generator
 from unittest.mock import MagicMock, patch
 
 import pytest
-from lava.exceptions import MesaCIException, MesaCIRetryError
+from lava.exceptions import MesaCIException, MesaCIRetryError, MesaCIFatalException
 from lava.lava_job_submitter import (
     DEVICE_HANGING_TIMEOUT_SEC,
     NUMBER_OF_RETRIES_TIMEOUT_DETECTION,
@@ -23,6 +24,7 @@ from lava.lava_job_submitter import (
     bootstrap_log_follower,
     follow_job_execution,
     retriable_follow_job,
+    wait_for_job_get_started,
 )
 from lava.utils import LogSectionType
 
@@ -82,7 +84,7 @@ def lava_job_submitter(
 def test_submit_and_follow_respects_exceptions(mock_sleep, mock_proxy, exception):
     with pytest.raises(MesaCIException):
         proxy = mock_proxy(side_effect=exception)
-        job = LAVAJob(proxy, '')
+        job = LAVAJob(proxy, "")
         log_follower = bootstrap_log_follower()
         follow_job_execution(job, log_follower)
 
@@ -164,21 +166,13 @@ PROXY_SCENARIOS = {
         mock_logs(result="pass"),
         does_not_raise(),
         "pass",
-        {
-            "testsuite_results": [
-                generate_testsuite_result(result="pass")
-            ]
-        },
+        {"testsuite_results": [generate_testsuite_result(result="pass")]},
     ),
     "no retries, but testsuite fails": (
         mock_logs(result="fail"),
         does_not_raise(),
         "fail",
-        {
-            "testsuite_results": [
-                generate_testsuite_result(result="fail")
-            ]
-        },
+        {"testsuite_results": [generate_testsuite_result(result="fail")]},
     ),
     "no retries, one testsuite fails": (
         generate_n_logs(n=1, tick_fn=0, result="fail"),
@@ -187,7 +181,7 @@ PROXY_SCENARIOS = {
         {
             "testsuite_results": [
                 generate_testsuite_result(result="fail"),
-                generate_testsuite_result(result="pass")
+                generate_testsuite_result(result="pass"),
             ]
         },
     ),
@@ -264,6 +258,27 @@ def test_simulate_a_long_wait_to_start_a_job(
     assert delta_time.total_seconds() >= wait_time
 
 
+LONG_LAVA_QUEUE_SCENARIOS = {
+    "no_time_to_run": (0, pytest.raises(MesaCIFatalException)),
+    "enough_time_to_run": (9999999999, does_not_raise()),
+}
+
+
+@pytest.mark.parametrize(
+    "job_timeout, expectation",
+    LONG_LAVA_QUEUE_SCENARIOS.values(),
+    ids=LONG_LAVA_QUEUE_SCENARIOS.keys(),
+)
+def test_wait_for_job_get_started_no_time_to_run(monkeypatch, job_timeout, expectation):
+    monkeypatch.setattr("lava.lava_job_submitter.CI_JOB_TIMEOUT_SEC", job_timeout)
+    job = MagicMock()
+    # Make it escape the loop
+    job.is_started.side_effect = (False, False, True)
+    with expectation as e:
+        wait_for_job_get_started(job, 1)
+    if e:
+        job.cancel.assert_called_with()
+
 
 CORRUPTED_LOG_SCENARIOS = {
     "too much subsequent corrupted data": (
@@ -341,13 +356,15 @@ def test_full_yaml_log(mock_proxy, frozen_time, lava_job_submitter):
         if not data_chunk:
             return
 
-        first_log_time = data_chunk[0]["dt"]
+        first_log = lava_yaml.load(data_chunk[0])[0]
+        first_log_time = first_log["dt"]
         frozen_time.move_to(first_log_time)
         yield
 
-        last_log_time = data_chunk[-1]["dt"]
+        last_log = lava_yaml.load(data_chunk[-1])[0]
+        last_log_time = last_log["dt"]
         frozen_time.move_to(last_log_time)
-        return
+        yield
 
     def time_travel_to_test_time():
         # Suppose that the first message timestamp of the entire LAVA job log is
@@ -357,22 +374,31 @@ def test_full_yaml_log(mock_proxy, frozen_time, lava_job_submitter):
             first_log_time = lava_yaml.load(first_log)[0]["dt"]
             frozen_time.move_to(first_log_time)
 
-    def load_lines() -> list:
+    def load_lines() -> Generator[tuple[bool, str], None, None]:
         with open("/tmp/log.yaml", "r") as f:
             # data = yaml.safe_load(f)
-            data = f.readlines()
-            stream = chain(data)
+            log_lines = f.readlines()
+            serial_message: str = ""
+            chunk_start_line = 0
+            chunk_end_line = 0
+            chunk_max_size = 100
             try:
                 while True:
-                    data_chunk = [next(stream) for _ in range(random.randint(0, 50))]
-                    serial_message = "".join(data_chunk)
+                    chunk_end_line = chunk_start_line + random.randint(1, chunk_max_size)
+                    # split the log in chunks of random size
+                    log_chunk = list(islice(log_lines, chunk_start_line, chunk_end_line))
+                    chunk_start_line = chunk_end_line + 1
+                    serial_message = "".join(log_chunk)
+                    # time_traveller_gen will make the time trave according to the timestamp from
+                    # the message
+                    time_traveller_gen = time_travel_from_log_chunk(log_chunk)
                     # Suppose that the first message timestamp is the same of
                     # log fetch RPC call
-                    time_travel_from_log_chunk(data_chunk)
+                    next(time_traveller_gen)
                     yield False, "[]"
                     # Travel to the same datetime of the last fetched log line
                     # in the chunk
-                    time_travel_from_log_chunk(data_chunk)
+                    next(time_traveller_gen)
                     yield False, serial_message
             except StopIteration:
                 yield True, serial_message
@@ -384,11 +410,20 @@ def test_full_yaml_log(mock_proxy, frozen_time, lava_job_submitter):
         proxy.scheduler.jobs.logs.side_effect = load_lines()
 
     proxy.scheduler.jobs.submit = reset_logs
-    with pytest.raises(MesaCIRetryError):
+    try:
         time_travel_to_test_time()
-        lava_job_submitter.submit()
+        start_time = datetime.now()
         retriable_follow_job(proxy, "")
-        print(lava_job_submitter.structured_log_file.read_text())
+    finally:
+        try:
+            # If the job fails, maybe there will be no structured log
+            print(lava_job_submitter.structured_log_file.read_text())
+        finally:
+            end_time = datetime.now()
+            print("---- Reproduction log stats ----")
+            print(f"Start time: {start_time}")
+            print(f"End time: {end_time}")
+            print(f"Duration: {end_time - start_time}")
 
 
 @pytest.mark.parametrize(
@@ -417,9 +452,7 @@ def test_job_combined_status(
         "lava.lava_job_submitter.retriable_follow_job"
     ) as mock_retriable_follow_job, patch(
         "lava.lava_job_submitter.LAVAJobSubmitter._LAVAJobSubmitter__prepare_submission"
-    ) as mock_prepare_submission, patch(
-        "sys.exit"
-    ):
+    ) as mock_prepare_submission, patch("sys.exit"):
         from lava.lava_job_submitter import STRUCTURAL_LOG
 
         mock_retriable_follow_job.return_value = MagicMock(status=finished_job_status)

.gitlab-ci/tests/utils/test_lava_log.py

@@ -16,8 +16,15 @@ from lava.utils import (
     fix_lava_gitlab_section_log,
     hide_sensitive_data,
 )
+from lava.utils.constants import KNOWN_ISSUE_R8152_MAX_CONSECUTIVE_COUNTER
 
-from ..lava.helpers import create_lava_yaml_msg, does_not_raise, lava_yaml, yaml_dump
+from ..lava.helpers import (
+    create_lava_yaml_msg,
+    does_not_raise,
+    lava_yaml,
+    mock_lava_signal,
+    yaml_dump,
+)
 
 GITLAB_SECTION_SCENARIOS = {
     "start collapsed": (
@@ -311,47 +318,56 @@ def test_gitlab_section_id(case_name, expected_id):
     assert gl.id == expected_id
 
 
-A618_NETWORK_ISSUE_LOGS = [
-    create_lava_yaml_msg(
-        msg="[ 1733.599402] r8152 2-1.3:1.0 eth0: Tx status -71", lvl="target"
-    ),
-    create_lava_yaml_msg(
-        msg="[ 1733.604506] nfs: server 192.168.201.1 not responding, still trying",
-        lvl="target",
-    ),
-]
-TEST_PHASE_LAVA_SIGNAL = create_lava_yaml_msg(
-    msg="Received signal: <STARTTC> mesa-ci_a618_vk", lvl="debug"
-)
+def a618_network_issue_logs(level: str = "target") -> list:
+    net_error = create_lava_yaml_msg(
+            msg="[ 1733.599402] r8152 2-1.3:1.0 eth0: Tx status -71", lvl=level)
+
+    nfs_error = create_lava_yaml_msg(
+            msg="[ 1733.604506] nfs: server 192.168.201.1 not responding, still trying",
+            lvl=level,
+        )
+
+    return [
+        *(KNOWN_ISSUE_R8152_MAX_CONSECUTIVE_COUNTER*[net_error]),
+        nfs_error
+    ]
+
+
+TEST_PHASE_LAVA_SIGNAL = mock_lava_signal(LogSectionType.TEST_CASE)
+A618_NET_ISSUE_BOOT = a618_network_issue_logs(level="feedback")
+A618_NET_ISSUE_TEST = [TEST_PHASE_LAVA_SIGNAL, *a618_network_issue_logs(level="target")]
 
 
 A618_NETWORK_ISSUE_SCENARIOS = {
-    "Pass - R8152 kmsg during boot": (A618_NETWORK_ISSUE_LOGS, does_not_raise()),
+    "Fail - R8152 kmsg during boot phase": (
+        A618_NET_ISSUE_BOOT,
+        pytest.raises(MesaCIKnownIssueException),
+    ),
     "Fail - R8152 kmsg during test phase": (
-        [TEST_PHASE_LAVA_SIGNAL, *A618_NETWORK_ISSUE_LOGS],
+        A618_NET_ISSUE_TEST,
         pytest.raises(MesaCIKnownIssueException),
     ),
     "Pass - Partial (1) R8152 kmsg during test phase": (
-        [TEST_PHASE_LAVA_SIGNAL, A618_NETWORK_ISSUE_LOGS[0]],
+        A618_NET_ISSUE_TEST[:1],
         does_not_raise(),
     ),
     "Pass - Partial (2) R8152 kmsg during test phase": (
-        [TEST_PHASE_LAVA_SIGNAL, A618_NETWORK_ISSUE_LOGS[1]],
+        A618_NET_ISSUE_TEST[:2],
         does_not_raise(),
     ),
-    "Pass - Partial subsequent (3) R8152 kmsg during test phase": (
+    "Pass - Partial (3) subsequent R8152 kmsg during test phase": (
         [
             TEST_PHASE_LAVA_SIGNAL,
-            A618_NETWORK_ISSUE_LOGS[0],
-            A618_NETWORK_ISSUE_LOGS[0],
+            A618_NET_ISSUE_TEST[1],
+            A618_NET_ISSUE_TEST[1],
         ],
         does_not_raise(),
     ),
-    "Pass - Partial subsequent (4) R8152 kmsg during test phase": (
+    "Pass - Partial (4) subsequent nfs kmsg during test phase": (
         [
             TEST_PHASE_LAVA_SIGNAL,
-            A618_NETWORK_ISSUE_LOGS[1],
-            A618_NETWORK_ISSUE_LOGS[1],
+            A618_NET_ISSUE_TEST[-1],
+            A618_NET_ISSUE_TEST[-1],
         ],
         does_not_raise(),
     ),
@@ -364,6 +380,13 @@ A618_NETWORK_ISSUE_SCENARIOS = {
     ids=A618_NETWORK_ISSUE_SCENARIOS.keys(),
 )
 def test_detect_failure(messages, expectation):
-    lf = LogFollower()
+    boot_section = GitlabSection(
+        id="lava_boot",
+        header="LAVA boot",
+        type=LogSectionType.LAVA_BOOT,
+        start_collapsed=True,
+    )
+    boot_section.start()
+    lf = LogFollower(starting_section=boot_section)
     with expectation:
         lf.feed(messages)

.gitlab-ci/valve/traces-runner.sh

@@ -1,87 +0,0 @@
-#!/usr/bin/env bash
-# shellcheck disable=SC2086 # we want word splitting
-
-set -ex
-
-if [[ -z "$VK_DRIVER" ]]; then
-    exit 1
-fi
-
-# Useful debug output, you rarely know what envirnoment you'll be
-# running in within container-land, this can be a landmark.
-ls -l
-
-INSTALL=$(realpath -s "$PWD"/install)
-RESULTS=$(realpath -s "$PWD"/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=$(sed 's/\./\\./g' "$INSTALL/VERSION")
-
-# Force the stdout and stderr streams to be unbuffered in python.
-export PYTHONUNBUFFERED=1
-
-# Set the Vulkan driver to use.
-export VK_ICD_FILENAMES="$INSTALL/share/vulkan/icd.d/${VK_DRIVER}_icd.x86_64.json"
-if [ "${VK_DRIVER}" = "radeon" ]; then
-    # Disable vsync
-    export MESA_VK_WSI_PRESENT_MODE=mailbox
-    export vblank_mode=0
-fi
-
-# Set environment for Wine.
-export WINEDEBUG="-all"
-export WINEPREFIX="/dxvk-wine64"
-export WINEESYNC=1
-
-# Wait for amdgpu to be fully loaded
-sleep 1
-
-# Avoid having to perform nasty command pre-processing to insert the
-# wine executable in front of the test executables. Instead, use the
-# kernel's binfmt support to automatically use Wine as an interpreter
-# when asked to load PE executables.
-# TODO: Have boot2container mount this filesystem for all jobs?
-mount -t binfmt_misc none /proc/sys/fs/binfmt_misc
-echo ':DOSWin:M::MZ::/usr/bin/wine64:' > /proc/sys/fs/binfmt_misc/register
-
-# Set environment for DXVK.
-export DXVK_LOG_LEVEL="info"
-export DXVK_LOG="$RESULTS/dxvk"
-[ -d "$DXVK_LOG" ] || mkdir -pv "$DXVK_LOG"
-export DXVK_STATE_CACHE=0
-
-# Set environment for replaying traces.
-export PATH="/apitrace-msvc-win64/bin:/gfxreconstruct/build/bin:$PATH"
-
-SANITY_MESA_VERSION_CMD="vulkaninfo"
-
-# Set up the Window System Interface (WSI)
-# TODO: Can we get away with GBM?
-if [ "${TEST_START_XORG:-0}" -eq 1 ]; then
-    "$INSTALL"/common/start-x.sh "$INSTALL"
-    export DISPLAY=:0
-fi
-
-wine64 --version
-
-SANITY_MESA_VERSION_CMD="$SANITY_MESA_VERSION_CMD | tee /tmp/version.txt | grep \"Mesa $MESA_VERSION\(\s\|$\)\""
-
-RUN_CMD="export LD_LIBRARY_PATH=$__LD_LIBRARY_PATH; $SANITY_MESA_VERSION_CMD"
-
-set +e
-if ! eval $RUN_CMD;
-then
-    printf "%s\n" "Found $(cat /tmp/version.txt), expected $MESA_VERSION"
-fi
-set -e
-
-# Just to be sure...
-chmod +x ./valvetraces-run.sh
-./valvetraces-run.sh

.gitlab-ci/vkd3d-proton/run.sh

@@ -23,7 +23,7 @@ export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$INSTALL/lib/:/vkd3d-proton-tests/x64/"
 MESA_VERSION=$(sed 's/\./\\./g' "$INSTALL/VERSION")
 
 # Set the Vulkan driver to use.
-export VK_ICD_FILENAMES="$INSTALL/share/vulkan/icd.d/${VK_DRIVER}_icd.x86_64.json"
+export VK_DRIVER_FILES="$INSTALL/share/vulkan/icd.d/${VK_DRIVER}_icd.x86_64.json"
 
 # Set environment for Wine.
 export WINEDEBUG="-all"

.gitlab-ci/windows/Dockerfile_build

@@ -7,6 +7,10 @@ COPY mesa_deps_vulkan_sdk.ps1 C:\
 RUN C:\mesa_deps_vulkan_sdk.ps1
 
 COPY mesa_init_msvc.ps1 C:\
+
+COPY mesa_deps_libva.ps1 C:\
+RUN C:\mesa_deps_libva.ps1
+
 COPY mesa_deps_build.ps1 C:\
 RUN C:\mesa_deps_build.ps1
 

.gitlab-ci/windows/Dockerfile_test

@@ -14,6 +14,9 @@ RUN C:\mesa_deps_rust.ps1
 
 COPY mesa_init_msvc.ps1 C:\
 
+COPY mesa_deps_libva.ps1 C:\
+RUN C:\mesa_deps_libva.ps1
+
 COPY mesa_deps_test_piglit.ps1 C:\
 RUN C:\mesa_deps_test_piglit.ps1
 COPY mesa_deps_test_deqp.ps1 c:\

.gitlab-ci/windows/deqp_runner_run.ps1

@@ -1,4 +1,4 @@
-# VK_ICD_FILENAMES environment variable is not used when running with
+# VK_DRIVER_FILES environment variable is not used when running with
 # elevated privileges. Add a key to the registry instead.
 $hkey_path = "HKLM:\SOFTWARE\Khronos\Vulkan\Drivers\"
 $hkey_name = Join-Path -Path $pwd -ChildPath "_install\share\vulkan\icd.d\dzn_icd.x86_64.json"

.gitlab-ci/windows/mesa_build.ps1

@@ -59,7 +59,6 @@ meson setup `
 -Dopencl-spirv=true `
 -Dmicrosoft-clc=enabled `
 -Dstatic-libclc=all `
--Dopencl-external-clang-headers=disabled `
 -Dspirv-to-dxil=true `
 -Dbuild-tests=true `
 -Dwerror=true `
@@ -85,4 +84,6 @@ Copy-Item ".\.gitlab-ci\windows\spirv2dxil_run.ps1" -Destination $installdir
 
 Copy-Item ".\.gitlab-ci\windows\deqp_runner_run.ps1" -Destination $installdir
 
+Copy-Item ".\.gitlab-ci\windows\vainfo_run.ps1" -Destination $installdir
+
 Get-ChildItem -Recurse -Filter "ci" | Get-ChildItem -Include "*.txt","*.toml" | Copy-Item -Destination $installdir

.gitlab-ci/windows/mesa_deps_build.ps1

@@ -12,7 +12,7 @@ $depsInstallPath="C:\mesa-deps"
 
 Get-Date
 Write-Host "Cloning DirectX-Headers"
-git clone -b v1.611.0 --depth=1 https://github.com/microsoft/DirectX-Headers deps/DirectX-Headers
+git clone -b v1.613.1 --depth=1 https://github.com/microsoft/DirectX-Headers deps/DirectX-Headers
 if (!$?) {
   Write-Host "Failed to clone DirectX-Headers repository"
   Exit 1
@@ -32,16 +32,17 @@ if (!$buildstatus) {
 
 Get-Date
 Write-Host "Cloning zlib"
-git clone -b v1.2.13 --depth=1 https://github.com/madler/zlib deps/zlib
+git clone -b v1.3.1 --depth=1 https://github.com/madler/zlib deps/zlib
 if (!$?) {
   Write-Host "Failed to clone zlib repository"
   Exit 1
 }
 Write-Host "Downloading zlib meson build files"
-Invoke-WebRequest -Uri "https://wrapdb.mesonbuild.com/v2/zlib_1.2.13-1/get_patch" -OutFile deps/zlib.zip
+Invoke-WebRequest -Uri "https://wrapdb.mesonbuild.com/v2/zlib_1.3.1-1/get_patch" -OutFile deps/zlib.zip
 Expand-Archive -Path deps/zlib.zip -Destination deps/zlib
 # Wrap archive puts build files in a version subdir
-Move-Item deps/zlib/zlib-1.2.13/* deps/zlib
+robocopy deps/zlib/zlib-1.3.1 deps/zlib /E
+Remove-Item -Recurse -Force -ErrorAction SilentlyContinue -Path deps/zlib/zlib-1.3.1
 $zlib_build = New-Item -ItemType Directory -Path ".\deps\zlib" -Name "build"
 Push-Location -Path $zlib_build.FullName
 meson .. --backend=ninja -Dprefix="$depsInstallPath" --default-library=static --buildtype=release -Db_vscrt=mt && `
@@ -54,35 +55,6 @@ if (!$buildstatus) {
   Exit 1
 }
 
-
-Get-Date
-Write-Host "Cloning libva"
-git clone https://github.com/intel/libva.git deps/libva
-if (!$?) {
-  Write-Host "Failed to clone libva repository"
-  Exit 1
-}
-
-Push-Location -Path ".\deps\libva"
-Write-Host "Checking out libva df3c584bb79d1a1e521372d62fa62e8b1c52ce6c"
-# libva-win32 is released with libva version 2.17 (see https://github.com/intel/libva/releases/tag/2.17.0)
-git checkout 2.17.0
-Pop-Location
-
-Write-Host "Building libva"
-# libva already has a build dir in their repo, use builddir instead
-$libva_build = New-Item -ItemType Directory -Path ".\deps\libva" -Name "builddir"
-Push-Location -Path $libva_build.FullName
-meson .. -Dprefix="$depsInstallPath"
-ninja -j32 install
-$buildstatus = $?
-Pop-Location
-Remove-Item -Recurse -Force -ErrorAction SilentlyContinue -Path $libva_build
-if (!$buildstatus) {
-  Write-Host "Failed to compile libva"
-  Exit 1
-}
-
 Get-Date
 Write-Host "Cloning LLVM release/15.x"
 git clone -b release/15.x --depth=1 https://github.com/llvm/llvm-project deps/llvm-project
@@ -158,12 +130,12 @@ Remove-Item -Recurse -Force -ErrorAction SilentlyContinue -Path $llvm_build
 
 Get-Date
 Write-Host "Cloning SPIRV-Tools"
-git clone -b "sdk-$env:VULKAN_SDK_VERSION" --depth=1 https://github.com/KhronosGroup/SPIRV-Tools deps/SPIRV-Tools
+git clone -b "vulkan-sdk-$env:VULKAN_SDK_VERSION" --depth=1 https://github.com/KhronosGroup/SPIRV-Tools deps/SPIRV-Tools
 if (!$?) {
   Write-Host "Failed to clone SPIRV-Tools repository"
   Exit 1
 }
-git clone -b "sdk-$env:VULKAN_SDK_VERSION" --depth=1 https://github.com/KhronosGroup/SPIRV-Headers deps/SPIRV-Tools/external/SPIRV-Headers
+git clone -b "vulkan-sdk-$env:VULKAN_SDK_VERSION" --depth=1 https://github.com/KhronosGroup/SPIRV-Headers deps/SPIRV-Tools/external/SPIRV-Headers
 if (!$?) {
   Write-Host "Failed to clone SPIRV-Headers repository"
   Exit 1

.gitlab-ci/windows/mesa_deps_d3d.ps1

@@ -8,7 +8,7 @@ $depsInstallPath="C:\mesa-deps"
 
 Write-Host "Downloading DirectX 12 Agility SDK at:"
 Get-Date
-Invoke-WebRequest -Uri https://www.nuget.org/api/v2/package/Microsoft.Direct3D.D3D12/1.610.2 -OutFile 'agility.zip'
+Invoke-WebRequest -Uri https://www.nuget.org/api/v2/package/Microsoft.Direct3D.D3D12/1.613.2 -OutFile 'agility.zip'
 Expand-Archive -Path 'agility.zip' -DestinationPath 'C:\agility'
 # Copy Agility SDK into mesa-deps\bin\D3D12
 New-Item -ErrorAction SilentlyContinue -ItemType Directory -Path $depsInstallPath\bin -Name 'D3D12'
@@ -18,7 +18,7 @@ Remove-Item -Recurse 'C:\agility'
 
 Write-Host "Downloading Updated WARP at:"
 Get-Date
-Invoke-WebRequest -Uri https://www.nuget.org/api/v2/package/Microsoft.Direct3D.WARP/1.0.7.1 -OutFile 'warp.zip'
+Invoke-WebRequest -Uri https://www.nuget.org/api/v2/package/Microsoft.Direct3D.WARP/1.0.11 -OutFile 'warp.zip'
 Expand-Archive -Path 'warp.zip' -DestinationPath 'C:\warp'
 # Copy WARP into mesa-deps\bin
 Copy-Item 'C:\warp\build\native\amd64\d3d10warp.dll' -Destination $depsInstallPath\bin
@@ -27,7 +27,7 @@ Remove-Item -Recurse 'C:\warp'
 
 Write-Host "Downloading DirectXShaderCompiler release at:"
 Get-Date
-Invoke-WebRequest -Uri https://github.com/microsoft/DirectXShaderCompiler/releases/download/v1.7.2207/dxc_2022_07_18.zip -OutFile 'DXC.zip'
+Invoke-WebRequest -Uri https://github.com/microsoft/DirectXShaderCompiler/releases/download/v1.8.2403/dxc_2024_03_07.zip -OutFile 'DXC.zip'
 Expand-Archive -Path 'DXC.zip' -DestinationPath 'C:\DXC'
 # No more need to get dxil.dll from the VS install
 Copy-Item 'C:\DXC\bin\x64\*.dll' -Destination 'C:\Windows\System32'

.gitlab-ci/windows/mesa_deps_libva.ps1

@@ -0,0 +1,79 @@
+# Compiling libva/libva-utils deps
+
+$ProgressPreference = "SilentlyContinue"
+$MyPath = $MyInvocation.MyCommand.Path | Split-Path -Parent
+. "$MyPath\mesa_init_msvc.ps1"
+
+Remove-Item -Recurse -Force -ErrorAction SilentlyContinue "deps" | Out-Null
+$depsInstallPath="C:\mesa-deps"
+
+Write-Host "Cloning libva at:"
+Get-Date
+git clone https://github.com/intel/libva.git deps/libva
+if (!$?) {
+  Write-Host "Failed to clone libva repository"
+  Exit 1
+}
+
+Write-Host "Cloning libva finished at:"
+Get-Date
+
+Write-Host "Building libva at:"
+Get-Date
+
+Push-Location -Path ".\deps\libva"
+Write-Host "Checking out libva..."
+git checkout 2.21.0
+Pop-Location
+
+# libva already has a build dir in their repo, use builddir instead
+$libva_build = New-Item -ItemType Directory -Path ".\deps\libva" -Name "builddir"
+Push-Location -Path $libva_build.FullName
+meson .. -Dprefix="$depsInstallPath"
+ninja -j32 install
+$buildstatus = $?
+Pop-Location
+Remove-Item -Recurse -Force -ErrorAction SilentlyContinue -Path $libva_build
+if (!$buildstatus) {
+  Write-Host "Failed to compile libva"
+  Exit 1
+}
+
+Write-Host "Building libva finished at:"
+Get-Date
+
+Write-Host "Cloning libva-utils at:"
+Get-Date
+git clone https://github.com/intel/libva-utils.git deps/libva-utils
+if (!$?) {
+  Write-Host "Failed to clone libva-utils repository"
+  Exit 1
+}
+
+Write-Host "Cloning libva-utils finished at:"
+Get-Date
+
+Write-Host "Building libva-utils at:"
+Get-Date
+
+Push-Location -Path ".\deps\libva-utils"
+Write-Host "Checking out libva-utils..."
+git checkout 2.21.0
+Pop-Location
+
+Write-Host "Building libva-utils"
+# libva-utils already has a build dir in their repo, use builddir instead
+$libva_utils_build = New-Item -ItemType Directory -Path ".\deps\libva-utils" -Name "builddir"
+Push-Location -Path $libva_utils_build.FullName
+meson .. -Dprefix="$depsInstallPath" --pkg-config-path="$depsInstallPath\lib\pkgconfig;$depsInstallPath\share\pkgconfig"
+ninja -j32 install
+$buildstatus = $?
+Pop-Location
+Remove-Item -Recurse -Force -ErrorAction SilentlyContinue -Path $libva_utils_build
+if (!$buildstatus) {
+  Write-Host "Failed to compile libva-utils"
+  Exit 1
+}
+
+Write-Host "Building libva-utils finished at:"
+Get-Date

.gitlab-ci/windows/mesa_deps_test_piglit.ps1

@@ -53,7 +53,7 @@ New-Item -ItemType Directory -Path "$piglit_source" | Out-Null
 Push-Location -Path $piglit_source
 git init
 git remote add origin https://gitlab.freedesktop.org/mesa/piglit.git
-git fetch --depth 1 origin b41accc83689966f91217fc5b57dbe06202b8c8c # of branch main
+git fetch --depth 1 origin 814046fe6942eac660ee4a6cc5fcc54011a49945 # of branch main
 if (!$?) {
   Write-Host "Failed to fetch Piglit repository"
   Pop-Location

.gitlab-ci/windows/mesa_deps_vulkan_sdk.ps1

@@ -2,7 +2,7 @@
 # Touch this file needs update both WINDOWS_X64_BUILD_TAG WINDOWS_X64_TEST_TAG
 # This file needs run in administrator mode
 
-$env:VULKAN_SDK_VERSION="1.3.211.0"
+$env:VULKAN_SDK_VERSION="1.3.275.0"
 
 $ProgressPreference = "SilentlyContinue"
 

.gitlab-ci/windows/piglit_run.ps1

@@ -1,4 +1,5 @@
 $env:PIGLIT_NO_FAST_SKIP = 1
+$env:PIGLIT_SPIRV_AS_BINARY = "C:\VulkanSDK\$env:VULKAN_SDK_VERSION\Bin\spirv-as.exe"
 
 Copy-Item -Path _install\bin\opengl32.dll -Destination C:\Piglit\bin\opengl32.dll
 Copy-Item -Path _install\bin\libgallium_wgl.dll -Destination C:\Piglit\bin\libgallium_wgl.dll

.gitlab-ci/windows/vainfo_run.ps1

@@ -0,0 +1,99 @@
+
+function Deploy-Dependencies {
+  param (
+    [string] $deploy_directory
+  )
+  
+  Write-Host "Copying libva runtime and driver at:"
+  Get-Date
+
+  # Copy the VA runtime binaries from the mesa built dependencies so the versions match with the built mesa VA driver binary
+  $depsInstallPath="C:\mesa-deps"
+  Copy-Item "$depsInstallPath\bin\vainfo.exe" -Destination "$deploy_directory\vainfo.exe"
+  Copy-Item "$depsInstallPath\bin\va_win32.dll" -Destination "$deploy_directory\va_win32.dll"
+  Copy-Item "$depsInstallPath\bin\va.dll" -Destination "$deploy_directory\va.dll"
+
+  # Copy Agility SDK into D3D12 subfolder of vainfo
+  New-Item -ItemType Directory -Force -Path "$deploy_directory\D3D12" | Out-Null
+  Copy-Item "$depsInstallPath\bin\D3D12\D3D12Core.dll" -Destination "$deploy_directory\D3D12\D3D12Core.dll"
+  Copy-Item "$depsInstallPath\bin\D3D12\d3d12SDKLayers.dll" -Destination "$deploy_directory\D3D12\d3d12SDKLayers.dll"
+
+  # Copy WARP next to vainfo
+  Copy-Item "$depsInstallPath\bin\d3d10warp.dll" -Destination "$deploy_directory\d3d10warp.dll"
+
+  Write-Host "Copying libva runtime and driver finished at:"
+  Get-Date
+}
+
+function Check-VAInfo-Entrypoint {
+  param (
+    [string] $vainfo_app_path,
+    [string] $entrypoint
+  )
+
+  $vainfo_run_cmd = "$vainfo_app_path --display win32 --device 0 2>&1 | Select-String $entrypoint -Quiet"
+  Write-Host "Running: $vainfo_run_cmd"
+  $vainfo_ret_code= Invoke-Expression $vainfo_run_cmd
+  if (-not($vainfo_ret_code)) {
+      return 0
+  }
+  return 1
+}
+
+# Set testing environment variables
+$successful_run=1
+$testing_dir="$PWD\_install\bin" # vaon12_drv_video.dll is placed on this directory by the build
+$vainfo_app_path = "$testing_dir\vainfo.exe"
+
+# Deploy vainfo and dependencies
+Deploy-Dependencies -deploy_directory $testing_dir
+
+# Set VA runtime environment variables
+$env:LIBVA_DRIVER_NAME="vaon12"
+$env:LIBVA_DRIVERS_PATH="$testing_dir"
+
+Write-Host "LIBVA_DRIVER_NAME: $env:LIBVA_DRIVER_NAME"
+Write-Host "LIBVA_DRIVERS_PATH: $env:LIBVA_DRIVERS_PATH"
+
+# Check video processing entrypoint is supported
+# Inbox WARP/D3D12 supports this entrypoint with VA frontend shaders support (e.g no video APIs support required)
+$entrypoint = "VAEntrypointVideoProc"
+
+# First run without app verifier
+Write-Host "Disabling appverifier for $vainfo_app_path and checking for the presence of $entrypoint supported..."
+appverif.exe /disable * -for "$vainfo_app_path"
+$result_without_appverifier = Check-VAInfo-Entrypoint -vainfo_app_path $vainfo_app_path -entrypoint $entrypoint
+if ($result_without_appverifier -eq 1) {
+  Write-Host "Process exited successfully."
+} else {
+  $successful_run=0
+  Write-Error "Process exit not successful for $vainfo_run_cmd. Please see vainfo verbose output below for diagnostics..."
+  # verbose run to print more info on error (helpful to investigate issues from the CI output)
+  Invoke-Expression "$vainfo_app_path -a --display win32 --device help"
+  Invoke-Expression "$vainfo_app_path -a --display win32 --device 0"
+}
+
+# Enable appverif and run again
+Write-Host "Enabling appverifier for $vainfo_app_path and checking for the presence of $entrypoint supported..."
+appverif.exe /logtofile enable
+appverif.exe /verify "$vainfo_app_path"
+appverif.exe /enable "Leak" -for "$vainfo_app_path"
+$verifier_log_path="$testing_dir\vainfo_appverif_log.xml"
+$result_with_appverifier = Check-VAInfo-Entrypoint -vainfo_app_path $vainfo_app_path -entrypoint $entrypoint
+if ($result_with_appverifier -eq 1) {
+  Write-Host "Process exited successfully."
+  appverif.exe /logtofile disable
+} else {
+  Write-Host "Process failed. Please see Application Verifier log contents below."
+  # Need to wait for appverif to exit before gathering log
+  Start-Process -Wait -FilePath "appverif.exe" -ArgumentList "-export", "log", "-for", "$vainfo_app_path", "-with", "to=$verifier_log_path"
+  Get-Content $verifier_log_path
+  Write-Error "Process exit not successful for $vainfo_run_cmd."
+  appverif.exe /logtofile disable
+  $successful_run=0
+}
+
+if ($successful_run -ne 1) {
+  Exit 1
+}
+

.mr-label-maker.yml

@@ -0,0 +1,282 @@
+# version field is required
+version: 1
+project:
+    name: 'mesa'
+    id: 176
+    instance: https://gitlab.freedesktop.org
+
+issues:
+    topics: &topics
+        'aco': 'ACO'
+        'anv': 'ANV'
+        'asahi': 'asahi'
+        'blorp': 'blorp'
+        'ci': 'CI'
+        'clc': 'OpenCL'
+        'clover': 'clover'
+        'crocus': 'crocus'
+        'd3d12': 'd3d12'
+        'docs': 'docs'
+        'dozen': 'dozen'
+        'drirc': 'drirc'
+        'dzn': 'dozen'
+        'egl': 'EGL'
+        'etnaviv': 'etnaviv'
+        'freedreno': 'freedreno'
+        'freedreno/ir3': ['freedreno', 'ir3']
+        'gallium': 'gallium'
+        'gbm': 'gbm'
+        'gitlab-ci': 'CI'
+        'glsl': 'GLSL'
+        'glvnd': 'GLVND'
+        'glx': 'GLX'
+        'hasvk': 'hasvk'
+        'i915': 'i915'
+        'i965': 'i965'
+        'intel/compiler': 'intel-compiler'
+        'intel/brw': 'intel-brw'
+        'intel/elk': 'intel-elk'
+        'intel/tools': 'intel-tools'
+        'iris': 'iris'
+        'isl': 'ISL'
+        'lima': 'lima'
+        'lima/ppir' : 'lima'
+        'llvmpipe': 'llvmpipe'
+        'mesa' : 'mesa'
+        'meson' : 'meson'
+        'microsoft/compiler': 'd3d12'
+        'nak' : 'NAK'
+        'nine' : 'nine'
+        'nir': 'NIR'
+        'nir2dxil': 'd3d12'
+        'nouveau' : 'nouveau'
+        'nv30' : ['nouveau', 'nv30']
+        'nv50' : ['nouveau', 'nv50']
+        'nv50/ir' : 'nouveau'
+        'nvc0' : ['nouveau', 'nvc0']
+        'nvk' : 'NVK'
+        'panfrost' : 'panfrost'
+        'pan/midgard' : 'panfrost'
+        'pvr' : 'powervr'
+        'r100' : 'r100'
+        'r200' : 'r200'
+        'r300' : 'r300'
+        'r600' : 'r600'
+        'radeonsi' : 'radeonsi'
+        'radv': 'RADV'
+        'radv/aco': ['RADV', 'ACO']
+        'rusticl': 'Rusticl'
+        'softpipe' : 'softpipe'
+        'spirv' : 'SPIR-V'
+        'swr' : 'swr'
+        'swrast' : 'swrast'
+        'tegra' : 'tegra'
+        'tgsi' : 'TGSI'
+        'turnip': 'turnip'
+        'util' : 'util'
+        'v3d': 'v3d'
+        'vaapi' : 'VA-API'
+        'vc4' : 'vc4'
+        'vdpau' : 'VDPAU'
+        'vieux' : 'vieux'
+        'virgl' : 'virgl'
+        'vmwgfx' : 'vmwgfx'
+        'zink': 'zink'
+
+    titles: &titles
+        'android': 'android'
+        'bisected': 'bisected'
+        'coverity': 'coverity'
+        'deqp': 'deqp'
+        'feature request': 'feature request'
+        'haiku' : 'haiku'
+        'regression': 'regression'
+
+        'i915_dri.so' : 'i915'
+        'i965_dri.so' : 'i965'
+        'iris_dri.so' : 'iris'
+        'nouveau_dri.so' : 'nouveau'
+        'nouveau_vieux_dri.so' : 'vieux'
+        'r200_dri.so' : 'r200'
+        'r300_dri.so' : 'r300'
+        'r600_dri.so' : 'r600'
+        'radeonsi_dri.so' : 'radeonsi'
+        'swrast_dri.so' : 'swrast'
+        'vmwgfx_dri.so' : 'vmwgfx'
+
+merge_requests:
+    topics:
+        *topics
+    titles:
+        *titles
+
+    paths:
+        '^.gitlab/issue_templates/' : ['docs']
+        '^.gitlab-ci' : ['CI']
+        '^.*/gitlab-ci(-inc)?.yml' : ['CI']
+        '^.*/ci/deqp-.*\.toml' : ['CI']
+        '^.*/ci/.*-(fails|flakes|skips)\.txt' : ['CI']
+        '^.*/ci/(restricted-)?traces-.*\.yml' : ['CI']
+        '^.*/ci/.*-validation-settings\.txt' : ['CI']
+        '^.gitlab-ci/windows/' : ['Windows']
+        '^bin/__init__.py$' : ['maintainer-scripts']
+        '^bin/gen_release_notes' : ['maintainer-scripts']
+        '^bin/git_sha1_gen.py$' : ['meson', 'android']
+        '^bin/install_megadrivers.py$' : ['meson']
+        '^bin/meson-cmd-extract.py$' : ['meson']
+        '^bin/meson.build$' : ['meson']
+        '^bin/pick-ui' : ['maintainer-scripts']
+        '^bin/pick/' : ['maintainer-scripts']
+        '^bin/post_version' : ['maintainer-scripts']
+        '^bin/symbols-check.py$' : ['meson']
+        '^docs/' : ['docs']
+        '^include/drm-uapi/i915_drm.h' : ['intel']
+        '^include/drm-uapi/xe_drm.h' : ['intel']
+        '^include/vulkan/' : ['vulkan']
+        '^meson_options.txt' : ['meson']
+        '^README.rst' : ['docs']
+        '^src/amd/addrlib/' : ['AMD common']
+        '^src/amd/common/' : ['AMD common']
+        '^src/amd/compiler/' : ['ACO']
+        '^src/amd/llvm/' : ['AMD common']
+        '^src/amd/registers/' : ['AMD common']
+        '^src/amd/vulkan/' : ['RADV']
+        '^src/asahi/' : ['asahi']
+        '^src/broadcom/drm-shim/v3d' : ['v3d']
+        '^src/broadcom/vulkan/' : ['v3dv']
+        '^src/compiler/clc' : ['OpenCL']
+        '^src/compiler/glsl' : ['GLSL']
+        '^src/compiler/nir' : ['NIR']
+        '^src/compiler/spirv/' : ['SPIR-V']
+        '^src/egl/' : ['EGL']
+        '^src/egl/drivers/wgl/' : ['wgl']
+        '^src/etnaviv/' : ['etnaviv']
+        '^src/freedreno/' : ['freedreno']
+        '^src/freedreno/ir3/' : ['ir3']
+        '^src/freedreno/vulkan/' : ['turnip']
+        '^src/gallium/auxiliary/' : ['gallium']
+        '^src/gallium/auxiliary/nir/' : ['NIR']
+        '^src/gallium/auxiliary/nir/.*tgsi.*' : ['TGSI']
+        '^src/gallium/auxiliary/tgsi/' : ['TGSI']
+        '^src/gallium/docs/' : ['gallium']
+        '^src/gallium/drivers/asahi/' : ['asahi']
+        '^src/gallium/drivers/crocus/' : ['crocus']
+        '^src/gallium/drivers/d3d12/' : ['d3d12']
+        '^src/gallium/drivers/etnaviv/' : ['etnaviv']
+        '^src/gallium/drivers/freedreno/' : ['freedreno']
+        '^src/gallium/drivers/grate/' : ['tegra']
+        '^src/gallium/drivers/i915/' : ['i915g']
+        '^src/gallium/drivers/iris/' : ['iris']
+        '^src/gallium/drivers/lima/' : ['lima']
+        '^src/gallium/drivers/llvmpipe/' : ['llvmpipe']
+        '^src/gallium/drivers/nouveau/' : ['nouveau']
+        '^src/gallium/drivers/nouveau/nv30' : ['nv30']
+        '^src/gallium/drivers/nouveau/nv50' : ['nv50']
+        '^src/gallium/drivers/nouveau/nvc0' : ['nvc0']
+        '^src/gallium/drivers/panfrost/' : ['panfrost']
+        '^src/gallium/drivers/r300/' : ['r300']
+        '^src/gallium/drivers/r600/' : ['r600']
+        '^src/gallium/drivers/radeonsi' : ['radeonsi']
+        '^src/gallium/drivers/softpipe' : ['softpipe']
+        '^src/gallium/drivers/svga/' : ['svga']
+        '^src/gallium/drivers/swr/' : ['swr']
+        '^src/gallium/drivers/tegra/' : ['tegra']
+        '^src/gallium/drivers/v3d/' : ['v3d']
+        '^src/gallium/drivers/vc4/' : ['vc4']
+        '^src/gallium/drivers/virgl/' : ['virgl']
+        '^src/gallium/drivers/zink/' : ['zink']
+        '^src/gallium/frontends/clover/' : ['clover']
+        '^src/gallium/frontends/dri/' : ['gallium']
+        '^src/gallium/frontends/glx/' : ['GLX']
+        '^src/gallium/frontends/hgl/' : ['haiku']
+        '^src/gallium/frontends/lavapipe/' : ['lavapipe']
+        '^src/gallium/frontends/nine/' : ['nine']
+        '^src/gallium/frontends/omx/' : ['omx']
+        '^src/gallium/frontends/osmesa/' : ['osmesa']
+        '^src/gallium/frontends/rusticl/' : ['Rusticl']
+        '^src/gallium/frontends/va/' : ['VA-API']
+        '^src/gallium/frontends/vdpau/' : ['VDPAU']
+        '^src/gallium/frontends/wgl/' : ['wgl']
+            #        '^src/gallium/frontends/xa/' : ['']
+        '^src/gallium/include/' : ['gallium']
+        '^src/gallium/targets/' : ['gallium']
+        '^src/gallium/targets/opencl/' : ['clover']
+        '^src/gallium/targets/osmesa/' : ['osmesa']
+        '^src/gallium/targets/rusticl/' : ['Rusticl']
+        '^src/gallium/tests/' : ['gallium']
+        '^src/gallium/tools/' : ['gallium']
+            #        '^src/gallium/winsys/amdgpu/' : ['']
+        '^src/gallium/winsys/crocus/' : ['crocus']
+        '^src/gallium/winsys/d3d12/' : ['d3d12']
+        '^src/gallium/winsys/etnaviv/' : ['etnaviv']
+        '^src/gallium/winsys/freedreno/' : ['freedreno']
+        '^src/gallium/winsys/grate/' : ['tegra']
+        '^src/gallium/winsys/i915/' : ['i915g']
+        '^src/gallium/winsys/iris/' : ['iris']
+            #        '^src/gallium/winsys/kmsro/' : ['']
+        '^src/gallium/winsys/lima/' : ['lima']
+        '^src/gallium/winsys/nouveau/' : ['nouveau']
+        '^src/gallium/winsys/panfrost/' : ['panfrost']
+            #        '^src/gallium/winsys/radeon/' : ['radeon']
+        '^src/gallium/winsys/svga/' : ['svga']
+            #        '^src/gallium/winsys/sw/' : ['']
+        '^src/gallium/winsys/sw/gdi/' : ['wgl']
+        '^src/gallium/winsys/tegra/' : ['tegra']
+        '^src/gallium/winsys/v3d/' : ['v3d']
+        '^src/gallium/winsys/vc4/' : ['vc4']
+        '^src/gallium/winsys/virgl/' : ['virgl']
+        '^src/gbm/' : ['gbm']
+        '^src/glx/' : ['GLX']
+        '^src/imagination/' : ['powervr']
+        '^src/intel/blorp/' : ['blorp']
+        '^src/intel/common/' : ['intel']
+        '^src/intel/compiler/' : ['intel-compiler']
+        '^src/intel/compiler/brw' : ['intel-brw']
+        '^src/intel/compiler/elk' : ['intel-elk']
+        '^src/intel/dev/' : ['intel']
+        '^src/intel/ds/' : ['intel']
+        '^src/intel/genxml/' : ['intel']
+        '^src/intel/isl/' : ['ISL']
+        '^src/intel/nullhw-layer/' : ['intel']
+        '^src/intel/perf/' : ['intel']
+        '^src/intel/tools/' : ['intel-tools']
+        '^src/intel/vulkan/' : ['ANV']
+        '^src/intel/vulkan_hasvk/' : ['hasvk']
+        '^src/loader/' : ['loader']
+        '^src/mapi/' : ['mapi']
+        '^src/mesa/drivers/dri/i915/' : ['i915']
+        '^src/mesa/drivers/dri/i965/' : ['i965']
+        '^src/mesa/drivers/dri/nouveau/' : ['vieux']
+        '^src/mesa/drivers/dri/r200/' : ['r200']
+        '^src/mesa/drivers/dri/radeon/' : ['radeon']
+        '^src/mesa/drivers/dri/swrast/' : ['swrast']
+        '^src/mesa/drivers/osmesa' : ['osmesa']
+        '^src/mesa/main/' : ['mesa']
+        '^src/mesa/state_tracker/.*glsl.*' : ['GLSL']
+        '^src/mesa/state_tracker/.*tgsi.*' : ['TGSI']
+        '^src/mesa/state_tracker/.*nir.*' : ['NIR']
+        '^src/microsoft/clc/' : ['d3d12']
+        '^src/microsoft/compiler/' : ['d3d12']
+        '^src/microsoft/spirv_to_dxil/' : ['dozen']
+        '^src/microsoft/vulkan/' : ['dozen']
+        '^src/nouveau/codegen/' : ['nouveau']
+        '^src/nouveau/compiler/' : ['NAK']
+        '^src/nouveau/drm-shim/' : ['nouveau']
+        '^src/nouveau/mme/' : ['NVK']
+        '^src/nouveau/nil/' : ['NVK']
+        '^src/nouveau/nvidia-headers/' : ['NVK']
+        '^src/nouveau/vulkan/' : ['NVK']
+        '^src/nouveau/winsys/' : ['NVK']
+        '^src/panfrost/' : ['panfrost']
+        '^src/virtio/vulkan/' : ['venus']
+        '^src/virtio/venus-protocol/' : ['venus']
+        '^src/virtio/ci/' : ['venus']
+        '^src/util/' : ['util']
+        '^src/util/00-mesa-defaults.conf' : ['drirc']
+        '^src/vulkan/' : ['vulkan']
+        '^VERSION$' : ['maintainer-scripts']
+
+        'Android' : ['android']
+        'EGL' : ['EGL']
+        'meson.build' : ['meson']
+        'wayland' : ['wayland']

CODEOWNERS

@@ -29,7 +29,7 @@ meson.build @dbaker @eric
 
 # Compatibility headers
 /include/c99* @xexaxo
-/src/c11/ @eric @lygstate
+/src/c11/ @lygstate
 
 # Documentation
 /docs/ @eric @xexaxo
@@ -43,8 +43,8 @@ meson.build @dbaker @eric
 /src/compiler/nir/ @gfxstrand
 
 # Vulkan
-/src/vulkan/ @eric @gfxstrand
-/include/vulkan/ @eric @gfxstrand
+/src/vulkan/ @gfxstrand
+/include/vulkan/ @gfxstrand
 
 
 #############
@@ -99,6 +99,10 @@ meson.build @dbaker @eric
 # CI #
 ######
 
+/.gitlab-ci.yml @eric
+/.gitlab-ci/ @eric
+gitlab-ci*.yml @eric
+
 # Broadcom
 /src/broadcom/ci/ @jasuarez @chema
 
@@ -120,8 +124,8 @@ meson.build @dbaker @eric
 /src/gallium/drivers/freedreno/ @robclark
 
 # Imagination
-/include/drm-uapi/pvr_drm.h @CreativeCylon @frankbinns @MTCoster
-/src/imagination/ @CreativeCylon @frankbinns @MTCoster
+/include/drm-uapi/pvr_drm.h @aashishc @frankbinns @luigi.santivetti
+/src/imagination/ @aashishc @frankbinns @luigi.santivetti
 /src/imagination/rogue/ @simon-perretta-img
 
 # Intel

VERSION

@@ -1 +1 @@
-24.0.0-devel
+24.1.0-devel

android/Android.mk

@@ -79,11 +79,6 @@ LOCAL_SHARED_LIBRARIES += libdrm_radeon
 MESON_GEN_PKGCONFIGS += libdrm_radeon:$(LIBDRM_VERSION)
 endif
 
-ifneq ($(filter nouveau,$(BOARD_MESA3D_GALLIUM_DRIVERS)),)
-LOCAL_SHARED_LIBRARIES += libdrm_nouveau
-MESON_GEN_PKGCONFIGS += libdrm_nouveau:$(LIBDRM_VERSION)
-endif
-
 ifneq ($(filter d3d12,$(BOARD_MESA3D_GALLIUM_DRIVERS)),)
 LOCAL_HEADER_LIBRARIES += DirectX-Headers
 LOCAL_STATIC_LIBRARIES += DirectX-Guids
@@ -128,23 +123,21 @@ endif
 #-------------------------------------------------------------------------------
 
 # $1: name
-# $2: symlink suffix
-# $3: subdir
-# $4: source prebuilt
-# $5: export headers
+# $2: subdir
+# $3: source prebuilt
+# $4: export headers
 define mesa3d-lib
 include $(CLEAR_VARS)
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 LOCAL_MODULE := $1
 LOCAL_VENDOR_MODULE := true
-LOCAL_MODULE_RELATIVE_PATH := $3
-LOCAL_PREBUILT_MODULE_FILE := $($4)
+LOCAL_MODULE_RELATIVE_PATH := $2
+LOCAL_PREBUILT_MODULE_FILE := $($3)
 LOCAL_MULTILIB := first
 LOCAL_CHECK_ELF_FILES := false
 LOCAL_MODULE_SUFFIX := .so
-LOCAL_MODULE_SYMLINKS := $1$2
 LOCAL_SHARED_LIBRARIES := $(__MY_SHARED_LIBRARIES)
-LOCAL_EXPORT_C_INCLUDE_DIRS := $5
+LOCAL_EXPORT_C_INCLUDE_DIRS := $4
 include $(BUILD_PREBUILT)
 
 ifdef TARGET_2ND_ARCH
@@ -152,14 +145,13 @@ include $(CLEAR_VARS)
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 LOCAL_MODULE := $1
 LOCAL_VENDOR_MODULE := true
-LOCAL_MODULE_RELATIVE_PATH := $3
-LOCAL_PREBUILT_MODULE_FILE := $(2ND_$4)
+LOCAL_MODULE_RELATIVE_PATH := $2
+LOCAL_PREBUILT_MODULE_FILE := $(2ND_$3)
 LOCAL_MULTILIB := 32
 LOCAL_CHECK_ELF_FILES := false
 LOCAL_MODULE_SUFFIX := .so
-LOCAL_MODULE_SYMLINKS := $1$2
 LOCAL_SHARED_LIBRARIES := $(__MY_SHARED_LIBRARIES)
-LOCAL_EXPORT_C_INCLUDE_DIRS := $5
+LOCAL_EXPORT_C_INCLUDE_DIRS := $4
 include $(BUILD_PREBUILT)
 endif
 endef
@@ -167,25 +159,25 @@ endef
 ifneq ($(strip $(BOARD_MESA3D_GALLIUM_DRIVERS)),)
 # Module 'libgallium_dri', produces '/vendor/lib{64}/dri/libgallium_dri.so'
 # This module also trigger DRI symlinks creation process
-$(eval $(call mesa3d-lib,libgallium_dri,.so.0,dri,MESA3D_GALLIUM_DRI_BIN))
+$(eval $(call mesa3d-lib,libgallium_dri,dri,MESA3D_GALLIUM_DRI_BIN))
 # Module 'libglapi', produces '/vendor/lib{64}/libglapi.so'
-$(eval $(call mesa3d-lib,libglapi,.so.0,,MESA3D_LIBGLAPI_BIN))
+$(eval $(call mesa3d-lib,libglapi,,MESA3D_LIBGLAPI_BIN))
 
 # Module 'libEGL_mesa', produces '/vendor/lib{64}/egl/libEGL_mesa.so'
-$(eval $(call mesa3d-lib,libEGL_mesa,.so.1,egl,MESA3D_LIBEGL_BIN))
+$(eval $(call mesa3d-lib,libEGL_mesa,egl,MESA3D_LIBEGL_BIN))
 # Module 'libGLESv1_CM_mesa', produces '/vendor/lib{64}/egl/libGLESv1_CM_mesa.so'
-$(eval $(call mesa3d-lib,libGLESv1_CM_mesa,.so.1,egl,MESA3D_LIBGLESV1_BIN))
+$(eval $(call mesa3d-lib,libGLESv1_CM_mesa,egl,MESA3D_LIBGLESV1_BIN))
 # Module 'libGLESv2_mesa', produces '/vendor/lib{64}/egl/libGLESv2_mesa.so'
-$(eval $(call mesa3d-lib,libGLESv2_mesa,.so.2,egl,MESA3D_LIBGLESV2_BIN))
+$(eval $(call mesa3d-lib,libGLESv2_mesa,egl,MESA3D_LIBGLESV2_BIN))
 endif
 
 # Modules 'vulkan.{driver_name}', produces '/vendor/lib{64}/hw/vulkan.{driver_name}.so' HAL
 $(foreach driver,$(BOARD_MESA3D_VULKAN_DRIVERS), \
-    $(eval $(call mesa3d-lib,vulkan.$(MESA_VK_LIB_SUFFIX_$(driver)),.so.0,hw,MESA3D_VULKAN_$(driver)_BIN)))
+    $(eval $(call mesa3d-lib,vulkan.$(MESA_VK_LIB_SUFFIX_$(driver)),hw,MESA3D_VULKAN_$(driver)_BIN)))
 
 ifneq ($(filter true, $(BOARD_MESA3D_BUILD_LIBGBM)),)
 # Modules 'libgbm', produces '/vendor/lib{64}/libgbm.so'
-$(eval $(call mesa3d-lib,$(MESA_LIBGBM_NAME),.so.1,,MESA3D_LIBGBM_BIN,$(MESA3D_TOP)/src/gbm/main))
+$(eval $(call mesa3d-lib,$(MESA_LIBGBM_NAME),,MESA3D_LIBGBM_BIN,$(MESA3D_TOP)/src/gbm/main))
 endif
 
 #-------------------------------------------------------------------------------

android/mesa3d_cross.mk

@@ -65,11 +65,11 @@ MESON_GEN_FILES_TARGET                   := $(MESON_GEN_DIR)/.timestamp
 
 MESA3D_GALLIUM_DRI_DIR                   := $(MESON_OUT_DIR)/install/usr/local/lib/dri
 $(M_TARGET_PREFIX)MESA3D_GALLIUM_DRI_BIN := $(MESON_OUT_DIR)/install/usr/local/lib/libgallium_dri.so
-$(M_TARGET_PREFIX)MESA3D_LIBEGL_BIN      := $(MESON_OUT_DIR)/install/usr/local/lib/libEGL.so.1.0.0
-$(M_TARGET_PREFIX)MESA3D_LIBGLESV1_BIN   := $(MESON_OUT_DIR)/install/usr/local/lib/libGLESv1_CM.so.1.1.0
-$(M_TARGET_PREFIX)MESA3D_LIBGLESV2_BIN   := $(MESON_OUT_DIR)/install/usr/local/lib/libGLESv2.so.2.0.0
-$(M_TARGET_PREFIX)MESA3D_LIBGLAPI_BIN    := $(MESON_OUT_DIR)/install/usr/local/lib/libglapi.so.0.0.0
-$(M_TARGET_PREFIX)MESA3D_LIBGBM_BIN      := $(MESON_OUT_DIR)/install/usr/local/lib/$(MESA_LIBGBM_NAME).so.1.0.0
+$(M_TARGET_PREFIX)MESA3D_LIBEGL_BIN      := $(MESON_OUT_DIR)/install/usr/local/lib/libEGL.so
+$(M_TARGET_PREFIX)MESA3D_LIBGLESV1_BIN   := $(MESON_OUT_DIR)/install/usr/local/lib/libGLESv1_CM.so
+$(M_TARGET_PREFIX)MESA3D_LIBGLESV2_BIN   := $(MESON_OUT_DIR)/install/usr/local/lib/libGLESv2.so
+$(M_TARGET_PREFIX)MESA3D_LIBGLAPI_BIN    := $(MESON_OUT_DIR)/install/usr/local/lib/libglapi.so
+$(M_TARGET_PREFIX)MESA3D_LIBGBM_BIN      := $(MESON_OUT_DIR)/install/usr/local/lib/$(MESA_LIBGBM_NAME).so
 
 
 MESA3D_GLES_BINS := \
@@ -256,7 +256,7 @@ $(MESON_GEN_FILES_TARGET): $(sort $(shell find -L $(MESA3D_TOP) -not -path '*/\.
 		"pkgconfig = ['env', 'PKG_CONFIG_LIBDIR=' + '$(call relative-to-absolute,$(MESON_GEN_DIR))', '/usr/bin/pkg-config']\n\n" \
 		"llvm-config = '/dev/null'\n"                                                                                     \
 		"[host_machine]\n"                                                                                                \
-		"system = 'linux'\n"                                                                                              \
+		"system = 'android'\n"                                                                                              \
 		"cpu_family = '$(MESON_CPU_FAMILY)'\n"                                                                            \
 		"cpu = '$(MESON_CPU_FAMILY)'\n"                                                                                   \
 		"endian = 'little'" > $(dir $@)/aosp_cross

bin/ci/ci_gantt_chart.py

@@ -0,0 +1,162 @@
+#!/usr/bin/env python3
+# Copyright © 2023 Collabora Ltd.
+# Authors:
+#   Helen Koike <helen.koike@collabora.com>
+#
+# For the dependencies, see the requirements.txt
+# SPDX-License-Identifier: MIT
+
+
+import argparse
+import gitlab
+import plotly.express as px
+from gitlab_common import pretty_duration
+from datetime import datetime, timedelta
+from gitlab_common import read_token, GITLAB_URL, get_gitlab_pipeline_from_url
+
+
+def calculate_queued_at(job):
+    # we can have queued_duration without started_at when a job is canceled
+    if not job.queued_duration or not job.started_at:
+        return None
+    started_at = job.started_at.replace("Z", "+00:00")
+    return datetime.fromisoformat(started_at) - timedelta(seconds=job.queued_duration)
+
+
+def calculate_time_difference(time1, time2):
+    if not time1 or not time2:
+        return None
+    if type(time1) is str:
+        time1 = datetime.fromisoformat(time1.replace("Z", "+00:00"))
+    if type(time2) is str:
+        time2 = datetime.fromisoformat(time2.replace("Z", "+00:00"))
+
+    diff = time2 - time1
+    return pretty_duration(diff.seconds)
+
+
+def create_task_name(job):
+    status_color = {"success": "green", "failed": "red"}.get(job.status, "grey")
+    return f"{job.name}\t(<span style='color: {status_color}'>{job.status}</span>,<a href='{job.web_url}'>{job.id}</a>)"
+
+
+def add_gantt_bar(job, tasks):
+    queued_at = calculate_queued_at(job)
+    task_name = create_task_name(job)
+
+    tasks.append(
+        {
+            "Job": task_name,
+            "Start": job.created_at,
+            "Finish": queued_at,
+            "Duration": calculate_time_difference(job.created_at, queued_at),
+            "Phase": "Waiting dependencies",
+        }
+    )
+    tasks.append(
+        {
+            "Job": task_name,
+            "Start": queued_at,
+            "Finish": job.started_at,
+            "Duration": calculate_time_difference(queued_at, job.started_at),
+            "Phase": "Queued",
+        }
+    )
+    tasks.append(
+        {
+            "Job": task_name,
+            "Start": job.started_at,
+            "Finish": job.finished_at,
+            "Duration": calculate_time_difference(job.started_at, job.finished_at),
+            "Phase": "Running",
+        }
+    )
+
+
+def generate_gantt_chart(pipeline):
+    if pipeline.yaml_errors:
+        raise ValueError("Pipeline YAML errors detected")
+
+    # Convert the data into a list of dictionaries for plotly
+    tasks = []
+
+    for job in pipeline.jobs.list(all=True, include_retried=True):
+        add_gantt_bar(job, tasks)
+
+    # Make it easier to see retried jobs
+    tasks.sort(key=lambda x: x["Job"])
+
+    title = f"Gantt chart of jobs in pipeline <a href='{pipeline.web_url}'>{pipeline.web_url}</a>."
+    title += (
+        f" Total duration {str(timedelta(seconds=pipeline.duration))}"
+        if pipeline.duration
+        else ""
+    )
+
+    # Create a Gantt chart
+    fig = px.timeline(
+        tasks,
+        x_start="Start",
+        x_end="Finish",
+        y="Job",
+        color="Phase",
+        title=title,
+        hover_data=["Duration"],
+    )
+
+    # Calculate the height dynamically
+    fig.update_layout(height=len(tasks) * 10, yaxis_tickfont_size=14)
+
+    # Add a deadline line to the chart
+    created_at = datetime.fromisoformat(pipeline.created_at.replace("Z", "+00:00"))
+    timeout_at = created_at + timedelta(hours=1)
+    fig.add_vrect(
+        x0=timeout_at,
+        x1=timeout_at,
+        annotation_text="1h Timeout",
+        fillcolor="gray",
+        line_width=2,
+        line_color="gray",
+        line_dash="dash",
+        annotation_position="top left",
+        annotation_textangle=90,
+    )
+
+    return fig
+
+
+def parse_args() -> None:
+    parser = argparse.ArgumentParser(
+        description="Generate the Gantt chart from a given pipeline."
+    )
+    parser.add_argument("pipeline_url", type=str, help="URLs to the pipeline.")
+    parser.add_argument(
+        "-o",
+        "--output",
+        type=str,
+        help="Output file name. Use html ou image suffixes to choose the format.",
+    )
+    parser.add_argument(
+        "--token",
+        metavar="token",
+        help="force GitLab token, otherwise it's read from ~/.config/gitlab-token",
+    )
+    return parser.parse_args()
+
+
+if __name__ == "__main__":
+    args = parse_args()
+
+    token = read_token(args.token)
+
+    gl = gitlab.Gitlab(url=GITLAB_URL, private_token=token, retry_transient_errors=True)
+
+    pipeline, _ = get_gitlab_pipeline_from_url(gl, args.pipeline_url)
+    fig = generate_gantt_chart(pipeline)
+    if args.output and "htm" in args.output:
+        fig.write_html(args.output)
+    elif args.output:
+        fig.update_layout(width=1000)
+        fig.write_image(args.output)
+    else:
+        fig.show()

bin/ci/ci_gantt_chart.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+set -eu
+
+this_dir=$(dirname -- "$(readlink -f -- "${BASH_SOURCE[0]}")")
+readonly this_dir
+
+exec \
+  "$this_dir/../python-venv.sh" \
+  "$this_dir/requirements.txt" \
+  "$this_dir/ci_gantt_chart.py" "$@"

bin/ci/ci_post_gantt.py

@@ -0,0 +1,178 @@
+#!/usr/bin/env python3
+# Copyright © 2023 Collabora Ltd.
+# Authors:
+#   Helen Koike <helen.koike@collabora.com>
+#
+# For the dependencies, see the requirements.txt
+# SPDX-License-Identifier: MIT
+
+
+import argparse
+import gitlab
+import re
+import os
+import pytz
+import traceback
+from datetime import datetime, timedelta
+from gitlab_common import (
+    read_token,
+    GITLAB_URL,
+    get_gitlab_pipeline_from_url,
+)
+from ci_gantt_chart import generate_gantt_chart
+
+MARGE_USER_ID = 9716  # Marge
+
+LAST_MARGE_EVENT_FILE = os.path.expanduser("~/.config/last_marge_event")
+
+
+def read_last_event_date_from_file():
+    try:
+        with open(LAST_MARGE_EVENT_FILE, "r") as f:
+            last_event_date = f.read().strip()
+    except FileNotFoundError:
+        # 3 days ago
+        last_event_date = (datetime.now() - timedelta(days=3)).isoformat()
+    return last_event_date
+
+
+def pretty_time(time_str):
+    """Pretty print time"""
+    local_timezone = datetime.now().astimezone().tzinfo
+
+    time_d = datetime.fromisoformat(time_str.replace("Z", "+00:00")).astimezone(
+        local_timezone
+    )
+    return f'{time_str} ({time_d.strftime("%d %b %Y %Hh%Mm%Ss")} {local_timezone})'
+
+
+def compose_message(file_name, attachment_url):
+    return f"""
+Here is the Gantt chart for the referred pipeline, I hope it helps 😄 (tip: click on the "Pan" button on the top right bar):
+
+[{file_name}]({attachment_url})
+
+<details>
+<summary>more info</summary>
+
+This message was generated by the ci_post_gantt.py script, which is running on a server at Collabora.
+</details>
+"""
+
+
+def gitlab_upload_file_get_url(gl, project_id, filepath):
+    project = gl.projects.get(project_id)
+    uploaded_file = project.upload(filepath, filepath=filepath)
+    return uploaded_file["url"]
+
+
+def gitlab_post_reply_to_note(gl, event, reply_message):
+    """
+    Post a reply to a note in thread based on a GitLab event.
+
+    :param gl: The GitLab connection instance.
+    :param event: The event object containing the note details.
+    :param reply_message: The reply message.
+    """
+    try:
+        note_id = event.target_id
+        merge_request_iid = event.note["noteable_iid"]
+
+        project = gl.projects.get(event.project_id)
+        merge_request = project.mergerequests.get(merge_request_iid)
+
+        # Find the discussion to which the note belongs
+        discussions = merge_request.discussions.list(as_list=False)
+        target_discussion = next(
+            (
+                d
+                for d in discussions
+                if any(n["id"] == note_id for n in d.attributes["notes"])
+            ),
+            None,
+        )
+
+        if target_discussion is None:
+            raise ValueError("Discussion for the note not found.")
+
+        # Add a reply to the discussion
+        reply = target_discussion.notes.create({"body": reply_message})
+        return reply
+
+    except gitlab.exceptions.GitlabError as e:
+        print(f"Failed to post a reply to '{event.note['body']}': {e}")
+        return None
+
+
+def parse_args() -> None:
+    parser = argparse.ArgumentParser(description="Monitor rejected pipelines by Marge.")
+    parser.add_argument(
+        "--token",
+        metavar="token",
+        help="force GitLab token, otherwise it's read from ~/.config/gitlab-token",
+    )
+    parser.add_argument(
+        "--since",
+        metavar="since",
+        help="consider only events after this date (ISO format), otherwise it's read from ~/.config/last_marge_event",
+    )
+    return parser.parse_args()
+
+
+if __name__ == "__main__":
+    args = parse_args()
+
+    token = read_token(args.token)
+
+    gl = gitlab.Gitlab(url=GITLAB_URL, private_token=token, retry_transient_errors=True)
+
+    user = gl.users.get(MARGE_USER_ID)
+    last_event_at = args.since if args.since else read_last_event_date_from_file()
+
+    print(f"Retrieving Marge messages since {pretty_time(last_event_at)}\n")
+
+    # the "after" only considers the "2023-10-24" part, it doesn't consider the time
+    events = user.events.list(
+        all=True,
+        target_type="note",
+        after=(datetime.now() - timedelta(days=3)).isoformat(),
+        sort="asc",
+    )
+
+    last_event_at_date = datetime.fromisoformat(
+        last_event_at.replace("Z", "+00:00")
+    ).replace(tzinfo=pytz.UTC)
+
+    for event in events:
+        created_at_date = datetime.fromisoformat(
+            event.created_at.replace("Z", "+00:00")
+        ).replace(tzinfo=pytz.UTC)
+        if created_at_date <= last_event_at_date:
+            continue
+        last_event_at = event.created_at
+
+        match = re.search(r"https://[^ ]+", event.note["body"])
+        if match:
+            try:
+                print("Found message:", event.note["body"])
+                pipeline_url = match.group(0)[:-1]
+                pipeline, _ = get_gitlab_pipeline_from_url(gl, pipeline_url)
+                print("Generating gantt chart...")
+                fig = generate_gantt_chart(pipeline)
+                file_name = "Gantt.html"
+                fig.write_html(file_name)
+                print("Uploading gantt file...")
+                file_url = gitlab_upload_file_get_url(gl, event.project_id, file_name)
+                print("Posting reply ...\n")
+                message = compose_message(file_name, file_url)
+                gitlab_post_reply_to_note(gl, event, message)
+            except Exception as e:
+                print(f"Failed to generate gantt chart, not posting reply.{e}")
+                traceback.print_exc()
+
+        if not args.since:
+            print(
+                f"Updating last event date to {pretty_time(last_event_at)} on {LAST_MARGE_EVENT_FILE}\n"
+            )
+            with open(LAST_MARGE_EVENT_FILE, "w") as f:
+                f.write(last_event_at)

bin/ci/ci_post_gantt.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+set -eu
+
+this_dir=$(dirname -- "$(readlink -f -- "${BASH_SOURCE[0]}")")
+readonly this_dir
+
+exec \
+  "$this_dir/../python-venv.sh" \
+  "$this_dir/requirements.txt" \
+  "$this_dir/ci_post_gantt.py" "$@"

bin/ci/ci_run_n_monitor.py

@@ -20,24 +20,27 @@ from collections import defaultdict
 from concurrent.futures import ThreadPoolExecutor
 from functools import partial
 from itertools import chain
-from subprocess import check_output
+from subprocess import check_output, CalledProcessError
 from typing import TYPE_CHECKING, Iterable, Literal, Optional
 
 import gitlab
+import gitlab.v4.objects
 from colorama import Fore, Style
 from gitlab_common import (
+    GITLAB_URL,
+    TOKEN_DIR,
+    get_gitlab_pipeline_from_url,
     get_gitlab_project,
+    get_token_from_default_dir,
+    pretty_duration,
     read_token,
     wait_for_pipeline,
-    pretty_duration,
 )
 from gitlab_gql import GitlabGQL, create_job_needs_dag, filter_dag, print_dag
 
 if TYPE_CHECKING:
     from gitlab_gql import Dag
 
-GITLAB_URL = "https://gitlab.freedesktop.org"
-
 REFRESH_WAIT_LOG = 10
 REFRESH_WAIT_JOBS = 6
 
@@ -63,6 +66,9 @@ def print_job_status(job, new_status=False) -> None:
     if job.status == "canceled":
         return
 
+    if new_status and job.status == "created":
+        return
+
     if job.duration:
         duration = job.duration
     elif job.started_at:
@@ -114,10 +120,10 @@ def monitor_pipeline(
                         stress < 0
                         or sum(stress_status_counter[job.name].values()) < stress
                     ):
-                        enable_job(project, job, "retry", force_manual)
+                        job = enable_job(project, pipeline, job, "retry", force_manual)
                         stress_status_counter[job.name][job.status] += 1
                 else:
-                    enable_job(project, job, "target", force_manual)
+                    job = enable_job(project, pipeline, job, "target", force_manual)
 
                 print_job_status(job, job.status not in target_statuses[job.name])
                 target_statuses[job.name] = job.status
@@ -130,7 +136,7 @@ def monitor_pipeline(
 
             # run dependencies and cancel the rest
             if job.name in dependencies:
-                enable_job(project, job, "dep", True)
+                job = enable_job(project, pipeline, job, "dep", True)
                 if job.status == "failed":
                     deps_failed.append(job.name)
             else:
@@ -185,23 +191,37 @@ def monitor_pipeline(
         pretty_wait(REFRESH_WAIT_JOBS)
 
 
+def get_pipeline_job(
+    pipeline: gitlab.v4.objects.ProjectPipeline,
+    id: int,
+) -> gitlab.v4.objects.ProjectPipelineJob:
+    pipeline_jobs = pipeline.jobs.list(all=True)
+    return [j for j in pipeline_jobs if j.id == id][0]
+
+
 def enable_job(
-    project, job, action_type: Literal["target", "dep", "retry"], force_manual: bool
-) -> None:
+    project: gitlab.v4.objects.Project,
+    pipeline: gitlab.v4.objects.ProjectPipeline,
+    job: gitlab.v4.objects.ProjectPipelineJob,
+    action_type: Literal["target", "dep", "retry"],
+    force_manual: bool,
+) -> gitlab.v4.objects.ProjectPipelineJob:
     """enable job"""
     if (
         (job.status in ["success", "failed"] and action_type != "retry")
         or (job.status == "manual" and not force_manual)
         or job.status in ["skipped", "running", "created", "pending"]
     ):
-        return
+        return job
 
     pjob = project.jobs.get(job.id, lazy=True)
 
     if job.status in ["success", "failed", "canceled"]:
-        pjob.retry()
+        new_job = pjob.retry()
+        job = get_pipeline_job(pipeline, new_job["id"])
     else:
         pjob.play()
+        job = get_pipeline_job(pipeline, pjob.id)
 
     if action_type == "target":
         jtype = "🞋 "
@@ -212,6 +232,8 @@ def enable_job(
 
     print(Fore.MAGENTA + f"{jtype} job {job.name} manually enabled" + Style.RESET_ALL)
 
+    return job
+
 
 def cancel_job(project, job) -> None:
     """Cancel GitLab job"""
@@ -245,7 +267,7 @@ def print_log(project, job_id) -> None:
         job = project.jobs.get(job_id)
 
         # GitLab's REST API doesn't offer pagination for logs, so we have to refetch it all
-        lines = job.trace().decode("raw_unicode_escape").splitlines()
+        lines = job.trace().decode().splitlines()
         for line in lines[printed_lines:]:
             print(line)
         printed_lines = len(lines)
@@ -267,13 +289,18 @@ def parse_args() -> None:
     parser.add_argument(
         "--target",
         metavar="target-job",
-        help="Target job regex. For multiple targets, separate with pipe | character",
+        help="Target job regex. For multiple targets, pass multiple values, "
+             "eg. `--target foo bar`.",
         required=True,
+        nargs=argparse.ONE_OR_MORE,
     )
     parser.add_argument(
         "--token",
         metavar="token",
-        help="force GitLab token, otherwise it's read from ~/.config/gitlab-token",
+        type=str,
+        default=get_token_from_default_dir(),
+        help="Use the provided GitLab token or token file, "
+             f"otherwise it's read from {TOKEN_DIR / 'gitlab-token'}",
     )
     parser.add_argument(
         "--force-manual", action="store_true", help="Force jobs marked as manual"
@@ -334,8 +361,31 @@ def print_detected_jobs(
     print_job_set(Fore.BLUE, "target", target_jobs)
 
 
-def find_dependencies(target_jobs_regex: re.Pattern, project_path: str, iid: int) -> set[str]:
-    gql_instance = GitlabGQL()
+def find_dependencies(token: str | None,
+                      target_jobs_regex: re.Pattern,
+                      project_path: str,
+                      iid: int) -> set[str]:
+    """
+    Find the dependencies of the target jobs in a GitLab pipeline.
+
+    This function uses the GitLab GraphQL API to fetch the job dependency graph
+    of a pipeline, filters the graph to only include the target jobs and their
+    dependencies, and returns the names of these jobs.
+
+    Args:
+        token (str | None): The GitLab API token. If None, the API is accessed without
+                            authentication.
+        target_jobs_regex (re.Pattern): A regex pattern to match the names of the target jobs.
+        project_path (str): The path of the GitLab project.
+        iid (int): The internal ID of the pipeline.
+
+    Returns:
+        set[str]: A set of the names of the target jobs and their dependencies.
+
+    Raises:
+        SystemExit: If no target jobs are found in the pipeline.
+    """
+    gql_instance = GitlabGQL(token=token)
     dag = create_job_needs_dag(
         gql_instance, {"projectPath": project_path.path_with_namespace, "iid": iid}
     )
@@ -366,15 +416,7 @@ if __name__ == "__main__":
         REV: str = args.rev
 
         if args.pipeline_url:
-            assert args.pipeline_url.startswith(GITLAB_URL)
-            url_path = args.pipeline_url[len(GITLAB_URL):]
-            url_path_components = url_path.split("/")
-            project_name = "/".join(url_path_components[1:3])
-            assert url_path_components[3] == "-"
-            assert url_path_components[4] == "pipelines"
-            pipeline_id = int(url_path_components[5])
-            cur_project = gl.projects.get(project_name)
-            pipe = cur_project.pipelines.get(pipeline_id)
+            pipe, cur_project = get_gitlab_pipeline_from_url(gl, args.pipeline_url)
             REV = pipe.sha
         else:
             mesa_project = gl.projects.get("mesa/mesa")
@@ -383,20 +425,58 @@ if __name__ == "__main__":
                 REV = mesa_project.mergerequests.get(args.mr).sha
             else:
                 REV = check_output(['git', 'rev-parse', REV]).decode('ascii').strip()
+
+                if args.rev == 'HEAD':
+                    try:
+                        branch_name = check_output([
+                            'git', 'symbolic-ref', '-q', 'HEAD',
+                        ]).decode('ascii').strip()
+                    except CalledProcessError:
+                        branch_name = ""
+
+                    # Ignore detached heads
+                    if branch_name:
+                        tracked_remote = check_output([
+                            'git', 'for-each-ref', '--format=%(upstream)',
+                            branch_name,
+                        ]).decode('ascii').strip()
+
+                        # Ignore local branches that do not track any remote
+                        if tracked_remote:
+                            remote_rev = check_output([
+                                'git', 'rev-parse', tracked_remote,
+                            ]).decode('ascii').strip()
+
+                            if REV != remote_rev:
+                                print(
+                                    f"Local HEAD commit {REV[:10]} is different than "
+                                    f"tracked remote HEAD commit {remote_rev[:10]}"
+                                )
+                                print("Did you forget to `git push` ?")
+
                 projects.append(get_gitlab_project(gl, args.project))
             (pipe, cur_project) = wait_for_pipeline(projects, REV)
 
         print(f"Revision: {REV}")
         print(f"Pipeline: {pipe.web_url}")
 
-        target_jobs_regex = re.compile(args.target.strip())
+        target = '|'.join(args.target)
+        target = target.strip()
 
         deps = set()
-        if args.target:
-            print("🞋 job: " + Fore.BLUE + args.target + Style.RESET_ALL)
-            deps = find_dependencies(
-                target_jobs_regex=target_jobs_regex, iid=pipe.iid, project_path=cur_project
-            )
+        print("🞋 job: " + Fore.BLUE + target + Style.RESET_ALL)
+
+        # Implicitly include `parallel:` jobs
+        target = f'({target})' + r'( \d+/\d+)?'
+
+        target_jobs_regex = re.compile(target)
+
+        deps = find_dependencies(
+            token=token,
+            target_jobs_regex=target_jobs_regex,
+            iid=pipe.iid,
+            project_path=cur_project
+        )
         target_job_id, ret = monitor_pipeline(
             cur_project, pipe, target_jobs_regex, deps, args.force_manual, args.stress
         )

bin/ci/gitlab_common.py

@@ -3,13 +3,33 @@
 # Authors:
 #   Tomeu Vizoso <tomeu.vizoso@collabora.com>
 #   David Heidelberg <david.heidelberg@collabora.com>
+#   Guilherme Gallo <guilherme.gallo@collabora.com>
 #
 # SPDX-License-Identifier: MIT
 '''Shared functions between the scripts.'''
 
+import logging
 import os
+import re
 import time
-from typing import Optional
+from pathlib import Path
+
+GITLAB_URL = "https://gitlab.freedesktop.org"
+TOKEN_DIR = Path(os.getenv("XDG_CONFIG_HOME") or Path.home() / ".config")
+
+# Known GitLab token prefixes: https://docs.gitlab.com/ee/security/token_overview.html#token-prefixes
+TOKEN_PREFIXES: dict[str, str] = {
+    "Personal access token": "glpat-",
+    "OAuth Application Secret": "gloas-",
+    "Deploy token": "gldt-",
+    "Runner authentication token": "glrt-",
+    "CI/CD Job token": "glcbt-",
+    "Trigger token": "glptt-",
+    "Feed token": "glft-",
+    "Incoming mail token": "glimt-",
+    "GitLab Agent for Kubernetes token": "glagent-",
+    "SCIM Tokens": "glsoat-"
+}
 
 
 def pretty_duration(seconds):
@@ -23,6 +43,19 @@ def pretty_duration(seconds):
     return f"{seconds:0.0f}s"
 
 
+def get_gitlab_pipeline_from_url(gl, pipeline_url):
+    assert pipeline_url.startswith(GITLAB_URL)
+    url_path = pipeline_url[len(GITLAB_URL) :]
+    url_path_components = url_path.split("/")
+    project_name = "/".join(url_path_components[1:3])
+    assert url_path_components[3] == "-"
+    assert url_path_components[4] == "pipelines"
+    pipeline_id = int(url_path_components[5])
+    cur_project = gl.projects.get(project_name)
+    pipe = cur_project.pipelines.get(pipeline_id)
+    return pipe, cur_project
+
+
 def get_gitlab_project(glab, name: str):
     """Finds a specified gitlab project for given user"""
     if "/" in name:
@@ -34,15 +67,81 @@ def get_gitlab_project(glab, name: str):
     return glab.projects.get(project_path)
 
 
-def read_token(token_arg: Optional[str]) -> str:
-    """pick token from args or file"""
-    if token_arg:
-        return token_arg
-    return (
-        open(os.path.expanduser("~/.config/gitlab-token"), encoding="utf-8")
-        .readline()
-        .rstrip()
-    )
+def get_token_from_default_dir() -> str:
+    """
+    Retrieves the GitLab token from the default directory.
+
+    Returns:
+        str: The path to the GitLab token file.
+
+    Raises:
+        FileNotFoundError: If the token file is not found.
+    """
+    token_file = TOKEN_DIR / "gitlab-token"
+    try:
+        return str(token_file.resolve())
+    except FileNotFoundError as ex:
+        print(
+            f"Could not find {token_file}, please provide a token file as an argument"
+        )
+        raise ex
+
+
+def validate_gitlab_token(token: str) -> bool:
+    token_suffix = token.split("-")[-1]
+    # Basic validation of the token suffix based on:
+    # https://gitlab.com/gitlab-org/gitlab/-/blob/master/gems/gitlab-secret_detection/lib/gitleaks.toml
+    if not re.match(r"(\w+-)?[0-9a-zA-Z_\-]{20,64}", token_suffix):
+        return False
+
+    for token_type, token_prefix in TOKEN_PREFIXES.items():
+        if token.startswith(token_prefix):
+            logging.info(f"Found probable token type: {token_type}")
+            return True
+
+    # If the token type is not recognized, return False
+    return False
+
+
+def get_token_from_arg(token_arg: str | Path | None) -> str | None:
+    if not token_arg:
+        logging.info("No token provided.")
+        return None
+
+    token_path = Path(token_arg)
+    if token_path.is_file():
+        return read_token_from_file(token_path)
+
+    return handle_direct_token(token_path, token_arg)
+
+
+def read_token_from_file(token_path: Path) -> str:
+    token = token_path.read_text().strip()
+    logging.info(f"Token read from file: {token_path}")
+    return token
+
+
+def handle_direct_token(token_path: Path, token_arg: str | Path) -> str | None:
+    if token_path == Path(get_token_from_default_dir()):
+        logging.warning(
+            f"The default token file {token_path} was not found. "
+            "Please provide a token file or a token directly via --token arg."
+        )
+        return None
+    logging.info("Token provided directly as an argument.")
+    return str(token_arg)
+
+
+def read_token(token_arg: str | Path | None) -> str | None:
+    token = get_token_from_arg(token_arg)
+    if token and not validate_gitlab_token(token):
+        logging.warning("The provided token is either an old token or does not seem to "
+                        "be a valid token.")
+        logging.warning("Newer tokens are the ones created from a Gitlab 14.5+ instance.")
+        logging.warning("See https://about.gitlab.com/releases/2021/11/22/"
+                        "gitlab-14-5-released/"
+                        "#new-gitlab-access-token-prefix-and-detection")
+    return token
 
 
 def wait_for_pipeline(projects, sha: str, timeout=None):

bin/ci/gitlab_gql.py

@@ -9,7 +9,6 @@ from collections import OrderedDict
 from copy import deepcopy
 from dataclasses import dataclass, field
 from itertools import accumulate
-from os import getenv
 from pathlib import Path
 from subprocess import check_output
 from textwrap import dedent
@@ -17,6 +16,7 @@ from typing import Any, Iterable, Optional, Pattern, TypedDict, Union
 
 import yaml
 from filecache import DAY, filecache
+from gitlab_common import get_token_from_default_dir
 from gql import Client, gql
 from gql.transport.requests import RequestsHTTPTransport
 from graphql import DocumentNode
@@ -34,18 +34,6 @@ Dag = dict[str, DagNode]
 
 
 StageSeq = OrderedDict[str, set[str]]
-TOKEN_DIR = Path(getenv("XDG_CONFIG_HOME") or Path.home() / ".config")
-
-
-def get_token_from_default_dir() -> str:
-    token_file = TOKEN_DIR / "gitlab-token"
-    try:
-        return str(token_file.resolve())
-    except FileNotFoundError as ex:
-        print(
-            f"Could not find {token_file}, please provide a token file as an argument"
-        )
-        raise ex
 
 
 def get_project_root_dir():
@@ -241,7 +229,7 @@ def traverse_dag_needs(jobs_metadata: Dag) -> None:
         partial = True
 
         while partial:
-            next_depth: set[str] = {n for dn in final_needs for n in jobs_metadata[dn]["needs"]}
+            next_depth: set[str] = {n for dn in final_needs if dn in jobs_metadata for n in jobs_metadata[dn]["needs"]}
             partial: bool = not final_needs.issuperset(next_depth)
             final_needs = final_needs.union(next_depth)
 
@@ -355,8 +343,12 @@ def fetch_merged_yaml(gl_gql: GitlabGQL, params) -> dict[str, Any]:
       - local: .gitlab-ci.yml
     """)
     raw_response = gl_gql.query("job_details.gql", params)
-    if merged_yaml := raw_response["ciConfig"]["mergedYaml"]:
+    ci_config = raw_response["ciConfig"]
+    if merged_yaml := ci_config["mergedYaml"]:
         return yaml.safe_load(merged_yaml)
+    if "errors" in ci_config:
+        for error in ci_config["errors"]:
+            print(error)
 
     gl_gql.invalidate_query_cache()
     raise ValueError(

bin/ci/requirements.txt

@@ -1,7 +1,10 @@
 colorama==0.4.5
 filecache==0.81
 gql==3.4.0
+kaleido==0.2.1
 python-dateutil==2.8.2
+pandas==2.1.1
+plotly==5.17.0
 python-gitlab==3.5.0
 PyYAML==6.0.1
 ruamel.yaml.clib==0.2.8

bin/khronos-update.py

@@ -177,6 +177,8 @@ SOURCES = [
             Source('include/vulkan/vulkan_xlib.h',              'https://github.com/KhronosGroup/Vulkan-Headers/raw/main/include/vulkan/vulkan_xlib.h'),
             Source('include/vulkan/vulkan_xlib_xrandr.h',       'https://github.com/KhronosGroup/Vulkan-Headers/raw/main/include/vulkan/vulkan_xlib_xrandr.h'),
             Source('include/vulkan/vk_android_native_buffer.h', 'https://android.googlesource.com/platform/frameworks/native/+/master/vulkan/include/vulkan/vk_android_native_buffer.h?format=TEXT'),
+            Source('include/vk_video/vulkan_video_codec_av1std.h', 'https://github.com/KhronosGroup/Vulkan-Headers/raw/main/include/vk_video/vulkan_video_codec_av1std.h'),
+            Source('include/vk_video/vulkan_video_codec_av1std_decode.h', 'https://github.com/KhronosGroup/Vulkan-Headers/raw/main/include/vk_video/vulkan_video_codec_av1std_decode.h'),
             Source('include/vk_video/vulkan_video_codec_h264std.h', 'https://github.com/KhronosGroup/Vulkan-Headers/raw/main/include/vk_video/vulkan_video_codec_h264std.h'),
             Source('include/vk_video/vulkan_video_codec_h264std_decode.h', 'https://github.com/KhronosGroup/Vulkan-Headers/raw/main/include/vk_video/vulkan_video_codec_h264std_decode.h'),
             Source('include/vk_video/vulkan_video_codec_h264std_encode.h', 'https://github.com/KhronosGroup/Vulkan-Headers/raw/main/include/vk_video/vulkan_video_codec_h264std_encode.h'),

docs/android.rst

@@ -33,15 +33,15 @@ Then, create your Meson cross file to use it, something like this
     pkgconfig = ['env', 'PKG_CONFIG_LIBDIR=NDKDIR/pkgconfig', '/usr/bin/pkg-config']
 
     [host_machine]
-    system = 'linux'
+    system = 'android'
     cpu_family = 'arm'
-    cpu = 'armv8'
+    cpu = 'aarch64'
     endian = 'little'
 
 Now, use that cross file for your Android build directory (as in this
 one cross-compiling the turnip driver for a stock Pixel phone)
 
-.. code-block:: console
+.. code-block:: sh
 
     meson setup build-android-aarch64 \
         --cross-file android-aarch64 \
@@ -61,21 +61,27 @@ read-only disk image on ``/vendor``.  To be able to replace them for
 driver development, we need to unlock the device and remount
 ``/vendor`` read/write.
 
-.. code-block:: console
+.. code-block:: sh
 
     adb disable-verity
     adb reboot
     adb remount -R
+    adb remount
 
 Now you can replace drivers as in:
 
-.. code-block:: console
+.. code-block:: sh
 
     adb push build-android-aarch64/src/freedreno/vulkan/libvulkan_freedreno.so /vendor/lib64/hw/vulkan.sdm710.so
 
 Note this command doesn't quite work because libvulkan wants the
-SONAME to match.  For now, in turnip we have been using a hack to the
-meson.build to change the SONAME.
+SONAME to match. You can use ``patchelf`` to fix this:
+
+.. code-block:: sh
+
+   cp build-android-aarch64/src/freedreno/vulkan/libvulkan_freedreno.so /tmp/vulkan.sdm710.so
+   patchelf --set-soname vulkan.sdm710.so /tmp/vulkan.sdm710.so
+   adb push /tmp/vulkan.sdm710.so /vendor/lib64/hw/
 
 Replacing Android drivers on Chrome OS
 --------------------------------------
@@ -91,7 +97,7 @@ using scp from outside the container.
 On your device, you'll want to make ``/`` read-write.  ssh in as root
 and run:
 
-.. code-block:: console
+.. code-block:: sh
 
     crossystem dev_boot_signed_only=0
     /usr/share/vboot/bin/make_dev_ssd.sh --remove_rootfs_verification --partitions 4
@@ -100,7 +106,7 @@ and run:
 Then, we'll switch Android from using an image for ``/vendor`` to using a
 bind-mount from a directory we control.
 
-.. code-block:: console
+.. code-block:: sh
 
     cd /opt/google/containers/android/
     mkdir vendor-ro
@@ -123,7 +129,7 @@ change it to::
 
 Now, restart the UI to do a full reload:
 
-.. code-block:: console
+.. code-block:: sh
 
     restart ui
 
@@ -136,7 +142,7 @@ then the ``mount`` command should show::
 Now, replacing your DRI driver with a new one built for Android should
 be a matter of:
 
-.. code-block:: console
+.. code-block:: sh
 
     scp msm_dri.so $HOST:/opt/google/containers/android/vendor-rw/lib64/dri/
 
@@ -149,7 +155,7 @@ available to the NDK, assuming you're building anything but the
 Freedreno Vulkan driver for KGSL.  You can mostly put things in place
 with:
 
-.. code-block:: console
+.. code-block:: sh
 
     scp $HOST:/opt/google/containers/android/vendor-rw/lib64/libdrm.so \
         NDKDIR/sysroot/usr/lib/aarch64-linux-android/lib/
@@ -166,6 +172,6 @@ find you need to reload the whole Android container.  To do so without
 having to log in to Chrome again every time, you can just kill the
 container and let it restart:
 
-.. code-block:: console
+.. code-block:: sh
 
     kill $(cat /run/containers/android-run_oci/container.pid )

docs/application-issues.rst

@@ -35,7 +35,7 @@ than the given year.
 
 For example, if the game was released in 2001, do
 
-.. code-block:: console
+.. code-block:: sh
 
    export MESA_EXTENSION_MAX_YEAR=2001
 

docs/ci/bare-metal.rst

@@ -138,7 +138,7 @@ Setup
 Each board will be registered in freedesktop.org GitLab.  You'll want
 something like this to register a fastboot board:
 
-.. code-block:: console
+.. code-block:: sh
 
    sudo gitlab-runner register \
         --url https://gitlab.freedesktop.org \
@@ -194,7 +194,7 @@ Caching downloads
 To improve the runtime for downloading traces during traces job runs, you will
 want a pass-through HTTP cache.  On your runner box, install nginx:
 
-.. code-block:: console
+.. code-block:: sh
 
    sudo apt install nginx libnginx-mod-http-lua
 
@@ -213,7 +213,7 @@ your devices are on.
 
 Enable the site and restart nginx:
 
-.. code-block:: console
+.. code-block:: sh
 
    sudo rm /etc/nginx/sites-enabled/default
    sudo ln -s /etc/nginx/sites-available/fdo-cache /etc/nginx/sites-enabled/fdo-cache

docs/ci/index.rst

@@ -64,13 +64,13 @@ Farm management
 
 When the farm starts failing for any reason (power, network, out-of-space), it needs to be disabled by pushing separate MR with
 
-.. code-block:: console
+.. code-block:: sh
 
    git mv .ci-farms{,-disabled}/$farm_name
 
 After farm restore functionality can be enabled by pushing a new merge request, which contains
 
-.. code-block:: console
+.. code-block:: sh
 
    git mv .ci-farms{-disabled,}/$farm_name
 
@@ -279,7 +279,7 @@ command`` instead of ``run -it $IMAGE bash`` (which you may also find
 useful for debug).  Extract your build setup variables from
 .gitlab-ci.yml and run the CI meson build script:
 
-.. code-block:: console
+.. code-block:: sh
 
    IMAGE=registry.freedesktop.org/anholt/mesa/debian/android_build:2020-09-11
    sudo docker pull $IMAGE
@@ -288,7 +288,7 @@ useful for debug).  Extract your build setup variables from
 All you have left over from the build is its output, and a _build
 directory.  You can hack on mesa and iterate testing the build with:
 
-.. code-block:: console
+.. code-block:: sh
 
    sudo docker run --rm -v `pwd`:/mesa $IMAGE meson compile -C /mesa/_build
 
@@ -305,6 +305,12 @@ The ``--target`` argument takes a regex that you can use to select the
 jobs names you want to run, eg. ``--target 'zink.*'`` will run all the
 zink jobs, leaving the other drivers' jobs free for others to use.
 
+Note that in fork pipelines, GitLab only adds the jobs for the files that have
+changed **since the last push**, so you might not get the jobs you expect.
+You can work around that by adding a dummy change in a file core to what you're
+working on and then making a new push with that change, and removing that change
+before you create the MR.
+
 Conformance Tests
 -----------------
 

docs/ci/local-traces.rst

@@ -12,7 +12,7 @@ Running single trace
 --------------------
 A simple run to see the output of the trace can be done with
 
-.. code-block:: console
+.. code-block:: sh
 
    apitrace replay -w name_of_trace.trace
 
@@ -20,7 +20,7 @@ For more information, look into the `Apitrace documentation <https://github.com/
 
 For comparing checksums use:
 
-.. code-block:: console
+.. code-block:: sh
 
    cd piglit/replayer
    export PIGLIT_SOURCE_DIR="../"
@@ -34,7 +34,7 @@ Sometimes it's useful to be able to test traces on your local machine instead of
 
 Download the YAML file from your driver's ``ci/`` directory and then change the path in the YAML file from local proxy or MinIO to the local directory (url-like format ``file://``)
 
-.. code-block:: console
+.. code-block:: sh
 
    # The PIGLIT_REPLAY_DEVICE_NAME has to match name in the YAML file.
    export PIGLIT_REPLAY_DEVICE_NAME='your_device_name'

docs/codingstyle.rst

@@ -126,7 +126,7 @@ Basic formatting guidelines
 -  This GNU indent command generally does the right thing for
    formatting:
 
-   .. code-block:: console
+   .. code-block:: sh
 
       indent -br -i3 -npcs --no-tabs infile.c -o outfile.c
 

docs/download.rst

@@ -28,13 +28,13 @@ Mesa releases are available in two formats: ``.tar.xz`` and ``.tar.gz``.
 
 To unpack the tarball:
 
-.. code-block:: console
+.. code-block:: sh
 
       tar xf mesa-Y.N.P.tar.xz
 
 or
 
-.. code-block:: console
+.. code-block:: sh
 
       tar xf mesa-Y.N.P.tar.gz
 

docs/drivers/anv.rst

@@ -7,26 +7,37 @@ Debugging
 Here are a few environment variable debug environment variables
 specific to ANV:
 
-:envvar:`ANV_ENABLE_PIPELINE_CACHE`
+.. envvar:: ANV_ENABLE_PIPELINE_CACHE
+
    If defined to ``0`` or ``false``, this will disable pipeline
    caching, forcing ANV to reparse and recompile any VkShaderModule
    (SPIRV) it is given.
-:envvar:`ANV_DISABLE_SECONDARY_CMD_BUFFER_CALLS`
+
+.. envvar:: ANV_DISABLE_SECONDARY_CMD_BUFFER_CALLS
+
    If defined to ``1`` or ``true``, this will prevent usage of self
    modifying command buffers to implement ``vkCmdExecuteCommands``. As
    a result of this, it will also disable :ext:`VK_KHR_performance_query`.
-:envvar:`ANV_ALWAYS_BINDLESS`
+
+.. envvar:: ANV_ALWAYS_BINDLESS
+
    If defined to ``1`` or ``true``, this forces all descriptor sets to
    use the internal `Bindless model`_.
-:envvar:`ANV_QUEUE_THREAD_DISABLE`
+
+.. envvar:: ANV_QUEUE_THREAD_DISABLE
+
    If defined to ``1`` or ``true``, this disables support for timeline
    semaphores.
-:envvar:`ANV_USERSPACE_RELOCS`
+
+.. envvar:: ANV_USERSPACE_RELOCS
+
    If defined to ``1`` or ``true``, this forces ANV to always do
    kernel relocations in command buffers. This should only have an
    effect on hardware that doesn't support soft-pinning (Ivybridge,
    Haswell, Cherryview).
-:envvar:`ANV_PRIMITIVE_REPLICATION_MAX_VIEWS`
+
+.. envvar:: ANV_PRIMITIVE_REPLICATION_MAX_VIEWS
+
    Specifies up to how many view shaders can be lowered to handle
    :ext:`VK_KHR_multiview`. Beyond this number, multiview is implemented
    using instanced rendering. If unspecified, the value default to
@@ -388,3 +399,13 @@ executed :
     "main-command-buffer":f1 -> "ring-buffer":f1 [color="#0000ff"];
     "main-command-buffer":f1 -> "ring-buffer":f2 [color="#0000ff"];
   }
+
+Runtime dependencies
+--------------------
+
+Starting with Intel 12th generation/Alder Lake-P and Intel Arc Alchemist, the Intel 3D driver stack requires GuC firmware for proper operation. You have two options to install the firmware:
+
+- Distro package: Install the pre-packaged firmware included in your Linux distribution's repositories.
+- Manual download: You can download the firmware from the official repository: https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/tree/i915. Place the downloaded files in the /lib/firmware/i915 directory.
+
+Important: For optimal performance, we recommend updating the GuC firmware to version 70.6.3 or later.

docs/drivers/asahi.rst

@@ -205,8 +205,7 @@ Strided linear images have numerous limitations:
 - Strides must be a multiple of 16 bytes.
 - Strides must be nonzero. For 1D images where the stride is logically
   irrelevant, ail will internally select the minimal stride.
-- Only 1D and 2D images may be linear. In particular, no 3D or cubemaps.
-- Array texture may not be linear. No 2D arrays or cubemap arrays.
+- Only 1D, 2D, and 2D Array images may be linear. In particular, no 3D or cubemaps.
 - 2D images must not be mipmapped.
 - Block-compressed formats and multisampled images are unsupported. Elements of
   a strided linear image are simply pixels.
@@ -307,14 +306,14 @@ useful for exercising the compiler. To build, use options:
 
 Then run an OpenGL workload with environment variable:
 
-.. code-block:: console
+.. code-block:: sh
 
    LD_PRELOAD=~/mesa/build/src/asahi/drm-shim/libasahi_noop_drm_shim.so
 
 For example to compile a shader with shaderdb and print some statistics along
 with the IR:
 
-.. code-block:: console
+.. code-block:: sh
 
    ~/shader-db$ AGX_MESA_DEBUG=shaders,shaderdb ASAHI_MESA_DEBUG=precompile LIBGL_DRIVERS_PATH=~/lib/dri/ LD_PRELOAD=~/mesa/build/src/asahi/drm-shim/libasahi_noop_drm_shim.so ./run shaders/glmark/1-12.shader_test
 
@@ -362,3 +361,7 @@ concepts used in PowerVR GPUs appear in AGX.
    Pixel BackEnd
       Hardware unit which writes to color attachements and images. Also the
       name for a descriptor passed to :term:`PBE` instructions.
+
+   UVS
+   Unified Vertex Store
+      Hardware unit which buffers the outputs of the vertex shader (varyings).

docs/drivers/freedreno.rst

@@ -308,7 +308,7 @@ the GPU (including its internal hang detection).  If a fault in GPU address
 space happened, you should expect to find a message from the iommu, with the
 faulting address and a hardware unit involved:
 
-.. code-block:: console
+.. code-block:: text
 
   *** gpu fault: ttbr0=000000001c941000 iova=000000010066a000 dir=READ type=TRANSLATION source=TP|VFD (0,0,0,1)
 
@@ -346,7 +346,7 @@ though going here is the last resort and likely won't be helpful.
 The ``PC`` value is an instruction address in the current firmware.
 You would need to disassemble the firmware (/lib/firmware/qcom/aXXX_sqe.fw) via:
 
-.. code-block:: console
+.. code-block:: sh
 
   afuc-disasm -v a650_sqe.fw > a650_sqe.fw.disasm
 
@@ -369,18 +369,17 @@ Command Stream Capture
 ^^^^^^^^^^^^^^^^^^^^^^
 
 During Mesa development, it's often useful to look at the command streams we
-send to the kernel.  Mesa itself doesn't implement a way to stream them out
-(though it maybe should!).  Instead, we have an interface for the kernel to
-capture all submitted command streams:
+send to the kernel.  We have an interface for the kernel to capture all
+submitted command streams:
 
-.. code-block:: console
+.. code-block:: sh
 
   cat /sys/kernel/debug/dri/0/rd > cmdstream &
 
 By default, command stream capture does not capture texture/vertex/etc. data.
 You can enable capturing all the BOs with:
 
-.. code-block:: console
+.. code-block:: sh
 
   echo Y > /sys/module/msm/parameters/rd_full
 
@@ -391,6 +390,29 @@ probably want to cause a crash in the GPU during a frame of interest so that a
 single GPU core dump is generated.  Emitting ``0xdeadbeef`` in the CS should be
 enough to cause a fault.
 
+``fd_rd_output`` facilities provide support for generating the command stream
+capture from inside Mesa. Different ``FD_RD_DUMP`` options are available:
+
+- ``enable`` simply enables dumping the command stream on each submit for a
+  given logical device. When a more advanced option is specified, ``enable`` is
+  implied as specified.
+- ``combine`` will combine all dumps into a single file instead of writing the
+  dump for each submit into a standalone file.
+- ``full`` will dump every buffer object, which is necessary for replays of
+  command streams (see below).
+- ``trigger`` will establish a trigger file through which dumps can be better
+  controlled. Writing a positive integer value into the file will enable dumping
+  of that many subsequent submits. Writing -1 will enable dumping of submits
+  until disabled. Writing 0 (or any other value) will disable dumps.
+
+Output dump files and trigger file (when enabled) are hard-coded to be placed
+under ``/tmp``, or ``/data/local/tmp`` under Android. `FD_RD_DUMP_TESTNAME` can
+be used to specify a more descriptive prefix for the output or trigger files.
+
+Functionality is generic to any Freedreno-based backend, but is currently only
+integrated in the MSM backend of Turnip. Using the existing ``TU_DEBUG=rd``
+option will translate to ``FD_RD_DUMP=enable``.
+
 Capturing Hang RD
 +++++++++++++++++
 
@@ -400,7 +422,7 @@ Additionally it is geared towards analyzing the GPU state at the moment of the c
 Alternatively, it's possible to obtain the whole submission with all command
 streams via ``/sys/kernel/debug/dri/0/hangrd``:
 
-.. code-block:: console
+.. code-block:: sh
 
   sudo cat /sys/kernel/debug/dri/0/hangrd > logfile.rd // Do the cat _before_ the expected hang
 
@@ -410,7 +432,7 @@ The format of hangrd is the same as in ordinary command stream capture.
 Replaying Command Stream
 ^^^^^^^^^^^^^^^^^^^^^^^^
 
-`replay` tool allows capturing and replaying ``rd`` to reproduce GPU faults.
+``replay`` tool allows capturing and replaying ``rd`` to reproduce GPU faults.
 Especially useful for transient GPU issues since it has much higher chances to
 reproduce them.
 
@@ -419,21 +441,21 @@ Dumping rendering results or even just memory is currently unsupported.
 - Replaying command streams requires kernel with ``MSM_INFO_SET_IOVA`` support.
 - Requires ``rd`` capture to have full snapshots of the memory (``rd_full`` is enabled).
 
-Replaying is done via `replay` tool:
+Replaying is done via ``replay`` tool:
 
-.. code-block:: console
+.. code-block:: sh
 
   ./replay test_replay.rd
 
 More examples:
 
-.. code-block:: console
+.. code-block:: sh
 
   ./replay --first=start_submit_n --last=last_submit_n test_replay.rd
 
-.. code-block:: console
+.. code-block:: sh
 
-  ./replay --override=0 --generator=./generate_rd test_replay.rd
+  ./replay --override=0 test_replay.rd
 
 Editing Command Stream (a6xx+)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -446,24 +468,24 @@ Given the address space bounds the generated program creates a new ``rd`` which
 could be used to override cmdstream with 'replay'. Generated ``rd`` is not replayable
 on its own and depends on buffers provided by the source ``rd``.
 
-C source could be compiled using rdcompiler-meson.build as an example.
+C source could be compiled by putting it into src/freedreno/decode/generate-rd.cc.
 
 The workflow would look like this:
 
 1. Find the cmdstream № you want to edit;
 2. Decompile it:
 
-.. code-block:: console
+.. code-block:: sh
 
-  ./rddecompiler -s %cmd_stream_n% example.rd > generate_rd.c
+  ./rddecompiler -s %cmd_stream_n% example.rd > src/freedreno/decode/generate-rd.cc
 
-3. Edit the command stream;
-4. Compile it back, see rdcompiler-meson.build for the instructions;
+3. Edit the command stream;;
+4. Compile and deploy freedreno tools;
 5. Plug the generator into cmdstream replay:
 
-.. code-block:: console
+.. code-block:: sh
 
-  ./replay --override=%cmd_stream_№% --generator=~/generate_rd
+  ./replay --override=%cmd_stream_№%
 
 6. Repeat 3-5.
 
@@ -529,7 +551,7 @@ because it would require much less breadcrumb writes and syncs.
 
 Breadcrumbs settings:
 
-.. code-block:: console
+.. code-block:: sh
 
   TU_BREADCRUMBS=%IP%:%PORT%,break=%BREAKPOINT%:%BREAKPOINT_HITS%
 
@@ -544,26 +566,26 @@ A typical work flow would be:
 
 - Start listening for breadcrumbs on a remote host:
 
-.. code-block:: console
+.. code-block:: sh
 
    nc -lvup $PORT | stdbuf -o0 xxd -pc -c 4 | awk -Wposix '{printf("%u:%u\n", "0x" $0, a[$0]++)}'
 
 - Start capturing command stream;
 - Replay the hanging trace with:
 
-.. code-block:: console
+.. code-block:: sh
 
    TU_BREADCRUMBS=$IP:$PORT,break=-1:0
 
 - Increase hangcheck period:
 
-.. code-block:: console
+.. code-block:: sh
 
    echo -n 60000 > /sys/kernel/debug/dri/0/hangcheck_period_ms
 
 - After GPU hang note the last breadcrumb and relaunch trace with:
 
-.. code-block:: console
+.. code-block:: sh
 
    TU_BREADCRUMBS=%IP%:%PORT%,break=%LAST_BREADCRUMB%:%HITS%
 
@@ -589,7 +611,7 @@ Finding instances of stale reg reads
 Turnip has a debug option to stomp the registers with invalid values to catch
 the cases where stale data is read.
 
-.. code-block:: console
+.. code-block:: sh
 
   MESA_VK_ABORT_ON_DEVICE_LOSS=1 \
   TU_DEBUG_STALE_REGS_RANGE=0x00000c00,0x0000be01 \
@@ -608,9 +630,9 @@ the cases where stale data is read.
   ``renderpass``
     stomp registers before each renderpass.
   ``inverse``
-    changes `TU_DEBUG_STALE_REGS_RANGE` meaning to
+    changes ``TU_DEBUG_STALE_REGS_RANGE`` meaning to
     "regs that should NOT be stomped".
 
 The best way to pinpoint the reg which causes a failure is to bisect the regs
 range. In case when a fail is caused by combination of several registers
-the `inverse` flag may be set to find the reg which prevents the failure.
+the ``inverse`` flag may be set to find the reg which prevents the failure.

docs/drivers/lima.rst

@@ -55,6 +55,7 @@ These are some display drivers that have been tested with Lima:
 - Exynos: ``exynos``
 - Rockchip: ``rockchip``
 - Tiny DRM: ``tinydrm``
+- Xilinx ZynqMP: ``zynqmp-dpsub``
 
 Environment variables
 ---------------------