From dde734030bcdac40e63a0b251903c0281db170ee Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Fri, 20 Sep 2019 15:43:19 +0200 Subject: [PATCH] Add support for T820 CI Jobs Tomeu: - Small rebase fixups Signed-off-by: Neil Armstrong Signed-off-by: Tomeu Vizoso --- .gitlab-ci/deqp-panfrost-t820-fails.txt | 33 +++++++++++++++++++++++++ .gitlab-ci/deqp-panfrost-t820-skips.txt | 13 ++++++++++ .gitlab-ci/generate_lava.py | 13 ++++++++++ .gitlab-ci/lava-deqp.yml.jinja2 | 6 +++++ .gitlab-ci/lava-gitlab-ci.yml | 13 +++++++--- 5 files changed, 75 insertions(+), 3 deletions(-) create mode 100644 .gitlab-ci/deqp-panfrost-t820-fails.txt create mode 100644 .gitlab-ci/deqp-panfrost-t820-skips.txt diff --git a/.gitlab-ci/deqp-panfrost-t820-fails.txt b/.gitlab-ci/deqp-panfrost-t820-fails.txt new file mode 100644 index 00000000000..bd7f94e4373 --- /dev/null +++ b/.gitlab-ci/deqp-panfrost-t820-fails.txt @@ -0,0 +1,33 @@ +dEQP-GLES2.functional.depth_stencil_clear.depth_stencil_masked Fail +dEQP-GLES2.functional.fbo.render.recreate_colorbuffer.no_rebind_rbo_rgb565_depth_component16 Fail +dEQP-GLES2.functional.fbo.render.recreate_colorbuffer.no_rebind_rbo_rgb565_stencil_index8 Fail +dEQP-GLES2.functional.fbo.render.recreate_colorbuffer.no_rebind_rbo_rgb5_a1_depth_component16 Fail +dEQP-GLES2.functional.fbo.render.recreate_colorbuffer.no_rebind_rbo_rgb5_a1_stencil_index8 Fail +dEQP-GLES2.functional.fbo.render.recreate_colorbuffer.no_rebind_rbo_rgba4_depth_component16 Fail +dEQP-GLES2.functional.fbo.render.recreate_colorbuffer.no_rebind_rbo_rgba4_stencil_index8 Fail +dEQP-GLES2.functional.fbo.render.recreate_colorbuffer.no_rebind_tex2d_rgba_depth_component16 Fail +dEQP-GLES2.functional.fbo.render.recreate_colorbuffer.no_rebind_tex2d_rgba_stencil_index8 Fail +dEQP-GLES2.functional.fbo.render.recreate_colorbuffer.no_rebind_tex2d_rgb_depth_component16 Fail +dEQP-GLES2.functional.fbo.render.recreate_colorbuffer.no_rebind_tex2d_rgb_stencil_index8 Fail +dEQP-GLES2.functional.fbo.render.recreate_colorbuffer.rebind_rbo_rgb565_depth_component16 Fail +dEQP-GLES2.functional.fbo.render.recreate_colorbuffer.rebind_rbo_rgb565_stencil_index8 Fail +dEQP-GLES2.functional.fbo.render.recreate_colorbuffer.rebind_rbo_rgb5_a1_depth_component16 Fail +dEQP-GLES2.functional.fbo.render.recreate_colorbuffer.rebind_rbo_rgb5_a1_stencil_index8 Fail +dEQP-GLES2.functional.fbo.render.recreate_colorbuffer.rebind_rbo_rgba4_depth_component16 Fail +dEQP-GLES2.functional.fbo.render.recreate_colorbuffer.rebind_rbo_rgba4_stencil_index8 Fail +dEQP-GLES2.functional.fbo.render.recreate_colorbuffer.rebind_tex2d_rgba_depth_component16 Fail +dEQP-GLES2.functional.fbo.render.recreate_colorbuffer.rebind_tex2d_rgba_stencil_index8 Fail +dEQP-GLES2.functional.fbo.render.recreate_colorbuffer.rebind_tex2d_rgb_depth_component16 Fail +dEQP-GLES2.functional.fbo.render.recreate_colorbuffer.rebind_tex2d_rgb_stencil_index8 Fail +dEQP-GLES2.functional.fbo.render.shared_colorbuffer.rbo_rgb565_depth_component16 Fail +dEQP-GLES2.functional.fbo.render.shared_colorbuffer.tex2d_rgba_depth_component16 Fail +dEQP-GLES2.functional.fbo.render.shared_colorbuffer.tex2d_rgb_depth_component16 Fail +dEQP-GLES2.functional.fbo.render.shared_colorbuffer.rbo_rgb5_a1_depth_component16 Fail +dEQP-GLES2.functional.fbo.render.shared_colorbuffer.rbo_rgba4_depth_component16 Fail +dEQP-GLES2.functional.fbo.render.shared_depthbuffer.rbo_rgb565_depth_component16 Fail +dEQP-GLES2.functional.fbo.render.shared_depthbuffer.tex2d_rgba_depth_component16 Fail +dEQP-GLES2.functional.fbo.render.shared_depthbuffer.tex2d_rgb_depth_component16 Fail +dEQP-GLES2.functional.fbo.render.shared_depthbuffer.rbo_rgb5_a1_depth_component16 Fail +dEQP-GLES2.functional.fbo.render.shared_depthbuffer.rbo_rgba4_depth_component16 Fail +dEQP-GLES2.functional.shaders.scoping.valid.local_variable_hides_function_parameter_fragment Fail +dEQP-GLES2.functional.shaders.scoping.valid.local_variable_hides_function_parameter_vertex Fail diff --git a/.gitlab-ci/deqp-panfrost-t820-skips.txt b/.gitlab-ci/deqp-panfrost-t820-skips.txt new file mode 100644 index 00000000000..83effaab5c6 --- /dev/null +++ b/.gitlab-ci/deqp-panfrost-t820-skips.txt @@ -0,0 +1,13 @@ +# Note: skips lists for CI are just a list of lines that, when +# non-zero-length and not starting with '#', will regex match to +# delete lines from the test list. Be careful. + +# Skip the perf/stress tests to keep runtime manageable +dEQP-GLES[0-9]*.performance +dEQP-GLES[0-9]*.stress + +# These are really slow on tiling architectures (including llvmpipe). +dEQP-GLES[0-9]*.functional.flush_finish + +# XXX: Why does this flake? +dEQP-GLES2.functional.clipping.triangle_vertex.clip_three.clip_neg_x_neg_z_and_pos_x_pos_z_and_neg_x_neg_y_pos_z diff --git a/.gitlab-ci/generate_lava.py b/.gitlab-ci/generate_lava.py index e7abd8407ad..b2c8c296beb 100755 --- a/.gitlab-ci/generate_lava.py +++ b/.gitlab-ci/generate_lava.py @@ -9,30 +9,42 @@ device_types = { "boot_method": "u-boot", "lava_device_type": "sun50i-h6-pine-h64", "kernel_image_type": "type: image", + "tags": [], }, "rk3288-veyron-jaq": { "gpu_version": "panfrost-t760", "boot_method": "depthcharge", "lava_device_type": "rk3288-veyron-jaq", "kernel_image_type": "", + "tags": [], }, "rk3399-gru-kevin": { "gpu_version": "panfrost-t860", "boot_method": "depthcharge", "lava_device_type": "rk3399-gru-kevin", "kernel_image_type": "", + "tags": [], }, "sun8i-h3-libretech-all-h3-cc": { "gpu_version": "lima", "boot_method": "u-boot", "lava_device_type": "sun8i-h3-libretech-all-h3-cc", "kernel_image_type": "type: zimage", + "tags": [], }, "meson-gxl-s905x-libretech-cc": { "gpu_version": "lima", "boot_method": "u-boot", "lava_device_type": "meson-gxl-s905x-libretech-cc", "kernel_image_type": "type: image", + "tags": [], + }, + "meson-gxm-khadas-vim2": { + "gpu_version": "panfrost-t820", + "boot_method": "u-boot", + "lava_device_type": "meson-gxm-khadas-vim2", + "kernel_image_type": "type: image", + "tags": ["panfrost"], }, } @@ -57,6 +69,7 @@ for device_type in args.device_types: values['gpu_version'] = device_types[device_type]['gpu_version'] values['boot_method'] = device_types[device_type]['boot_method'] values['kernel_image_type'] = device_types[device_type]['kernel_image_type'] + values['tags'] = device_types[device_type]['tags'] f = open('results/lava-deqp-%s.yml' % device_type, "w") f.write(template.render(values)) diff --git a/.gitlab-ci/lava-deqp.yml.jinja2 b/.gitlab-ci/lava-deqp.yml.jinja2 index 3c63921ca11..7723d1fb894 100644 --- a/.gitlab-ci/lava-deqp.yml.jinja2 +++ b/.gitlab-ci/lava-deqp.yml.jinja2 @@ -10,6 +10,12 @@ timeouts: seconds: 30 priority: 75 visibility: public +{% if tags %} +tags: +{% for tag in tags %} + - {{ tag }} +{% endfor %} +{% endif %} actions: - deploy: timeout: diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml index cad0eb9491c..55bd6884a56 100644 --- a/.gitlab-ci/lava-gitlab-ci.yml +++ b/.gitlab-ci/lava-gitlab-ci.yml @@ -25,7 +25,7 @@ include: - .lava-ci-run-policy variables: REPO_SUFFIX: ${CI_JOB_NAME} - DEBIAN_TAG: &debian_tag '2019-10-28-2-tomeu' + DEBIAN_TAG: &debian_tag '2019-12-03-1' DEBIAN_EXEC: 'DEBIAN_ARCH=${DEBIAN_ARCH} GCC_ARCH=${GCC_ARCH} KERNEL_ARCH=${KERNEL_ARCH} @@ -55,7 +55,7 @@ lava_arm64: KERNEL_ARCH: "arm64" VOLT_ARCH: "aarch64" DEFCONFIG: "arch/arm64/configs/defconfig" - DEVICE_TREES: "arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dtb arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dtb" + DEVICE_TREES: "arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dtb arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dtb arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dtb" KERNEL_IMAGE_NAME: "Image" .lava-build: @@ -136,7 +136,7 @@ lava-build:arm64: variables: DEBIAN_ARCH: "arm64" GCC_ARCH: "aarch64-linux-gnu" - DEVICE_TYPES: "rk3399-gru-kevin meson-gxl-s905x-libretech-cc sun50i-h6-pine-h64" + DEVICE_TYPES: "rk3399-gru-kevin meson-gxl-s905x-libretech-cc sun50i-h6-pine-h64 meson-gxm-khadas-vim2" KERNEL_IMAGE_NAME: "Image" .lava-test: @@ -201,6 +201,13 @@ panfrost-t860-test:arm64: tags: - lava-rk3399-gru-kevin +panfrost-t820-test:arm64: + extends: .lava-test:arm64 + variables: + DEVICE_TYPE: meson-gxm-khadas-vim2 + tags: + - lava-meson-gxm-khadas-vim2 + .lima-test:armhf: extends: .lava-test:armhf variables: