X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.gitlab-ci.yml;h=6ab6f6cc741389bef5a8b4780d3bbe81ea8ccfe4;hb=53664108c2906e6c6d7fb79d61686ec9cb65fd8d;hp=87f6c19f31be259c4a6fac84f92d6759990b278c;hpb=43b6dd05f746f3c946bc6d259c69fad744989c89;p=mesa.git diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 87f6c19f31b..6ab6f6cc741 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -112,39 +112,63 @@ ubuntu: - ninja -j4 - ninja test -.make-build: +.scons-build: extends: .build variables: - MAKEFLAGS: "-j4" + SCONSFLAGS: "-j4" script: - if test -n "$LLVM_VERSION"; then export LLVM_CONFIG="llvm-config-${LLVM_VERSION}"; fi + - scons $SCONS_TARGET + - eval $SCONS_CHECK_COMMAND + +autotools: + extends: .build + variables: + MAKEFLAGS: "-j8" + LLVM_CONFIG: llvm-config-7 + script: - mkdir build - cd build - ../autogen.sh --enable-autotools --enable-debug - $LIBUNWIND_FLAGS - $DRI_LOADERS - --with-dri-drivers=$DRI_DRIVERS - $GALLIUM_ST - --with-gallium-drivers=$GALLIUM_DRIVERS - --with-vulkan-drivers=$VULKAN_DRIVERS --disable-llvm-shared-libs - make - - eval $MAKE_CHECK_COMMAND + - make check -.scons-build: - extends: .build +# NOTE: Building SWR is 2x (yes two) times slower than all the other +# gallium drivers combined. +# Start this early so that it doesn't limit the total run time. +meson-gallium-swr: + extends: .meson-build variables: - SCONSFLAGS: "-j4" - script: - - if test -n "$LLVM_VERSION"; then - export LLVM_CONFIG="llvm-config-${LLVM_VERSION}"; - fi - - scons $SCONS_TARGET - - eval $SCONS_CHECK_COMMAND + UNWIND: "true" + DRI_LOADERS: > + -D glx=disabled + -D egl=false + -D gbm=false + GALLIUM_ST: > + -D dri3=false + -D gallium-vdpau=false + -D gallium-xvmc=false + -D gallium-omx=disabled + -D gallium-va=false + -D gallium-xa=false + -D gallium-nine=false + -D gallium-opencl=disabled + GALLIUM_DRIVERS: "swr" + LLVM_VERSION: "6.0" + +meson-clang: + extends: .meson-build + variables: + UNWIND: "true" + DRI_DRIVERS: "auto" + GALLIUM_DRIVERS: "auto" + CC: clang-7 + CXX: clang++-7 meson-vulkan: extends: .meson-build @@ -208,38 +232,6 @@ meson-glvnd: -D gallium-nine=false -D gallium-opencl=disabled -meson-clang: - extends: .meson-build - variables: - UNWIND: "true" - DRI_DRIVERS: "auto" - GALLIUM_DRIVERS: "auto" - CC: clang-7 - CXX: clang++-7 - -# NOTE: Building SWR is 2x (yes two) times slower than all the other -# gallium drivers combined. -# Start this early so that it doesn't hunder the run time. -meson-gallium-swr: - extends: .meson-build - variables: - UNWIND: "true" - DRI_LOADERS: > - -D glx=disabled - -D egl=false - -D gbm=false - GALLIUM_ST: > - -D dri3=false - -D gallium-vdpau=false - -D gallium-xvmc=false - -D gallium-omx=disabled - -D gallium-va=false - -D gallium-xa=false - -D gallium-nine=false - -D gallium-opencl=disabled - GALLIUM_DRIVERS: "swr" - LLVM_VERSION: "6.0" - meson-gallium-radeonsi: extends: .meson-build variables: @@ -326,147 +318,6 @@ meson-gallium-st-other: GALLIUM_DRIVERS: "nouveau,swrast" LLVM_VERSION: "5.0" -make-vulkan: - extends: .make-build - variables: - MAKE_CHECK_COMMAND: "make -C src/gtest check && make -C src/intel check" - LLVM_VERSION: "7" - DRI_LOADERS: > - --disable-glx - --disable-gbm - --disable-egl - --with-platforms=x11,wayland,drm - DRI_DRIVERS: "" - GALLIUM_ST: > - --enable-dri - --enable-dri3 - --disable-opencl - --disable-xa - --disable-nine - --disable-xvmc - --disable-vdpau - --disable-va - --disable-omx-bellagio - --disable-gallium-osmesa - VULKAN_DRIVERS: intel,radeon - LIBUNWIND_FLAGS: --disable-libunwind - -make-loader-classic-dri: - extends: .make-build - variables: - MAKE_CHECK_COMMAND: "make check" - DRI_LOADERS: > - --enable-glx - --enable-gbm - --enable-egl - --with-platforms=x11,wayland,drm,surfaceless - --enable-osmesa - DRI_DRIVERS: "i915,i965,radeon,r200,swrast,nouveau" - GALLIUM_ST: > - --enable-dri - --disable-opencl - --disable-xa - --disable-nine - --disable-xvmc - --disable-vdpau - --disable-va - --disable-omx-bellagio - --disable-gallium-osmesa - LIBUNWIND_FLAGS: --disable-libunwind - -# NOTE: Building SWR is 2x (yes two) times slower than all the other -# gallium drivers combined. -# Start this early so that it doesn't hunder the run time. -make-gallium-drivers-swr: - extends: .make-build - variables: - MAKE_CHECK_COMMAND: "true" - LLVM_VERSION: "6.0" - DRI_LOADERS: > - --disable-glx - --disable-gbm - --disable-egl - GALLIUM_ST: > - --enable-dri - --disable-opencl - --disable-xa - --disable-nine - --disable-xvmc - --disable-vdpau - --disable-va - --disable-omx-bellagio - --disable-gallium-osmesa - GALLIUM_DRIVERS: "swr" - LIBUNWIND_FLAGS: --enable-libunwind - -make-gallium-drivers-radeonsi: - extends: make-gallium-drivers-swr - variables: - LLVM_VERSION: "7" - GALLIUM_DRIVERS: "radeonsi" - -make-gallium-drivers-other: - extends: make-gallium-drivers-swr - variables: - LLVM_VERSION: "3.9" - GALLIUM_DRIVERS: "i915,nouveau,kmsro,r300,r600,freedreno,svga,swrast,v3d,vc4,virgl,etnaviv" - -make-gallium-st-clover-llvm: - extends: .make-build - variables: - MAKE_CHECK_COMMAND: "true" - DRI_LOADERS: > - --disable-glx - --disable-gbm - --disable-egl - GALLIUM_ST: > - --disable-dri - --enable-opencl - --enable-opencl-icd - --enable-llvm - --disable-xa - --disable-nine - --disable-xvmc - --disable-vdpau - --disable-va - --disable-omx-bellagio - --disable-gallium-osmesa - LIBUNWIND_FLAGS: --enable-libunwind - GALLIUM_DRIVERS: "r600,radeonsi" - LLVM_VERSION: "7" - -make-gallium-st-clover-llvm-39: - extends: make-gallium-st-clover-llvm - variables: - LLVM_VERSION: "3.9" - GALLIUM_DRIVERS: "r600" - -make-gallium-st-other: - extends: .make-build - variables: - MAKE_CHECK_COMMAND: "true" - # We should be testing 3.3, but 3.9 is the oldest that still exists in ubuntu - LLVM_VERSION: "3.9" - DRI_LOADERS: > - --disable-glx - --disable-gbm - --disable-egl - GALLIUM_ST: > - --enable-dri - --disable-opencl - --enable-xa - --enable-nine - --enable-xvmc - --enable-vdpau - --enable-va - --enable-omx-bellagio - --enable-gallium-osmesa - # We need swrast for osmesa and nine. - # i915 most likely doesn't work with most ST. - # Regardless - we're doing a quick build test here. - GALLIUM_DRIVERS: "i915,swrast" - LIBUNWIND_FLAGS: --enable-libunwind - scons-nollvm: extends: .scons-build variables: