X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.gitlab-ci.yml;h=e260420c5c7696eff440f605933185b6fd61f29f;hb=c92ae9d3ef89b20e6e45825a8151cd6d1e29ceb3;hp=dd80adb36d778b39e2cf5a728e5044565a897ebd;hpb=e00adef34a5ce485e2c9216a268ca05e89a5fc98;p=mesa.git diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dd80adb36d7..e260420c5c7 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,12 +65,14 @@ 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 - if: '$CI_PROJECT_NAMESPACE == "mesa"' when: never - - if: '$GITLAB_USER_LOGIN == "marge-bot"' + - if: '$GITLAB_USER_LOGIN == "marge-bot" && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == $CI_COMMIT_REF_NAME' changes: *docs-or-ci when: on_success - changes: *docs-or-ci @@ -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 @@ -173,7 +174,7 @@ success: when: on_success # Run pipeline by default if it was triggered by Marge Bot, is for a # merge request, and any files affecting the pipeline were changed - - if: '$GITLAB_USER_LOGIN == "marge-bot" && $CI_PROJECT_PATH != "mesa/mesa"' + - if: '$GITLAB_USER_LOGIN == "marge-bot" && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == $CI_COMMIT_REF_NAME' changes: *all_paths when: on_success @@ -193,7 +194,7 @@ success: variables: FDO_DISTRIBUTION_VERSION: buster-slim FDO_REPO_SUFFIX: "debian/$CI_JOB_NAME" - FDO_DISTRIBUTION_EXEC: 'bash .gitlab-ci/container/${CI_JOB_NAME}.sh' + FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/container/${CI_JOB_NAME}.sh' # no need to pull the whole repo to build the container image GIT_STRATEGY: none @@ -203,7 +204,7 @@ x86_build-base: - .fdo.container-build@debian - .container variables: - FDO_DISTRIBUTION_TAG: &x86_build-base "2020-06-12" + FDO_DISTRIBUTION_TAG: &x86_build-base "2020-07-28-x86-2" .use-x86_build-base: extends: @@ -221,14 +222,13 @@ x86_build: extends: - .use-x86_build-base variables: - FDO_DISTRIBUTION_TAG: &x86_build "2020-06-02" + FDO_DISTRIBUTION_TAG: &x86_build "2020-07-28-x86-2" .use-x86_build: variables: TAG: *x86_build image: "$CI_REGISTRY_IMAGE/debian/x86_build:$TAG" needs: - - x86_build-base - x86_build # Debian 10 based i386 cross-build image @@ -236,14 +236,13 @@ i386_build: extends: - .use-x86_build-base variables: - FDO_DISTRIBUTION_TAG: &i386_build "2020-06-02" + FDO_DISTRIBUTION_TAG: &i386_build "2020-07-28-x86-2" .use-i386_build: variables: TAG: *i386_build image: "$CI_REGISTRY_IMAGE/debian/i386_build:$TAG" needs: - - x86_build-base - i386_build # Debian 10 based ppc64el cross-build image @@ -251,14 +250,13 @@ ppc64el_build: extends: - .use-x86_build-base variables: - FDO_DISTRIBUTION_TAG: &ppc64el_build "2020-06-02" + FDO_DISTRIBUTION_TAG: &ppc64el_build "2020-07-28-x86-2" .use-ppc64el_build: variables: TAG: *ppc64el_build image: "$CI_REGISTRY_IMAGE/debian/ppc64el_build:$TAG" needs: - - x86_build-base - ppc64el_build # Debian 10 based s390x cross-build image @@ -266,21 +264,20 @@ s390x_build: extends: - .use-x86_build-base variables: - FDO_DISTRIBUTION_TAG: &s390x_build "2020-06-02" + FDO_DISTRIBUTION_TAG: &s390x_build "2020-07-28-x86-2" .use-s390x_build: variables: TAG: *s390x_build image: "$CI_REGISTRY_IMAGE/debian/s390x_build:$TAG" needs: - - x86_build-base - s390x_build # Debian 10 based x86 test image base x86_test-base: extends: x86_build-base variables: - FDO_DISTRIBUTION_TAG: &x86_test-base "2020-06-02" + FDO_DISTRIBUTION_TAG: &x86_test-base "2020-07-28-x86-2" .use-x86_test-base: extends: @@ -297,19 +294,19 @@ x86_test-base: x86_test-gl: extends: .use-x86_test-base variables: - FDO_DISTRIBUTION_TAG: &x86_test-gl "2020-06-23-virgl" + FDO_DISTRIBUTION_TAG: &x86_test-gl "2020-07-28-x86-2" # Debian 10 based x86 test image for VK x86_test-vk: extends: .use-x86_test-base variables: - FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-06-18-vkcts" + 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-06-12" + FDO_DISTRIBUTION_TAG: &x86_build_old "2020-07-28-x86-2" FDO_DISTRIBUTION_VERSION: stretch-slim .use-x86_build_old: @@ -325,7 +322,7 @@ arm_build: - .fdo.container-build@debian@arm64v8 - .container variables: - FDO_DISTRIBUTION_TAG: &arm_build "2020-07-07" + FDO_DISTRIBUTION_TAG: &arm_build "2020-07-28-libdrm" .use-arm_build: variables: @@ -340,7 +337,7 @@ arm_test-base: - .fdo.container-build@debian - .container variables: - FDO_DISTRIBUTION_TAG: &arm_test-base "2020-06-22-tracie" + FDO_DISTRIBUTION_TAG: &arm_test-base "2020-07-28-libdrm" .use-arm_test-base: extends: @@ -358,14 +355,13 @@ arm64_test: extends: - .use-arm_test-base variables: - FDO_DISTRIBUTION_TAG: &arm64_test "2020-06-25-kernelfix" + FDO_DISTRIBUTION_TAG: &arm64_test "2020-08-04-ramdisk-fix" .use-arm64_test: variables: TAG: *arm64_test image: "$CI_REGISTRY_IMAGE/debian/arm64_test:$TAG" needs: - - arm_test-base - arm64_test # Native Windows docker builds @@ -454,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 @@ -505,10 +503,8 @@ make git archive: - .build-linux - .use-x86_build stage: scons - variables: - SCONSFLAGS: "-j4" script: - - .gitlab-ci/scons-build.sh + - env SCONSFLAGS="-j${FDO_CI_CONCURRENT:-4}" .gitlab-ci/scons-build.sh meson-testing: extends: @@ -523,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 @@ -559,6 +557,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 @@ -643,6 +642,8 @@ meson-arm64-build-test: - .ci-deqp-artifacts variables: VULKAN_DRIVERS: "amd" + EXTRA_OPTION: > + -Dtools=panfrost script: - .gitlab-ci/meson-build.sh @@ -740,6 +741,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: @@ -791,6 +793,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: @@ -811,13 +815,8 @@ meson-mingw32-x86_64: TAG: *x86_test-gl image: "$CI_REGISTRY_IMAGE/debian/x86_test-gl:$TAG" needs: - - x86_build-base - - x86_build - meson-testing - - x86_test-base - x86_test-gl - dependencies: - - meson-testing .test-vk: extends: @@ -826,13 +825,8 @@ meson-mingw32-x86_64: TAG: *x86_test-vk image: "$CI_REGISTRY_IMAGE/debian/x86_test-vk:$TAG" needs: - - x86_build-base - - x86_build - meson-testing - - x86_test-base - x86_test-vk - dependencies: - - meson-testing .piglit-test: extends: @@ -856,7 +850,6 @@ piglit-quick_gl: NIR_VALIDATE: 0 PIGLIT_OPTIONS: > --process-isolation false - -x arb_gpu_shader5 -x egl_ext_device_ -x egl_ext_platform_device -x ext_timer_query@time-elapsed @@ -911,10 +904,9 @@ piglit-quick_shader: llvmpipe-gles2: variables: DEQP_VER: gles2 - DEQP_PARALLEL: 4 NIR_VALIDATE: 0 - # Don't use threads inside llvmpipe, we've already got all 4 cores - # busy with DEQP_PARALLEL. + # Don't use threads inside llvmpipe, we've already got all cores + # busy at the deqp-runner level. LP_NUM_THREADS: 0 DEQP_EXPECTED_FAILS: deqp-llvmpipe-fails.txt LIBGL_ALWAYS_SOFTWARE: "true" @@ -934,13 +926,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 @@ -948,11 +939,10 @@ softpipe-gles31: virgl-gles2-on-gl: variables: DEQP_VER: gles2 - DEQP_PARALLEL: 4 NIR_VALIDATE: 0 DEQP_NO_SAVE_RESULTS: 1 - # Don't use threads inside llvmpipe, we've already got all 4 cores - # busy with DEQP_PARALLEL. + # Don't use threads inside llvmpipe, we've already got all cores + # busy at the deqp-runner level. LP_NUM_THREADS: 0 DEQP_EXPECTED_FAILS: deqp-virgl-gl-fails.txt DEQP_OPTIONS: "--deqp-log-images=disable" @@ -964,14 +954,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" @@ -1089,6 +1078,7 @@ arm64_a630_traces: BARE_METAL_TEST_SCRIPT: "/install/tracie-runner-gl.sh" DEVICE_NAME: "freedreno-a630" 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" @@ -1135,6 +1125,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 @@ -1166,9 +1158,7 @@ arm64_a306_gles2: script: - ./install/bare-metal/fastboot.sh needs: - - arm_test-base - arm64_test - - arm_build - meson-arm64 tags: - google-freedreno-db410c @@ -1274,6 +1264,8 @@ radv-fossils: key: ${CI_JOB_NAME} paths: - traces-db/ + variables: + TRACIE_UPLOAD_TO_MINIO: 1 .traces-test-gl: extends: @@ -1308,6 +1300,16 @@ radv-polaris10-traces: tags: - polaris10 +radv-raven-traces: + extends: + - .traces-test-vk + - .test-radv + - .test-manual + variables: + DEVICE_NAME: "vk-amd-raven" + tags: + - raven + virgl-traces: extends: - .traces-test-gl