diff --git a/.gitlab-ci/build/gitlab-ci.yml b/.gitlab-ci/build/gitlab-ci.yml index 28fab7d1eee..5e039a3774a 100644 --- a/.gitlab-ci/build/gitlab-ci.yml +++ b/.gitlab-ci/build/gitlab-ci.yml @@ -84,6 +84,7 @@ debian-testing: -D spirv-to-dxil=true -D valgrind=false MINIO_ARTIFACT_NAME: mesa-amd64 + LLVM_VERSION: "13" script: - .gitlab-ci/lava/lava-pytest.sh - .gitlab-ci/meson/build.sh diff --git a/.gitlab-ci/container/create-rootfs.sh b/.gitlab-ci/container/create-rootfs.sh index 1bd09a68d2f..7b529ec7016 100644 --- a/.gitlab-ci/container/create-rootfs.sh +++ b/.gitlab-ci/container/create-rootfs.sh @@ -11,6 +11,11 @@ if [ $DEBIAN_ARCH = arm64 ]; then libvulkan-dev " elif [ $DEBIAN_ARCH = amd64 ]; then + # Add llvm 13 to the build image + apt-get -y install --no-install-recommends wget gnupg2 software-properties-common + apt-key add /llvm-snapshot.gpg.key + add-apt-repository "deb https://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-13 main" + ARCH_PACKAGES="firmware-amd-graphics inetutils-syslogd iptables @@ -20,6 +25,7 @@ elif [ $DEBIAN_ARCH = amd64 ]; then libfdt1 libgl1 libglu1-mesa + libllvm13 libllvm11 libva2 libva-drm2 @@ -37,6 +43,7 @@ INSTALL_CI_FAIRY_PACKAGES="git python3-wheel " +apt-get update apt-get -y install --no-install-recommends \ $ARCH_PACKAGES \ $INSTALL_CI_FAIRY_PACKAGES \ @@ -192,6 +199,8 @@ UNNEEDED_PACKAGES="apt libapt-pkg6.0 "\ "libgles2-mesa-dev "\ "libglx-mesa0 "\ "mesa-common-dev "\ +"gnupg2 "\ +"software-properties-common " \ # Removing unneeded packages for PACKAGE in ${UNNEEDED_PACKAGES} diff --git a/.gitlab-ci/container/debian/llvm-snapshot.gpg.key b/.gitlab-ci/container/debian/llvm-snapshot.gpg.key new file mode 100644 index 00000000000..aa6b105aa3d --- /dev/null +++ b/.gitlab-ci/container/debian/llvm-snapshot.gpg.key @@ -0,0 +1,52 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.12 (GNU/Linux) + +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 +bXb5c6gCHESH5PXwPU4jQEE7Ib9J6sbk7ZT2Mw== +=j+4q +-----END PGP PUBLIC KEY BLOCK----- diff --git a/.gitlab-ci/container/debian/x86_build-base.sh b/.gitlab-ci/container/debian/x86_build-base.sh index 0a56d479bf2..042d6c9ae2c 100644 --- a/.gitlab-ci/container/debian/x86_build-base.sh +++ b/.gitlab-ci/container/debian/x86_build-base.sh @@ -5,7 +5,11 @@ set -o xtrace export DEBIAN_FRONTEND=noninteractive -apt-get install -y ca-certificates +apt-get install -y ca-certificates gnupg2 software-properties-common + +# Add llvm 13 to the build image +apt-key add .gitlab-ci/container/debian/llvm-snapshot.gpg.key +add-apt-repository "deb https://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-13 main" sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list @@ -30,6 +34,7 @@ apt-get install -y --no-remove \ git \ glslang-tools \ kmod \ + libclang-13-dev \ libclang-11-dev \ libclang-9-dev \ libclc-dev \ @@ -37,6 +42,7 @@ apt-get install -y --no-remove \ libepoxy-dev \ libexpat1-dev \ libgtk-3-dev \ + libllvm13 \ libllvm11 \ libllvm9 \ libomxil-bellagio-dev \ diff --git a/.gitlab-ci/container/debian/x86_build.sh b/.gitlab-ci/container/debian/x86_build.sh index e2695564ea5..56bf406203c 100644 --- a/.gitlab-ci/container/debian/x86_build.sh +++ b/.gitlab-ci/container/debian/x86_build.sh @@ -23,6 +23,7 @@ apt-get install -y --no-remove \ clang \ libasan6 \ libarchive-dev \ + libclang-cpp13-dev \ libclang-cpp11-dev \ libgbm-dev \ libglvnd-dev \ @@ -38,6 +39,7 @@ apt-get install -y --no-remove \ libxcb-xfixes0-dev \ libxcb1-dev \ libxml2-dev \ + llvm-13-dev \ llvm-11-dev \ llvm-9-dev \ ocl-icd-opencl-dev \ diff --git a/.gitlab-ci/container/debian/x86_test-base.sh b/.gitlab-ci/container/debian/x86_test-base.sh index 7d56e7825f7..9d522ee5a84 100644 --- a/.gitlab-ci/container/debian/x86_test-base.sh +++ b/.gitlab-ci/container/debian/x86_test-base.sh @@ -5,7 +5,7 @@ set -o xtrace export DEBIAN_FRONTEND=noninteractive -apt-get install -y ca-certificates +apt-get install -y ca-certificates gnupg2 software-properties-common sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list @@ -19,6 +19,10 @@ STABLE_EPHEMERAL=" \ python3-wheel \ " +# Add llvm 13 to the build image +apt-key add .gitlab-ci/container/debian/llvm-snapshot.gpg.key +add-apt-repository "deb https://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-13 main" + apt-get update apt-get dist-upgrade -y @@ -27,6 +31,7 @@ apt-get install -y --no-remove \ git-lfs \ libasan6 \ libexpat1 \ + libllvm13 \ libllvm11 \ libllvm9 \ liblz4-1 \ diff --git a/.gitlab-ci/container/debian/x86_test-gl.sh b/.gitlab-ci/container/debian/x86_test-gl.sh index 9dc8b395d7c..33c7d0c4de2 100644 --- a/.gitlab-ci/container/debian/x86_test-gl.sh +++ b/.gitlab-ci/container/debian/x86_test-gl.sh @@ -13,6 +13,7 @@ STABLE_EPHEMERAL=" \ bison \ bzip2 \ ccache \ + clang-13 \ clang-11 \ cmake \ flex \ @@ -20,6 +21,7 @@ STABLE_EPHEMERAL=" \ glslang-tools \ libasound2-dev \ libcap-dev \ + libclang-cpp13-dev \ libclang-cpp11-dev \ libelf-dev \ libexpat1-dev \ @@ -37,6 +39,7 @@ STABLE_EPHEMERAL=" \ libxext-dev \ libxkbcommon-dev \ libxrender-dev \ + llvm-13-dev \ llvm-11-dev \ llvm-spirv \ make \ @@ -48,11 +51,15 @@ STABLE_EPHEMERAL=" \ xz-utils \ " +apt-get update + apt-get install -y --no-remove \ $STABLE_EPHEMERAL \ clinfo \ iptables \ + libclang-common-13-dev \ libclang-common-11-dev \ + libclang-cpp13 \ libclang-cpp11 \ libcap2 \ libegl1 \ diff --git a/.gitlab-ci/container/lava_build.sh b/.gitlab-ci/container/lava_build.sh index d2b61c07359..776a055a8e9 100755 --- a/.gitlab-ci/container/lava_build.sh +++ b/.gitlab-ci/container/lava_build.sh @@ -214,7 +214,9 @@ fi set -e cp .gitlab-ci/container/create-rootfs.sh /lava-files/rootfs-${DEBIAN_ARCH}/. +cp .gitlab-ci/container/debian/llvm-snapshot.gpg.key /lava-files/rootfs-${DEBIAN_ARCH}/. chroot /lava-files/rootfs-${DEBIAN_ARCH} sh /create-rootfs.sh +rm /lava-files/rootfs-${DEBIAN_ARCH}/llvm-snapshot.gpg.key rm /lava-files/rootfs-${DEBIAN_ARCH}/create-rootfs.sh diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index b0c37b218e1..7b3a3e6a7a3 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -1,21 +1,21 @@ variables: DEBIAN_X86_BUILD_BASE_IMAGE: "debian/x86_build-base" - DEBIAN_BASE_TAG: "2022-06-27-libvulkan" + DEBIAN_BASE_TAG: "2022-07-01-bb-llvm13" DEBIAN_X86_BUILD_IMAGE_PATH: "debian/x86_build" - DEBIAN_BUILD_TAG: "2022-06-16-Debian-MinGW" + DEBIAN_BUILD_TAG: "2022-07-01-db-llvm13" DEBIAN_X86_BUILD_MINGW_IMAGE_PATH: "debian/x86_build-mingw" - DEBIAN_BUILD_MINGW_TAG: "2022-06-16-Debian-MinGW" + DEBIAN_BUILD_MINGW_TAG: "2022-07-01-dmgw-llvm13" DEBIAN_X86_TEST_BASE_IMAGE: "debian/x86_test-base" DEBIAN_X86_TEST_IMAGE_PATH: "debian/x86_test-gl" - DEBIAN_X86_TEST_GL_TAG: "2022-06-21-apitrace-linux" - DEBIAN_X86_TEST_VK_TAG: "2022-06-22-dxvk-1.10.1" + DEBIAN_X86_TEST_GL_TAG: "2022-07-01-gl-llvm13" + DEBIAN_X86_TEST_VK_TAG: "2022-07-01-vk-llvm13" FEDORA_X86_BUILD_TAG: "2022-04-24-spirv-tools-5" - KERNEL_ROOTFS_TAG: "2022-06-21-apitrace-linux" + KERNEL_ROOTFS_TAG: "2022-07-01-krfs-llvm13" WINDOWS_X64_VS_PATH: "windows/x64_vs" WINDOWS_X64_VS_TAG: "2022-06-15-vs-winsdk" diff --git a/src/gallium/drivers/llvmpipe/ci/llvmpipe-skips.txt b/src/gallium/drivers/llvmpipe/ci/llvmpipe-skips.txt index f50b4c819af..dabe47e4340 100644 --- a/src/gallium/drivers/llvmpipe/ci/llvmpipe-skips.txt +++ b/src/gallium/drivers/llvmpipe/ci/llvmpipe-skips.txt @@ -30,3 +30,7 @@ longprim # Unreliable on shared runners due to timing ext_timer_query@time-elapsed spec@arb_timer_query@query gl_timestamp + +# These tests started hitting timeouts when we upgraded LLVM from v11 to 13 +spec@arb_texture_rg@fbo-blending-formats +spec@ext_framebuffer_object@fbo-blending-formats diff --git a/src/gallium/drivers/virgl/ci/virpipe-gl-skips.txt b/src/gallium/drivers/virgl/ci/virpipe-gl-skips.txt index e2524e4be22..1a0237d5b1f 100644 --- a/src/gallium/drivers/virgl/ci/virpipe-gl-skips.txt +++ b/src/gallium/drivers/virgl/ci/virpipe-gl-skips.txt @@ -14,3 +14,7 @@ spec@arb_compute_shader@local-id-explosion KHR-GL43.texture_swizzle.smoke KHR-GL43.texture_swizzle.functional KHR-GL43.copy_image.functional + +# These tests started hitting timeouts when we upgraded LLVM from v11 to 13 +spec@arb_texture_rg@fbo-blending-formats +spec@ext_framebuffer_object@fbo-blending-formats diff --git a/src/gallium/drivers/zink/ci/zink-lvp-skips.txt b/src/gallium/drivers/zink/ci/zink-lvp-skips.txt index 1ccfe666706..e6aa12bc0c0 100644 --- a/src/gallium/drivers/zink/ci/zink-lvp-skips.txt +++ b/src/gallium/drivers/zink/ci/zink-lvp-skips.txt @@ -36,3 +36,6 @@ KHR-GL46.texture_swizzle.functional # Kopper regression glx@glx-tfp + +# These tests started hitting timeouts when we upgraded LLVM from v11 to 13 +spec@arb_texture_rg@fbo-blending-formats diff --git a/src/gallium/drivers/zink/ci/zink-radv-fails.txt b/src/gallium/drivers/zink/ci/zink-radv-fails.txt index cbb8293d2e1..7714c3858ad 100644 --- a/src/gallium/drivers/zink/ci/zink-radv-fails.txt +++ b/src/gallium/drivers/zink/ci/zink-radv-fails.txt @@ -618,3 +618,7 @@ spec@!opengl 3.2@gl-3.2-adj-prims line cull-front pv-first,Fail spec@!opengl 3.2@gl-3.2-adj-prims pv-first,Fail spec@!opengl es 2.0@glsl-fs-pointcoord,Fail spec@!opengl es 3.0@gles-3.0-transform-feedback-uniform-buffer-object,Fail + +# Regression introduced by moving from LLVM 11 to 13 +dEQP-GLES2.functional.shaders.random.basic_expression.fragment.70,Fail +dEQP-GLES3.functional.shaders.random.basic_expression.fragment.70,Fail diff --git a/src/gallium/frontends/lavapipe/ci/lvp-skips.txt b/src/gallium/frontends/lavapipe/ci/lvp-skips.txt index 1e15e3d9728..b5b5f24b0bc 100644 --- a/src/gallium/frontends/lavapipe/ci/lvp-skips.txt +++ b/src/gallium/frontends/lavapipe/ci/lvp-skips.txt @@ -32,3 +32,8 @@ dEQP-VK.tessellation.invariance.outer_triangle_set.triangles_fractional_even_spa dEQP-VK.tessellation.invariance.outer_triangle_set.triangles_fractional_odd_spacing dEQP-VK.graphicsfuzz.cov-int-initialize-from-multiple-large-arrays + +# These tests started hitting timeouts when we upgraded LLVM from v11 to 13 +dEQP-VK.pipeline.fast_linked_library.blend.dual_source.format.r16_unorm.states.color_1ms1a_cc_max_alpha_1msa_1mca_sub-color_o_1mdc_max_alpha_1mda_1ms1c_rsub-color_sas_da_max_alpha_1msa_1msc_add-color_sc_1msc_add_alpha_sas_1ms1a_rsub +dEQP-VK.pipeline.fast_linked_library.blend.format.r16_unorm.states.color_sas_sa_min_alpha_ca_1mda_max-color_1mdc_dc_add_alpha_1mda_sas_rsub-color_sas_1mca_max_alpha_1mca_1mcc_min-color_o_1msa_rsub_alpha_dc_da_min +dEQP-VK.graphicsfuzz.spv-stable-maze-flatten-copy-composite