ci: Add testing of the khr-single tests.

These got split out from gl4[3456]-master a while back, so we were missing
coverage in CI.

Acked-by: Timothy Arceri <tarceri@itsqueeze.com>
Acked-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17876>
This commit is contained in:
Emma Anholt 2022-08-03 13:40:37 -07:00 committed by Marge Bot
parent 478626fd94
commit f01ae0203d
23 changed files with 70 additions and 3 deletions

View file

@ -60,6 +60,9 @@ cp \
cp \
/deqp/external/openglcts/modules/gl_cts/data/mustpass/gl/khronos_mustpass/4.6.1.x/*-master.txt \
/deqp/mustpass/.
cp \
/deqp/external/openglcts/modules/gl_cts/data/mustpass/gl/khronos_mustpass_single/4.6.1.x/*-single.txt \
/deqp/mustpass/.
# Save *some* executor utils, but otherwise strip things down
# to reduct deqp build size:

View file

@ -11,11 +11,11 @@ variables:
DEBIAN_X86_TEST_BASE_IMAGE: "debian/x86_test-base"
DEBIAN_X86_TEST_IMAGE_PATH: "debian/x86_test-gl"
DEBIAN_X86_TEST_GL_TAG: "2022-08-04-crosvm-opaque-fd"
DEBIAN_X86_TEST_VK_TAG: "2022-08-04-crosvm-opaque-fd"
DEBIAN_X86_TEST_GL_TAG: "2022-08-04-khr-single"
DEBIAN_X86_TEST_VK_TAG: "2022-08-04-khr-single"
FEDORA_X86_BUILD_TAG: "2022-04-24-spirv-tools-5"
KERNEL_ROOTFS_TAG: "2022-08-04-virgl-update"
KERNEL_ROOTFS_TAG: "2022-08-06-khr-single"
WINDOWS_X64_VS_PATH: "windows/x64_vs"
WINDOWS_X64_VS_TAG: "2022-06-15-vs-winsdk"

View file

@ -47,6 +47,7 @@ caselists = [
"/deqp/mustpass/gles3-khr-master.txt",
"/deqp/mustpass/gles31-khr-master.txt",
"/deqp/mustpass/gl45-master.txt",
"/deqp/mustpass/gl45-khr-single.txt",
]
deqp_args = [
"--deqp-surface-width=256",

View file

@ -23,6 +23,9 @@ dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_min_reverse_src_dst_x,Fa
dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_min_reverse_src_dst_y,Fail
dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_min_reverse_src_x,Fail
# https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17878
KHR-Single-GL45.enhanced_layouts.xfb_all_stages,Crash
spec@glsl-1.20@compiler@invalid-vec4-array-to-vec3-array-conversion.vert,Fail
spec@oes_shader_io_blocks@compiler@layout-location-aliasing.vert,Fail

View file

@ -12,6 +12,8 @@ KHR-GL45.copy_image.functional
KHR-GL45.texture_size_promotion.functional
KHR-GL45.texture_swizzle.functional
KHR-GL45.texture_swizzle.smoke
KHR-Single-GL45.arrays_of_arrays_gl.SubroutineArgumentAliasing3
KHR-Single-GL45.arrays_of_arrays_gl.SubroutineArgumentAliasing4
KHR-GLES31.core.arrays_of_arrays.InteractionFunctionCalls2
arb_pipeline_statistics_query-comp
gl-1.0-blend-func

View file

@ -39,6 +39,7 @@ timeout = 180.0
deqp = "/deqp/external/openglcts/modules/glcts"
caselists = [
"/deqp/mustpass/gl43-master.txt",
"/deqp/mustpass/gl43-khr-single.txt",
]
deqp_args = [
"--deqp-surface-width=256",

View file

@ -57,6 +57,22 @@ KHR-GL43.shader_storage_buffer_object.basic-atomic-case1,Fail
KHR-GL43.shader_storage_buffer_object.basic-atomic-case2,Fail
KHR-GL43.shader_subroutine.ssbo_atomic_image_load_store,Fail
KHR-Single-GL43.arrays_of_arrays_gl.AtomicUsage,Fail
KHR-Single-GL43.arrays_of_arrays_gl.InteractionArgumentAliasing1,Fail
KHR-Single-GL43.arrays_of_arrays_gl.InteractionArgumentAliasing2,Fail
KHR-Single-GL43.arrays_of_arrays_gl.InteractionArgumentAliasing3,Fail
KHR-Single-GL43.arrays_of_arrays_gl.InteractionArgumentAliasing4,Fail
KHR-Single-GL43.arrays_of_arrays_gl.InteractionArgumentAliasing5,Fail
KHR-Single-GL43.arrays_of_arrays_gl.InteractionArgumentAliasing6,Fail
KHR-Single-GL43.arrays_of_arrays_gl.InteractionFunctionCalls1,Fail
KHR-Single-GL43.arrays_of_arrays_gl.InteractionFunctionCalls2,Fail
KHR-Single-GL43.arrays_of_arrays_gl.SubroutineArgumentAliasing1,Fail
KHR-Single-GL43.arrays_of_arrays_gl.SubroutineArgumentAliasing2,Fail
KHR-Single-GL43.arrays_of_arrays_gl.SubroutineArgumentAliasing3,Fail
KHR-Single-GL43.arrays_of_arrays_gl.SubroutineArgumentAliasing4,Fail
KHR-Single-GL43.arrays_of_arrays_gl.SubroutineFunctionCalls1,Fail
KHR-Single-GL43.arrays_of_arrays_gl.SubroutineFunctionCalls2,Fail
# virglrenderer translates TGSI IMAGE declaration "WR" ("image is not readonly")
# into the writeonly qualifier, which works for gles (where each image is either
# RO or WO) but not for desktop GL.

View file

@ -40,6 +40,7 @@
deqp = "/deqp/external/openglcts/modules/glcts"
caselists = [
"/deqp/mustpass/gl46-master.txt",
"/deqp/mustpass/gl46-khr-single.txt",
]
deqp_args = [
"--deqp-surface-width=256",

View file

@ -40,6 +40,7 @@ timeout = 180.0
deqp = "/deqp/external/openglcts/modules/glcts"
caselists = [
"/deqp/mustpass/gl46-master.txt",
"/deqp/mustpass/gl46-khr-single.txt",
]
deqp_args = [
"--deqp-surface-width=256",

View file

@ -5,3 +5,8 @@ KHR-GL46.gpu_shader_fp64.builtin.inverse_dmat4
KHR-GL46.gpu_shader_fp64.builtin.inverse_dmat3
KHR-GL46.gpu_shader_fp64.fp64.varyings
KHR-GL46.texture_swizzle.functional
KHR-Single-GL46.arrays_of_arrays_gl.AtomicUsage
KHR-Single-GL46.arrays_of_arrays_gl.InteractionFunctionCalls2
KHR-Single-GL46.arrays_of_arrays_gl.SubroutineFunctionCalls2
KHR-Single-GL46.enhanced_layouts.uniform_block_member_align_non_power_of_2
KHR-Single-GL46.enhanced_layouts.xfb_global_buffer

View file

@ -41,6 +41,7 @@ caselists = [
"/deqp/mustpass/gles3-khr-master.txt",
"/deqp/mustpass/gles31-khr-master.txt",
"/deqp/mustpass/gl46-master.txt",
"/deqp/mustpass/gl46-khr-single.txt",
]
skips = ["/install/iris-skips.txt"]
deqp_args = [

View file

@ -43,6 +43,7 @@ caselists = [
"/deqp/mustpass/gles3-khr-master.txt",
"/deqp/mustpass/gles31-khr-master.txt",
"/deqp/mustpass/gl46-master.txt",
"/deqp/mustpass/gl46-khr-single.txt",
]
skips = ["/install/iris-skips.txt"]
deqp_args = [

View file

@ -41,6 +41,7 @@ caselists = [
"/deqp/mustpass/gles3-khr-master.txt",
"/deqp/mustpass/gles31-khr-master.txt",
"/deqp/mustpass/gl46-master.txt",
"/deqp/mustpass/gl46-khr-single.txt",
]
skips = ["/install/iris-skips.txt"]
deqp_args = [

View file

@ -44,6 +44,7 @@ caselists = [
"/deqp/mustpass/gles3-khr-master.txt",
"/deqp/mustpass/gles31-khr-master.txt",
"/deqp/mustpass/gl46-master.txt",
"/deqp/mustpass/gl46-khr-single.txt",
]
skips = ["/install/iris-skips.txt"]
deqp_args = [

View file

@ -41,6 +41,7 @@ caselists = [
"/deqp/mustpass/gles3-khr-master.txt",
"/deqp/mustpass/gles31-khr-master.txt",
"/deqp/mustpass/gl46-master.txt",
"/deqp/mustpass/gl46-khr-single.txt",
]
skips = ["/install/iris-skips.txt"]
deqp_args = [

View file

@ -41,6 +41,7 @@ caselists = [
"/deqp/mustpass/gles3-khr-master.txt",
"/deqp/mustpass/gles31-khr-master.txt",
"/deqp/mustpass/gl46-master.txt",
"/deqp/mustpass/gl46-khr-single.txt",
]
skips = ["/install/iris-skips.txt"]
deqp_args = [

View file

@ -14,3 +14,6 @@ dEQP-GLES3.functional.texture.compressed.astc.void_extent_ldr.8x6,Fail
dEQP-GLES3.functional.texture.compressed.astc.void_extent_ldr.8x8,Fail
dEQP-EGL.functional.sharing.gles2.multithread.random.images.copyteximage2d.12,Crash
# https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17878
KHR-Single-GL46.enhanced_layouts.xfb_all_stages,Crash

View file

@ -1 +1,4 @@
dEQP-EGL.functional.sharing.gles2.multithread.random.images.copyteximage2d.12,Crash
# https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17878
KHR-Single-GL46.enhanced_layouts.xfb_all_stages,Crash

View file

@ -12,3 +12,6 @@ dEQP-GLES3.functional.texture.compressed.astc.void_extent_ldr.6x6,Fail
dEQP-GLES3.functional.texture.compressed.astc.void_extent_ldr.8x5,Fail
dEQP-GLES3.functional.texture.compressed.astc.void_extent_ldr.8x6,Fail
dEQP-GLES3.functional.texture.compressed.astc.void_extent_ldr.8x8,Fail
# https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17878
KHR-Single-GL46.enhanced_layouts.xfb_all_stages,Crash

View file

@ -4,3 +4,6 @@ KHR-GL46.texture_buffer.texture_buffer_atomic_functions,Fail
KHR-GLES31.core.texture_buffer.texture_buffer_atomic_functions,Fail
dEQP-EGL.functional.sharing.gles2.multithread.random.images.copyteximage2d.12,Crash
# https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17878
KHR-Single-GL46.enhanced_layouts.xfb_all_stages,Crash

View file

@ -13,6 +13,9 @@ dEQP-GLES3.functional.texture.compressed.astc.void_extent_ldr.8x5,Fail
dEQP-GLES3.functional.texture.compressed.astc.void_extent_ldr.8x6,Fail
dEQP-GLES3.functional.texture.compressed.astc.void_extent_ldr.8x8,Fail
# https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17878
KHR-Single-GL46.enhanced_layouts.xfb_all_stages,Crash
glx@glx-swap-pixmap-bad,Fail
# failed to create drawable

View file

@ -12,3 +12,13 @@ KHR-GL46.tessellation_shader.tessellation_control_to_tessellation_evaluation.gl_
KHR-GL46.texture_swizzle.functional
KHR-GL46.texture_swizzle.smoke
KHR-GLES31.core.tessellation_shader.tessellation_control_to_tessellation_evaluation.gl_MaxPatchVertices_Position_PointSize
KHR-Single-GL46.arrays_of_arrays_gl.AtomicDeclaration
KHR-Single-GL46.arrays_of_arrays_gl.AtomicUsage
KHR-Single-GL46.arrays_of_arrays_gl.ConstructorsAndUnsizedDeclConstructorSizing1
KHR-Single-GL46.arrays_of_arrays_gl.SizedDeclarationsPrimitive
KHR-Single-GL46.arrays_of_arrays_gl.SubroutineArgumentAliasing2
KHR-Single-GL46.arrays_of_arrays_gl.SubroutineArgumentAliasing4
KHR-Single-GL46.enhanced_layouts.ssb_member_align_non_power_of_2
KHR-Single-GL46.enhanced_layouts.ssb_member_invalid_offset_alignment
KHR-Single-GL46.enhanced_layouts.uniform_block_member_invalid_offset_alignment

View file

@ -12,3 +12,6 @@ dEQP-GLES3.functional.texture.compressed.astc.void_extent_ldr.6x6,Fail
dEQP-GLES3.functional.texture.compressed.astc.void_extent_ldr.8x5,Fail
dEQP-GLES3.functional.texture.compressed.astc.void_extent_ldr.8x6,Fail
dEQP-GLES3.functional.texture.compressed.astc.void_extent_ldr.8x8,Fail
# https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17878
KHR-Single-GL46.enhanced_layouts.xfb_all_stages,Crash