diff --git a/.gitlab-ci/android-deqp-runner.sh b/.gitlab-ci/android-deqp-runner.sh index 9dd09d9243b..d03755927de 100755 --- a/.gitlab-ci/android-deqp-runner.sh +++ b/.gitlab-ci/android-deqp-runner.sh @@ -17,6 +17,7 @@ $ADB push /deqp-tools/* /data/deqp $ADB push /deqp-runner/deqp-runner /data/deqp $ADB push "$INSTALL/all-skips.txt" /data/deqp +$ADB push "$INSTALL/android-skips.txt" /data/deqp $ADB push "$INSTALL/angle-skips.txt" /data/deqp if [ -e "$INSTALL/$GPU_VERSION-flakes.txt" ]; then $ADB push "$INSTALL/$GPU_VERSION-flakes.txt" /data/deqp diff --git a/.gitlab-ci/android-skips.txt b/.gitlab-ci/android-skips.txt new file mode 100644 index 00000000000..3aa627ffed6 --- /dev/null +++ b/.gitlab-ci/android-skips.txt @@ -0,0 +1,11 @@ +# Skip these tests when running fractional dEQP batches, as the AHB tests are expected +# to be handled separately in a non-fractional run within the deqp-runner suite. +dEQP-VK.api.external.memory.android_hardware_buffer.* + +# Skip all WSI tests: the DEQP_ANDROID_EXE build used can't create native windows, as +# only APKs support window creation on Android. +dEQP-VK.image.swapchain_mutable.* +dEQP-VK.wsi.* + +# These tests cause hangs and need to be skipped for now. +dEQP-VK.synchronization* diff --git a/src/virtio/ci/android-angle-venus-anv-fails.txt b/src/virtio/ci/android-angle-venus-anv-fails.txt index 171827d0459..e9da8b5c1a9 100644 --- a/src/virtio/ci/android-angle-venus-anv-fails.txt +++ b/src/virtio/ci/android-angle-venus-anv-fails.txt @@ -1,2 +1,2 @@ -dEQP-VK.api.external.memory.android_hardware_buffer.dedicated.host_visible.import_twice,Fail -dEQP-VK.api.external.memory.android_hardware_buffer.suballocated.host_visible.import_twice,Fail +ahb-dEQP-VK.api.external.memory.android_hardware_buffer.dedicated.host_visible.import_twice,Fail +ahb-dEQP-VK.api.external.memory.android_hardware_buffer.suballocated.host_visible.import_twice,Fail diff --git a/src/virtio/ci/deqp-android-angle-venus-anv.toml b/src/virtio/ci/deqp-android-angle-venus-anv.toml index d0e1b916697..81f0182365b 100644 --- a/src/virtio/ci/deqp-android-angle-venus-anv.toml +++ b/src/virtio/ci/deqp-android-angle-venus-anv.toml @@ -4,8 +4,18 @@ deqp = "/data/deqp/deqp-vk" caselists = ["/data/deqp/vk-main.txt"] include = ["dEQP-VK.api.external.memory.android_hardware_buffer.*"] timeout = 120 +prefix = "ahb-" renderer_check = "Virtio-GPU Venus.*Intel" +# Basic fractioned vkcts test set +[[deqp]] +deqp = "/data/deqp/deqp-vk" +caselists = [ "/data/deqp/vk-main.txt" ] +tests_per_group = 10000 +skips = ["/data/deqp/android-skips.txt"] +timeout = 120 +fraction = 50 + # Basic EGL test set [[deqp]] deqp = "/data/deqp/deqp-egl-android" diff --git a/src/virtio/ci/gitlab-ci.yml b/src/virtio/ci/gitlab-ci.yml index 3ed1b4ad001..47adb12d86f 100644 --- a/src/virtio/ci/gitlab-ci.yml +++ b/src/virtio/ci/gitlab-ci.yml @@ -56,6 +56,7 @@ android-angle-venus-anv-cml: DEQP_SUITE: android-angle-venus-anv GPU_VERSION: android-angle-venus-anv HWCI_KERNEL_MODULES: "i915,vhost_vsock" + parallel: 3 android-angle-venus-anv-cml-cts: extends: @@ -77,6 +78,7 @@ android-angle-venus-anv-tgl: GPU_VERSION: android-angle-venus-anv HWCI_KERNEL_MODULES: "i915,vhost_vsock" DEVICE_HANGING_TIMEOUT_SEC: 5400 # Workaround until network configuration is updated + timeout: 1h 30m android-angle-venus-anv-adl: extends: