From c1e59bea05c6145baf4c5e9d5dd16c38fb14bfdb Mon Sep 17 00:00:00 2001 From: David Heidelberg Date: Mon, 18 Apr 2022 16:15:11 +0200 Subject: [PATCH] ci: intel: Merge anv and iris into src/intel/ci This commit make simple adding tests which use both GL(ES) and VK. Reviewed-by: Tomeu Vizoso Signed-off-by: David Heidelberg Part-of: --- .gitlab-ci.yml | 1 - src/gallium/drivers/iris/ci/gitlab-ci.yml | 257 ----------------- .../iris => intel}/ci/deqp-iris-amly.toml | 0 .../iris => intel}/ci/deqp-iris-apl.toml | 0 .../iris => intel}/ci/deqp-iris-cml.toml | 0 .../iris => intel}/ci/deqp-iris-glk.toml | 0 .../iris => intel}/ci/deqp-iris-kbl.toml | 0 .../iris => intel}/ci/deqp-iris-whl.toml | 0 src/intel/ci/gitlab-ci.yml | 266 +++++++++++++++++- .../iris => intel}/ci/iris-amly-fails.txt | 0 .../iris => intel}/ci/iris-amly-flakes.txt | 0 .../iris => intel}/ci/iris-amly-skips.txt | 0 .../iris => intel}/ci/iris-apl-fails.txt | 0 .../iris => intel}/ci/iris-apl-flakes.txt | 0 .../iris => intel}/ci/iris-cml-fails.txt | 0 .../iris => intel}/ci/iris-cml-flakes.txt | 0 .../iris => intel}/ci/iris-glk-fails.txt | 0 .../iris => intel}/ci/iris-glk-flakes.txt | 0 .../iris => intel}/ci/iris-kbl-fails.txt | 0 .../iris => intel}/ci/iris-kbl-flakes.txt | 0 .../iris => intel}/ci/iris-kbl-skips.txt | 0 .../drivers/iris => intel}/ci/iris-skips.txt | 0 .../iris => intel}/ci/iris-whl-fails.txt | 0 .../iris => intel}/ci/iris-whl-flakes.txt | 0 .../drivers/iris => intel}/ci/traces-iris.yml | 0 25 files changed, 263 insertions(+), 261 deletions(-) delete mode 100644 src/gallium/drivers/iris/ci/gitlab-ci.yml rename src/{gallium/drivers/iris => intel}/ci/deqp-iris-amly.toml (100%) rename src/{gallium/drivers/iris => intel}/ci/deqp-iris-apl.toml (100%) rename src/{gallium/drivers/iris => intel}/ci/deqp-iris-cml.toml (100%) rename src/{gallium/drivers/iris => intel}/ci/deqp-iris-glk.toml (100%) rename src/{gallium/drivers/iris => intel}/ci/deqp-iris-kbl.toml (100%) rename src/{gallium/drivers/iris => intel}/ci/deqp-iris-whl.toml (100%) rename src/{gallium/drivers/iris => intel}/ci/iris-amly-fails.txt (100%) rename src/{gallium/drivers/iris => intel}/ci/iris-amly-flakes.txt (100%) rename src/{gallium/drivers/iris => intel}/ci/iris-amly-skips.txt (100%) rename src/{gallium/drivers/iris => intel}/ci/iris-apl-fails.txt (100%) rename src/{gallium/drivers/iris => intel}/ci/iris-apl-flakes.txt (100%) rename src/{gallium/drivers/iris => intel}/ci/iris-cml-fails.txt (100%) rename src/{gallium/drivers/iris => intel}/ci/iris-cml-flakes.txt (100%) rename src/{gallium/drivers/iris => intel}/ci/iris-glk-fails.txt (100%) rename src/{gallium/drivers/iris => intel}/ci/iris-glk-flakes.txt (100%) rename src/{gallium/drivers/iris => intel}/ci/iris-kbl-fails.txt (100%) rename src/{gallium/drivers/iris => intel}/ci/iris-kbl-flakes.txt (100%) rename src/{gallium/drivers/iris => intel}/ci/iris-kbl-skips.txt (100%) rename src/{gallium/drivers/iris => intel}/ci/iris-skips.txt (100%) rename src/{gallium/drivers/iris => intel}/ci/iris-whl-fails.txt (100%) rename src/{gallium/drivers/iris => intel}/ci/iris-whl-flakes.txt (100%) rename src/{gallium/drivers/iris => intel}/ci/traces-iris.yml (100%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b26689abcd4..5fb25d37718 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -60,7 +60,6 @@ include: - local: 'src/gallium/drivers/crocus/ci/gitlab-ci.yml' - local: 'src/gallium/drivers/d3d12/ci/gitlab-ci.yml' - local: 'src/gallium/drivers/i915/ci/gitlab-ci.yml' - - local: 'src/gallium/drivers/iris/ci/gitlab-ci.yml' - 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' diff --git a/src/gallium/drivers/iris/ci/gitlab-ci.yml b/src/gallium/drivers/iris/ci/gitlab-ci.yml deleted file mode 100644 index 237f6102ff2..00000000000 --- a/src/gallium/drivers/iris/ci/gitlab-ci.yml +++ /dev/null @@ -1,257 +0,0 @@ -.iris-test: - extends: - - .lava-test:amd64 - - .iris-rules - variables: - DTB: "" - DRIVER_NAME: iris - BOOT_METHOD: depthcharge - KERNEL_IMAGE_TYPE: "" - FLAKES_CHANNEL: "#intel-ci" - HWCI_FREQ_MAX: "true" - -# 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 - -# 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 - -# 5 boards, manual for now due to the GPU being occasionally stuck -.iris-amly-test: - extends: - - .iris-test - - .test-manual-mr - variables: - DEVICE_TYPE: asus-C433TA-AJ0005-rammus - GPU_VERSION: iris-amly - RUNNER_TAG: mesa-ci-x86-64-lava-asus-C433TA-AJ0005-rammus - -# 7 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 - -# 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 - -# 5 boards -.iris-cml-test: - extends: - - .iris-test - variables: - DEVICE_TYPE: asus-C436FA-Flip-hatch - GPU_VERSION: iris-cml - RUNNER_TAG: mesa-ci-x86-64-lava-asus-C436FA-flip-hatch - -iris-apl-deqp: - extends: - - .iris-apl-test - variables: - DEQP_SUITE: iris-apl - parallel: 3 - -iris-apl-egl: - extends: - - .iris-apl-test - variables: - PIGLIT_NO_WINDOW: 0 - HWCI_START_XORG: 1 - DEQP_VER: egl - -iris-glk-deqp: - extends: - - .iris-glk-test - variables: - DEQP_SUITE: iris-glk - parallel: 2 - -iris-glk-egl: - extends: - - .iris-glk-test - variables: - PIGLIT_NO_WINDOW: 0 - HWCI_START_XORG: 1 - DEQP_VER: egl - -iris-amly-deqp: - extends: - - .iris-amly-test - variables: - DEQP_SUITE: iris-amly - parallel: 3 - -iris-kbl-deqp: - extends: - - .iris-kbl-test - variables: - DEQP_SUITE: iris-kbl - parallel: 3 - -iris-whl-deqp: - extends: - - .iris-whl-test - variables: - DEQP_SUITE: iris-whl - parallel: 4 - -iris-cml-deqp: - extends: - - .iris-cml-test - variables: - DEQP_SUITE: iris-cml - parallel: 4 - -iris-amly-egl: - extends: - - .iris-amly-test - variables: - PIGLIT_NO_WINDOW: 0 - HWCI_START_XORG: 1 - DEQP_VER: egl - -iris-kbl-piglit: - extends: - - .iris-kbl-test - - .lava-piglit - parallel: 3 - variables: - HWCI_START_XORG: 1 - PIGLIT_NO_WINDOW: 0 - PIGLIT_PLATFORM: mixed_glx_egl - PIGLIT_PROFILES: gpu - -.iris-traces: - extends: - - .lava-traces-base - variables: - EGL_PLATFORM: surfaceless - PIGLIT_REPLAY_DEVICE_NAME: "gl-${GPU_VERSION}" - PIGLIT_RESULTS: "${GPU_VERSION}-${PIGLIT_PROFILES}" - PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/traces-iris.yml" - PIGLIT_REPLAY_EXTRA_ARGS: --keep-image - -iris-apl-traces: - variables: - GPU_VERSION: intel-apl - extends: - - .iris-apl-test - - .iris-traces - -iris-glk-traces: - variables: - GPU_VERSION: intel-glk - extends: - - .iris-glk-test - - .iris-traces - -iris-amly-traces: - variables: - GPU_VERSION: intel-amly - extends: - - .iris-amly-test - - .iris-traces - -iris-kbl-traces: - variables: - GPU_VERSION: intel-kbl - extends: - - .iris-kbl-test - - .iris-traces - -iris-whl-traces: - variables: - GPU_VERSION: intel-whl - extends: - - .iris-whl-test - - .iris-traces - -iris-cml-traces: - variables: - GPU_VERSION: intel-cml - extends: - - .iris-cml-test - - .iris-traces - -.profile-traces: - extends: - - .iris-traces - - .iris-rules-performance - variables: - PIGLIT_REPLAY_SUBCOMMAND: "profile" - PIGLIT_REPLAY_EXTRA_ARGS: "--db-path ${CI_PROJECT_DIR}/replayer-db/" - # More than this can hit OOM due to BOs leaked during the replay of the last frame - PIGLIT_REPLAY_LOOP_TIMES: 150 - # We don't want for more than one workload to be submitted to the GPU at a time - FDO_CI_CONCURRENT: 1 - # Piglit is very sparse in its status output and downloads of big traces can take a while - LAVA_DEVICE_HANGING_TIMEOUT_SEC: 600 - # So we aren't capped by VSync by the X server - EGL_PLATFORM: surfaceless - GIT_STRATEGY: none - HWCI_FREQ_MAX: "true" - LAVA_TAGS: "cbg-0" - allow_failure: true - -iris-apl-traces-performance: - extends: - - .iris-apl-test - - .profile-traces - variables: - GPU_VERSION: intel-apl - -iris-glk-traces-performance: - extends: - - .iris-glk-test - - .profile-traces - variables: - GPU_VERSION: intel-glk - -iris-amly-traces-performance: - extends: - - .iris-amly-test - - .profile-traces - variables: - GPU_VERSION: intel-amly - -iris-kbl-traces-performance: - extends: - - .iris-kbl-test - - .profile-traces - variables: - GPU_VERSION: intel-kbl - -iris-whl-traces-performance: - extends: - - .iris-whl-test - - .profile-traces - variables: - GPU_VERSION: intel-whl - -.iris-cml-traces-performance: - extends: - - .iris-cml-test - - .profile-traces - variables: - GPU_VERSION: intel-cml diff --git a/src/gallium/drivers/iris/ci/deqp-iris-amly.toml b/src/intel/ci/deqp-iris-amly.toml similarity index 100% rename from src/gallium/drivers/iris/ci/deqp-iris-amly.toml rename to src/intel/ci/deqp-iris-amly.toml diff --git a/src/gallium/drivers/iris/ci/deqp-iris-apl.toml b/src/intel/ci/deqp-iris-apl.toml similarity index 100% rename from src/gallium/drivers/iris/ci/deqp-iris-apl.toml rename to src/intel/ci/deqp-iris-apl.toml diff --git a/src/gallium/drivers/iris/ci/deqp-iris-cml.toml b/src/intel/ci/deqp-iris-cml.toml similarity index 100% rename from src/gallium/drivers/iris/ci/deqp-iris-cml.toml rename to src/intel/ci/deqp-iris-cml.toml diff --git a/src/gallium/drivers/iris/ci/deqp-iris-glk.toml b/src/intel/ci/deqp-iris-glk.toml similarity index 100% rename from src/gallium/drivers/iris/ci/deqp-iris-glk.toml rename to src/intel/ci/deqp-iris-glk.toml diff --git a/src/gallium/drivers/iris/ci/deqp-iris-kbl.toml b/src/intel/ci/deqp-iris-kbl.toml similarity index 100% rename from src/gallium/drivers/iris/ci/deqp-iris-kbl.toml rename to src/intel/ci/deqp-iris-kbl.toml diff --git a/src/gallium/drivers/iris/ci/deqp-iris-whl.toml b/src/intel/ci/deqp-iris-whl.toml similarity index 100% rename from src/gallium/drivers/iris/ci/deqp-iris-whl.toml rename to src/intel/ci/deqp-iris-whl.toml diff --git a/src/intel/ci/gitlab-ci.yml b/src/intel/ci/gitlab-ci.yml index 9bd29012d7c..94380f6318d 100644 --- a/src/intel/ci/gitlab-ci.yml +++ b/src/intel/ci/gitlab-ci.yml @@ -1,15 +1,28 @@ -.anv-test: +.intel-common-test: extends: - .lava-test:amd64 - - .anv-rules variables: DTB: "" - DRIVER_NAME: anv BOOT_METHOD: depthcharge KERNEL_IMAGE_TYPE: "" FLAKES_CHANNEL: "#intel-ci" HWCI_FREQ_MAX: "true" +.anv-test: + extends: + - .intel-common-test + - .anv-rules + variables: + DRIVER_NAME: anv + +.iris-test: + extends: + - .intel-common-test + - .iris-rules + variables: + DRIVER_NAME: iris + +## ANV only # 10 boards .anv-tgl-test: extends: @@ -28,3 +41,250 @@ anv-tgl-vk: DEQP_VER: vk VK_DRIVER: intel parallel: 10 + +## 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 + +# 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 + +# 5 boards, manual for now due to the GPU being occasionally stuck +.iris-amly-test: + extends: + - .iris-test + - .test-manual-mr + variables: + DEVICE_TYPE: asus-C433TA-AJ0005-rammus + GPU_VERSION: iris-amly + RUNNER_TAG: mesa-ci-x86-64-lava-asus-C433TA-AJ0005-rammus + +# 7 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 + +# 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 + +# 5 boards +.iris-cml-test: + extends: + - .iris-test + variables: + DEVICE_TYPE: asus-C436FA-Flip-hatch + GPU_VERSION: iris-cml + RUNNER_TAG: mesa-ci-x86-64-lava-asus-C436FA-flip-hatch + +iris-apl-deqp: + extends: + - .iris-apl-test + variables: + DEQP_SUITE: iris-apl + parallel: 3 + +iris-apl-egl: + extends: + - .iris-apl-test + variables: + PIGLIT_NO_WINDOW: 0 + HWCI_START_XORG: 1 + DEQP_VER: egl + +iris-glk-deqp: + extends: + - .iris-glk-test + variables: + DEQP_SUITE: iris-glk + parallel: 2 + +iris-glk-egl: + extends: + - .iris-glk-test + variables: + PIGLIT_NO_WINDOW: 0 + HWCI_START_XORG: 1 + DEQP_VER: egl + +iris-amly-deqp: + extends: + - .iris-amly-test + variables: + DEQP_SUITE: iris-amly + parallel: 3 + +iris-kbl-deqp: + extends: + - .iris-kbl-test + variables: + DEQP_SUITE: iris-kbl + parallel: 3 + +iris-whl-deqp: + extends: + - .iris-whl-test + variables: + DEQP_SUITE: iris-whl + parallel: 4 + +iris-cml-deqp: + extends: + - .iris-cml-test + variables: + DEQP_SUITE: iris-cml + parallel: 4 + +iris-amly-egl: + extends: + - .iris-amly-test + variables: + PIGLIT_NO_WINDOW: 0 + HWCI_START_XORG: 1 + DEQP_VER: egl + +iris-kbl-piglit: + extends: + - .iris-kbl-test + - .lava-piglit + parallel: 3 + variables: + HWCI_START_XORG: 1 + PIGLIT_NO_WINDOW: 0 + PIGLIT_PLATFORM: mixed_glx_egl + PIGLIT_PROFILES: gpu + +.iris-traces: + extends: + - .lava-traces-base + variables: + EGL_PLATFORM: surfaceless + PIGLIT_REPLAY_DEVICE_NAME: "gl-${GPU_VERSION}" + PIGLIT_RESULTS: "${GPU_VERSION}-${PIGLIT_PROFILES}" + PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/traces-iris.yml" + PIGLIT_REPLAY_EXTRA_ARGS: --keep-image + +iris-apl-traces: + variables: + GPU_VERSION: intel-apl + extends: + - .iris-apl-test + - .iris-traces + +iris-glk-traces: + variables: + GPU_VERSION: intel-glk + extends: + - .iris-glk-test + - .iris-traces + +iris-amly-traces: + variables: + GPU_VERSION: intel-amly + extends: + - .iris-amly-test + - .iris-traces + +iris-kbl-traces: + variables: + GPU_VERSION: intel-kbl + extends: + - .iris-kbl-test + - .iris-traces + +iris-whl-traces: + variables: + GPU_VERSION: intel-whl + extends: + - .iris-whl-test + - .iris-traces + +iris-cml-traces: + variables: + GPU_VERSION: intel-cml + extends: + - .iris-cml-test + - .iris-traces + +.profile-traces: + extends: + - .iris-traces + - .iris-rules-performance + variables: + PIGLIT_REPLAY_SUBCOMMAND: "profile" + PIGLIT_REPLAY_EXTRA_ARGS: "--db-path ${CI_PROJECT_DIR}/replayer-db/" + # More than this can hit OOM due to BOs leaked during the replay of the last frame + PIGLIT_REPLAY_LOOP_TIMES: 150 + # We don't want for more than one workload to be submitted to the GPU at a time + FDO_CI_CONCURRENT: 1 + # Piglit is very sparse in its status output and downloads of big traces can take a while + LAVA_DEVICE_HANGING_TIMEOUT_SEC: 600 + # So we aren't capped by VSync by the X server + EGL_PLATFORM: surfaceless + GIT_STRATEGY: none + HWCI_FREQ_MAX: "true" + LAVA_TAGS: "cbg-0" + allow_failure: true + +iris-apl-traces-performance: + extends: + - .iris-apl-test + - .profile-traces + variables: + GPU_VERSION: intel-apl + +iris-glk-traces-performance: + extends: + - .iris-glk-test + - .profile-traces + variables: + GPU_VERSION: intel-glk + +iris-amly-traces-performance: + extends: + - .iris-amly-test + - .profile-traces + variables: + GPU_VERSION: intel-amly + +iris-kbl-traces-performance: + extends: + - .iris-kbl-test + - .profile-traces + variables: + GPU_VERSION: intel-kbl + +iris-whl-traces-performance: + extends: + - .iris-whl-test + - .profile-traces + variables: + GPU_VERSION: intel-whl + +.iris-cml-traces-performance: + extends: + - .iris-cml-test + - .profile-traces + variables: + GPU_VERSION: intel-cml diff --git a/src/gallium/drivers/iris/ci/iris-amly-fails.txt b/src/intel/ci/iris-amly-fails.txt similarity index 100% rename from src/gallium/drivers/iris/ci/iris-amly-fails.txt rename to src/intel/ci/iris-amly-fails.txt diff --git a/src/gallium/drivers/iris/ci/iris-amly-flakes.txt b/src/intel/ci/iris-amly-flakes.txt similarity index 100% rename from src/gallium/drivers/iris/ci/iris-amly-flakes.txt rename to src/intel/ci/iris-amly-flakes.txt diff --git a/src/gallium/drivers/iris/ci/iris-amly-skips.txt b/src/intel/ci/iris-amly-skips.txt similarity index 100% rename from src/gallium/drivers/iris/ci/iris-amly-skips.txt rename to src/intel/ci/iris-amly-skips.txt diff --git a/src/gallium/drivers/iris/ci/iris-apl-fails.txt b/src/intel/ci/iris-apl-fails.txt similarity index 100% rename from src/gallium/drivers/iris/ci/iris-apl-fails.txt rename to src/intel/ci/iris-apl-fails.txt diff --git a/src/gallium/drivers/iris/ci/iris-apl-flakes.txt b/src/intel/ci/iris-apl-flakes.txt similarity index 100% rename from src/gallium/drivers/iris/ci/iris-apl-flakes.txt rename to src/intel/ci/iris-apl-flakes.txt diff --git a/src/gallium/drivers/iris/ci/iris-cml-fails.txt b/src/intel/ci/iris-cml-fails.txt similarity index 100% rename from src/gallium/drivers/iris/ci/iris-cml-fails.txt rename to src/intel/ci/iris-cml-fails.txt diff --git a/src/gallium/drivers/iris/ci/iris-cml-flakes.txt b/src/intel/ci/iris-cml-flakes.txt similarity index 100% rename from src/gallium/drivers/iris/ci/iris-cml-flakes.txt rename to src/intel/ci/iris-cml-flakes.txt diff --git a/src/gallium/drivers/iris/ci/iris-glk-fails.txt b/src/intel/ci/iris-glk-fails.txt similarity index 100% rename from src/gallium/drivers/iris/ci/iris-glk-fails.txt rename to src/intel/ci/iris-glk-fails.txt diff --git a/src/gallium/drivers/iris/ci/iris-glk-flakes.txt b/src/intel/ci/iris-glk-flakes.txt similarity index 100% rename from src/gallium/drivers/iris/ci/iris-glk-flakes.txt rename to src/intel/ci/iris-glk-flakes.txt diff --git a/src/gallium/drivers/iris/ci/iris-kbl-fails.txt b/src/intel/ci/iris-kbl-fails.txt similarity index 100% rename from src/gallium/drivers/iris/ci/iris-kbl-fails.txt rename to src/intel/ci/iris-kbl-fails.txt diff --git a/src/gallium/drivers/iris/ci/iris-kbl-flakes.txt b/src/intel/ci/iris-kbl-flakes.txt similarity index 100% rename from src/gallium/drivers/iris/ci/iris-kbl-flakes.txt rename to src/intel/ci/iris-kbl-flakes.txt diff --git a/src/gallium/drivers/iris/ci/iris-kbl-skips.txt b/src/intel/ci/iris-kbl-skips.txt similarity index 100% rename from src/gallium/drivers/iris/ci/iris-kbl-skips.txt rename to src/intel/ci/iris-kbl-skips.txt diff --git a/src/gallium/drivers/iris/ci/iris-skips.txt b/src/intel/ci/iris-skips.txt similarity index 100% rename from src/gallium/drivers/iris/ci/iris-skips.txt rename to src/intel/ci/iris-skips.txt diff --git a/src/gallium/drivers/iris/ci/iris-whl-fails.txt b/src/intel/ci/iris-whl-fails.txt similarity index 100% rename from src/gallium/drivers/iris/ci/iris-whl-fails.txt rename to src/intel/ci/iris-whl-fails.txt diff --git a/src/gallium/drivers/iris/ci/iris-whl-flakes.txt b/src/intel/ci/iris-whl-flakes.txt similarity index 100% rename from src/gallium/drivers/iris/ci/iris-whl-flakes.txt rename to src/intel/ci/iris-whl-flakes.txt diff --git a/src/gallium/drivers/iris/ci/traces-iris.yml b/src/intel/ci/traces-iris.yml similarity index 100% rename from src/gallium/drivers/iris/ci/traces-iris.yml rename to src/intel/ci/traces-iris.yml