Module: Mesa Branch: main Commit: 16af090908e8eb4fff552151dbb130120e11c1f9 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=16af090908e8eb4fff552151dbb130120e11c1f9
Author: David Heidelberg <david.heidelb...@collabora.com> Date: Fri Sep 15 23:40:13 2023 +0530 ci/lava: separate HW definitions from SW Reviewed-by: Guilherme Gallo <guilherme.ga...@collabora.com> Signed-off-by: David Heidelberg <david.heidelb...@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26722> --- src/amd/ci/gitlab-ci-inc.yml | 72 ++++++++------ src/amd/ci/gitlab-ci.yml | 2 + src/freedreno/ci/gitlab-ci-inc.yml | 100 +++++++++++--------- src/freedreno/ci/gitlab-ci.yml | 22 +++-- src/gallium/drivers/lima/ci/gitlab-ci.yml | 23 +++-- src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml | 4 +- src/gallium/drivers/zink/ci/gitlab-ci.yml | 7 +- src/intel/ci/gitlab-ci-inc.yml | 125 ++++++++++++++---------- src/intel/ci/gitlab-ci.yml | 6 +- src/panfrost/ci/gitlab-ci.yml | 126 ++++++++++++++----------- 10 files changed, 276 insertions(+), 211 deletions(-) diff --git a/src/amd/ci/gitlab-ci-inc.yml b/src/amd/ci/gitlab-ci-inc.yml index eb15e703246..c62afc032ba 100644 --- a/src/amd/ci/gitlab-ci-inc.yml +++ b/src/amd/ci/gitlab-ci-inc.yml @@ -115,66 +115,84 @@ when: manual -############### LAVA -# job prefixes: radeonsi (OpenGL), radv (Vulkan), amd (radeonsi+radv) -.stoney-test:x86_64: +# Status: https://lava.collabora.dev/scheduler/device_type/acer-R721T-grunt +.lava-acer-R721T-grunt:x86_64: variables: BOOT_METHOD: depthcharge - DEQP_EXPECTED_RENDERER: STONEY + DEVICE_TYPE: acer-R721T-grunt DTB: "" FDO_CI_CONCURRENT: 3 HWCI_FREQ_MAX: "true" HWCI_KERNEL_MODULES: amdgpu KERNEL_IMAGE_TYPE: "" - FLAKES_CHANNEL: "#amd-ci" - -.radeonsi-stoney-test:x86_64: - extends: - - .stoney-test:x86_64 - - .radeonsi-rules - variables: - GPU_VERSION: radeonsi-stoney - DRIVER_NAME: radeonsi - # 12 devices (2023-01-10) RUNNER_TAG: mesa-ci-x86-64-lava-acer-R721T-grunt - DEVICE_TYPE: acer-R721T-grunt - PIGLIT_PLATFORM: mixed_glx_egl + VK_DRIVER: radeon -.radv-stoney-test:x86_64: - extends: - - .stoney-test:x86_64 - - .radv-collabora-rules +# Status: https://lava.collabora.dev/scheduler/device_type/hp-14-db0003na-grunt +.lava-hp-14-db0003na-grunt:x86_64: variables: - DEQP_VER: vk - DRIVER_NAME: radv - GPU_VERSION: radv-stoney-aco - VK_DRIVER: radeon - # 6 devices (2022-11-30) + BOOT_METHOD: depthcharge DEVICE_TYPE: hp-14-db0003na-grunt + DTB: "" + FDO_CI_CONCURRENT: 3 + HWCI_FREQ_MAX: "true" + HWCI_KERNEL_MODULES: amdgpu + KERNEL_IMAGE_TYPE: "" RUNNER_TAG: mesa-ci-x86-64-lava-hp-14-db0003na-grunt + VK_DRIVER: radeon -# 10 devices (2023-01-17) +# Status: https://lava.collabora.dev/scheduler/device_type/asus-CM1400CXA-dalboz .lava-asus-CM1400CXA-dalboz:x86_64: variables: BOOT_METHOD: depthcharge DEVICE_TYPE: asus-CM1400CXA-dalboz DTB: "" +# FDO_CI_CONCURRENT: ? HWCI_FREQ_MAX: "true" HWCI_KERNEL_MODULES: amdgpu KERNEL_IMAGE_TYPE: "" RUNNER_TAG: mesa-ci-x86-64-lava-asus-CM1400CXA-dalboz -# 5 devices (2023-05-03) +# Status: https://lava.collabora.dev/scheduler/device_type/lenovo-TPad-C13-Yoga-zork .lava-lenovo-TPad-C13-Yoga-zork:x86_64: variables: BOOT_METHOD: depthcharge DEVICE_TYPE: lenovo-TPad-C13-Yoga-zork DTB: "" +# FDO_CI_CONCURRENT: ? HWCI_FREQ_MAX: "true" HWCI_KERNEL_MODULES: amdgpu KERNEL_IMAGE_TYPE: "" RUNNER_TAG: mesa-ci-x86-64-lava-lenovo-TPad-C13-Yoga-zork + +############### LAVA +# job prefixes: radeonsi (OpenGL), radv (Vulkan), amd (radeonsi+radv) +.stoney-test:x86_64: + variables: + DEQP_EXPECTED_RENDERER: STONEY + FLAKES_CHANNEL: "#amd-ci" + +.radeonsi-stoney-test:x86_64: + extends: + - .stoney-test:x86_64 + - .lava-acer-R721T-grunt:x86_64 + - .radeonsi-rules + variables: + GPU_VERSION: radeonsi-stoney + DRIVER_NAME: radeonsi + PIGLIT_PLATFORM: mixed_glx_egl + +.radv-stoney-test:x86_64: + extends: + - .stoney-test:x86_64 + - .lava-hp-14-db0003na-grunt:x86_64 + - .radv-collabora-rules + variables: + DEQP_VER: vk + DRIVER_NAME: radv + GPU_VERSION: radv-stoney-aco + .radeonsi-raven-test:x86_64: extends: - .radeonsi-rules diff --git a/src/amd/ci/gitlab-ci.yml b/src/amd/ci/gitlab-ci.yml index e42d513db02..5ee36998612 100644 --- a/src/amd/ci/gitlab-ci.yml +++ b/src/amd/ci/gitlab-ci.yml @@ -46,6 +46,8 @@ radeonsi-stoney-traces:x86_64: variables: EGL_PLATFORM: surfaceless PIGLIT_TRACES_FILE: traces-amd.yml + PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/traces-amd.yml" + PIGLIT_REPLAY_EXTRA_ARGS: --keep-image radv-raven-vkcts:x86_64: extends: diff --git a/src/freedreno/ci/gitlab-ci-inc.yml b/src/freedreno/ci/gitlab-ci-inc.yml index 02f3e52810f..285ebe7d20a 100644 --- a/src/freedreno/ci/gitlab-ci-inc.yml +++ b/src/freedreno/ci/gitlab-ci-inc.yml @@ -191,6 +191,59 @@ dependencies: null +# Status: https://lava.collabora.dev/scheduler/device_type/sc7180-trogdor-kingoftown +.lava-sc7180-trogdor-kingoftown:arm64: + variables: + BOOT_METHOD: depthcharge + DEVICE_TYPE: sc7180-trogdor-kingoftown + DTB: sc7180-trogdor-kingoftown +# FDO_CI_CONCURRENT: ? + # Increase the hangcheck timer for our spilling tests which bump up against + # the .5s default. + FREEDRENO_HANGCHECK_MS: 2000 + GPU_VERSION: freedreno-a618 + KERNEL_IMAGE_TYPE: "" + RUNNER_TAG: mesa-ci-x86-64-lava-sc7180-trogdor-kingoftown + VK_DRIVER: freedreno + FORCE_KERNEL_TAG: "v6.4.12-for-mesa-ci-f6b4ad45f48d" # 6.6 is slow and unstable + KERNEL_IMAGE_BASE: https://${S3_HOST}/mesa-lava/${KERNEL_REPO}/${FORCE_KERNEL_TAG} + +# Status: https://lava.collabora.dev/scheduler/device_type/sc7180-trogdor-lazor-limozeen +.lava-sc7180-trogdor-lazor-limozeen:arm64: + variables: + BOOT_METHOD: depthcharge + DEVICE_TYPE: sc7180-trogdor-lazor-limozeen + DTB: sc7180-trogdor-lazor-limozeen-nots-r5 +# FDO_CI_CONCURRENT: ? + # Increase the hangcheck timer for our spilling tests which bump up against + # the .5s default. + FREEDRENO_HANGCHECK_MS: 2000 + GPU_VERSION: freedreno-a618 + KERNEL_IMAGE_TYPE: "" + RUNNER_TAG: mesa-ci-x86-64-lava-sc7180-trogdor-lazor-limozeen + VK_DRIVER: freedreno + FORCE_KERNEL_TAG: "v6.4.12-for-mesa-ci-f6b4ad45f48d" # 6.6 is slow and unstable + KERNEL_IMAGE_BASE: https://${S3_HOST}/mesa-lava/${KERNEL_REPO}/${FORCE_KERNEL_TAG} + +# Status: https://lava.collabora.dev/scheduler/device_type/sm8350-hdk +.lava-sm8350-hdk:arm64: + variables: + BOOT_METHOD: fastboot + DEVICE_TYPE: sm8350-hdk + DTB: sm8350-hdk +# FDO_CI_CONCURRENT: ? + # Increase the hangcheck timer for our spilling tests which bump up against + # the .5s default. + FREEDRENO_HANGCHECK_MS: 2000 + GPU_VERSION: freedreno-a660 + KERNEL_IMAGE_NAME: "Image.gz" + KERNEL_IMAGE_TYPE: "" + RUNNER_TAG: mesa-ci-x86-64-lava-sm8350-hdk + VK_DRIVER: freedreno + FORCE_KERNEL_TAG: "v6.4.12-for-mesa-ci-f6b4ad45f48d" # 6.6 is slow and unstable + KERNEL_IMAGE_BASE: https://${S3_HOST}/mesa-lava/${KERNEL_REPO}/${FORCE_KERNEL_TAG} + + .google-freedreno-test: extends: - .baremetal-test-arm64 @@ -287,53 +340,6 @@ variables: PIGLIT_PROFILES: quick_gl -.a618-test: - extends: - .lava-test:arm64 - variables: - FLAKES_CHANNEL: "#freedreno-ci" - BOOT_METHOD: depthcharge - KERNEL_IMAGE_TYPE: "" - # Increase the hangcheck timer for our spilling tests which bump up against - # the .5s default. - FREEDRENO_HANGCHECK_MS: 2000 - GPU_VERSION: freedreno-a618 - VK_DRIVER: freedreno - FORCE_KERNEL_TAG: "v6.4.12-for-mesa-ci-f6b4ad45f48d" # 6.6 is slow and unstable - KERNEL_IMAGE_BASE: https://${S3_HOST}/mesa-lava/${KERNEL_REPO}/${FORCE_KERNEL_TAG} - -.a618-test-kingoftown: - extends: - - .a618-test - variables: - DEVICE_TYPE: sc7180-trogdor-kingoftown - DTB: sc7180-trogdor-kingoftown - RUNNER_TAG: mesa-ci-x86-64-lava-sc7180-trogdor-kingoftown - -.a618-test-limozeen-nots-r5: - extends: - - .a618-test - variables: - DEVICE_TYPE: sc7180-trogdor-lazor-limozeen - DTB: sc7180-trogdor-lazor-limozeen-nots-r5 - RUNNER_TAG: mesa-ci-x86-64-lava-sc7180-trogdor-lazor-limozeen - -.lava-sm8350-hdk: - variables: - BOOT_METHOD: fastboot - KERNEL_IMAGE_NAME: "Image.gz" - KERNEL_IMAGE_TYPE: "" - # Increase the hangcheck timer for our spilling tests which bump up against - # the .5s default. - FREEDRENO_HANGCHECK_MS: 2000 - DEVICE_TYPE: sm8350-hdk - DTB: sm8350-hdk - GPU_VERSION: freedreno-a660 - RUNNER_TAG: mesa-ci-x86-64-lava-sm8350-hdk - VK_DRIVER: freedreno - FORCE_KERNEL_TAG: "v6.4.12-for-mesa-ci-f6b4ad45f48d" # 6.6 is slow and unstable - KERNEL_IMAGE_BASE: https://${S3_HOST}/mesa-lava/${KERNEL_REPO}/${FORCE_KERNEL_TAG} - # 6 devices (2023-07-06) .a630-test: extends: diff --git a/src/freedreno/ci/gitlab-ci.yml b/src/freedreno/ci/gitlab-ci.yml index 8ec41cc843a..f3c0b1738e2 100644 --- a/src/freedreno/ci/gitlab-ci.yml +++ b/src/freedreno/ci/gitlab-ci.yml @@ -46,11 +46,12 @@ a530-traces: a618_vk: extends: - .lava-test-deqp:arm64 - - .a618-test-kingoftown + - .lava-sc7180-trogdor-kingoftown:arm64 - .collabora-turnip-rules parallel: 12 variables: DEQP_SUITE: freedreno-a618-vk + FLAKES_CHANNEL: "#freedreno-ci" MESA_VK_IGNORE_CONFORMANCE_WARNING: 1 DEQP_FRACTION: 2 @@ -72,21 +73,23 @@ a618_vk_full: a618_gl: extends: - .lava-test-deqp:arm64 - - .a618-test-limozeen-nots-r5 + - .lava-sc7180-trogdor-lazor-limozeen:arm64 - .collabora-freedreno-rules parallel: 4 variables: DEQP_SUITE: freedreno-a618 + FLAKES_CHANNEL: "#freedreno-ci" # Run dEQP EGL window system tests separately with the window systems available. # X11 takes over the screen, wayland is run headless. a618_egl: extends: - .lava-test-deqp:arm64 - - .a618-test-limozeen-nots-r5 + - .lava-sc7180-trogdor-lazor-limozeen:arm64 - .collabora-freedreno-rules variables: DEQP_VER: egl + FLAKES_CHANNEL: "#freedreno-ci" HWCI_START_XORG: 1 HWCI_START_WESTON: 1 DEQP_SUITE: freedreno-a618-egl @@ -94,11 +97,12 @@ a618_egl: a618_skqp: extends: - .lava-test-deqp:arm64 - - .a618-test-limozeen-nots-r5 + - .lava-sc7180-trogdor-lazor-limozeen:arm64 - .collabora-freedreno-rules # SKQP tests both the GL and VK drivers. - .collabora-freedreno-turnip-rules variables: + FLAKES_CHANNEL: "#freedreno-ci" HWCI_START_XORG: 1 DEQP_SUITE: freedreno-a618-skqp @@ -106,24 +110,26 @@ a618_piglit: extends: - .piglit-test - .lava-piglit:arm64 - - .a618-test-limozeen-nots-r5 + - .lava-sc7180-trogdor-lazor-limozeen:arm64 - .collabora-freedreno-rules # Note that piglit has GL+VK integration testing. - .collabora-freedreno-turnip-rules variables: + FLAKES_CHANNEL: "#freedreno-ci" HWCI_START_WESTON: 1 PIGLIT_PROFILES: gpu a618-traces: extends: - .lava-piglit-traces:arm64 - - .a618-test-limozeen-nots-r5 + - .lava-sc7180-trogdor-lazor-limozeen:arm64 - .collabora-freedreno-rules variables: HWCI_START_WESTON: 1 # So we aren't capped by VSync by the X server EGL_PLATFORM: surfaceless FDO_CI_CONCURRENT: 5 # 6 is too much leading to OOM + FLAKES_CHANNEL: "#freedreno-ci" PIGLIT_REPLAY_DEVICE_NAME: "${GPU_VERSION}" PIGLIT_RESULTS: "${GPU_VERSION}-replay" # This lets us run several more traces which don't use any features we're @@ -149,7 +155,7 @@ a660_gl: extends: - .lava-test-deqp:arm64 - .collabora-freedreno-rules - - .lava-sm8350-hdk + - .lava-sm8350-hdk:arm64 parallel: 2 variables: DEQP_SUITE: freedreno-a660 @@ -159,7 +165,7 @@ a660_gl: extends: - .lava-test-deqp:arm64 - .collabora-turnip-rules - - .lava-sm8350-hdk + - .lava-sm8350-hdk:arm64 parallel: 5 variables: DEQP_SUITE: freedreno-a660-vk diff --git a/src/gallium/drivers/lima/ci/gitlab-ci.yml b/src/gallium/drivers/lima/ci/gitlab-ci.yml index b9adf963717..680ed8c1f5a 100644 --- a/src/gallium/drivers/lima/ci/gitlab-ci.yml +++ b/src/gallium/drivers/lima/ci/gitlab-ci.yml @@ -10,31 +10,34 @@ - src/lima/**/* when: on_success - -.lava-meson-gxl-s805x-libretech-ac: - extends: - - .lava-test-deqp:arm64 - - .lima-rules +# 4 devices (2023-12-16) +.lava-meson-gxl-s805x-libretech-ac:arm64: variables: DEVICE_TYPE: meson-gxl-s805x-libretech-ac - DTB: ${DEVICE_TYPE} + DTB: meson-gxl-s805x-libretech-ac FDO_CI_CONCURRENT: 4 - FDO_HTTP_CACHE_URI: '' GPU_VERSION: lima - VISIBILITY_GROUP: "mesa-ci" RUNNER_TAG: mesa-ci-x86-64-lava-lima lima-mali450-deqp:arm64: extends: - - .lava-meson-gxl-s805x-libretech-ac + - .lava-test-deqp:arm64 + - .lima-rules + - .lava-meson-gxl-s805x-libretech-ac:arm64 variables: + FDO_HTTP_CACHE_URI: '' HWCI_START_WESTON: 1 DEQP_SUITE: lima-mali450-deqp + VISIBILITY_GROUP: "mesa-ci" lima-mali450-piglit:arm64: extends: - - .lava-meson-gxl-s805x-libretech-ac + - .lava-test-deqp:arm64 + - .lima-rules + - .lava-meson-gxl-s805x-libretech-ac:arm64 variables: DEQP_SUITE: lima-mali450-piglit + FDO_HTTP_CACHE_URI: '' PIGLIT_PLATFORM: gbm + VISIBILITY_GROUP: "mesa-ci" parallel: 2 diff --git a/src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml b/src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml index 4b92da40f73..7326998c325 100644 --- a/src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml +++ b/src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml @@ -67,9 +67,8 @@ .virgl-iris-test: extends: - .lava-piglit-traces:x86_64 + - .lava-asus-cx9400-volteer:x86_64 variables: - DEVICE_TYPE: asus-cx9400-volteer - BOOT_METHOD: depthcharge HWCI_KERNEL_MODULES: vhost_vsock HWCI_KVM: "true" HWCI_TEST_SCRIPT: "LP_NUM_THREADS=${FDO_CI_CONCURRENT} FDO_CI_CONCURRENT=1 /install/crosvm-runner.sh /install/piglit/piglit-traces.sh" @@ -81,4 +80,3 @@ EGL_PLATFORM: surfaceless PIGLIT_PROFILES: replay PIGLIT_TRACES_FILE: traces-virgl-iris.yml - RUNNER_TAG: mesa-ci-x86-64-lava-asus-cx9400-volteer diff --git a/src/gallium/drivers/zink/ci/gitlab-ci.yml b/src/gallium/drivers/zink/ci/gitlab-ci.yml index d6237b30a25..5713b2ac5ad 100644 --- a/src/gallium/drivers/zink/ci/gitlab-ci.yml +++ b/src/gallium/drivers/zink/ci/gitlab-ci.yml @@ -66,18 +66,15 @@ zink-anv-tgl-traces-restricted: zink-tu-a618: extends: - .lava-test-deqp:arm64 - - .a618-test - .zink-turnip-rules - .zink-test + - .lava-sc7180-trogdor-lazor-limozeen:arm64 parallel: 2 variables: DEQP_SUITE: zink-freedreno-a618 + FLAKES_CHANNEL: "#freedreno-ci" HWCI_START_WESTON: 1 GPU_VERSION: zink-freedreno-a618 - VK_DRIVER: freedreno - DEVICE_TYPE: sc7180-trogdor-lazor-limozeen - DTB: sc7180-trogdor-lazor-limozeen-nots-r5 - RUNNER_TAG: mesa-ci-x86-64-lava-sc7180-trogdor-lazor-limozeen zink-tu-a618-traces: extends: diff --git a/src/intel/ci/gitlab-ci-inc.yml b/src/intel/ci/gitlab-ci-inc.yml index ddbb5b341f2..16a9e19408a 100644 --- a/src/intel/ci/gitlab-ci-inc.yml +++ b/src/intel/ci/gitlab-ci-inc.yml @@ -182,6 +182,72 @@ - !reference [.anv-manual-rules, rules] +# Status: https://lava.collabora.dev/scheduler/device_type/acer-cb317-1h-c3z6-dedede +.lava-acer-cb317-1h-c3z6-dedede:x86_64: + variables: + DEVICE_TYPE: acer-cb317-1h-c3z6-dedede + FDO_CI_CONCURRENT: 3 + GPU_VERSION: iris-jsl + RUNNER_TAG: mesa-ci-x86-64-lava-acer-cb317-1h-c3z6-dedede + +# Status: https://lava.collabora.dev/scheduler/device_type/asus-C523NA-A20057-coral +.lava-asus-C523NA-A20057-coral:x86_64: + variables: + DEVICE_TYPE: asus-C523NA-A20057-coral + FDO_CI_CONCURRENT: 5 + GPU_VERSION: iris-apl + RUNNER_TAG: mesa-ci-x86-64-lava-asus-C523NA-A20057-coral + +# Status: https://lava.collabora.dev/scheduler/device_type/hp-x360-12b-ca0010nr-n4020-octopus +.lava-hp-x360-12b-ca0010nr-n4020-octopus:x86_64: + variables: + DEVICE_TYPE: hp-x360-12b-ca0010nr-n4020-octopus + FDO_CI_CONCURRENT: 3 + GPU_VERSION: iris-glk + RUNNER_TAG: mesa-ci-x86-64-lava-hp-x360-12b-ca0010nr-n4020-octopus + +# Status: https://lava.collabora.dev/scheduler/device_type/asus-cx9400-volteer +.lava-asus-cx9400-volteer:x86_64: + variables: + BOOT_METHOD: depthcharge + DEVICE_TYPE: asus-cx9400-volteer + FDO_CI_CONCURRENT: 9 + GPU_VERSION: anv-tgl + RUNNER_TAG: mesa-ci-x86-64-lava-asus-cx9400-volteer + +# Status: https://lava.collabora.dev/scheduler/device_type/asus-C433TA-AJ0005-rammus +.lava-asus-C433TA-AJ0005-rammus:x86_64: + variables: + DEVICE_TYPE: asus-C433TA-AJ0005-rammus + FDO_CI_CONCURRENT: 5 + GPU_VERSION: iris-amly + RUNNER_TAG: mesa-ci-x86-64-lava-asus-C433TA-AJ0005-rammus + +# Status: https://lava.collabora.dev/scheduler/device_type/hp-x360-14-G1-sona +.lava-hp-x360-14-G1-sona:x86_64: + variables: + DEVICE_TYPE: hp-x360-14-G1-sona + FDO_CI_CONCURRENT: 9 + GPU_VERSION: iris-kbl + RUNNER_TAG: mesa-ci-x86-64-lava-hp-x360-14-G1-sona + +# Status: https://lava.collabora.dev/scheduler/device_type/dell-latitude-5400-8665U-sarien +.lava-dell-latitude-5400-8665U-sarien:x86_64: + variables: + DEVICE_TYPE: dell-latitude-5400-8665U-sarien + FDO_CI_CONCURRENT: 9 + GPU_VERSION: iris-whl + RUNNER_TAG: mesa-ci-x86-64-lava-dell-latitude-5400-8665U-sarien + +# Status: https://lava.collabora.dev/scheduler/device_type/asus-C436FA-Flip-hatch +.lava-asus-C436FA-Flip-hatch:x86_64: + variables: + DEVICE_TYPE: asus-C436FA-Flip-hatch + FDO_CI_CONCURRENT: 9 + GPU_VERSION: iris-cml + RUNNER_TAG: mesa-ci-x86-64-lava-asus-C436FA-flip-hatch + + .intel-common-test: extends: - .lava-test-deqp:x86_64 @@ -212,15 +278,10 @@ - .intel-rules ## ANV only -# 15; 10 i5 boards + 5 i7 boards (2023-01-17) .anv-tgl-test: extends: - .anv-test - variables: - DEVICE_TYPE: asus-cx9400-volteer - GPU_VERSION: anv-tgl - FDO_CI_CONCURRENT: 9 - RUNNER_TAG: mesa-ci-x86-64-lava-asus-cx9400-volteer + - .lava-asus-cx9400-volteer:x86_64 .anv-angle-test: extends: @@ -233,75 +294,37 @@ HWCI_START_XORG: 1 ## Iris only -# 5 boards .iris-apl-test: extends: - .iris-test - variables: - DEVICE_TYPE: asus-C523NA-A20057-coral - GPU_VERSION: iris-apl - RUNNER_TAG: mesa-ci-x86-64-lava-asus-C523NA-A20057-coral - FDO_CI_CONCURRENT: 5 + - .lava-asus-C523NA-A20057-coral:x86_64 -# 4 boards .iris-glk-test: extends: - .iris-test - variables: - DEVICE_TYPE: hp-x360-12b-ca0010nr-n4020-octopus - GPU_VERSION: iris-glk - RUNNER_TAG: mesa-ci-x86-64-lava-hp-x360-12b-ca0010nr-n4020-octopus - FDO_CI_CONCURRENT: 3 + - .lava-hp-x360-12b-ca0010nr-n4020-octopus:x86_64 -# 5 boards, manual for now due to the GPU being occasionally stuck .iris-amly-test: extends: - .iris-test - - .iris-manual-rules - variables: - DEVICE_TYPE: asus-C433TA-AJ0005-rammus - GPU_VERSION: iris-amly - RUNNER_TAG: mesa-ci-x86-64-lava-asus-C433TA-AJ0005-rammus - FDO_CI_CONCURRENT: 5 + - .iris-manual-rules # GPU being occasionally stuck + - .lava-asus-C433TA-AJ0005-rammus:x86_64 -# 6 boards .iris-kbl-test: extends: - .iris-test - variables: - DEVICE_TYPE: hp-x360-14-G1-sona - GPU_VERSION: iris-kbl - RUNNER_TAG: mesa-ci-x86-64-lava-hp-x360-14-G1-sona - FDO_CI_CONCURRENT: 9 + - .lava-hp-x360-14-G1-sona:x86_64 -# 5 boards .iris-whl-test: extends: - .iris-test - variables: - DEVICE_TYPE: dell-latitude-5400-8665U-sarien - GPU_VERSION: iris-whl - RUNNER_TAG: mesa-ci-x86-64-lava-dell-latitude-5400-8665U-sarien - FDO_CI_CONCURRENT: 9 + - .lava-dell-latitude-5400-8665U-sarien:x86_64 -# 5 boards .iris-cml-test: extends: - .iris-test - .iris-manual-rules # Devices have too often network problems and fail to boot. - variables: - DEVICE_TYPE: asus-C436FA-Flip-hatch - GPU_VERSION: iris-cml - RUNNER_TAG: mesa-ci-x86-64-lava-asus-C436FA-flip-hatch - FDO_CI_CONCURRENT: 9 - -# 8 boards -.jsl-test: - variables: - DEVICE_TYPE: acer-cb317-1h-c3z6-dedede - GPU_VERSION: iris-jsl - RUNNER_TAG: mesa-ci-x86-64-lava-acer-cb317-1h-c3z6-dedede - FDO_CI_CONCURRENT: 3 + - .lava-asus-C436FA-Flip-hatch:x86_64 .iris-whl-deqp: extends: diff --git a/src/intel/ci/gitlab-ci.yml b/src/intel/ci/gitlab-ci.yml index 806662ec7f6..57e40992ff6 100644 --- a/src/intel/ci/gitlab-ci.yml +++ b/src/intel/ci/gitlab-ci.yml @@ -3,7 +3,7 @@ include: anv-jsl: extends: - - .jsl-test + - .lava-acer-cb317-1h-c3z6-dedede:x86_64 - .anv-test variables: DEQP_SUITE: anv-jsl @@ -63,7 +63,7 @@ hasvk-hsw: anv-jsl-angle: extends: - - .jsl-test + - .lava-acer-cb317-1h-c3z6-dedede:x86_64 - .anv-angle-test variables: DEQP_SUITE: anv-jsl-angle @@ -150,7 +150,7 @@ iris-cml-deqp: iris-jsl-deqp: extends: - - .jsl-test + - .lava-acer-cb317-1h-c3z6-dedede:x86_64 - .iris-test variables: DEQP_SUITE: iris-jsl diff --git a/src/panfrost/ci/gitlab-ci.yml b/src/panfrost/ci/gitlab-ci.yml index 8267c92e17c..a2f15d22552 100644 --- a/src/panfrost/ci/gitlab-ci.yml +++ b/src/panfrost/ci/gitlab-ci.yml @@ -81,7 +81,6 @@ *panfrost_bifrost_file_list when: manual - .panfrost-test: variables: FLAKES_CHANNEL: "#panfrost-ci" @@ -97,32 +96,81 @@ EGL_PLATFORM: surfaceless PIGLIT_TRACES_FILE: traces-panfrost.yml -# 2 machines, but shared with KernelCI (2022-10-24) -.lava-rk3288-veyron-jaq: +# https://lava.collabora.dev/scheduler/device_type/meson-g12b-a311d-khadas-vim3 +.lava-meson-g12b-a311d-khadas-vim3:arm64: + variables: + DEVICE_TYPE: meson-g12b-a311d-khadas-vim3 + DTB: $DEVICE_TYPE + GPU_VERSION: panfrost-g52 +# FDO_CI_CONCURRENT: ? + RUNNER_TAG: mesa-ci-x86-64-lava-meson-g12b-a311d-khadas-vim3 + VK_DRIVER: panfrost + +# Status: https://lava.collabora.dev/scheduler/device_type/mt8183-kukui-jacuzzi-juniper-sku16 +.lava-mt8183-kukui-jacuzzi-juniper-sku16:arm64: + variables: + DEVICE_TYPE: mt8183-kukui-jacuzzi-juniper-sku16 + DTB: $DEVICE_TYPE + BOOT_METHOD: depthcharge + KERNEL_IMAGE_TYPE: "" + GPU_VERSION: panfrost-g72 +# FDO_CI_CONCURRENT: ? + RUNNER_TAG: mesa-ci-x86-64-lava-mt8183-kukui-jacuzzi-juniper-sku16 + +# Status: https://lava.collabora.dev/scheduler/device_type/mt8192-asurada-spherion-r0 +.lava-mt8192-asurada-spherion-r0:arm64: + variables: + BOOT_METHOD: depthcharge + DEVICE_TYPE: mt8192-asurada-spherion-r0 + DTB: $DEVICE_TYPE +# FDO_CI_CONCURRENT: ? + GPU_VERSION: panfrost-g57 + KERNEL_IMAGE_TYPE: "" + RUNNER_TAG: mesa-ci-x86-64-lava-mt8192-asurada-spherion-r0 + +.lava-rk3288-veyron-jaq:arm32: variables: BOOT_METHOD: depthcharge DEVICE_TYPE: rk3288-veyron-jaq DEQP_SUITE: panfrost-t760 DRIVER_NAME: panfrost - DTB: $DEVICE_TYPE + DTB: rk3288-veyron-jaq + FDO_CI_CONCURRENT: 6 GPU_VERSION: panfrost-t760 KERNEL_IMAGE_TYPE: "" - FDO_CI_CONCURRENT: 6 RUNNER_TAG: mesa-ci-x86-64-lava-rk3288-veyron-jaq -panfrost-t720-gles2:arm64: - extends: - - .lava-test-deqp:arm64 - - .panfrost-midgard-rules - - .panfrost-test +# Status: https://lava.collabora.dev/scheduler/device_type/rk3399-gru-kevin +.lava-rk3399-gru-kevin:arm64: variables: - DEVICE_TYPE: sun50i-h6-pine-h64 + DEVICE_TYPE: rk3399-gru-kevin DTB: $DEVICE_TYPE + GPU_VERSION: panfrost-t860 + DRIVER_NAME: panfrost +# FDO_CI_CONCURRENT: ? + BOOT_METHOD: depthcharge + KERNEL_IMAGE_TYPE: "" + RUNNER_TAG: mesa-ci-x86-64-lava-rk3399-gru-kevin + +# Status: https://lava.collabora.dev/scheduler/device_type/sun50i-h6-pine-h64 +.lava-sun50i-h6-pine-h64:arm64: + variables: + DEVICE_TYPE: sun50i-h6-pine-h64 + DTB: sun50i-h6-pine-h64 GPU_VERSION: panfrost-t720 DEQP_SUITE: panfrost-t720 FDO_CI_CONCURRENT: 6 + HWCI_FREQ_MAX: "true" RUNNER_TAG: mesa-ci-x86-64-lava-sun50i-h6-pine-h64 + +panfrost-t720-gles2:arm64: + extends: + - .lava-test-deqp:arm64 + - .panfrost-midgard-rules + - .panfrost-test + - .lava-sun50i-h6-pine-h64:arm64 + # We only have two machines, which we share with KernelCI. # Keep the second t760 job manual. panfrost-t760-gles:arm32: @@ -130,7 +178,7 @@ panfrost-t760-gles:arm32: - .lava-test-deqp:arm32 - .panfrost-midgard-manual-rules - .panfrost-test - - .lava-rk3288-veyron-jaq + - .lava-rk3288-veyron-jaq:arm32 variables: JOB_TIMEOUT: 60 @@ -139,26 +187,16 @@ panfrost-t760-traces:arm32: - .lava-piglit-traces:arm32 - .panfrost-midgard-manual-rules - .panfrost-test - - .lava-rk3288-veyron-jaq + - .lava-rk3288-veyron-jaq:arm32 - .panfrost-traces -.lava-rk3399-gru-kevin: - variables: - DEVICE_TYPE: rk3399-gru-kevin - DTB: $DEVICE_TYPE - GPU_VERSION: panfrost-t860 - DRIVER_NAME: panfrost - BOOT_METHOD: depthcharge - KERNEL_IMAGE_TYPE: "" - RUNNER_TAG: mesa-ci-x86-64-lava-rk3399-gru-kevin - panfrost-t860-gl:arm64: parallel: 3 extends: - .lava-test-deqp:arm64 - .panfrost-midgard-rules - .panfrost-test - - .lava-rk3399-gru-kevin + - .lava-rk3399-gru-kevin:arm64 variables: FDO_CI_CONCURRENT: 6 DEQP_SUITE: panfrost-t860 @@ -168,7 +206,7 @@ panfrost-t860-egl:arm64: - .lava-test-deqp:arm64 - .panfrost-midgard-rules - .panfrost-test - - .lava-rk3399-gru-kevin + - .lava-rk3399-gru-kevin:arm64 variables: HWCI_START_WESTON: 1 DEQP_SUITE: panfrost-t860-egl @@ -178,23 +216,16 @@ panfrost-t860-traces:arm64: - .lava-piglit-traces:arm64 - .panfrost-midgard-manual-rules - .panfrost-test - - .lava-rk3399-gru-kevin + - .lava-rk3399-gru-kevin:arm64 - .panfrost-traces -.lava-meson-g12b-a311d-khadas-vim3: - variables: - DEVICE_TYPE: meson-g12b-a311d-khadas-vim3 - DTB: $DEVICE_TYPE - GPU_VERSION: panfrost-g52 - RUNNER_TAG: mesa-ci-x86-64-lava-meson-g12b-a311d-khadas-vim3 - panfrost-g52-gl:arm64: parallel: 3 extends: - .lava-test-deqp:arm64 - .panfrost-bifrost-rules - .panfrost-test - - .lava-meson-g12b-a311d-khadas-vim3 + - .lava-meson-g12b-a311d-khadas-vim3:arm64 variables: FDO_CI_CONCURRENT: 6 DEQP_SUITE: panfrost-g52 @@ -205,10 +236,9 @@ panfrost-g52-vk:arm64: - .lava-test-deqp:arm64 - .panfrost-bifrost-rules - .panfrost-test - - .lava-meson-g12b-a311d-khadas-vim3 + - .lava-meson-g12b-a311d-khadas-vim3:arm64 - .panfrost-bifrost-manual-rules variables: - VK_DRIVER: panfrost MESA_VK_IGNORE_CONFORMANCE_WARNING: 1 PAN_I_WANT_A_BROKEN_VULKAN_DRIVER: 1 PANVK_DEBUG: no_known_warn @@ -219,46 +249,28 @@ panfrost-g52-piglit-gles2:arm64: - .lava-piglit:arm64 - .panfrost-bifrost-rules - .panfrost-test - - .lava-meson-g12b-a311d-khadas-vim3 + - .lava-meson-g12b-a311d-khadas-vim3:arm64 variables: HWCI_START_WESTON: 1 DEQP_VER: gles2 PIGLIT_PROFILES: quick_gl -.lava-mt8183-kukui-jacuzzi-juniper-sku16: - variables: - DEVICE_TYPE: mt8183-kukui-jacuzzi-juniper-sku16 - DTB: mt8183-kukui-jacuzzi-juniper-sku16 - BOOT_METHOD: depthcharge - KERNEL_IMAGE_TYPE: "" - GPU_VERSION: panfrost-g72 - RUNNER_TAG: mesa-ci-x86-64-lava-mt8183-kukui-jacuzzi-juniper-sku16 - panfrost-g72-gl:arm64: parallel: 3 extends: - .lava-test-deqp:arm64 - .panfrost-bifrost-rules - .panfrost-test - - .lava-mt8183-kukui-jacuzzi-juniper-sku16 + - .lava-mt8183-kukui-jacuzzi-juniper-sku16:arm64 variables: DEQP_SUITE: panfrost-g72 -.lava-mt8192-asurada-spherion-r0: - variables: - DEVICE_TYPE: mt8192-asurada-spherion-r0 - DTB: mt8192-asurada-spherion-r0 - BOOT_METHOD: depthcharge - KERNEL_IMAGE_TYPE: "" - GPU_VERSION: panfrost-g57 - RUNNER_TAG: mesa-ci-x86-64-lava-mt8192-asurada-spherion-r0 - panfrost-g57-gl:arm64: extends: - .lava-test-deqp:arm64 - .panfrost-bifrost-rules - .panfrost-test - - .lava-mt8192-asurada-spherion-r0 + - .lava-mt8192-asurada-spherion-r0:arm64 parallel: 6 variables: DEQP_SUITE: panfrost-g57
