From a1d34d8c95773a210fabef5999ad37065851f815 Mon Sep 17 00:00:00 2001 From: David Heidelberg Date: Mon, 19 Sep 2022 22:53:08 +0200 Subject: [PATCH] ci/amd: move radeonsi in amd directory Deduplicate jobs, make easier to use GL+VK scenarios. Signed-off-by: David Heidelberg Part-of: --- .gitlab-ci.yml | 1 - .../amd-raven-skqp-gl_rendertests-fails.txt} | 0 ...amd-raven-skqp-gles_rendertests-fails.txt} | 0 .../amd-raven-skqp-vk_rendertests-fails.txt} | 0 .../ci/amd-raven-skqp_unittests-fails.txt} | 0 .../ci/deqp-radeonsi-stoney.toml | 0 src/amd/ci/gitlab-ci.yml | 158 ++++++++++++++++-- .../ci/radeonsi-raven-fails.txt | 0 .../ci/radeonsi-raven-flakes.txt | 0 .../ci/radeonsi-raven-skips.txt | 0 .../ci/traces-amd.yml} | 0 src/gallium/drivers/radeonsi/ci/gitlab-ci.yml | 112 ------------- 12 files changed, 142 insertions(+), 129 deletions(-) rename src/{gallium/drivers/radeonsi/ci/radeonsi-raven-skqp-gl_rendertests-fails.txt => amd/ci/amd-raven-skqp-gl_rendertests-fails.txt} (100%) rename src/{gallium/drivers/radeonsi/ci/radeonsi-raven-skqp-gles_rendertests-fails.txt => amd/ci/amd-raven-skqp-gles_rendertests-fails.txt} (100%) rename src/{gallium/drivers/radeonsi/ci/radeonsi-raven-skqp-vk_rendertests-fails.txt => amd/ci/amd-raven-skqp-vk_rendertests-fails.txt} (100%) rename src/{gallium/drivers/radeonsi/ci/radeonsi-raven-skqp_unittests-fails.txt => amd/ci/amd-raven-skqp_unittests-fails.txt} (100%) rename src/{gallium/drivers/radeonsi => amd}/ci/deqp-radeonsi-stoney.toml (100%) rename src/{gallium/drivers/radeonsi => amd}/ci/radeonsi-raven-fails.txt (100%) rename src/{gallium/drivers/radeonsi => amd}/ci/radeonsi-raven-flakes.txt (100%) rename src/{gallium/drivers/radeonsi => amd}/ci/radeonsi-raven-skips.txt (100%) rename src/{gallium/drivers/radeonsi/ci/traces-radeonsi.yml => amd/ci/traces-amd.yml} (100%) delete mode 100644 src/gallium/drivers/radeonsi/ci/gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0e2a95d7002..7d6de8c589c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -71,7 +71,6 @@ include: - local: 'src/gallium/drivers/lima/ci/gitlab-ci.yml' - local: 'src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml' - local: 'src/gallium/drivers/nouveau/ci/gitlab-ci.yml' - - local: 'src/gallium/drivers/radeonsi/ci/gitlab-ci.yml' - local: 'src/gallium/drivers/softpipe/ci/gitlab-ci.yml' - local: 'src/gallium/drivers/virgl/ci/gitlab-ci.yml' - local: 'src/gallium/drivers/zink/ci/gitlab-ci.yml' diff --git a/src/gallium/drivers/radeonsi/ci/radeonsi-raven-skqp-gl_rendertests-fails.txt b/src/amd/ci/amd-raven-skqp-gl_rendertests-fails.txt similarity index 100% rename from src/gallium/drivers/radeonsi/ci/radeonsi-raven-skqp-gl_rendertests-fails.txt rename to src/amd/ci/amd-raven-skqp-gl_rendertests-fails.txt diff --git a/src/gallium/drivers/radeonsi/ci/radeonsi-raven-skqp-gles_rendertests-fails.txt b/src/amd/ci/amd-raven-skqp-gles_rendertests-fails.txt similarity index 100% rename from src/gallium/drivers/radeonsi/ci/radeonsi-raven-skqp-gles_rendertests-fails.txt rename to src/amd/ci/amd-raven-skqp-gles_rendertests-fails.txt diff --git a/src/gallium/drivers/radeonsi/ci/radeonsi-raven-skqp-vk_rendertests-fails.txt b/src/amd/ci/amd-raven-skqp-vk_rendertests-fails.txt similarity index 100% rename from src/gallium/drivers/radeonsi/ci/radeonsi-raven-skqp-vk_rendertests-fails.txt rename to src/amd/ci/amd-raven-skqp-vk_rendertests-fails.txt diff --git a/src/gallium/drivers/radeonsi/ci/radeonsi-raven-skqp_unittests-fails.txt b/src/amd/ci/amd-raven-skqp_unittests-fails.txt similarity index 100% rename from src/gallium/drivers/radeonsi/ci/radeonsi-raven-skqp_unittests-fails.txt rename to src/amd/ci/amd-raven-skqp_unittests-fails.txt diff --git a/src/gallium/drivers/radeonsi/ci/deqp-radeonsi-stoney.toml b/src/amd/ci/deqp-radeonsi-stoney.toml similarity index 100% rename from src/gallium/drivers/radeonsi/ci/deqp-radeonsi-stoney.toml rename to src/amd/ci/deqp-radeonsi-stoney.toml diff --git a/src/amd/ci/gitlab-ci.yml b/src/amd/ci/gitlab-ci.yml index e8014b16914..49d6e276f45 100644 --- a/src/amd/ci/gitlab-ci.yml +++ b/src/amd/ci/gitlab-ci.yml @@ -1,25 +1,151 @@ ############### LAVA -# Run four jobs in parallel each running 1/40th of the test suite -radv_stoney_vkcts:amd64: +# job prefixes: radeonsi (OpenGL), radv (Vulkan), amd (radeonsi+radv) +# 10 devices (2022-10-19) +.stoney-test:amd64: + variables: + BOOT_METHOD: depthcharge + DEVICE_TYPE: hp-11A-G6-EE-grunt + DEQP_EXPECTED_RENDERER: STONEY + DTB: "" + FDO_CI_CONCURRENT: 4 + HWCI_FREQ_MAX: "true" + HWCI_KERNEL_MODULES: amdgpu + KERNEL_IMAGE_TYPE: "" + RUNNER_TAG: mesa-ci-x86-64-lava-hp-11A-G6-EE-grunt + +.radeonsi-stoney-test:amd64: extends: - - .lava-test:amd64 + - .stoney-test:amd64 + - .radeonsi-rules + variables: + GPU_VERSION: radeonsi-stoney + DRIVER_NAME: radeonsi + +.radv-stoney-test:amd64: + extends: + - .stoney-test:amd64 - .radv-rules - parallel: 4 variables: DEQP_VER: vk - DEQP_FRACTION: 10 - FDO_CI_CONCURRENT: 4 - DEQP_EXPECTED_RENDERER: STONEY - DEVICE_TYPE: hp-11A-G6-EE-grunt - DTB: "" - GPU_VERSION: radv-stoney-aco - BOOT_METHOD: depthcharge - KERNEL_IMAGE_TYPE: "" - HWCI_KERNEL_MODULES: amdgpu - HWCI_FREQ_MAX: "true" - VK_DRIVER: radeon DRIVER_NAME: radv - RUNNER_TAG: mesa-ci-x86-64-lava-hp-11A-G6-EE-grunt + GPU_VERSION: radv-stoney-aco + VK_DRIVER: radeon + +# Run four jobs in parallel each running 1/40th of the test suite +radv-stoney-vkcts:amd64: + extends: + - .lava-test:amd64 + - .radv-stoney-test:amd64 + parallel: 4 + variables: + DEQP_FRACTION: 10 + +radeonsi-stoney-gl:amd64: + extends: + - .lava-test:amd64 + - .radeonsi-stoney-test:amd64 + parallel: 5 + variables: + DEQP_SUITE: radeonsi-stoney + +radeonsi-stoney-traces:amd64: + extends: + - .lava-piglit-traces:amd64 + - .radeonsi-stoney-test:amd64 + variables: + EGL_PLATFORM: surfaceless + PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/traces-amd.yml" + PIGLIT_REPLAY_EXTRA_ARGS: --keep-image + +# 5 devices (2022-10-19) +.raven-test:amd64: + variables: + BOOT_METHOD: depthcharge + DEVICE_TYPE: lenovo-TPad-C13-Yoga-zork + DTB: "" + HWCI_FREQ_MAX: "true" + HWCI_KERNEL_MODULES: amdgpu + KERNEL_IMAGE_TYPE: "" + RUNNER_TAG: mesa-ci-x86-64-lava-lenovo-TPad-C13-Yoga-zork + +.radeonsi-raven-test:amd64: + extends: + - .raven-test:amd64 + - .radeonsi-rules + variables: + GPU_VERSION: radeonsi-raven + DRIVER_NAME: radeonsi + +.radv-raven-test:amd64: + extends: + - .raven-test:amd64 + - .radv-rules + variables: + GPU_VERSION: radv-raven + VK_DRIVER: radeon + +.amd-raven-test:amd64: + extends: + - .raven-test:amd64 + - .radeonsi+radv-rules + variables: + DRIVER_NAME: radeonsi + GPU_VERSION: amd-raven + VK_DRIVER: radeon + +amd-raven-skqp:amd64: + extends: + - .lava-test:amd64 + - .amd-raven-test:amd64 + - .skqp-test + variables: + # Possible skqp backends: gl, gles, unitTest and vk + SKQP_BACKENDS: gl gles vk unitTest # space separated values + +.radv-traces: + extends: + - .lava-piglit-traces:amd64 + variables: + HWCI_START_XORG: 1 + PIGLIT_PLATFORM: mixed_glx_egl # TODO, take wine/VK in account + PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/traces-amd.yml" + PIGLIT_REPLAY_EXTRA_ARGS: --keep-image + +radv-raven-traces:amd64: + extends: + - .radv-traces + - .radv-raven-test:amd64 + variables: + PIGLIT_REPLAY_DEVICE_NAME: "vk-${GPU_VERSION}" + +radeonsi-raven-piglit-gl:amd64: + extends: + - .lava-piglit:amd64 + - .radeonsi-raven-test:amd64 + variables: + PIGLIT_PLATFORM: mixed_glx_egl + PIGLIT_PROFILES: quick_gl + HWCI_START_XORG: 1 + +radeonsi-raven-va:amd64: + extends: + - .lava-test:amd64 + - .radeonsi-raven-test:amd64 + - .radeonsi-vaapi-rules + variables: + HWCI_TEST_SCRIPT: "/install/gtest-runner.sh" + # While the tests don't need Xorg, it's an easy way to keep DRM open so we don't + # spend all our time in drm_lastclose()'s modesetting. + HWCI_START_XORG: 1 + GTEST: test_va_api + # The big 10-surface 10k allocations oomkill us at around 2.5G of GPU memory + # allocated if we run at the normal 4 threads. + # https://github.com/intel/libva-utils/issues/248 + FDO_CI_CONCURRENT: 1 + # A whole run would be about 25 minutes currently. Fixing + # https://github.com/intel/libva-utils/issues/247 and + # https://github.com/google/googletest/issues/3614 would probably help. + GTEST_FRACTION: 2 ############### Valve Infra .test-radv: diff --git a/src/gallium/drivers/radeonsi/ci/radeonsi-raven-fails.txt b/src/amd/ci/radeonsi-raven-fails.txt similarity index 100% rename from src/gallium/drivers/radeonsi/ci/radeonsi-raven-fails.txt rename to src/amd/ci/radeonsi-raven-fails.txt diff --git a/src/gallium/drivers/radeonsi/ci/radeonsi-raven-flakes.txt b/src/amd/ci/radeonsi-raven-flakes.txt similarity index 100% rename from src/gallium/drivers/radeonsi/ci/radeonsi-raven-flakes.txt rename to src/amd/ci/radeonsi-raven-flakes.txt diff --git a/src/gallium/drivers/radeonsi/ci/radeonsi-raven-skips.txt b/src/amd/ci/radeonsi-raven-skips.txt similarity index 100% rename from src/gallium/drivers/radeonsi/ci/radeonsi-raven-skips.txt rename to src/amd/ci/radeonsi-raven-skips.txt diff --git a/src/gallium/drivers/radeonsi/ci/traces-radeonsi.yml b/src/amd/ci/traces-amd.yml similarity index 100% rename from src/gallium/drivers/radeonsi/ci/traces-radeonsi.yml rename to src/amd/ci/traces-amd.yml diff --git a/src/gallium/drivers/radeonsi/ci/gitlab-ci.yml b/src/gallium/drivers/radeonsi/ci/gitlab-ci.yml deleted file mode 100644 index bb90dbbee70..00000000000 --- a/src/gallium/drivers/radeonsi/ci/gitlab-ci.yml +++ /dev/null @@ -1,112 +0,0 @@ -.radeonsi-raven-test:amd64: - extends: - - .radeonsi-rules - variables: - BOOT_METHOD: depthcharge - DRIVER_NAME: radeonsi - DTB: "" - GPU_VERSION: radeonsi-raven - HWCI_FREQ_MAX: "true" - HWCI_KERNEL_MODULES: amdgpu - KERNEL_IMAGE_TYPE: "" - VK_DRIVER: radeon - DEVICE_TYPE: lenovo-TPad-C13-Yoga-zork - RUNNER_TAG: mesa-ci-x86-64-lava-lenovo-TPad-C13-Yoga-zork - -radeonsi-raven-skqp:amd64: - extends: - - .lava-test:amd64 - - .radeonsi-raven-test:amd64 - - .radeonsi+radv-rules # SKQP VK needs to be triggered for any Vulkan changes - - .skqp-test - variables: - # Possible skqp backends: gl, gles, unitTest and vk - SKQP_BACKENDS: gl gles vk unitTest # space separated values - -.radeonsi-traces: - extends: - - .lava-piglit-traces:amd64 - variables: - HWCI_START_XORG: 1 - PIGLIT_PLATFORM: mixed_glx_egl # TODO, take wine/VK in account - PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/traces-radeonsi.yml" - PIGLIT_REPLAY_EXTRA_ARGS: --keep-image - -radeonsi-raven-gl-traces:amd64: - extends: - - .radeonsi-traces - - .radeonsi-raven-test:amd64 - - .test-manual-mr # only reference run on default wine, not for regular testing - variables: - PIGLIT_REPLAY_DEVICE_NAME: "gl-${GPU_VERSION}" - -radeonsi-raven-vk-traces:amd64: - extends: - - .radeonsi-traces - - .radeonsi-raven-test:amd64 - variables: - PIGLIT_REPLAY_DEVICE_NAME: "vk-${GPU_VERSION}" - - -.radeonsi-stoney-test:amd64: - extends: - - .radeonsi-rules - variables: - DEVICE_TYPE: hp-11A-G6-EE-grunt - DTB: "" - GPU_VERSION: radeonsi-stoney - BOOT_METHOD: depthcharge - KERNEL_IMAGE_TYPE: "" - HWCI_KERNEL_MODULES: amdgpu - DRIVER_NAME: radeonsi - FDO_CI_CONCURRENT: 4 - DEQP_EXPECTED_RENDERER: STONEY - HWCI_FREQ_MAX: "true" - RUNNER_TAG: mesa-ci-x86-64-lava-hp-11A-G6-EE-grunt - -radeonsi-stoney-gl:amd64: - extends: - - .lava-test:amd64 - - .radeonsi-stoney-test:amd64 - parallel: 5 - variables: - DEQP_SUITE: radeonsi-stoney - -radeonsi-stoney-traces:amd64: - extends: - - .lava-piglit-traces:amd64 - - .radeonsi-stoney-test:amd64 - variables: - EGL_PLATFORM: surfaceless - PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/traces-radeonsi.yml" - PIGLIT_REPLAY_EXTRA_ARGS: --keep-image - RUNNER_TAG: mesa-ci-x86-64-lava-hp-11A-G6-EE-grunt - -radeonsi-raven-piglit-gl:amd64: - extends: - - .lava-piglit:amd64 - - .radeonsi-raven-test:amd64 - variables: - PIGLIT_PLATFORM: mixed_glx_egl - PIGLIT_PROFILES: quick_gl - HWCI_START_XORG: 1 - -radeonsi-raven-va:amd64: - extends: - - .lava-test:amd64 - - .radeonsi-raven-test:amd64 - - .radeonsi-vaapi-rules - variables: - HWCI_TEST_SCRIPT: "/install/gtest-runner.sh" - # While the tests don't need Xorg, it's an easy way to keep DRM open so we don't - # spend all our time in drm_lastclose()'s modesetting. - HWCI_START_XORG: 1 - GTEST: test_va_api - # The big 10-surface 10k allocations oomkill us at around 2.5G of GPU memory - # allocated if we run at the normal 4 threads. - # https://github.com/intel/libva-utils/issues/248 - FDO_CI_CONCURRENT: 1 - # A whole run would be about 25 minutes currently. Fixing - # https://github.com/intel/libva-utils/issues/247 and - # https://github.com/google/googletest/issues/3614 would probably help. - GTEST_FRACTION: 2