Merge commit 'b41cd5979024419d2ffe020520cccf786e12b138' into dev/adreno-main

Author: lfdevs

.gitlab-ci/bare-metal/poe-powered.sh

@@ -75,8 +75,6 @@ section_start prepare_rootfs "Preparing rootfs components"
 
 set -ex
 
-date +'%F %T'
-
 # Clear out any previous run's artifacts.
 rm -rf results/
 mkdir -p results
@@ -85,26 +83,20 @@ mkdir -p results
 # state, since it's volume-mounted on the host.
 rsync -a --delete $BM_ROOTFS/ /nfs/
 
-date +'%F %T'
-
 # If BM_BOOTFS is an URL, download it
 if echo $BM_BOOTFS | grep -q http; then
   curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
     "${FDO_HTTP_CACHE_URI:-}$BM_BOOTFS" -o /tmp/bootfs.tar
   BM_BOOTFS=/tmp/bootfs.tar
 fi
 
-date +'%F %T'
-
 # If BM_BOOTFS is a file, assume it is a tarball and uncompress it
 if [ -f "${BM_BOOTFS}" ]; then
   mkdir -p /tmp/bootfs
   tar xf $BM_BOOTFS -C /tmp/bootfs
   BM_BOOTFS=/tmp/bootfs
 fi
 
-date +'%F %T'
-
 # Install kernel modules (it could be either in /lib/modules or
 # /usr/lib/modules, but we want to install in the latter)
 if [ -n "${BM_BOOTFS}" ]; then
@@ -115,22 +107,16 @@ else
 fi
 
 
-date +'%F %T'
-
 # Install kernel image + bootloader files
 if [ -z "$BM_BOOTFS" ]; then
   mv "${BM_KERNEL}" "${BM_DTB}.dtb" /tftp/
 else  # BM_BOOTFS
   rsync -aL --delete $BM_BOOTFS/boot/ /tftp/
 fi
 
-date +'%F %T'
-
 # Create the rootfs in the NFS directory
 . $BM/rootfs-setup.sh /nfs
 
-date +'%F %T'
-
 echo "$BM_CMDLINE" > /tftp/cmdline.txt
 
 # Add some options in config.txt, if defined
@@ -180,13 +166,10 @@ python3 $CI_INSTALL/custom_logger.py ${STRUCTURED_LOG_FILE} --close-dut-job
 python3 $CI_INSTALL/custom_logger.py ${STRUCTURED_LOG_FILE} --close
 set -e
 
-date +'%F %T'
-
 # Bring artifacts back from the NFS dir to the build dir where gitlab-runner
 # will look for them.
 cp -Rp /nfs/results/. results/
 
-date +'%F %T'
 section_end dut_cleanup
 
 exit $ret

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

@@ -25,17 +25,16 @@
 import os
 import re
 import sys
-import threading
 
 from custom_logger import CustomLogger
 from serial_buffer import SerialBuffer
 
+
 class PoERun:
     def __init__(self, args, boot_timeout, test_timeout, logger):
         self.powerup = args.powerup
         self.powerdown = args.powerdown
-        self.ser = SerialBuffer(
-            args.dev, "results/serial-output.txt", ": ")
+        self.ser = SerialBuffer(args.dev, "results/serial-output.txt")
         self.boot_timeout = boot_timeout
         self.test_timeout = test_timeout
         self.logger = logger

.gitlab-ci/bare-metal/rootfs-setup.sh

@@ -9,14 +9,10 @@ mkdir -p $rootfs_dst/results
 cp $BM/bm-init.sh $rootfs_dst/init
 cp $CI_COMMON/init*.sh $rootfs_dst/
 
-date +'%F %T'
-
 # Make JWT token available as file in the bare-metal storage to enable access
 # to MinIO
 cp "${S3_JWT_FILE}" "${rootfs_dst}${S3_JWT_FILE}"
 
-date +'%F %T'
-
 cp "$SCRIPTS_DIR/setup-test-env.sh" "$rootfs_dst/"
 
 set +x
@@ -30,5 +26,3 @@ set -x
 # Add the Mesa drivers we built, and make a consistent symlink to them.
 mkdir -p $rootfs_dst/$CI_PROJECT_DIR
 rsync -aH --delete $CI_PROJECT_DIR/install/ $rootfs_dst/$CI_PROJECT_DIR/install/
-
-date +'%F %T'

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

@@ -22,15 +22,14 @@
 # IN THE SOFTWARE.
 
 import argparse
-from datetime import datetime, UTC
 import queue
 import serial
 import threading
 import time
 
 
 class SerialBuffer:
-    def __init__(self, dev, filename, prefix, timeout=None, line_queue=None):
+    def __init__(self, dev, filename, timeout=None, line_queue=None):
         self.filename = filename
         self.dev = dev
 
@@ -49,7 +48,6 @@ def __init__(self, dev, filename, prefix, timeout=None, line_queue=None):
             self.line_queue = line_queue
         else:
             self.line_queue = queue.Queue()
-        self.prefix = prefix
         self.timeout = timeout
         self.sentinel = object()
         self.closing = False
@@ -88,7 +86,7 @@ def serial_read_thread_loop(self):
                     break
                 self.byte_queue.put(b)
             except Exception as err:
-                print(self.prefix + str(err))
+                print(str(err))
                 break
         self.byte_queue.put(self.sentinel)
 
@@ -130,10 +128,7 @@ def serial_lines_thread_loop(self):
                 if b == b'\n'[0]:
                     line = line.decode(errors="replace")
 
-                    ts = datetime.now(tz=UTC)
-                    ts_str = f"{ts.hour:02}:{ts.minute:02}:{ts.second:02}.{int(ts.microsecond / 1000):03}"
-                    print("{endc}{time}{prefix}{line}".format(
-                        time=ts_str, prefix=self.prefix, line=line, endc='\033[0m'), flush=True, end='')
+                    print("{endc}{line}".format(line=line, endc='\033[0m'), flush=True, end='')
 
                     self.line_queue.put(line)
                     line = bytearray()
@@ -170,12 +165,10 @@ def main():
     parser.add_argument('--dev', type=str, help='Serial device')
     parser.add_argument('--file', type=str,
                         help='Filename for serial output', required=True)
-    parser.add_argument('--prefix', type=str,
-                        help='Prefix for logging serial to stdout', nargs='?')
 
     args = parser.parse_args()
 
-    ser = SerialBuffer(args.dev, args.file, args.prefix or "")
+    ser = SerialBuffer(args.dev, args.file)
     for line in ser.lines():
         # We're just using this as a logger, so eat the produced lines and drop
         # them

.gitlab-ci/ci-tron/gitlab-ci.yml

@@ -3,7 +3,7 @@
   extends:
     - .ci-tron-b2c-job-v1
   variables:
-    GIT_STRATEGY: empty
+    GIT_STRATEGY: none
     B2C_VERSION: v0.9.17  # Linux 6.16.3
 
     CI_TRON_PATTERN__JOB_SUCCESS__REGEX: 'hwci: mesa: exit_code: 0\r$'

.gitlab-ci/conditional-build-image-tags.yml

@@ -1,7 +1,8 @@
 variables:
   CONDITIONAL_BUILD_ANDROID_CTS_TAG: 2dfd3e288249e4776ef6866d34d344d4
-  CONDITIONAL_BUILD_ANGLE_TAG: 09747e85cb75ce82b9302bf1cdb1fd58
+  CONDITIONAL_BUILD_ANGLE_TAG: e40de41a79653aa19fac70dc6289d8e9
   CONDITIONAL_BUILD_CROSVM_TAG: 4c61f9707203afca91db3efeb57175db
   CONDITIONAL_BUILD_FLUSTER_TAG: e13f8521875ebd70e207ec0f6f3d3e5b
-  CONDITIONAL_BUILD_PIGLIT_TAG: 8638cc6cab3840150257cabc88739579
-  CONDITIONAL_BUILD_VKD3D_PROTON_TAG: 3c680463034cc7273d9e98393861c61c
+  CONDITIONAL_BUILD_PIGLIT_TAG: 7c554632e450496da9382764f449abae
+  CONDITIONAL_BUILD_VKD3D_PROTON_TAG: 4ca112b515539395fc3df34cc8bdf2fd
+  CONDITIONAL_BUILD_WINE_TAG: c97d0ebc9d033b3ad8a50c5832955d9c

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

@@ -13,7 +13,7 @@ section_start angle "Building ANGLE"
 # setting up the environment variables locally
 ci_tag_build_time_check "ANGLE_TAG"
 
-ANGLE_REV="599125448d7ad53b2868a7b5d2e3e8d3bfbc1717"
+ANGLE_REV="5e591d03650dd427001e355f4884b857cadab113"
 DEPOT_REV="5982a1aeb33dc36382ed8c62eddf52a6135e7dd3"
 
 # Set ANGLE_ARCH based on DEBIAN_ARCH if it hasn't been explicitly defined
@@ -144,9 +144,9 @@ fi
 # The Chromium build system hardcodes these flags, and they're not compatible
 # with our clang19 'unbundled' toolchain. See:
 # https://chromium.googlesource.com/chromium/src/build/+/39d42026/config/compiler/BUILD.gn#619
-# https://chromium.googlesource.com/chromium/src/build/+/39d42026/config/compiler/BUILD.gn#1882
+# https://chromium.googlesource.com/chromium/src/build/+/42209031/config/sanitizers/sanitizers.gni#548
 sed -i '/-fno-lifetime-dse/d' build/config/compiler/BUILD.gn
-sed -i '/-fsanitize-ignore-for-ubsan-feature=/d' build/config/compiler/BUILD.gn
+sed -i '/-fsanitize-ignore-for-ubsan-feature=/d' build/config/sanitizers/sanitizers.gni
 
 (
   # The 'unbundled' toolchain configuration requires clang, and it also needs to

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

@@ -9,7 +9,7 @@ set -uex
 
 section_start apitrace "Building apitrace"
 
-APITRACE_VERSION="45a005875d348b055d5b88dca285c109dee90457"
+APITRACE_VERSION="18cfd388ac47a9e00978b34d6c20341f3e2cdb56"
 
 git clone https://github.com/apitrace/apitrace.git --single-branch --no-checkout /apitrace
 pushd /apitrace

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

@@ -23,7 +23,7 @@ set -x
 # - the GL release produces `glcts`, and
 # - the GLES release produces `deqp-gles*` and `deqp-egl`
 
-DEQP_MAIN_COMMIT=4d3bedc74e2258c483cf968753207cff84d9e4fc
+DEQP_MAIN_COMMIT=634a3fc62d82c34de68c3b1add25e6b7f5777524
 DEQP_VK_VERSION=1.4.4.2
 DEQP_GL_VERSION=4.6.8.0
 DEQP_GLES_VERSION=3.2.14.0

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

@@ -19,7 +19,7 @@ pushd /gfxreconstruct
 git checkout "$GFXRECONSTRUCT_VERSION"
 git submodule update --init
 git submodule update
-cmake -S . -B _build -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX:PATH=/gfxreconstruct/build -DBUILD_WERROR=OFF
+cmake -S . -B _build -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX:PATH=/gfxreconstruct/build -DBUILD_WERROR=OFF -DGFXRECON_ENABLE_OPENXR=OFF
 cmake --build _build --parallel --target tools/{replay,info}/install/strip
 find . -not -path './build' -not -path './build/*' -delete
 popd