ci/amd: move radeonsi in amd directory

Deduplicate jobs, make easier to use GL+VK scenarios.

Signed-off-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17938>

.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'

src/amd/ci/gitlab-ci.yml

@@ -1,25 +1,151 @@
 ############### LAVA
-# Run four jobs in parallel each running 1/40th of the test suite
+# job prefixes: radeonsi (OpenGL), radv (Vulkan), amd (radeonsi+radv)
-radv_stoney_vkcts:amd64:
+# 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:

src/gallium/drivers/radeonsi/ci/gitlab-ci.yml

@@ -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