From 78ea3bb43dc37013c3ab87c261ef5987d5e876fa Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Wed, 14 Feb 2024 14:50:53 +0000 Subject: [PATCH] ci/deqp: use the proper gl/gles releases for deqp-gl*, deqp-gles*, deqp-egl Part-of: --- .gitlab-ci/container/build-deqp.sh | 40 +++++++++---------- ...ing-on-Android-from-the-command-line.patch | 19 ++++++--- ...ing-on-Android-from-the-command-line.patch | 19 ++++++--- .gitlab-ci/cuttlefish-runner.sh | 2 +- .gitlab-ci/deqp-runner.sh | 6 +-- .gitlab-ci/image-tags.yml | 6 +-- src/amd/ci/deqp-radeonsi-stoney.toml | 6 +-- src/amd/ci/deqp-radeonsi-vangogh.toml | 14 +++---- src/amd/ci/deqp-radv-stoney-angle-full.toml | 12 +++--- src/amd/ci/deqp-radv-stoney-angle.toml | 12 +++--- src/broadcom/ci/broadcom-rpi3-fails.txt | 4 -- src/broadcom/ci/deqp-broadcom-rpi3.toml | 8 ++-- src/broadcom/ci/deqp-broadcom-rpi4.toml | 18 ++++----- src/freedreno/ci/deqp-freedreno-a307.toml | 8 ++-- src/freedreno/ci/deqp-freedreno-a530.toml | 12 +++--- src/freedreno/ci/deqp-freedreno-a618-egl.toml | 4 +- src/freedreno/ci/deqp-freedreno-a618.toml | 22 +++++----- src/freedreno/ci/deqp-freedreno-a630.toml | 26 ++++++------ src/freedreno/ci/deqp-freedreno-a660.toml | 22 +++++----- src/freedreno/ci/freedreno-a618-fails.txt | 2 + src/freedreno/ci/freedreno-a630-fails.txt | 2 + src/freedreno/ci/freedreno-a660-fails.txt | 2 + .../drivers/crocus/ci/deqp-crocus-g41.toml | 4 +- .../drivers/crocus/ci/deqp-crocus-hsw.toml | 14 +++---- src/gallium/drivers/i915/ci/deqp-i915g.toml | 4 +- .../lima/ci/deqp-lima-mali450-deqp.toml | 6 +-- src/gallium/drivers/lima/ci/lima-fails.txt | 7 ++-- .../llvmpipe/ci/deqp-llvmpipe-asan.toml | 2 +- .../drivers/llvmpipe/ci/deqp-llvmpipe.toml | 18 ++++----- .../nouveau/ci/deqp-nouveau-gk20a.toml | 12 +++--- .../nouveau/ci/deqp-nouveau-gm20b.toml | 12 +++--- .../drivers/r300/ci/deqp-r300-rv380.toml | 4 +- .../drivers/r300/ci/deqp-r300-rv530.toml | 4 +- .../drivers/radeonsi/ci/radeonsi-run-tests.py | 16 ++++---- .../drivers/softpipe/ci/deqp-softpipe.toml | 14 +++---- .../drivers/virgl/ci/deqp-android-virgl.toml | 2 +- .../drivers/virgl/ci/deqp-virgl-gl.toml | 8 ++-- .../drivers/virgl/ci/deqp-virgl-gles.toml | 8 ++-- .../drivers/virgl/ci/deqp-virpipe-gl.toml | 8 ++-- .../drivers/virgl/ci/virgl-gl-fails.txt | 2 + .../drivers/virgl/ci/virgl-gles-fails.txt | 2 + .../zink/ci/deqp-zink-anv-tgl-full.toml | 18 ++++----- .../drivers/zink/ci/deqp-zink-anv-tgl.toml | 12 +++--- .../zink/ci/deqp-zink-freedreno-a618.toml | 14 +++---- .../drivers/zink/ci/deqp-zink-lvp.toml | 8 ++-- .../drivers/zink/ci/deqp-zink-radv.toml | 8 ++-- .../zink/ci/zink-freedreno-a618-fails.txt | 3 ++ .../zink/ci/zink-radv-navi10-fails.txt | 4 -- .../zink/ci/zink-radv-navi31-fails.txt | 1 - src/intel/ci/deqp-anv-jsl-angle-full.toml | 12 +++--- src/intel/ci/deqp-anv-jsl-angle.toml | 12 +++--- src/intel/ci/deqp-anv-tgl-angle-full.toml | 12 +++--- src/intel/ci/deqp-anv-tgl-angle.toml | 12 +++--- src/intel/ci/deqp-iris-amly-egl.toml | 4 +- src/intel/ci/deqp-iris-amly.toml | 14 +++---- src/intel/ci/deqp-iris-apl-egl.toml | 4 +- src/intel/ci/deqp-iris-apl-glk.toml | 4 +- src/intel/ci/deqp-iris-apl.toml | 14 +++---- src/intel/ci/deqp-iris-cml.toml | 14 +++---- src/intel/ci/deqp-iris-glk-egl.toml | 4 +- src/intel/ci/deqp-iris-glk.toml | 14 +++---- src/intel/ci/deqp-iris-jsl.toml | 14 +++---- src/intel/ci/deqp-iris-kbl.toml | 14 +++---- src/intel/ci/deqp-iris-whl.toml | 14 +++---- src/panfrost/ci/deqp-panfrost-g52.toml | 14 +++---- src/panfrost/ci/deqp-panfrost-g57.toml | 14 +++---- src/panfrost/ci/deqp-panfrost-g72.toml | 12 +++--- src/panfrost/ci/deqp-panfrost-t720.toml | 2 +- src/panfrost/ci/deqp-panfrost-t760.toml | 6 +-- src/panfrost/ci/deqp-panfrost-t860-egl.toml | 4 +- src/panfrost/ci/deqp-panfrost-t860.toml | 6 +-- src/panfrost/ci/panfrost-g52-fails.txt | 2 + src/panfrost/ci/panfrost-g57-fails.txt | 2 + src/panfrost/ci/panfrost-g72-fails.txt | 1 + src/panfrost/ci/panfrost-t760-fails.txt | 1 + 75 files changed, 365 insertions(+), 342 deletions(-) diff --git a/.gitlab-ci/container/build-deqp.sh b/.gitlab-ci/container/build-deqp.sh index 0b679ddacd5..9db044ed50f 100644 --- a/.gitlab-ci/container/build-deqp.sh +++ b/.gitlab-ci/container/build-deqp.sh @@ -12,12 +12,8 @@ set -ex -o pipefail DEQP_VK_VERSION=1.3.7.0 - -# FIXME: these should be GL & GLES releases instead -#DEQP_GL_VERSION=4.6.3.3 -DEQP_GL_VERSION=1.3.7.0 -#DEQP_GLES_VERSION=3.2.9.3 -DEQP_GLES_VERSION=1.3.7.0 +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 @@ -95,11 +91,8 @@ git config --global user.name "Mesa CI" # shellcheck disable=SC2153 case "${DEQP_API}" in VK) DEQP_VERSION="vulkan-cts-$DEQP_VK_VERSION";; - # FIXME: these should be GL & GLES releases instead - #GL) DEQP_VERSION="opengl-cts-$DEQP_GL_VERSION";; - GL) DEQP_VERSION="vulkan-cts-$DEQP_GL_VERSION";; - #GLES) DEQP_VERSION="opengl-es-cts-$DEQP_GLES_VERSION";; - GLES) DEQP_VERSION="vulkan-cts-$DEQP_GLES_VERSION";; + GL) DEQP_VERSION="opengl-cts-$DEQP_GL_VERSION";; + GLES) DEQP_VERSION="opengl-es-cts-$DEQP_GLES_VERSION";; esac git clone \ @@ -219,20 +212,23 @@ if [ "${DEQP_TARGET}" != 'android' ]; then if [ "${DEQP_API}" = 'GL' ]; then cp \ - /deqp/external/openglcts/modules/gl_cts/data/mustpass/gles/aosp_mustpass/3.2.6.x/*.txt \ - /deqp/mustpass/. + /VK-GL-CTS/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.1.x/*-main.txt \ + /deqp/mustpass/ cp \ - /deqp/external/openglcts/modules/gl_cts/data/mustpass/egl/aosp_mustpass/3.2.6.x/egl-master.txt \ - /deqp/mustpass/. + /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 \ - /deqp/external/openglcts/modules/gl_cts/data/mustpass/gles/khronos_mustpass/3.2.6.x/*-master.txt \ - /deqp/mustpass/. + /VK-GL-CTS/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.6.x/*.txt \ + /deqp/mustpass/ cp \ - /deqp/external/openglcts/modules/gl_cts/data/mustpass/gl/khronos_mustpass/4.6.1.x/*-master.txt \ - /deqp/mustpass/. + /VK-GL-CTS/external/openglcts/data/mustpass/egl/aosp_mustpass/3.2.6.x/egl-main.txt \ + /deqp/mustpass/ cp \ - /deqp/external/openglcts/modules/gl_cts/data/mustpass/gl/khronos_mustpass_single/4.6.1.x/*-single.txt \ - /deqp/mustpass/. + /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 @@ -244,7 +240,7 @@ 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/**/mustpass/ rm -rf /deqp/external/vulkancts/modules/vulkan/vk-master* rm -rf /deqp/external/vulkancts/modules/vulkan/vk-default diff --git a/.gitlab-ci/container/patches/build-deqp-gl_Allow-running-on-Android-from-the-command-line.patch b/.gitlab-ci/container/patches/build-deqp-gl_Allow-running-on-Android-from-the-command-line.patch index dda871c00f1..9431941b733 100644 --- a/.gitlab-ci/container/patches/build-deqp-gl_Allow-running-on-Android-from-the-command-line.patch +++ b/.gitlab-ci/container/patches/build-deqp-gl_Allow-running-on-Android-from-the-command-line.patch @@ -14,13 +14,13 @@ $ ninja -C build modules/egl/deqp-egl Signed-off-by: Tomeu Vizoso --- - CMakeLists.txt | 36 ++----------------- - .../android/tcuAndroidNativeActivity.cpp | 36 ++++++++++--------- - .../platform/android/tcuAndroidPlatform.cpp | 12 ++++++- - 3 files changed, 33 insertions(+), 51 deletions(-) + 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 f9c61d0db..d6ad2990b 100644 +index eb58cc7ba..98b8fc6cc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -272,7 +272,7 @@ include_directories( @@ -36,6 +36,15 @@ index f9c61d0db..d6ad2990b 100644 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 diff --git a/.gitlab-ci/container/patches/build-deqp-gles_Allow-running-on-Android-from-the-command-line.patch b/.gitlab-ci/container/patches/build-deqp-gles_Allow-running-on-Android-from-the-command-line.patch index dda871c00f1..9431941b733 100644 --- a/.gitlab-ci/container/patches/build-deqp-gles_Allow-running-on-Android-from-the-command-line.patch +++ b/.gitlab-ci/container/patches/build-deqp-gles_Allow-running-on-Android-from-the-command-line.patch @@ -14,13 +14,13 @@ $ ninja -C build modules/egl/deqp-egl Signed-off-by: Tomeu Vizoso --- - CMakeLists.txt | 36 ++----------------- - .../android/tcuAndroidNativeActivity.cpp | 36 ++++++++++--------- - .../platform/android/tcuAndroidPlatform.cpp | 12 ++++++- - 3 files changed, 33 insertions(+), 51 deletions(-) + 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 f9c61d0db..d6ad2990b 100644 +index eb58cc7ba..98b8fc6cc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -272,7 +272,7 @@ include_directories( @@ -36,6 +36,15 @@ index f9c61d0db..d6ad2990b 100644 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 diff --git a/.gitlab-ci/cuttlefish-runner.sh b/.gitlab-ci/cuttlefish-runner.sh index 18deee6aae9..562de581cf2 100755 --- a/.gitlab-ci/cuttlefish-runner.sh +++ b/.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 diff --git a/.gitlab-ci/deqp-runner.sh b/.gitlab-ci/deqp-runner.sh index 594ac993e7d..8b8d235e73c 100755 --- a/.gitlab-ci/deqp-runner.sh +++ b/.gitlab-ci/deqp-runner.sh @@ -62,13 +62,13 @@ if [ -z "$DEQP_SUITE" ]; then MUSTPASS=/deqp/mustpass/vk-master.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-master.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-master.txt + MUSTPASS=/deqp/mustpass/$DEQP_VER-main.txt DEQP=/deqp/external/openglcts/modules/glcts else - MUSTPASS=/deqp/mustpass/$DEQP_VER-master.txt + MUSTPASS=/deqp/mustpass/$DEQP_VER-main.txt DEQP=/deqp/external/openglcts/modules/glcts fi diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 9df837f5089..904baba9098 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -24,10 +24,10 @@ 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: "20240301-patches" - DEBIAN_X86_64_TEST_GL_TAG: "20240301-patches" + DEBIAN_X86_64_TEST_ANDROID_TAG: "20240302-gl-gles" + DEBIAN_X86_64_TEST_GL_TAG: "20240302-gl-gles" DEBIAN_X86_64_TEST_VK_TAG: "20240301-patches" - KERNEL_ROOTFS_TAG: "20240301-patches" + KERNEL_ROOTFS_TAG: "20240302-gl-gles" ALPINE_X86_64_BUILD_TAG: "20240208-libclc-5" ALPINE_X86_64_LAVA_SSH_TAG: "20230626-v1" diff --git a/src/amd/ci/deqp-radeonsi-stoney.toml b/src/amd/ci/deqp-radeonsi-stoney.toml index be03a476902..f2fe9c801f4 100644 --- a/src/amd/ci/deqp-radeonsi-stoney.toml +++ b/src/amd/ci/deqp-radeonsi-stoney.toml @@ -1,9 +1,9 @@ [[deqp]] deqp = "/deqp/external/openglcts/modules/glcts" caselists = [ - "/deqp/mustpass/gles2-master.txt", - "/deqp/mustpass/gles3-master.txt", - "/deqp/mustpass/gles31-master.txt", + "/deqp/mustpass/gles2-main.txt", + "/deqp/mustpass/gles3-main.txt", + "/deqp/mustpass/gles31-main.txt", ] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", diff --git a/src/amd/ci/deqp-radeonsi-vangogh.toml b/src/amd/ci/deqp-radeonsi-vangogh.toml index 9ff025a88d6..ee404b20db5 100644 --- a/src/amd/ci/deqp-radeonsi-vangogh.toml +++ b/src/amd/ci/deqp-radeonsi-vangogh.toml @@ -3,13 +3,13 @@ deqp = "/deqp/external/openglcts/modules/glcts" caselists = [ # The GL* tests include the tests for the previous versions, but the GLES* # tests don't. - "/deqp/mustpass/gles2-master.txt", - "/deqp/mustpass/gles3-master.txt", - "/deqp/mustpass/gles31-master.txt", - "/deqp/mustpass/gles2-khr-master.txt", - "/deqp/mustpass/gles3-khr-master.txt", - "/deqp/mustpass/gles31-khr-master.txt", - "/deqp/mustpass/gl46-master.txt", + "/deqp/mustpass/gles2-main.txt", + "/deqp/mustpass/gles3-main.txt", + "/deqp/mustpass/gles31-main.txt", + "/deqp/mustpass/gles2-khr-main.txt", + "/deqp/mustpass/gles3-khr-main.txt", + "/deqp/mustpass/gles31-khr-main.txt", + "/deqp/mustpass/gl46-main.txt", "/deqp/mustpass/gl46-khr-single.txt", ] deqp_args = [ diff --git a/src/amd/ci/deqp-radv-stoney-angle-full.toml b/src/amd/ci/deqp-radv-stoney-angle-full.toml index b252321d30e..07659b43444 100644 --- a/src/amd/ci/deqp-radv-stoney-angle-full.toml +++ b/src/amd/ci/deqp-radv-stoney-angle-full.toml @@ -1,7 +1,7 @@ # Basic test set [[deqp]] deqp = "/deqp/modules/gles2/deqp-gles2" -caselists = ["/deqp/mustpass/gles2-master.txt"] +caselists = ["/deqp/mustpass/gles2-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -12,7 +12,7 @@ renderer_check = "ANGLE.*RADV" [[deqp]] deqp = "/deqp/modules/gles3/deqp-gles3" -caselists = ["/deqp/mustpass/gles3-master.txt"] +caselists = ["/deqp/mustpass/gles3-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -21,7 +21,7 @@ deqp_args = [ [[deqp]] deqp = "/deqp/modules/gles31/deqp-gles31" -caselists = ["/deqp/mustpass/gles31-master.txt"] +caselists = ["/deqp/mustpass/gles31-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -34,9 +34,9 @@ deqp_args = [ [[deqp]] deqp = "/deqp/external/openglcts/modules/glcts" caselists = [ - "/deqp/mustpass/gles2-khr-master.txt", - "/deqp/mustpass/gles3-khr-master.txt", - "/deqp/mustpass/gles31-khr-master.txt", + "/deqp/mustpass/gles2-khr-main.txt", + "/deqp/mustpass/gles3-khr-main.txt", + "/deqp/mustpass/gles31-khr-main.txt", ] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", diff --git a/src/amd/ci/deqp-radv-stoney-angle.toml b/src/amd/ci/deqp-radv-stoney-angle.toml index 97e86f5f546..323c5e06ba5 100644 --- a/src/amd/ci/deqp-radv-stoney-angle.toml +++ b/src/amd/ci/deqp-radv-stoney-angle.toml @@ -1,7 +1,7 @@ # Basic test set [[deqp]] deqp = "/deqp/modules/gles2/deqp-gles2" -caselists = ["/deqp/mustpass/gles2-master.txt"] +caselists = ["/deqp/mustpass/gles2-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -13,7 +13,7 @@ renderer_check = "ANGLE.*RADV" [[deqp]] deqp = "/deqp/modules/gles3/deqp-gles3" -caselists = ["/deqp/mustpass/gles3-master.txt"] +caselists = ["/deqp/mustpass/gles3-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -23,7 +23,7 @@ fraction = 12 [[deqp]] deqp = "/deqp/modules/gles31/deqp-gles31" -caselists = ["/deqp/mustpass/gles31-master.txt"] +caselists = ["/deqp/mustpass/gles31-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -37,9 +37,9 @@ fraction = 12 [[deqp]] deqp = "/deqp/external/openglcts/modules/glcts" caselists = [ - "/deqp/mustpass/gles2-khr-master.txt", - "/deqp/mustpass/gles3-khr-master.txt", - "/deqp/mustpass/gles31-khr-master.txt", + "/deqp/mustpass/gles2-khr-main.txt", + "/deqp/mustpass/gles3-khr-main.txt", + "/deqp/mustpass/gles31-khr-main.txt", ] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", diff --git a/src/broadcom/ci/broadcom-rpi3-fails.txt b/src/broadcom/ci/broadcom-rpi3-fails.txt index a7b6baa819b..c492ca64e0f 100644 --- a/src/broadcom/ci/broadcom-rpi3-fails.txt +++ b/src/broadcom/ci/broadcom-rpi3-fails.txt @@ -1192,10 +1192,6 @@ spec@ext_framebuffer_multisample@unaligned-blit 4 stencil msaa,Fail # https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/817 spec@intel_performance_query@intel_performance_query-issue_2235,Fail -# New CTS failures in 1.3.6.3 -wayland-dEQP-EGL.functional.fence_sync.valid.egl_fence_persistent_buffer,Crash -x11-dEQP-EGL.functional.fence_sync.valid.egl_fence_persistent_buffer,Crash - # Bisected to 35ae5dce39c ("mesa: don't pass Infs to the shader via gl_Fog.scale") spec@glsl-1.10@execution@glsl-1.10-built-in-uniform-state,Fail diff --git a/src/broadcom/ci/deqp-broadcom-rpi3.toml b/src/broadcom/ci/deqp-broadcom-rpi3.toml index faeae92ce72..e47503f4221 100644 --- a/src/broadcom/ci/deqp-broadcom-rpi3.toml +++ b/src/broadcom/ci/deqp-broadcom-rpi3.toml @@ -1,8 +1,8 @@ [[deqp]] deqp = "/deqp/external/openglcts/modules/glcts" caselists = [ - "/deqp/mustpass/gles2-master.txt", - "/deqp/mustpass/gles2-khr-master.txt", + "/deqp/mustpass/gles2-main.txt", + "/deqp/mustpass/gles2-khr-main.txt", ] tests_per_group = 250 deqp_args = [ @@ -32,7 +32,7 @@ process_isolation = true # wayland [[deqp]] deqp = "/deqp/modules/egl/deqp-egl-wayland" -caselists = ["/deqp/mustpass/egl-master.txt"] +caselists = ["/deqp/mustpass/egl-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -43,7 +43,7 @@ prefix = "wayland-" # x11 [[deqp]] deqp = "/deqp/modules/egl/deqp-egl-x11" -caselists = ["/deqp/mustpass/egl-master.txt"] +caselists = ["/deqp/mustpass/egl-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", diff --git a/src/broadcom/ci/deqp-broadcom-rpi4.toml b/src/broadcom/ci/deqp-broadcom-rpi4.toml index f4a1b7b724d..c61fdbf2bce 100644 --- a/src/broadcom/ci/deqp-broadcom-rpi4.toml +++ b/src/broadcom/ci/deqp-broadcom-rpi4.toml @@ -1,13 +1,13 @@ [[deqp]] deqp = "/deqp/external/openglcts/modules/glcts" caselists = [ - "/deqp/mustpass/gles31-master.txt", - "/deqp/mustpass/gles3-master.txt", - "/deqp/mustpass/gles2-master.txt", - "/deqp/mustpass/gles31-khr-master.txt", - "/deqp/mustpass/gles3-khr-master.txt", - "/deqp/mustpass/gles2-khr-master.txt", - "/deqp/mustpass/gl31-master.txt", + "/deqp/mustpass/gles31-main.txt", + "/deqp/mustpass/gles3-main.txt", + "/deqp/mustpass/gles2-main.txt", + "/deqp/mustpass/gles31-khr-main.txt", + "/deqp/mustpass/gles3-khr-main.txt", + "/deqp/mustpass/gles2-khr-main.txt", + "/deqp/mustpass/gl31-main.txt", ] deqp_args = [ "--deqp-gl-config-name=rgba8888d24s8ms0", @@ -29,7 +29,7 @@ process_isolation = true # wayland [[deqp]] deqp = "/deqp/modules/egl/deqp-egl-wayland" -caselists = ["/deqp/mustpass/egl-master.txt"] +caselists = ["/deqp/mustpass/egl-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -40,7 +40,7 @@ prefix = "wayland-" # x11 [[deqp]] deqp = "/deqp/modules/egl/deqp-egl-x11" -caselists = ["/deqp/mustpass/egl-master.txt"] +caselists = ["/deqp/mustpass/egl-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", diff --git a/src/freedreno/ci/deqp-freedreno-a307.toml b/src/freedreno/ci/deqp-freedreno-a307.toml index 00d266e8318..2546d54aa49 100644 --- a/src/freedreno/ci/deqp-freedreno-a307.toml +++ b/src/freedreno/ci/deqp-freedreno-a307.toml @@ -1,7 +1,7 @@ # Basic test set [[deqp]] deqp = "/deqp/modules/gles2/deqp-gles2" -caselists = ["/deqp/mustpass/gles2-master.txt"] +caselists = ["/deqp/mustpass/gles2-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -12,7 +12,7 @@ renderer_check = "FD307" [[deqp]] deqp = "/deqp/modules/gles3/deqp-gles3" -caselists = ["/deqp/mustpass/gles3-master.txt"] +caselists = ["/deqp/mustpass/gles3-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -24,7 +24,7 @@ deqp_args = [ deqp = "/deqp/external/openglcts/modules/glcts" # Not doing GLES3 because of a lot of GPU hangs. caselists = [ - "/deqp/mustpass/gles2-khr-master.txt", + "/deqp/mustpass/gles2-khr-main.txt", ] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -35,7 +35,7 @@ deqp_args = [ # Check that the non-constbuf UBO case works. [[deqp]] deqp = "/deqp/modules/gles3/deqp-gles3" -caselists = ["/deqp/mustpass/gles3-master.txt"] +caselists = ["/deqp/mustpass/gles3-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", diff --git a/src/freedreno/ci/deqp-freedreno-a530.toml b/src/freedreno/ci/deqp-freedreno-a530.toml index edbbeda2c86..63114c5e818 100644 --- a/src/freedreno/ci/deqp-freedreno-a530.toml +++ b/src/freedreno/ci/deqp-freedreno-a530.toml @@ -1,7 +1,7 @@ # Basic test set [[deqp]] deqp = "/deqp/modules/gles2/deqp-gles2" -caselists = ["/deqp/mustpass/gles2-master.txt"] +caselists = ["/deqp/mustpass/gles2-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -12,7 +12,7 @@ renderer_check = "FD530" [[deqp]] deqp = "/deqp/modules/gles3/deqp-gles3" -caselists = ["/deqp/mustpass/gles3-master.txt"] +caselists = ["/deqp/mustpass/gles3-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -22,7 +22,7 @@ fraction = 2 [[deqp]] deqp = "/deqp/modules/gles31/deqp-gles31" -caselists = ["/deqp/mustpass/gles31-master.txt"] +caselists = ["/deqp/mustpass/gles31-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -33,9 +33,9 @@ fraction = 2 [[deqp]] deqp = "/deqp/external/openglcts/modules/glcts" caselists = [ - "/deqp/mustpass/gles2-khr-master.txt", - "/deqp/mustpass/gles3-khr-master.txt", - "/deqp/mustpass/gles31-khr-master.txt", + "/deqp/mustpass/gles2-khr-main.txt", + "/deqp/mustpass/gles3-khr-main.txt", + "/deqp/mustpass/gles31-khr-main.txt", ] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", diff --git a/src/freedreno/ci/deqp-freedreno-a618-egl.toml b/src/freedreno/ci/deqp-freedreno-a618-egl.toml index 38dfd7c716e..b4ec4fdbd1d 100644 --- a/src/freedreno/ci/deqp-freedreno-a618-egl.toml +++ b/src/freedreno/ci/deqp-freedreno-a618-egl.toml @@ -1,7 +1,7 @@ # x11 [[deqp]] deqp = "/deqp/modules/egl/deqp-egl-x11" -caselists = ["/deqp/mustpass/egl-master.txt"] +caselists = ["/deqp/mustpass/egl-main.txt"] skips = ["install/freedreno-a618-premerge-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -11,7 +11,7 @@ deqp_args = [ [[deqp]] deqp = "/deqp/modules/egl/deqp-egl-wayland" -caselists = ["/deqp/mustpass/egl-master.txt"] +caselists = ["/deqp/mustpass/egl-main.txt"] skips = ["install/freedreno-a618-premerge-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", diff --git a/src/freedreno/ci/deqp-freedreno-a618.toml b/src/freedreno/ci/deqp-freedreno-a618.toml index c6595fb40cf..3c65cf6afdf 100644 --- a/src/freedreno/ci/deqp-freedreno-a618.toml +++ b/src/freedreno/ci/deqp-freedreno-a618.toml @@ -1,7 +1,7 @@ # Basic test set [[deqp]] deqp = "/deqp/modules/gles2/deqp-gles2" -caselists = ["/deqp/mustpass/gles2-master.txt"] +caselists = ["/deqp/mustpass/gles2-main.txt"] skips = ["install/freedreno-a618-premerge-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -13,7 +13,7 @@ renderer_check = "FD618" [[deqp]] deqp = "/deqp/modules/gles3/deqp-gles3" -caselists = ["/deqp/mustpass/gles3-master.txt"] +caselists = ["/deqp/mustpass/gles3-main.txt"] skips = ["install/freedreno-a618-premerge-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -23,7 +23,7 @@ deqp_args = [ [[deqp]] deqp = "/deqp/modules/gles31/deqp-gles31" -caselists = ["/deqp/mustpass/gles31-master.txt"] +caselists = ["/deqp/mustpass/gles31-main.txt"] skips = ["install/freedreno-a618-premerge-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -37,10 +37,10 @@ deqp_args = [ [[deqp]] deqp = "/deqp/external/openglcts/modules/glcts" caselists = [ - "/deqp/mustpass/gles2-khr-master.txt", - "/deqp/mustpass/gles3-khr-master.txt", - "/deqp/mustpass/gles31-khr-master.txt", - "/deqp/mustpass/gl46-master.txt", + "/deqp/mustpass/gles2-khr-main.txt", + "/deqp/mustpass/gles3-khr-main.txt", + "/deqp/mustpass/gles31-khr-main.txt", + "/deqp/mustpass/gl46-main.txt", ] skips = ["install/freedreno-a618-premerge-skips.txt"] deqp_args = [ @@ -53,7 +53,7 @@ deqp_args = [ # force-gmem testing [[deqp]] deqp = "/deqp/modules/gles31/deqp-gles31" -caselists = ["/deqp/mustpass/gles31-master.txt"] +caselists = ["/deqp/mustpass/gles31-main.txt"] skips = ["install/freedreno-a618-premerge-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -69,7 +69,7 @@ FD_MESA_DEBUG = "gmem" # force-bypass testing [[deqp]] deqp = "/deqp/modules/gles31/deqp-gles31" -caselists = ["/deqp/mustpass/gles31-master.txt"] +caselists = ["/deqp/mustpass/gles31-main.txt"] skips = ["install/freedreno-a618-premerge-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -85,7 +85,7 @@ FD_MESA_DEBUG = "sysmem" # noubo testing [[deqp]] deqp = "/deqp/modules/gles31/deqp-gles31" -caselists = ["/deqp/mustpass/gles31-master.txt"] +caselists = ["/deqp/mustpass/gles31-main.txt"] skips = ["install/freedreno-a618-premerge-skips.txt"] include = ["functional.*ubo"] deqp_args = [ @@ -147,7 +147,7 @@ prefix = "multisample-" # spilling testing [[deqp]] deqp = "/deqp/modules/gles2/deqp-gles2" -caselists = ["/deqp/mustpass/gles2-master.txt"] +caselists = ["/deqp/mustpass/gles2-main.txt"] skips = ["install/freedreno-a618-premerge-skips.txt"] include = ["functional.shaders"] deqp_args = [ diff --git a/src/freedreno/ci/deqp-freedreno-a630.toml b/src/freedreno/ci/deqp-freedreno-a630.toml index 600fb1b44d4..22cbb52fb36 100644 --- a/src/freedreno/ci/deqp-freedreno-a630.toml +++ b/src/freedreno/ci/deqp-freedreno-a630.toml @@ -1,7 +1,7 @@ # Basic test set [[deqp]] deqp = "/deqp/modules/gles2/deqp-gles2" -caselists = ["/deqp/mustpass/gles2-master.txt"] +caselists = ["/deqp/mustpass/gles2-main.txt"] skips = ["install/freedreno-a630-premerge-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -13,7 +13,7 @@ renderer_check = "FD630" [[deqp]] deqp = "/deqp/modules/gles3/deqp-gles3" -caselists = ["/deqp/mustpass/gles3-master.txt"] +caselists = ["/deqp/mustpass/gles3-main.txt"] skips = ["install/freedreno-a630-premerge-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -23,7 +23,7 @@ deqp_args = [ [[deqp]] deqp = "/deqp/modules/gles31/deqp-gles31" -caselists = ["/deqp/mustpass/gles31-master.txt"] +caselists = ["/deqp/mustpass/gles31-main.txt"] skips = ["install/freedreno-a630-premerge-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -37,10 +37,10 @@ deqp_args = [ [[deqp]] deqp = "/deqp/external/openglcts/modules/glcts" caselists = [ - "/deqp/mustpass/gles2-khr-master.txt", - "/deqp/mustpass/gles3-khr-master.txt", - "/deqp/mustpass/gles31-khr-master.txt", - "/deqp/mustpass/gl46-master.txt", + "/deqp/mustpass/gles2-khr-main.txt", + "/deqp/mustpass/gles3-khr-main.txt", + "/deqp/mustpass/gles31-khr-main.txt", + "/deqp/mustpass/gl46-main.txt", ] skips = ["install/freedreno-a630-premerge-skips.txt"] deqp_args = [ @@ -52,7 +52,7 @@ deqp_args = [ # x11 [[deqp]] deqp = "/deqp/modules/egl/deqp-egl-x11" -caselists = ["/deqp/mustpass/egl-master.txt"] +caselists = ["/deqp/mustpass/egl-main.txt"] skips = ["install/freedreno-a630-premerge-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -62,7 +62,7 @@ deqp_args = [ [[deqp]] deqp = "/deqp/modules/egl/deqp-egl-wayland" -caselists = ["/deqp/mustpass/egl-master.txt"] +caselists = ["/deqp/mustpass/egl-main.txt"] skips = ["install/freedreno-a630-premerge-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -74,7 +74,7 @@ prefix = "wayland-" # force-gmem testing [[deqp]] deqp = "/deqp/modules/gles31/deqp-gles31" -caselists = ["/deqp/mustpass/gles31-master.txt"] +caselists = ["/deqp/mustpass/gles31-main.txt"] skips = ["install/freedreno-a630-premerge-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -90,7 +90,7 @@ FD_MESA_DEBUG = "gmem" # force-bypass testing [[deqp]] deqp = "/deqp/modules/gles31/deqp-gles31" -caselists = ["/deqp/mustpass/gles31-master.txt"] +caselists = ["/deqp/mustpass/gles31-main.txt"] skips = ["install/freedreno-a630-premerge-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -108,7 +108,7 @@ FD_MESA_DEBUG = "sysmem" # noubo testing [[deqp]] deqp = "/deqp/modules/gles31/deqp-gles31" -caselists = ["/deqp/mustpass/gles31-master.txt"] +caselists = ["/deqp/mustpass/gles31-main.txt"] skips = ["install/freedreno-a630-premerge-skips.txt"] include = ["functional.*ubo"] deqp_args = [ @@ -170,7 +170,7 @@ prefix = "multisample-" # spilling testing [[deqp]] deqp = "/deqp/modules/gles2/deqp-gles2" -caselists = ["/deqp/mustpass/gles2-master.txt"] +caselists = ["/deqp/mustpass/gles2-main.txt"] skips = ["install/freedreno-a630-premerge-skips.txt"] include = ["functional.shaders"] deqp_args = [ diff --git a/src/freedreno/ci/deqp-freedreno-a660.toml b/src/freedreno/ci/deqp-freedreno-a660.toml index e46c1cf5057..fda131bc8c9 100644 --- a/src/freedreno/ci/deqp-freedreno-a660.toml +++ b/src/freedreno/ci/deqp-freedreno-a660.toml @@ -1,7 +1,7 @@ # Basic test set [[deqp]] deqp = "/deqp/modules/gles2/deqp-gles2" -caselists = ["/deqp/mustpass/gles2-master.txt"] +caselists = ["/deqp/mustpass/gles2-main.txt"] skips = ["install/freedreno-a660-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -13,7 +13,7 @@ renderer_check = "FD660" [[deqp]] deqp = "/deqp/modules/gles3/deqp-gles3" -caselists = ["/deqp/mustpass/gles3-master.txt"] +caselists = ["/deqp/mustpass/gles3-main.txt"] skips = ["install/freedreno-a660-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -23,7 +23,7 @@ deqp_args = [ [[deqp]] deqp = "/deqp/modules/gles31/deqp-gles31" -caselists = ["/deqp/mustpass/gles31-master.txt"] +caselists = ["/deqp/mustpass/gles31-main.txt"] skips = ["install/freedreno-a660-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -37,10 +37,10 @@ deqp_args = [ [[deqp]] deqp = "/deqp/external/openglcts/modules/glcts" caselists = [ - "/deqp/mustpass/gles2-khr-master.txt", - "/deqp/mustpass/gles3-khr-master.txt", - "/deqp/mustpass/gles31-khr-master.txt", - "/deqp/mustpass/gl46-master.txt", + "/deqp/mustpass/gles2-khr-main.txt", + "/deqp/mustpass/gles3-khr-main.txt", + "/deqp/mustpass/gles31-khr-main.txt", + "/deqp/mustpass/gl46-main.txt", ] skips = ["install/freedreno-a660-skips.txt"] deqp_args = [ @@ -53,7 +53,7 @@ deqp_args = [ # force-gmem testing [[deqp]] deqp = "/deqp/modules/gles31/deqp-gles31" -caselists = ["/deqp/mustpass/gles31-master.txt"] +caselists = ["/deqp/mustpass/gles31-main.txt"] skips = ["install/freedreno-a660-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -69,7 +69,7 @@ FD_MESA_DEBUG = "gmem" # force-bypass testing [[deqp]] deqp = "/deqp/modules/gles31/deqp-gles31" -caselists = ["/deqp/mustpass/gles31-master.txt"] +caselists = ["/deqp/mustpass/gles31-main.txt"] skips = ["install/freedreno-a660-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -85,7 +85,7 @@ FD_MESA_DEBUG = "sysmem" # noubo testing [[deqp]] deqp = "/deqp/modules/gles31/deqp-gles31" -caselists = ["/deqp/mustpass/gles31-master.txt"] +caselists = ["/deqp/mustpass/gles31-main.txt"] skips = ["install/freedreno-a660-skips.txt"] include = ["functional.*ubo"] deqp_args = [ @@ -147,7 +147,7 @@ prefix = "multisample-" # spilling testing [[deqp]] deqp = "/deqp/modules/gles2/deqp-gles2" -caselists = ["/deqp/mustpass/gles2-master.txt"] +caselists = ["/deqp/mustpass/gles2-main.txt"] skips = ["install/freedreno-a660-skips.txt"] include = ["functional.shaders"] deqp_args = [ diff --git a/src/freedreno/ci/freedreno-a618-fails.txt b/src/freedreno/ci/freedreno-a618-fails.txt index a2aee6699a7..eb9fc37e01e 100644 --- a/src/freedreno/ci/freedreno-a618-fails.txt +++ b/src/freedreno/ci/freedreno-a618-fails.txt @@ -20,6 +20,8 @@ KHR-GL46.shader_image_load_store.basic-allFormats-store,Fail KHR-GL46.shader_image_load_store.basic-allTargets-store,Fail KHR-GL46.shading_language_420pack.binding_images,Fail +dEQP-GLES31.functional.texture.border_clamp.range_clamp.linear_float_color,Fail + # https://gitlab.freedesktop.org/mesa/mesa/-/issues/5582 KHR-GLES31.core.texture_cube_map_array.color_depth_attachments,Fail KHR-GL46.texture_cube_map_array.color_depth_attachments,Fail diff --git a/src/freedreno/ci/freedreno-a630-fails.txt b/src/freedreno/ci/freedreno-a630-fails.txt index a031d5498c5..ab9612d45c6 100644 --- a/src/freedreno/ci/freedreno-a630-fails.txt +++ b/src/freedreno/ci/freedreno-a630-fails.txt @@ -28,6 +28,8 @@ KHR-GLES31.core.tessellation_shader.tessellation_shader_tc_barriers.barrier_guar KHR-GLES31.core.texture_cube_map_array.color_depth_attachments,Fail KHR-GL46.texture_cube_map_array.color_depth_attachments,Fail +dEQP-GLES31.functional.texture.border_clamp.range_clamp.linear_float_color,Fail + # # new fails with gl45: # diff --git a/src/freedreno/ci/freedreno-a660-fails.txt b/src/freedreno/ci/freedreno-a660-fails.txt index df1c87fad0e..902b35c68de 100644 --- a/src/freedreno/ci/freedreno-a660-fails.txt +++ b/src/freedreno/ci/freedreno-a660-fails.txt @@ -4,6 +4,8 @@ KHR-GL46.multi_bind.dispatch_bind_image_textures,Fail KHR-GL46.shader_image_load_store.basic-allTargets-store,Fail KHR-GL46.shader_subroutine.control_flow_and_returned_subroutine_values_used_as_subroutine_input,Fail +dEQP-GLES31.functional.texture.border_clamp.range_clamp.linear_float_color,Fail + # Fails when TU_DEBUG=forcebin is set gmem-dEQP-VK.spirv_assembly.instruction.graphics.variable_pointers.graphics.writes_two_buffers_vert,Fail diff --git a/src/gallium/drivers/crocus/ci/deqp-crocus-g41.toml b/src/gallium/drivers/crocus/ci/deqp-crocus-g41.toml index c59f4798a71..a082f4534ca 100644 --- a/src/gallium/drivers/crocus/ci/deqp-crocus-g41.toml +++ b/src/gallium/drivers/crocus/ci/deqp-crocus-g41.toml @@ -1,6 +1,6 @@ [[deqp]] deqp = "/deqp/modules/gles2/deqp-gles2" -caselists = ["/deqp/mustpass/gles2-master.txt"] +caselists = ["/deqp/mustpass/gles2-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -13,7 +13,7 @@ renderer_check = "Intel.*G41" [[deqp]] deqp = "/deqp/external/openglcts/modules/glcts" -caselists = ["/deqp/mustpass/gles2-khr-master.txt"] +caselists = ["/deqp/mustpass/gles2-khr-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", diff --git a/src/gallium/drivers/crocus/ci/deqp-crocus-hsw.toml b/src/gallium/drivers/crocus/ci/deqp-crocus-hsw.toml index 968e114e3ec..e73aecbcd1f 100644 --- a/src/gallium/drivers/crocus/ci/deqp-crocus-hsw.toml +++ b/src/gallium/drivers/crocus/ci/deqp-crocus-hsw.toml @@ -1,6 +1,6 @@ [[deqp]] deqp = "/deqp/modules/gles2/deqp-gles2" -caselists = ["/deqp/mustpass/gles2-master.txt"] +caselists = ["/deqp/mustpass/gles2-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -13,7 +13,7 @@ renderer_check = "Intel.*HSW GT2" [[deqp]] deqp = "/deqp/modules/gles3/deqp-gles3" -caselists = ["/deqp/mustpass/gles3-master.txt"] +caselists = ["/deqp/mustpass/gles3-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -26,7 +26,7 @@ renderer_check = "Intel.*HSW GT2" [[deqp]] deqp = "/deqp/modules/gles31/deqp-gles31" -caselists = ["/deqp/mustpass/gles31-master.txt"] +caselists = ["/deqp/mustpass/gles31-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -40,9 +40,9 @@ renderer_check = "Intel.*HSW GT2" [[deqp]] deqp = "/deqp/external/openglcts/modules/glcts" caselists = [ - "/deqp/mustpass/gles2-khr-master.txt", - "/deqp/mustpass/gles3-khr-master.txt", - "/deqp/mustpass/gles31-khr-master.txt" + "/deqp/mustpass/gles2-khr-main.txt", + "/deqp/mustpass/gles3-khr-main.txt", + "/deqp/mustpass/gles31-khr-main.txt" ] deqp_args = [ "--deqp-surface-width=256", @@ -54,7 +54,7 @@ deqp_args = [ [[deqp]] deqp = "/deqp/external/openglcts/modules/glcts" -caselists = ["/deqp/mustpass/gl46-master.txt"] +caselists = ["/deqp/mustpass/gl46-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", diff --git a/src/gallium/drivers/i915/ci/deqp-i915g.toml b/src/gallium/drivers/i915/ci/deqp-i915g.toml index ef5d9c0639a..6451e743a0b 100644 --- a/src/gallium/drivers/i915/ci/deqp-i915g.toml +++ b/src/gallium/drivers/i915/ci/deqp-i915g.toml @@ -1,6 +1,6 @@ [[deqp]] deqp = "/deqp/modules/gles2/deqp-gles2" -caselists = ["/deqp/mustpass/gles2-master.txt"] +caselists = ["/deqp/mustpass/gles2-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -13,7 +13,7 @@ renderer_check = "i915" [[deqp]] deqp = "/deqp/external/openglcts/modules/glcts" -caselists = ["/deqp/mustpass/gles2-khr-master.txt"] +caselists = ["/deqp/mustpass/gles2-khr-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", diff --git a/src/gallium/drivers/lima/ci/deqp-lima-mali450-deqp.toml b/src/gallium/drivers/lima/ci/deqp-lima-mali450-deqp.toml index a42b9644066..588edb95ab1 100644 --- a/src/gallium/drivers/lima/ci/deqp-lima-mali450-deqp.toml +++ b/src/gallium/drivers/lima/ci/deqp-lima-mali450-deqp.toml @@ -1,6 +1,6 @@ [[deqp]] deqp = "/deqp/modules/gles2/deqp-gles2" -caselists = ["/deqp/mustpass/gles2-master.txt"] +caselists = ["/deqp/mustpass/gles2-main.txt"] tests_per_group = 250 deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -13,7 +13,7 @@ renderer_check = "Mali450" # wayland [[deqp]] deqp = "/deqp/modules/egl/deqp-egl-wayland" -caselists = ["/deqp/mustpass/egl-master.txt"] +caselists = ["/deqp/mustpass/egl-main.txt"] tests_per_group = 250 deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -25,7 +25,7 @@ prefix = "wayland-" # x11 [[deqp]] deqp = "/deqp/modules/egl/deqp-egl-x11" -caselists = ["/deqp/mustpass/egl-master.txt"] +caselists = ["/deqp/mustpass/egl-main.txt"] tests_per_group = 250 deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", diff --git a/src/gallium/drivers/lima/ci/lima-fails.txt b/src/gallium/drivers/lima/ci/lima-fails.txt index c219fcaabb7..5dcb3439a22 100644 --- a/src/gallium/drivers/lima/ci/lima-fails.txt +++ b/src/gallium/drivers/lima/ci/lima-fails.txt @@ -662,10 +662,9 @@ spec@!opengl 1.1@line-smooth-stipple,Fail # bookworm update spec@ext_framebuffer_multisample@renderbufferstorage-samples,Fail -# New CTS failures in 1.3.6.3 -wayland-dEQP-EGL.functional.fence_sync.valid.egl_fence_persistent_buffer,Crash -x11-dEQP-EGL.functional.fence_sync.valid.egl_fence_persistent_buffer,Crash - # remove this after https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/843 # is merged and piglit is updated spec@glsl-1.10@execution@glsl-1.10-built-in-uniform-state,Fail + +x11-dEQP-EGL.functional.wide_color.pbuffer_888_colorspace_srgb,Fail +x11-dEQP-EGL.functional.wide_color.window_888_colorspace_srgb,Fail diff --git a/src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe-asan.toml b/src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe-asan.toml index 1236d230a82..414c96bca74 100644 --- a/src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe-asan.toml +++ b/src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe-asan.toml @@ -1,7 +1,7 @@ [[deqp]] deqp = "/deqp/modules/gles31/deqp-gles31" -caselists = ["/deqp/mustpass/gles31-master.txt"] +caselists = ["/deqp/mustpass/gles31-main.txt"] skips = ["install/llvmpipe-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", diff --git a/src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe.toml b/src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe.toml index 757956fb296..cbf76f58474 100644 --- a/src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe.toml +++ b/src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe.toml @@ -1,6 +1,6 @@ [[deqp]] deqp = "/deqp/modules/gles2/deqp-gles2" -caselists = ["/deqp/mustpass/gles2-master.txt"] +caselists = ["/deqp/mustpass/gles2-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -13,7 +13,7 @@ renderer_check = "llvmpipe" [[deqp]] deqp = "/deqp/modules/gles3/deqp-gles3" -caselists = ["/deqp/mustpass/gles3-master.txt"] +caselists = ["/deqp/mustpass/gles3-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -24,7 +24,7 @@ deqp_args = [ [[deqp]] deqp = "/deqp/modules/gles31/deqp-gles31" -caselists = ["/deqp/mustpass/gles31-master.txt"] +caselists = ["/deqp/mustpass/gles31-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -43,10 +43,10 @@ deqp_args = [ [[deqp]] deqp = "/deqp/external/openglcts/modules/glcts" caselists = [ - "/deqp/mustpass/gles2-khr-master.txt", - "/deqp/mustpass/gles3-khr-master.txt", - "/deqp/mustpass/gles31-khr-master.txt", - "/deqp/mustpass/gl45-master.txt", + "/deqp/mustpass/gles2-khr-main.txt", + "/deqp/mustpass/gles3-khr-main.txt", + "/deqp/mustpass/gles31-khr-main.txt", + "/deqp/mustpass/gl45-main.txt", "/deqp/mustpass/gl45-khr-single.txt", ] deqp_args = [ @@ -59,7 +59,7 @@ deqp_args = [ [[deqp]] deqp = "/deqp/modules/egl/deqp-egl-x11" -caselists = ["/deqp/mustpass/egl-master.txt"] +caselists = ["/deqp/mustpass/egl-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -70,7 +70,7 @@ deqp_args = [ [[deqp]] deqp = "/deqp/modules/egl/deqp-egl-wayland" -caselists = ["/deqp/mustpass/egl-master.txt"] +caselists = ["/deqp/mustpass/egl-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", diff --git a/src/gallium/drivers/nouveau/ci/deqp-nouveau-gk20a.toml b/src/gallium/drivers/nouveau/ci/deqp-nouveau-gk20a.toml index cd9e70f0299..50b19005ef6 100644 --- a/src/gallium/drivers/nouveau/ci/deqp-nouveau-gk20a.toml +++ b/src/gallium/drivers/nouveau/ci/deqp-nouveau-gk20a.toml @@ -1,6 +1,6 @@ [[deqp]] deqp = "/deqp/modules/gles2/deqp-gles2" -caselists = ["/deqp/mustpass/gles2-master.txt"] +caselists = ["/deqp/mustpass/gles2-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -13,7 +13,7 @@ version_check = "GL ES 3.2" [[deqp]] deqp = "/deqp/modules/gles3/deqp-gles3" -caselists = ["/deqp/mustpass/gles3-master.txt"] +caselists = ["/deqp/mustpass/gles3-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -24,7 +24,7 @@ deqp_args = [ [[deqp]] deqp = "/deqp/modules/gles31/deqp-gles31" -caselists = ["/deqp/mustpass/gles31-master.txt"] +caselists = ["/deqp/mustpass/gles31-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -36,9 +36,9 @@ deqp_args = [ [[deqp]] deqp = "/deqp/external/openglcts/modules/glcts" caselists = [ - "/deqp/mustpass/gles2-khr-master.txt", - "/deqp/mustpass/gles3-khr-master.txt", - "/deqp/mustpass/gles31-khr-master.txt" + "/deqp/mustpass/gles2-khr-main.txt", + "/deqp/mustpass/gles3-khr-main.txt", + "/deqp/mustpass/gles31-khr-main.txt" ] deqp_args = [ "--deqp-surface-width=256", diff --git a/src/gallium/drivers/nouveau/ci/deqp-nouveau-gm20b.toml b/src/gallium/drivers/nouveau/ci/deqp-nouveau-gm20b.toml index fcc98a603e8..28c93c6570a 100644 --- a/src/gallium/drivers/nouveau/ci/deqp-nouveau-gm20b.toml +++ b/src/gallium/drivers/nouveau/ci/deqp-nouveau-gm20b.toml @@ -1,6 +1,6 @@ [[deqp]] deqp = "/deqp/modules/gles2/deqp-gles2" -caselists = ["/deqp/mustpass/gles2-master.txt"] +caselists = ["/deqp/mustpass/gles2-main.txt"] skips = ["install/all-skips.txt", "install/nouveau-gm20b-skips.txt"] deqp_args = [ "--deqp-surface-width=256", @@ -14,7 +14,7 @@ version_check = "GL ES 3.2" [[deqp]] deqp = "/deqp/modules/gles3/deqp-gles3" -caselists = ["/deqp/mustpass/gles3-master.txt"] +caselists = ["/deqp/mustpass/gles3-main.txt"] skips = ["install/all-skips.txt", "install/nouveau-gm20b-skips.txt"] deqp_args = [ "--deqp-surface-width=256", @@ -26,7 +26,7 @@ deqp_args = [ [[deqp]] deqp = "/deqp/modules/gles31/deqp-gles31" -caselists = ["/deqp/mustpass/gles31-master.txt"] +caselists = ["/deqp/mustpass/gles31-main.txt"] skips = ["install/all-skips.txt", "install/nouveau-gm20b-skips.txt"] deqp_args = [ "--deqp-surface-width=256", @@ -39,9 +39,9 @@ deqp_args = [ [[deqp]] deqp = "/deqp/external/openglcts/modules/glcts" caselists = [ - "/deqp/mustpass/gles2-khr-master.txt", - "/deqp/mustpass/gles3-khr-master.txt", - "/deqp/mustpass/gles31-khr-master.txt" + "/deqp/mustpass/gles2-khr-main.txt", + "/deqp/mustpass/gles3-khr-main.txt", + "/deqp/mustpass/gles31-khr-main.txt" ] skips = ["install/all-skips.txt", "install/nouveau-gm20b-skips.txt"] deqp_args = [ diff --git a/src/gallium/drivers/r300/ci/deqp-r300-rv380.toml b/src/gallium/drivers/r300/ci/deqp-r300-rv380.toml index c70372efa70..049e5dcc849 100644 --- a/src/gallium/drivers/r300/ci/deqp-r300-rv380.toml +++ b/src/gallium/drivers/r300/ci/deqp-r300-rv380.toml @@ -4,8 +4,8 @@ renderer_check = "RV370" [[deqp]] deqp = "/deqp/external/openglcts/modules/glcts" caselists = [ - "/deqp/mustpass/gles2-khr-master.txt", - "/deqp/mustpass/gles2-master.txt", + "/deqp/mustpass/gles2-khr-main.txt", + "/deqp/mustpass/gles2-main.txt", ] deqp_args = [ "--deqp-surface-width=256", diff --git a/src/gallium/drivers/r300/ci/deqp-r300-rv530.toml b/src/gallium/drivers/r300/ci/deqp-r300-rv530.toml index 0aa8b16834c..2b21201ecda 100644 --- a/src/gallium/drivers/r300/ci/deqp-r300-rv530.toml +++ b/src/gallium/drivers/r300/ci/deqp-r300-rv530.toml @@ -1,6 +1,6 @@ [[deqp]] deqp = "/deqp/modules/gles2/deqp-gles2" -caselists = ["/deqp/mustpass/gles2-master.txt"] +caselists = ["/deqp/mustpass/gles2-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -13,7 +13,7 @@ renderer_check = "RV530" [[deqp]] deqp = "/deqp/external/openglcts/modules/glcts" -caselists = ["/deqp/mustpass/gles2-khr-master.txt"] +caselists = ["/deqp/mustpass/gles2-khr-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", diff --git a/src/gallium/drivers/radeonsi/ci/radeonsi-run-tests.py b/src/gallium/drivers/radeonsi/ci/radeonsi-run-tests.py index 0ce00ae0b50..a7e87d18477 100755 --- a/src/gallium/drivers/radeonsi/ci/radeonsi-run-tests.py +++ b/src/gallium/drivers/radeonsi/ci/radeonsi-run-tests.py @@ -424,15 +424,15 @@ if args.glcts: "--deqp", "{}/build/external/openglcts/modules/glcts".format(glcts_path), "--caselist", - "{}/build/external/openglcts/modules/gl_cts/data/mustpass/gl/khronos_mustpass/4.6.1.x/gl46-master.txt".format( + "{}/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.1.x/gl46-main.txt".format( glcts_path ), "--caselist", - "{}/build/external/openglcts/modules/gl_cts/data/mustpass/gl/khronos_mustpass_single/4.6.1.x/gl46-khr-single.txt".format( + "{}/external/openglcts/data/mustpass/gl/khronos_mustpass_single/4.6.1.x/gl46-khr-single.txt".format( glcts_path ), "--caselist", - "{}/build/external/openglcts/modules/gl_cts/data/mustpass/gl/khronos_mustpass/4.6.1.x/gl46-gtf-master.txt".format( + "{}/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.1.x/gl46-gtf-main.txt".format( glcts_path ), "--output", @@ -468,19 +468,19 @@ if args.escts: "--deqp", "{}/build/external/openglcts/modules/glcts".format(escts_path), "--caselist", - "{}/build/external/openglcts/modules/gl_cts/data/mustpass/gles/khronos_mustpass/3.2.6.x/gles2-khr-master.txt".format( + "{}/external/openglcts/data/mustpass/gles/khronos_mustpass/3.2.6.x/gles2-khr-main.txt".format( escts_path ), "--caselist", - "{}/build/external/openglcts/modules/gl_cts/data/mustpass/gles/khronos_mustpass/3.2.6.x/gles3-khr-master.txt".format( + "{}/external/openglcts/data/mustpass/gles/khronos_mustpass/3.2.6.x/gles3-khr-main.txt".format( escts_path ), "--caselist", - "{}/build/external/openglcts/modules/gl_cts/data/mustpass/gles/khronos_mustpass/3.2.6.x/gles31-khr-master.txt".format( + "{}/external/openglcts/data/mustpass/gles/khronos_mustpass/3.2.6.x/gles31-khr-main.txt".format( escts_path ), "--caselist", - "{}/build/external/openglcts/modules/gl_cts/data/mustpass/gles/khronos_mustpass/3.2.6.x/gles32-khr-master.txt".format( + "{}/external/openglcts/data/mustpass/gles/khronos_mustpass/3.2.6.x/gles32-khr-main.txt".format( escts_path ), "--output", @@ -530,7 +530,7 @@ if args.deqp: ) suite.write( 'caselists = ["{}"]\n'.format( - "{}/android/cts/main/{}-master.txt".format(deqp_path, k) + "{}/android/cts/main/{}-main.txt".format(deqp_path, k) ) ) if os.path.exists(baseline): diff --git a/src/gallium/drivers/softpipe/ci/deqp-softpipe.toml b/src/gallium/drivers/softpipe/ci/deqp-softpipe.toml index a4c8c5d2996..78e68d6a9fc 100644 --- a/src/gallium/drivers/softpipe/ci/deqp-softpipe.toml +++ b/src/gallium/drivers/softpipe/ci/deqp-softpipe.toml @@ -1,6 +1,6 @@ [[deqp]] deqp = "/deqp/modules/gles2/deqp-gles2" -caselists = ["/deqp/mustpass/gles2-master.txt"] +caselists = ["/deqp/mustpass/gles2-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -13,7 +13,7 @@ renderer_check = "softpipe" [[deqp]] deqp = "/deqp/modules/gles3/deqp-gles3" -caselists = ["/deqp/mustpass/gles3-master.txt"] +caselists = ["/deqp/mustpass/gles3-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -24,7 +24,7 @@ deqp_args = [ [[deqp]] deqp = "/deqp/modules/gles31/deqp-gles31" -caselists = ["/deqp/mustpass/gles31-master.txt"] +caselists = ["/deqp/mustpass/gles31-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -39,10 +39,10 @@ deqp_args = [ [[deqp]] deqp = "/deqp/external/openglcts/modules/glcts" caselists = [ - "/deqp/mustpass/gles2-khr-master.txt", - "/deqp/mustpass/gles3-khr-master.txt", - "/deqp/mustpass/gles31-khr-master.txt", - "/deqp/mustpass/gl33-master.txt", + "/deqp/mustpass/gles2-khr-main.txt", + "/deqp/mustpass/gles3-khr-main.txt", + "/deqp/mustpass/gles31-khr-main.txt", + "/deqp/mustpass/gl33-main.txt", ] deqp_args = [ "--deqp-surface-width=256", diff --git a/src/gallium/drivers/virgl/ci/deqp-android-virgl.toml b/src/gallium/drivers/virgl/ci/deqp-android-virgl.toml index 197e0412e59..0b71a79163d 100644 --- a/src/gallium/drivers/virgl/ci/deqp-android-virgl.toml +++ b/src/gallium/drivers/virgl/ci/deqp-android-virgl.toml @@ -1,6 +1,6 @@ [[deqp]] deqp = "/data/deqp-egl-android" -caselists = ["/data/egl-master.txt"] +caselists = ["/data/egl-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", diff --git a/src/gallium/drivers/virgl/ci/deqp-virgl-gl.toml b/src/gallium/drivers/virgl/ci/deqp-virgl-gl.toml index e478d9d1c95..cdef2737877 100644 --- a/src/gallium/drivers/virgl/ci/deqp-virgl-gl.toml +++ b/src/gallium/drivers/virgl/ci/deqp-virgl-gl.toml @@ -1,6 +1,6 @@ [[deqp]] deqp = "/install/crosvm-runner.sh" -caselists = ["/deqp/mustpass/gles2-master.txt"] +caselists = ["/deqp/mustpass/gles2-main.txt"] deqp_args = [ "/deqp/modules/gles2/deqp-gles2", "--deqp-surface-width=256", @@ -15,7 +15,7 @@ renderer_check = "virgl.*LLVMPIPE" [[deqp]] deqp = "/install/crosvm-runner.sh" -caselists = ["/deqp/mustpass/gles3-master.txt"] +caselists = ["/deqp/mustpass/gles3-main.txt"] deqp_args = [ "/deqp/modules/gles3/deqp-gles3", "--deqp-surface-width=256", @@ -28,7 +28,7 @@ timeout = 360.0 # Starting 8 Crosvm instances simultaneously can take some time [[deqp]] deqp = "/install/crosvm-runner.sh" -caselists = ["/deqp/mustpass/gles31-master.txt"] +caselists = ["/deqp/mustpass/gles31-main.txt"] deqp_args = [ "/deqp/modules/gles31/deqp-gles31", "--deqp-surface-width=256", @@ -42,7 +42,7 @@ timeout = 360.0 # Starting 8 Crosvm instances simultaneously can take some time [[deqp]] deqp = "/install/crosvm-runner.sh" caselists = [ - "/deqp/mustpass/gl32-master.txt", + "/deqp/mustpass/gl32-main.txt", ] deqp_args = [ "/deqp/external/openglcts/modules/glcts", diff --git a/src/gallium/drivers/virgl/ci/deqp-virgl-gles.toml b/src/gallium/drivers/virgl/ci/deqp-virgl-gles.toml index e478d9d1c95..cdef2737877 100644 --- a/src/gallium/drivers/virgl/ci/deqp-virgl-gles.toml +++ b/src/gallium/drivers/virgl/ci/deqp-virgl-gles.toml @@ -1,6 +1,6 @@ [[deqp]] deqp = "/install/crosvm-runner.sh" -caselists = ["/deqp/mustpass/gles2-master.txt"] +caselists = ["/deqp/mustpass/gles2-main.txt"] deqp_args = [ "/deqp/modules/gles2/deqp-gles2", "--deqp-surface-width=256", @@ -15,7 +15,7 @@ renderer_check = "virgl.*LLVMPIPE" [[deqp]] deqp = "/install/crosvm-runner.sh" -caselists = ["/deqp/mustpass/gles3-master.txt"] +caselists = ["/deqp/mustpass/gles3-main.txt"] deqp_args = [ "/deqp/modules/gles3/deqp-gles3", "--deqp-surface-width=256", @@ -28,7 +28,7 @@ timeout = 360.0 # Starting 8 Crosvm instances simultaneously can take some time [[deqp]] deqp = "/install/crosvm-runner.sh" -caselists = ["/deqp/mustpass/gles31-master.txt"] +caselists = ["/deqp/mustpass/gles31-main.txt"] deqp_args = [ "/deqp/modules/gles31/deqp-gles31", "--deqp-surface-width=256", @@ -42,7 +42,7 @@ timeout = 360.0 # Starting 8 Crosvm instances simultaneously can take some time [[deqp]] deqp = "/install/crosvm-runner.sh" caselists = [ - "/deqp/mustpass/gl32-master.txt", + "/deqp/mustpass/gl32-main.txt", ] deqp_args = [ "/deqp/external/openglcts/modules/glcts", diff --git a/src/gallium/drivers/virgl/ci/deqp-virpipe-gl.toml b/src/gallium/drivers/virgl/ci/deqp-virpipe-gl.toml index 26dcc826e21..a9d21e20905 100644 --- a/src/gallium/drivers/virgl/ci/deqp-virpipe-gl.toml +++ b/src/gallium/drivers/virgl/ci/deqp-virpipe-gl.toml @@ -1,6 +1,6 @@ [[deqp]] deqp = "/deqp/modules/gles2/deqp-gles2" -caselists = ["/deqp/mustpass/gles2-master.txt"] +caselists = ["/deqp/mustpass/gles2-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -13,7 +13,7 @@ renderer_check = "virgl" [[deqp]] deqp = "/deqp/modules/gles3/deqp-gles3" -caselists = ["/deqp/mustpass/gles3-master.txt"] +caselists = ["/deqp/mustpass/gles3-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -25,7 +25,7 @@ timeout = 180.0 [[deqp]] deqp = "/deqp/modules/gles31/deqp-gles31" -caselists = ["/deqp/mustpass/gles31-master.txt"] +caselists = ["/deqp/mustpass/gles31-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -38,7 +38,7 @@ timeout = 180.0 [[deqp]] deqp = "/deqp/external/openglcts/modules/glcts" caselists = [ - "/deqp/mustpass/gl43-master.txt", + "/deqp/mustpass/gl43-main.txt", "/deqp/mustpass/gl43-khr-single.txt", ] deqp_args = [ diff --git a/src/gallium/drivers/virgl/ci/virgl-gl-fails.txt b/src/gallium/drivers/virgl/ci/virgl-gl-fails.txt index e2088c27a22..1ca12fb6365 100644 --- a/src/gallium/drivers/virgl/ci/virgl-gl-fails.txt +++ b/src/gallium/drivers/virgl/ci/virgl-gl-fails.txt @@ -24,4 +24,6 @@ dEQP-GLES31.functional.shaders.sample_variables.sample_mask_in.bit_count_per_two dEQP-GLES31.functional.ssbo.layout.random.all_shared_buffer.36,Fail dEQP-GLES31.functional.ssbo.layout.random.nested_structs_arrays_instance_arrays.22,Fail +dEQP-GLES31.functional.texture.border_clamp.range_clamp.linear_float_color,Fail + KHR-GL30.transform_feedback.api_errors_test,Fail diff --git a/src/gallium/drivers/virgl/ci/virgl-gles-fails.txt b/src/gallium/drivers/virgl/ci/virgl-gles-fails.txt index d42f82ba422..aed42e931d1 100644 --- a/src/gallium/drivers/virgl/ci/virgl-gles-fails.txt +++ b/src/gallium/drivers/virgl/ci/virgl-gles-fails.txt @@ -11,6 +11,8 @@ dEQP-GLES31.functional.shaders.sample_variables.sample_mask_in.bit_count_per_two dEQP-GLES31.functional.ssbo.layout.random.all_shared_buffer.36,Fail dEQP-GLES31.functional.ssbo.layout.random.nested_structs_arrays_instance_arrays.22,Fail +dEQP-GLES31.functional.texture.border_clamp.range_clamp.linear_float_color,Fail + KHR-GL30.transform_feedback.api_errors_test,Fail KHR-GL30.transform_feedback.draw_xfb_stream_instanced_test,Fail KHR-GL31.transform_feedback.capture_special_interleaved_test,Crash diff --git a/src/gallium/drivers/zink/ci/deqp-zink-anv-tgl-full.toml b/src/gallium/drivers/zink/ci/deqp-zink-anv-tgl-full.toml index f5148d0b8b3..9799c2da7cb 100644 --- a/src/gallium/drivers/zink/ci/deqp-zink-anv-tgl-full.toml +++ b/src/gallium/drivers/zink/ci/deqp-zink-anv-tgl-full.toml @@ -1,6 +1,6 @@ [[deqp]] deqp = "/deqp/modules/gles2/deqp-gles2" -caselists = ["/deqp/mustpass/gles2-master.txt"] +caselists = ["/deqp/mustpass/gles2-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -14,7 +14,7 @@ renderer_check = "zink.*Intel.*" [[deqp]] deqp = "/deqp/modules/gles3/deqp-gles3" -caselists = ["/deqp/mustpass/gles3-master.txt"] +caselists = ["/deqp/mustpass/gles3-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -26,7 +26,7 @@ timeout = 180.0 [[deqp]] deqp = "/deqp/modules/gles31/deqp-gles31" -caselists = ["/deqp/mustpass/gles31-master.txt"] +caselists = ["/deqp/mustpass/gles31-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -39,11 +39,11 @@ timeout = 180.0 [[deqp]] deqp = "/deqp/external/openglcts/modules/glcts" caselists = [ - "/deqp/mustpass/gl46-master.txt", + "/deqp/mustpass/gl46-main.txt", "/deqp/mustpass/gl46-khr-single.txt", - "/deqp/mustpass/gles2-khr-master.txt", - "/deqp/mustpass/gles3-khr-master.txt", - "/deqp/mustpass/gles31-khr-master.txt", + "/deqp/mustpass/gles2-khr-main.txt", + "/deqp/mustpass/gles3-khr-main.txt", + "/deqp/mustpass/gles31-khr-main.txt", ] deqp_args = [ "--deqp-surface-width=256", @@ -98,7 +98,7 @@ prefix = "multisample-" [[deqp]] deqp = "/deqp/modules/egl/deqp-egl-x11" -caselists = ["/deqp/mustpass/egl-master.txt"] +caselists = ["/deqp/mustpass/egl-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -107,7 +107,7 @@ deqp_args = [ [[deqp]] deqp = "/deqp/modules/egl/deqp-egl-wayland" -caselists = ["/deqp/mustpass/egl-master.txt"] +caselists = ["/deqp/mustpass/egl-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", diff --git a/src/gallium/drivers/zink/ci/deqp-zink-anv-tgl.toml b/src/gallium/drivers/zink/ci/deqp-zink-anv-tgl.toml index 3b31c339dd4..0554b105692 100644 --- a/src/gallium/drivers/zink/ci/deqp-zink-anv-tgl.toml +++ b/src/gallium/drivers/zink/ci/deqp-zink-anv-tgl.toml @@ -1,6 +1,6 @@ #[[deqp]] #deqp = "/deqp/modules/gles2/deqp-gles2" -#caselists = ["/deqp/mustpass/gles2-master.txt"] +#caselists = ["/deqp/mustpass/gles2-main.txt"] #deqp_args = [ # "--deqp-surface-width=256", # "--deqp-surface-height=256", @@ -14,7 +14,7 @@ # #[[deqp]] #deqp = "/deqp/modules/gles3/deqp-gles3" -#caselists = ["/deqp/mustpass/gles3-master.txt"] +#caselists = ["/deqp/mustpass/gles3-main.txt"] #deqp_args = [ # "--deqp-surface-width=256", # "--deqp-surface-height=256", @@ -26,7 +26,7 @@ # #[[deqp]] #deqp = "/deqp/modules/gles31/deqp-gles31" -#caselists = ["/deqp/mustpass/gles31-master.txt"] +#caselists = ["/deqp/mustpass/gles31-main.txt"] #deqp_args = [ # "--deqp-surface-width=256", # "--deqp-surface-height=256", @@ -39,7 +39,7 @@ [[deqp]] deqp = "/deqp/external/openglcts/modules/glcts" caselists = [ - "/deqp/mustpass/gl46-master.txt", + "/deqp/mustpass/gl46-main.txt", "/deqp/mustpass/gl46-khr-single.txt", ] deqp_args = [ @@ -59,7 +59,7 @@ timeout = 180.0 [[deqp]] deqp = "/deqp/external/openglcts/modules/glcts" caselists = [ - "/deqp/mustpass/gl46-master.txt", + "/deqp/mustpass/gl46-main.txt", ] deqp_args = [ @@ -80,7 +80,7 @@ prefix = "noopt-" # don't know about multisampling etc... at compile time [[deqp]] deqp = "/deqp/modules/gles31/deqp-gles31" -caselists = ["/deqp/mustpass/gles31-master.txt"] +caselists = ["/deqp/mustpass/gles31-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", diff --git a/src/gallium/drivers/zink/ci/deqp-zink-freedreno-a618.toml b/src/gallium/drivers/zink/ci/deqp-zink-freedreno-a618.toml index a8d34245c11..1f2e01dfe78 100644 --- a/src/gallium/drivers/zink/ci/deqp-zink-freedreno-a618.toml +++ b/src/gallium/drivers/zink/ci/deqp-zink-freedreno-a618.toml @@ -1,7 +1,7 @@ # Basic test set [[deqp]] deqp = "/deqp/modules/gles2/deqp-gles2" -caselists = ["/deqp/mustpass/gles2-master.txt"] +caselists = ["/deqp/mustpass/gles2-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -12,7 +12,7 @@ renderer_check = "zink.*Adreno.*618" [[deqp]] deqp = "/deqp/modules/gles3/deqp-gles3" -caselists = ["/deqp/mustpass/gles3-master.txt"] +caselists = ["/deqp/mustpass/gles3-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -21,7 +21,7 @@ deqp_args = [ [[deqp]] deqp = "/deqp/modules/gles31/deqp-gles31" -caselists = ["/deqp/mustpass/gles31-master.txt"] +caselists = ["/deqp/mustpass/gles31-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -34,13 +34,13 @@ deqp_args = [ [[deqp]] deqp = "/deqp/external/openglcts/modules/glcts" caselists = [ - "/deqp/mustpass/gles2-khr-master.txt", - "/deqp/mustpass/gles3-khr-master.txt", - "/deqp/mustpass/gles31-khr-master.txt", + "/deqp/mustpass/gles2-khr-main.txt", + "/deqp/mustpass/gles3-khr-main.txt", + "/deqp/mustpass/gles31-khr-main.txt", ] # We want to test desktop GL eventually, but fp64 is slow and we've got enough work # to do just getting GLES sorted out. -# "/deqp/mustpass/gl46-master.txt", +# "/deqp/mustpass/gl46-main.txt", deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", diff --git a/src/gallium/drivers/zink/ci/deqp-zink-lvp.toml b/src/gallium/drivers/zink/ci/deqp-zink-lvp.toml index edbb613df82..549b9f026a4 100644 --- a/src/gallium/drivers/zink/ci/deqp-zink-lvp.toml +++ b/src/gallium/drivers/zink/ci/deqp-zink-lvp.toml @@ -1,6 +1,6 @@ [[deqp]] deqp = "/deqp/modules/gles2/deqp-gles2" -caselists = ["/deqp/mustpass/gles2-master.txt"] +caselists = ["/deqp/mustpass/gles2-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -14,7 +14,7 @@ renderer_check = "zink.*llvmpipe" [[deqp]] deqp = "/deqp/modules/gles3/deqp-gles3" -caselists = ["/deqp/mustpass/gles3-master.txt"] +caselists = ["/deqp/mustpass/gles3-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -26,7 +26,7 @@ timeout = 180.0 [[deqp]] deqp = "/deqp/modules/gles31/deqp-gles31" -caselists = ["/deqp/mustpass/gles31-master.txt"] +caselists = ["/deqp/mustpass/gles31-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -39,7 +39,7 @@ timeout = 180.0 [[deqp]] deqp = "/deqp/external/openglcts/modules/glcts" caselists = [ - "/deqp/mustpass/gl46-master.txt", + "/deqp/mustpass/gl46-main.txt", "/deqp/mustpass/gl46-khr-single.txt", ] deqp_args = [ diff --git a/src/gallium/drivers/zink/ci/deqp-zink-radv.toml b/src/gallium/drivers/zink/ci/deqp-zink-radv.toml index 72e6429f9e1..e113afe8a95 100644 --- a/src/gallium/drivers/zink/ci/deqp-zink-radv.toml +++ b/src/gallium/drivers/zink/ci/deqp-zink-radv.toml @@ -1,10 +1,10 @@ [[deqp]] deqp = "/deqp/external/openglcts/modules/glcts" caselists = [ - "/deqp/mustpass/gles2-master.txt", - "/deqp/mustpass/gles3-master.txt", - "/deqp/mustpass/gles31-master.txt", - "/deqp/mustpass/gl46-master.txt", + "/deqp/mustpass/gles2-main.txt", + "/deqp/mustpass/gles3-main.txt", + "/deqp/mustpass/gles31-main.txt", + "/deqp/mustpass/gl46-main.txt", ] deqp_args = [ "--deqp-surface-width=256", diff --git a/src/gallium/drivers/zink/ci/zink-freedreno-a618-fails.txt b/src/gallium/drivers/zink/ci/zink-freedreno-a618-fails.txt index 8663b7b0049..18c4d4cc59e 100644 --- a/src/gallium/drivers/zink/ci/zink-freedreno-a618-fails.txt +++ b/src/gallium/drivers/zink/ci/zink-freedreno-a618-fails.txt @@ -2,3 +2,6 @@ spec@ext_transform_feedback@tessellation quad_strip wireframe,Fail spec@ext_transform_feedback@tessellation quads wireframe,Fail +dEQP-GLES3.functional.shaders.matrix.inverse.dynamic.lowp_mat4_float_vertex,Fail +dEQP-GLES3.functional.shaders.matrix.inverse.dynamic.mediump_mat4_float_vertex,Fail +dEQP-GLES31.functional.texture.border_clamp.range_clamp.linear_float_color,Fail diff --git a/src/gallium/drivers/zink/ci/zink-radv-navi10-fails.txt b/src/gallium/drivers/zink/ci/zink-radv-navi10-fails.txt index 5ac98e90267..e7ecd7e93eb 100644 --- a/src/gallium/drivers/zink/ci/zink-radv-navi10-fails.txt +++ b/src/gallium/drivers/zink/ci/zink-radv-navi10-fails.txt @@ -334,7 +334,3 @@ spec@!opengl 1.0@gl-1.0-polygon-line-aa,Fail # Regression noticed in https://gitlab.freedesktop.org/mesa/mesa/-/pipelines/891104 spec@arb_viewport_array@display-list,Fail - -# New CTS failures in 1.3.6.3 -dEQP-GLES31.functional.image_load_store.buffer.atomic.comp_swap_r32i_return_value,Fail - diff --git a/src/gallium/drivers/zink/ci/zink-radv-navi31-fails.txt b/src/gallium/drivers/zink/ci/zink-radv-navi31-fails.txt index dc59d343f87..a26426b8add 100644 --- a/src/gallium/drivers/zink/ci/zink-radv-navi31-fails.txt +++ b/src/gallium/drivers/zink/ci/zink-radv-navi31-fails.txt @@ -342,7 +342,6 @@ spec@!opengl 1.0@gl-1.0-polygon-line-aa,Fail spec@arb_viewport_array@display-list,Fail dEQP-GLES3.functional.shaders.precision.uint.highp_div_fragment,Fail -dEQP-GLES31.functional.image_load_store.buffer.atomic.comp_swap_r32i_return_value,Fail spec@arb_sample_shading@arb_sample_shading-builtin-gl-sample-mask-mrt-alpha-to-coverage,Fail spec@ext_image_dma_buf_import@ext_image_dma_buf_import-export,Fail diff --git a/src/intel/ci/deqp-anv-jsl-angle-full.toml b/src/intel/ci/deqp-anv-jsl-angle-full.toml index 2684eab3102..bfefea8666f 100644 --- a/src/intel/ci/deqp-anv-jsl-angle-full.toml +++ b/src/intel/ci/deqp-anv-jsl-angle-full.toml @@ -1,7 +1,7 @@ # Basic test set [[deqp]] deqp = "/deqp/modules/gles2/deqp-gles2" -caselists = ["/deqp/mustpass/gles2-master.txt"] +caselists = ["/deqp/mustpass/gles2-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -12,7 +12,7 @@ renderer_check = "ANGLE.*JSL" [[deqp]] deqp = "/deqp/modules/gles3/deqp-gles3" -caselists = ["/deqp/mustpass/gles3-master.txt"] +caselists = ["/deqp/mustpass/gles3-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -21,7 +21,7 @@ deqp_args = [ [[deqp]] deqp = "/deqp/modules/gles31/deqp-gles31" -caselists = ["/deqp/mustpass/gles31-master.txt"] +caselists = ["/deqp/mustpass/gles31-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -34,9 +34,9 @@ deqp_args = [ [[deqp]] deqp = "/deqp/external/openglcts/modules/glcts" caselists = [ - "/deqp/mustpass/gles2-khr-master.txt", - "/deqp/mustpass/gles3-khr-master.txt", - "/deqp/mustpass/gles31-khr-master.txt", + "/deqp/mustpass/gles2-khr-main.txt", + "/deqp/mustpass/gles3-khr-main.txt", + "/deqp/mustpass/gles31-khr-main.txt", ] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", diff --git a/src/intel/ci/deqp-anv-jsl-angle.toml b/src/intel/ci/deqp-anv-jsl-angle.toml index 5f44fd86c7c..5b2c7666a6d 100644 --- a/src/intel/ci/deqp-anv-jsl-angle.toml +++ b/src/intel/ci/deqp-anv-jsl-angle.toml @@ -1,7 +1,7 @@ # Basic test set [[deqp]] deqp = "/deqp/modules/gles2/deqp-gles2" -caselists = ["/deqp/mustpass/gles2-master.txt"] +caselists = ["/deqp/mustpass/gles2-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -13,7 +13,7 @@ fraction = 3 [[deqp]] deqp = "/deqp/modules/gles3/deqp-gles3" -caselists = ["/deqp/mustpass/gles3-master.txt"] +caselists = ["/deqp/mustpass/gles3-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -23,7 +23,7 @@ fraction = 6 [[deqp]] deqp = "/deqp/modules/gles31/deqp-gles31" -caselists = ["/deqp/mustpass/gles31-master.txt"] +caselists = ["/deqp/mustpass/gles31-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -37,9 +37,9 @@ fraction = 6 [[deqp]] deqp = "/deqp/external/openglcts/modules/glcts" caselists = [ - "/deqp/mustpass/gles2-khr-master.txt", - "/deqp/mustpass/gles3-khr-master.txt", - "/deqp/mustpass/gles31-khr-master.txt", + "/deqp/mustpass/gles2-khr-main.txt", + "/deqp/mustpass/gles3-khr-main.txt", + "/deqp/mustpass/gles31-khr-main.txt", ] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", diff --git a/src/intel/ci/deqp-anv-tgl-angle-full.toml b/src/intel/ci/deqp-anv-tgl-angle-full.toml index dd36a9e1c4c..a3381abd65d 100644 --- a/src/intel/ci/deqp-anv-tgl-angle-full.toml +++ b/src/intel/ci/deqp-anv-tgl-angle-full.toml @@ -1,7 +1,7 @@ # Basic test set [[deqp]] deqp = "/deqp/modules/gles2/deqp-gles2" -caselists = ["/deqp/mustpass/gles2-master.txt"] +caselists = ["/deqp/mustpass/gles2-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -12,7 +12,7 @@ renderer_check = "ANGLE.*TGL" [[deqp]] deqp = "/deqp/modules/gles3/deqp-gles3" -caselists = ["/deqp/mustpass/gles3-master.txt"] +caselists = ["/deqp/mustpass/gles3-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -21,7 +21,7 @@ deqp_args = [ [[deqp]] deqp = "/deqp/modules/gles31/deqp-gles31" -caselists = ["/deqp/mustpass/gles31-master.txt"] +caselists = ["/deqp/mustpass/gles31-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -34,9 +34,9 @@ deqp_args = [ [[deqp]] deqp = "/deqp/external/openglcts/modules/glcts" caselists = [ - "/deqp/mustpass/gles2-khr-master.txt", - "/deqp/mustpass/gles3-khr-master.txt", - "/deqp/mustpass/gles31-khr-master.txt", + "/deqp/mustpass/gles2-khr-main.txt", + "/deqp/mustpass/gles3-khr-main.txt", + "/deqp/mustpass/gles31-khr-main.txt", ] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", diff --git a/src/intel/ci/deqp-anv-tgl-angle.toml b/src/intel/ci/deqp-anv-tgl-angle.toml index a17c4d6b994..2a6c1bec89c 100644 --- a/src/intel/ci/deqp-anv-tgl-angle.toml +++ b/src/intel/ci/deqp-anv-tgl-angle.toml @@ -1,7 +1,7 @@ # Basic test set [[deqp]] deqp = "/deqp/modules/gles2/deqp-gles2" -caselists = ["/deqp/mustpass/gles2-master.txt"] +caselists = ["/deqp/mustpass/gles2-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -12,7 +12,7 @@ renderer_check = "ANGLE.*TGL" [[deqp]] deqp = "/deqp/modules/gles3/deqp-gles3" -caselists = ["/deqp/mustpass/gles3-master.txt"] +caselists = ["/deqp/mustpass/gles3-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -22,7 +22,7 @@ fraction = 3 [[deqp]] deqp = "/deqp/modules/gles31/deqp-gles31" -caselists = ["/deqp/mustpass/gles31-master.txt"] +caselists = ["/deqp/mustpass/gles31-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -36,9 +36,9 @@ fraction = 3 [[deqp]] deqp = "/deqp/external/openglcts/modules/glcts" caselists = [ - "/deqp/mustpass/gles2-khr-master.txt", - "/deqp/mustpass/gles3-khr-master.txt", - "/deqp/mustpass/gles31-khr-master.txt", + "/deqp/mustpass/gles2-khr-main.txt", + "/deqp/mustpass/gles3-khr-main.txt", + "/deqp/mustpass/gles31-khr-main.txt", ] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", diff --git a/src/intel/ci/deqp-iris-amly-egl.toml b/src/intel/ci/deqp-iris-amly-egl.toml index 234daa34443..87234d4639f 100644 --- a/src/intel/ci/deqp-iris-amly-egl.toml +++ b/src/intel/ci/deqp-iris-amly-egl.toml @@ -1,7 +1,7 @@ # x11 [[deqp]] deqp = "/deqp/modules/egl/deqp-egl-x11" -caselists = ["/deqp/mustpass/egl-master.txt"] +caselists = ["/deqp/mustpass/egl-main.txt"] skips = ["/install/iris-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -11,7 +11,7 @@ deqp_args = [ [[deqp]] deqp = "/deqp/modules/egl/deqp-egl-wayland" -caselists = ["/deqp/mustpass/egl-master.txt"] +caselists = ["/deqp/mustpass/egl-main.txt"] skips = ["/install/iris-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", diff --git a/src/intel/ci/deqp-iris-amly.toml b/src/intel/ci/deqp-iris-amly.toml index 59719fcc7e6..f919628935d 100644 --- a/src/intel/ci/deqp-iris-amly.toml +++ b/src/intel/ci/deqp-iris-amly.toml @@ -1,7 +1,7 @@ # Basic test set [[deqp]] deqp = "/deqp/modules/gles2/deqp-gles2" -caselists = ["/deqp/mustpass/gles2-master.txt"] +caselists = ["/deqp/mustpass/gles2-main.txt"] skips = ["/install/iris-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -13,7 +13,7 @@ renderer_check = "AML" [[deqp]] deqp = "/deqp/modules/gles3/deqp-gles3" -caselists = ["/deqp/mustpass/gles3-master.txt"] +caselists = ["/deqp/mustpass/gles3-main.txt"] skips = ["/install/iris-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -23,7 +23,7 @@ deqp_args = [ [[deqp]] deqp = "/deqp/modules/gles31/deqp-gles31" -caselists = ["/deqp/mustpass/gles31-master.txt"] +caselists = ["/deqp/mustpass/gles31-main.txt"] skips = ["/install/iris-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -37,10 +37,10 @@ deqp_args = [ [[deqp]] deqp = "/deqp/external/openglcts/modules/glcts" caselists = [ - "/deqp/mustpass/gles2-khr-master.txt", - "/deqp/mustpass/gles3-khr-master.txt", - "/deqp/mustpass/gles31-khr-master.txt", - "/deqp/mustpass/gl46-master.txt", + "/deqp/mustpass/gles2-khr-main.txt", + "/deqp/mustpass/gles3-khr-main.txt", + "/deqp/mustpass/gles31-khr-main.txt", + "/deqp/mustpass/gl46-main.txt", "/deqp/mustpass/gl46-khr-single.txt", ] skips = ["/install/iris-skips.txt"] diff --git a/src/intel/ci/deqp-iris-apl-egl.toml b/src/intel/ci/deqp-iris-apl-egl.toml index 234daa34443..87234d4639f 100644 --- a/src/intel/ci/deqp-iris-apl-egl.toml +++ b/src/intel/ci/deqp-iris-apl-egl.toml @@ -1,7 +1,7 @@ # x11 [[deqp]] deqp = "/deqp/modules/egl/deqp-egl-x11" -caselists = ["/deqp/mustpass/egl-master.txt"] +caselists = ["/deqp/mustpass/egl-main.txt"] skips = ["/install/iris-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -11,7 +11,7 @@ deqp_args = [ [[deqp]] deqp = "/deqp/modules/egl/deqp-egl-wayland" -caselists = ["/deqp/mustpass/egl-master.txt"] +caselists = ["/deqp/mustpass/egl-main.txt"] skips = ["/install/iris-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", diff --git a/src/intel/ci/deqp-iris-apl-glk.toml b/src/intel/ci/deqp-iris-apl-glk.toml index 234daa34443..87234d4639f 100644 --- a/src/intel/ci/deqp-iris-apl-glk.toml +++ b/src/intel/ci/deqp-iris-apl-glk.toml @@ -1,7 +1,7 @@ # x11 [[deqp]] deqp = "/deqp/modules/egl/deqp-egl-x11" -caselists = ["/deqp/mustpass/egl-master.txt"] +caselists = ["/deqp/mustpass/egl-main.txt"] skips = ["/install/iris-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -11,7 +11,7 @@ deqp_args = [ [[deqp]] deqp = "/deqp/modules/egl/deqp-egl-wayland" -caselists = ["/deqp/mustpass/egl-master.txt"] +caselists = ["/deqp/mustpass/egl-main.txt"] skips = ["/install/iris-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", diff --git a/src/intel/ci/deqp-iris-apl.toml b/src/intel/ci/deqp-iris-apl.toml index a9323e5e893..42dc5753c21 100644 --- a/src/intel/ci/deqp-iris-apl.toml +++ b/src/intel/ci/deqp-iris-apl.toml @@ -1,7 +1,7 @@ # Basic test set [[deqp]] deqp = "/deqp/modules/gles2/deqp-gles2" -caselists = ["/deqp/mustpass/gles2-master.txt"] +caselists = ["/deqp/mustpass/gles2-main.txt"] skips = ["/install/iris-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -13,7 +13,7 @@ renderer_check = "APL" [[deqp]] deqp = "/deqp/modules/gles3/deqp-gles3" -caselists = ["/deqp/mustpass/gles3-master.txt"] +caselists = ["/deqp/mustpass/gles3-main.txt"] skips = ["/install/iris-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -24,7 +24,7 @@ fraction = 3 [[deqp]] deqp = "/deqp/modules/gles31/deqp-gles31" -caselists = ["/deqp/mustpass/gles31-master.txt"] +caselists = ["/deqp/mustpass/gles31-main.txt"] skips = ["/install/iris-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -39,10 +39,10 @@ fraction = 3 [[deqp]] deqp = "/deqp/external/openglcts/modules/glcts" caselists = [ - "/deqp/mustpass/gles2-khr-master.txt", - "/deqp/mustpass/gles3-khr-master.txt", - "/deqp/mustpass/gles31-khr-master.txt", - "/deqp/mustpass/gl46-master.txt", + "/deqp/mustpass/gles2-khr-main.txt", + "/deqp/mustpass/gles3-khr-main.txt", + "/deqp/mustpass/gles31-khr-main.txt", + "/deqp/mustpass/gl46-main.txt", "/deqp/mustpass/gl46-khr-single.txt", ] skips = ["/install/iris-skips.txt"] diff --git a/src/intel/ci/deqp-iris-cml.toml b/src/intel/ci/deqp-iris-cml.toml index 4da4ed83c2c..471af878ee3 100644 --- a/src/intel/ci/deqp-iris-cml.toml +++ b/src/intel/ci/deqp-iris-cml.toml @@ -1,7 +1,7 @@ # Basic test set [[deqp]] deqp = "/deqp/modules/gles2/deqp-gles2" -caselists = ["/deqp/mustpass/gles2-master.txt"] +caselists = ["/deqp/mustpass/gles2-main.txt"] skips = ["/install/iris-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -13,7 +13,7 @@ renderer_check = "CML" [[deqp]] deqp = "/deqp/modules/gles3/deqp-gles3" -caselists = ["/deqp/mustpass/gles3-master.txt"] +caselists = ["/deqp/mustpass/gles3-main.txt"] skips = ["/install/iris-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -23,7 +23,7 @@ deqp_args = [ [[deqp]] deqp = "/deqp/modules/gles31/deqp-gles31" -caselists = ["/deqp/mustpass/gles31-master.txt"] +caselists = ["/deqp/mustpass/gles31-main.txt"] skips = ["/install/iris-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -37,10 +37,10 @@ deqp_args = [ [[deqp]] deqp = "/deqp/external/openglcts/modules/glcts" caselists = [ - "/deqp/mustpass/gles2-khr-master.txt", - "/deqp/mustpass/gles3-khr-master.txt", - "/deqp/mustpass/gles31-khr-master.txt", - "/deqp/mustpass/gl46-master.txt", + "/deqp/mustpass/gles2-khr-main.txt", + "/deqp/mustpass/gles3-khr-main.txt", + "/deqp/mustpass/gles31-khr-main.txt", + "/deqp/mustpass/gl46-main.txt", "/deqp/mustpass/gl46-khr-single.txt", ] skips = ["/install/iris-skips.txt"] diff --git a/src/intel/ci/deqp-iris-glk-egl.toml b/src/intel/ci/deqp-iris-glk-egl.toml index 234daa34443..87234d4639f 100644 --- a/src/intel/ci/deqp-iris-glk-egl.toml +++ b/src/intel/ci/deqp-iris-glk-egl.toml @@ -1,7 +1,7 @@ # x11 [[deqp]] deqp = "/deqp/modules/egl/deqp-egl-x11" -caselists = ["/deqp/mustpass/egl-master.txt"] +caselists = ["/deqp/mustpass/egl-main.txt"] skips = ["/install/iris-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -11,7 +11,7 @@ deqp_args = [ [[deqp]] deqp = "/deqp/modules/egl/deqp-egl-wayland" -caselists = ["/deqp/mustpass/egl-master.txt"] +caselists = ["/deqp/mustpass/egl-main.txt"] skips = ["/install/iris-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", diff --git a/src/intel/ci/deqp-iris-glk.toml b/src/intel/ci/deqp-iris-glk.toml index e071a0202eb..f6b0832b804 100644 --- a/src/intel/ci/deqp-iris-glk.toml +++ b/src/intel/ci/deqp-iris-glk.toml @@ -1,7 +1,7 @@ # Basic test set [[deqp]] deqp = "/deqp/modules/gles2/deqp-gles2" -caselists = ["/deqp/mustpass/gles2-master.txt"] +caselists = ["/deqp/mustpass/gles2-main.txt"] skips = ["/install/iris-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -14,7 +14,7 @@ renderer_check = "GLK" [[deqp]] deqp = "/deqp/modules/gles3/deqp-gles3" -caselists = ["/deqp/mustpass/gles3-master.txt"] +caselists = ["/deqp/mustpass/gles3-main.txt"] skips = ["/install/iris-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -25,7 +25,7 @@ fraction = 8 [[deqp]] deqp = "/deqp/modules/gles31/deqp-gles31" -caselists = ["/deqp/mustpass/gles31-master.txt"] +caselists = ["/deqp/mustpass/gles31-main.txt"] skips = ["/install/iris-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -40,10 +40,10 @@ fraction = 8 [[deqp]] deqp = "/deqp/external/openglcts/modules/glcts" caselists = [ - "/deqp/mustpass/gles2-khr-master.txt", - "/deqp/mustpass/gles3-khr-master.txt", - "/deqp/mustpass/gles31-khr-master.txt", - "/deqp/mustpass/gl46-master.txt", + "/deqp/mustpass/gles2-khr-main.txt", + "/deqp/mustpass/gles3-khr-main.txt", + "/deqp/mustpass/gles31-khr-main.txt", + "/deqp/mustpass/gl46-main.txt", "/deqp/mustpass/gl46-khr-single.txt", ] skips = ["/install/iris-skips.txt"] diff --git a/src/intel/ci/deqp-iris-jsl.toml b/src/intel/ci/deqp-iris-jsl.toml index 019026c7987..163c33efe59 100644 --- a/src/intel/ci/deqp-iris-jsl.toml +++ b/src/intel/ci/deqp-iris-jsl.toml @@ -1,7 +1,7 @@ # Basic test set [[deqp]] deqp = "/deqp/modules/gles2/deqp-gles2" -caselists = ["/deqp/mustpass/gles2-master.txt"] +caselists = ["/deqp/mustpass/gles2-main.txt"] skips = ["/install/iris-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -13,7 +13,7 @@ renderer_check = "JSL" [[deqp]] deqp = "/deqp/modules/gles3/deqp-gles3" -caselists = ["/deqp/mustpass/gles3-master.txt"] +caselists = ["/deqp/mustpass/gles3-main.txt"] skips = ["/install/iris-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -23,7 +23,7 @@ deqp_args = [ [[deqp]] deqp = "/deqp/modules/gles31/deqp-gles31" -caselists = ["/deqp/mustpass/gles31-master.txt"] +caselists = ["/deqp/mustpass/gles31-main.txt"] skips = ["/install/iris-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -37,10 +37,10 @@ deqp_args = [ [[deqp]] deqp = "/deqp/external/openglcts/modules/glcts" caselists = [ - "/deqp/mustpass/gles2-khr-master.txt", - "/deqp/mustpass/gles3-khr-master.txt", - "/deqp/mustpass/gles31-khr-master.txt", - "/deqp/mustpass/gl46-master.txt", + "/deqp/mustpass/gles2-khr-main.txt", + "/deqp/mustpass/gles3-khr-main.txt", + "/deqp/mustpass/gles31-khr-main.txt", + "/deqp/mustpass/gl46-main.txt", "/deqp/mustpass/gl46-khr-single.txt", ] skips = ["/install/iris-skips.txt"] diff --git a/src/intel/ci/deqp-iris-kbl.toml b/src/intel/ci/deqp-iris-kbl.toml index 4ed30136d66..442c4169239 100644 --- a/src/intel/ci/deqp-iris-kbl.toml +++ b/src/intel/ci/deqp-iris-kbl.toml @@ -1,7 +1,7 @@ # Basic test set [[deqp]] deqp = "/deqp/modules/gles2/deqp-gles2" -caselists = ["/deqp/mustpass/gles2-master.txt"] +caselists = ["/deqp/mustpass/gles2-main.txt"] skips = ["/install/iris-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -13,7 +13,7 @@ renderer_check = "KBL" [[deqp]] deqp = "/deqp/modules/gles3/deqp-gles3" -caselists = ["/deqp/mustpass/gles3-master.txt"] +caselists = ["/deqp/mustpass/gles3-main.txt"] skips = ["/install/iris-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -23,7 +23,7 @@ deqp_args = [ [[deqp]] deqp = "/deqp/modules/gles31/deqp-gles31" -caselists = ["/deqp/mustpass/gles31-master.txt"] +caselists = ["/deqp/mustpass/gles31-main.txt"] skips = ["/install/iris-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -37,10 +37,10 @@ deqp_args = [ [[deqp]] deqp = "/deqp/external/openglcts/modules/glcts" caselists = [ - "/deqp/mustpass/gles2-khr-master.txt", - "/deqp/mustpass/gles3-khr-master.txt", - "/deqp/mustpass/gles31-khr-master.txt", - "/deqp/mustpass/gl46-master.txt", + "/deqp/mustpass/gles2-khr-main.txt", + "/deqp/mustpass/gles3-khr-main.txt", + "/deqp/mustpass/gles31-khr-main.txt", + "/deqp/mustpass/gl46-main.txt", "/deqp/mustpass/gl46-khr-single.txt", ] skips = ["/install/iris-skips.txt"] diff --git a/src/intel/ci/deqp-iris-whl.toml b/src/intel/ci/deqp-iris-whl.toml index 74cc1813860..17191acebe0 100644 --- a/src/intel/ci/deqp-iris-whl.toml +++ b/src/intel/ci/deqp-iris-whl.toml @@ -1,7 +1,7 @@ # Basic test set [[deqp]] deqp = "/deqp/modules/gles2/deqp-gles2" -caselists = ["/deqp/mustpass/gles2-master.txt"] +caselists = ["/deqp/mustpass/gles2-main.txt"] skips = ["/install/iris-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -13,7 +13,7 @@ renderer_check = "WHL" [[deqp]] deqp = "/deqp/modules/gles3/deqp-gles3" -caselists = ["/deqp/mustpass/gles3-master.txt"] +caselists = ["/deqp/mustpass/gles3-main.txt"] skips = ["/install/iris-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -23,7 +23,7 @@ deqp_args = [ [[deqp]] deqp = "/deqp/modules/gles31/deqp-gles31" -caselists = ["/deqp/mustpass/gles31-master.txt"] +caselists = ["/deqp/mustpass/gles31-main.txt"] skips = ["/install/iris-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -37,10 +37,10 @@ deqp_args = [ [[deqp]] deqp = "/deqp/external/openglcts/modules/glcts" caselists = [ - "/deqp/mustpass/gles2-khr-master.txt", - "/deqp/mustpass/gles3-khr-master.txt", - "/deqp/mustpass/gles31-khr-master.txt", - "/deqp/mustpass/gl46-master.txt", + "/deqp/mustpass/gles2-khr-main.txt", + "/deqp/mustpass/gles3-khr-main.txt", + "/deqp/mustpass/gles31-khr-main.txt", + "/deqp/mustpass/gl46-main.txt", "/deqp/mustpass/gl46-khr-single.txt", ] skips = ["/install/iris-skips.txt"] diff --git a/src/panfrost/ci/deqp-panfrost-g52.toml b/src/panfrost/ci/deqp-panfrost-g52.toml index 7ae8bfa1679..e7bd61ddbbd 100644 --- a/src/panfrost/ci/deqp-panfrost-g52.toml +++ b/src/panfrost/ci/deqp-panfrost-g52.toml @@ -1,7 +1,7 @@ # Basic test set [[deqp]] deqp = "/deqp/modules/gles2/deqp-gles2" -caselists = ["/deqp/mustpass/gles2-master.txt"] +caselists = ["/deqp/mustpass/gles2-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -12,7 +12,7 @@ renderer_check = "Mali-G52" [[deqp]] deqp = "/deqp/modules/gles3/deqp-gles3" -caselists = ["/deqp/mustpass/gles3-master.txt"] +caselists = ["/deqp/mustpass/gles3-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -21,7 +21,7 @@ deqp_args = [ [[deqp]] deqp = "/deqp/modules/gles31/deqp-gles31" -caselists = ["/deqp/mustpass/gles31-master.txt"] +caselists = ["/deqp/mustpass/gles31-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -31,9 +31,9 @@ deqp_args = [ [[deqp]] deqp = "/deqp/external/openglcts/modules/glcts" caselists = [ - "/deqp/mustpass/gles2-khr-master.txt", - "/deqp/mustpass/gles3-khr-master.txt", - "/deqp/mustpass/gles31-khr-master.txt", + "/deqp/mustpass/gles2-khr-main.txt", + "/deqp/mustpass/gles3-khr-main.txt", + "/deqp/mustpass/gles31-khr-main.txt", ] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -44,7 +44,7 @@ deqp_args = [ # Smoke test spilling [[deqp]] deqp = "/deqp/modules/gles2/deqp-gles2" -caselists = ["/deqp/mustpass/gles2-master.txt"] +caselists = ["/deqp/mustpass/gles2-main.txt"] include = ["functional.shaders"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", diff --git a/src/panfrost/ci/deqp-panfrost-g57.toml b/src/panfrost/ci/deqp-panfrost-g57.toml index f17e54748a8..96bdc06ab99 100644 --- a/src/panfrost/ci/deqp-panfrost-g57.toml +++ b/src/panfrost/ci/deqp-panfrost-g57.toml @@ -1,7 +1,7 @@ # Basic test set [[deqp]] deqp = "/deqp/modules/gles2/deqp-gles2" -caselists = ["/deqp/mustpass/gles2-master.txt"] +caselists = ["/deqp/mustpass/gles2-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -12,7 +12,7 @@ renderer_check = "Mali-G57" [[deqp]] deqp = "/deqp/modules/gles3/deqp-gles3" -caselists = ["/deqp/mustpass/gles3-master.txt"] +caselists = ["/deqp/mustpass/gles3-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -21,7 +21,7 @@ deqp_args = [ [[deqp]] deqp = "/deqp/modules/gles31/deqp-gles31" -caselists = ["/deqp/mustpass/gles31-master.txt"] +caselists = ["/deqp/mustpass/gles31-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -31,9 +31,9 @@ deqp_args = [ [[deqp]] deqp = "/deqp/external/openglcts/modules/glcts" caselists = [ - "/deqp/mustpass/gles2-khr-master.txt", - "/deqp/mustpass/gles3-khr-master.txt", - "/deqp/mustpass/gles31-khr-master.txt", + "/deqp/mustpass/gles2-khr-main.txt", + "/deqp/mustpass/gles3-khr-main.txt", + "/deqp/mustpass/gles31-khr-main.txt", ] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -44,7 +44,7 @@ deqp_args = [ # Smoke test spilling [[deqp]] deqp = "/deqp/modules/gles2/deqp-gles2" -caselists = ["/deqp/mustpass/gles2-master.txt"] +caselists = ["/deqp/mustpass/gles2-main.txt"] include = ["functional.shaders"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", diff --git a/src/panfrost/ci/deqp-panfrost-g72.toml b/src/panfrost/ci/deqp-panfrost-g72.toml index 849b77f7be9..3620942d995 100644 --- a/src/panfrost/ci/deqp-panfrost-g72.toml +++ b/src/panfrost/ci/deqp-panfrost-g72.toml @@ -1,7 +1,7 @@ # Basic test set [[deqp]] deqp = "/deqp/modules/gles2/deqp-gles2" -caselists = ["/deqp/mustpass/gles2-master.txt"] +caselists = ["/deqp/mustpass/gles2-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -12,7 +12,7 @@ renderer_check = "Mali-G72" [[deqp]] deqp = "/deqp/modules/gles3/deqp-gles3" -caselists = ["/deqp/mustpass/gles3-master.txt"] +caselists = ["/deqp/mustpass/gles3-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -21,7 +21,7 @@ deqp_args = [ [[deqp]] deqp = "/deqp/modules/gles31/deqp-gles31" -caselists = ["/deqp/mustpass/gles31-master.txt"] +caselists = ["/deqp/mustpass/gles31-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -31,9 +31,9 @@ deqp_args = [ [[deqp]] deqp = "/deqp/external/openglcts/modules/glcts" caselists = [ - "/deqp/mustpass/gles2-khr-master.txt", - "/deqp/mustpass/gles3-khr-master.txt", - "/deqp/mustpass/gles31-khr-master.txt", + "/deqp/mustpass/gles2-khr-main.txt", + "/deqp/mustpass/gles3-khr-main.txt", + "/deqp/mustpass/gles31-khr-main.txt", ] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", diff --git a/src/panfrost/ci/deqp-panfrost-t720.toml b/src/panfrost/ci/deqp-panfrost-t720.toml index 5bb962f282f..62c240c3bc7 100644 --- a/src/panfrost/ci/deqp-panfrost-t720.toml +++ b/src/panfrost/ci/deqp-panfrost-t720.toml @@ -1,7 +1,7 @@ # Basic test set [[deqp]] deqp = "/deqp/modules/gles2/deqp-gles2" -caselists = ["/deqp/mustpass/gles2-master.txt"] +caselists = ["/deqp/mustpass/gles2-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", diff --git a/src/panfrost/ci/deqp-panfrost-t760.toml b/src/panfrost/ci/deqp-panfrost-t760.toml index f69f19867f9..6e1fe5ce691 100644 --- a/src/panfrost/ci/deqp-panfrost-t760.toml +++ b/src/panfrost/ci/deqp-panfrost-t760.toml @@ -1,7 +1,7 @@ # Basic test set [[deqp]] deqp = "/deqp/modules/gles2/deqp-gles2" -caselists = ["/deqp/mustpass/gles2-master.txt"] +caselists = ["/deqp/mustpass/gles2-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -12,7 +12,7 @@ renderer_check = "Mali-T760" [[deqp]] deqp = "/deqp/modules/gles3/deqp-gles3" -caselists = ["/deqp/mustpass/gles3-master.txt"] +caselists = ["/deqp/mustpass/gles3-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -21,7 +21,7 @@ deqp_args = [ [[deqp]] deqp = "/deqp/modules/gles31/deqp-gles31" -caselists = ["/deqp/mustpass/gles31-master.txt"] +caselists = ["/deqp/mustpass/gles31-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", diff --git a/src/panfrost/ci/deqp-panfrost-t860-egl.toml b/src/panfrost/ci/deqp-panfrost-t860-egl.toml index a9e4c73a42a..aa4fcca487e 100644 --- a/src/panfrost/ci/deqp-panfrost-t860-egl.toml +++ b/src/panfrost/ci/deqp-panfrost-t860-egl.toml @@ -1,7 +1,7 @@ # wayland [[deqp]] deqp = "/deqp/modules/egl/deqp-egl-wayland" -caselists = ["/deqp/mustpass/egl-master.txt"] +caselists = ["/deqp/mustpass/egl-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -12,7 +12,7 @@ prefix = "wayland-" # x11 [[deqp]] deqp = "/deqp/modules/egl/deqp-egl-x11" -caselists = ["/deqp/mustpass/egl-master.txt"] +caselists = ["/deqp/mustpass/egl-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", diff --git a/src/panfrost/ci/deqp-panfrost-t860.toml b/src/panfrost/ci/deqp-panfrost-t860.toml index 48371661156..78471bd9f92 100644 --- a/src/panfrost/ci/deqp-panfrost-t860.toml +++ b/src/panfrost/ci/deqp-panfrost-t860.toml @@ -1,7 +1,7 @@ # Basic test set [[deqp]] deqp = "/deqp/modules/gles2/deqp-gles2" -caselists = ["/deqp/mustpass/gles2-master.txt"] +caselists = ["/deqp/mustpass/gles2-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -12,7 +12,7 @@ renderer_check = "Mali-T860" [[deqp]] deqp = "/deqp/modules/gles3/deqp-gles3" -caselists = ["/deqp/mustpass/gles3-master.txt"] +caselists = ["/deqp/mustpass/gles3-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -21,7 +21,7 @@ deqp_args = [ [[deqp]] deqp = "/deqp/modules/gles31/deqp-gles31" -caselists = ["/deqp/mustpass/gles31-master.txt"] +caselists = ["/deqp/mustpass/gles31-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", diff --git a/src/panfrost/ci/panfrost-g52-fails.txt b/src/panfrost/ci/panfrost-g52-fails.txt index c5b34313e24..22ed5605383 100644 --- a/src/panfrost/ci/panfrost-g52-fails.txt +++ b/src/panfrost/ci/panfrost-g52-fails.txt @@ -417,6 +417,8 @@ spec@!opengl 3.1@primitive-restart-xfb generated,Fail spec@!opengl 3.1@primitive-restart-xfb written,Fail spec@!opengl es 3.0@gles-3.0-transform-feedback-uniform-buffer-object,Fail +dEQP-GLES31.functional.texture.border_clamp.range_clamp.linear_float_color,Fail + # The following tests started to fail after CI fix, see # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16325 dEQP-VK.rasterization.interpolation_multisample_4_bit.lines_wide,Fail diff --git a/src/panfrost/ci/panfrost-g57-fails.txt b/src/panfrost/ci/panfrost-g57-fails.txt index 841918b7dea..cb153e49d33 100644 --- a/src/panfrost/ci/panfrost-g57-fails.txt +++ b/src/panfrost/ci/panfrost-g57-fails.txt @@ -538,3 +538,5 @@ spec@!opengl 3.1@primitive-restart-xfb flush,Fail spec@!opengl 3.1@primitive-restart-xfb generated,Fail spec@!opengl 3.1@primitive-restart-xfb written,Fail spec@!opengl es 3.0@gles-3.0-transform-feedback-uniform-buffer-object,Fail + +dEQP-GLES31.functional.texture.border_clamp.range_clamp.linear_float_color,Fail diff --git a/src/panfrost/ci/panfrost-g72-fails.txt b/src/panfrost/ci/panfrost-g72-fails.txt index e69de29bb2d..7acddfd3fd5 100644 --- a/src/panfrost/ci/panfrost-g72-fails.txt +++ b/src/panfrost/ci/panfrost-g72-fails.txt @@ -0,0 +1 @@ +dEQP-GLES31.functional.texture.border_clamp.range_clamp.linear_float_color,Fail diff --git a/src/panfrost/ci/panfrost-t760-fails.txt b/src/panfrost/ci/panfrost-t760-fails.txt index f335a6c1176..d1d8e1e6d74 100644 --- a/src/panfrost/ci/panfrost-t760-fails.txt +++ b/src/panfrost/ci/panfrost-t760-fails.txt @@ -49,6 +49,7 @@ dEQP-GLES31.functional.texture.border_clamp.per_axis_wrap_mode.texture_2d.unorm_ dEQP-GLES31.functional.texture.border_clamp.per_axis_wrap_mode.texture_2d.unorm_color.gather.s_mirrored_repeat_t_clamp_to_border_pot,Fail dEQP-GLES31.functional.texture.border_clamp.per_axis_wrap_mode.texture_2d.unorm_depth.gather.s_mirrored_repeat_t_clamp_to_border_npot,Fail dEQP-GLES31.functional.texture.border_clamp.per_axis_wrap_mode.texture_2d.unorm_depth.gather.s_mirrored_repeat_t_clamp_to_border_pot,Fail +dEQP-GLES31.functional.texture.border_clamp.range_clamp.linear_float_color,Fail dEQP-GLES31.functional.texture.gather.basic.2d.depth32f.size_npot.compare_greater.mirrored_repeat_clamp_to_edge,Fail dEQP-GLES31.functional.texture.gather.basic.2d.depth32f.size_npot.compare_greater.repeat_mirrored_repeat,Fail dEQP-GLES31.functional.texture.gather.basic.2d.depth32f.size_npot.compare_less.mirrored_repeat_clamp_to_edge,Fail