gitlab-ci/lava: Test Lima driver with dEQP

Run dEQP on boards with Mali 400 and 450 in Baylibre's lab.

There's lots of skipped tests because of crashes and undetermined
behavior. May be a good idea to run the tests with valgrind and fix any
issues found.

Signed-off-by: Tomeu Vizoso <[email protected]>
Reviewed-by: Vasily Khoruzhick <[email protected]>
Reviewed-by: Neil Armstrong <[email protected]>

1 files changed, 37 insertions, 18 deletions

diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml
index 432776b81cf..a35a72474b7 100644
--- a/.gitlab-ci/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava-gitlab-ci.yml
@@ -1,6 +1,6 @@
 variables:
     LAVA_DEBIAN_VERSION: testing-slim
-    LAVA_IMAGE_TAG: "lava-2019-09-20-1"
+    LAVA_IMAGE_TAG: "lava-2019-10-10-1"
 
 include:
   - project: 'wayland/ci-templates'
@@ -32,7 +32,7 @@ include:
                   KERNEL_ARCH=${KERNEL_ARCH}
                   VOLT_ARCH=${VOLT_ARCH}
                   DEFCONFIG=${DEFCONFIG}
-                  DEVICE_TREES=${DEVICE_TREES}
+                  DEVICE_TREES="${DEVICE_TREES}"
                   KERNEL_IMAGE_NAME=${KERNEL_IMAGE_NAME}
                   bash .gitlab-ci/lava-debian-install.sh'
     DEBIAN_VERSION: ${LAVA_DEBIAN_VERSION}
@@ -45,7 +45,7 @@ lava-container:armhf:
     KERNEL_ARCH: "arm"
     VOLT_ARCH: "armhf"
     DEFCONFIG: "arch/arm/configs/multi_v7_defconfig"
-    DEVICE_TREES: "arch/arm/boot/dts/rk3288-veyron-jaq.dtb"
+    DEVICE_TREES: "arch/arm/boot/dts/rk3288-veyron-jaq.dtb arch/arm/boot/dts/sun8i-h3-libretech-all-h3-cc.dtb"
     KERNEL_IMAGE_NAME: "zImage"
 
 lava-container:arm64:
@@ -56,7 +56,7 @@ lava-container:arm64:
     KERNEL_ARCH: "arm64"
     VOLT_ARCH: "aarch64"
     DEFCONFIG: "arch/arm64/configs/defconfig"
-    DEVICE_TREES: "arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dtb"
+    DEVICE_TREES: "arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dtb"
     KERNEL_IMAGE_NAME: "Image"
 
 .lava-build:
@@ -87,7 +87,7 @@ lava-container:arm64:
         --cross-file /tmp/cross_file.txt
         --libdir /artifacts/rootfs/mesa/lib/
         --buildtype debugoptimized
-        -D gallium-drivers=kmsro,panfrost
+        -D gallium-drivers=kmsro,panfrost,lima
         -D dri-drivers=
         -D prefix=/artifacts/rootfs/mesa
         -D glx=disabled
@@ -116,7 +116,7 @@ lava-container:arm64:
     - cp .gitlab-ci/deqp-*-skips.txt /artifacts/rootfs/deqp/.
     - du -sh /artifacts/rootfs/deqp/*
     - find /artifacts/rootfs/ -type f -printf "%s\t%p\n" | sort -n
-    - pushd /artifacts/rootfs/ ; find -H  |  cpio -H newc -v -o | gzip -c - > $CI_PROJECT_DIR/results/panfrost-rootfs-${DEBIAN_ARCH}.cpio.gz; popd
+    - pushd /artifacts/rootfs/ ; find -H  |  cpio -H newc -v -o | gzip -c - > $CI_PROJECT_DIR/results/lava-rootfs-${DEBIAN_ARCH}.cpio.gz; popd
 
     # Copy kernel and DT
     - cp /artifacts/${KERNEL_IMAGE_NAME} /artifacts/*.dtb $CI_PROJECT_DIR/results/.
@@ -127,10 +127,8 @@ lava-container:arm64:
         --template .gitlab-ci/lava-deqp.yml.jinja2
         --arch ${DEBIAN_ARCH}
         --base-artifacts-url $CI_PROJECT_URL/-/jobs/$CI_JOB_ID/artifacts/raw/results
-        --device-type ${DEVICE_TYPE}
+        --device-types ${DEVICE_TYPES}
         --kernel-image-name ${KERNEL_IMAGE_NAME}
-        --gpu-version ${GPU_VERSION}
-        > results/lava-deqp.yml
   after_script:
     - export CCACHE_DIR="$PWD/ccache"
     - ccache --show-stats
@@ -145,9 +143,8 @@ lava-build:armhf:
   variables:
     DEBIAN_ARCH: "armhf"
     GCC_ARCH: "arm-linux-gnueabihf"
-    DEVICE_TYPE: "rk3288-veyron-jaq"
+    DEVICE_TYPES: "rk3288-veyron-jaq sun8i-h3-libretech-all-h3-cc"
     KERNEL_IMAGE_NAME: "zImage"
-    GPU_VERSION: "t760"
 
 lava-build:arm64:
   extends: .lava-build
@@ -155,9 +152,8 @@ lava-build:arm64:
   variables:
     DEBIAN_ARCH: "arm64"
     GCC_ARCH: "aarch64-linux-gnu"
-    DEVICE_TYPE: "rk3399-gru-kevin"
+    DEVICE_TYPES: "rk3399-gru-kevin meson-gxl-s905x-libretech-cc"
     KERNEL_IMAGE_NAME: "Image"
-    GPU_VERSION: "t860"
 
 .lava-test:
   stage: test
@@ -166,7 +162,7 @@ lava-build:arm64:
   variables:
     GIT_STRATEGY: none # no need to pull the whole tree for submitting the job
   script:
-    - lava_job_id=`lavacli jobs submit $CI_PROJECT_DIR/results/lava-deqp.yml`
+    - lava_job_id=`lavacli jobs submit $CI_PROJECT_DIR/results/lava-deqp-$DEVICE_TYPE.yml`
     - echo $lava_job_id
     - lavacli jobs logs $lava_job_id | grep -a -v "{'case':" | tee results/lava-deqp-$lava_job_id.log
     - lavacli jobs show $lava_job_id
@@ -178,7 +174,7 @@ lava-build:arm64:
     paths:
       - results/
 
-panfrost-t760-test:armhf:
+.lava-test:armhf:
   image: $CI_REGISTRY_IMAGE/debian/$LAVA_DEBIAN_VERSION:armhf-$LAVA_IMAGE_TAG
   extends: .lava-test
   needs:
@@ -186,10 +182,8 @@ panfrost-t760-test:armhf:
     - lava-build:armhf
   dependencies:
     - lava-build:armhf
-  tags:
-    - lava-rk3288-veyron-jaq
 
-panfrost-t860-test:arm64:
+.lava-test:arm64:
   image: $CI_REGISTRY_IMAGE/debian/$LAVA_DEBIAN_VERSION:arm64-$LAVA_IMAGE_TAG
   extends: .lava-test
   needs:
@@ -197,6 +191,31 @@ panfrost-t860-test:arm64:
     - lava-build:arm64
   dependencies:
     - lava-build:arm64
+
+panfrost-t760-test:armhf:
+  extends: .lava-test:armhf
+  variables:
+    DEVICE_TYPE: rk3288-veyron-jaq
+  tags:
+    - lava-rk3288-veyron-jaq
+
+panfrost-t860-test:arm64:
+  extends: .lava-test:arm64
+  variables:
+    DEVICE_TYPE: rk3399-gru-kevin
   tags:
     - lava-rk3399-gru-kevin
 
+lima-test:armhf:
+  extends: .lava-test:armhf
+  variables:
+    DEVICE_TYPE: sun8i-h3-libretech-all-h3-cc
+  tags:
+    - lava-sun8i-h3-libretech-all-h3-cc
+
+lima-test:arm64:
+  extends: .lava-test:arm64
+  variables:
+    DEVICE_TYPE: meson-gxl-s905x-libretech-cc
+  tags:
+    - lava-meson-gxl-s905x-libretech-cc