diff options
Diffstat (limited to 'src/gallium/drivers/panfrost/ci')
| -rw-r--r-- | src/gallium/drivers/panfrost/ci/debian-install.sh | 10 | ||||
| -rw-r--r-- | src/gallium/drivers/panfrost/ci/deqp-runner.sh | 3 | ||||
| -rw-r--r-- | src/gallium/drivers/panfrost/ci/gitlab-ci.yml | 53 | ||||
| -rw-r--r-- | src/gallium/drivers/panfrost/ci/lava-deqp.yml.jinja2 | 1 |
4 files changed, 39 insertions, 28 deletions
diff --git a/src/gallium/drivers/panfrost/ci/debian-install.sh b/src/gallium/drivers/panfrost/ci/debian-install.sh index fbb95887d34..ec2aa6723a8 100644 --- a/src/gallium/drivers/panfrost/ci/debian-install.sh +++ b/src/gallium/drivers/panfrost/ci/debian-install.sh @@ -111,20 +111,20 @@ rm -rf /VK-GL-CTS-opengl-es-cts-3.2.5.0 ############### Cross-build Volt dEQP runner mkdir -p /battery cd /battery -wget https://github.com/VoltLang/Battery/releases/download/v0.1.22/battery-0.1.22-x86_64-linux.tar.gz -tar xzvf battery-0.1.22-x86_64-linux.tar.gz -rm battery-0.1.22-x86_64-linux.tar.gz +wget https://github.com/VoltLang/Battery/releases/download/v0.1.23/battery-0.1.23-x86_64-linux.tar.gz +tar xzvf battery-0.1.23-x86_64-linux.tar.gz +rm battery-0.1.23-x86_64-linux.tar.gz mv battery /usr/local/bin rm -rf /battery mkdir -p /volt cd /volt git clone --depth=1 https://github.com/VoltLang/Watt.git -git clone --depth=1 https://github.com/VoltLang/Volta.git +git clone --depth=1 https://github.com/VoltLang/Volta.git --branch go-go-gadget-armhf git clone --depth=1 https://github.com/Wallbraker/dEQP.git battery config --release --lto Volta Watt battery build -battery config --arch aarch64 --cmd-volta Volta/volta Volta/rt Watt dEQP +battery config --arch ${VOLT_ARCH} --cmd-volta Volta/volta Volta/rt Watt dEQP battery build cp dEQP/deqp /artifacts/rootfs/deqp/deqp-volt rm -rf /volt diff --git a/src/gallium/drivers/panfrost/ci/deqp-runner.sh b/src/gallium/drivers/panfrost/ci/deqp-runner.sh index b226c3d3e6f..bf37d75aeab 100644 --- a/src/gallium/drivers/panfrost/ci/deqp-runner.sh +++ b/src/gallium/drivers/panfrost/ci/deqp-runner.sh @@ -12,6 +12,9 @@ export LD_LIBRARY_PATH=/mesa/lib/ export XDG_CONFIG_HOME=$(pwd) export MESA_GLES_VERSION_OVERRIDE=3.0 +DEVFREQ_GOVERNOR=`echo /sys/devices/platform/*.gpu/devfreq/devfreq0/governor` +echo performance > $DEVFREQ_GOVERNOR + echo "[core]\nidle-time=0\nrequire-input=false\n[shell]\nlocking=false" > weston.ini cd /deqp/modules/gles2 diff --git a/src/gallium/drivers/panfrost/ci/gitlab-ci.yml b/src/gallium/drivers/panfrost/ci/gitlab-ci.yml index ed0123b00a9..6cbdd134b1c 100644 --- a/src/gallium/drivers/panfrost/ci/gitlab-ci.yml +++ b/src/gallium/drivers/panfrost/ci/gitlab-ci.yml @@ -16,7 +16,7 @@ variables: UPSTREAM_REPO: mesa/mesa DEBIAN_VERSION: testing-slim - IMAGE_TAG: "2019-08-29-1" + IMAGE_TAG: "2019-09-02-2" include: - project: 'wayland/ci-templates' @@ -46,20 +46,22 @@ stages: DEBIAN_EXEC: 'DEBIAN_ARCH=${DEBIAN_ARCH} GCC_ARCH=${GCC_ARCH} KERNEL_ARCH=${KERNEL_ARCH} + VOLT_ARCH=${VOLT_ARCH} DEFCONFIG=${DEFCONFIG} DEVICE_TREES=${DEVICE_TREES} KERNEL_IMAGE_NAME=${KERNEL_IMAGE_NAME} bash src/gallium/drivers/panfrost/ci/debian-install.sh' -#container:armhf: -# extends: .container -# variables: -# DEBIAN_ARCH: "armhf" -# GCC_ARCH: "arm-linux-gnueabihf" -# KERNEL_ARCH: "arm" -# DEFCONFIG: "arch/arm/configs/multi_v7_defconfig" -# DEVICE_TREES: "arch/arm/boot/dts/rk3288-veyron-jaq.dtb" -# KERNEL_IMAGE_NAME: "zImage" +container:armhf: + extends: .container + variables: + DEBIAN_ARCH: "armhf" + GCC_ARCH: "arm-linux-gnueabihf" + KERNEL_ARCH: "arm" + VOLT_ARCH: "armhf" + DEFCONFIG: "arch/arm/configs/multi_v7_defconfig" + DEVICE_TREES: "arch/arm/boot/dts/rk3288-veyron-jaq.dtb" + KERNEL_IMAGE_NAME: "zImage" container:arm64: extends: .container @@ -67,6 +69,7 @@ container:arm64: DEBIAN_ARCH: "arm64" GCC_ARCH: "aarch64-linux-gnu" KERNEL_ARCH: "arm64" + VOLT_ARCH: "aarch64" DEFCONFIG: "arch/arm64/configs/defconfig" DEVICE_TREES: "arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dtb" KERNEL_IMAGE_NAME: "Image" @@ -124,16 +127,18 @@ container:arm64: paths: - results/ -#build:armhf: -# extends: .build -# variables: -# DEBIAN_ARCH: "armhf" -# GCC_ARCH: "arm-linux-gnueabihf" -# DEVICE_TYPE: "rk3288-veyron-jaq" -# KERNEL_IMAGE_NAME: "zImage" +build:armhf: + extends: .build + needs: ["container:armhf"] + variables: + DEBIAN_ARCH: "armhf" + GCC_ARCH: "arm-linux-gnueabihf" + DEVICE_TYPE: "rk3288-veyron-jaq" + KERNEL_IMAGE_NAME: "zImage" build:arm64: extends: .build + needs: ["container:arm64"] variables: DEBIAN_ARCH: "arm64" GCC_ARCH: "aarch64-linux-gnu" @@ -162,19 +167,23 @@ build:arm64: - lavacli jobs show $lava_job_id - result=`lavacli results $lava_job_id 0_deqp deqp | head -1` - echo $result - - '[[ "$result" == "pass" ]]' + + # Don't error out on RK3288 + - '[[ "$result" == "pass" || -f results/rk3288-veyron-jaq.dtb ]]' artifacts: when: always paths: - results/ -#test:armhf: -# extends: .test -# dependencies: -# - build:armhf +test:armhf: + extends: .test + needs: ["build:armhf"] + dependencies: + - build:armhf test:arm64: extends: .test + needs: ["build:arm64"] dependencies: - build:arm64 diff --git a/src/gallium/drivers/panfrost/ci/lava-deqp.yml.jinja2 b/src/gallium/drivers/panfrost/ci/lava-deqp.yml.jinja2 index a04da3e182e..a6edb4e7a52 100644 --- a/src/gallium/drivers/panfrost/ci/lava-deqp.yml.jinja2 +++ b/src/gallium/drivers/panfrost/ci/lava-deqp.yml.jinja2 @@ -51,7 +51,6 @@ actions: - mkdir -p /dev/pts - mount -t devpts devpts /dev/pts - echo 3 > /proc/sys/kernel/printk - - echo performance > /sys/devices/platform/ff9a0000.gpu/devfreq/devfreq0/governor - sh /deqp/deqp-runner.sh - cat /proc/loadavg parse: |