etnaviv/ci: convert from baremetal to CI-Tron

Signed-off-by: Martin Roukala (né Peres) <martin.roukala@mupuf.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32927>

src/etnaviv/ci/etnaviv-gc2000-fails.txt

@@ -115,12 +115,6 @@ dEQP-GLES2.functional.fragment_ops.random.97,Fail
 dEQP-GLES2.functional.fragment_ops.random.98,Fail
 dEQP-GLES2.functional.fragment_ops.random.9,Fail
 dEQP-GLES2.functional.rasterization.limits.points,Fail
-dEQP-GLES2.functional.shaders.random.basic_expression.combined.12,Fail
-dEQP-GLES2.functional.shaders.random.basic_expression.combined.30,Fail
-dEQP-GLES2.functional.shaders.random.basic_expression.combined.63,Fail
-dEQP-GLES2.functional.shaders.random.basic_expression.combined.66,Fail
-dEQP-GLES2.functional.shaders.random.conditionals.combined.14,Fail
-dEQP-GLES2.functional.shaders.random.conditionals.combined.48,Fail
 dEQP-GLES2.functional.texture.vertex.cube.filtering.nearest_mipmap_linear_linear_clamp,Fail
 dEQP-GLES2.functional.texture.vertex.cube.filtering.nearest_mipmap_linear_linear_mirror,Fail
 dEQP-GLES2.functional.texture.vertex.cube.filtering.nearest_mipmap_linear_linear_repeat,Fail
@@ -141,7 +135,6 @@ shaders@glsl-uniform-interstage-limits@subdivide 5,Timeout
 
 # Expects that some format/internal_format combinations should be supported when they currently aren't.
 spec@arb_clear_texture@arb_clear_texture-sized-formats,Fail
-spec@arb_clear_texture@arb_clear_texture-supported-formats,Fail
 spec@arb_depth_texture@depth-level-clamp,Fail
 spec@arb_depth_texture@fbo-depth-gl_depth_component16-tex1d,Fail
 spec@arb_depth_texture@texwrap formats bordercolor,Fail
@@ -272,8 +265,6 @@ spec@ext_direct_state_access@textures,Crash
 
 spec@ext_framebuffer_blit@fbo-blit-check-limits,Fail
 
-spec@ext_framebuffer_object@fbo-blending-formats,Fail
-spec@ext_framebuffer_object@fbo-blending-formats@GL_RGB10,Fail
 spec@ext_framebuffer_object@fbo-copyteximage,Fail
 spec@ext_framebuffer_object@fbo-copyteximage-simple,Fail
 spec@ext_framebuffer_object@fbo-cubemap,Fail
@@ -391,20 +382,12 @@ spec@glsl-1.10@execution@glsl-1.10-built-in-uniform-state,Fail
 spec@glsl-1.10@execution@glsl-fs-convolution-2,Fail
 spec@glsl-1.10@execution@glsl-fs-uniform-array-7,Fail
 spec@glsl-1.10@execution@glsl-vs-large-uniform-array,Fail
-spec@glsl-1.10@execution@interpolation@interpolation-none-gl_backsecondarycolor-flat-fixed,Fail
-spec@glsl-1.10@execution@interpolation@interpolation-none-gl_backsecondarycolor-flat-none,Fail
 spec@glsl-1.10@execution@interpolation@interpolation-none-gl_backsecondarycolor-flat-vertex,Fail
 spec@glsl-1.10@execution@interpolation@interpolation-none-gl_backsecondarycolor-smooth-vertex,Fail
-spec@glsl-1.10@execution@interpolation@interpolation-none-gl_backcolor-flat-fixed,Fail
-spec@glsl-1.10@execution@interpolation@interpolation-none-gl_backcolor-flat-none,Fail
 spec@glsl-1.10@execution@interpolation@interpolation-none-gl_backcolor-flat-vertex,Fail
 spec@glsl-1.10@execution@interpolation@interpolation-none-gl_backcolor-smooth-vertex,Fail
-spec@glsl-1.10@execution@interpolation@interpolation-none-gl_frontcolor-flat-fixed,Fail
-spec@glsl-1.10@execution@interpolation@interpolation-none-gl_frontcolor-flat-none,Fail
 spec@glsl-1.10@execution@interpolation@interpolation-none-gl_frontcolor-flat-vertex,Fail
 spec@glsl-1.10@execution@interpolation@interpolation-none-gl_frontcolor-smooth-vertex,Fail
-spec@glsl-1.10@execution@interpolation@interpolation-none-gl_frontsecondarycolor-flat-fixed,Fail
-spec@glsl-1.10@execution@interpolation@interpolation-none-gl_frontsecondarycolor-flat-none,Fail
 spec@glsl-1.10@execution@interpolation@interpolation-none-gl_frontsecondarycolor-flat-vertex,Fail
 spec@glsl-1.10@execution@interpolation@interpolation-none-gl_frontsecondarycolor-smooth-vertex,Fail
 spec@glsl-1.10@execution@interpolation@interpolation-none-other-flat-vertex,Fail
@@ -429,7 +412,6 @@ spec@glsl-1.20@execution@fs-vec4-const-array-indirect-access-256-elements,Fail
 spec@glsl-1.20@execution@out-parameter-indexing@fs-inout-index-two-level,Fail
 spec@glsl-1.20@execution@vs-nan-builtin-max,Fail
 spec@glsl-1.20@execution@vs-nan-builtin-min,Fail
-spec@glsl-es-1.00@execution@glsl-no-vertex-attribs,Fail
 spec@intel_performance_query@intel_performance_query-issue_2235,Fail
 spec@khr_texture_compression_astc@basic-gles,Fail
 spec@khr_texture_compression_astc@miptree-gles srgb,Fail
@@ -450,7 +432,6 @@ spec@sgis_generate_mipmap@gen-nonzero-unit,Crash
 
 spec@!opengl 1.0@gl-1.0-blend-func,Fail
 
-spec@!opengl 1.0@gl-1.0-drawbuffer-modes,Fail
 spec@!opengl 1.0@gl-1.0-edgeflag-const,Fail
 spec@!opengl 1.0@gl-1.0-edgeflag,Fail
 spec@!opengl 1.0@gl-1.0-edgeflag-quads,Fail
@@ -595,7 +576,6 @@ spec@!opengl 1.2@texwrap 3d proj bordercolor@GL_RGBA8- projected- border color o
 spec@!opengl 1.2@tex-skipped-unit,Crash
 
 spec@!opengl 1.2@two-sided-lighting-separate-specular,Fail
-spec@!opengl 1.3@gl-1.3-texture-env,Fail
 spec@!opengl 1.3@tex3d-depth1,Fail
 spec@!opengl 1.3@tex-border-1,Fail
 
@@ -650,3 +630,33 @@ spec@arb_texture_cube_map@copyteximage cube samples=4,Fail
 
 spec@arb_texture_rectangle@copyteximage rect samples=2,Fail
 spec@arb_texture_rectangle@copyteximage rect samples=4,Fail
+
+# Added on 2025-01-30
+dEQP-GLES2.functional.polygon_offset.default_enable,Fail
+dEQP-GLES2.functional.shaders.operator.selection.highp_float_fragment,Fail
+dEQP-GLES2.functional.shaders.operator.selection.highp_int_fragment,Fail
+dEQP-GLES2.functional.shaders.operator.selection.highp_ivec2_fragment,Fail
+dEQP-GLES2.functional.shaders.operator.selection.highp_ivec3_fragment,Fail
+dEQP-GLES2.functional.shaders.operator.selection.highp_ivec4_fragment,Fail
+dEQP-GLES2.functional.shaders.operator.selection.highp_vec2_fragment,Fail
+dEQP-GLES2.functional.shaders.operator.selection.highp_vec3_fragment,Fail
+dEQP-GLES2.functional.shaders.operator.selection.highp_vec4_fragment,Fail
+dEQP-GLES2.functional.shaders.operator.sequence.no_side_effects.highp_bool_vec2_fragment,Fail
+dEQP-GLES2.functional.shaders.operator.sequence.side_effects.highp_bool_vec2_fragment,Fail
+spec@!opengl 1.0@gl-1.0-dlist-materials,Fail
+spec@!opengl 1.0@gl-1.0-spot-light,Fail
+spec@!opengl 1.1@dlist-color-material,Fail
+spec@!opengl 1.1@draw-arrays-colormaterial,Fail
+spec@!opengl 1.1@gl-1.1-color-material-array,Fail
+spec@!opengl 1.1@infinite-spot-light,Fail
+spec@!opengl 1.2@draw-elements-vs-inputs,Fail
+spec@!opengl 1.2@gl-1.2-rescale-normal,Fail
+spec@!opengl 1.4@gl-1.4-polygon-offset,Fail
+spec@!opengl 1.5@normal3b3s-invariance-byte,Fail
+spec@arb_draw_buffers@fbo-mrt-alphatest,Fail
+spec@ext_framebuffer_multisample@alpha-to-coverage-no-draw-buffer-zero 2,Fail
+spec@ext_framebuffer_multisample@alpha-to-coverage-no-draw-buffer-zero 4,Fail
+spec@glsl-1.10@execution@variable-indexing@fs-input-array-float-index-rd,Fail
+spec@glsl-1.10@execution@variable-indexing@fs-input-array-vec2-index-rd,Fail
+spec@glsl-1.10@execution@variable-indexing@fs-input-array-vec3-index-rd,Fail
+spec@glsl-1.10@execution@variable-indexing@fs-input-array-vec4-index-rd,Fail

src/etnaviv/ci/etnaviv-gc2000-flakes.txt

@@ -245,3 +245,85 @@ spec@khr_texture_compression_astc@miptree-gles ldr@LDR Profile
 # bit more random flakes
 spec@arb_depth_texture@depth-tex-modes
 shaders@glsl-fs-texturecube
+
+# Added on 2025-01-30
+dEQP-GLES2.functional.fbo.render.color.blend_npot_rbo_bgra
+dEQP-GLES2.functional.fbo.render.color.blend_npot_rbo_bgra_depth_component16
+dEQP-GLES2.functional.fbo.render.color.blend_npot_tex2d_bgra_depth_component16
+dEQP-GLES2.functional.fbo.render.color.blend_tex2d_rgb
+dEQP-GLES2.functional.fbo.render.color.mix_tex2d_bgra
+dEQP-GLES2.functional.fbo.render.color.mix_tex2d_rgb
+dEQP-GLES2.functional.fbo.render.color.mix_tex2d_rgba
+dEQP-GLES2.functional.fbo.render.color.mix_npot_tex2d_bgra
+dEQP-GLES2.functional.fbo.render.color.mix_npot_tex2d_rgb_depth_component16
+dEQP-GLES2.functional.fbo.render.color_clear.tex2d_bgra
+dEQP-GLES2.functional.fbo.render.color_clear.tex2d_bgra_stencil_index8
+dEQP-GLES2.functional.fbo.render.color_clear.tex2d_rgb_stencil_index8
+dEQP-GLES2.functional.fbo.render.depth.npot_rbo_bgra_depth_component16
+dEQP-GLES2.functional.fbo.render.depth.rbo_rgb565_depth_component16
+dEQP-GLES2.functional.fbo.render.depth.tex2d_bgra_depth_component16
+dEQP-GLES2.functional.fbo.render.recreate_colorbuffer.no_rebind_tex2d_rgb_depth_component16
+dEQP-GLES2.functional.fbo.render.recreate_colorbuffer.rebind_rbo_bgra
+dEQP-GLES2.functional.fbo.render.recreate_depthbuffer.rebind_rbo_rgba4_depth_component16
+dEQP-GLES2.functional.fbo.render.resize.rbo_bgra_stencil_index8
+dEQP-GLES2.functional.fbo.render.resize.rbo_rgb5_a1_depth_component16
+dEQP-GLES2.functional.fbo.render.stencil_clear.rbo_bgra_stencil_index8
+dEQP-GLES2.functional.fbo.render.stencil_clear.tex2d_bgra_stencil_index8
+dEQP-GLES2.functional.fbo.render.stencil.npot_rbo_rgb565_stencil_index8
+dEQP-GLES2.functional.fbo.render.stencil.tex2d_bgra_stencil_index8
+dEQP-GLES2.functional.shaders.discard.dynamic_loop_texture
+dEQP-GLES2.functional.shaders.random.all_features.fragment.14
+dEQP-GLES2.functional.shaders.random.all_features.fragment.4
+dEQP-GLES2.functional.shaders.random.all_features.fragment.52
+dEQP-GLES2.functional.shaders.random.texture.fragment.116
+dEQP-GLES2.functional.shaders.random.texture.fragment.123
+dEQP-GLES2.functional.shaders.random.texture.fragment.124
+dEQP-GLES2.functional.shaders.random.texture.fragment.147
+dEQP-GLES2.functional.shaders.random.texture.fragment.31
+dEQP-GLES2.functional.shaders.random.texture.fragment.37
+dEQP-GLES2.functional.shaders.random.texture.fragment.43
+dEQP-GLES2.functional.shaders.random.texture.fragment.82
+dEQP-GLES2.functional.shaders.random.texture.fragment.85
+dEQP-GLES2.functional.shaders.random.texture.fragment.91
+dEQP-GLES2.functional.shaders.random.texture.vertex.12
+dEQP-GLES2.functional.shaders.random.texture.vertex.2
+dEQP-GLES2.functional.shaders.struct.uniform.sampler_in_array_function_arg_fragment
+dEQP-GLES2.functional.shaders.struct.uniform.sampler_in_function_arg_fragment
+dEQP-GLES2.functional.shaders.struct.uniform.sampler_nested_vertex
+dEQP-GLES2.functional.texture.filtering.2d.linear_nearest_mirror_rgb888_pot
+dEQP-GLES2.functional.texture.filtering.2d.nearest_linear_repeat_etc1
+dEQP-GLES2.functional.texture.filtering.2d.nearest_mipmap_linear_linear_clamp_rgba8888
+dEQP-GLES2.functional.texture.format.a8_2d_pot
+dEQP-GLES2.functional.texture.format.a8_cube_pot
+dEQP-GLES2.functional.texture.format.etc1_cube_pot
+dEQP-GLES2.functional.texture.format.rgba8888_2d_npot
+dEQP-GLES2.functional.texture.size.2d.64x64_l8_mipmap
+dEQP-GLES2.functional.texture.size.2d.64x64_rgba4444
+dEQP-GLES2.functional.texture.size.2d.64x64_rgb888
+dEQP-GLES2.functional.texture.size.2d.64x64_rgba8888
+dEQP-GLES2.functional.texture.size.2d.65x63_rgba8888
+dEQP-GLES2.functional.texture.size.cube.15x15_rgba4444
+dEQP-GLES2.functional.texture.size.cube.16x16_l8_mipmap
+dEQP-GLES2.functional.texture.size.cube.64x64_rgba8888_mipmap
+dEQP-GLES2.functional.texture.wrap.clamp_clamp_linear_pot_rgb888
+dEQP-GLES2.functional.uniform_api.random.21
+dEQP-GLES2.functional.uniform_api.random.33
+dEQP-GLES2.functional.uniform_api.random.94
+dEQP-GLES2.functional.uniform_api.value.assigned.by_pointer.render.basic_array.sampler2D_both
+dEQP-GLES2.functional.uniform_api.value.assigned.by_pointer.render.basic_array.sampler2D_vertex
+dEQP-GLES2.functional.uniform_api.value.initial.render.basic.samplerCube_both
+spec@!opengl 1.0@gl-1.0-scissor-bitmap
+spec@!opengl 1.0@rasterpos
+spec@!opengl 1.0@rasterpos@glsl_vs_uniforms
+spec@!opengl 1.4@triangle-rasterization-fbo
+spec@arb_fragment_program@fp-indirections2
+spec@arb_fragment_program_shadow@tex-shadow2dnotdepth
+spec@arb_framebuffer_object@fbo-generatemipmap-cubemap
+spec@arb_pixel_buffer_object@pbo-teximage
+spec@ext_framebuffer_object@fbo-drawbuffers-fragcolor
+spec@ext_framebuffer_object@fbo-generatemipmap-formats
+spec@ext_framebuffer_object@fbo-generatemipmap-formats@3
+spec@ext_texture_array@glsl-fs-shadow2darray
+spec@glsl-1.10@execution@samplers@glsl-fs-shadow2d
+spec@glsl-1.10@execution@samplers@glsl-fs-shadow2d-04
+spec@glsl-1.10@execution@texture1d

src/etnaviv/ci/gitlab-ci.yml

@@ -31,70 +31,96 @@
         *etnaviv_file_list
       when: manual
 
-# 1 devices (2023-12-16)
 .austriancoder-imx6q-cubox-i:arm32:
   variables:
-    BM_CMDLINE: "ip=dhcp console=ttymxc0,115200n8 root=/dev/nfs rw nfsrootdebug init=/init $BM_KERNELARGS"
+    RUNNER_FARM_LOCATION: austriancoder
-    BM_DTB: imx6q-cubox-i
+    B2C_TIMEOUT_FIRST_CONSOLE_ACTIVITY_SECONDS: 30
-    BM_KERNEL: zImage
+    B2C_TIMEOUT_FIRST_CONSOLE_ACTIVITY_RETRIES: 3
+    B2C_IMAGESTORE_PLATFORM: linux/arm/v7
     GPU_VERSION: "etnaviv-gc2000"
-  script:
-    - ./install/bare-metal/fastboot.sh
-  tags:
-    - etnaviv-gc2000
 
-# 1 devices (2023-12-16)
+# 1 device (2025-01-30)
+.austriancoder-imx6q-cubox-i-2cores:arm32:
+  extends:
+    - .austriancoder-imx6q-cubox-i:arm32
+  variables:
+    FDO_CI_CONCURRENT: 2
+  tags:
+    - farm:$RUNNER_FARM_LOCATION
+    - cpu:cores:2
+    - vivante:model:2000
+
+# 4 devices (2025-01-30)
+.austriancoder-imx6q-cubox-i-4cores:arm32:
+  extends:
+    - .austriancoder-imx6q-cubox-i:arm32
+  variables:
+    FDO_CI_CONCURRENT: 4
+  tags:
+    - farm:$RUNNER_FARM_LOCATION
+    - cpu:cores:4
+    - vivante:model:2000
+
+
+# 0 devices (2025-01-30)
 .austriancoder-imx8mq-nitrogen:arm64:
   variables:
-    BM_CMDLINE: "ip=dhcp console=ttymxc0,115200n8 root=/dev/nfs rw nfsrootdebug init=/init $BM_KERNELARGS"
+    FDO_CI_CONCURRENT: 4
-    BM_DTB: imx8mq-nitrogen
+    RUNNER_FARM_LOCATION: austriancoder
-    BM_KERNEL: Image
+    B2C_TIMEOUT_FIRST_CONSOLE_ACTIVITY_SECONDS: 30
+    B2C_TIMEOUT_FIRST_CONSOLE_ACTIVITY_RETRIES: 3
+    B2C_IMAGESTORE_PLATFORM: linux/arm64/v8
     GPU_VERSION: "etnaviv-gc7000"
-  script:
-    - ./install/bare-metal/fastboot.sh
   tags:
-    - austriancoder-etnaviv-imx8mq-nitrogen
+    - farm:$RUNNER_FARM_LOCATION
-
+    - vivante:model:7000
 
 gc2000-gles2:
   extends:
-    - .baremetal-deqp-test
+    - .b2c-arm32-test-gl
-    - .baremetal-test-arm32
+    - .austriancoder-imx6q-cubox-i-4cores:arm32
-    - .austriancoder-imx6q-cubox-i:arm32
     - .etnaviv-manual-rules
   variables:
     DEQP_SUITE: etnaviv-gc2000
-    FLAKES_CHANNEL: "#etnaviv-ci"
+    # Disable reporting, since DUTs don't have internet access
+    FLAKES_CHANNEL: ""
     HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
-  timeout: 20m
+    B2C_TIMEOUT_OVERALL_MINUTES: 28
+  timeout: 30m
 
-gc2000-gles2-asan:
+# Disabled until the 168 fails get addressed
+.gc2000-gles2-asan:
   extends:
-    - gc2000-gles2
+    - .b2c-arm32-test-asan-gl
-    - .baremetal-arm32-asan-test
+    - .austriancoder-imx6q-cubox-i-2cores:arm32
+    - .etnaviv-manual-rules
   variables:
+    DEQP_SUITE: etnaviv-gc2000
+    FLAKES_CHANNEL: ""
     DEQP_FRACTION: 100
     FDO_CI_CONCURRENT: 1
+    HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
+    B2C_TIMEOUT_OVERALL_MINUTES: 28
+  timeout: 30m
 
 gc2000-piglit:
   extends:
-    - .baremetal-deqp-test
+    - gc2000-gles2
-    - .baremetal-test-arm32
-    - .austriancoder-imx6q-cubox-i:arm32
-    - .etnaviv-manual-rules
   variables:
     DEQP_SUITE: etnaviv-gc2000-piglit
-    FLAKES_CHANNEL: "#etnaviv-ci"
+    B2C_TIMEOUT_OVERALL_MINUTES: 25
-  timeout: 40m
+  parallel: 2
+  timeout: 30m
 
-gc7000-gles2:
+# Disabled until DUTs appear
+.gc7000-gles2:
   extends:
-    - .baremetal-deqp-test
+    - .b2c-arm64-test-gl
-    - .baremetal-test-arm64
     - .austriancoder-imx8mq-nitrogen:arm64
     - .etnaviv-manual-rules
   variables:
     DEQP_SUITE: etnaviv-gc7000
-    FLAKES_CHANNEL: "#etnaviv-ci"
+    FLAKES_CHANNEL: ""
     HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
-  timeout: 20m
+    B2C_TIMEOUT_OVERALL_MINUTES: 28
+  timeout: 30m