From 70dfe9c6d104eae3d97b1c9a4d5a31a6475d4a22 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Fri, 21 Jun 2024 15:35:45 +0200 Subject: [PATCH] ci: include rusticl in the arm64 build Part-of: --- .gitlab-ci/build/gitlab-ci.yml | 4 ++-- src/broadcom/ci/broadcom-rpi4-fails.txt | 5 ----- src/freedreno/ci/freedreno-a618-fails.txt | 5 +++-- src/freedreno/ci/freedreno-a630-fails.txt | 5 +++-- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/.gitlab-ci/build/gitlab-ci.yml b/.gitlab-ci/build/gitlab-ci.yml index 942d0db4dc1..98d36024cb0 100644 --- a/.gitlab-ci/build/gitlab-ci.yml +++ b/.gitlab-ci/build/gitlab-ci.yml @@ -484,12 +484,13 @@ debian-arm64: DRI_LOADERS: -D glvnd=disabled EXTRA_OPTION: > - -D llvm=disabled -D valgrind=disabled -D imagination-srv=true -D perfetto=true -D freedreno-kmds=msm,virtio -D teflon=true + GALLIUM_ST: + -D gallium-rusticl=true S3_ARTIFACT_NAME: mesa-arm64-default-${BUILDTYPE} script: - .gitlab-ci/meson/build.sh @@ -502,7 +503,6 @@ debian-arm64-asan: DRI_LOADERS: -D glvnd=disabled EXTRA_OPTION: > - -D llvm=disabled -D b_sanitize=address -D valgrind=disabled -D tools=dlclose-skip diff --git a/src/broadcom/ci/broadcom-rpi4-fails.txt b/src/broadcom/ci/broadcom-rpi4-fails.txt index c1808f774ab..36bee712c52 100644 --- a/src/broadcom/ci/broadcom-rpi4-fails.txt +++ b/src/broadcom/ci/broadcom-rpi4-fails.txt @@ -356,11 +356,6 @@ spec@nv_read_depth@read_depth_gles3,Fail spec@oes_point_sprite@arb_point_sprite-checkerboard_gles1,Fail spec@oes_shader_io_blocks@compiler@layout-location-aliasing.vert,Fail -# This crashes only when LLVM is not enabled. This is because Gallium backend -# uses TGSI to do some task that do not contains a sampler; when LLVM is -# enabled, it uses LLVM instead, which is complete. -spec@!opengl 1.0@rasterpos,Crash - # There are two problems here. On one side, hardware do not support # different polygon mode for front and back faces. By default we # choose the mode set for front face, unless we are culling it; in diff --git a/src/freedreno/ci/freedreno-a618-fails.txt b/src/freedreno/ci/freedreno-a618-fails.txt index bc758b7fa2c..a9b04fd890c 100644 --- a/src/freedreno/ci/freedreno-a618-fails.txt +++ b/src/freedreno/ci/freedreno-a618-fails.txt @@ -235,8 +235,9 @@ spec@oes_egl_image_external_essl3@oes_egl_image_external_essl3,Fail # "Failure with Polygon Stipple set to fail mode." spec@!opengl 1.0@gl-1.0-no-op-paths,Fail -# crash in tgsi exec doing st_freedback_draw_vbo(). -spec@!opengl 1.0@rasterpos,Crash +spec@!opengl 1.0@rasterpos,Fail +spec@!opengl 1.0@rasterpos@glsl_vs_gs_linked,Fail +spec@!opengl 1.0@rasterpos@glsl_vs_tes_linked,Fail spec@!opengl 1.1@polygon-mode-facing,Fail spec@!opengl 1.1@polygon-mode,Fail diff --git a/src/freedreno/ci/freedreno-a630-fails.txt b/src/freedreno/ci/freedreno-a630-fails.txt index 553db5c5d2f..4d408bc895d 100644 --- a/src/freedreno/ci/freedreno-a630-fails.txt +++ b/src/freedreno/ci/freedreno-a630-fails.txt @@ -238,8 +238,9 @@ spec@khr_texture_compression_astc@sliced-3d-miptree-gl hdr@HDR Profile,Fail spec@oes_egl_image_external_essl3@oes_egl_image_external_essl3@oes_egl_image_external_essl3_imageStore,Fail spec@oes_egl_image_external_essl3@oes_egl_image_external_essl3,Fail -# crash in tgsi exec doing st_freedback_draw_vbo(). -spec@!opengl 1.0@rasterpos,Crash +spec@!opengl 1.0@rasterpos,Fail +spec@!opengl 1.0@rasterpos@glsl_vs_gs_linked,Fail +spec@!opengl 1.0@rasterpos@glsl_vs_tes_linked,Fail spec@!opengl 1.1@polygon-mode-facing,Fail spec@!opengl 1.1@polygon-mode,Fail