From 446bf13e487ac287062cc38779d6bfd20d9c2651 Mon Sep 17 00:00:00 2001 From: Emma Anholt Date: Mon, 12 Jul 2021 14:39:30 -0700 Subject: [PATCH] ci: Make sure that we build the piglit dmabuf tests. Force the option rather than relying on autodetection -- ARM runners were apparently finding the necessary deps, but the x86 rootfs (radeonsi, iris) and x86_test-gl container (i915g) were not. Reviewed-by: Tomeu Vizoso Part-of: --- .gitlab-ci.yml | 4 ++-- .gitlab-ci/container/debian/x86_test-gl.sh | 3 ++- .gitlab-ci/container/lava_build.sh | 4 +++- .../drivers/i915/ci/piglit-i915-g33-fails.txt | 10 -------- .../radeonsi/ci/piglit-radeonsi-stoney-fails.txt | 27 ---------------------- 5 files changed, 7 insertions(+), 41 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c1494aa..79222f9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -425,7 +425,7 @@ debian/x86_test-gl: variables: FDO_DISTRIBUTION_EXEC: 'env KERNEL_URL=${KERNEL_URL} FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/container/${CI_JOB_NAME}.sh' KERNEL_URL: &kernel-rootfs-url "https://gitlab.freedesktop.org/gfx-ci/linux/-/archive/v5.13-rc5-for-mesa-ci-27df41f1e0cf/linux-v5.13-rc5-for-mesa-ci-27df41f1e0cf.tar.bz2" - MESA_IMAGE_TAG: &debian-x86_test-gl "2021-07-06-latest-virglrenderer" + MESA_IMAGE_TAG: &debian-x86_test-gl "2021-07-12-dmabuf" # Debian 11 based x86 test image for VK debian/x86_test-vk: @@ -480,7 +480,7 @@ fedora/x86_build: variables: GIT_STRATEGY: fetch KERNEL_URL: *kernel-rootfs-url - MESA_ROOTFS_TAG: &kernel-rootfs "2021-07-02-bump-libdrm" + MESA_ROOTFS_TAG: &kernel-rootfs "2021-07-12-dmabuf" DISTRIBUTION_TAG: &distribution-tag-arm "${MESA_ROOTFS_TAG}--${MESA_ARTIFACTS_TAG}--${MESA_TEMPLATES_COMMIT}" script: - .gitlab-ci/container/lava_build.sh diff --git a/.gitlab-ci/container/debian/x86_test-gl.sh b/.gitlab-ci/container/debian/x86_test-gl.sh index 3e265fd..05b1b9b 100644 --- a/.gitlab-ci/container/debian/x86_test-gl.sh +++ b/.gitlab-ci/container/debian/x86_test-gl.sh @@ -34,6 +34,7 @@ STABLE_EPHEMERAL=" \ libwaffle-dev \ libwayland-dev \ libx11-xcb-dev \ + libxcb-dri2-0-dev \ libxext-dev \ libxkbcommon-dev \ libxrender-dev \ @@ -96,7 +97,7 @@ mkdir -p /lava-files/ ############### Build piglit -PIGLIT_OPTS="-DPIGLIT_BUILD_CL_TESTS=ON" . .gitlab-ci/container/build-piglit.sh +PIGLIT_OPTS="-DPIGLIT_BUILD_CL_TESTS=ON -DPIGLIT_BUILD_DMA_BUF_TESTS=ON" . .gitlab-ci/container/build-piglit.sh ############### Build Crosvm diff --git a/.gitlab-ci/container/lava_build.sh b/.gitlab-ci/container/lava_build.sh index 88a78c2..288fb41 100755 --- a/.gitlab-ci/container/lava_build.sh +++ b/.gitlab-ci/container/lava_build.sh @@ -75,6 +75,7 @@ apt-get install -y --no-remove \ debootstrap \ git \ glslang-tools \ + libdrm-dev \ libegl1-mesa-dev \ libgbm-dev \ libgles2-mesa-dev \ @@ -85,6 +86,7 @@ apt-get install -y --no-remove \ libwaffle-dev \ libwayland-dev \ libx11-xcb-dev \ + libxcb-dri2-0-dev \ libxkbcommon-dev \ patch \ python3-distutils \ @@ -136,7 +138,7 @@ mv /deqp /lava-files/rootfs-${DEBIAN_ARCH}/. ############### Build piglit -. .gitlab-ci/container/build-piglit.sh +PIGLIT_OPTS="-DPIGLIT_BUILD_DMA_BUF_TESTS=ON" . .gitlab-ci/container/build-piglit.sh mv /piglit /lava-files/rootfs-${DEBIAN_ARCH}/. diff --git a/src/gallium/drivers/i915/ci/piglit-i915-g33-fails.txt b/src/gallium/drivers/i915/ci/piglit-i915-g33-fails.txt index 53a82aa..50d0e79 100644 --- a/src/gallium/drivers/i915/ci/piglit-i915-g33-fails.txt +++ b/src/gallium/drivers/i915/ci/piglit-i915-g33-fails.txt @@ -414,21 +414,12 @@ spec@ext_framebuffer_object@getteximage-formats init-by-rendering,Crash spec@ext_image_dma_buf_import@ext_image_dma_buf_import-export,Fail spec@ext_image_dma_buf_import@ext_image_dma_buf_import-export-tex,Fail spec@ext_image_dma_buf_import@ext_image_dma_buf_import-intel_external_sampler_only,Fail -spec@ext_image_dma_buf_import@ext_image_dma_buf_import-invalid_attributes,Fail -spec@ext_image_dma_buf_import@ext_image_dma_buf_import-invalid_hints,Fail -spec@ext_image_dma_buf_import@ext_image_dma_buf_import-missing_attributes,Fail -spec@ext_image_dma_buf_import@ext_image_dma_buf_import-ownership_transfer,Fail -spec@ext_image_dma_buf_import@ext_image_dma_buf_import-refcount,Fail spec@ext_image_dma_buf_import@ext_image_dma_buf_import-reimport-bug,Fail -spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_argb8888,Fail -spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_ayuv,Fail spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_nv12,Fail spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_p010,Fail spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_p012,Fail spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_p016,Fail spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_uyvy,Fail -spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_xrgb8888,Fail -spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_xyuv,Fail spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y210,Fail spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y212,Fail spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y216,Fail @@ -439,7 +430,6 @@ spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_yuv420,Fail spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_yuyv,Fail spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_yvu420,Fail spec@ext_image_dma_buf_import@ext_image_dma_buf_import-transcode-nv12-as-r8-gr88,Fail -spec@ext_image_dma_buf_import@ext_image_dma_buf_import-unsupported_format,Fail spec@ext_occlusion_query_boolean@any-samples,Fail spec@ext_packed_depth_stencil@depth_stencil texture,Fail spec@ext_packed_depth_stencil@fbo-clear-formats,Fail diff --git a/src/gallium/drivers/radeonsi/ci/piglit-radeonsi-stoney-fails.txt b/src/gallium/drivers/radeonsi/ci/piglit-radeonsi-stoney-fails.txt index b0dbb13..c7f849b 100644 --- a/src/gallium/drivers/radeonsi/ci/piglit-radeonsi-stoney-fails.txt +++ b/src/gallium/drivers/radeonsi/ci/piglit-radeonsi-stoney-fails.txt @@ -56,35 +56,8 @@ spec@ext_framebuffer_multisample@turn-on-off 2,Fail spec@ext_framebuffer_multisample@turn-on-off 4,Fail spec@ext_framebuffer_multisample@turn-on-off 6,Fail spec@ext_framebuffer_multisample@turn-on-off 8,Fail -spec@ext_image_dma_buf_import@ext_image_dma_buf_import-export,Fail -spec@ext_image_dma_buf_import@ext_image_dma_buf_import-export-tex,Fail -spec@ext_image_dma_buf_import@ext_image_dma_buf_import-intel_external_sampler_only,Fail -spec@ext_image_dma_buf_import@ext_image_dma_buf_import-invalid_attributes,Fail -spec@ext_image_dma_buf_import@ext_image_dma_buf_import-invalid_hints,Fail -spec@ext_image_dma_buf_import@ext_image_dma_buf_import-missing_attributes,Fail -spec@ext_image_dma_buf_import@ext_image_dma_buf_import-ownership_transfer,Fail -spec@ext_image_dma_buf_import@ext_image_dma_buf_import-refcount,Fail -spec@ext_image_dma_buf_import@ext_image_dma_buf_import-reimport-bug,Fail -spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_argb8888,Fail -spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_ayuv,Fail -spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_nv12,Fail -spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_p010,Fail -spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_p012,Fail -spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_p016,Fail -spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_uyvy,Fail -spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_xrgb8888,Fail -spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_xyuv,Fail -spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y210,Fail -spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y212,Fail spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y216,Fail -spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y410,Fail -spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y412,Fail -spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y416,Fail -spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_yuv420,Fail spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_yuyv,Fail -spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_yvu420,Fail -spec@ext_image_dma_buf_import@ext_image_dma_buf_import-transcode-nv12-as-r8-gr88,Fail -spec@ext_image_dma_buf_import@ext_image_dma_buf_import-unsupported_format,Fail spec@ext_packed_float@texwrap formats bordercolor-swizzled,Fail spec@ext_packed_float@texwrap formats bordercolor-swizzled@GL_R11F_G11F_B10F- swizzled- border color only,Fail spec@ext_texture_compression_rgtc@texwrap formats bordercolor-swizzled,Fail -- 2.7.4