mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-06-10 05:38:18 +02:00
ci: Include Windows renderdoc in with wine and update gpu-trace-perf.
We'll use this for trace testing of the new D3D11 .rdc collection. Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/41662>
This commit is contained in:
parent
5415e6779c
commit
ad8da52443
7 changed files with 40 additions and 5 deletions
|
|
@ -5,4 +5,4 @@ variables:
|
|||
CONDITIONAL_BUILD_FLUSTER_TAG: e13f8521875ebd70e207ec0f6f3d3e5b
|
||||
CONDITIONAL_BUILD_PIGLIT_TAG: ca18ec9b1945c6ed69ecb5b3bcfb3479
|
||||
CONDITIONAL_BUILD_VKD3D_PROTON_TAG: f9a108eea5cca9a5c79b058963e161a8
|
||||
CONDITIONAL_BUILD_WINE_TAG: c97d0ebc9d033b3ad8a50c5832955d9c
|
||||
CONDITIONAL_BUILD_WINE_TAG: 3376ef5f6160dbc502a7f8710a2eac27
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ set -uex
|
|||
|
||||
section_start gpu-trace-perf "Building gpu-trace-perf"
|
||||
|
||||
GPU_TRACE_PERF_VERSION=1.8.2
|
||||
GPU_TRACE_PERF_VERSION=1.9.0
|
||||
|
||||
commits_to_backport=(
|
||||
)
|
||||
|
|
|
|||
|
|
@ -124,6 +124,38 @@ wineserver -k
|
|||
|
||||
section_end DXVK
|
||||
|
||||
section_start Renderdoc "Installing Renderdoc"
|
||||
|
||||
renderdoc_install_upstream() {
|
||||
local RDC_VERSION=${1:?}
|
||||
|
||||
curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
|
||||
-O "https://renderdoc.org/stable/${RDC_VERSION}/RenderDoc_${RDC_VERSION}_64.zip"
|
||||
unzip "RenderDoc_${RDC_VERSION}_64.zip"
|
||||
mv "RenderDoc_${RDC_VERSION}_64/" /renderdoc-win64
|
||||
}
|
||||
|
||||
# renderdoc doesn't have ARM64 binaries, so grab a snapshot of a build from a Linaro dev.
|
||||
renderdoc_install_arm() {
|
||||
# anholt's copy is a snapshot of the google drive link from https://linaro.atlassian.net/wiki/spaces/WOAR/pages/30353719316/RenderDoc
|
||||
curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
|
||||
-o renderdoc_arm64.7z \
|
||||
-O "https://people.freedesktop.org/~anholt/renderdoc-arm64-anthony-linaro-snapshot.7z"
|
||||
|
||||
mkdir /renderdoc-win64
|
||||
7z -o/renderdoc-win64 x renderdoc_arm64.7z
|
||||
}
|
||||
if [ "$DEBIAN_ARCH" != arm64 ]; then
|
||||
renderdoc_install_upstream "1.43"
|
||||
else
|
||||
renderdoc_install_arm
|
||||
fi
|
||||
# Clean up large binaries we won't use.
|
||||
rm /renderdoc-win64/qrenderdoc.exe
|
||||
|
||||
section_end Renderdoc
|
||||
|
||||
|
||||
# Archive and upload wine for use as a LAVA overlay, if the archive doesn't exist yet
|
||||
WINE_S3_ARTIFACT="wine.tar.zst"
|
||||
ARTIFACT_PATH="${DATA_STORAGE_PATH}/wine/${DEBIAN_TEST_VK_TAG}-${WINE_TAG}/${CI_JOB_NAME}/${WINE_S3_ARTIFACT}"
|
||||
|
|
@ -134,6 +166,7 @@ else
|
|||
tar --zstd -cf "$WINE_S3_ARTIFACT" -C / \
|
||||
"${WINEPREFIX#/}" \
|
||||
/apitrace-msvc-win64 \
|
||||
/renderdoc-win64 \
|
||||
/usr/lib/*/wine
|
||||
ci-fairy s3cp --token-file "${S3_JWT_FILE}" "$WINE_S3_ARTIFACT" \
|
||||
"https://${S3_BASE_PATH}/${CI_PROJECT_PATH}/${ARTIFACT_PATH}"
|
||||
|
|
|
|||
|
|
@ -47,6 +47,7 @@ EPHEMERAL=(
|
|||
python3-pip
|
||||
python3-setuptools
|
||||
python3-wheel
|
||||
unzip
|
||||
xz-utils
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -52,6 +52,7 @@ buildah_export() {
|
|||
rm -rf "${mountpoint}/cuttlefish"
|
||||
rm -rf "${mountpoint}/fluster/resources"
|
||||
rm -rf "${mountpoint}/usr/lib/*/wine"
|
||||
rm -rf "${mountpoint}/renderdoc-win64"
|
||||
rm -rf "${mountpoint}/vkd3d-proton-tests"
|
||||
rm -rf "${mountpoint}/wineprefix"
|
||||
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ if [ -n "$WINE_TAG" ]; then
|
|||
export WINEDEBUG="-all"
|
||||
export WINEPREFIX="/wineprefix"
|
||||
export WINEESYNC=1
|
||||
export WINEPATH="/apitrace-msvc-win64/bin"
|
||||
export WINEPATH="/apitrace-msvc-win64/bin;/renderdoc-win64"
|
||||
|
||||
# This may be useful if you're debugging DXVK loading.
|
||||
#export WINEDEBUG="+loaddll,+module"
|
||||
|
|
|
|||
|
|
@ -22,11 +22,11 @@ variables:
|
|||
DEBIAN_BUILD_BASE_TAG: "20250430-imgui.2"
|
||||
DEBIAN_BUILD_TAG: "20260430-imgui.2"
|
||||
|
||||
DEBIAN_TEST_BASE_TAG: "20260502-virgl"
|
||||
DEBIAN_TEST_BASE_TAG: "20260527-gtp"
|
||||
DEBIAN_TEST_ANDROID_TAG: "20260526-angle-a7"
|
||||
DEBIAN_TEST_GL_TAG: "20260526-angle-a7"
|
||||
DEBIAN_TEST_VIDEO_TAG: "20260512-vkuprev"
|
||||
DEBIAN_TEST_VK_TAG: "20260514-vkbackport"
|
||||
DEBIAN_TEST_VK_TAG: "20260528-rdc-2"
|
||||
|
||||
ALPINE_X86_64_BUILD_TAG: "20260429-libdrm"
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue