KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ci/deqp-runner: Use new deqp-runner's built-in renderer/version checks. 

This is prettier in the log files, less shell code, and for non-suite mode
adds checking that the driver has the right git sha1.  Also, no need for
suites to have a DEQP_VER to say which dEQP we should run for the renderer
check.

The version checks can help us make sure that GL version exposed doesn't
accidentally regress, and the ".*git" checks that we're using a git
version of Mesa rather than something that snuck in through distro
packages.

Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13372>
This commit is contained in:
Emma Anholt 2021-10-11 16:27:25 -07:00 committed by Marge Bot
parent 9ddfd297e0
commit b978688df6
36 changed files with 81 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
.gitlab-ci/deqp-runner.sh
View File

@ -12,8 +12,8 @@ DEQP_OPTIONS="$DEQP_OPTIONS --deqp-surface-type=${DEQP_SURFACE_TYPE:-pbuffer}"
DEQP_OPTIONS="$DEQP_OPTIONS --deqp-gl-config-name=$DEQP_CONFIG"
DEQP_OPTIONS="$DEQP_OPTIONS --deqp-visibility=hidden"
if [ -z "$DEQP_VER" ]; then
echo 'DEQP_VER must be set to something like "gles2", "gles31-khr" or "vk" for the test run'
if [ -z "$DEQP_VER" -a -z "$DEQP_SUITE" ]; then
echo 'DEQP_SUITE must be set to the name of your deqp-gpu_version.toml, or DEQP_VER must be set to something like "gles2", "gles31-khr" or "vk" for the test run'
exit 1
fi
@ -45,26 +45,23 @@ mkdir -p $RESULTS
HANG_DETECTION_CMD=""
# Generate test case list file.
if [ "$DEQP_VER" = "vk" ]; then
MUSTPASS=/deqp/mustpass/vk-$DEQP_VARIANT.txt
DEQP=/deqp/external/vulkancts/modules/vulkan/deqp-vk
HANG_DETECTION_CMD="/parallel-deqp-runner/build/bin/hang-detection"
elif [ "$DEQP_VER" = "gles2" -o "$DEQP_VER" = "gles3" -o "$DEQP_VER" = "gles31" -o "$DEQP_VER" = "egl" ]; then
MUSTPASS=/deqp/mustpass/$DEQP_VER-$DEQP_VARIANT.txt
DEQP=/deqp/modules/$DEQP_VER/deqp-$DEQP_VER
SUITE=dEQP
elif [ "$DEQP_VER" = "gles2-khr" -o "$DEQP_VER" = "gles3-khr" -o "$DEQP_VER" = "gles31-khr" -o "$DEQP_VER" = "gles32-khr" ]; then
MUSTPASS=/deqp/mustpass/$DEQP_VER-$DEQP_VARIANT.txt
DEQP=/deqp/external/openglcts/modules/glcts
SUITE=dEQP
else
MUSTPASS=/deqp/mustpass/$DEQP_VER-$DEQP_VARIANT.txt
DEQP=/deqp/external/openglcts/modules/glcts
SUITE=KHR
fi
if [ -z "$DEQP_SUITE" ]; then
# Generate test case list file.
if [ "$DEQP_VER" = "vk" ]; then
MUSTPASS=/deqp/mustpass/vk-$DEQP_VARIANT.txt
DEQP=/deqp/external/vulkancts/modules/vulkan/deqp-vk
HANG_DETECTION_CMD="/parallel-deqp-runner/build/bin/hang-detection"
elif [ "$DEQP_VER" = "gles2" -o "$DEQP_VER" = "gles3" -o "$DEQP_VER" = "gles31" -o "$DEQP_VER" = "egl" ]; then
MUSTPASS=/deqp/mustpass/$DEQP_VER-$DEQP_VARIANT.txt
DEQP=/deqp/modules/$DEQP_VER/deqp-$DEQP_VER
elif [ "$DEQP_VER" = "gles2-khr" -o "$DEQP_VER" = "gles3-khr" -o "$DEQP_VER" = "gles31-khr" -o "$DEQP_VER" = "gles32-khr" ]; then
MUSTPASS=/deqp/mustpass/$DEQP_VER-$DEQP_VARIANT.txt
DEQP=/deqp/external/openglcts/modules/glcts
else
MUSTPASS=/deqp/mustpass/$DEQP_VER-$DEQP_VARIANT.txt
DEQP=/deqp/external/openglcts/modules/glcts
fi
cp $MUSTPASS /tmp/case-list.txt
# If the caselist is too long to run in a reasonable amount of time, let the job
@ -120,46 +117,6 @@ fi
set +e
parse_renderer() {
RENDERER=`grep -A1 TestCaseResult.\*info.renderer $RESULTS/deqp-info.qpa | grep '<Text' | sed 's|.*<Text>||g' | sed 's|</Text>||g'`
VERSION=`grep -A1 TestCaseResult.\*info.version $RESULTS/deqp-info.qpa | grep '<Text' | sed 's|.*<Text>||g' | sed 's|</Text>||g'`
echo "Renderer: $RENDERER"
echo "Version: $VERSION "
if ! echo $RENDERER | grep -q $DEQP_EXPECTED_RENDERER; then
echo "Expected GL_RENDERER $DEQP_EXPECTED_RENDERER"
exit 1
fi
}
check_renderer() {
if echo $DEQP_VER | grep -q egl; then
return
fi
echo "Capturing renderer info for GLES driver sanity checks"
# If you're having trouble loading your driver, uncommenting this may help
# debug.
# export EGL_LOG_LEVEL=debug
VERSION=`echo $DEQP_VER | cut -d '-' -f1 | tr '[a-z]' '[A-Z]'`
export LD_PRELOAD=$TEST_LD_PRELOAD
$DEQP $DEQP_OPTIONS --deqp-case=$SUITE-$VERSION.info.\* --deqp-log-filename=$RESULTS/deqp-info.qpa
export LD_PRELOAD=
parse_renderer
}
check_vk_device_name() {
echo "Capturing device info for VK driver sanity checks"
export LD_PRELOAD=$TEST_LD_PRELOAD
$DEQP $DEQP_OPTIONS --deqp-case=dEQP-VK.info.device --deqp-log-filename=$RESULTS/deqp-info.qpa
export LD_PRELOAD=
DEVICENAME=`grep deviceName $RESULTS/deqp-info.qpa | sed 's|deviceName: ||g'`
echo "deviceName: $DEVICENAME"
if ! echo $DEVICENAME | grep -q "$DEQP_EXPECTED_RENDERER"; then
echo "Expected deviceName $DEQP_EXPECTED_RENDERER"
exit 1
fi
}
report_load() {
echo "System load: $(cut -d' ' -f1-3 < /proc/loadavg)"
echo "# of CPU cores: $(cat /proc/cpuinfo | grep processor | wc -l)"
@ -188,11 +145,6 @@ if [ "$GALLIUM_DRIVER" = "virpipe" ]; then
sleep 1
fi
if [ $DEQP_VER = vk ]; then
quiet check_vk_device_name
else
quiet check_renderer
fi
RESULTS_CSV=$RESULTS/results.csv
FAILURES_CSV=$RESULTS/failures.csv
@ -200,6 +152,13 @@ FAILURES_CSV=$RESULTS/failures.csv
export LD_PRELOAD=$TEST_LD_PRELOAD
if [ -z "$DEQP_SUITE" ]; then
if [ -n "$DEQP_EXPECTED_RENDERER" ]; then
export DEQP_RUNNER_OPTIONS="$DEQP_RUNNER_OPTIONS --renderer-check "$DEQP_EXPECTED_RENDERER""
fi
if [ $DEQP_VER != vk -a $DEQP_VER != egl ]; then
export DEQP_RUNNER_OPTIONS="$DEQP_RUNNER_OPTIONS --version-check `cat $INSTALL/VERSION | sed 's/[() ]/./g'`"
fi
deqp-runner \
run \
--deqp $DEQP \
@ -244,7 +203,7 @@ find $RESULTS -name \*.xml \
-quit
$HANG_DETECTION_CMD deqp-runner junit \
--testsuite $DEQP_VER \
--testsuite dEQP \
--results $RESULTS/failures.csv \
--output $RESULTS/junit.xml \
--limit 50 \

2
src/broadcom/ci/deqp-v3d-rpi4-gles.toml
View File

@ -8,6 +8,8 @@ deqp_args = [
"--deqp-surface-width=256",
"--deqp-visibility=hidden",
]
version_check = "GL ES 3.1.*git"
renderer_check = "V3D"
[[deqp]]
deqp = "/deqp/modules/gles3/deqp-gles3"

2
src/broadcom/ci/deqp-vc4-rpi3-gles.toml
View File

@ -9,6 +9,8 @@ deqp_args = [
"--deqp-surface-width=256",
"--deqp-visibility=hidden",
]
version_check = "GL ES 2.0.*git"
renderer_check = "VC4"
[[deqp]]
deqp = "/deqp/external/openglcts/modules/glcts"

6
src/broadcom/ci/gitlab-ci.yml
View File

@ -6,7 +6,6 @@
variables:
BM_BOOTFS: /boot/raspberrypi_armhf
BM_ROOTFS: /rootfs-armhf
DEQP_EXPECTED_RENDERER: VC4
GPU_VERSION: vc4-rpi3
HWCI_KERNEL_MODULES: vc4
FLAKES_CHANNEL: "#videocore-ci"
@ -26,7 +25,6 @@ vc4-rpi3-gles:armhf:
variables:
HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
DEQP_SUITE: vc4-rpi3-gles
DEQP_VER: gles2
vc4-rpi3-egl:armhf:
extends:
@ -74,7 +72,6 @@ vc4-rpi3-piglit-quick_shader:armhf:
BM_BOOTFS: /boot/raspberrypi_armhf
BM_POE_TIMEOUT: 300
BM_ROOTFS: /rootfs-armhf
DEQP_EXPECTED_RENDERER: V3D
FLAKES_CHANNEL: "#videocore-ci"
GPU_VERSION: v3d-rpi4
HWCI_KERNEL_MODULES: v3d,vc4
@ -92,7 +89,6 @@ v3d-rpi4-gles:armhf:
parallel: 8
variables:
DEQP_SUITE: v3d-rpi4-gles
DEQP_VER: gles31
v3d-rpi4-egl:armhf:
extends:
@ -123,7 +119,7 @@ v3dv-rpi4-vk:arm64:
BM_BOOTFS: /boot/raspberrypi_arm64
BM_POE_TIMEOUT: 300
BM_ROOTFS: /rootfs-arm64
DEQP_EXPECTED_RENDERER: "V3D 4.2"
DEQP_EXPECTED_RENDERER: "V3D.4.2"
DEQP_FRACTION: 5
DEQP_VER: vk
FLAKES_CHANNEL: "#videocore-ci"

2
src/freedreno/ci/deqp-freedreno-a307.toml
View File

@ -7,6 +7,8 @@ deqp_args = [
"--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
"--deqp-gl-config-name=rgba8888d24s8ms0",
]
version_check = "GL ES 3.0.*git"
renderer_check = "FD307"
[[deqp]]
deqp = "/deqp/modules/gles3/deqp-gles3"

2
src/freedreno/ci/deqp-freedreno-a530.toml
View File

@ -7,6 +7,8 @@ deqp_args = [
"--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
"--deqp-gl-config-name=rgba8888d24s8ms0",
]
version_check = "GL ES 3.1.*git"
renderer_check = "FD530"
[[deqp]]
deqp = "/deqp/modules/gles3/deqp-gles3"

1
src/freedreno/ci/deqp-freedreno-a630-vk-full.toml
View File

@ -3,6 +3,7 @@
deqp = "/deqp/external/vulkancts/modules/vulkan/deqp-vk"
caselists = ["/deqp/mustpass/vk-master.txt"]
timeout = 300
renderer_check = "Turnip Adreno .* 630"
[deqp.env]
# Force binning in the main run, which makes sure we render at
# least 2 bins. This is the path that impacts the most different

1
src/freedreno/ci/deqp-freedreno-a630-vk.toml
View File

@ -4,6 +4,7 @@ deqp = "/deqp/external/vulkancts/modules/vulkan/deqp-vk"
caselists = ["/deqp/mustpass/vk-master.txt"]
skips = ["install/deqp-freedreno-a630-premerge-skips.txt"]
fraction = 3
renderer_check = "Turnip Adreno .* 630"
[deqp.env]
# Force binning in the main run, which makes sure we render at
# least 2 bins. This is the path that impacts the most different

2
src/freedreno/ci/deqp-freedreno-a630.toml
View File

@ -8,6 +8,8 @@ deqp_args = [
"--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
"--deqp-gl-config-name=rgba8888d24s8ms0",
]
version_check = "GL ES 3.2.*git"
renderer_check = "FD630"
[[deqp]]
deqp = "/deqp/modules/gles3/deqp-gles3"

10
src/freedreno/ci/gitlab-ci.yml
View File

@ -24,7 +24,6 @@
variables:
DEQP_VER: vk
VK_DRIVER: freedreno
DEQP_EXPECTED_RENDERER: "Turnip Adreno (TM) 630"
MESA_VK_IGNORE_CONFORMANCE_WARNING: 1
.freedreno-test-traces:
@ -45,14 +44,12 @@
BM_KERNEL: /baremetal-files/Image.gz
BM_DTB: /baremetal-files/apq8016-sbc.dtb
GPU_VERSION: freedreno-a307
DEQP_EXPECTED_RENDERER: FD307
a306_gl:
extends:
- .baremetal-deqp-test
- .a306-test
variables:
DEQP_VER: gles2
DEQP_SUITE: freedreno-a307
parallel: 5
@ -72,7 +69,6 @@ a306-traces:
BM_KERNEL: /baremetal-files/Image.gz
BM_DTB: /baremetal-files/apq8096-db820c.dtb
GPU_VERSION: freedreno-a530
DEQP_EXPECTED_RENDERER: FD530
tags:
- google-freedreno-db820c
@ -81,7 +77,6 @@ a530_gl:
- .baremetal-deqp-test
- .a530-test
variables:
DEQP_VER: gles2
DEQP_SUITE: freedreno-a530
parallel: 5
@ -125,7 +120,6 @@ a530-traces:
BM_KERNEL: /baremetal-files/cheza-kernel
BM_CMDLINE: "ip=dhcp console=ttyMSM0,115200n8 root=/dev/nfs rw nfsrootdebug nfsroot=,tcp,nfsvers=4.2 init=/init"
GPU_VERSION: freedreno-a630
DEQP_EXPECTED_RENDERER: FD630
tags:
- google-freedreno-cheza
script:
@ -137,7 +131,6 @@ a630_gl:
- .a630-test
parallel: 4
variables:
DEQP_VER: gles2 # for renderer check
DEQP_SUITE: freedreno-a630
# Robustness tests may be disruptive to other tests, so we run EGL's robustness
@ -160,6 +153,7 @@ a630_gles_asan:
variables:
DEQP_VER: gles31
DEQP_FRACTION: 10
DEQP_EXPECTED_RENDERER: FD630
GPU_VERSION: freedreno-a630-asan
a630_vk:
@ -168,7 +162,6 @@ a630_vk:
- .baremetal-deqp-test-freedreno-vk
parallel: 3
variables:
DEQP_VER: vk
DEQP_SUITE: freedreno-a630-vk
a630_vk_full:
@ -189,6 +182,7 @@ a630_vk_asan:
- .baremetal-arm64-asan-test
- .test-manual
variables:
DEQP_EXPECTED_RENDERER: "Turnip Adreno (TM) 630"
DEQP_FRACTION: 100
FDO_CI_CONCURRENT: 4 # We get OOMkills if we go too wide with asan enabled
TU_DEBUG: forcebin

2
src/gallium/drivers/i915/ci/deqp-i915g.toml
View File

@ -8,6 +8,8 @@ deqp_args = [
"--deqp-gl-config-name=rgba8888d24s8ms0",
"--deqp-visibility=hidden"
]
version_check = "GL ES 2.0.*git"
renderer_check = "i915"
[[deqp]]
deqp = "/deqp/external/openglcts/modules/glcts"

2
src/gallium/drivers/i915/ci/gitlab-ci.yml
View File

@ -7,7 +7,6 @@
tags:
- anholt-g33
variables:
DEQP_EXPECTED_RENDERER: i915
GPU_VERSION: i915-g33
i915-g33-deqp:
@ -15,7 +14,6 @@ i915-g33-deqp:
- .anholt-g33-test
- .deqp-test
variables:
DEQP_VER: gles2
DEQP_SUITE: i915g
i915-g33-piglit:

2
src/gallium/drivers/iris/ci/deqp-iris-amly.toml
View File

@ -8,6 +8,8 @@ deqp_args = [
"--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
"--deqp-gl-config-name=rgba8888d24s8ms0",
]
version_check = "GL ES 3.2.*git"
renderer_check = "AML"
[[deqp]]
deqp = "/deqp/modules/gles3/deqp-gles3"

2
src/gallium/drivers/iris/ci/deqp-iris-apl.toml
View File

@ -8,6 +8,8 @@ deqp_args = [
"--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
"--deqp-gl-config-name=rgba8888d24s8ms0",
]
version_check = "GL ES 3.2.*git"
renderer_check = "APL"
[[deqp]]
deqp = "/deqp/modules/gles3/deqp-gles3"

2
src/gallium/drivers/iris/ci/deqp-iris-cml.toml
View File

@ -9,6 +9,8 @@ deqp_args = [
"--deqp-gl-config-name=rgba8888d24s8ms0",
]
fraction = 2
version_check = "GL ES 3.2.*git"
renderer_check = "CML"
[[deqp]]
deqp = "/deqp/modules/gles3/deqp-gles3"

2
src/gallium/drivers/iris/ci/deqp-iris-glk.toml
View File

@ -9,6 +9,8 @@ deqp_args = [
"--deqp-gl-config-name=rgba8888d24s8ms0",
]
fraction = 3
version_check = "GL ES 3.2.*git"
renderer_check = "GLK"
[[deqp]]
deqp = "/deqp/modules/gles3/deqp-gles3"

2
src/gallium/drivers/iris/ci/deqp-iris-kbl.toml
View File

@ -8,6 +8,8 @@ deqp_args = [
"--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
"--deqp-gl-config-name=rgba8888d24s8ms0",
]
version_check = "GL ES 3.2.*git"
renderer_check = "KBL"
[[deqp]]
deqp = "/deqp/modules/gles3/deqp-gles3"

2
src/gallium/drivers/iris/ci/deqp-iris-whl.toml
View File

@ -9,6 +9,8 @@ deqp_args = [
"--deqp-gl-config-name=rgba8888d24s8ms0",
]
fraction = 5
version_check = "GL ES 3.2.*git"
renderer_check = "WHL"
[[deqp]]
deqp = "/deqp/modules/gles3/deqp-gles3"

12
src/gallium/drivers/iris/ci/gitlab-ci.yml
View File

@ -17,7 +17,6 @@
variables:
DEVICE_TYPE: asus-C523NA-A20057-coral
GPU_VERSION: iris-apl
DEQP_EXPECTED_RENDERER: APL
tags:
- mesa-ci-x86-64-lava-asus-C523NA-A20057-coral
@ -29,7 +28,6 @@
variables:
DEVICE_TYPE: hp-x360-12b-ca0010nr-n4020-octopus
GPU_VERSION: iris-glk
DEQP_EXPECTED_RENDERER: GLK
tags:
- mesa-ci-x86-64-lava-hp-x360-12b-ca0010nr-n4020-octopus
@ -41,7 +39,6 @@
variables:
DEVICE_TYPE: asus-C433TA-AJ0005-rammus
GPU_VERSION: iris-amly
DEQP_EXPECTED_RENDERER: AML
tags:
- mesa-ci-x86-64-lava-asus-C433TA-AJ0005-rammus
@ -53,7 +50,6 @@
variables:
DEVICE_TYPE: hp-x360-14-G1-sona
GPU_VERSION: iris-kbl
DEQP_EXPECTED_RENDERER: KBL
tags:
- mesa-ci-x86-64-lava-hp-x360-14-G1-sona
@ -65,7 +61,6 @@
variables:
DEVICE_TYPE: dell-latitude-5400-4305U-sarien
GPU_VERSION: iris-whl
DEQP_EXPECTED_RENDERER: WHL
tags:
- mesa-ci-x86-64-lava-dell-latitude-5400-4305U-sarien
@ -77,7 +72,6 @@
variables:
DEVICE_TYPE: asus-C436FA-Flip-hatch
GPU_VERSION: iris-cml
DEQP_EXPECTED_RENDERER: CML
tags:
- mesa-ci-x86-64-lava-asus-C436FA-flip-hatch
@ -85,7 +79,6 @@ iris-apl-deqp:
extends:
- .iris-apl-test
variables:
DEQP_VER: gles2 # for the renderer check
DEQP_SUITE: iris-apl
parallel: 3
@ -101,7 +94,6 @@ iris-glk-deqp:
extends:
- .iris-glk-test
variables:
DEQP_VER: gles2 # for the renderer check
DEQP_SUITE: iris-glk
parallel: 2
@ -117,7 +109,6 @@ iris-amly-deqp:
extends:
- .iris-amly-test
variables:
DEQP_VER: gles2 # for the renderer check
DEQP_SUITE: iris-amly
parallel: 3
@ -125,7 +116,6 @@ iris-kbl-deqp:
extends:
- .iris-kbl-test
variables:
DEQP_VER: gles2 # for the renderer check
DEQP_SUITE: iris-kbl
parallel: 3
@ -133,14 +123,12 @@ iris-whl-deqp:
extends:
- .iris-whl-test
variables:
DEQP_VER: gles2 # for the renderer check
DEQP_SUITE: iris-whl
iris-cml-deqp:
extends:
- .iris-cml-test
variables:
DEQP_VER: gles2 # for the renderer check
DEQP_SUITE: iris-cml
parallel: 2

9
src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe-asan.toml
View File

@ -8,8 +8,7 @@ deqp_args = [
"--deqp-surface-type=pbuffer", "--deqp-gl-config-name=rgba8888d24s8ms0", "--deqp-visibility=hidden"
]
fraction = 10
# Would be nice to just set the LD_PRELOAD here instead of in the job, so deqp-runner
# wasn't asanned, but then the renderer check in deqp-runner.sh fails to pull in asan.
# Long term I want to just move the renderer check to deqp-runner anyway.
# [deqp.env]
# LD_PRELOAD = "libasan.so.6"
version_check = "GL ES 3.2.*git"
renderer_check = "llvmpipe"
[deqp.env]
LD_PRELOAD = "libasan.so.6"

2
src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe.toml
View File

@ -8,6 +8,8 @@ deqp_args = [
"--deqp-gl-config-name=rgba8888d24s8ms0",
"--deqp-visibility=hidden"
]
version_check = "GL ES 3.2.*git"
renderer_check = "llvmpipe"
[[deqp]]
deqp = "/deqp/modules/gles3/deqp-gles3"

4
src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml
View File

@ -84,7 +84,6 @@ llvmpipe-traces:
# busy at the deqp-runner level.
LP_NUM_THREADS: 0
GPU_VERSION: llvmpipe
DEQP_EXPECTED_RENDERER: llvmpipe
extends:
- .test-gl
- .deqp-test
@ -92,18 +91,15 @@ llvmpipe-traces:
llvmpipe-deqp:
variables:
DEQP_VER: gles2 # for the renderer check
DEQP_SUITE: llvmpipe
parallel: 2
extends: .llvmpipe-deqp-test
llvmpipe-deqp-asan:
variables:
DEQP_VER: gles2 # for the renderer check
DEQP_SUITE: llvmpipe-asan
GPU_VERSION: llvmpipe-asan
DEQP_FRACTION: 10
TEST_LD_PRELOAD: libasan.so.6
extends: .llvmpipe-deqp-test
needs:
- debian/x86_test-gl

2
src/gallium/drivers/softpipe/ci/deqp-softpipe.toml
View File

@ -8,6 +8,8 @@ deqp_args = [
"--deqp-gl-config-name=rgba8888d24s8ms0",
"--deqp-visibility=hidden"
]
version_check = "GL ES 3.1.*git"
renderer_check = "softpipe"
[[deqp]]
deqp = "/deqp/modules/gles3/deqp-gles3"

1
src/gallium/drivers/softpipe/ci/gitlab-ci.yml
View File

@ -13,7 +13,6 @@
softpipe-deqp:
variables:
DEQP_VER: gles2 # for the renderer check
DEQP_SUITE: softpipe
parallel: 2
extends: .softpipe-deqp-test

2
src/gallium/drivers/virgl/ci/deqp-virgl-gl.toml
View File

@ -8,6 +8,8 @@ deqp_args = [
"--deqp-gl-config-name=rgba8888d24s8ms0",
"--deqp-visibility=hidden"
]
version_check = "GL ES 3.2.*git"
renderer_check = "virgl"
[[deqp]]
deqp = "/deqp/modules/gles3/deqp-gles3"

2
src/gallium/drivers/virgl/ci/deqp-virgl-gles.toml
View File

@ -8,6 +8,8 @@ deqp_args = [
"--deqp-gl-config-name=rgba8888d24s8ms0",
"--deqp-visibility=hidden"
]
version_check = "GL ES 3.1.*git"
renderer_check = "virgl"
[[deqp]]
deqp = "/deqp/modules/gles3/deqp-gles3"

2
src/gallium/drivers/virgl/ci/gitlab-ci.yml
View File

@ -9,13 +9,11 @@
virgl-on-gl:
variables:
DEQP_VER: gles2 # For renderer check
DEQP_SUITE: virgl-gl
GPU_VERSION: virgl-gl
# Speed rendering a bit, as crosvm is processing requests serially
LP_NUM_THREADS: 8
FDO_CI_CONCURRENT: 3
DEQP_EXPECTED_RENDERER: virgl
CROSVM_TEST_SCRIPT: "/install/deqp-runner.sh"
parallel: 6
tags:

2
src/gallium/drivers/zink/ci/deqp-zink-lvp.toml
View File

@ -9,6 +9,8 @@ deqp_args = [
"--deqp-visibility=hidden"
]
timeout = 180.0
version_check = "GL ES 3.2.*git"
renderer_check = "zink.*llvmpipe"
[[deqp]]
deqp = "/deqp/modules/gles3/deqp-gles3"

2
src/gallium/drivers/zink/ci/gitlab-ci.yml
View File

@ -44,7 +44,5 @@ zink-lvp-deqp:
variables:
GALLIUM_DRIVER: "zink" # move here due to bad xvfb-run interactions
VK_DRIVER: lvp # Don't move to the top level, piglit runs do funny stuff with VK_DRIVER set
DEQP_EXPECTED_RENDERER: "zink.*llvmpipe"
DEQP_VER: gles2
DEQP_SUITE: zink-lvp
parallel: 2

1
src/panfrost/ci/deqp-panfrost-g52-vk.toml
View File

@ -1,3 +1,4 @@
[[deqp]]
deqp = "/deqp/external/vulkancts/modules/vulkan/deqp-vk"
caselists = ["install/vk-panvk.txt"]
renderer_check = "Mali-G52"

2
src/panfrost/ci/deqp-panfrost-g52.toml
View File

@ -7,6 +7,8 @@ deqp_args = [
"--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
"--deqp-gl-config-name=rgba8888d24s8ms0",
]
version_check = "GL ES 3.1.*git"
renderer_check = "Mali-G52"
[[deqp]]
deqp = "/deqp/modules/gles3/deqp-gles3"

2
src/panfrost/ci/deqp-panfrost-g72.toml
View File

@ -7,6 +7,8 @@ deqp_args = [
"--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
"--deqp-gl-config-name=rgba8888d24s8ms0",
]
version_check = "GL ES 3.1.*git"
renderer_check = "Mali-G72"
[[deqp]]
deqp = "/deqp/modules/gles3/deqp-gles3"

2
src/panfrost/ci/deqp-panfrost-t720.toml
View File

@ -7,3 +7,5 @@ deqp_args = [
"--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
"--deqp-gl-config-name=rgba8888d24s8ms0",
]
version_check = "GL ES .*git"
renderer_check = "Mali-T720"

2
src/panfrost/ci/deqp-panfrost-t760.toml
View File

@ -7,3 +7,5 @@ deqp_args = [
"--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
"--deqp-gl-config-name=rgba8888d24s8ms0",
]
version_check = "GL ES 3.1.*git"
renderer_check = "Mali-T760"

2
src/panfrost/ci/deqp-panfrost-t860.toml
View File

@ -7,6 +7,8 @@ deqp_args = [
"--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
"--deqp-gl-config-name=rgba8888d24s8ms0",
]
version_check = "GL ES 3.1.*git"
renderer_check = "Mali-T860"
[[deqp]]
deqp = "/deqp/modules/gles3/deqp-gles3"

10
src/panfrost/ci/gitlab-ci.yml
View File

@ -15,7 +15,6 @@ panfrost-t720-gles2:arm64:
GPU_VERSION: panfrost-t720
DEQP_SUITE: panfrost-t720
FDO_CI_CONCURRENT: 6
DEQP_EXPECTED_RENDERER: T720
tags:
- mesa-ci-x86-64-lava-sun50i-h6-pine-h64
@ -30,9 +29,8 @@ panfrost-t760-gles2:armhf:
GPU_VERSION: panfrost-t760
BOOT_METHOD: depthcharge
KERNEL_IMAGE_TYPE: ""
DEQP_SUITE: panfrost-t720
DEQP_SUITE: panfrost-t760
FDO_CI_CONCURRENT: 6
DEQP_EXPECTED_RENDERER: T760
tags:
- mesa-ci-x86-64-lava-rk3288-veyron-jaq
@ -81,7 +79,6 @@ panfrost-t860-gl:arm64:
- .lava-rk3399-gru-kevin
variables:
FDO_CI_CONCURRENT: 6
DEQP_EXPECTED_RENDERER: T860
DEQP_SUITE: panfrost-t860
panfrost-t860-traces:arm64:
@ -118,7 +115,6 @@ panfrost-g52-gl:arm64:
variables:
FDO_CI_CONCURRENT: 6
DEQP_SUITE: panfrost-g52
DEQP_EXPECTED_RENDERER: G52
PAN_MESA_DEBUG: "deqp,sync,indirect"
panfrost-g52-vk:arm64:
@ -126,8 +122,6 @@ panfrost-g52-vk:arm64:
- .lava-test:arm64
- .lava-meson-g12b-a311d-khadas-vim3
variables:
DEQP_VER: vk
DEQP_EXPECTED_RENDERER: G52
VK_DRIVER: panfrost
MESA_VK_IGNORE_CONFORMANCE_WARNING: 1
PAN_I_WANT_A_BROKEN_VULKAN_DRIVER: 1
@ -164,7 +158,6 @@ panfrost-g72-gl:arm64:
- .lava-test:arm64
- .lava-mt8183-kukui-jacuzzi-juniper-sku16
variables:
DEQP_EXPECTED_RENDERER: G72
DEQP_SUITE: panfrost-g72
.panfrost-t820-gles2:arm64:
@ -177,7 +170,6 @@ panfrost-g72-gl:arm64:
DTB: $DEVICE_TYPE
GPU_VERSION: panfrost-t820
FDO_CI_CONCURRENT: 6
DEQP_EXPECTED_RENDERER: T820
DEQP_SUITE: panfrost-t720
tags:
- mesa-ci-aarch64-lava-baylibre