X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.gitlab-ci.yml;h=2765f3972d27017a6a26348601b4649338033cc1;hb=cacb388b3b720b63d17e08aabf2bd86d116f4506;hp=6ffe2bee5ed3f506cb3f75c12fc134018a9e444e;hpb=a1947f059fcf118c879752f72e11f6217eb5f5a0;p=mesa.git diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6ffe2bee5ed..2765f3972d2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,6 +30,7 @@ stages: - radv - lima - virgl + - radeonsi - success # Generic rule to not run the job during scheduled pipelines @@ -64,6 +65,8 @@ pages: test-docs: extends: .docs-base + # Cancel job if a newer commit is pushed to the same branch + interruptible: true stage: container+docs rules: - *ignore_scheduled_pipelines @@ -109,8 +112,6 @@ test-docs: max: 2 when: - runner_system_failure - # Cancel CI run if a newer commit is pushed to the same branch - interruptible: true success: stage: success @@ -203,7 +204,7 @@ x86_build-base: - .fdo.container-build@debian - .container variables: - FDO_DISTRIBUTION_TAG: &x86_build-base "2020-07-21-tracie" + FDO_DISTRIBUTION_TAG: &x86_build-base "2020-07-28-x86-2" .use-x86_build-base: extends: @@ -221,7 +222,7 @@ x86_build: extends: - .use-x86_build-base variables: - FDO_DISTRIBUTION_TAG: &x86_build "2020-07-21-tracie" + FDO_DISTRIBUTION_TAG: &x86_build "2020-08-08-glvnd" .use-x86_build: variables: @@ -235,7 +236,7 @@ i386_build: extends: - .use-x86_build-base variables: - FDO_DISTRIBUTION_TAG: &i386_build "2020-07-21-tracie" + FDO_DISTRIBUTION_TAG: &i386_build "2020-07-28-x86-2" .use-i386_build: variables: @@ -249,7 +250,7 @@ ppc64el_build: extends: - .use-x86_build-base variables: - FDO_DISTRIBUTION_TAG: &ppc64el_build "2020-07-21-tracie" + FDO_DISTRIBUTION_TAG: &ppc64el_build "2020-07-28-x86-2" .use-ppc64el_build: variables: @@ -263,7 +264,7 @@ s390x_build: extends: - .use-x86_build-base variables: - FDO_DISTRIBUTION_TAG: &s390x_build "2020-07-21-tracie" + FDO_DISTRIBUTION_TAG: &s390x_build "2020-07-28-x86-2" .use-s390x_build: variables: @@ -276,7 +277,7 @@ s390x_build: x86_test-base: extends: x86_build-base variables: - FDO_DISTRIBUTION_TAG: &x86_test-base "2020-07-21-tracie" + FDO_DISTRIBUTION_TAG: &x86_test-base "2020-07-28-x86-2" .use-x86_test-base: extends: @@ -293,19 +294,19 @@ x86_test-base: x86_test-gl: extends: .use-x86_test-base variables: - FDO_DISTRIBUTION_TAG: &x86_test-gl "2020-07-21-tracie" + FDO_DISTRIBUTION_TAG: &x86_test-gl "2020-08-14-xcb-shm" # Debian 10 based x86 test image for VK x86_test-vk: extends: .use-x86_test-base variables: - FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-07-21-tracie" + FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-07-28-x86-2" # Debian 9 based x86 build image (old LLVM) x86_build_old: extends: x86_build-base variables: - FDO_DISTRIBUTION_TAG: &x86_build_old "2020-07-21-tracie" + FDO_DISTRIBUTION_TAG: &x86_build_old "2020-07-28-x86-2" FDO_DISTRIBUTION_VERSION: stretch-slim .use-x86_build_old: @@ -321,7 +322,7 @@ arm_build: - .fdo.container-build@debian@arm64v8 - .container variables: - FDO_DISTRIBUTION_TAG: &arm_build "2020-07-21-tracie" + FDO_DISTRIBUTION_TAG: &arm_build "2020-08-04-nfs-2" .use-arm_build: variables: @@ -336,7 +337,7 @@ arm_test-base: - .fdo.container-build@debian - .container variables: - FDO_DISTRIBUTION_TAG: &arm_test-base "2020-07-18-nginx" + FDO_DISTRIBUTION_TAG: &arm_test-base "2020-07-28-libdrm" .use-arm_test-base: extends: @@ -354,7 +355,7 @@ arm64_test: extends: - .use-arm_test-base variables: - FDO_DISTRIBUTION_TAG: &arm64_test "2020-07-18-nginx" + FDO_DISTRIBUTION_TAG: &arm64_test "2020-08-18" .use-arm64_test: variables: @@ -449,6 +450,8 @@ make git archive: # Shared between windows and Linux .build-common: extends: .ci-run-policy + # Cancel job if a newer commit is pushed to the same branch + interruptible: true artifacts: name: "mesa_${CI_JOB_NAME}" when: always @@ -516,11 +519,13 @@ meson-testing: -D platforms=x11 GALLIUM_ST: > -D dri3=enabled - GALLIUM_DRIVERS: "swrast,virgl" + GALLIUM_DRIVERS: "swrast,virgl,radeonsi" VULKAN_DRIVERS: amd BUILDTYPE: "debugoptimized" EXTRA_OPTION: > -D werror=true + UPLOAD_FOR_LAVA: 1 + DEBIAN_ARCH: amd64 script: - .gitlab-ci/meson-build.sh - .gitlab-ci/prepare-artifacts.sh @@ -545,6 +550,7 @@ meson-gallium: -D gallium-nine=true -D gallium-opencl=disabled GALLIUM_DRIVERS: "iris,nouveau,kmsro,r300,r600,freedreno,swr,swrast,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink" + VULKAN_DRIVERS: swrast EXTRA_OPTION: > -D osmesa=gallium -D tools=all @@ -552,6 +558,7 @@ meson-gallium: script: - .gitlab-ci/meson-build.sh - .gitlab-ci/run-shader-db.sh + - src/freedreno/.gitlab-ci/run-fdtools.sh meson-classic: extends: .meson-build @@ -568,6 +575,30 @@ meson-classic: -D tools=all -D werror=true +meson-android: + extends: .meson-build + variables: + UNWIND: "disabled" + DRI_LOADERS: > + -D glx=disabled + -D gbm=disabled + -D egl=enabled + -D platforms=android + GALLIUM_DRIVERS: freedreno + VULKAN_DRIVERS: freedreno,intel,amd + EXTRA_OPTION: > + -D android-stub=true + -D werror=true + GALLIUM_ST: > + -D dri3=disabled + -D gallium-vdpau=disabled + -D gallium-xvmc=disabled + -D gallium-omx=disabled + -D gallium-va=disabled + -D gallium-xa=disabled + -D gallium-nine=false + -D gallium-opencl=disabled + .meson-cross: extends: - .meson-build @@ -636,6 +667,8 @@ meson-arm64-build-test: - .ci-deqp-artifacts variables: VULKAN_DRIVERS: "amd" + EXTRA_OPTION: > + -Dtools=panfrost script: - .gitlab-ci/meson-build.sh @@ -733,6 +766,7 @@ meson-vulkan: VULKAN_DRIVERS: intel,amd,freedreno EXTRA_OPTION: > -D vulkan-overlay-layer=true + -D build-aco-tests=true -D werror=true meson-i386: @@ -784,6 +818,8 @@ meson-mingw32-x86_64: .test: extends: - .ci-run-policy + # Cancel job if a newer commit is pushed to the same branch + interruptible: true variables: GIT_STRATEGY: none # testing doesn't build anything from source before_script: @@ -915,13 +951,12 @@ softpipe-gles2: DEQP_EXPECTED_RENDERER: softpipe softpipe-gles3: - parallel: 2 variables: DEQP_VER: gles3 extends: softpipe-gles2 softpipe-gles31: - parallel: 4 + parallel: 2 variables: DEQP_VER: gles31 extends: softpipe-gles2 @@ -931,6 +966,7 @@ virgl-gles2-on-gl: DEQP_VER: gles2 NIR_VALIDATE: 0 DEQP_NO_SAVE_RESULTS: 1 + DEQP_SKIPS: deqp-virgl-gl-skips.txt # Don't use threads inside llvmpipe, we've already got all cores # busy at the deqp-runner level. LP_NUM_THREADS: 0 @@ -944,14 +980,13 @@ virgl-gles2-on-gl: - .virgl-rules virgl-gles3-on-gl: - parallel: 2 variables: DEQP_VER: gles3 DEQP_RUNNER_OPTIONS: "--timeout 180" extends: virgl-gles2-on-gl virgl-gles31-on-gl: - parallel: 4 + parallel: 2 variables: DEQP_VER: gles31 MESA_GLES_VERSION_OVERRIDE: "3.1" @@ -1019,7 +1054,7 @@ arm64_a630_gles2: BM_KERNEL: /lava-files/cheza-kernel BM_CMDLINE: "ip=dhcp console=ttyMSM0,115200n8 root=/dev/nfs rw nfsrootdebug nfsroot=,tcp,nfsvers=4.2 init=/init" DEQP_EXPECTED_FAILS: deqp-freedreno-a630-fails.txt - DEQP_SKIPS: deqp-freedreno-a630-skips.txt + DEQP_FLAKES: deqp-freedreno-a630-flakes.txt GIT_STRATEGY: none DEQP_EXPECTED_RENDERER: FD630 DEQP_NO_SAVE_RESULTS: "" @@ -1068,7 +1103,9 @@ arm64_a630_traces: variables: BARE_METAL_TEST_SCRIPT: "/install/tracie-runner-gl.sh" DEVICE_NAME: "freedreno-a630" + DRIVER_NAME: "freedreno" TRACIE_NO_UNIT_TESTS: 1 + TRACIE_UPLOAD_TO_MINIO: 1 # This lets us run several more traces which don't use any features we're # missing. MESA_GLSL_VERSION_OVERRIDE: "460" @@ -1115,6 +1152,8 @@ arm64_a630_vk_sysmem: extends: - .ci-run-policy - .test + # Cancel job if a newer commit is pushed to the same branch + interruptible: true stage: test artifacts: when: always @@ -1136,7 +1175,8 @@ arm64_a306_gles2: FLAKES_CHANNEL: "#freedreno-ci" BARE_METAL_TEST_SCRIPT: "/install/deqp-runner.sh" DEQP_EXPECTED_FAILS: deqp-freedreno-a307-fails.txt - DEQP_SKIPS: deqp-freedreno-a307-skips.txt + DEQP_SKIPS: deqp-default-skips.txt + DEQP_FLAKES: deqp-freedreno-a307-flakes.txt DEQP_VER: gles2 DEQP_PARALLEL: 4 DEQP_EXPECTED_RENDERER: FD307 @@ -1182,7 +1222,7 @@ arm64_a530_gles2: # current upstream kernel. BM_CMDLINE: "ip=dhcp console=ttyMSM0,115200n8 nosmp" DEQP_EXPECTED_FAILS: deqp-freedreno-a530-fails.txt - DEQP_SKIPS: deqp-freedreno-a530-skips.txt + DEQP_FLAKES: deqp-freedreno-a530-flakes.txt DEQP_EXPECTED_RENDERER: FD530 NIR_VALIDATE: 0 tags: @@ -1245,6 +1285,9 @@ radv-fossils: # Navi10 (GFX10) - export RADV_FORCE_FAMILY="gfx1010" - ./install/fossilize-runner.sh + # Sienna Cichlid (GFX10) + - export RADV_FORCE_FAMILY="gfx1030" + - ./install/fossilize-runner.sh # Traces CI .traces-test: @@ -1252,6 +1295,8 @@ radv-fossils: key: ${CI_JOB_NAME} paths: - traces-db/ + variables: + TRACIE_UPLOAD_TO_MINIO: 1 .traces-test-gl: extends: @@ -1275,6 +1320,7 @@ llvmpipe-traces: LIBGL_ALWAYS_SOFTWARE: "true" GALLIUM_DRIVER: "llvmpipe" DEVICE_NAME: "gl-vmware-llvmpipe" + DRIVER_NAME: "llvmpipe" radv-polaris10-traces: extends: @@ -1283,9 +1329,21 @@ radv-polaris10-traces: - .test-manual variables: DEVICE_NAME: "vk-amd-polaris10" + DRIVER_NAME: "radv" tags: - polaris10 +radv-raven-traces: + extends: + - .traces-test-vk + - .test-radv + - .test-manual + variables: + DEVICE_NAME: "vk-amd-raven" + DRIVER_NAME: "radv" + tags: + - raven + virgl-traces: extends: - .traces-test-gl @@ -1294,5 +1352,6 @@ virgl-traces: LIBGL_ALWAYS_SOFTWARE: "true" GALLIUM_DRIVER: "virpipe" DEVICE_NAME: "gl-virgl" + DRIVER_NAME: "virgl" MESA_GLES_VERSION_OVERRIDE: "3.1" MESA_GLSL_VERSION_OVERRIDE: "310"