diff --git a/.gitlab-ci/build/gitlab-ci.yml b/.gitlab-ci/build/gitlab-ci.yml index 206a49ac624..8bd8ceb6a21 100644 --- a/.gitlab-ci/build/gitlab-ci.yml +++ b/.gitlab-ci/build/gitlab-ci.yml @@ -147,15 +147,6 @@ debian-testing-msan: - .gitlab-ci/meson/build.sh - .gitlab-ci/prepare-artifacts.sh -# TODO: remove together with Clover -.debian-clover-testing: - extends: - - .debian-cl-testing - variables: - GALLIUM_ST: > - -D gallium-opencl=icd - -D opencl-spirv=true - debian-rusticl-testing: extends: - .debian-cl-testing @@ -607,21 +598,6 @@ windows-vs2019: EXTRA_OPTION: > -D valgrind=disabled -# TODO: remove with Clover -.debian-clover: - extends: .debian-cl - variables: - GALLIUM_DRIVERS: "r600,radeonsi,swrast" - GALLIUM_ST: > - -D dri3=disabled - -D gallium-vdpau=disabled - -D gallium-omx=disabled - -D gallium-va=disabled - -D gallium-xa=disabled - -D gallium-nine=false - -D gallium-opencl=icd - -D gallium-rusticl=false - debian-rusticl: extends: .debian-cl variables: diff --git a/src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe-clover.toml b/src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe-clover.toml deleted file mode 100644 index 75f48f313fd..00000000000 --- a/src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe-clover.toml +++ /dev/null @@ -1,4 +0,0 @@ -[[piglit]] -piglit_folder = "/piglit" -profile = "cl" -process_isolation = true diff --git a/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml b/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml index 67a019d6284..11f78390e96 100644 --- a/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml +++ b/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml @@ -32,14 +32,6 @@ *llvmpipe_file_list when: on_success -# TODO: remove together with Clover -.llvmpipe-clover-rules: - rules: - - !reference [.llvmpipe-cl-rules, rules] - - changes: - - src/gallium/frontends/clover/**/* - when: on_success - .llvmpipe-rusticl-rules: rules: - !reference [.llvmpipe-cl-rules, rules] @@ -66,19 +58,6 @@ LP_NUM_THREADS: 1 PIGLIT_PROFILES: cl -# TODO: remove together with Clover -.llvmpipe-piglit-clover: - extends: - - .llvmpipe-piglit-cl - - .llvmpipe-clover-rules - needs: - - .debian-clover-testing - - debian/x86_64_test-gl - variables: - LP_CL: 1 - DEQP_SUITE: llvmpipe-clover - GPU_VERSION: llvmpipe-clover - llvmpipe-piglit-rusticl: extends: - .llvmpipe-piglit-cl diff --git a/src/gallium/drivers/llvmpipe/ci/llvmpipe-clover-fails.txt b/src/gallium/drivers/llvmpipe/ci/llvmpipe-clover-fails.txt deleted file mode 100644 index 745c1b98771..00000000000 --- a/src/gallium/drivers/llvmpipe/ci/llvmpipe-clover-fails.txt +++ /dev/null @@ -1,53 +0,0 @@ -# Failed (error code: CL_LINK_PROGRAM_FAILURE): CL_SUCCESS when compiling an empty string.. -api@clbuildprogram,Fail - -# "input.cl:8:10: fatal error: 'include_test.h' file not found" -# build-piglit.sh removes all the *.[ch] files from the piglit tree, so it's a Mesa CI bug. -program@build@include-directories,Fail - -# Expecting 0.000000 (0x0) with tolerance 0.000000 (0 ulps), but got 0.000000 (0x40) -# Error at float[0] -# Argument 0: FAIL -program@execute@amdgcn-f32-inline-immediates,Fail -program@execute@amdgcn-f32-inline-immediates@add integer 64,Fail - -# [Error] At word No.340: "OpenCL.std ldexp: expected the exponent to have the same number of components as Result Type -# %call3_4 = OpExtInst %v2float %1 ldexp %call1_4 %145 -program@execute@builtin@builtin-float-ldexp-1.0.generated,Fail - -# cl-program-tester: ../src/gallium/auxiliary/gallivm/lp_bld_nir.c:341: get_alu_src: Assertion `num_components <= 4' failed. -program@execute@builtin@builtin-float-lgamma_r-1.0.generated,Crash - -# exit status: signal: 11 (core dumped) -program@execute@calls-large-struct,Crash - - -program@execute@calls-struct,Fail -# Argument 0: PASS -# Expecting 14 (0xe) with tolerance 0, but got 114 (0x72) -# Error at int[0] -# Argument 1: FAIL -program@execute@calls-struct@regs struct,Fail -# Expecting 86 (0x56) with tolerance 0, but got 134 (0x86) -# Error at int[0] -# Argument 0: FAIL -# Argument 1: PASS -program@execute@calls-struct@small struct in regs,Fail - - -program@execute@clz-optimizations,Crash - -# Expecting 0 (0x0) with tolerance 0, but got 9 (0x9) -# Error at int[0] -# Argument 0: FAIL -program@execute@global-offset,Fail -program@execute@global-offset@3d- input dependent,Fail - -# Unsupported intrinsic: vec1 32 ssa_25 = intrinsic image_deref_order (ssa_2) (image_dim=2D /*1*/, image_array=false /*0*/, format=none /*0*/, access=16) -program@execute@image-attributes,Crash - -# InvalidModule: Invalid SPIR-V module: vloada_half should be of a half vector type -program@execute@vload@vloada_half-float-constant,Crash -program@execute@vload@vloada_half-float-global,Crash -program@execute@vload@vloada_half-float-local,Crash -program@execute@vload@vloada_half-float-private,Crash diff --git a/src/gallium/drivers/llvmpipe/ci/llvmpipe-clover-flakes.txt b/src/gallium/drivers/llvmpipe/ci/llvmpipe-clover-flakes.txt deleted file mode 100644 index 9ec78c83dac..00000000000 --- a/src/gallium/drivers/llvmpipe/ci/llvmpipe-clover-flakes.txt +++ /dev/null @@ -1,4 +0,0 @@ -program@execute@bswap - -# corrupted size vs. prev_size -program@execute@clz-optimizations diff --git a/src/gallium/drivers/llvmpipe/ci/llvmpipe-clover-skips.txt b/src/gallium/drivers/llvmpipe/ci/llvmpipe-clover-skips.txt deleted file mode 100644 index be776e8e0cf..00000000000 --- a/src/gallium/drivers/llvmpipe/ci/llvmpipe-clover-skips.txt +++ /dev/null @@ -1,4 +0,0 @@ -builtin-float-cos-1.0.generated -builtin-float-sin-1.0.generated -builtin-float-sincos-1.0.generated -builtin-float-tan-1.0.generated