Module: Mesa Branch: master Commit: ef28b1b30feee489d159670d989fd3293f4d3c7d URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ef28b1b30feee489d159670d989fd3293f4d3c7d
Author: Andres Gomez <[email protected]> Date: Mon Aug 17 12:09:56 2020 +0300 ci: update piglit's version so it features replayer We also need that summary's aggregate command can use JUnit as backend, a cross-compilation fix for its CMakeList.txt, a fix for the JUnit backend and a small change in replayer's compare output. v2: - Updated the piglit commit so it features another couple of needed fixes. Signed-off-by: Andres Gomez <[email protected]> Reviewed-by: Christian Gmeiner <[email protected]> [v1] Reviewed-by: Tomeu Vizoso <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6388> --- .gitlab-ci.yml | 4 ++-- .gitlab-ci/build-piglit.sh | 2 +- .gitlab-ci/piglit/glslparser.txt | 11 +++++++---- .gitlab-ci/piglit/quick_gl.txt | 14 ++++++++++---- .gitlab-ci/piglit/quick_shader.txt | 33 ++++++++++++++++++++++++++++++--- 5 files changed, 50 insertions(+), 14 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d78dca26e85..d8fd635635d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -361,13 +361,13 @@ x86_test-base: x86_test-gl: extends: .use-x86_test-base variables: - MESA_IMAGE_TAG: &x86_test-gl "2020-12-17-install-ci-fairy" + MESA_IMAGE_TAG: &x86_test-gl "2020-12-18-piglit-replayer" # Debian 10 based x86 test image for VK x86_test-vk: extends: .use-x86_test-base variables: - MESA_IMAGE_TAG: &x86_test-vk "2020-12-17-install-ci-fairy" + MESA_IMAGE_TAG: &x86_test-vk "2020-12-18-piglit-replayer" # Debian 10 based ARM build image arm_build: diff --git a/.gitlab-ci/build-piglit.sh b/.gitlab-ci/build-piglit.sh index 2fd0f9547da..bdde78c40cf 100644 --- a/.gitlab-ci/build-piglit.sh +++ b/.gitlab-ci/build-piglit.sh @@ -8,7 +8,7 @@ fi git clone https://gitlab.freedesktop.org/mesa/piglit.git --single-branch --no-checkout /piglit pushd /piglit -git checkout 404862743cf8a7b37a4e3a93b4ba1858d59cd4ab +git checkout c702d2bbf28b01a18ce613f386a4ffef03f6c0c9 patch -p1 <$OLDPWD/.gitlab-ci/piglit/disable-vs_in.diff cmake -S . -B . -G Ninja -DCMAKE_BUILD_TYPE=Release $PIGLIT_OPTS ninja diff --git a/.gitlab-ci/piglit/glslparser.txt b/.gitlab-ci/piglit/glslparser.txt index 785f9f13923..824aa502c29 100644 --- a/.gitlab-ci/piglit/glslparser.txt +++ b/.gitlab-ci/piglit/glslparser.txt @@ -194,6 +194,7 @@ spec/amd_vertex_shader_layer/preprocessor/disabled-undefined-core.tese: skip spec/amd_vertex_shader_layer/preprocessor/disabled-undefined-core.vert: skip spec/amd_vertex_shader_layer/preprocessor/enabled-compat.frag: skip spec/amd_vertex_shader_layer/preprocessor/enabled-compat.vert: skip +spec/amd_vertex_shader_viewport_index/compiler/vs-redeclares-pervertex-out-viewport-index-compat.vert: skip spec/amd_vertex_shader_viewport_index/preprocessor/disabled-defined-core.comp: skip spec/amd_vertex_shader_viewport_index/preprocessor/disabled-defined-core.frag: skip spec/amd_vertex_shader_viewport_index/preprocessor/disabled-defined-core.geom: skip @@ -367,6 +368,8 @@ spec/arb_draw_instanced/preprocessor/disabled-undefined-core.geom: skip spec/arb_draw_instanced/preprocessor/disabled-undefined-core.tesc: skip spec/arb_draw_instanced/preprocessor/disabled-undefined-core.tese: skip spec/arb_draw_instanced/preprocessor/disabled-undefined-core.vert: skip +spec/arb_enhanced_layouts/compiler/block-member-locations/arrayed-block-member-location.frag: fail +spec/arb_enhanced_layouts/compiler/block-member-locations/arrayed-block-member-location.vert: fail spec/arb_enhanced_layouts/preprocessor/disabled-defined-core.comp: skip spec/arb_enhanced_layouts/preprocessor/disabled-defined-core.frag: skip spec/arb_enhanced_layouts/preprocessor/disabled-defined-core.geom: skip @@ -2572,10 +2575,10 @@ spec/oes_texture_storage_multisample_2d_array/preprocessor/disabled-undefined-es summary: name: results ---- -------- - pass: 12264 - fail: 2 + pass: 12265 + fail: 4 crash: 4 - skip: 2565 + skip: 2566 timeout: 0 warn: 0 incomplete: 0 @@ -2584,4 +2587,4 @@ summary: changes: 0 fixes: 0 regressions: 0 - total: 14835 + total: 14839 diff --git a/.gitlab-ci/piglit/quick_gl.txt b/.gitlab-ci/piglit/quick_gl.txt index 104d2f6cd01..148f0d5c0e5 100644 --- a/.gitlab-ci/piglit/quick_gl.txt +++ b/.gitlab-ci/piglit/quick_gl.txt @@ -1,3 +1,4 @@ +fast_color_clear/fcc-clear-tex: skip glx/extension string sanity: fail glx/glx-buffer-age: skip glx/glx-buffer-age vblank_mode=0: skip @@ -913,8 +914,13 @@ spec/ext_direct_state_access/named-buffers 15/mapnamedbufferrangeext: skip spec/ext_direct_state_access/named-buffers 15/namedcopybuffersubdataext: skip spec/ext_external_objects/memory-object-api-errors: skip spec/ext_external_objects/semaphore-api-errors: skip +spec/ext_external_objects/vk-buf-exchange: skip spec/ext_external_objects/vk-image-display: skip -spec/ext_external_objects/vk-image-override: skip +spec/ext_external_objects/vk-image-display-overwrite: skip +spec/ext_external_objects/vk-image-overwrite: skip +spec/ext_external_objects/vk-pix-buf-update-errors: skip +spec/ext_external_objects/vk-vert-buf-reuse: skip +spec/ext_external_objects/vk-vert-buf-update-errors: skip spec/ext_external_objects_fd/memory-object-api-errors: skip spec/ext_external_objects_fd/semaphore-api-errors: skip spec/ext_framebuffer_blit/fbo-blit-check-limits: fail @@ -1655,10 +1661,10 @@ wgl/wgl-sanity: skip summary: name: results ---- -------- - pass: 23075 + pass: 23082 fail: 197 crash: 0 - skip: 1433 + skip: 1439 timeout: 0 warn: 6 incomplete: 0 @@ -1667,4 +1673,4 @@ summary: changes: 0 fixes: 0 regressions: 0 - total: 24729 + total: 24742 diff --git a/.gitlab-ci/piglit/quick_shader.txt b/.gitlab-ci/piglit/quick_shader.txt index a4b3a5ccc4f..4e7539abd28 100644 --- a/.gitlab-ci/piglit/quick_shader.txt +++ b/.gitlab-ci/piglit/quick_shader.txt @@ -15,6 +15,7 @@ spec/arb_bindless_texture/execution/samplers/basic-ubo-texture2d: skip spec/arb_bindless_texture/execution/samplers/explicit-texture-binding: skip spec/arb_bindless_texture/execution/samplers/fs-const-index-three-dimensions: skip spec/arb_bindless_texture/execution/samplers/fs-struct-non-const-index: skip +spec/arb_bindless_texture/execution/samplers/sampler-in-struct: skip spec/arb_bindless_texture/execution/samplers/sampler-vertex-attrib-input-output: skip spec/arb_bindless_texture/execution/samplers/sampler-vertex-uniform-input-output: skip spec/arb_bindless_texture/execution/samplers/ubo-named-block: skip @@ -561,6 +562,32 @@ spec/nv_shader_atomic_float/execution/shared-atomicadd-float: skip spec/nv_shader_atomic_float/execution/shared-atomicexchange-float: skip spec/nv_shader_atomic_float/execution/ssbo-atomicadd-float: skip spec/nv_shader_atomic_float/execution/ssbo-atomicexchange-float: skip +spec/nv_shader_atomic_int64/execution/shared-atomicadd-int: skip +spec/nv_shader_atomic_int64/execution/shared-atomicand-int: skip +spec/nv_shader_atomic_int64/execution/shared-atomicand-uint: skip +spec/nv_shader_atomic_int64/execution/shared-atomiccompswap-int: skip +spec/nv_shader_atomic_int64/execution/shared-atomicexchange-int: skip +spec/nv_shader_atomic_int64/execution/shared-atomicmax-int: skip +spec/nv_shader_atomic_int64/execution/shared-atomicmax-uint: skip +spec/nv_shader_atomic_int64/execution/shared-atomicmin-int: skip +spec/nv_shader_atomic_int64/execution/shared-atomicmin-uint: skip +spec/nv_shader_atomic_int64/execution/shared-atomicor-int: skip +spec/nv_shader_atomic_int64/execution/shared-atomicor-uint: skip +spec/nv_shader_atomic_int64/execution/shared-atomicxor-int: skip +spec/nv_shader_atomic_int64/execution/shared-atomicxor-uint: skip +spec/nv_shader_atomic_int64/execution/ssbo-atomicadd-int: skip +spec/nv_shader_atomic_int64/execution/ssbo-atomicand-int: skip +spec/nv_shader_atomic_int64/execution/ssbo-atomicand-uint: skip +spec/nv_shader_atomic_int64/execution/ssbo-atomiccompswap-int: skip +spec/nv_shader_atomic_int64/execution/ssbo-atomicexchange-int: skip +spec/nv_shader_atomic_int64/execution/ssbo-atomicmax-int: skip +spec/nv_shader_atomic_int64/execution/ssbo-atomicmax-uint: skip +spec/nv_shader_atomic_int64/execution/ssbo-atomicmin-int: skip +spec/nv_shader_atomic_int64/execution/ssbo-atomicmin-uint: skip +spec/nv_shader_atomic_int64/execution/ssbo-atomicor-int: skip +spec/nv_shader_atomic_int64/execution/ssbo-atomicor-uint: skip +spec/nv_shader_atomic_int64/execution/ssbo-atomicxor-int: skip +spec/nv_shader_atomic_int64/execution/ssbo-atomicxor-uint: skip spec/nv_viewport_array2/execution/viewport_broadcast: skip spec/nv_viewport_array2/execution/viewport_non_relative_broadcast: skip spec/nv_viewport_array2/execution/viewport_relative_broadcast: skip @@ -569,10 +596,10 @@ spec/nv_viewport_swizzle/viewport_swizzle: skip summary: name: results ---- -------- - pass: 15807 + pass: 15808 fail: 83 crash: 170 - skip: 315 + skip: 342 timeout: 0 warn: 0 incomplete: 0 @@ -581,4 +608,4 @@ summary: changes: 0 fixes: 0 regressions: 0 - total: 16375 + total: 16403 _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
