[igt-dev] [i-g-t V5 0/7] New dir structure for intel specific tests

Igt-dev Archive on lore.kernel.org
 help / color / mirror / Atom feed

* [igt-dev] [i-g-t V5 0/7] New dir structure for intel specific tests
@ 2023-08-31 14:56 Bhanuprakash Modem
  2023-08-31 14:56 ` [igt-dev] [i-g-t V5 1/7] testplan/i915: Exclude non-i915 tests from i915 testplan Bhanuprakash Modem
                   ` (9 more replies)
  0 siblings, 10 replies; 18+ messages in thread
From: Bhanuprakash Modem @ 2023-08-31 14:56 UTC (permalink / raw)
  To: igt-dev, mauro.chehab

In-order to organize tests, move all intel specific tests to
a new directory "tests/intel". And rename all intel specific
tests to represent the supported driver. Test name should start
with the driver_name prefix. Below are the Examples.

- tests/intel/xe_*.c   : All XE specific tests. Ex: xe_module_load.c
- tests/intel/kms_*.c  : All kms tests. Ex: kms_psr.c
- tests/intel/intel_*.c: All tests those supports both i915 & XE.
- tests/intel/i915_*.c : All i915 specific tests. Ex: i915_module_load.c

Bhanuprakash Modem (7):
  testplan/i915: Exclude non-i915 tests from i915 testplan
  testplan/kms: Move kms testplan to intel dir
  tests/i915/prime_mmap_kms: Add missing documentation
  tests/meson.build: Simplify builds for Chamelium targets
  tests: Move intel specific tests to new directory
  tests/meson.build: Split intel targets based on their nature
  tests: Rename all intel specific tests

 README.md                                     |   2 +-
 docs/testplan/meson.build                     |   6 +-
 tests/intel-ci/blacklist-pre-merge.txt        |  14 +-
 tests/intel-ci/blacklist.txt                  | 102 ++---
 tests/intel-ci/fast-feedback.testlist         | 104 ++---
 .../i915_api_intel_bb.c}                      |   0
 .../i915_debugfs_test.c}                      |   0
 .../drm_fdinfo.c => intel/i915_drm_fdinfo.c}  |   0
 tests/{i915 => intel}/i915_fb_tiling.c        |   0
 .../i915_gem_bad_reloc.c}                     |   0
 .../i915_gem_barrier_race.c}                  |   0
 .../gem_basic.c => intel/i915_gem_basic.c}    |   0
 .../gem_blits.c => intel/i915_gem_blits.c}    |   0
 .../gem_busy.c => intel/i915_gem_busy.c}      |   0
 .../i915_gem_caching.c}                       |   0
 .../{i915/gem_ccs.c => intel/i915_gem_ccs.c}  |   0
 .../gem_close.c => intel/i915_gem_close.c}    |   0
 .../i915_gem_close_race.c}                    |   0
 .../i915_gem_concurrent_all.c}                |   0
 .../i915_gem_concurrent_blit.c}               |   2 +-
 .../gem_create.c => intel/i915_gem_create.c}  |   0
 .../gem_cs_tlb.c => intel/i915_gem_cs_tlb.c}  |   0
 .../i915_gem_ctx_bad_destroy.c}               |   0
 .../i915_gem_ctx_create.c}                    |   0
 .../i915_gem_ctx_engines.c}                   |   0
 .../i915_gem_ctx_exec.c}                      |   0
 .../i915_gem_ctx_freq.c}                      |   0
 .../i915_gem_ctx_isolation.c}                 |   0
 .../i915_gem_ctx_param.c}                     |   0
 .../i915_gem_ctx_persistence.c}               |   0
 .../i915_gem_ctx_shared.c}                    |   0
 .../i915_gem_ctx_sseu.c}                      |   0
 .../i915_gem_ctx_switch.c}                    |   0
 .../{i915/gem_eio.c => intel/i915_gem_eio.c}  |   0
 .../i915_gem_evict_alignment.c}               |   0
 .../i915_gem_evict_everything.c}              |   0
 .../i915_gem_exec_alignment.c}                |   0
 .../i915_gem_exec_async.c}                    |   0
 .../i915_gem_exec_await.c}                    |   0
 .../i915_gem_exec_balancer.c}                 |   0
 .../i915_gem_exec_basic.c}                    |   0
 .../i915_gem_exec_big.c}                      |   0
 .../i915_gem_exec_capture.c}                  |   0
 .../i915_gem_exec_create.c}                   |   0
 .../i915_gem_exec_endless.c}                  |   0
 .../i915_gem_exec_fair.c}                     |   0
 .../i915_gem_exec_fence.c}                    |   0
 .../i915_gem_exec_flush.c}                    |   0
 .../i915_gem_exec_gttfill.c}                  |   0
 .../i915_gem_exec_latency.c}                  |   0
 .../i915_gem_exec_lut_handle.c}               |   0
 .../i915_gem_exec_nop.c}                      |   0
 .../i915_gem_exec_parallel.c}                 |   0
 .../i915_gem_exec_params.c}                   |   0
 .../i915_gem_exec_reloc.c}                    |   0
 .../i915_gem_exec_schedule.c}                 |   0
 .../i915_gem_exec_store.c}                    |   0
 .../i915_gem_exec_suspend.c}                  |   0
 .../i915_gem_exec_whisper.c}                  |   0
 .../i915_gem_exercise_blt.c}                  |   0
 .../i915_gem_fd_exhaustion.c}                 |   0
 .../i915_gem_fence_thrash.c}                  |   0
 .../i915_gem_fence_upload.c}                  |   0
 .../i915_gem_fenced_exec_thrash.c}            |   0
 .../i915_gem_flink_basic.c}                   |   0
 .../i915_gem_flink_race.c}                    |   0
 .../i915_gem_gpgpu_fill.c}                    |   0
 .../i915_gem_gtt_cpu_tlb.c}                   |   0
 .../i915_gem_gtt_hog.c}                       |   0
 .../i915_gem_gtt_speed.c}                     |   0
 .../i915_gem_huc_copy.c}                      |   0
 .../i915_gem_linear_blits.c}                  |   0
 .../i915_gem_lmem_evict.c}                    |   0
 .../i915_gem_lmem_swapping.c}                 |   0
 .../i915_gem_lut_handle.c}                    |   0
 .../i915_gem_madvise.c}                       |   0
 .../i915_gem_media_fill.c}                    |   0
 .../i915_gem_media_vme.c}                     |   0
 .../gem_mmap.c => intel/i915_gem_mmap.c}      |   0
 .../i915_gem_mmap_gtt.c}                      |   0
 .../i915_gem_mmap_offset.c}                   |   0
 .../i915_gem_mmap_wc.c}                       |   0
 .../i915_gem_partial_pwrite_pread.c}          |   0
 .../i915_gem_pipe_control_store_loop.c}       |   0
 .../gem_ppgtt.c => intel/i915_gem_ppgtt.c}    |   0
 .../gem_pread.c => intel/i915_gem_pread.c}    |   0
 .../i915_gem_pread_after_blit.c}              |   0
 .../gem_pwrite.c => intel/i915_gem_pwrite.c}  |   0
 .../i915_gem_pwrite_snooped.c}                |   0
 .../{i915/gem_pxp.c => intel/i915_gem_pxp.c}  |   0
 .../i915_gem_read_read_speed.c}               |   0
 .../i915_gem_readwrite.c}                     |   0
 .../i915_gem_reg_read.c}                      |   0
 .../i915_gem_render_copy.c}                   |   0
 .../i915_gem_render_copy_redux.c}             |   0
 .../i915_gem_render_linear_blits.c}           |   0
 .../i915_gem_render_tiled_blits.c}            |   0
 .../i915_gem_request_retire.c}                |   0
 .../i915_gem_reset_stats.c}                   |   0
 .../i915_gem_ringfill.c}                      |   0
 .../i915_gem_set_tiling_vs_blt.c}             |   0
 .../i915_gem_set_tiling_vs_gtt.c}             |   0
 .../i915_gem_set_tiling_vs_pwrite.c}          |   0
 .../gem_shrink.c => intel/i915_gem_shrink.c}  |   0
 .../i915_gem_softpin.c}                       |   0
 .../i915_gem_spin_batch.c}                    |   0
 .../i915_gem_streaming_writes.c}              |   0
 .../gem_stress.c => intel/i915_gem_stress.c}  |   0
 .../gem_sync.c => intel/i915_gem_sync.c}      |   0
 .../i915_gem_tiled_blits.c}                   |   0
 .../i915_gem_tiled_fence_blits.c}             |   0
 .../i915_gem_tiled_partial_pwrite_pread.c}    |   0
 .../i915_gem_tiled_pread_basic.c}             |   0
 .../i915_gem_tiled_pread_pwrite.c}            |   0
 .../i915_gem_tiled_swapping.c}                |   0
 .../i915_gem_tiled_wb.c}                      |   0
 .../i915_gem_tiled_wc.c}                      |   0
 .../i915_gem_tiling_max_stride.c}             |   0
 .../i915_gem_unfence_active_buffers.c}        |   0
 .../i915_gem_unref_active_buffers.c}          |   0
 .../i915_gem_userptr_blits.c}                 |   0
 .../i915_gem_vm_create.c}                     |   0
 .../gem_wait.c => intel/i915_gem_wait.c}      |   0
 .../i915_gem_watchdog.c}                      |   0
 .../i915_gem_workarounds.c}                   |   0
 .../i915_gen3_mixed_blits.c}                  |   0
 .../i915_gen3_render_linear_blits.c}          |   0
 .../i915_gen3_render_mixed_blits.c}           |   0
 .../i915_gen3_render_tiledx_blits.c}          |   0
 .../i915_gen3_render_tiledy_blits.c}          |   0
 .../i915_gen7_exec_parse.c}                   |   0
 .../i915_gen9_exec_parse.c}                   |   0
 tests/{i915 => intel}/i915_getparams_basic.c  |   0
 tests/{i915 => intel}/i915_hangman.c          |   0
 tests/{i915 => intel}/i915_hwmon.c            |   0
 tests/{i915 => intel}/i915_module_load.c      |   0
 tests/{i915 => intel}/i915_pciid.c            |   0
 tests/{i915/perf.c => intel/i915_perf.c}      |   0
 .../perf_pmu.c => intel/i915_perf_pmu.c}      |   0
 tests/{i915 => intel}/i915_pipe_stress.c      |   0
 tests/{i915 => intel}/i915_pm_backlight.c     |   0
 tests/{i915 => intel}/i915_pm_dc.c            |   0
 tests/{i915 => intel}/i915_pm_freq_api.c      |   0
 tests/{i915 => intel}/i915_pm_freq_mult.c     |   0
 tests/{i915 => intel}/i915_pm_lpsp.c          |   0
 tests/{i915 => intel}/i915_pm_rc6_residency.c |   0
 tests/{i915 => intel}/i915_pm_rpm.c           |   0
 tests/{i915 => intel}/i915_pm_rps.c           |   0
 tests/{i915 => intel}/i915_pm_sseu.c          |   0
 tests/{i915 => intel}/i915_power.c            |   0
 .../{prime_busy.c => intel/i915_prime_busy.c} |   0
 .../{prime_mmap.c => intel/i915_prime_mmap.c} |   0
 .../i915_prime_mmap_coherency.c}              |   0
 .../i915_prime_mmap_kms.c}                    |  13 +
 .../i915_prime_self_import.c}                 |   0
 tests/{i915 => intel}/i915_query.c            |   0
 tests/{i915 => intel}/i915_selftest.c         |   0
 tests/{i915 => intel}/i915_suspend.c          |   0
 .../i915_sysfs_defaults.c}                    |   0
 .../i915_sysfs_heartbeat_interval.c}          |   0
 .../i915_sysfs_preempt_timeout.c}             |   0
 .../i915_sysfs_timeslice_duration.c}          |   0
 tests/{i915 => intel}/i915_test_config.json   |   9 +-
 .../intel_api_intel_allocator.c}              |   0
 tests/{i915 => intel}/kms_big_fb.c            |   0
 tests/{i915 => intel}/kms_big_joiner.c        |   0
 tests/{i915 => intel}/kms_busy.c              |   0
 tests/{i915 => intel}/kms_ccs.c               |   0
 tests/{i915 => intel}/kms_cdclk.c             |   0
 tests/{i915 => intel}/kms_dirtyfb.c           |   0
 tests/{i915 => intel}/kms_draw_crc.c          |   0
 tests/{i915 => intel}/kms_dsc.c               |   0
 tests/{i915 => intel}/kms_dsc_helper.c        |   0
 tests/{i915 => intel}/kms_dsc_helper.h        |   0
 tests/{i915 => intel}/kms_fb_coherency.c      |   0
 tests/{i915 => intel}/kms_fbcon_fbt.c         |   0
 tests/{i915 => intel}/kms_fence_pin_leak.c    |   0
 tests/{i915 => intel}/kms_flip_scaled_crc.c   |   0
 tests/{i915 => intel}/kms_flip_tiling.c       |   0
 .../kms_frontbuffer_tracking.c                |   0
 tests/{i915 => intel}/kms_legacy_colorkey.c   |   0
 tests/{i915 => intel}/kms_mmap_write_crc.c    |   0
 tests/{i915 => intel}/kms_pipe_b_c_ivb.c      |   0
 tests/{i915 => intel}/kms_psr.c               |   0
 tests/{i915 => intel}/kms_psr2_sf.c           |   0
 tests/{i915 => intel}/kms_psr2_su.c           |   0
 tests/{i915 => intel}/kms_psr_stress_test.c   |   0
 tests/{i915 => intel}/kms_pwrite_crc.c        |   0
 tests/{ => intel}/kms_test_config.json        |   6 +-
 tests/{xe => intel}/xe_ccs.c                  |   0
 tests/{xe => intel}/xe_compute.c              |   0
 tests/{xe => intel}/xe_create.c               |   0
 tests/{xe => intel}/xe_debugfs.c              |   0
 tests/{xe => intel}/xe_dma_buf_sync.c         |   0
 tests/{xe => intel}/xe_evict.c                |   0
 tests/{xe => intel}/xe_exec_balancer.c        |   0
 tests/{xe => intel}/xe_exec_basic.c           |   0
 tests/{xe => intel}/xe_exec_compute_mode.c    |   0
 tests/{xe => intel}/xe_exec_fault_mode.c      |   0
 tests/{xe => intel}/xe_exec_reset.c           |   0
 tests/{xe => intel}/xe_exec_store.c           |   0
 tests/{xe => intel}/xe_exec_threads.c         |   0
 tests/{xe => intel}/xe_exercise_blt.c         |   0
 tests/{xe => intel}/xe_gpgpu_fill.c           |   0
 tests/{xe => intel}/xe_guc_pc.c               |   0
 tests/{xe => intel}/xe_huc_copy.c             |   0
 tests/{xe => intel}/xe_intel_bb.c             |   0
 tests/{xe => intel}/xe_live_ktest.c           |   0
 tests/{xe => intel}/xe_media_fill.c           |   0
 tests/{xe => intel}/xe_mmap.c                 |   0
 tests/{xe => intel}/xe_mmio.c                 |   0
 tests/{xe => intel}/xe_module_load.c          |   0
 tests/{xe => intel}/xe_noexec_ping_pong.c     |   0
 tests/{xe => intel}/xe_pm.c                   |   0
 tests/{xe => intel}/xe_pm_residency.c         |   0
 tests/{xe => intel}/xe_prime_self_import.c    |   0
 tests/{xe => intel}/xe_query.c                |   0
 tests/{xe => intel}/xe_spin_batch.c           |   0
 tests/{xe => intel}/xe_sysfs_defaults.c       |   0
 tests/{xe => intel}/xe_sysfs_scheduler.c      |   0
 tests/{xe => intel}/xe_sysfs_tile.c           |   0
 tests/{xe => intel}/xe_test_config.json       |   0
 tests/{xe => intel}/xe_uevent.c               |   0
 tests/{xe => intel}/xe_vm.c                   |   0
 tests/{xe => intel}/xe_waitfence.c            |   0
 tests/meson.build                             | 379 +++++++++---------
 226 files changed, 316 insertions(+), 321 deletions(-)
 rename tests/{i915/api_intel_bb.c => intel/i915_api_intel_bb.c} (100%)
 rename tests/{debugfs_test.c => intel/i915_debugfs_test.c} (100%)
 rename tests/{i915/drm_fdinfo.c => intel/i915_drm_fdinfo.c} (100%)
 rename tests/{i915 => intel}/i915_fb_tiling.c (100%)
 rename tests/{i915/gem_bad_reloc.c => intel/i915_gem_bad_reloc.c} (100%)
 rename tests/{i915/gem_barrier_race.c => intel/i915_gem_barrier_race.c} (100%)
 rename tests/{i915/gem_basic.c => intel/i915_gem_basic.c} (100%)
 rename tests/{i915/gem_blits.c => intel/i915_gem_blits.c} (100%)
 rename tests/{i915/gem_busy.c => intel/i915_gem_busy.c} (100%)
 rename tests/{i915/gem_caching.c => intel/i915_gem_caching.c} (100%)
 rename tests/{i915/gem_ccs.c => intel/i915_gem_ccs.c} (100%)
 rename tests/{i915/gem_close.c => intel/i915_gem_close.c} (100%)
 rename tests/{i915/gem_close_race.c => intel/i915_gem_close_race.c} (100%)
 rename tests/{i915/gem_concurrent_all.c => intel/i915_gem_concurrent_all.c} (100%)
 rename tests/{i915/gem_concurrent_blit.c => intel/i915_gem_concurrent_blit.c} (91%)
 rename tests/{i915/gem_create.c => intel/i915_gem_create.c} (100%)
 rename tests/{i915/gem_cs_tlb.c => intel/i915_gem_cs_tlb.c} (100%)
 rename tests/{i915/gem_ctx_bad_destroy.c => intel/i915_gem_ctx_bad_destroy.c} (100%)
 rename tests/{i915/gem_ctx_create.c => intel/i915_gem_ctx_create.c} (100%)
 rename tests/{i915/gem_ctx_engines.c => intel/i915_gem_ctx_engines.c} (100%)
 rename tests/{i915/gem_ctx_exec.c => intel/i915_gem_ctx_exec.c} (100%)
 rename tests/{i915/gem_ctx_freq.c => intel/i915_gem_ctx_freq.c} (100%)
 rename tests/{i915/gem_ctx_isolation.c => intel/i915_gem_ctx_isolation.c} (100%)
 rename tests/{i915/gem_ctx_param.c => intel/i915_gem_ctx_param.c} (100%)
 rename tests/{i915/gem_ctx_persistence.c => intel/i915_gem_ctx_persistence.c} (100%)
 rename tests/{i915/gem_ctx_shared.c => intel/i915_gem_ctx_shared.c} (100%)
 rename tests/{i915/gem_ctx_sseu.c => intel/i915_gem_ctx_sseu.c} (100%)
 rename tests/{i915/gem_ctx_switch.c => intel/i915_gem_ctx_switch.c} (100%)
 rename tests/{i915/gem_eio.c => intel/i915_gem_eio.c} (100%)
 rename tests/{i915/gem_evict_alignment.c => intel/i915_gem_evict_alignment.c} (100%)
 rename tests/{i915/gem_evict_everything.c => intel/i915_gem_evict_everything.c} (100%)
 rename tests/{i915/gem_exec_alignment.c => intel/i915_gem_exec_alignment.c} (100%)
 rename tests/{i915/gem_exec_async.c => intel/i915_gem_exec_async.c} (100%)
 rename tests/{i915/gem_exec_await.c => intel/i915_gem_exec_await.c} (100%)
 rename tests/{i915/gem_exec_balancer.c => intel/i915_gem_exec_balancer.c} (100%)
 rename tests/{i915/gem_exec_basic.c => intel/i915_gem_exec_basic.c} (100%)
 rename tests/{i915/gem_exec_big.c => intel/i915_gem_exec_big.c} (100%)
 rename tests/{i915/gem_exec_capture.c => intel/i915_gem_exec_capture.c} (100%)
 rename tests/{i915/gem_exec_create.c => intel/i915_gem_exec_create.c} (100%)
 rename tests/{i915/gem_exec_endless.c => intel/i915_gem_exec_endless.c} (100%)
 rename tests/{i915/gem_exec_fair.c => intel/i915_gem_exec_fair.c} (100%)
 rename tests/{i915/gem_exec_fence.c => intel/i915_gem_exec_fence.c} (100%)
 rename tests/{i915/gem_exec_flush.c => intel/i915_gem_exec_flush.c} (100%)
 rename tests/{i915/gem_exec_gttfill.c => intel/i915_gem_exec_gttfill.c} (100%)
 rename tests/{i915/gem_exec_latency.c => intel/i915_gem_exec_latency.c} (100%)
 rename tests/{i915/gem_exec_lut_handle.c => intel/i915_gem_exec_lut_handle.c} (100%)
 rename tests/{i915/gem_exec_nop.c => intel/i915_gem_exec_nop.c} (100%)
 rename tests/{i915/gem_exec_parallel.c => intel/i915_gem_exec_parallel.c} (100%)
 rename tests/{i915/gem_exec_params.c => intel/i915_gem_exec_params.c} (100%)
 rename tests/{i915/gem_exec_reloc.c => intel/i915_gem_exec_reloc.c} (100%)
 rename tests/{i915/gem_exec_schedule.c => intel/i915_gem_exec_schedule.c} (100%)
 rename tests/{i915/gem_exec_store.c => intel/i915_gem_exec_store.c} (100%)
 rename tests/{i915/gem_exec_suspend.c => intel/i915_gem_exec_suspend.c} (100%)
 rename tests/{i915/gem_exec_whisper.c => intel/i915_gem_exec_whisper.c} (100%)
 rename tests/{i915/gem_exercise_blt.c => intel/i915_gem_exercise_blt.c} (100%)
 rename tests/{i915/gem_fd_exhaustion.c => intel/i915_gem_fd_exhaustion.c} (100%)
 rename tests/{i915/gem_fence_thrash.c => intel/i915_gem_fence_thrash.c} (100%)
 rename tests/{i915/gem_fence_upload.c => intel/i915_gem_fence_upload.c} (100%)
 rename tests/{i915/gem_fenced_exec_thrash.c => intel/i915_gem_fenced_exec_thrash.c} (100%)
 rename tests/{i915/gem_flink_basic.c => intel/i915_gem_flink_basic.c} (100%)
 rename tests/{i915/gem_flink_race.c => intel/i915_gem_flink_race.c} (100%)
 rename tests/{i915/gem_gpgpu_fill.c => intel/i915_gem_gpgpu_fill.c} (100%)
 rename tests/{i915/gem_gtt_cpu_tlb.c => intel/i915_gem_gtt_cpu_tlb.c} (100%)
 rename tests/{i915/gem_gtt_hog.c => intel/i915_gem_gtt_hog.c} (100%)
 rename tests/{i915/gem_gtt_speed.c => intel/i915_gem_gtt_speed.c} (100%)
 rename tests/{i915/gem_huc_copy.c => intel/i915_gem_huc_copy.c} (100%)
 rename tests/{i915/gem_linear_blits.c => intel/i915_gem_linear_blits.c} (100%)
 rename tests/{i915/gem_lmem_evict.c => intel/i915_gem_lmem_evict.c} (100%)
 rename tests/{i915/gem_lmem_swapping.c => intel/i915_gem_lmem_swapping.c} (100%)
 rename tests/{i915/gem_lut_handle.c => intel/i915_gem_lut_handle.c} (100%)
 rename tests/{i915/gem_madvise.c => intel/i915_gem_madvise.c} (100%)
 rename tests/{i915/gem_media_fill.c => intel/i915_gem_media_fill.c} (100%)
 rename tests/{i915/gem_media_vme.c => intel/i915_gem_media_vme.c} (100%)
 rename tests/{i915/gem_mmap.c => intel/i915_gem_mmap.c} (100%)
 rename tests/{i915/gem_mmap_gtt.c => intel/i915_gem_mmap_gtt.c} (100%)
 rename tests/{i915/gem_mmap_offset.c => intel/i915_gem_mmap_offset.c} (100%)
 rename tests/{i915/gem_mmap_wc.c => intel/i915_gem_mmap_wc.c} (100%)
 rename tests/{i915/gem_partial_pwrite_pread.c => intel/i915_gem_partial_pwrite_pread.c} (100%)
 rename tests/{i915/gem_pipe_control_store_loop.c => intel/i915_gem_pipe_control_store_loop.c} (100%)
 rename tests/{i915/gem_ppgtt.c => intel/i915_gem_ppgtt.c} (100%)
 rename tests/{i915/gem_pread.c => intel/i915_gem_pread.c} (100%)
 rename tests/{i915/gem_pread_after_blit.c => intel/i915_gem_pread_after_blit.c} (100%)
 rename tests/{i915/gem_pwrite.c => intel/i915_gem_pwrite.c} (100%)
 rename tests/{i915/gem_pwrite_snooped.c => intel/i915_gem_pwrite_snooped.c} (100%)
 rename tests/{i915/gem_pxp.c => intel/i915_gem_pxp.c} (100%)
 rename tests/{i915/gem_read_read_speed.c => intel/i915_gem_read_read_speed.c} (100%)
 rename tests/{i915/gem_readwrite.c => intel/i915_gem_readwrite.c} (100%)
 rename tests/{i915/gem_reg_read.c => intel/i915_gem_reg_read.c} (100%)
 rename tests/{i915/gem_render_copy.c => intel/i915_gem_render_copy.c} (100%)
 rename tests/{i915/gem_render_copy_redux.c => intel/i915_gem_render_copy_redux.c} (100%)
 rename tests/{i915/gem_render_linear_blits.c => intel/i915_gem_render_linear_blits.c} (100%)
 rename tests/{i915/gem_render_tiled_blits.c => intel/i915_gem_render_tiled_blits.c} (100%)
 rename tests/{i915/gem_request_retire.c => intel/i915_gem_request_retire.c} (100%)
 rename tests/{i915/gem_reset_stats.c => intel/i915_gem_reset_stats.c} (100%)
 rename tests/{i915/gem_ringfill.c => intel/i915_gem_ringfill.c} (100%)
 rename tests/{i915/gem_set_tiling_vs_blt.c => intel/i915_gem_set_tiling_vs_blt.c} (100%)
 rename tests/{i915/gem_set_tiling_vs_gtt.c => intel/i915_gem_set_tiling_vs_gtt.c} (100%)
 rename tests/{i915/gem_set_tiling_vs_pwrite.c => intel/i915_gem_set_tiling_vs_pwrite.c} (100%)
 rename tests/{i915/gem_shrink.c => intel/i915_gem_shrink.c} (100%)
 rename tests/{i915/gem_softpin.c => intel/i915_gem_softpin.c} (100%)
 rename tests/{i915/gem_spin_batch.c => intel/i915_gem_spin_batch.c} (100%)
 rename tests/{i915/gem_streaming_writes.c => intel/i915_gem_streaming_writes.c} (100%)
 rename tests/{i915/gem_stress.c => intel/i915_gem_stress.c} (100%)
 rename tests/{i915/gem_sync.c => intel/i915_gem_sync.c} (100%)
 rename tests/{i915/gem_tiled_blits.c => intel/i915_gem_tiled_blits.c} (100%)
 rename tests/{i915/gem_tiled_fence_blits.c => intel/i915_gem_tiled_fence_blits.c} (100%)
 rename tests/{i915/gem_tiled_partial_pwrite_pread.c => intel/i915_gem_tiled_partial_pwrite_pread.c} (100%)
 rename tests/{i915/gem_tiled_pread_basic.c => intel/i915_gem_tiled_pread_basic.c} (100%)
 rename tests/{i915/gem_tiled_pread_pwrite.c => intel/i915_gem_tiled_pread_pwrite.c} (100%)
 rename tests/{i915/gem_tiled_swapping.c => intel/i915_gem_tiled_swapping.c} (100%)
 rename tests/{i915/gem_tiled_wb.c => intel/i915_gem_tiled_wb.c} (100%)
 rename tests/{i915/gem_tiled_wc.c => intel/i915_gem_tiled_wc.c} (100%)
 rename tests/{i915/gem_tiling_max_stride.c => intel/i915_gem_tiling_max_stride.c} (100%)
 rename tests/{i915/gem_unfence_active_buffers.c => intel/i915_gem_unfence_active_buffers.c} (100%)
 rename tests/{i915/gem_unref_active_buffers.c => intel/i915_gem_unref_active_buffers.c} (100%)
 rename tests/{i915/gem_userptr_blits.c => intel/i915_gem_userptr_blits.c} (100%)
 rename tests/{i915/gem_vm_create.c => intel/i915_gem_vm_create.c} (100%)
 rename tests/{i915/gem_wait.c => intel/i915_gem_wait.c} (100%)
 rename tests/{i915/gem_watchdog.c => intel/i915_gem_watchdog.c} (100%)
 rename tests/{i915/gem_workarounds.c => intel/i915_gem_workarounds.c} (100%)
 rename tests/{i915/gen3_mixed_blits.c => intel/i915_gen3_mixed_blits.c} (100%)
 rename tests/{i915/gen3_render_linear_blits.c => intel/i915_gen3_render_linear_blits.c} (100%)
 rename tests/{i915/gen3_render_mixed_blits.c => intel/i915_gen3_render_mixed_blits.c} (100%)
 rename tests/{i915/gen3_render_tiledx_blits.c => intel/i915_gen3_render_tiledx_blits.c} (100%)
 rename tests/{i915/gen3_render_tiledy_blits.c => intel/i915_gen3_render_tiledy_blits.c} (100%)
 rename tests/{i915/gen7_exec_parse.c => intel/i915_gen7_exec_parse.c} (100%)
 rename tests/{i915/gen9_exec_parse.c => intel/i915_gen9_exec_parse.c} (100%)
 rename tests/{i915 => intel}/i915_getparams_basic.c (100%)
 rename tests/{i915 => intel}/i915_hangman.c (100%)
 rename tests/{i915 => intel}/i915_hwmon.c (100%)
 rename tests/{i915 => intel}/i915_module_load.c (100%)
 rename tests/{i915 => intel}/i915_pciid.c (100%)
 rename tests/{i915/perf.c => intel/i915_perf.c} (100%)
 rename tests/{i915/perf_pmu.c => intel/i915_perf_pmu.c} (100%)
 rename tests/{i915 => intel}/i915_pipe_stress.c (100%)
 rename tests/{i915 => intel}/i915_pm_backlight.c (100%)
 rename tests/{i915 => intel}/i915_pm_dc.c (100%)
 rename tests/{i915 => intel}/i915_pm_freq_api.c (100%)
 rename tests/{i915 => intel}/i915_pm_freq_mult.c (100%)
 rename tests/{i915 => intel}/i915_pm_lpsp.c (100%)
 rename tests/{i915 => intel}/i915_pm_rc6_residency.c (100%)
 rename tests/{i915 => intel}/i915_pm_rpm.c (100%)
 rename tests/{i915 => intel}/i915_pm_rps.c (100%)
 rename tests/{i915 => intel}/i915_pm_sseu.c (100%)
 rename tests/{i915 => intel}/i915_power.c (100%)
 rename tests/{prime_busy.c => intel/i915_prime_busy.c} (100%)
 rename tests/{prime_mmap.c => intel/i915_prime_mmap.c} (100%)
 rename tests/{prime_mmap_coherency.c => intel/i915_prime_mmap_coherency.c} (100%)
 rename tests/{prime_mmap_kms.c => intel/i915_prime_mmap_kms.c} (96%)
 rename tests/{prime_self_import.c => intel/i915_prime_self_import.c} (100%)
 rename tests/{i915 => intel}/i915_query.c (100%)
 rename tests/{i915 => intel}/i915_selftest.c (100%)
 rename tests/{i915 => intel}/i915_suspend.c (100%)
 rename tests/{i915/sysfs_defaults.c => intel/i915_sysfs_defaults.c} (100%)
 rename tests/{i915/sysfs_heartbeat_interval.c => intel/i915_sysfs_heartbeat_interval.c} (100%)
 rename tests/{i915/sysfs_preempt_timeout.c => intel/i915_sysfs_preempt_timeout.c} (100%)
 rename tests/{i915/sysfs_timeslice_duration.c => intel/i915_sysfs_timeslice_duration.c} (100%)
 rename tests/{i915 => intel}/i915_test_config.json (90%)
 rename tests/{i915/api_intel_allocator.c => intel/intel_api_intel_allocator.c} (100%)
 rename tests/{i915 => intel}/kms_big_fb.c (100%)
 rename tests/{i915 => intel}/kms_big_joiner.c (100%)
 rename tests/{i915 => intel}/kms_busy.c (100%)
 rename tests/{i915 => intel}/kms_ccs.c (100%)
 rename tests/{i915 => intel}/kms_cdclk.c (100%)
 rename tests/{i915 => intel}/kms_dirtyfb.c (100%)
 rename tests/{i915 => intel}/kms_draw_crc.c (100%)
 rename tests/{i915 => intel}/kms_dsc.c (100%)
 rename tests/{i915 => intel}/kms_dsc_helper.c (100%)
 rename tests/{i915 => intel}/kms_dsc_helper.h (100%)
 rename tests/{i915 => intel}/kms_fb_coherency.c (100%)
 rename tests/{i915 => intel}/kms_fbcon_fbt.c (100%)
 rename tests/{i915 => intel}/kms_fence_pin_leak.c (100%)
 rename tests/{i915 => intel}/kms_flip_scaled_crc.c (100%)
 rename tests/{i915 => intel}/kms_flip_tiling.c (100%)
 rename tests/{i915 => intel}/kms_frontbuffer_tracking.c (100%)
 rename tests/{i915 => intel}/kms_legacy_colorkey.c (100%)
 rename tests/{i915 => intel}/kms_mmap_write_crc.c (100%)
 rename tests/{i915 => intel}/kms_pipe_b_c_ivb.c (100%)
 rename tests/{i915 => intel}/kms_psr.c (100%)
 rename tests/{i915 => intel}/kms_psr2_sf.c (100%)
 rename tests/{i915 => intel}/kms_psr2_su.c (100%)
 rename tests/{i915 => intel}/kms_psr_stress_test.c (100%)
 rename tests/{i915 => intel}/kms_pwrite_crc.c (100%)
 rename tests/{ => intel}/kms_test_config.json (86%)
 rename tests/{xe => intel}/xe_ccs.c (100%)
 rename tests/{xe => intel}/xe_compute.c (100%)
 rename tests/{xe => intel}/xe_create.c (100%)
 rename tests/{xe => intel}/xe_debugfs.c (100%)
 rename tests/{xe => intel}/xe_dma_buf_sync.c (100%)
 rename tests/{xe => intel}/xe_evict.c (100%)
 rename tests/{xe => intel}/xe_exec_balancer.c (100%)
 rename tests/{xe => intel}/xe_exec_basic.c (100%)
 rename tests/{xe => intel}/xe_exec_compute_mode.c (100%)
 rename tests/{xe => intel}/xe_exec_fault_mode.c (100%)
 rename tests/{xe => intel}/xe_exec_reset.c (100%)
 rename tests/{xe => intel}/xe_exec_store.c (100%)
 rename tests/{xe => intel}/xe_exec_threads.c (100%)
 rename tests/{xe => intel}/xe_exercise_blt.c (100%)
 rename tests/{xe => intel}/xe_gpgpu_fill.c (100%)
 rename tests/{xe => intel}/xe_guc_pc.c (100%)
 rename tests/{xe => intel}/xe_huc_copy.c (100%)
 rename tests/{xe => intel}/xe_intel_bb.c (100%)
 rename tests/{xe => intel}/xe_live_ktest.c (100%)
 rename tests/{xe => intel}/xe_media_fill.c (100%)
 rename tests/{xe => intel}/xe_mmap.c (100%)
 rename tests/{xe => intel}/xe_mmio.c (100%)
 rename tests/{xe => intel}/xe_module_load.c (100%)
 rename tests/{xe => intel}/xe_noexec_ping_pong.c (100%)
 rename tests/{xe => intel}/xe_pm.c (100%)
 rename tests/{xe => intel}/xe_pm_residency.c (100%)
 rename tests/{xe => intel}/xe_prime_self_import.c (100%)
 rename tests/{xe => intel}/xe_query.c (100%)
 rename tests/{xe => intel}/xe_spin_batch.c (100%)
 rename tests/{xe => intel}/xe_sysfs_defaults.c (100%)
 rename tests/{xe => intel}/xe_sysfs_scheduler.c (100%)
 rename tests/{xe => intel}/xe_sysfs_tile.c (100%)
 rename tests/{xe => intel}/xe_test_config.json (100%)
 rename tests/{xe => intel}/xe_uevent.c (100%)
 rename tests/{xe => intel}/xe_vm.c (100%)
 rename tests/{xe => intel}/xe_waitfence.c (100%)

--
2.40.0



^ permalink raw reply	[flat|nested] 18+ messages in thread

* [igt-dev] [i-g-t V5 1/7] testplan/i915: Exclude non-i915 tests from i915 testplan
  2023-08-31 14:56 [igt-dev] [i-g-t V5 0/7] New dir structure for intel specific tests Bhanuprakash Modem
@ 2023-08-31 14:56 ` Bhanuprakash Modem
  2023-08-31 14:56 ` [igt-dev] [i-g-t V5 2/7] testplan/kms: Move kms testplan to intel dir Bhanuprakash Modem
                   ` (8 subsequent siblings)
  9 siblings, 0 replies; 18+ messages in thread
From: Bhanuprakash Modem @ 2023-08-31 14:56 UTC (permalink / raw)
  To: igt-dev, mauro.chehab

Using wildcards in testplan configs, and keeping other configs
(Xe & kms) in same dir may leads to the problem. Hence, exclude
non-i915 tests from i915 testplan.

Cc: Mauro Carvalho Chehab <mauro.chehab@linux.intel.com>
Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
Reviewed-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
 tests/i915/i915_test_config.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/i915/i915_test_config.json b/tests/i915/i915_test_config.json
index a029801a6..c15ef2580 100644
--- a/tests/i915/i915_test_config.json
+++ b/tests/i915/i915_test_config.json
@@ -12,7 +12,8 @@
                "../prime_vgem.c", "../sw_sync.c", "../syncobj_basic.c",
                "../syncobj_timeline.c", "../syncobj_wait.c",
                "../vgem_basic.c", "../vgem_slow.c" ],
-    "exclude_files": [ "kms_*", "gem_concurrent_all.c", "gem_concurrent_blit.c" ],
+    "exclude_files": [ "kms_*", "gem_concurrent_all.c", "gem_concurrent_blit.c",
+                       "xe_*" ],
     "fields": {
 	"Mega feature": {
                 "_properties_": {
-- 
2.40.0



^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [igt-dev] [i-g-t V5 2/7] testplan/kms: Move kms testplan to intel dir
  2023-08-31 14:56 [igt-dev] [i-g-t V5 0/7] New dir structure for intel specific tests Bhanuprakash Modem
  2023-08-31 14:56 ` [igt-dev] [i-g-t V5 1/7] testplan/i915: Exclude non-i915 tests from i915 testplan Bhanuprakash Modem
@ 2023-08-31 14:56 ` Bhanuprakash Modem
  2023-08-31 15:56   ` Mauro Carvalho Chehab
  2023-08-31 14:56 ` [igt-dev] [i-g-t V5 3/7] tests/i915/prime_mmap_kms: Add missing documentation Bhanuprakash Modem
                   ` (7 subsequent siblings)
  9 siblings, 1 reply; 18+ messages in thread
From: Bhanuprakash Modem @ 2023-08-31 14:56 UTC (permalink / raw)
  To: igt-dev, mauro.chehab

As this testplan is specific to the Intel hardware, the correct
place for it is inside the tests/i915/.

V2: - Fix the included files path
V3: - Rebase

Cc: Mauro Carvalho Chehab <mauro.chehab@linux.intel.com>
Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
---
 docs/testplan/meson.build             | 2 +-
 tests/{ => i915}/kms_test_config.json | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename tests/{ => i915}/kms_test_config.json (86%)

diff --git a/docs/testplan/meson.build b/docs/testplan/meson.build
index e838f2eb1..8d3ad952d 100644
--- a/docs/testplan/meson.build
+++ b/docs/testplan/meson.build
@@ -7,7 +7,7 @@ rst2pdf = find_program('rst2pdf', required: false)
 stylesheet = join_paths(meson.current_source_dir(), 'testplan.css')
 
 xe_test_config = join_paths(source_root, 'tests', 'xe', 'xe_test_config.json')
-kms_test_config = join_paths(source_root, 'tests', 'kms_test_config.json')
+kms_test_config = join_paths(source_root, 'tests', 'i915', 'kms_test_config.json')
 i915_test_config = join_paths(source_root, 'tests', 'i915', 'i915_test_config.json')
 
 check_testlist = []
diff --git a/tests/kms_test_config.json b/tests/i915/kms_test_config.json
similarity index 86%
rename from tests/kms_test_config.json
rename to tests/i915/kms_test_config.json
index 9219ae4eb..4130b7d6d 100644
--- a/tests/kms_test_config.json
+++ b/tests/i915/kms_test_config.json
@@ -1,9 +1,9 @@
 {
     "description": "JSON file to be used to parse KMS documentation",
     "name": "Display and KMS Tests for Intel i915 and Xe Drivers",
-    "files": [ "chamelium/kms_*.c", "i915/kms_*.c", "kms_*.c", "testdisplay.c" ],
-    "exclude_files": [ "chamelium/kms_chamelium_helper.c", "i915/kms_dsc_helper.c",
-                       "kms_color_helper.c"],
+    "files": [ "../chamelium/kms_*.c", "../kms_*.c", "../testdisplay.c", "kms_*.c" ],
+    "exclude_files": [ "../chamelium/kms_chamelium_helper.c", "../kms_color_helper.c",
+                       "kms_dsc_helper.c" ],
     "fields": {
         "Category": {
             "_properties_": {
-- 
2.40.0



^ permalink raw reply related	[flat|nested] 18+ messages in thread

* Re: [igt-dev] [i-g-t V5 2/7] testplan/kms: Move kms testplan to intel dir
  2023-08-31 14:56 ` [igt-dev] [i-g-t V5 2/7] testplan/kms: Move kms testplan to intel dir Bhanuprakash Modem
@ 2023-08-31 15:56   ` Mauro Carvalho Chehab
  0 siblings, 0 replies; 18+ messages in thread
From: Mauro Carvalho Chehab @ 2023-08-31 15:56 UTC (permalink / raw)
  To: Bhanuprakash Modem; +Cc: igt-dev

On Thu, 31 Aug 2023 20:26:17 +0530
Bhanuprakash Modem <bhanuprakash.modem@intel.com> wrote:

> As this testplan is specific to the Intel hardware, the correct
> place for it is inside the tests/i915/.
> 
> V2: - Fix the included files path
> V3: - Rebase
> 
> Cc: Mauro Carvalho Chehab <mauro.chehab@linux.intel.com>
> Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com>

Reviewed-by: Mauro Carvalho Chehab <mchehab@kernel.org>

> ---
>  docs/testplan/meson.build             | 2 +-
>  tests/{ => i915}/kms_test_config.json | 6 +++---
>  2 files changed, 4 insertions(+), 4 deletions(-)
>  rename tests/{ => i915}/kms_test_config.json (86%)
> 
> diff --git a/docs/testplan/meson.build b/docs/testplan/meson.build
> index e838f2eb1..8d3ad952d 100644
> --- a/docs/testplan/meson.build
> +++ b/docs/testplan/meson.build
> @@ -7,7 +7,7 @@ rst2pdf = find_program('rst2pdf', required: false)
>  stylesheet = join_paths(meson.current_source_dir(), 'testplan.css')
>  
>  xe_test_config = join_paths(source_root, 'tests', 'xe', 'xe_test_config.json')
> -kms_test_config = join_paths(source_root, 'tests', 'kms_test_config.json')
> +kms_test_config = join_paths(source_root, 'tests', 'i915', 'kms_test_config.json')
>  i915_test_config = join_paths(source_root, 'tests', 'i915', 'i915_test_config.json')
>  
>  check_testlist = []
> diff --git a/tests/kms_test_config.json b/tests/i915/kms_test_config.json
> similarity index 86%
> rename from tests/kms_test_config.json
> rename to tests/i915/kms_test_config.json
> index 9219ae4eb..4130b7d6d 100644
> --- a/tests/kms_test_config.json
> +++ b/tests/i915/kms_test_config.json
> @@ -1,9 +1,9 @@
>  {
>      "description": "JSON file to be used to parse KMS documentation",
>      "name": "Display and KMS Tests for Intel i915 and Xe Drivers",
> -    "files": [ "chamelium/kms_*.c", "i915/kms_*.c", "kms_*.c", "testdisplay.c" ],
> -    "exclude_files": [ "chamelium/kms_chamelium_helper.c", "i915/kms_dsc_helper.c",
> -                       "kms_color_helper.c"],
> +    "files": [ "../chamelium/kms_*.c", "../kms_*.c", "../testdisplay.c", "kms_*.c" ],
> +    "exclude_files": [ "../chamelium/kms_chamelium_helper.c", "../kms_color_helper.c",
> +                       "kms_dsc_helper.c" ],
>      "fields": {
>          "Category": {
>              "_properties_": {

^ permalink raw reply	[flat|nested] 18+ messages in thread

* [igt-dev] [i-g-t V5 3/7] tests/i915/prime_mmap_kms: Add missing documentation
  2023-08-31 14:56 [igt-dev] [i-g-t V5 0/7] New dir structure for intel specific tests Bhanuprakash Modem
  2023-08-31 14:56 ` [igt-dev] [i-g-t V5 1/7] testplan/i915: Exclude non-i915 tests from i915 testplan Bhanuprakash Modem
  2023-08-31 14:56 ` [igt-dev] [i-g-t V5 2/7] testplan/kms: Move kms testplan to intel dir Bhanuprakash Modem
@ 2023-08-31 14:56 ` Bhanuprakash Modem
  2023-08-31 17:09   ` Kamil Konieczny
  2023-08-31 14:56 ` [igt-dev] [i-g-t V5 4/7] tests/meson.build: Simplify builds for Chamelium targets Bhanuprakash Modem
                   ` (6 subsequent siblings)
  9 siblings, 1 reply; 18+ messages in thread
From: Bhanuprakash Modem @ 2023-08-31 14:56 UTC (permalink / raw)
  To: igt-dev, mauro.chehab

Add missing documentation for i915 testplan.

Cc: Mauro Carvalho Chehab <mauro.chehab@linux.intel.com>
Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
Reviewed-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
 tests/prime_mmap_kms.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/tests/prime_mmap_kms.c b/tests/prime_mmap_kms.c
index 1a63be38f..683665752 100644
--- a/tests/prime_mmap_kms.c
+++ b/tests/prime_mmap_kms.c
@@ -37,6 +37,19 @@
 IGT_TEST_DESCRIPTION(
    "Efficiently sharing CPU and GPU buffers");
 
+/**
+ * TEST: prime mmap kms
+ * Category: Infrastructure
+ * Feature: prime
+ * Functionality: memory management
+ * Run type: FULL
+ * Sub-category: DRM
+ * Test category: GEM_Legacy
+ *
+ * SUBTEST: buffer-sharing
+ * Description: Test efficiently sharing CPU and GPU buffers
+ */
+
 /*
  * render_process_t:
  *
-- 
2.40.0



^ permalink raw reply related	[flat|nested] 18+ messages in thread

* Re: [igt-dev] [i-g-t V5 3/7] tests/i915/prime_mmap_kms: Add missing documentation
  2023-08-31 14:56 ` [igt-dev] [i-g-t V5 3/7] tests/i915/prime_mmap_kms: Add missing documentation Bhanuprakash Modem
@ 2023-08-31 17:09   ` Kamil Konieczny
  0 siblings, 0 replies; 18+ messages in thread
From: Kamil Konieczny @ 2023-08-31 17:09 UTC (permalink / raw)
  To: igt-dev

Hi Bhanuprakash,

On 2023-08-31 at 20:26:18 +0530, Bhanuprakash Modem wrote:
> Add missing documentation for i915 testplan.
> 
> Cc: Mauro Carvalho Chehab <mauro.chehab@linux.intel.com>
> Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
> Reviewed-by: Mauro Carvalho Chehab <mchehab@kernel.org>

This is not related to patchset "move into intel folder",
please merge only this one before taking next steps.

Regards,
Kamil

> ---
>  tests/prime_mmap_kms.c | 13 +++++++++++++
>  1 file changed, 13 insertions(+)
> 
> diff --git a/tests/prime_mmap_kms.c b/tests/prime_mmap_kms.c
> index 1a63be38f..683665752 100644
> --- a/tests/prime_mmap_kms.c
> +++ b/tests/prime_mmap_kms.c
> @@ -37,6 +37,19 @@
>  IGT_TEST_DESCRIPTION(
>     "Efficiently sharing CPU and GPU buffers");
>  
> +/**
> + * TEST: prime mmap kms
> + * Category: Infrastructure
> + * Feature: prime
> + * Functionality: memory management
> + * Run type: FULL
> + * Sub-category: DRM
> + * Test category: GEM_Legacy
> + *
> + * SUBTEST: buffer-sharing
> + * Description: Test efficiently sharing CPU and GPU buffers
> + */
> +
>  /*
>   * render_process_t:
>   *
> -- 
> 2.40.0
> 


^ permalink raw reply	[flat|nested] 18+ messages in thread

* [igt-dev] [i-g-t V5 4/7] tests/meson.build: Simplify builds for Chamelium targets
  2023-08-31 14:56 [igt-dev] [i-g-t V5 0/7] New dir structure for intel specific tests Bhanuprakash Modem
                   ` (2 preceding siblings ...)
  2023-08-31 14:56 ` [igt-dev] [i-g-t V5 3/7] tests/i915/prime_mmap_kms: Add missing documentation Bhanuprakash Modem
@ 2023-08-31 14:56 ` Bhanuprakash Modem
  2023-08-31 15:57   ` Mauro Carvalho Chehab
  2023-08-31 14:56 ` [igt-dev] [i-g-t V5 5/7] tests: Move intel specific tests to new directory Bhanuprakash Modem
                   ` (5 subsequent siblings)
  9 siblings, 1 reply; 18+ messages in thread
From: Bhanuprakash Modem @ 2023-08-31 14:56 UTC (permalink / raw)
  To: igt-dev, mauro.chehab

Move Chamelium based extra dependencies & source files to
corresponding generic dictionaries.

If we want to change extra source files for any Chamelium
target, we can simply update in the dictionary, no need to
re-wrire the rules.

Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
---
 tests/meson.build | 26 ++++++++------------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/tests/meson.build b/tests/meson.build
index c683e468d..e25793b5a 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -311,6 +311,7 @@ msm_progs = [
 
 chamelium_progs = [
 	'kms_chamelium_audio',
+	'kms_chamelium_color',
 	'kms_chamelium_edid',
 	'kms_chamelium_frames',
 	'kms_chamelium_hpd',
@@ -334,6 +335,11 @@ extra_sources = {
 	'dumb_buffer': ['dumb_buffer.c' ],
 	'testdisplay': [ 'testdisplay_hotplug.c' ],
 	'kms_color':  [ 'kms_color_helper.c' ],
+	'kms_chamelium_audio': [ join_paths ('chamelium', 'kms_chamelium_helper.c') ],
+	'kms_chamelium_color':  [ 'kms_color_helper.c' ],
+	'kms_chamelium_edid': [ join_paths ('chamelium', 'kms_chamelium_helper.c') ],
+	'kms_chamelium_frames': [ join_paths ('chamelium', 'kms_chamelium_helper.c') ],
+	'kms_chamelium_hpd': [ join_paths ('chamelium', 'kms_chamelium_helper.c') ],
 	'kms_dsc': [ join_paths ('i915', 'kms_dsc_helper.c') ],
 	'kms_psr2_sf':  [ join_paths ('i915', 'kms_dsc_helper.c') ],
 }
@@ -426,9 +432,8 @@ endforeach
 if chamelium.found()
 	foreach prog : chamelium_progs
 		testexe = executable(prog,
-				 [join_paths('chamelium', prog + '.c'),
-					join_paths('chamelium', 'kms_chamelium_helper.c')],
-				 dependencies : test_deps,
+				 [join_paths('chamelium', prog + '.c')] + extra_sources.get(prog, []),
+				 dependencies : test_deps + extra_dependencies.get(prog, []),
 				 install_dir : libexecdir,
 				 install_rpath : libexecdir_rpathdir,
 				 install : true)
@@ -442,21 +447,6 @@ if chamelium.found()
 			     output : name + '.testlist')
 	endforeach
 	test_deps += chamelium
-
-	name = 'kms_chamelium_color'
-	testexe = executable('kms_chamelium_color',
-				[ 'chamelium/kms_chamelium_color.c', 'kms_color_helper.c' ],
-				dependencies : test_deps + [ chamelium ],
-				install_dir : libexecdir,
-				install_rpath : libexecdir_rpathdir,
-				install : true)
-	test_list += name
-	test_executables += testexe
-	testlist_files += custom_target(name + '.testlist',
-		     build_by_default : true,
-		     command : [testexe, '--show-testlist'],
-		     capture : true,
-		     output : name + '.testlist')
 endif
 
 subdir('amdgpu')
-- 
2.40.0



^ permalink raw reply related	[flat|nested] 18+ messages in thread

* Re: [igt-dev] [i-g-t V5 4/7] tests/meson.build: Simplify builds for Chamelium targets
  2023-08-31 14:56 ` [igt-dev] [i-g-t V5 4/7] tests/meson.build: Simplify builds for Chamelium targets Bhanuprakash Modem
@ 2023-08-31 15:57   ` Mauro Carvalho Chehab
  0 siblings, 0 replies; 18+ messages in thread
From: Mauro Carvalho Chehab @ 2023-08-31 15:57 UTC (permalink / raw)
  To: Bhanuprakash Modem; +Cc: igt-dev

On Thu, 31 Aug 2023 20:26:19 +0530
Bhanuprakash Modem <bhanuprakash.modem@intel.com> wrote:

> Move Chamelium based extra dependencies & source files to
> corresponding generic dictionaries.
> 
> If we want to change extra source files for any Chamelium
> target, we can simply update in the dictionary, no need to
> re-wrire the rules.
> 
> Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
> Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com>

Reviewed-by: Mauro Carvalho Chehab <mchehab@kernel.org>

> ---
>  tests/meson.build | 26 ++++++++------------------
>  1 file changed, 8 insertions(+), 18 deletions(-)
> 
> diff --git a/tests/meson.build b/tests/meson.build
> index c683e468d..e25793b5a 100644
> --- a/tests/meson.build
> +++ b/tests/meson.build
> @@ -311,6 +311,7 @@ msm_progs = [
>  
>  chamelium_progs = [
>  	'kms_chamelium_audio',
> +	'kms_chamelium_color',
>  	'kms_chamelium_edid',
>  	'kms_chamelium_frames',
>  	'kms_chamelium_hpd',
> @@ -334,6 +335,11 @@ extra_sources = {
>  	'dumb_buffer': ['dumb_buffer.c' ],
>  	'testdisplay': [ 'testdisplay_hotplug.c' ],
>  	'kms_color':  [ 'kms_color_helper.c' ],
> +	'kms_chamelium_audio': [ join_paths ('chamelium', 'kms_chamelium_helper.c') ],
> +	'kms_chamelium_color':  [ 'kms_color_helper.c' ],
> +	'kms_chamelium_edid': [ join_paths ('chamelium', 'kms_chamelium_helper.c') ],
> +	'kms_chamelium_frames': [ join_paths ('chamelium', 'kms_chamelium_helper.c') ],
> +	'kms_chamelium_hpd': [ join_paths ('chamelium', 'kms_chamelium_helper.c') ],
>  	'kms_dsc': [ join_paths ('i915', 'kms_dsc_helper.c') ],
>  	'kms_psr2_sf':  [ join_paths ('i915', 'kms_dsc_helper.c') ],
>  }
> @@ -426,9 +432,8 @@ endforeach
>  if chamelium.found()
>  	foreach prog : chamelium_progs
>  		testexe = executable(prog,
> -				 [join_paths('chamelium', prog + '.c'),
> -					join_paths('chamelium', 'kms_chamelium_helper.c')],
> -				 dependencies : test_deps,
> +				 [join_paths('chamelium', prog + '.c')] + extra_sources.get(prog, []),
> +				 dependencies : test_deps + extra_dependencies.get(prog, []),
>  				 install_dir : libexecdir,
>  				 install_rpath : libexecdir_rpathdir,
>  				 install : true)
> @@ -442,21 +447,6 @@ if chamelium.found()
>  			     output : name + '.testlist')
>  	endforeach
>  	test_deps += chamelium
> -
> -	name = 'kms_chamelium_color'
> -	testexe = executable('kms_chamelium_color',
> -				[ 'chamelium/kms_chamelium_color.c', 'kms_color_helper.c' ],
> -				dependencies : test_deps + [ chamelium ],
> -				install_dir : libexecdir,
> -				install_rpath : libexecdir_rpathdir,
> -				install : true)
> -	test_list += name
> -	test_executables += testexe
> -	testlist_files += custom_target(name + '.testlist',
> -		     build_by_default : true,
> -		     command : [testexe, '--show-testlist'],
> -		     capture : true,
> -		     output : name + '.testlist')
>  endif
>  
>  subdir('amdgpu')

^ permalink raw reply	[flat|nested] 18+ messages in thread

* [igt-dev] [i-g-t V5 5/7] tests: Move intel specific tests to new directory
  2023-08-31 14:56 [igt-dev] [i-g-t V5 0/7] New dir structure for intel specific tests Bhanuprakash Modem
                   ` (3 preceding siblings ...)
  2023-08-31 14:56 ` [igt-dev] [i-g-t V5 4/7] tests/meson.build: Simplify builds for Chamelium targets Bhanuprakash Modem
@ 2023-08-31 14:56 ` Bhanuprakash Modem
  2023-08-31 16:00   ` Mauro Carvalho Chehab
  2023-08-31 14:56 ` [igt-dev] [i-g-t V5 6/7] tests/meson.build: Split intel targets based on their nature Bhanuprakash Modem
                   ` (4 subsequent siblings)
  9 siblings, 1 reply; 18+ messages in thread
From: Bhanuprakash Modem @ 2023-08-31 14:56 UTC (permalink / raw)
  To: igt-dev, mauro.chehab

In-order to organize tests in a better way, move all intel
specific tests (includes i915, xe & kms) to a new directory
called "tests/intel".

V2: - Rebase

Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
---
 docs/testplan/meson.build                     |  6 ++--
 tests/{i915 => intel}/api_intel_allocator.c   |  0
 tests/{i915 => intel}/api_intel_bb.c          |  0
 tests/{ => intel}/debugfs_test.c              |  0
 tests/{i915 => intel}/drm_fdinfo.c            |  0
 tests/{i915 => intel}/gem_bad_reloc.c         |  0
 tests/{i915 => intel}/gem_barrier_race.c      |  0
 tests/{i915 => intel}/gem_basic.c             |  0
 tests/{i915 => intel}/gem_blits.c             |  0
 tests/{i915 => intel}/gem_busy.c              |  0
 tests/{i915 => intel}/gem_caching.c           |  0
 tests/{i915 => intel}/gem_ccs.c               |  0
 tests/{i915 => intel}/gem_close.c             |  0
 tests/{i915 => intel}/gem_close_race.c        |  0
 tests/{i915 => intel}/gem_concurrent_all.c    |  0
 tests/{i915 => intel}/gem_concurrent_blit.c   |  0
 tests/{i915 => intel}/gem_create.c            |  0
 tests/{i915 => intel}/gem_cs_tlb.c            |  0
 tests/{i915 => intel}/gem_ctx_bad_destroy.c   |  0
 tests/{i915 => intel}/gem_ctx_create.c        |  0
 tests/{i915 => intel}/gem_ctx_engines.c       |  0
 tests/{i915 => intel}/gem_ctx_exec.c          |  0
 tests/{i915 => intel}/gem_ctx_freq.c          |  0
 tests/{i915 => intel}/gem_ctx_isolation.c     |  0
 tests/{i915 => intel}/gem_ctx_param.c         |  0
 tests/{i915 => intel}/gem_ctx_persistence.c   |  0
 tests/{i915 => intel}/gem_ctx_shared.c        |  0
 tests/{i915 => intel}/gem_ctx_sseu.c          |  0
 tests/{i915 => intel}/gem_ctx_switch.c        |  0
 tests/{i915 => intel}/gem_eio.c               |  0
 tests/{i915 => intel}/gem_evict_alignment.c   |  0
 tests/{i915 => intel}/gem_evict_everything.c  |  0
 tests/{i915 => intel}/gem_exec_alignment.c    |  0
 tests/{i915 => intel}/gem_exec_async.c        |  0
 tests/{i915 => intel}/gem_exec_await.c        |  0
 tests/{i915 => intel}/gem_exec_balancer.c     |  0
 tests/{i915 => intel}/gem_exec_basic.c        |  0
 tests/{i915 => intel}/gem_exec_big.c          |  0
 tests/{i915 => intel}/gem_exec_capture.c      |  0
 tests/{i915 => intel}/gem_exec_create.c       |  0
 tests/{i915 => intel}/gem_exec_endless.c      |  0
 tests/{i915 => intel}/gem_exec_fair.c         |  0
 tests/{i915 => intel}/gem_exec_fence.c        |  0
 tests/{i915 => intel}/gem_exec_flush.c        |  0
 tests/{i915 => intel}/gem_exec_gttfill.c      |  0
 tests/{i915 => intel}/gem_exec_latency.c      |  0
 tests/{i915 => intel}/gem_exec_lut_handle.c   |  0
 tests/{i915 => intel}/gem_exec_nop.c          |  0
 tests/{i915 => intel}/gem_exec_parallel.c     |  0
 tests/{i915 => intel}/gem_exec_params.c       |  0
 tests/{i915 => intel}/gem_exec_reloc.c        |  0
 tests/{i915 => intel}/gem_exec_schedule.c     |  0
 tests/{i915 => intel}/gem_exec_store.c        |  0
 tests/{i915 => intel}/gem_exec_suspend.c      |  0
 tests/{i915 => intel}/gem_exec_whisper.c      |  0
 tests/{i915 => intel}/gem_exercise_blt.c      |  0
 tests/{i915 => intel}/gem_fd_exhaustion.c     |  0
 tests/{i915 => intel}/gem_fence_thrash.c      |  0
 tests/{i915 => intel}/gem_fence_upload.c      |  0
 .../{i915 => intel}/gem_fenced_exec_thrash.c  |  0
 tests/{i915 => intel}/gem_flink_basic.c       |  0
 tests/{i915 => intel}/gem_flink_race.c        |  0
 tests/{i915 => intel}/gem_gpgpu_fill.c        |  0
 tests/{i915 => intel}/gem_gtt_cpu_tlb.c       |  0
 tests/{i915 => intel}/gem_gtt_hog.c           |  0
 tests/{i915 => intel}/gem_gtt_speed.c         |  0
 tests/{i915 => intel}/gem_huc_copy.c          |  0
 tests/{i915 => intel}/gem_linear_blits.c      |  0
 tests/{i915 => intel}/gem_lmem_evict.c        |  0
 tests/{i915 => intel}/gem_lmem_swapping.c     |  0
 tests/{i915 => intel}/gem_lut_handle.c        |  0
 tests/{i915 => intel}/gem_madvise.c           |  0
 tests/{i915 => intel}/gem_media_fill.c        |  0
 tests/{i915 => intel}/gem_media_vme.c         |  0
 tests/{i915 => intel}/gem_mmap.c              |  0
 tests/{i915 => intel}/gem_mmap_gtt.c          |  0
 tests/{i915 => intel}/gem_mmap_offset.c       |  0
 tests/{i915 => intel}/gem_mmap_wc.c           |  0
 .../gem_partial_pwrite_pread.c                |  0
 .../gem_pipe_control_store_loop.c             |  0
 tests/{i915 => intel}/gem_ppgtt.c             |  0
 tests/{i915 => intel}/gem_pread.c             |  0
 tests/{i915 => intel}/gem_pread_after_blit.c  |  0
 tests/{i915 => intel}/gem_pwrite.c            |  0
 tests/{i915 => intel}/gem_pwrite_snooped.c    |  0
 tests/{i915 => intel}/gem_pxp.c               |  0
 tests/{i915 => intel}/gem_read_read_speed.c   |  0
 tests/{i915 => intel}/gem_readwrite.c         |  0
 tests/{i915 => intel}/gem_reg_read.c          |  0
 tests/{i915 => intel}/gem_render_copy.c       |  0
 tests/{i915 => intel}/gem_render_copy_redux.c |  0
 .../{i915 => intel}/gem_render_linear_blits.c |  0
 .../{i915 => intel}/gem_render_tiled_blits.c  |  0
 tests/{i915 => intel}/gem_request_retire.c    |  0
 tests/{i915 => intel}/gem_reset_stats.c       |  0
 tests/{i915 => intel}/gem_ringfill.c          |  0
 tests/{i915 => intel}/gem_set_tiling_vs_blt.c |  0
 tests/{i915 => intel}/gem_set_tiling_vs_gtt.c |  0
 .../gem_set_tiling_vs_pwrite.c                |  0
 tests/{i915 => intel}/gem_shrink.c            |  0
 tests/{i915 => intel}/gem_softpin.c           |  0
 tests/{i915 => intel}/gem_spin_batch.c        |  0
 tests/{i915 => intel}/gem_streaming_writes.c  |  0
 tests/{i915 => intel}/gem_stress.c            |  0
 tests/{i915 => intel}/gem_sync.c              |  0
 tests/{i915 => intel}/gem_tiled_blits.c       |  0
 tests/{i915 => intel}/gem_tiled_fence_blits.c |  0
 .../gem_tiled_partial_pwrite_pread.c          |  0
 tests/{i915 => intel}/gem_tiled_pread_basic.c |  0
 .../{i915 => intel}/gem_tiled_pread_pwrite.c  |  0
 tests/{i915 => intel}/gem_tiled_swapping.c    |  0
 tests/{i915 => intel}/gem_tiled_wb.c          |  0
 tests/{i915 => intel}/gem_tiled_wc.c          |  0
 tests/{i915 => intel}/gem_tiling_max_stride.c |  0
 .../gem_unfence_active_buffers.c              |  0
 .../gem_unref_active_buffers.c                |  0
 tests/{i915 => intel}/gem_userptr_blits.c     |  0
 tests/{i915 => intel}/gem_vm_create.c         |  0
 tests/{i915 => intel}/gem_wait.c              |  0
 tests/{i915 => intel}/gem_watchdog.c          |  0
 tests/{i915 => intel}/gem_workarounds.c       |  0
 tests/{i915 => intel}/gen3_mixed_blits.c      |  0
 .../gen3_render_linear_blits.c                |  0
 .../{i915 => intel}/gen3_render_mixed_blits.c |  0
 .../gen3_render_tiledx_blits.c                |  0
 .../gen3_render_tiledy_blits.c                |  0
 tests/{i915 => intel}/gen7_exec_parse.c       |  0
 tests/{i915 => intel}/gen9_exec_parse.c       |  0
 tests/{i915 => intel}/i915_fb_tiling.c        |  0
 tests/{i915 => intel}/i915_getparams_basic.c  |  0
 tests/{i915 => intel}/i915_hangman.c          |  0
 tests/{i915 => intel}/i915_hwmon.c            |  0
 tests/{i915 => intel}/i915_module_load.c      |  0
 tests/{i915 => intel}/i915_pciid.c            |  0
 tests/{i915 => intel}/i915_pipe_stress.c      |  0
 tests/{i915 => intel}/i915_pm_backlight.c     |  0
 tests/{i915 => intel}/i915_pm_dc.c            |  0
 tests/{i915 => intel}/i915_pm_freq_api.c      |  0
 tests/{i915 => intel}/i915_pm_freq_mult.c     |  0
 tests/{i915 => intel}/i915_pm_lpsp.c          |  0
 tests/{i915 => intel}/i915_pm_rc6_residency.c |  0
 tests/{i915 => intel}/i915_pm_rpm.c           |  0
 tests/{i915 => intel}/i915_pm_rps.c           |  0
 tests/{i915 => intel}/i915_pm_sseu.c          |  0
 tests/{i915 => intel}/i915_power.c            |  0
 tests/{i915 => intel}/i915_query.c            |  0
 tests/{i915 => intel}/i915_selftest.c         |  0
 tests/{i915 => intel}/i915_suspend.c          |  0
 tests/{i915 => intel}/i915_test_config.json   |  0
 tests/{i915 => intel}/kms_big_fb.c            |  0
 tests/{i915 => intel}/kms_big_joiner.c        |  0
 tests/{i915 => intel}/kms_busy.c              |  0
 tests/{i915 => intel}/kms_ccs.c               |  0
 tests/{i915 => intel}/kms_cdclk.c             |  0
 tests/{i915 => intel}/kms_dirtyfb.c           |  0
 tests/{i915 => intel}/kms_draw_crc.c          |  0
 tests/{i915 => intel}/kms_dsc.c               |  0
 tests/{i915 => intel}/kms_dsc_helper.c        |  0
 tests/{i915 => intel}/kms_dsc_helper.h        |  0
 tests/{i915 => intel}/kms_fb_coherency.c      |  0
 tests/{i915 => intel}/kms_fbcon_fbt.c         |  0
 tests/{i915 => intel}/kms_fence_pin_leak.c    |  0
 tests/{i915 => intel}/kms_flip_scaled_crc.c   |  0
 tests/{i915 => intel}/kms_flip_tiling.c       |  0
 .../kms_frontbuffer_tracking.c                |  0
 tests/{i915 => intel}/kms_legacy_colorkey.c   |  0
 tests/{i915 => intel}/kms_mmap_write_crc.c    |  0
 tests/{i915 => intel}/kms_pipe_b_c_ivb.c      |  0
 tests/{i915 => intel}/kms_psr.c               |  0
 tests/{i915 => intel}/kms_psr2_sf.c           |  0
 tests/{i915 => intel}/kms_psr2_su.c           |  0
 tests/{i915 => intel}/kms_psr_stress_test.c   |  0
 tests/{i915 => intel}/kms_pwrite_crc.c        |  0
 tests/{i915 => intel}/kms_test_config.json    |  0
 tests/{i915 => intel}/perf.c                  |  0
 tests/{i915 => intel}/perf_pmu.c              |  0
 tests/{ => intel}/prime_busy.c                |  0
 tests/{ => intel}/prime_mmap.c                |  0
 tests/{ => intel}/prime_mmap_coherency.c      |  0
 tests/{ => intel}/prime_mmap_kms.c            |  0
 tests/{ => intel}/prime_self_import.c         |  0
 tests/{i915 => intel}/sysfs_defaults.c        |  0
 .../sysfs_heartbeat_interval.c                |  0
 tests/{i915 => intel}/sysfs_preempt_timeout.c |  0
 .../sysfs_timeslice_duration.c                |  0
 tests/{xe => intel}/xe_ccs.c                  |  0
 tests/{xe => intel}/xe_compute.c              |  0
 tests/{xe => intel}/xe_create.c               |  0
 tests/{xe => intel}/xe_debugfs.c              |  0
 tests/{xe => intel}/xe_dma_buf_sync.c         |  0
 tests/{xe => intel}/xe_evict.c                |  0
 tests/{xe => intel}/xe_exec_balancer.c        |  0
 tests/{xe => intel}/xe_exec_basic.c           |  0
 tests/{xe => intel}/xe_exec_compute_mode.c    |  0
 tests/{xe => intel}/xe_exec_fault_mode.c      |  0
 tests/{xe => intel}/xe_exec_reset.c           |  0
 tests/{xe => intel}/xe_exec_store.c           |  0
 tests/{xe => intel}/xe_exec_threads.c         |  0
 tests/{xe => intel}/xe_exercise_blt.c         |  0
 tests/{xe => intel}/xe_gpgpu_fill.c           |  0
 tests/{xe => intel}/xe_guc_pc.c               |  0
 tests/{xe => intel}/xe_huc_copy.c             |  0
 tests/{xe => intel}/xe_intel_bb.c             |  0
 tests/{xe => intel}/xe_live_ktest.c           |  0
 tests/{xe => intel}/xe_media_fill.c           |  0
 tests/{xe => intel}/xe_mmap.c                 |  0
 tests/{xe => intel}/xe_mmio.c                 |  0
 tests/{xe => intel}/xe_module_load.c          |  0
 tests/{xe => intel}/xe_noexec_ping_pong.c     |  0
 tests/{xe => intel}/xe_pm.c                   |  0
 tests/{xe => intel}/xe_pm_residency.c         |  0
 tests/{xe => intel}/xe_prime_self_import.c    |  0
 tests/{xe => intel}/xe_query.c                |  0
 tests/{xe => intel}/xe_spin_batch.c           |  0
 tests/{xe => intel}/xe_sysfs_defaults.c       |  0
 tests/{xe => intel}/xe_sysfs_scheduler.c      |  0
 tests/{xe => intel}/xe_sysfs_tile.c           |  0
 tests/{xe => intel}/xe_test_config.json       |  0
 tests/{xe => intel}/xe_uevent.c               |  0
 tests/{xe => intel}/xe_vm.c                   |  0
 tests/{xe => intel}/xe_waitfence.c            |  0
 tests/meson.build                             | 28 +++++++++----------
 222 files changed, 17 insertions(+), 17 deletions(-)
 rename tests/{i915 => intel}/api_intel_allocator.c (100%)
 rename tests/{i915 => intel}/api_intel_bb.c (100%)
 rename tests/{ => intel}/debugfs_test.c (100%)
 rename tests/{i915 => intel}/drm_fdinfo.c (100%)
 rename tests/{i915 => intel}/gem_bad_reloc.c (100%)
 rename tests/{i915 => intel}/gem_barrier_race.c (100%)
 rename tests/{i915 => intel}/gem_basic.c (100%)
 rename tests/{i915 => intel}/gem_blits.c (100%)
 rename tests/{i915 => intel}/gem_busy.c (100%)
 rename tests/{i915 => intel}/gem_caching.c (100%)
 rename tests/{i915 => intel}/gem_ccs.c (100%)
 rename tests/{i915 => intel}/gem_close.c (100%)
 rename tests/{i915 => intel}/gem_close_race.c (100%)
 rename tests/{i915 => intel}/gem_concurrent_all.c (100%)
 rename tests/{i915 => intel}/gem_concurrent_blit.c (100%)
 rename tests/{i915 => intel}/gem_create.c (100%)
 rename tests/{i915 => intel}/gem_cs_tlb.c (100%)
 rename tests/{i915 => intel}/gem_ctx_bad_destroy.c (100%)
 rename tests/{i915 => intel}/gem_ctx_create.c (100%)
 rename tests/{i915 => intel}/gem_ctx_engines.c (100%)
 rename tests/{i915 => intel}/gem_ctx_exec.c (100%)
 rename tests/{i915 => intel}/gem_ctx_freq.c (100%)
 rename tests/{i915 => intel}/gem_ctx_isolation.c (100%)
 rename tests/{i915 => intel}/gem_ctx_param.c (100%)
 rename tests/{i915 => intel}/gem_ctx_persistence.c (100%)
 rename tests/{i915 => intel}/gem_ctx_shared.c (100%)
 rename tests/{i915 => intel}/gem_ctx_sseu.c (100%)
 rename tests/{i915 => intel}/gem_ctx_switch.c (100%)
 rename tests/{i915 => intel}/gem_eio.c (100%)
 rename tests/{i915 => intel}/gem_evict_alignment.c (100%)
 rename tests/{i915 => intel}/gem_evict_everything.c (100%)
 rename tests/{i915 => intel}/gem_exec_alignment.c (100%)
 rename tests/{i915 => intel}/gem_exec_async.c (100%)
 rename tests/{i915 => intel}/gem_exec_await.c (100%)
 rename tests/{i915 => intel}/gem_exec_balancer.c (100%)
 rename tests/{i915 => intel}/gem_exec_basic.c (100%)
 rename tests/{i915 => intel}/gem_exec_big.c (100%)
 rename tests/{i915 => intel}/gem_exec_capture.c (100%)
 rename tests/{i915 => intel}/gem_exec_create.c (100%)
 rename tests/{i915 => intel}/gem_exec_endless.c (100%)
 rename tests/{i915 => intel}/gem_exec_fair.c (100%)
 rename tests/{i915 => intel}/gem_exec_fence.c (100%)
 rename tests/{i915 => intel}/gem_exec_flush.c (100%)
 rename tests/{i915 => intel}/gem_exec_gttfill.c (100%)
 rename tests/{i915 => intel}/gem_exec_latency.c (100%)
 rename tests/{i915 => intel}/gem_exec_lut_handle.c (100%)
 rename tests/{i915 => intel}/gem_exec_nop.c (100%)
 rename tests/{i915 => intel}/gem_exec_parallel.c (100%)
 rename tests/{i915 => intel}/gem_exec_params.c (100%)
 rename tests/{i915 => intel}/gem_exec_reloc.c (100%)
 rename tests/{i915 => intel}/gem_exec_schedule.c (100%)
 rename tests/{i915 => intel}/gem_exec_store.c (100%)
 rename tests/{i915 => intel}/gem_exec_suspend.c (100%)
 rename tests/{i915 => intel}/gem_exec_whisper.c (100%)
 rename tests/{i915 => intel}/gem_exercise_blt.c (100%)
 rename tests/{i915 => intel}/gem_fd_exhaustion.c (100%)
 rename tests/{i915 => intel}/gem_fence_thrash.c (100%)
 rename tests/{i915 => intel}/gem_fence_upload.c (100%)
 rename tests/{i915 => intel}/gem_fenced_exec_thrash.c (100%)
 rename tests/{i915 => intel}/gem_flink_basic.c (100%)
 rename tests/{i915 => intel}/gem_flink_race.c (100%)
 rename tests/{i915 => intel}/gem_gpgpu_fill.c (100%)
 rename tests/{i915 => intel}/gem_gtt_cpu_tlb.c (100%)
 rename tests/{i915 => intel}/gem_gtt_hog.c (100%)
 rename tests/{i915 => intel}/gem_gtt_speed.c (100%)
 rename tests/{i915 => intel}/gem_huc_copy.c (100%)
 rename tests/{i915 => intel}/gem_linear_blits.c (100%)
 rename tests/{i915 => intel}/gem_lmem_evict.c (100%)
 rename tests/{i915 => intel}/gem_lmem_swapping.c (100%)
 rename tests/{i915 => intel}/gem_lut_handle.c (100%)
 rename tests/{i915 => intel}/gem_madvise.c (100%)
 rename tests/{i915 => intel}/gem_media_fill.c (100%)
 rename tests/{i915 => intel}/gem_media_vme.c (100%)
 rename tests/{i915 => intel}/gem_mmap.c (100%)
 rename tests/{i915 => intel}/gem_mmap_gtt.c (100%)
 rename tests/{i915 => intel}/gem_mmap_offset.c (100%)
 rename tests/{i915 => intel}/gem_mmap_wc.c (100%)
 rename tests/{i915 => intel}/gem_partial_pwrite_pread.c (100%)
 rename tests/{i915 => intel}/gem_pipe_control_store_loop.c (100%)
 rename tests/{i915 => intel}/gem_ppgtt.c (100%)
 rename tests/{i915 => intel}/gem_pread.c (100%)
 rename tests/{i915 => intel}/gem_pread_after_blit.c (100%)
 rename tests/{i915 => intel}/gem_pwrite.c (100%)
 rename tests/{i915 => intel}/gem_pwrite_snooped.c (100%)
 rename tests/{i915 => intel}/gem_pxp.c (100%)
 rename tests/{i915 => intel}/gem_read_read_speed.c (100%)
 rename tests/{i915 => intel}/gem_readwrite.c (100%)
 rename tests/{i915 => intel}/gem_reg_read.c (100%)
 rename tests/{i915 => intel}/gem_render_copy.c (100%)
 rename tests/{i915 => intel}/gem_render_copy_redux.c (100%)
 rename tests/{i915 => intel}/gem_render_linear_blits.c (100%)
 rename tests/{i915 => intel}/gem_render_tiled_blits.c (100%)
 rename tests/{i915 => intel}/gem_request_retire.c (100%)
 rename tests/{i915 => intel}/gem_reset_stats.c (100%)
 rename tests/{i915 => intel}/gem_ringfill.c (100%)
 rename tests/{i915 => intel}/gem_set_tiling_vs_blt.c (100%)
 rename tests/{i915 => intel}/gem_set_tiling_vs_gtt.c (100%)
 rename tests/{i915 => intel}/gem_set_tiling_vs_pwrite.c (100%)
 rename tests/{i915 => intel}/gem_shrink.c (100%)
 rename tests/{i915 => intel}/gem_softpin.c (100%)
 rename tests/{i915 => intel}/gem_spin_batch.c (100%)
 rename tests/{i915 => intel}/gem_streaming_writes.c (100%)
 rename tests/{i915 => intel}/gem_stress.c (100%)
 rename tests/{i915 => intel}/gem_sync.c (100%)
 rename tests/{i915 => intel}/gem_tiled_blits.c (100%)
 rename tests/{i915 => intel}/gem_tiled_fence_blits.c (100%)
 rename tests/{i915 => intel}/gem_tiled_partial_pwrite_pread.c (100%)
 rename tests/{i915 => intel}/gem_tiled_pread_basic.c (100%)
 rename tests/{i915 => intel}/gem_tiled_pread_pwrite.c (100%)
 rename tests/{i915 => intel}/gem_tiled_swapping.c (100%)
 rename tests/{i915 => intel}/gem_tiled_wb.c (100%)
 rename tests/{i915 => intel}/gem_tiled_wc.c (100%)
 rename tests/{i915 => intel}/gem_tiling_max_stride.c (100%)
 rename tests/{i915 => intel}/gem_unfence_active_buffers.c (100%)
 rename tests/{i915 => intel}/gem_unref_active_buffers.c (100%)
 rename tests/{i915 => intel}/gem_userptr_blits.c (100%)
 rename tests/{i915 => intel}/gem_vm_create.c (100%)
 rename tests/{i915 => intel}/gem_wait.c (100%)
 rename tests/{i915 => intel}/gem_watchdog.c (100%)
 rename tests/{i915 => intel}/gem_workarounds.c (100%)
 rename tests/{i915 => intel}/gen3_mixed_blits.c (100%)
 rename tests/{i915 => intel}/gen3_render_linear_blits.c (100%)
 rename tests/{i915 => intel}/gen3_render_mixed_blits.c (100%)
 rename tests/{i915 => intel}/gen3_render_tiledx_blits.c (100%)
 rename tests/{i915 => intel}/gen3_render_tiledy_blits.c (100%)
 rename tests/{i915 => intel}/gen7_exec_parse.c (100%)
 rename tests/{i915 => intel}/gen9_exec_parse.c (100%)
 rename tests/{i915 => intel}/i915_fb_tiling.c (100%)
 rename tests/{i915 => intel}/i915_getparams_basic.c (100%)
 rename tests/{i915 => intel}/i915_hangman.c (100%)
 rename tests/{i915 => intel}/i915_hwmon.c (100%)
 rename tests/{i915 => intel}/i915_module_load.c (100%)
 rename tests/{i915 => intel}/i915_pciid.c (100%)
 rename tests/{i915 => intel}/i915_pipe_stress.c (100%)
 rename tests/{i915 => intel}/i915_pm_backlight.c (100%)
 rename tests/{i915 => intel}/i915_pm_dc.c (100%)
 rename tests/{i915 => intel}/i915_pm_freq_api.c (100%)
 rename tests/{i915 => intel}/i915_pm_freq_mult.c (100%)
 rename tests/{i915 => intel}/i915_pm_lpsp.c (100%)
 rename tests/{i915 => intel}/i915_pm_rc6_residency.c (100%)
 rename tests/{i915 => intel}/i915_pm_rpm.c (100%)
 rename tests/{i915 => intel}/i915_pm_rps.c (100%)
 rename tests/{i915 => intel}/i915_pm_sseu.c (100%)
 rename tests/{i915 => intel}/i915_power.c (100%)
 rename tests/{i915 => intel}/i915_query.c (100%)
 rename tests/{i915 => intel}/i915_selftest.c (100%)
 rename tests/{i915 => intel}/i915_suspend.c (100%)
 rename tests/{i915 => intel}/i915_test_config.json (100%)
 rename tests/{i915 => intel}/kms_big_fb.c (100%)
 rename tests/{i915 => intel}/kms_big_joiner.c (100%)
 rename tests/{i915 => intel}/kms_busy.c (100%)
 rename tests/{i915 => intel}/kms_ccs.c (100%)
 rename tests/{i915 => intel}/kms_cdclk.c (100%)
 rename tests/{i915 => intel}/kms_dirtyfb.c (100%)
 rename tests/{i915 => intel}/kms_draw_crc.c (100%)
 rename tests/{i915 => intel}/kms_dsc.c (100%)
 rename tests/{i915 => intel}/kms_dsc_helper.c (100%)
 rename tests/{i915 => intel}/kms_dsc_helper.h (100%)
 rename tests/{i915 => intel}/kms_fb_coherency.c (100%)
 rename tests/{i915 => intel}/kms_fbcon_fbt.c (100%)
 rename tests/{i915 => intel}/kms_fence_pin_leak.c (100%)
 rename tests/{i915 => intel}/kms_flip_scaled_crc.c (100%)
 rename tests/{i915 => intel}/kms_flip_tiling.c (100%)
 rename tests/{i915 => intel}/kms_frontbuffer_tracking.c (100%)
 rename tests/{i915 => intel}/kms_legacy_colorkey.c (100%)
 rename tests/{i915 => intel}/kms_mmap_write_crc.c (100%)
 rename tests/{i915 => intel}/kms_pipe_b_c_ivb.c (100%)
 rename tests/{i915 => intel}/kms_psr.c (100%)
 rename tests/{i915 => intel}/kms_psr2_sf.c (100%)
 rename tests/{i915 => intel}/kms_psr2_su.c (100%)
 rename tests/{i915 => intel}/kms_psr_stress_test.c (100%)
 rename tests/{i915 => intel}/kms_pwrite_crc.c (100%)
 rename tests/{i915 => intel}/kms_test_config.json (100%)
 rename tests/{i915 => intel}/perf.c (100%)
 rename tests/{i915 => intel}/perf_pmu.c (100%)
 rename tests/{ => intel}/prime_busy.c (100%)
 rename tests/{ => intel}/prime_mmap.c (100%)
 rename tests/{ => intel}/prime_mmap_coherency.c (100%)
 rename tests/{ => intel}/prime_mmap_kms.c (100%)
 rename tests/{ => intel}/prime_self_import.c (100%)
 rename tests/{i915 => intel}/sysfs_defaults.c (100%)
 rename tests/{i915 => intel}/sysfs_heartbeat_interval.c (100%)
 rename tests/{i915 => intel}/sysfs_preempt_timeout.c (100%)
 rename tests/{i915 => intel}/sysfs_timeslice_duration.c (100%)
 rename tests/{xe => intel}/xe_ccs.c (100%)
 rename tests/{xe => intel}/xe_compute.c (100%)
 rename tests/{xe => intel}/xe_create.c (100%)
 rename tests/{xe => intel}/xe_debugfs.c (100%)
 rename tests/{xe => intel}/xe_dma_buf_sync.c (100%)
 rename tests/{xe => intel}/xe_evict.c (100%)
 rename tests/{xe => intel}/xe_exec_balancer.c (100%)
 rename tests/{xe => intel}/xe_exec_basic.c (100%)
 rename tests/{xe => intel}/xe_exec_compute_mode.c (100%)
 rename tests/{xe => intel}/xe_exec_fault_mode.c (100%)
 rename tests/{xe => intel}/xe_exec_reset.c (100%)
 rename tests/{xe => intel}/xe_exec_store.c (100%)
 rename tests/{xe => intel}/xe_exec_threads.c (100%)
 rename tests/{xe => intel}/xe_exercise_blt.c (100%)
 rename tests/{xe => intel}/xe_gpgpu_fill.c (100%)
 rename tests/{xe => intel}/xe_guc_pc.c (100%)
 rename tests/{xe => intel}/xe_huc_copy.c (100%)
 rename tests/{xe => intel}/xe_intel_bb.c (100%)
 rename tests/{xe => intel}/xe_live_ktest.c (100%)
 rename tests/{xe => intel}/xe_media_fill.c (100%)
 rename tests/{xe => intel}/xe_mmap.c (100%)
 rename tests/{xe => intel}/xe_mmio.c (100%)
 rename tests/{xe => intel}/xe_module_load.c (100%)
 rename tests/{xe => intel}/xe_noexec_ping_pong.c (100%)
 rename tests/{xe => intel}/xe_pm.c (100%)
 rename tests/{xe => intel}/xe_pm_residency.c (100%)
 rename tests/{xe => intel}/xe_prime_self_import.c (100%)
 rename tests/{xe => intel}/xe_query.c (100%)
 rename tests/{xe => intel}/xe_spin_batch.c (100%)
 rename tests/{xe => intel}/xe_sysfs_defaults.c (100%)
 rename tests/{xe => intel}/xe_sysfs_scheduler.c (100%)
 rename tests/{xe => intel}/xe_sysfs_tile.c (100%)
 rename tests/{xe => intel}/xe_test_config.json (100%)
 rename tests/{xe => intel}/xe_uevent.c (100%)
 rename tests/{xe => intel}/xe_vm.c (100%)
 rename tests/{xe => intel}/xe_waitfence.c (100%)

diff --git a/docs/testplan/meson.build b/docs/testplan/meson.build
index 8d3ad952d..85f0cb4d6 100644
--- a/docs/testplan/meson.build
+++ b/docs/testplan/meson.build
@@ -6,9 +6,9 @@ rst2pdf = find_program('rst2pdf', required: false)
 
 stylesheet = join_paths(meson.current_source_dir(), 'testplan.css')
 
-xe_test_config = join_paths(source_root, 'tests', 'xe', 'xe_test_config.json')
-kms_test_config = join_paths(source_root, 'tests', 'i915', 'kms_test_config.json')
-i915_test_config = join_paths(source_root, 'tests', 'i915', 'i915_test_config.json')
+xe_test_config = join_paths(source_root, 'tests', 'intel', 'xe_test_config.json')
+kms_test_config = join_paths(source_root, 'tests', 'intel', 'kms_test_config.json')
+i915_test_config = join_paths(source_root, 'tests', 'intel', 'i915_test_config.json')
 
 check_testlist = []
 if build_tests
diff --git a/tests/i915/api_intel_allocator.c b/tests/intel/api_intel_allocator.c
similarity index 100%
rename from tests/i915/api_intel_allocator.c
rename to tests/intel/api_intel_allocator.c
diff --git a/tests/i915/api_intel_bb.c b/tests/intel/api_intel_bb.c
similarity index 100%
rename from tests/i915/api_intel_bb.c
rename to tests/intel/api_intel_bb.c
diff --git a/tests/debugfs_test.c b/tests/intel/debugfs_test.c
similarity index 100%
rename from tests/debugfs_test.c
rename to tests/intel/debugfs_test.c
diff --git a/tests/i915/drm_fdinfo.c b/tests/intel/drm_fdinfo.c
similarity index 100%
rename from tests/i915/drm_fdinfo.c
rename to tests/intel/drm_fdinfo.c
diff --git a/tests/i915/gem_bad_reloc.c b/tests/intel/gem_bad_reloc.c
similarity index 100%
rename from tests/i915/gem_bad_reloc.c
rename to tests/intel/gem_bad_reloc.c
diff --git a/tests/i915/gem_barrier_race.c b/tests/intel/gem_barrier_race.c
similarity index 100%
rename from tests/i915/gem_barrier_race.c
rename to tests/intel/gem_barrier_race.c
diff --git a/tests/i915/gem_basic.c b/tests/intel/gem_basic.c
similarity index 100%
rename from tests/i915/gem_basic.c
rename to tests/intel/gem_basic.c
diff --git a/tests/i915/gem_blits.c b/tests/intel/gem_blits.c
similarity index 100%
rename from tests/i915/gem_blits.c
rename to tests/intel/gem_blits.c
diff --git a/tests/i915/gem_busy.c b/tests/intel/gem_busy.c
similarity index 100%
rename from tests/i915/gem_busy.c
rename to tests/intel/gem_busy.c
diff --git a/tests/i915/gem_caching.c b/tests/intel/gem_caching.c
similarity index 100%
rename from tests/i915/gem_caching.c
rename to tests/intel/gem_caching.c
diff --git a/tests/i915/gem_ccs.c b/tests/intel/gem_ccs.c
similarity index 100%
rename from tests/i915/gem_ccs.c
rename to tests/intel/gem_ccs.c
diff --git a/tests/i915/gem_close.c b/tests/intel/gem_close.c
similarity index 100%
rename from tests/i915/gem_close.c
rename to tests/intel/gem_close.c
diff --git a/tests/i915/gem_close_race.c b/tests/intel/gem_close_race.c
similarity index 100%
rename from tests/i915/gem_close_race.c
rename to tests/intel/gem_close_race.c
diff --git a/tests/i915/gem_concurrent_all.c b/tests/intel/gem_concurrent_all.c
similarity index 100%
rename from tests/i915/gem_concurrent_all.c
rename to tests/intel/gem_concurrent_all.c
diff --git a/tests/i915/gem_concurrent_blit.c b/tests/intel/gem_concurrent_blit.c
similarity index 100%
rename from tests/i915/gem_concurrent_blit.c
rename to tests/intel/gem_concurrent_blit.c
diff --git a/tests/i915/gem_create.c b/tests/intel/gem_create.c
similarity index 100%
rename from tests/i915/gem_create.c
rename to tests/intel/gem_create.c
diff --git a/tests/i915/gem_cs_tlb.c b/tests/intel/gem_cs_tlb.c
similarity index 100%
rename from tests/i915/gem_cs_tlb.c
rename to tests/intel/gem_cs_tlb.c
diff --git a/tests/i915/gem_ctx_bad_destroy.c b/tests/intel/gem_ctx_bad_destroy.c
similarity index 100%
rename from tests/i915/gem_ctx_bad_destroy.c
rename to tests/intel/gem_ctx_bad_destroy.c
diff --git a/tests/i915/gem_ctx_create.c b/tests/intel/gem_ctx_create.c
similarity index 100%
rename from tests/i915/gem_ctx_create.c
rename to tests/intel/gem_ctx_create.c
diff --git a/tests/i915/gem_ctx_engines.c b/tests/intel/gem_ctx_engines.c
similarity index 100%
rename from tests/i915/gem_ctx_engines.c
rename to tests/intel/gem_ctx_engines.c
diff --git a/tests/i915/gem_ctx_exec.c b/tests/intel/gem_ctx_exec.c
similarity index 100%
rename from tests/i915/gem_ctx_exec.c
rename to tests/intel/gem_ctx_exec.c
diff --git a/tests/i915/gem_ctx_freq.c b/tests/intel/gem_ctx_freq.c
similarity index 100%
rename from tests/i915/gem_ctx_freq.c
rename to tests/intel/gem_ctx_freq.c
diff --git a/tests/i915/gem_ctx_isolation.c b/tests/intel/gem_ctx_isolation.c
similarity index 100%
rename from tests/i915/gem_ctx_isolation.c
rename to tests/intel/gem_ctx_isolation.c
diff --git a/tests/i915/gem_ctx_param.c b/tests/intel/gem_ctx_param.c
similarity index 100%
rename from tests/i915/gem_ctx_param.c
rename to tests/intel/gem_ctx_param.c
diff --git a/tests/i915/gem_ctx_persistence.c b/tests/intel/gem_ctx_persistence.c
similarity index 100%
rename from tests/i915/gem_ctx_persistence.c
rename to tests/intel/gem_ctx_persistence.c
diff --git a/tests/i915/gem_ctx_shared.c b/tests/intel/gem_ctx_shared.c
similarity index 100%
rename from tests/i915/gem_ctx_shared.c
rename to tests/intel/gem_ctx_shared.c
diff --git a/tests/i915/gem_ctx_sseu.c b/tests/intel/gem_ctx_sseu.c
similarity index 100%
rename from tests/i915/gem_ctx_sseu.c
rename to tests/intel/gem_ctx_sseu.c
diff --git a/tests/i915/gem_ctx_switch.c b/tests/intel/gem_ctx_switch.c
similarity index 100%
rename from tests/i915/gem_ctx_switch.c
rename to tests/intel/gem_ctx_switch.c
diff --git a/tests/i915/gem_eio.c b/tests/intel/gem_eio.c
similarity index 100%
rename from tests/i915/gem_eio.c
rename to tests/intel/gem_eio.c
diff --git a/tests/i915/gem_evict_alignment.c b/tests/intel/gem_evict_alignment.c
similarity index 100%
rename from tests/i915/gem_evict_alignment.c
rename to tests/intel/gem_evict_alignment.c
diff --git a/tests/i915/gem_evict_everything.c b/tests/intel/gem_evict_everything.c
similarity index 100%
rename from tests/i915/gem_evict_everything.c
rename to tests/intel/gem_evict_everything.c
diff --git a/tests/i915/gem_exec_alignment.c b/tests/intel/gem_exec_alignment.c
similarity index 100%
rename from tests/i915/gem_exec_alignment.c
rename to tests/intel/gem_exec_alignment.c
diff --git a/tests/i915/gem_exec_async.c b/tests/intel/gem_exec_async.c
similarity index 100%
rename from tests/i915/gem_exec_async.c
rename to tests/intel/gem_exec_async.c
diff --git a/tests/i915/gem_exec_await.c b/tests/intel/gem_exec_await.c
similarity index 100%
rename from tests/i915/gem_exec_await.c
rename to tests/intel/gem_exec_await.c
diff --git a/tests/i915/gem_exec_balancer.c b/tests/intel/gem_exec_balancer.c
similarity index 100%
rename from tests/i915/gem_exec_balancer.c
rename to tests/intel/gem_exec_balancer.c
diff --git a/tests/i915/gem_exec_basic.c b/tests/intel/gem_exec_basic.c
similarity index 100%
rename from tests/i915/gem_exec_basic.c
rename to tests/intel/gem_exec_basic.c
diff --git a/tests/i915/gem_exec_big.c b/tests/intel/gem_exec_big.c
similarity index 100%
rename from tests/i915/gem_exec_big.c
rename to tests/intel/gem_exec_big.c
diff --git a/tests/i915/gem_exec_capture.c b/tests/intel/gem_exec_capture.c
similarity index 100%
rename from tests/i915/gem_exec_capture.c
rename to tests/intel/gem_exec_capture.c
diff --git a/tests/i915/gem_exec_create.c b/tests/intel/gem_exec_create.c
similarity index 100%
rename from tests/i915/gem_exec_create.c
rename to tests/intel/gem_exec_create.c
diff --git a/tests/i915/gem_exec_endless.c b/tests/intel/gem_exec_endless.c
similarity index 100%
rename from tests/i915/gem_exec_endless.c
rename to tests/intel/gem_exec_endless.c
diff --git a/tests/i915/gem_exec_fair.c b/tests/intel/gem_exec_fair.c
similarity index 100%
rename from tests/i915/gem_exec_fair.c
rename to tests/intel/gem_exec_fair.c
diff --git a/tests/i915/gem_exec_fence.c b/tests/intel/gem_exec_fence.c
similarity index 100%
rename from tests/i915/gem_exec_fence.c
rename to tests/intel/gem_exec_fence.c
diff --git a/tests/i915/gem_exec_flush.c b/tests/intel/gem_exec_flush.c
similarity index 100%
rename from tests/i915/gem_exec_flush.c
rename to tests/intel/gem_exec_flush.c
diff --git a/tests/i915/gem_exec_gttfill.c b/tests/intel/gem_exec_gttfill.c
similarity index 100%
rename from tests/i915/gem_exec_gttfill.c
rename to tests/intel/gem_exec_gttfill.c
diff --git a/tests/i915/gem_exec_latency.c b/tests/intel/gem_exec_latency.c
similarity index 100%
rename from tests/i915/gem_exec_latency.c
rename to tests/intel/gem_exec_latency.c
diff --git a/tests/i915/gem_exec_lut_handle.c b/tests/intel/gem_exec_lut_handle.c
similarity index 100%
rename from tests/i915/gem_exec_lut_handle.c
rename to tests/intel/gem_exec_lut_handle.c
diff --git a/tests/i915/gem_exec_nop.c b/tests/intel/gem_exec_nop.c
similarity index 100%
rename from tests/i915/gem_exec_nop.c
rename to tests/intel/gem_exec_nop.c
diff --git a/tests/i915/gem_exec_parallel.c b/tests/intel/gem_exec_parallel.c
similarity index 100%
rename from tests/i915/gem_exec_parallel.c
rename to tests/intel/gem_exec_parallel.c
diff --git a/tests/i915/gem_exec_params.c b/tests/intel/gem_exec_params.c
similarity index 100%
rename from tests/i915/gem_exec_params.c
rename to tests/intel/gem_exec_params.c
diff --git a/tests/i915/gem_exec_reloc.c b/tests/intel/gem_exec_reloc.c
similarity index 100%
rename from tests/i915/gem_exec_reloc.c
rename to tests/intel/gem_exec_reloc.c
diff --git a/tests/i915/gem_exec_schedule.c b/tests/intel/gem_exec_schedule.c
similarity index 100%
rename from tests/i915/gem_exec_schedule.c
rename to tests/intel/gem_exec_schedule.c
diff --git a/tests/i915/gem_exec_store.c b/tests/intel/gem_exec_store.c
similarity index 100%
rename from tests/i915/gem_exec_store.c
rename to tests/intel/gem_exec_store.c
diff --git a/tests/i915/gem_exec_suspend.c b/tests/intel/gem_exec_suspend.c
similarity index 100%
rename from tests/i915/gem_exec_suspend.c
rename to tests/intel/gem_exec_suspend.c
diff --git a/tests/i915/gem_exec_whisper.c b/tests/intel/gem_exec_whisper.c
similarity index 100%
rename from tests/i915/gem_exec_whisper.c
rename to tests/intel/gem_exec_whisper.c
diff --git a/tests/i915/gem_exercise_blt.c b/tests/intel/gem_exercise_blt.c
similarity index 100%
rename from tests/i915/gem_exercise_blt.c
rename to tests/intel/gem_exercise_blt.c
diff --git a/tests/i915/gem_fd_exhaustion.c b/tests/intel/gem_fd_exhaustion.c
similarity index 100%
rename from tests/i915/gem_fd_exhaustion.c
rename to tests/intel/gem_fd_exhaustion.c
diff --git a/tests/i915/gem_fence_thrash.c b/tests/intel/gem_fence_thrash.c
similarity index 100%
rename from tests/i915/gem_fence_thrash.c
rename to tests/intel/gem_fence_thrash.c
diff --git a/tests/i915/gem_fence_upload.c b/tests/intel/gem_fence_upload.c
similarity index 100%
rename from tests/i915/gem_fence_upload.c
rename to tests/intel/gem_fence_upload.c
diff --git a/tests/i915/gem_fenced_exec_thrash.c b/tests/intel/gem_fenced_exec_thrash.c
similarity index 100%
rename from tests/i915/gem_fenced_exec_thrash.c
rename to tests/intel/gem_fenced_exec_thrash.c
diff --git a/tests/i915/gem_flink_basic.c b/tests/intel/gem_flink_basic.c
similarity index 100%
rename from tests/i915/gem_flink_basic.c
rename to tests/intel/gem_flink_basic.c
diff --git a/tests/i915/gem_flink_race.c b/tests/intel/gem_flink_race.c
similarity index 100%
rename from tests/i915/gem_flink_race.c
rename to tests/intel/gem_flink_race.c
diff --git a/tests/i915/gem_gpgpu_fill.c b/tests/intel/gem_gpgpu_fill.c
similarity index 100%
rename from tests/i915/gem_gpgpu_fill.c
rename to tests/intel/gem_gpgpu_fill.c
diff --git a/tests/i915/gem_gtt_cpu_tlb.c b/tests/intel/gem_gtt_cpu_tlb.c
similarity index 100%
rename from tests/i915/gem_gtt_cpu_tlb.c
rename to tests/intel/gem_gtt_cpu_tlb.c
diff --git a/tests/i915/gem_gtt_hog.c b/tests/intel/gem_gtt_hog.c
similarity index 100%
rename from tests/i915/gem_gtt_hog.c
rename to tests/intel/gem_gtt_hog.c
diff --git a/tests/i915/gem_gtt_speed.c b/tests/intel/gem_gtt_speed.c
similarity index 100%
rename from tests/i915/gem_gtt_speed.c
rename to tests/intel/gem_gtt_speed.c
diff --git a/tests/i915/gem_huc_copy.c b/tests/intel/gem_huc_copy.c
similarity index 100%
rename from tests/i915/gem_huc_copy.c
rename to tests/intel/gem_huc_copy.c
diff --git a/tests/i915/gem_linear_blits.c b/tests/intel/gem_linear_blits.c
similarity index 100%
rename from tests/i915/gem_linear_blits.c
rename to tests/intel/gem_linear_blits.c
diff --git a/tests/i915/gem_lmem_evict.c b/tests/intel/gem_lmem_evict.c
similarity index 100%
rename from tests/i915/gem_lmem_evict.c
rename to tests/intel/gem_lmem_evict.c
diff --git a/tests/i915/gem_lmem_swapping.c b/tests/intel/gem_lmem_swapping.c
similarity index 100%
rename from tests/i915/gem_lmem_swapping.c
rename to tests/intel/gem_lmem_swapping.c
diff --git a/tests/i915/gem_lut_handle.c b/tests/intel/gem_lut_handle.c
similarity index 100%
rename from tests/i915/gem_lut_handle.c
rename to tests/intel/gem_lut_handle.c
diff --git a/tests/i915/gem_madvise.c b/tests/intel/gem_madvise.c
similarity index 100%
rename from tests/i915/gem_madvise.c
rename to tests/intel/gem_madvise.c
diff --git a/tests/i915/gem_media_fill.c b/tests/intel/gem_media_fill.c
similarity index 100%
rename from tests/i915/gem_media_fill.c
rename to tests/intel/gem_media_fill.c
diff --git a/tests/i915/gem_media_vme.c b/tests/intel/gem_media_vme.c
similarity index 100%
rename from tests/i915/gem_media_vme.c
rename to tests/intel/gem_media_vme.c
diff --git a/tests/i915/gem_mmap.c b/tests/intel/gem_mmap.c
similarity index 100%
rename from tests/i915/gem_mmap.c
rename to tests/intel/gem_mmap.c
diff --git a/tests/i915/gem_mmap_gtt.c b/tests/intel/gem_mmap_gtt.c
similarity index 100%
rename from tests/i915/gem_mmap_gtt.c
rename to tests/intel/gem_mmap_gtt.c
diff --git a/tests/i915/gem_mmap_offset.c b/tests/intel/gem_mmap_offset.c
similarity index 100%
rename from tests/i915/gem_mmap_offset.c
rename to tests/intel/gem_mmap_offset.c
diff --git a/tests/i915/gem_mmap_wc.c b/tests/intel/gem_mmap_wc.c
similarity index 100%
rename from tests/i915/gem_mmap_wc.c
rename to tests/intel/gem_mmap_wc.c
diff --git a/tests/i915/gem_partial_pwrite_pread.c b/tests/intel/gem_partial_pwrite_pread.c
similarity index 100%
rename from tests/i915/gem_partial_pwrite_pread.c
rename to tests/intel/gem_partial_pwrite_pread.c
diff --git a/tests/i915/gem_pipe_control_store_loop.c b/tests/intel/gem_pipe_control_store_loop.c
similarity index 100%
rename from tests/i915/gem_pipe_control_store_loop.c
rename to tests/intel/gem_pipe_control_store_loop.c
diff --git a/tests/i915/gem_ppgtt.c b/tests/intel/gem_ppgtt.c
similarity index 100%
rename from tests/i915/gem_ppgtt.c
rename to tests/intel/gem_ppgtt.c
diff --git a/tests/i915/gem_pread.c b/tests/intel/gem_pread.c
similarity index 100%
rename from tests/i915/gem_pread.c
rename to tests/intel/gem_pread.c
diff --git a/tests/i915/gem_pread_after_blit.c b/tests/intel/gem_pread_after_blit.c
similarity index 100%
rename from tests/i915/gem_pread_after_blit.c
rename to tests/intel/gem_pread_after_blit.c
diff --git a/tests/i915/gem_pwrite.c b/tests/intel/gem_pwrite.c
similarity index 100%
rename from tests/i915/gem_pwrite.c
rename to tests/intel/gem_pwrite.c
diff --git a/tests/i915/gem_pwrite_snooped.c b/tests/intel/gem_pwrite_snooped.c
similarity index 100%
rename from tests/i915/gem_pwrite_snooped.c
rename to tests/intel/gem_pwrite_snooped.c
diff --git a/tests/i915/gem_pxp.c b/tests/intel/gem_pxp.c
similarity index 100%
rename from tests/i915/gem_pxp.c
rename to tests/intel/gem_pxp.c
diff --git a/tests/i915/gem_read_read_speed.c b/tests/intel/gem_read_read_speed.c
similarity index 100%
rename from tests/i915/gem_read_read_speed.c
rename to tests/intel/gem_read_read_speed.c
diff --git a/tests/i915/gem_readwrite.c b/tests/intel/gem_readwrite.c
similarity index 100%
rename from tests/i915/gem_readwrite.c
rename to tests/intel/gem_readwrite.c
diff --git a/tests/i915/gem_reg_read.c b/tests/intel/gem_reg_read.c
similarity index 100%
rename from tests/i915/gem_reg_read.c
rename to tests/intel/gem_reg_read.c
diff --git a/tests/i915/gem_render_copy.c b/tests/intel/gem_render_copy.c
similarity index 100%
rename from tests/i915/gem_render_copy.c
rename to tests/intel/gem_render_copy.c
diff --git a/tests/i915/gem_render_copy_redux.c b/tests/intel/gem_render_copy_redux.c
similarity index 100%
rename from tests/i915/gem_render_copy_redux.c
rename to tests/intel/gem_render_copy_redux.c
diff --git a/tests/i915/gem_render_linear_blits.c b/tests/intel/gem_render_linear_blits.c
similarity index 100%
rename from tests/i915/gem_render_linear_blits.c
rename to tests/intel/gem_render_linear_blits.c
diff --git a/tests/i915/gem_render_tiled_blits.c b/tests/intel/gem_render_tiled_blits.c
similarity index 100%
rename from tests/i915/gem_render_tiled_blits.c
rename to tests/intel/gem_render_tiled_blits.c
diff --git a/tests/i915/gem_request_retire.c b/tests/intel/gem_request_retire.c
similarity index 100%
rename from tests/i915/gem_request_retire.c
rename to tests/intel/gem_request_retire.c
diff --git a/tests/i915/gem_reset_stats.c b/tests/intel/gem_reset_stats.c
similarity index 100%
rename from tests/i915/gem_reset_stats.c
rename to tests/intel/gem_reset_stats.c
diff --git a/tests/i915/gem_ringfill.c b/tests/intel/gem_ringfill.c
similarity index 100%
rename from tests/i915/gem_ringfill.c
rename to tests/intel/gem_ringfill.c
diff --git a/tests/i915/gem_set_tiling_vs_blt.c b/tests/intel/gem_set_tiling_vs_blt.c
similarity index 100%
rename from tests/i915/gem_set_tiling_vs_blt.c
rename to tests/intel/gem_set_tiling_vs_blt.c
diff --git a/tests/i915/gem_set_tiling_vs_gtt.c b/tests/intel/gem_set_tiling_vs_gtt.c
similarity index 100%
rename from tests/i915/gem_set_tiling_vs_gtt.c
rename to tests/intel/gem_set_tiling_vs_gtt.c
diff --git a/tests/i915/gem_set_tiling_vs_pwrite.c b/tests/intel/gem_set_tiling_vs_pwrite.c
similarity index 100%
rename from tests/i915/gem_set_tiling_vs_pwrite.c
rename to tests/intel/gem_set_tiling_vs_pwrite.c
diff --git a/tests/i915/gem_shrink.c b/tests/intel/gem_shrink.c
similarity index 100%
rename from tests/i915/gem_shrink.c
rename to tests/intel/gem_shrink.c
diff --git a/tests/i915/gem_softpin.c b/tests/intel/gem_softpin.c
similarity index 100%
rename from tests/i915/gem_softpin.c
rename to tests/intel/gem_softpin.c
diff --git a/tests/i915/gem_spin_batch.c b/tests/intel/gem_spin_batch.c
similarity index 100%
rename from tests/i915/gem_spin_batch.c
rename to tests/intel/gem_spin_batch.c
diff --git a/tests/i915/gem_streaming_writes.c b/tests/intel/gem_streaming_writes.c
similarity index 100%
rename from tests/i915/gem_streaming_writes.c
rename to tests/intel/gem_streaming_writes.c
diff --git a/tests/i915/gem_stress.c b/tests/intel/gem_stress.c
similarity index 100%
rename from tests/i915/gem_stress.c
rename to tests/intel/gem_stress.c
diff --git a/tests/i915/gem_sync.c b/tests/intel/gem_sync.c
similarity index 100%
rename from tests/i915/gem_sync.c
rename to tests/intel/gem_sync.c
diff --git a/tests/i915/gem_tiled_blits.c b/tests/intel/gem_tiled_blits.c
similarity index 100%
rename from tests/i915/gem_tiled_blits.c
rename to tests/intel/gem_tiled_blits.c
diff --git a/tests/i915/gem_tiled_fence_blits.c b/tests/intel/gem_tiled_fence_blits.c
similarity index 100%
rename from tests/i915/gem_tiled_fence_blits.c
rename to tests/intel/gem_tiled_fence_blits.c
diff --git a/tests/i915/gem_tiled_partial_pwrite_pread.c b/tests/intel/gem_tiled_partial_pwrite_pread.c
similarity index 100%
rename from tests/i915/gem_tiled_partial_pwrite_pread.c
rename to tests/intel/gem_tiled_partial_pwrite_pread.c
diff --git a/tests/i915/gem_tiled_pread_basic.c b/tests/intel/gem_tiled_pread_basic.c
similarity index 100%
rename from tests/i915/gem_tiled_pread_basic.c
rename to tests/intel/gem_tiled_pread_basic.c
diff --git a/tests/i915/gem_tiled_pread_pwrite.c b/tests/intel/gem_tiled_pread_pwrite.c
similarity index 100%
rename from tests/i915/gem_tiled_pread_pwrite.c
rename to tests/intel/gem_tiled_pread_pwrite.c
diff --git a/tests/i915/gem_tiled_swapping.c b/tests/intel/gem_tiled_swapping.c
similarity index 100%
rename from tests/i915/gem_tiled_swapping.c
rename to tests/intel/gem_tiled_swapping.c
diff --git a/tests/i915/gem_tiled_wb.c b/tests/intel/gem_tiled_wb.c
similarity index 100%
rename from tests/i915/gem_tiled_wb.c
rename to tests/intel/gem_tiled_wb.c
diff --git a/tests/i915/gem_tiled_wc.c b/tests/intel/gem_tiled_wc.c
similarity index 100%
rename from tests/i915/gem_tiled_wc.c
rename to tests/intel/gem_tiled_wc.c
diff --git a/tests/i915/gem_tiling_max_stride.c b/tests/intel/gem_tiling_max_stride.c
similarity index 100%
rename from tests/i915/gem_tiling_max_stride.c
rename to tests/intel/gem_tiling_max_stride.c
diff --git a/tests/i915/gem_unfence_active_buffers.c b/tests/intel/gem_unfence_active_buffers.c
similarity index 100%
rename from tests/i915/gem_unfence_active_buffers.c
rename to tests/intel/gem_unfence_active_buffers.c
diff --git a/tests/i915/gem_unref_active_buffers.c b/tests/intel/gem_unref_active_buffers.c
similarity index 100%
rename from tests/i915/gem_unref_active_buffers.c
rename to tests/intel/gem_unref_active_buffers.c
diff --git a/tests/i915/gem_userptr_blits.c b/tests/intel/gem_userptr_blits.c
similarity index 100%
rename from tests/i915/gem_userptr_blits.c
rename to tests/intel/gem_userptr_blits.c
diff --git a/tests/i915/gem_vm_create.c b/tests/intel/gem_vm_create.c
similarity index 100%
rename from tests/i915/gem_vm_create.c
rename to tests/intel/gem_vm_create.c
diff --git a/tests/i915/gem_wait.c b/tests/intel/gem_wait.c
similarity index 100%
rename from tests/i915/gem_wait.c
rename to tests/intel/gem_wait.c
diff --git a/tests/i915/gem_watchdog.c b/tests/intel/gem_watchdog.c
similarity index 100%
rename from tests/i915/gem_watchdog.c
rename to tests/intel/gem_watchdog.c
diff --git a/tests/i915/gem_workarounds.c b/tests/intel/gem_workarounds.c
similarity index 100%
rename from tests/i915/gem_workarounds.c
rename to tests/intel/gem_workarounds.c
diff --git a/tests/i915/gen3_mixed_blits.c b/tests/intel/gen3_mixed_blits.c
similarity index 100%
rename from tests/i915/gen3_mixed_blits.c
rename to tests/intel/gen3_mixed_blits.c
diff --git a/tests/i915/gen3_render_linear_blits.c b/tests/intel/gen3_render_linear_blits.c
similarity index 100%
rename from tests/i915/gen3_render_linear_blits.c
rename to tests/intel/gen3_render_linear_blits.c
diff --git a/tests/i915/gen3_render_mixed_blits.c b/tests/intel/gen3_render_mixed_blits.c
similarity index 100%
rename from tests/i915/gen3_render_mixed_blits.c
rename to tests/intel/gen3_render_mixed_blits.c
diff --git a/tests/i915/gen3_render_tiledx_blits.c b/tests/intel/gen3_render_tiledx_blits.c
similarity index 100%
rename from tests/i915/gen3_render_tiledx_blits.c
rename to tests/intel/gen3_render_tiledx_blits.c
diff --git a/tests/i915/gen3_render_tiledy_blits.c b/tests/intel/gen3_render_tiledy_blits.c
similarity index 100%
rename from tests/i915/gen3_render_tiledy_blits.c
rename to tests/intel/gen3_render_tiledy_blits.c
diff --git a/tests/i915/gen7_exec_parse.c b/tests/intel/gen7_exec_parse.c
similarity index 100%
rename from tests/i915/gen7_exec_parse.c
rename to tests/intel/gen7_exec_parse.c
diff --git a/tests/i915/gen9_exec_parse.c b/tests/intel/gen9_exec_parse.c
similarity index 100%
rename from tests/i915/gen9_exec_parse.c
rename to tests/intel/gen9_exec_parse.c
diff --git a/tests/i915/i915_fb_tiling.c b/tests/intel/i915_fb_tiling.c
similarity index 100%
rename from tests/i915/i915_fb_tiling.c
rename to tests/intel/i915_fb_tiling.c
diff --git a/tests/i915/i915_getparams_basic.c b/tests/intel/i915_getparams_basic.c
similarity index 100%
rename from tests/i915/i915_getparams_basic.c
rename to tests/intel/i915_getparams_basic.c
diff --git a/tests/i915/i915_hangman.c b/tests/intel/i915_hangman.c
similarity index 100%
rename from tests/i915/i915_hangman.c
rename to tests/intel/i915_hangman.c
diff --git a/tests/i915/i915_hwmon.c b/tests/intel/i915_hwmon.c
similarity index 100%
rename from tests/i915/i915_hwmon.c
rename to tests/intel/i915_hwmon.c
diff --git a/tests/i915/i915_module_load.c b/tests/intel/i915_module_load.c
similarity index 100%
rename from tests/i915/i915_module_load.c
rename to tests/intel/i915_module_load.c
diff --git a/tests/i915/i915_pciid.c b/tests/intel/i915_pciid.c
similarity index 100%
rename from tests/i915/i915_pciid.c
rename to tests/intel/i915_pciid.c
diff --git a/tests/i915/i915_pipe_stress.c b/tests/intel/i915_pipe_stress.c
similarity index 100%
rename from tests/i915/i915_pipe_stress.c
rename to tests/intel/i915_pipe_stress.c
diff --git a/tests/i915/i915_pm_backlight.c b/tests/intel/i915_pm_backlight.c
similarity index 100%
rename from tests/i915/i915_pm_backlight.c
rename to tests/intel/i915_pm_backlight.c
diff --git a/tests/i915/i915_pm_dc.c b/tests/intel/i915_pm_dc.c
similarity index 100%
rename from tests/i915/i915_pm_dc.c
rename to tests/intel/i915_pm_dc.c
diff --git a/tests/i915/i915_pm_freq_api.c b/tests/intel/i915_pm_freq_api.c
similarity index 100%
rename from tests/i915/i915_pm_freq_api.c
rename to tests/intel/i915_pm_freq_api.c
diff --git a/tests/i915/i915_pm_freq_mult.c b/tests/intel/i915_pm_freq_mult.c
similarity index 100%
rename from tests/i915/i915_pm_freq_mult.c
rename to tests/intel/i915_pm_freq_mult.c
diff --git a/tests/i915/i915_pm_lpsp.c b/tests/intel/i915_pm_lpsp.c
similarity index 100%
rename from tests/i915/i915_pm_lpsp.c
rename to tests/intel/i915_pm_lpsp.c
diff --git a/tests/i915/i915_pm_rc6_residency.c b/tests/intel/i915_pm_rc6_residency.c
similarity index 100%
rename from tests/i915/i915_pm_rc6_residency.c
rename to tests/intel/i915_pm_rc6_residency.c
diff --git a/tests/i915/i915_pm_rpm.c b/tests/intel/i915_pm_rpm.c
similarity index 100%
rename from tests/i915/i915_pm_rpm.c
rename to tests/intel/i915_pm_rpm.c
diff --git a/tests/i915/i915_pm_rps.c b/tests/intel/i915_pm_rps.c
similarity index 100%
rename from tests/i915/i915_pm_rps.c
rename to tests/intel/i915_pm_rps.c
diff --git a/tests/i915/i915_pm_sseu.c b/tests/intel/i915_pm_sseu.c
similarity index 100%
rename from tests/i915/i915_pm_sseu.c
rename to tests/intel/i915_pm_sseu.c
diff --git a/tests/i915/i915_power.c b/tests/intel/i915_power.c
similarity index 100%
rename from tests/i915/i915_power.c
rename to tests/intel/i915_power.c
diff --git a/tests/i915/i915_query.c b/tests/intel/i915_query.c
similarity index 100%
rename from tests/i915/i915_query.c
rename to tests/intel/i915_query.c
diff --git a/tests/i915/i915_selftest.c b/tests/intel/i915_selftest.c
similarity index 100%
rename from tests/i915/i915_selftest.c
rename to tests/intel/i915_selftest.c
diff --git a/tests/i915/i915_suspend.c b/tests/intel/i915_suspend.c
similarity index 100%
rename from tests/i915/i915_suspend.c
rename to tests/intel/i915_suspend.c
diff --git a/tests/i915/i915_test_config.json b/tests/intel/i915_test_config.json
similarity index 100%
rename from tests/i915/i915_test_config.json
rename to tests/intel/i915_test_config.json
diff --git a/tests/i915/kms_big_fb.c b/tests/intel/kms_big_fb.c
similarity index 100%
rename from tests/i915/kms_big_fb.c
rename to tests/intel/kms_big_fb.c
diff --git a/tests/i915/kms_big_joiner.c b/tests/intel/kms_big_joiner.c
similarity index 100%
rename from tests/i915/kms_big_joiner.c
rename to tests/intel/kms_big_joiner.c
diff --git a/tests/i915/kms_busy.c b/tests/intel/kms_busy.c
similarity index 100%
rename from tests/i915/kms_busy.c
rename to tests/intel/kms_busy.c
diff --git a/tests/i915/kms_ccs.c b/tests/intel/kms_ccs.c
similarity index 100%
rename from tests/i915/kms_ccs.c
rename to tests/intel/kms_ccs.c
diff --git a/tests/i915/kms_cdclk.c b/tests/intel/kms_cdclk.c
similarity index 100%
rename from tests/i915/kms_cdclk.c
rename to tests/intel/kms_cdclk.c
diff --git a/tests/i915/kms_dirtyfb.c b/tests/intel/kms_dirtyfb.c
similarity index 100%
rename from tests/i915/kms_dirtyfb.c
rename to tests/intel/kms_dirtyfb.c
diff --git a/tests/i915/kms_draw_crc.c b/tests/intel/kms_draw_crc.c
similarity index 100%
rename from tests/i915/kms_draw_crc.c
rename to tests/intel/kms_draw_crc.c
diff --git a/tests/i915/kms_dsc.c b/tests/intel/kms_dsc.c
similarity index 100%
rename from tests/i915/kms_dsc.c
rename to tests/intel/kms_dsc.c
diff --git a/tests/i915/kms_dsc_helper.c b/tests/intel/kms_dsc_helper.c
similarity index 100%
rename from tests/i915/kms_dsc_helper.c
rename to tests/intel/kms_dsc_helper.c
diff --git a/tests/i915/kms_dsc_helper.h b/tests/intel/kms_dsc_helper.h
similarity index 100%
rename from tests/i915/kms_dsc_helper.h
rename to tests/intel/kms_dsc_helper.h
diff --git a/tests/i915/kms_fb_coherency.c b/tests/intel/kms_fb_coherency.c
similarity index 100%
rename from tests/i915/kms_fb_coherency.c
rename to tests/intel/kms_fb_coherency.c
diff --git a/tests/i915/kms_fbcon_fbt.c b/tests/intel/kms_fbcon_fbt.c
similarity index 100%
rename from tests/i915/kms_fbcon_fbt.c
rename to tests/intel/kms_fbcon_fbt.c
diff --git a/tests/i915/kms_fence_pin_leak.c b/tests/intel/kms_fence_pin_leak.c
similarity index 100%
rename from tests/i915/kms_fence_pin_leak.c
rename to tests/intel/kms_fence_pin_leak.c
diff --git a/tests/i915/kms_flip_scaled_crc.c b/tests/intel/kms_flip_scaled_crc.c
similarity index 100%
rename from tests/i915/kms_flip_scaled_crc.c
rename to tests/intel/kms_flip_scaled_crc.c
diff --git a/tests/i915/kms_flip_tiling.c b/tests/intel/kms_flip_tiling.c
similarity index 100%
rename from tests/i915/kms_flip_tiling.c
rename to tests/intel/kms_flip_tiling.c
diff --git a/tests/i915/kms_frontbuffer_tracking.c b/tests/intel/kms_frontbuffer_tracking.c
similarity index 100%
rename from tests/i915/kms_frontbuffer_tracking.c
rename to tests/intel/kms_frontbuffer_tracking.c
diff --git a/tests/i915/kms_legacy_colorkey.c b/tests/intel/kms_legacy_colorkey.c
similarity index 100%
rename from tests/i915/kms_legacy_colorkey.c
rename to tests/intel/kms_legacy_colorkey.c
diff --git a/tests/i915/kms_mmap_write_crc.c b/tests/intel/kms_mmap_write_crc.c
similarity index 100%
rename from tests/i915/kms_mmap_write_crc.c
rename to tests/intel/kms_mmap_write_crc.c
diff --git a/tests/i915/kms_pipe_b_c_ivb.c b/tests/intel/kms_pipe_b_c_ivb.c
similarity index 100%
rename from tests/i915/kms_pipe_b_c_ivb.c
rename to tests/intel/kms_pipe_b_c_ivb.c
diff --git a/tests/i915/kms_psr.c b/tests/intel/kms_psr.c
similarity index 100%
rename from tests/i915/kms_psr.c
rename to tests/intel/kms_psr.c
diff --git a/tests/i915/kms_psr2_sf.c b/tests/intel/kms_psr2_sf.c
similarity index 100%
rename from tests/i915/kms_psr2_sf.c
rename to tests/intel/kms_psr2_sf.c
diff --git a/tests/i915/kms_psr2_su.c b/tests/intel/kms_psr2_su.c
similarity index 100%
rename from tests/i915/kms_psr2_su.c
rename to tests/intel/kms_psr2_su.c
diff --git a/tests/i915/kms_psr_stress_test.c b/tests/intel/kms_psr_stress_test.c
similarity index 100%
rename from tests/i915/kms_psr_stress_test.c
rename to tests/intel/kms_psr_stress_test.c
diff --git a/tests/i915/kms_pwrite_crc.c b/tests/intel/kms_pwrite_crc.c
similarity index 100%
rename from tests/i915/kms_pwrite_crc.c
rename to tests/intel/kms_pwrite_crc.c
diff --git a/tests/i915/kms_test_config.json b/tests/intel/kms_test_config.json
similarity index 100%
rename from tests/i915/kms_test_config.json
rename to tests/intel/kms_test_config.json
diff --git a/tests/i915/perf.c b/tests/intel/perf.c
similarity index 100%
rename from tests/i915/perf.c
rename to tests/intel/perf.c
diff --git a/tests/i915/perf_pmu.c b/tests/intel/perf_pmu.c
similarity index 100%
rename from tests/i915/perf_pmu.c
rename to tests/intel/perf_pmu.c
diff --git a/tests/prime_busy.c b/tests/intel/prime_busy.c
similarity index 100%
rename from tests/prime_busy.c
rename to tests/intel/prime_busy.c
diff --git a/tests/prime_mmap.c b/tests/intel/prime_mmap.c
similarity index 100%
rename from tests/prime_mmap.c
rename to tests/intel/prime_mmap.c
diff --git a/tests/prime_mmap_coherency.c b/tests/intel/prime_mmap_coherency.c
similarity index 100%
rename from tests/prime_mmap_coherency.c
rename to tests/intel/prime_mmap_coherency.c
diff --git a/tests/prime_mmap_kms.c b/tests/intel/prime_mmap_kms.c
similarity index 100%
rename from tests/prime_mmap_kms.c
rename to tests/intel/prime_mmap_kms.c
diff --git a/tests/prime_self_import.c b/tests/intel/prime_self_import.c
similarity index 100%
rename from tests/prime_self_import.c
rename to tests/intel/prime_self_import.c
diff --git a/tests/i915/sysfs_defaults.c b/tests/intel/sysfs_defaults.c
similarity index 100%
rename from tests/i915/sysfs_defaults.c
rename to tests/intel/sysfs_defaults.c
diff --git a/tests/i915/sysfs_heartbeat_interval.c b/tests/intel/sysfs_heartbeat_interval.c
similarity index 100%
rename from tests/i915/sysfs_heartbeat_interval.c
rename to tests/intel/sysfs_heartbeat_interval.c
diff --git a/tests/i915/sysfs_preempt_timeout.c b/tests/intel/sysfs_preempt_timeout.c
similarity index 100%
rename from tests/i915/sysfs_preempt_timeout.c
rename to tests/intel/sysfs_preempt_timeout.c
diff --git a/tests/i915/sysfs_timeslice_duration.c b/tests/intel/sysfs_timeslice_duration.c
similarity index 100%
rename from tests/i915/sysfs_timeslice_duration.c
rename to tests/intel/sysfs_timeslice_duration.c
diff --git a/tests/xe/xe_ccs.c b/tests/intel/xe_ccs.c
similarity index 100%
rename from tests/xe/xe_ccs.c
rename to tests/intel/xe_ccs.c
diff --git a/tests/xe/xe_compute.c b/tests/intel/xe_compute.c
similarity index 100%
rename from tests/xe/xe_compute.c
rename to tests/intel/xe_compute.c
diff --git a/tests/xe/xe_create.c b/tests/intel/xe_create.c
similarity index 100%
rename from tests/xe/xe_create.c
rename to tests/intel/xe_create.c
diff --git a/tests/xe/xe_debugfs.c b/tests/intel/xe_debugfs.c
similarity index 100%
rename from tests/xe/xe_debugfs.c
rename to tests/intel/xe_debugfs.c
diff --git a/tests/xe/xe_dma_buf_sync.c b/tests/intel/xe_dma_buf_sync.c
similarity index 100%
rename from tests/xe/xe_dma_buf_sync.c
rename to tests/intel/xe_dma_buf_sync.c
diff --git a/tests/xe/xe_evict.c b/tests/intel/xe_evict.c
similarity index 100%
rename from tests/xe/xe_evict.c
rename to tests/intel/xe_evict.c
diff --git a/tests/xe/xe_exec_balancer.c b/tests/intel/xe_exec_balancer.c
similarity index 100%
rename from tests/xe/xe_exec_balancer.c
rename to tests/intel/xe_exec_balancer.c
diff --git a/tests/xe/xe_exec_basic.c b/tests/intel/xe_exec_basic.c
similarity index 100%
rename from tests/xe/xe_exec_basic.c
rename to tests/intel/xe_exec_basic.c
diff --git a/tests/xe/xe_exec_compute_mode.c b/tests/intel/xe_exec_compute_mode.c
similarity index 100%
rename from tests/xe/xe_exec_compute_mode.c
rename to tests/intel/xe_exec_compute_mode.c
diff --git a/tests/xe/xe_exec_fault_mode.c b/tests/intel/xe_exec_fault_mode.c
similarity index 100%
rename from tests/xe/xe_exec_fault_mode.c
rename to tests/intel/xe_exec_fault_mode.c
diff --git a/tests/xe/xe_exec_reset.c b/tests/intel/xe_exec_reset.c
similarity index 100%
rename from tests/xe/xe_exec_reset.c
rename to tests/intel/xe_exec_reset.c
diff --git a/tests/xe/xe_exec_store.c b/tests/intel/xe_exec_store.c
similarity index 100%
rename from tests/xe/xe_exec_store.c
rename to tests/intel/xe_exec_store.c
diff --git a/tests/xe/xe_exec_threads.c b/tests/intel/xe_exec_threads.c
similarity index 100%
rename from tests/xe/xe_exec_threads.c
rename to tests/intel/xe_exec_threads.c
diff --git a/tests/xe/xe_exercise_blt.c b/tests/intel/xe_exercise_blt.c
similarity index 100%
rename from tests/xe/xe_exercise_blt.c
rename to tests/intel/xe_exercise_blt.c
diff --git a/tests/xe/xe_gpgpu_fill.c b/tests/intel/xe_gpgpu_fill.c
similarity index 100%
rename from tests/xe/xe_gpgpu_fill.c
rename to tests/intel/xe_gpgpu_fill.c
diff --git a/tests/xe/xe_guc_pc.c b/tests/intel/xe_guc_pc.c
similarity index 100%
rename from tests/xe/xe_guc_pc.c
rename to tests/intel/xe_guc_pc.c
diff --git a/tests/xe/xe_huc_copy.c b/tests/intel/xe_huc_copy.c
similarity index 100%
rename from tests/xe/xe_huc_copy.c
rename to tests/intel/xe_huc_copy.c
diff --git a/tests/xe/xe_intel_bb.c b/tests/intel/xe_intel_bb.c
similarity index 100%
rename from tests/xe/xe_intel_bb.c
rename to tests/intel/xe_intel_bb.c
diff --git a/tests/xe/xe_live_ktest.c b/tests/intel/xe_live_ktest.c
similarity index 100%
rename from tests/xe/xe_live_ktest.c
rename to tests/intel/xe_live_ktest.c
diff --git a/tests/xe/xe_media_fill.c b/tests/intel/xe_media_fill.c
similarity index 100%
rename from tests/xe/xe_media_fill.c
rename to tests/intel/xe_media_fill.c
diff --git a/tests/xe/xe_mmap.c b/tests/intel/xe_mmap.c
similarity index 100%
rename from tests/xe/xe_mmap.c
rename to tests/intel/xe_mmap.c
diff --git a/tests/xe/xe_mmio.c b/tests/intel/xe_mmio.c
similarity index 100%
rename from tests/xe/xe_mmio.c
rename to tests/intel/xe_mmio.c
diff --git a/tests/xe/xe_module_load.c b/tests/intel/xe_module_load.c
similarity index 100%
rename from tests/xe/xe_module_load.c
rename to tests/intel/xe_module_load.c
diff --git a/tests/xe/xe_noexec_ping_pong.c b/tests/intel/xe_noexec_ping_pong.c
similarity index 100%
rename from tests/xe/xe_noexec_ping_pong.c
rename to tests/intel/xe_noexec_ping_pong.c
diff --git a/tests/xe/xe_pm.c b/tests/intel/xe_pm.c
similarity index 100%
rename from tests/xe/xe_pm.c
rename to tests/intel/xe_pm.c
diff --git a/tests/xe/xe_pm_residency.c b/tests/intel/xe_pm_residency.c
similarity index 100%
rename from tests/xe/xe_pm_residency.c
rename to tests/intel/xe_pm_residency.c
diff --git a/tests/xe/xe_prime_self_import.c b/tests/intel/xe_prime_self_import.c
similarity index 100%
rename from tests/xe/xe_prime_self_import.c
rename to tests/intel/xe_prime_self_import.c
diff --git a/tests/xe/xe_query.c b/tests/intel/xe_query.c
similarity index 100%
rename from tests/xe/xe_query.c
rename to tests/intel/xe_query.c
diff --git a/tests/xe/xe_spin_batch.c b/tests/intel/xe_spin_batch.c
similarity index 100%
rename from tests/xe/xe_spin_batch.c
rename to tests/intel/xe_spin_batch.c
diff --git a/tests/xe/xe_sysfs_defaults.c b/tests/intel/xe_sysfs_defaults.c
similarity index 100%
rename from tests/xe/xe_sysfs_defaults.c
rename to tests/intel/xe_sysfs_defaults.c
diff --git a/tests/xe/xe_sysfs_scheduler.c b/tests/intel/xe_sysfs_scheduler.c
similarity index 100%
rename from tests/xe/xe_sysfs_scheduler.c
rename to tests/intel/xe_sysfs_scheduler.c
diff --git a/tests/xe/xe_sysfs_tile.c b/tests/intel/xe_sysfs_tile.c
similarity index 100%
rename from tests/xe/xe_sysfs_tile.c
rename to tests/intel/xe_sysfs_tile.c
diff --git a/tests/xe/xe_test_config.json b/tests/intel/xe_test_config.json
similarity index 100%
rename from tests/xe/xe_test_config.json
rename to tests/intel/xe_test_config.json
diff --git a/tests/xe/xe_uevent.c b/tests/intel/xe_uevent.c
similarity index 100%
rename from tests/xe/xe_uevent.c
rename to tests/intel/xe_uevent.c
diff --git a/tests/xe/xe_vm.c b/tests/intel/xe_vm.c
similarity index 100%
rename from tests/xe/xe_vm.c
rename to tests/intel/xe_vm.c
diff --git a/tests/xe/xe_waitfence.c b/tests/intel/xe_waitfence.c
similarity index 100%
rename from tests/xe/xe_waitfence.c
rename to tests/intel/xe_waitfence.c
diff --git a/tests/meson.build b/tests/meson.build
index e25793b5a..211ecd513 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -6,7 +6,6 @@ test_progs = [
 	'core_hotunplug',
 	'core_setmaster',
 	'core_setmaster_vs_auth',
-	'debugfs_test',
 	'dmabuf',
 	'dmabuf_sync_file',
 	'device_reset',
@@ -70,11 +69,6 @@ test_progs = [
 	'panfrost_gem_new',
 	'panfrost_prime',
 	'panfrost_submit',
-	'prime_busy',
-	'prime_mmap',
-	'prime_mmap_coherency',
-	'prime_mmap_kms',
-	'prime_self_import',
 	'prime_udl',
 	'prime_vgem',
 	'syncobj_basic',
@@ -88,9 +82,10 @@ test_progs = [
 	'vgem_slow',
 ]
 
-i915_progs = [
+intel_progs = [
 	'api_intel_allocator',
 	'api_intel_bb',
+	'debugfs_test',
 	'drm_fdinfo',
 	'gen3_mixed_blits',
 	'gen3_render_linear_blits',
@@ -257,6 +252,11 @@ i915_progs = [
 	'kms_psr2_su',
 	'kms_psr_stress_test',
 	'kms_pwrite_crc',
+	'prime_busy',
+	'prime_mmap',
+	'prime_mmap_coherency',
+	'prime_mmap_kms',
+	'prime_self_import',
 	'sysfs_defaults',
 	'sysfs_heartbeat_interval',
 	'sysfs_preempt_timeout',
@@ -340,8 +340,8 @@ extra_sources = {
 	'kms_chamelium_edid': [ join_paths ('chamelium', 'kms_chamelium_helper.c') ],
 	'kms_chamelium_frames': [ join_paths ('chamelium', 'kms_chamelium_helper.c') ],
 	'kms_chamelium_hpd': [ join_paths ('chamelium', 'kms_chamelium_helper.c') ],
-	'kms_dsc': [ join_paths ('i915', 'kms_dsc_helper.c') ],
-	'kms_psr2_sf':  [ join_paths ('i915', 'kms_dsc_helper.c') ],
+	'kms_dsc': [ join_paths ('intel', 'kms_dsc_helper.c') ],
+	'kms_psr2_sf':  [ join_paths ('intel', 'kms_dsc_helper.c') ],
 }
 
 # Extra dependencies used on core and Intel drivers
@@ -383,9 +383,9 @@ foreach prog : test_progs
 		     output : name + '.testlist')
 endforeach
 
-foreach prog : i915_progs
+foreach prog : intel_progs
 	testexe = executable(prog,
-		   [join_paths('i915', prog + '.c')] + extra_sources.get(prog, []),
+		   [join_paths('intel', prog + '.c')] + extra_sources.get(prog, []),
 		   dependencies : test_deps + extra_dependencies.get(prog, []),
 		   install_dir : libexecdir,
 		   install_rpath : libexecdir_rpathdir,
@@ -403,7 +403,7 @@ endforeach
 if build_xe
 	foreach prog : xe_progs
 		testexe = executable(prog,
-			   [join_paths('xe', prog + '.c')] + extra_sources.get(prog, []),
+			   [join_paths('intel', prog + '.c')] + extra_sources.get(prog, []),
 			   dependencies : test_deps + extra_dependencies.get(prog, []),
 			   install_dir : libexecdir,
 			   install_rpath : libexecdir_rpathdir,
@@ -464,7 +464,7 @@ test_list_target = custom_target('testlist',
 	      install : true,
 	      install_dir : libexecdir)
 
-test_executables += executable('gem_concurrent_all', 'i915/gem_concurrent_all.c',
+test_executables += executable('gem_concurrent_all', 'intel/gem_concurrent_all.c',
 	   dependencies : test_deps + [ libatomic ],
 	   install_dir : libexecdir,
 	   install_rpath : libexecdir_rpathdir,
@@ -482,7 +482,7 @@ foreach prog : test_list
 	test('testcase check ' + prog, test_script, args : prog)
 endforeach
 
-testexe = executable('gem_stress', 'i915/gem_stress.c',
+testexe = executable('gem_stress', 'intel/gem_stress.c',
 	   install : true,
 	   install_dir : libexecdir,
 	   install_rpath : libexecdir_rpathdir,
-- 
2.40.0



^ permalink raw reply related	[flat|nested] 18+ messages in thread

* Re: [igt-dev] [i-g-t V5 5/7] tests: Move intel specific tests to new directory
  2023-08-31 14:56 ` [igt-dev] [i-g-t V5 5/7] tests: Move intel specific tests to new directory Bhanuprakash Modem
@ 2023-08-31 16:00   ` Mauro Carvalho Chehab
  0 siblings, 0 replies; 18+ messages in thread
From: Mauro Carvalho Chehab @ 2023-08-31 16:00 UTC (permalink / raw)
  To: Bhanuprakash Modem; +Cc: igt-dev

On Thu, 31 Aug 2023 20:26:20 +0530
Bhanuprakash Modem <bhanuprakash.modem@intel.com> wrote:

> In-order to organize tests in a better way, move all intel
> specific tests (includes i915, xe & kms) to a new directory
> called "tests/intel".
> 
> V2: - Rebase
> 
> Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
> Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com>

Didn't test, but it LGTM.

Reviewed-by: Mauro Carvalho Chehab <mchehab@kernel.org>

> ---
>  docs/testplan/meson.build                     |  6 ++--
>  tests/{i915 => intel}/api_intel_allocator.c   |  0
>  tests/{i915 => intel}/api_intel_bb.c          |  0
>  tests/{ => intel}/debugfs_test.c              |  0
>  tests/{i915 => intel}/drm_fdinfo.c            |  0
>  tests/{i915 => intel}/gem_bad_reloc.c         |  0
>  tests/{i915 => intel}/gem_barrier_race.c      |  0
>  tests/{i915 => intel}/gem_basic.c             |  0
>  tests/{i915 => intel}/gem_blits.c             |  0
>  tests/{i915 => intel}/gem_busy.c              |  0
>  tests/{i915 => intel}/gem_caching.c           |  0
>  tests/{i915 => intel}/gem_ccs.c               |  0
>  tests/{i915 => intel}/gem_close.c             |  0
>  tests/{i915 => intel}/gem_close_race.c        |  0
>  tests/{i915 => intel}/gem_concurrent_all.c    |  0
>  tests/{i915 => intel}/gem_concurrent_blit.c   |  0
>  tests/{i915 => intel}/gem_create.c            |  0
>  tests/{i915 => intel}/gem_cs_tlb.c            |  0
>  tests/{i915 => intel}/gem_ctx_bad_destroy.c   |  0
>  tests/{i915 => intel}/gem_ctx_create.c        |  0
>  tests/{i915 => intel}/gem_ctx_engines.c       |  0
>  tests/{i915 => intel}/gem_ctx_exec.c          |  0
>  tests/{i915 => intel}/gem_ctx_freq.c          |  0
>  tests/{i915 => intel}/gem_ctx_isolation.c     |  0
>  tests/{i915 => intel}/gem_ctx_param.c         |  0
>  tests/{i915 => intel}/gem_ctx_persistence.c   |  0
>  tests/{i915 => intel}/gem_ctx_shared.c        |  0
>  tests/{i915 => intel}/gem_ctx_sseu.c          |  0
>  tests/{i915 => intel}/gem_ctx_switch.c        |  0
>  tests/{i915 => intel}/gem_eio.c               |  0
>  tests/{i915 => intel}/gem_evict_alignment.c   |  0
>  tests/{i915 => intel}/gem_evict_everything.c  |  0
>  tests/{i915 => intel}/gem_exec_alignment.c    |  0
>  tests/{i915 => intel}/gem_exec_async.c        |  0
>  tests/{i915 => intel}/gem_exec_await.c        |  0
>  tests/{i915 => intel}/gem_exec_balancer.c     |  0
>  tests/{i915 => intel}/gem_exec_basic.c        |  0
>  tests/{i915 => intel}/gem_exec_big.c          |  0
>  tests/{i915 => intel}/gem_exec_capture.c      |  0
>  tests/{i915 => intel}/gem_exec_create.c       |  0
>  tests/{i915 => intel}/gem_exec_endless.c      |  0
>  tests/{i915 => intel}/gem_exec_fair.c         |  0
>  tests/{i915 => intel}/gem_exec_fence.c        |  0
>  tests/{i915 => intel}/gem_exec_flush.c        |  0
>  tests/{i915 => intel}/gem_exec_gttfill.c      |  0
>  tests/{i915 => intel}/gem_exec_latency.c      |  0
>  tests/{i915 => intel}/gem_exec_lut_handle.c   |  0
>  tests/{i915 => intel}/gem_exec_nop.c          |  0
>  tests/{i915 => intel}/gem_exec_parallel.c     |  0
>  tests/{i915 => intel}/gem_exec_params.c       |  0
>  tests/{i915 => intel}/gem_exec_reloc.c        |  0
>  tests/{i915 => intel}/gem_exec_schedule.c     |  0
>  tests/{i915 => intel}/gem_exec_store.c        |  0
>  tests/{i915 => intel}/gem_exec_suspend.c      |  0
>  tests/{i915 => intel}/gem_exec_whisper.c      |  0
>  tests/{i915 => intel}/gem_exercise_blt.c      |  0
>  tests/{i915 => intel}/gem_fd_exhaustion.c     |  0
>  tests/{i915 => intel}/gem_fence_thrash.c      |  0
>  tests/{i915 => intel}/gem_fence_upload.c      |  0
>  .../{i915 => intel}/gem_fenced_exec_thrash.c  |  0
>  tests/{i915 => intel}/gem_flink_basic.c       |  0
>  tests/{i915 => intel}/gem_flink_race.c        |  0
>  tests/{i915 => intel}/gem_gpgpu_fill.c        |  0
>  tests/{i915 => intel}/gem_gtt_cpu_tlb.c       |  0
>  tests/{i915 => intel}/gem_gtt_hog.c           |  0
>  tests/{i915 => intel}/gem_gtt_speed.c         |  0
>  tests/{i915 => intel}/gem_huc_copy.c          |  0
>  tests/{i915 => intel}/gem_linear_blits.c      |  0
>  tests/{i915 => intel}/gem_lmem_evict.c        |  0
>  tests/{i915 => intel}/gem_lmem_swapping.c     |  0
>  tests/{i915 => intel}/gem_lut_handle.c        |  0
>  tests/{i915 => intel}/gem_madvise.c           |  0
>  tests/{i915 => intel}/gem_media_fill.c        |  0
>  tests/{i915 => intel}/gem_media_vme.c         |  0
>  tests/{i915 => intel}/gem_mmap.c              |  0
>  tests/{i915 => intel}/gem_mmap_gtt.c          |  0
>  tests/{i915 => intel}/gem_mmap_offset.c       |  0
>  tests/{i915 => intel}/gem_mmap_wc.c           |  0
>  .../gem_partial_pwrite_pread.c                |  0
>  .../gem_pipe_control_store_loop.c             |  0
>  tests/{i915 => intel}/gem_ppgtt.c             |  0
>  tests/{i915 => intel}/gem_pread.c             |  0
>  tests/{i915 => intel}/gem_pread_after_blit.c  |  0
>  tests/{i915 => intel}/gem_pwrite.c            |  0
>  tests/{i915 => intel}/gem_pwrite_snooped.c    |  0
>  tests/{i915 => intel}/gem_pxp.c               |  0
>  tests/{i915 => intel}/gem_read_read_speed.c   |  0
>  tests/{i915 => intel}/gem_readwrite.c         |  0
>  tests/{i915 => intel}/gem_reg_read.c          |  0
>  tests/{i915 => intel}/gem_render_copy.c       |  0
>  tests/{i915 => intel}/gem_render_copy_redux.c |  0
>  .../{i915 => intel}/gem_render_linear_blits.c |  0
>  .../{i915 => intel}/gem_render_tiled_blits.c  |  0
>  tests/{i915 => intel}/gem_request_retire.c    |  0
>  tests/{i915 => intel}/gem_reset_stats.c       |  0
>  tests/{i915 => intel}/gem_ringfill.c          |  0
>  tests/{i915 => intel}/gem_set_tiling_vs_blt.c |  0
>  tests/{i915 => intel}/gem_set_tiling_vs_gtt.c |  0
>  .../gem_set_tiling_vs_pwrite.c                |  0
>  tests/{i915 => intel}/gem_shrink.c            |  0
>  tests/{i915 => intel}/gem_softpin.c           |  0
>  tests/{i915 => intel}/gem_spin_batch.c        |  0
>  tests/{i915 => intel}/gem_streaming_writes.c  |  0
>  tests/{i915 => intel}/gem_stress.c            |  0
>  tests/{i915 => intel}/gem_sync.c              |  0
>  tests/{i915 => intel}/gem_tiled_blits.c       |  0
>  tests/{i915 => intel}/gem_tiled_fence_blits.c |  0
>  .../gem_tiled_partial_pwrite_pread.c          |  0
>  tests/{i915 => intel}/gem_tiled_pread_basic.c |  0
>  .../{i915 => intel}/gem_tiled_pread_pwrite.c  |  0
>  tests/{i915 => intel}/gem_tiled_swapping.c    |  0
>  tests/{i915 => intel}/gem_tiled_wb.c          |  0
>  tests/{i915 => intel}/gem_tiled_wc.c          |  0
>  tests/{i915 => intel}/gem_tiling_max_stride.c |  0
>  .../gem_unfence_active_buffers.c              |  0
>  .../gem_unref_active_buffers.c                |  0
>  tests/{i915 => intel}/gem_userptr_blits.c     |  0
>  tests/{i915 => intel}/gem_vm_create.c         |  0
>  tests/{i915 => intel}/gem_wait.c              |  0
>  tests/{i915 => intel}/gem_watchdog.c          |  0
>  tests/{i915 => intel}/gem_workarounds.c       |  0
>  tests/{i915 => intel}/gen3_mixed_blits.c      |  0
>  .../gen3_render_linear_blits.c                |  0
>  .../{i915 => intel}/gen3_render_mixed_blits.c |  0
>  .../gen3_render_tiledx_blits.c                |  0
>  .../gen3_render_tiledy_blits.c                |  0
>  tests/{i915 => intel}/gen7_exec_parse.c       |  0
>  tests/{i915 => intel}/gen9_exec_parse.c       |  0
>  tests/{i915 => intel}/i915_fb_tiling.c        |  0
>  tests/{i915 => intel}/i915_getparams_basic.c  |  0
>  tests/{i915 => intel}/i915_hangman.c          |  0
>  tests/{i915 => intel}/i915_hwmon.c            |  0
>  tests/{i915 => intel}/i915_module_load.c      |  0
>  tests/{i915 => intel}/i915_pciid.c            |  0
>  tests/{i915 => intel}/i915_pipe_stress.c      |  0
>  tests/{i915 => intel}/i915_pm_backlight.c     |  0
>  tests/{i915 => intel}/i915_pm_dc.c            |  0
>  tests/{i915 => intel}/i915_pm_freq_api.c      |  0
>  tests/{i915 => intel}/i915_pm_freq_mult.c     |  0
>  tests/{i915 => intel}/i915_pm_lpsp.c          |  0
>  tests/{i915 => intel}/i915_pm_rc6_residency.c |  0
>  tests/{i915 => intel}/i915_pm_rpm.c           |  0
>  tests/{i915 => intel}/i915_pm_rps.c           |  0
>  tests/{i915 => intel}/i915_pm_sseu.c          |  0
>  tests/{i915 => intel}/i915_power.c            |  0
>  tests/{i915 => intel}/i915_query.c            |  0
>  tests/{i915 => intel}/i915_selftest.c         |  0
>  tests/{i915 => intel}/i915_suspend.c          |  0
>  tests/{i915 => intel}/i915_test_config.json   |  0
>  tests/{i915 => intel}/kms_big_fb.c            |  0
>  tests/{i915 => intel}/kms_big_joiner.c        |  0
>  tests/{i915 => intel}/kms_busy.c              |  0
>  tests/{i915 => intel}/kms_ccs.c               |  0
>  tests/{i915 => intel}/kms_cdclk.c             |  0
>  tests/{i915 => intel}/kms_dirtyfb.c           |  0
>  tests/{i915 => intel}/kms_draw_crc.c          |  0
>  tests/{i915 => intel}/kms_dsc.c               |  0
>  tests/{i915 => intel}/kms_dsc_helper.c        |  0
>  tests/{i915 => intel}/kms_dsc_helper.h        |  0
>  tests/{i915 => intel}/kms_fb_coherency.c      |  0
>  tests/{i915 => intel}/kms_fbcon_fbt.c         |  0
>  tests/{i915 => intel}/kms_fence_pin_leak.c    |  0
>  tests/{i915 => intel}/kms_flip_scaled_crc.c   |  0
>  tests/{i915 => intel}/kms_flip_tiling.c       |  0
>  .../kms_frontbuffer_tracking.c                |  0
>  tests/{i915 => intel}/kms_legacy_colorkey.c   |  0
>  tests/{i915 => intel}/kms_mmap_write_crc.c    |  0
>  tests/{i915 => intel}/kms_pipe_b_c_ivb.c      |  0
>  tests/{i915 => intel}/kms_psr.c               |  0
>  tests/{i915 => intel}/kms_psr2_sf.c           |  0
>  tests/{i915 => intel}/kms_psr2_su.c           |  0
>  tests/{i915 => intel}/kms_psr_stress_test.c   |  0
>  tests/{i915 => intel}/kms_pwrite_crc.c        |  0
>  tests/{i915 => intel}/kms_test_config.json    |  0
>  tests/{i915 => intel}/perf.c                  |  0
>  tests/{i915 => intel}/perf_pmu.c              |  0
>  tests/{ => intel}/prime_busy.c                |  0
>  tests/{ => intel}/prime_mmap.c                |  0
>  tests/{ => intel}/prime_mmap_coherency.c      |  0
>  tests/{ => intel}/prime_mmap_kms.c            |  0
>  tests/{ => intel}/prime_self_import.c         |  0
>  tests/{i915 => intel}/sysfs_defaults.c        |  0
>  .../sysfs_heartbeat_interval.c                |  0
>  tests/{i915 => intel}/sysfs_preempt_timeout.c |  0
>  .../sysfs_timeslice_duration.c                |  0
>  tests/{xe => intel}/xe_ccs.c                  |  0
>  tests/{xe => intel}/xe_compute.c              |  0
>  tests/{xe => intel}/xe_create.c               |  0
>  tests/{xe => intel}/xe_debugfs.c              |  0
>  tests/{xe => intel}/xe_dma_buf_sync.c         |  0
>  tests/{xe => intel}/xe_evict.c                |  0
>  tests/{xe => intel}/xe_exec_balancer.c        |  0
>  tests/{xe => intel}/xe_exec_basic.c           |  0
>  tests/{xe => intel}/xe_exec_compute_mode.c    |  0
>  tests/{xe => intel}/xe_exec_fault_mode.c      |  0
>  tests/{xe => intel}/xe_exec_reset.c           |  0
>  tests/{xe => intel}/xe_exec_store.c           |  0
>  tests/{xe => intel}/xe_exec_threads.c         |  0
>  tests/{xe => intel}/xe_exercise_blt.c         |  0
>  tests/{xe => intel}/xe_gpgpu_fill.c           |  0
>  tests/{xe => intel}/xe_guc_pc.c               |  0
>  tests/{xe => intel}/xe_huc_copy.c             |  0
>  tests/{xe => intel}/xe_intel_bb.c             |  0
>  tests/{xe => intel}/xe_live_ktest.c           |  0
>  tests/{xe => intel}/xe_media_fill.c           |  0
>  tests/{xe => intel}/xe_mmap.c                 |  0
>  tests/{xe => intel}/xe_mmio.c                 |  0
>  tests/{xe => intel}/xe_module_load.c          |  0
>  tests/{xe => intel}/xe_noexec_ping_pong.c     |  0
>  tests/{xe => intel}/xe_pm.c                   |  0
>  tests/{xe => intel}/xe_pm_residency.c         |  0
>  tests/{xe => intel}/xe_prime_self_import.c    |  0
>  tests/{xe => intel}/xe_query.c                |  0
>  tests/{xe => intel}/xe_spin_batch.c           |  0
>  tests/{xe => intel}/xe_sysfs_defaults.c       |  0
>  tests/{xe => intel}/xe_sysfs_scheduler.c      |  0
>  tests/{xe => intel}/xe_sysfs_tile.c           |  0
>  tests/{xe => intel}/xe_test_config.json       |  0
>  tests/{xe => intel}/xe_uevent.c               |  0
>  tests/{xe => intel}/xe_vm.c                   |  0
>  tests/{xe => intel}/xe_waitfence.c            |  0
>  tests/meson.build                             | 28 +++++++++----------
>  222 files changed, 17 insertions(+), 17 deletions(-)
>  rename tests/{i915 => intel}/api_intel_allocator.c (100%)
>  rename tests/{i915 => intel}/api_intel_bb.c (100%)
>  rename tests/{ => intel}/debugfs_test.c (100%)
>  rename tests/{i915 => intel}/drm_fdinfo.c (100%)
>  rename tests/{i915 => intel}/gem_bad_reloc.c (100%)
>  rename tests/{i915 => intel}/gem_barrier_race.c (100%)
>  rename tests/{i915 => intel}/gem_basic.c (100%)
>  rename tests/{i915 => intel}/gem_blits.c (100%)
>  rename tests/{i915 => intel}/gem_busy.c (100%)
>  rename tests/{i915 => intel}/gem_caching.c (100%)
>  rename tests/{i915 => intel}/gem_ccs.c (100%)
>  rename tests/{i915 => intel}/gem_close.c (100%)
>  rename tests/{i915 => intel}/gem_close_race.c (100%)
>  rename tests/{i915 => intel}/gem_concurrent_all.c (100%)
>  rename tests/{i915 => intel}/gem_concurrent_blit.c (100%)
>  rename tests/{i915 => intel}/gem_create.c (100%)
>  rename tests/{i915 => intel}/gem_cs_tlb.c (100%)
>  rename tests/{i915 => intel}/gem_ctx_bad_destroy.c (100%)
>  rename tests/{i915 => intel}/gem_ctx_create.c (100%)
>  rename tests/{i915 => intel}/gem_ctx_engines.c (100%)
>  rename tests/{i915 => intel}/gem_ctx_exec.c (100%)
>  rename tests/{i915 => intel}/gem_ctx_freq.c (100%)
>  rename tests/{i915 => intel}/gem_ctx_isolation.c (100%)
>  rename tests/{i915 => intel}/gem_ctx_param.c (100%)
>  rename tests/{i915 => intel}/gem_ctx_persistence.c (100%)
>  rename tests/{i915 => intel}/gem_ctx_shared.c (100%)
>  rename tests/{i915 => intel}/gem_ctx_sseu.c (100%)
>  rename tests/{i915 => intel}/gem_ctx_switch.c (100%)
>  rename tests/{i915 => intel}/gem_eio.c (100%)
>  rename tests/{i915 => intel}/gem_evict_alignment.c (100%)
>  rename tests/{i915 => intel}/gem_evict_everything.c (100%)
>  rename tests/{i915 => intel}/gem_exec_alignment.c (100%)
>  rename tests/{i915 => intel}/gem_exec_async.c (100%)
>  rename tests/{i915 => intel}/gem_exec_await.c (100%)
>  rename tests/{i915 => intel}/gem_exec_balancer.c (100%)
>  rename tests/{i915 => intel}/gem_exec_basic.c (100%)
>  rename tests/{i915 => intel}/gem_exec_big.c (100%)
>  rename tests/{i915 => intel}/gem_exec_capture.c (100%)
>  rename tests/{i915 => intel}/gem_exec_create.c (100%)
>  rename tests/{i915 => intel}/gem_exec_endless.c (100%)
>  rename tests/{i915 => intel}/gem_exec_fair.c (100%)
>  rename tests/{i915 => intel}/gem_exec_fence.c (100%)
>  rename tests/{i915 => intel}/gem_exec_flush.c (100%)
>  rename tests/{i915 => intel}/gem_exec_gttfill.c (100%)
>  rename tests/{i915 => intel}/gem_exec_latency.c (100%)
>  rename tests/{i915 => intel}/gem_exec_lut_handle.c (100%)
>  rename tests/{i915 => intel}/gem_exec_nop.c (100%)
>  rename tests/{i915 => intel}/gem_exec_parallel.c (100%)
>  rename tests/{i915 => intel}/gem_exec_params.c (100%)
>  rename tests/{i915 => intel}/gem_exec_reloc.c (100%)
>  rename tests/{i915 => intel}/gem_exec_schedule.c (100%)
>  rename tests/{i915 => intel}/gem_exec_store.c (100%)
>  rename tests/{i915 => intel}/gem_exec_suspend.c (100%)
>  rename tests/{i915 => intel}/gem_exec_whisper.c (100%)
>  rename tests/{i915 => intel}/gem_exercise_blt.c (100%)
>  rename tests/{i915 => intel}/gem_fd_exhaustion.c (100%)
>  rename tests/{i915 => intel}/gem_fence_thrash.c (100%)
>  rename tests/{i915 => intel}/gem_fence_upload.c (100%)
>  rename tests/{i915 => intel}/gem_fenced_exec_thrash.c (100%)
>  rename tests/{i915 => intel}/gem_flink_basic.c (100%)
>  rename tests/{i915 => intel}/gem_flink_race.c (100%)
>  rename tests/{i915 => intel}/gem_gpgpu_fill.c (100%)
>  rename tests/{i915 => intel}/gem_gtt_cpu_tlb.c (100%)
>  rename tests/{i915 => intel}/gem_gtt_hog.c (100%)
>  rename tests/{i915 => intel}/gem_gtt_speed.c (100%)
>  rename tests/{i915 => intel}/gem_huc_copy.c (100%)
>  rename tests/{i915 => intel}/gem_linear_blits.c (100%)
>  rename tests/{i915 => intel}/gem_lmem_evict.c (100%)
>  rename tests/{i915 => intel}/gem_lmem_swapping.c (100%)
>  rename tests/{i915 => intel}/gem_lut_handle.c (100%)
>  rename tests/{i915 => intel}/gem_madvise.c (100%)
>  rename tests/{i915 => intel}/gem_media_fill.c (100%)
>  rename tests/{i915 => intel}/gem_media_vme.c (100%)
>  rename tests/{i915 => intel}/gem_mmap.c (100%)
>  rename tests/{i915 => intel}/gem_mmap_gtt.c (100%)
>  rename tests/{i915 => intel}/gem_mmap_offset.c (100%)
>  rename tests/{i915 => intel}/gem_mmap_wc.c (100%)
>  rename tests/{i915 => intel}/gem_partial_pwrite_pread.c (100%)
>  rename tests/{i915 => intel}/gem_pipe_control_store_loop.c (100%)
>  rename tests/{i915 => intel}/gem_ppgtt.c (100%)
>  rename tests/{i915 => intel}/gem_pread.c (100%)
>  rename tests/{i915 => intel}/gem_pread_after_blit.c (100%)
>  rename tests/{i915 => intel}/gem_pwrite.c (100%)
>  rename tests/{i915 => intel}/gem_pwrite_snooped.c (100%)
>  rename tests/{i915 => intel}/gem_pxp.c (100%)
>  rename tests/{i915 => intel}/gem_read_read_speed.c (100%)
>  rename tests/{i915 => intel}/gem_readwrite.c (100%)
>  rename tests/{i915 => intel}/gem_reg_read.c (100%)
>  rename tests/{i915 => intel}/gem_render_copy.c (100%)
>  rename tests/{i915 => intel}/gem_render_copy_redux.c (100%)
>  rename tests/{i915 => intel}/gem_render_linear_blits.c (100%)
>  rename tests/{i915 => intel}/gem_render_tiled_blits.c (100%)
>  rename tests/{i915 => intel}/gem_request_retire.c (100%)
>  rename tests/{i915 => intel}/gem_reset_stats.c (100%)
>  rename tests/{i915 => intel}/gem_ringfill.c (100%)
>  rename tests/{i915 => intel}/gem_set_tiling_vs_blt.c (100%)
>  rename tests/{i915 => intel}/gem_set_tiling_vs_gtt.c (100%)
>  rename tests/{i915 => intel}/gem_set_tiling_vs_pwrite.c (100%)
>  rename tests/{i915 => intel}/gem_shrink.c (100%)
>  rename tests/{i915 => intel}/gem_softpin.c (100%)
>  rename tests/{i915 => intel}/gem_spin_batch.c (100%)
>  rename tests/{i915 => intel}/gem_streaming_writes.c (100%)
>  rename tests/{i915 => intel}/gem_stress.c (100%)
>  rename tests/{i915 => intel}/gem_sync.c (100%)
>  rename tests/{i915 => intel}/gem_tiled_blits.c (100%)
>  rename tests/{i915 => intel}/gem_tiled_fence_blits.c (100%)
>  rename tests/{i915 => intel}/gem_tiled_partial_pwrite_pread.c (100%)
>  rename tests/{i915 => intel}/gem_tiled_pread_basic.c (100%)
>  rename tests/{i915 => intel}/gem_tiled_pread_pwrite.c (100%)
>  rename tests/{i915 => intel}/gem_tiled_swapping.c (100%)
>  rename tests/{i915 => intel}/gem_tiled_wb.c (100%)
>  rename tests/{i915 => intel}/gem_tiled_wc.c (100%)
>  rename tests/{i915 => intel}/gem_tiling_max_stride.c (100%)
>  rename tests/{i915 => intel}/gem_unfence_active_buffers.c (100%)
>  rename tests/{i915 => intel}/gem_unref_active_buffers.c (100%)
>  rename tests/{i915 => intel}/gem_userptr_blits.c (100%)
>  rename tests/{i915 => intel}/gem_vm_create.c (100%)
>  rename tests/{i915 => intel}/gem_wait.c (100%)
>  rename tests/{i915 => intel}/gem_watchdog.c (100%)
>  rename tests/{i915 => intel}/gem_workarounds.c (100%)
>  rename tests/{i915 => intel}/gen3_mixed_blits.c (100%)
>  rename tests/{i915 => intel}/gen3_render_linear_blits.c (100%)
>  rename tests/{i915 => intel}/gen3_render_mixed_blits.c (100%)
>  rename tests/{i915 => intel}/gen3_render_tiledx_blits.c (100%)
>  rename tests/{i915 => intel}/gen3_render_tiledy_blits.c (100%)
>  rename tests/{i915 => intel}/gen7_exec_parse.c (100%)
>  rename tests/{i915 => intel}/gen9_exec_parse.c (100%)
>  rename tests/{i915 => intel}/i915_fb_tiling.c (100%)
>  rename tests/{i915 => intel}/i915_getparams_basic.c (100%)
>  rename tests/{i915 => intel}/i915_hangman.c (100%)
>  rename tests/{i915 => intel}/i915_hwmon.c (100%)
>  rename tests/{i915 => intel}/i915_module_load.c (100%)
>  rename tests/{i915 => intel}/i915_pciid.c (100%)
>  rename tests/{i915 => intel}/i915_pipe_stress.c (100%)
>  rename tests/{i915 => intel}/i915_pm_backlight.c (100%)
>  rename tests/{i915 => intel}/i915_pm_dc.c (100%)
>  rename tests/{i915 => intel}/i915_pm_freq_api.c (100%)
>  rename tests/{i915 => intel}/i915_pm_freq_mult.c (100%)
>  rename tests/{i915 => intel}/i915_pm_lpsp.c (100%)
>  rename tests/{i915 => intel}/i915_pm_rc6_residency.c (100%)
>  rename tests/{i915 => intel}/i915_pm_rpm.c (100%)
>  rename tests/{i915 => intel}/i915_pm_rps.c (100%)
>  rename tests/{i915 => intel}/i915_pm_sseu.c (100%)
>  rename tests/{i915 => intel}/i915_power.c (100%)
>  rename tests/{i915 => intel}/i915_query.c (100%)
>  rename tests/{i915 => intel}/i915_selftest.c (100%)
>  rename tests/{i915 => intel}/i915_suspend.c (100%)
>  rename tests/{i915 => intel}/i915_test_config.json (100%)
>  rename tests/{i915 => intel}/kms_big_fb.c (100%)
>  rename tests/{i915 => intel}/kms_big_joiner.c (100%)
>  rename tests/{i915 => intel}/kms_busy.c (100%)
>  rename tests/{i915 => intel}/kms_ccs.c (100%)
>  rename tests/{i915 => intel}/kms_cdclk.c (100%)
>  rename tests/{i915 => intel}/kms_dirtyfb.c (100%)
>  rename tests/{i915 => intel}/kms_draw_crc.c (100%)
>  rename tests/{i915 => intel}/kms_dsc.c (100%)
>  rename tests/{i915 => intel}/kms_dsc_helper.c (100%)
>  rename tests/{i915 => intel}/kms_dsc_helper.h (100%)
>  rename tests/{i915 => intel}/kms_fb_coherency.c (100%)
>  rename tests/{i915 => intel}/kms_fbcon_fbt.c (100%)
>  rename tests/{i915 => intel}/kms_fence_pin_leak.c (100%)
>  rename tests/{i915 => intel}/kms_flip_scaled_crc.c (100%)
>  rename tests/{i915 => intel}/kms_flip_tiling.c (100%)
>  rename tests/{i915 => intel}/kms_frontbuffer_tracking.c (100%)
>  rename tests/{i915 => intel}/kms_legacy_colorkey.c (100%)
>  rename tests/{i915 => intel}/kms_mmap_write_crc.c (100%)
>  rename tests/{i915 => intel}/kms_pipe_b_c_ivb.c (100%)
>  rename tests/{i915 => intel}/kms_psr.c (100%)
>  rename tests/{i915 => intel}/kms_psr2_sf.c (100%)
>  rename tests/{i915 => intel}/kms_psr2_su.c (100%)
>  rename tests/{i915 => intel}/kms_psr_stress_test.c (100%)
>  rename tests/{i915 => intel}/kms_pwrite_crc.c (100%)
>  rename tests/{i915 => intel}/kms_test_config.json (100%)
>  rename tests/{i915 => intel}/perf.c (100%)
>  rename tests/{i915 => intel}/perf_pmu.c (100%)
>  rename tests/{ => intel}/prime_busy.c (100%)
>  rename tests/{ => intel}/prime_mmap.c (100%)
>  rename tests/{ => intel}/prime_mmap_coherency.c (100%)
>  rename tests/{ => intel}/prime_mmap_kms.c (100%)
>  rename tests/{ => intel}/prime_self_import.c (100%)
>  rename tests/{i915 => intel}/sysfs_defaults.c (100%)
>  rename tests/{i915 => intel}/sysfs_heartbeat_interval.c (100%)
>  rename tests/{i915 => intel}/sysfs_preempt_timeout.c (100%)
>  rename tests/{i915 => intel}/sysfs_timeslice_duration.c (100%)
>  rename tests/{xe => intel}/xe_ccs.c (100%)
>  rename tests/{xe => intel}/xe_compute.c (100%)
>  rename tests/{xe => intel}/xe_create.c (100%)
>  rename tests/{xe => intel}/xe_debugfs.c (100%)
>  rename tests/{xe => intel}/xe_dma_buf_sync.c (100%)
>  rename tests/{xe => intel}/xe_evict.c (100%)
>  rename tests/{xe => intel}/xe_exec_balancer.c (100%)
>  rename tests/{xe => intel}/xe_exec_basic.c (100%)
>  rename tests/{xe => intel}/xe_exec_compute_mode.c (100%)
>  rename tests/{xe => intel}/xe_exec_fault_mode.c (100%)
>  rename tests/{xe => intel}/xe_exec_reset.c (100%)
>  rename tests/{xe => intel}/xe_exec_store.c (100%)
>  rename tests/{xe => intel}/xe_exec_threads.c (100%)
>  rename tests/{xe => intel}/xe_exercise_blt.c (100%)
>  rename tests/{xe => intel}/xe_gpgpu_fill.c (100%)
>  rename tests/{xe => intel}/xe_guc_pc.c (100%)
>  rename tests/{xe => intel}/xe_huc_copy.c (100%)
>  rename tests/{xe => intel}/xe_intel_bb.c (100%)
>  rename tests/{xe => intel}/xe_live_ktest.c (100%)
>  rename tests/{xe => intel}/xe_media_fill.c (100%)
>  rename tests/{xe => intel}/xe_mmap.c (100%)
>  rename tests/{xe => intel}/xe_mmio.c (100%)
>  rename tests/{xe => intel}/xe_module_load.c (100%)
>  rename tests/{xe => intel}/xe_noexec_ping_pong.c (100%)
>  rename tests/{xe => intel}/xe_pm.c (100%)
>  rename tests/{xe => intel}/xe_pm_residency.c (100%)
>  rename tests/{xe => intel}/xe_prime_self_import.c (100%)
>  rename tests/{xe => intel}/xe_query.c (100%)
>  rename tests/{xe => intel}/xe_spin_batch.c (100%)
>  rename tests/{xe => intel}/xe_sysfs_defaults.c (100%)
>  rename tests/{xe => intel}/xe_sysfs_scheduler.c (100%)
>  rename tests/{xe => intel}/xe_sysfs_tile.c (100%)
>  rename tests/{xe => intel}/xe_test_config.json (100%)
>  rename tests/{xe => intel}/xe_uevent.c (100%)
>  rename tests/{xe => intel}/xe_vm.c (100%)
>  rename tests/{xe => intel}/xe_waitfence.c (100%)
> 
> diff --git a/docs/testplan/meson.build b/docs/testplan/meson.build
> index 8d3ad952d..85f0cb4d6 100644
> --- a/docs/testplan/meson.build
> +++ b/docs/testplan/meson.build
> @@ -6,9 +6,9 @@ rst2pdf = find_program('rst2pdf', required: false)
>  
>  stylesheet = join_paths(meson.current_source_dir(), 'testplan.css')
>  
> -xe_test_config = join_paths(source_root, 'tests', 'xe', 'xe_test_config.json')
> -kms_test_config = join_paths(source_root, 'tests', 'i915', 'kms_test_config.json')
> -i915_test_config = join_paths(source_root, 'tests', 'i915', 'i915_test_config.json')
> +xe_test_config = join_paths(source_root, 'tests', 'intel', 'xe_test_config.json')
> +kms_test_config = join_paths(source_root, 'tests', 'intel', 'kms_test_config.json')
> +i915_test_config = join_paths(source_root, 'tests', 'intel', 'i915_test_config.json')
>  
>  check_testlist = []
>  if build_tests
> diff --git a/tests/i915/api_intel_allocator.c b/tests/intel/api_intel_allocator.c
> similarity index 100%
> rename from tests/i915/api_intel_allocator.c
> rename to tests/intel/api_intel_allocator.c
> diff --git a/tests/i915/api_intel_bb.c b/tests/intel/api_intel_bb.c
> similarity index 100%
> rename from tests/i915/api_intel_bb.c
> rename to tests/intel/api_intel_bb.c
> diff --git a/tests/debugfs_test.c b/tests/intel/debugfs_test.c
> similarity index 100%
> rename from tests/debugfs_test.c
> rename to tests/intel/debugfs_test.c
> diff --git a/tests/i915/drm_fdinfo.c b/tests/intel/drm_fdinfo.c
> similarity index 100%
> rename from tests/i915/drm_fdinfo.c
> rename to tests/intel/drm_fdinfo.c
> diff --git a/tests/i915/gem_bad_reloc.c b/tests/intel/gem_bad_reloc.c
> similarity index 100%
> rename from tests/i915/gem_bad_reloc.c
> rename to tests/intel/gem_bad_reloc.c
> diff --git a/tests/i915/gem_barrier_race.c b/tests/intel/gem_barrier_race.c
> similarity index 100%
> rename from tests/i915/gem_barrier_race.c
> rename to tests/intel/gem_barrier_race.c
> diff --git a/tests/i915/gem_basic.c b/tests/intel/gem_basic.c
> similarity index 100%
> rename from tests/i915/gem_basic.c
> rename to tests/intel/gem_basic.c
> diff --git a/tests/i915/gem_blits.c b/tests/intel/gem_blits.c
> similarity index 100%
> rename from tests/i915/gem_blits.c
> rename to tests/intel/gem_blits.c
> diff --git a/tests/i915/gem_busy.c b/tests/intel/gem_busy.c
> similarity index 100%
> rename from tests/i915/gem_busy.c
> rename to tests/intel/gem_busy.c
> diff --git a/tests/i915/gem_caching.c b/tests/intel/gem_caching.c
> similarity index 100%
> rename from tests/i915/gem_caching.c
> rename to tests/intel/gem_caching.c
> diff --git a/tests/i915/gem_ccs.c b/tests/intel/gem_ccs.c
> similarity index 100%
> rename from tests/i915/gem_ccs.c
> rename to tests/intel/gem_ccs.c
> diff --git a/tests/i915/gem_close.c b/tests/intel/gem_close.c
> similarity index 100%
> rename from tests/i915/gem_close.c
> rename to tests/intel/gem_close.c
> diff --git a/tests/i915/gem_close_race.c b/tests/intel/gem_close_race.c
> similarity index 100%
> rename from tests/i915/gem_close_race.c
> rename to tests/intel/gem_close_race.c
> diff --git a/tests/i915/gem_concurrent_all.c b/tests/intel/gem_concurrent_all.c
> similarity index 100%
> rename from tests/i915/gem_concurrent_all.c
> rename to tests/intel/gem_concurrent_all.c
> diff --git a/tests/i915/gem_concurrent_blit.c b/tests/intel/gem_concurrent_blit.c
> similarity index 100%
> rename from tests/i915/gem_concurrent_blit.c
> rename to tests/intel/gem_concurrent_blit.c
> diff --git a/tests/i915/gem_create.c b/tests/intel/gem_create.c
> similarity index 100%
> rename from tests/i915/gem_create.c
> rename to tests/intel/gem_create.c
> diff --git a/tests/i915/gem_cs_tlb.c b/tests/intel/gem_cs_tlb.c
> similarity index 100%
> rename from tests/i915/gem_cs_tlb.c
> rename to tests/intel/gem_cs_tlb.c
> diff --git a/tests/i915/gem_ctx_bad_destroy.c b/tests/intel/gem_ctx_bad_destroy.c
> similarity index 100%
> rename from tests/i915/gem_ctx_bad_destroy.c
> rename to tests/intel/gem_ctx_bad_destroy.c
> diff --git a/tests/i915/gem_ctx_create.c b/tests/intel/gem_ctx_create.c
> similarity index 100%
> rename from tests/i915/gem_ctx_create.c
> rename to tests/intel/gem_ctx_create.c
> diff --git a/tests/i915/gem_ctx_engines.c b/tests/intel/gem_ctx_engines.c
> similarity index 100%
> rename from tests/i915/gem_ctx_engines.c
> rename to tests/intel/gem_ctx_engines.c
> diff --git a/tests/i915/gem_ctx_exec.c b/tests/intel/gem_ctx_exec.c
> similarity index 100%
> rename from tests/i915/gem_ctx_exec.c
> rename to tests/intel/gem_ctx_exec.c
> diff --git a/tests/i915/gem_ctx_freq.c b/tests/intel/gem_ctx_freq.c
> similarity index 100%
> rename from tests/i915/gem_ctx_freq.c
> rename to tests/intel/gem_ctx_freq.c
> diff --git a/tests/i915/gem_ctx_isolation.c b/tests/intel/gem_ctx_isolation.c
> similarity index 100%
> rename from tests/i915/gem_ctx_isolation.c
> rename to tests/intel/gem_ctx_isolation.c
> diff --git a/tests/i915/gem_ctx_param.c b/tests/intel/gem_ctx_param.c
> similarity index 100%
> rename from tests/i915/gem_ctx_param.c
> rename to tests/intel/gem_ctx_param.c
> diff --git a/tests/i915/gem_ctx_persistence.c b/tests/intel/gem_ctx_persistence.c
> similarity index 100%
> rename from tests/i915/gem_ctx_persistence.c
> rename to tests/intel/gem_ctx_persistence.c
> diff --git a/tests/i915/gem_ctx_shared.c b/tests/intel/gem_ctx_shared.c
> similarity index 100%
> rename from tests/i915/gem_ctx_shared.c
> rename to tests/intel/gem_ctx_shared.c
> diff --git a/tests/i915/gem_ctx_sseu.c b/tests/intel/gem_ctx_sseu.c
> similarity index 100%
> rename from tests/i915/gem_ctx_sseu.c
> rename to tests/intel/gem_ctx_sseu.c
> diff --git a/tests/i915/gem_ctx_switch.c b/tests/intel/gem_ctx_switch.c
> similarity index 100%
> rename from tests/i915/gem_ctx_switch.c
> rename to tests/intel/gem_ctx_switch.c
> diff --git a/tests/i915/gem_eio.c b/tests/intel/gem_eio.c
> similarity index 100%
> rename from tests/i915/gem_eio.c
> rename to tests/intel/gem_eio.c
> diff --git a/tests/i915/gem_evict_alignment.c b/tests/intel/gem_evict_alignment.c
> similarity index 100%
> rename from tests/i915/gem_evict_alignment.c
> rename to tests/intel/gem_evict_alignment.c
> diff --git a/tests/i915/gem_evict_everything.c b/tests/intel/gem_evict_everything.c
> similarity index 100%
> rename from tests/i915/gem_evict_everything.c
> rename to tests/intel/gem_evict_everything.c
> diff --git a/tests/i915/gem_exec_alignment.c b/tests/intel/gem_exec_alignment.c
> similarity index 100%
> rename from tests/i915/gem_exec_alignment.c
> rename to tests/intel/gem_exec_alignment.c
> diff --git a/tests/i915/gem_exec_async.c b/tests/intel/gem_exec_async.c
> similarity index 100%
> rename from tests/i915/gem_exec_async.c
> rename to tests/intel/gem_exec_async.c
> diff --git a/tests/i915/gem_exec_await.c b/tests/intel/gem_exec_await.c
> similarity index 100%
> rename from tests/i915/gem_exec_await.c
> rename to tests/intel/gem_exec_await.c
> diff --git a/tests/i915/gem_exec_balancer.c b/tests/intel/gem_exec_balancer.c
> similarity index 100%
> rename from tests/i915/gem_exec_balancer.c
> rename to tests/intel/gem_exec_balancer.c
> diff --git a/tests/i915/gem_exec_basic.c b/tests/intel/gem_exec_basic.c
> similarity index 100%
> rename from tests/i915/gem_exec_basic.c
> rename to tests/intel/gem_exec_basic.c
> diff --git a/tests/i915/gem_exec_big.c b/tests/intel/gem_exec_big.c
> similarity index 100%
> rename from tests/i915/gem_exec_big.c
> rename to tests/intel/gem_exec_big.c
> diff --git a/tests/i915/gem_exec_capture.c b/tests/intel/gem_exec_capture.c
> similarity index 100%
> rename from tests/i915/gem_exec_capture.c
> rename to tests/intel/gem_exec_capture.c
> diff --git a/tests/i915/gem_exec_create.c b/tests/intel/gem_exec_create.c
> similarity index 100%
> rename from tests/i915/gem_exec_create.c
> rename to tests/intel/gem_exec_create.c
> diff --git a/tests/i915/gem_exec_endless.c b/tests/intel/gem_exec_endless.c
> similarity index 100%
> rename from tests/i915/gem_exec_endless.c
> rename to tests/intel/gem_exec_endless.c
> diff --git a/tests/i915/gem_exec_fair.c b/tests/intel/gem_exec_fair.c
> similarity index 100%
> rename from tests/i915/gem_exec_fair.c
> rename to tests/intel/gem_exec_fair.c
> diff --git a/tests/i915/gem_exec_fence.c b/tests/intel/gem_exec_fence.c
> similarity index 100%
> rename from tests/i915/gem_exec_fence.c
> rename to tests/intel/gem_exec_fence.c
> diff --git a/tests/i915/gem_exec_flush.c b/tests/intel/gem_exec_flush.c
> similarity index 100%
> rename from tests/i915/gem_exec_flush.c
> rename to tests/intel/gem_exec_flush.c
> diff --git a/tests/i915/gem_exec_gttfill.c b/tests/intel/gem_exec_gttfill.c
> similarity index 100%
> rename from tests/i915/gem_exec_gttfill.c
> rename to tests/intel/gem_exec_gttfill.c
> diff --git a/tests/i915/gem_exec_latency.c b/tests/intel/gem_exec_latency.c
> similarity index 100%
> rename from tests/i915/gem_exec_latency.c
> rename to tests/intel/gem_exec_latency.c
> diff --git a/tests/i915/gem_exec_lut_handle.c b/tests/intel/gem_exec_lut_handle.c
> similarity index 100%
> rename from tests/i915/gem_exec_lut_handle.c
> rename to tests/intel/gem_exec_lut_handle.c
> diff --git a/tests/i915/gem_exec_nop.c b/tests/intel/gem_exec_nop.c
> similarity index 100%
> rename from tests/i915/gem_exec_nop.c
> rename to tests/intel/gem_exec_nop.c
> diff --git a/tests/i915/gem_exec_parallel.c b/tests/intel/gem_exec_parallel.c
> similarity index 100%
> rename from tests/i915/gem_exec_parallel.c
> rename to tests/intel/gem_exec_parallel.c
> diff --git a/tests/i915/gem_exec_params.c b/tests/intel/gem_exec_params.c
> similarity index 100%
> rename from tests/i915/gem_exec_params.c
> rename to tests/intel/gem_exec_params.c
> diff --git a/tests/i915/gem_exec_reloc.c b/tests/intel/gem_exec_reloc.c
> similarity index 100%
> rename from tests/i915/gem_exec_reloc.c
> rename to tests/intel/gem_exec_reloc.c
> diff --git a/tests/i915/gem_exec_schedule.c b/tests/intel/gem_exec_schedule.c
> similarity index 100%
> rename from tests/i915/gem_exec_schedule.c
> rename to tests/intel/gem_exec_schedule.c
> diff --git a/tests/i915/gem_exec_store.c b/tests/intel/gem_exec_store.c
> similarity index 100%
> rename from tests/i915/gem_exec_store.c
> rename to tests/intel/gem_exec_store.c
> diff --git a/tests/i915/gem_exec_suspend.c b/tests/intel/gem_exec_suspend.c
> similarity index 100%
> rename from tests/i915/gem_exec_suspend.c
> rename to tests/intel/gem_exec_suspend.c
> diff --git a/tests/i915/gem_exec_whisper.c b/tests/intel/gem_exec_whisper.c
> similarity index 100%
> rename from tests/i915/gem_exec_whisper.c
> rename to tests/intel/gem_exec_whisper.c
> diff --git a/tests/i915/gem_exercise_blt.c b/tests/intel/gem_exercise_blt.c
> similarity index 100%
> rename from tests/i915/gem_exercise_blt.c
> rename to tests/intel/gem_exercise_blt.c
> diff --git a/tests/i915/gem_fd_exhaustion.c b/tests/intel/gem_fd_exhaustion.c
> similarity index 100%
> rename from tests/i915/gem_fd_exhaustion.c
> rename to tests/intel/gem_fd_exhaustion.c
> diff --git a/tests/i915/gem_fence_thrash.c b/tests/intel/gem_fence_thrash.c
> similarity index 100%
> rename from tests/i915/gem_fence_thrash.c
> rename to tests/intel/gem_fence_thrash.c
> diff --git a/tests/i915/gem_fence_upload.c b/tests/intel/gem_fence_upload.c
> similarity index 100%
> rename from tests/i915/gem_fence_upload.c
> rename to tests/intel/gem_fence_upload.c
> diff --git a/tests/i915/gem_fenced_exec_thrash.c b/tests/intel/gem_fenced_exec_thrash.c
> similarity index 100%
> rename from tests/i915/gem_fenced_exec_thrash.c
> rename to tests/intel/gem_fenced_exec_thrash.c
> diff --git a/tests/i915/gem_flink_basic.c b/tests/intel/gem_flink_basic.c
> similarity index 100%
> rename from tests/i915/gem_flink_basic.c
> rename to tests/intel/gem_flink_basic.c
> diff --git a/tests/i915/gem_flink_race.c b/tests/intel/gem_flink_race.c
> similarity index 100%
> rename from tests/i915/gem_flink_race.c
> rename to tests/intel/gem_flink_race.c
> diff --git a/tests/i915/gem_gpgpu_fill.c b/tests/intel/gem_gpgpu_fill.c
> similarity index 100%
> rename from tests/i915/gem_gpgpu_fill.c
> rename to tests/intel/gem_gpgpu_fill.c
> diff --git a/tests/i915/gem_gtt_cpu_tlb.c b/tests/intel/gem_gtt_cpu_tlb.c
> similarity index 100%
> rename from tests/i915/gem_gtt_cpu_tlb.c
> rename to tests/intel/gem_gtt_cpu_tlb.c
> diff --git a/tests/i915/gem_gtt_hog.c b/tests/intel/gem_gtt_hog.c
> similarity index 100%
> rename from tests/i915/gem_gtt_hog.c
> rename to tests/intel/gem_gtt_hog.c
> diff --git a/tests/i915/gem_gtt_speed.c b/tests/intel/gem_gtt_speed.c
> similarity index 100%
> rename from tests/i915/gem_gtt_speed.c
> rename to tests/intel/gem_gtt_speed.c
> diff --git a/tests/i915/gem_huc_copy.c b/tests/intel/gem_huc_copy.c
> similarity index 100%
> rename from tests/i915/gem_huc_copy.c
> rename to tests/intel/gem_huc_copy.c
> diff --git a/tests/i915/gem_linear_blits.c b/tests/intel/gem_linear_blits.c
> similarity index 100%
> rename from tests/i915/gem_linear_blits.c
> rename to tests/intel/gem_linear_blits.c
> diff --git a/tests/i915/gem_lmem_evict.c b/tests/intel/gem_lmem_evict.c
> similarity index 100%
> rename from tests/i915/gem_lmem_evict.c
> rename to tests/intel/gem_lmem_evict.c
> diff --git a/tests/i915/gem_lmem_swapping.c b/tests/intel/gem_lmem_swapping.c
> similarity index 100%
> rename from tests/i915/gem_lmem_swapping.c
> rename to tests/intel/gem_lmem_swapping.c
> diff --git a/tests/i915/gem_lut_handle.c b/tests/intel/gem_lut_handle.c
> similarity index 100%
> rename from tests/i915/gem_lut_handle.c
> rename to tests/intel/gem_lut_handle.c
> diff --git a/tests/i915/gem_madvise.c b/tests/intel/gem_madvise.c
> similarity index 100%
> rename from tests/i915/gem_madvise.c
> rename to tests/intel/gem_madvise.c
> diff --git a/tests/i915/gem_media_fill.c b/tests/intel/gem_media_fill.c
> similarity index 100%
> rename from tests/i915/gem_media_fill.c
> rename to tests/intel/gem_media_fill.c
> diff --git a/tests/i915/gem_media_vme.c b/tests/intel/gem_media_vme.c
> similarity index 100%
> rename from tests/i915/gem_media_vme.c
> rename to tests/intel/gem_media_vme.c
> diff --git a/tests/i915/gem_mmap.c b/tests/intel/gem_mmap.c
> similarity index 100%
> rename from tests/i915/gem_mmap.c
> rename to tests/intel/gem_mmap.c
> diff --git a/tests/i915/gem_mmap_gtt.c b/tests/intel/gem_mmap_gtt.c
> similarity index 100%
> rename from tests/i915/gem_mmap_gtt.c
> rename to tests/intel/gem_mmap_gtt.c
> diff --git a/tests/i915/gem_mmap_offset.c b/tests/intel/gem_mmap_offset.c
> similarity index 100%
> rename from tests/i915/gem_mmap_offset.c
> rename to tests/intel/gem_mmap_offset.c
> diff --git a/tests/i915/gem_mmap_wc.c b/tests/intel/gem_mmap_wc.c
> similarity index 100%
> rename from tests/i915/gem_mmap_wc.c
> rename to tests/intel/gem_mmap_wc.c
> diff --git a/tests/i915/gem_partial_pwrite_pread.c b/tests/intel/gem_partial_pwrite_pread.c
> similarity index 100%
> rename from tests/i915/gem_partial_pwrite_pread.c
> rename to tests/intel/gem_partial_pwrite_pread.c
> diff --git a/tests/i915/gem_pipe_control_store_loop.c b/tests/intel/gem_pipe_control_store_loop.c
> similarity index 100%
> rename from tests/i915/gem_pipe_control_store_loop.c
> rename to tests/intel/gem_pipe_control_store_loop.c
> diff --git a/tests/i915/gem_ppgtt.c b/tests/intel/gem_ppgtt.c
> similarity index 100%
> rename from tests/i915/gem_ppgtt.c
> rename to tests/intel/gem_ppgtt.c
> diff --git a/tests/i915/gem_pread.c b/tests/intel/gem_pread.c
> similarity index 100%
> rename from tests/i915/gem_pread.c
> rename to tests/intel/gem_pread.c
> diff --git a/tests/i915/gem_pread_after_blit.c b/tests/intel/gem_pread_after_blit.c
> similarity index 100%
> rename from tests/i915/gem_pread_after_blit.c
> rename to tests/intel/gem_pread_after_blit.c
> diff --git a/tests/i915/gem_pwrite.c b/tests/intel/gem_pwrite.c
> similarity index 100%
> rename from tests/i915/gem_pwrite.c
> rename to tests/intel/gem_pwrite.c
> diff --git a/tests/i915/gem_pwrite_snooped.c b/tests/intel/gem_pwrite_snooped.c
> similarity index 100%
> rename from tests/i915/gem_pwrite_snooped.c
> rename to tests/intel/gem_pwrite_snooped.c
> diff --git a/tests/i915/gem_pxp.c b/tests/intel/gem_pxp.c
> similarity index 100%
> rename from tests/i915/gem_pxp.c
> rename to tests/intel/gem_pxp.c
> diff --git a/tests/i915/gem_read_read_speed.c b/tests/intel/gem_read_read_speed.c
> similarity index 100%
> rename from tests/i915/gem_read_read_speed.c
> rename to tests/intel/gem_read_read_speed.c
> diff --git a/tests/i915/gem_readwrite.c b/tests/intel/gem_readwrite.c
> similarity index 100%
> rename from tests/i915/gem_readwrite.c
> rename to tests/intel/gem_readwrite.c
> diff --git a/tests/i915/gem_reg_read.c b/tests/intel/gem_reg_read.c
> similarity index 100%
> rename from tests/i915/gem_reg_read.c
> rename to tests/intel/gem_reg_read.c
> diff --git a/tests/i915/gem_render_copy.c b/tests/intel/gem_render_copy.c
> similarity index 100%
> rename from tests/i915/gem_render_copy.c
> rename to tests/intel/gem_render_copy.c
> diff --git a/tests/i915/gem_render_copy_redux.c b/tests/intel/gem_render_copy_redux.c
> similarity index 100%
> rename from tests/i915/gem_render_copy_redux.c
> rename to tests/intel/gem_render_copy_redux.c
> diff --git a/tests/i915/gem_render_linear_blits.c b/tests/intel/gem_render_linear_blits.c
> similarity index 100%
> rename from tests/i915/gem_render_linear_blits.c
> rename to tests/intel/gem_render_linear_blits.c
> diff --git a/tests/i915/gem_render_tiled_blits.c b/tests/intel/gem_render_tiled_blits.c
> similarity index 100%
> rename from tests/i915/gem_render_tiled_blits.c
> rename to tests/intel/gem_render_tiled_blits.c
> diff --git a/tests/i915/gem_request_retire.c b/tests/intel/gem_request_retire.c
> similarity index 100%
> rename from tests/i915/gem_request_retire.c
> rename to tests/intel/gem_request_retire.c
> diff --git a/tests/i915/gem_reset_stats.c b/tests/intel/gem_reset_stats.c
> similarity index 100%
> rename from tests/i915/gem_reset_stats.c
> rename to tests/intel/gem_reset_stats.c
> diff --git a/tests/i915/gem_ringfill.c b/tests/intel/gem_ringfill.c
> similarity index 100%
> rename from tests/i915/gem_ringfill.c
> rename to tests/intel/gem_ringfill.c
> diff --git a/tests/i915/gem_set_tiling_vs_blt.c b/tests/intel/gem_set_tiling_vs_blt.c
> similarity index 100%
> rename from tests/i915/gem_set_tiling_vs_blt.c
> rename to tests/intel/gem_set_tiling_vs_blt.c
> diff --git a/tests/i915/gem_set_tiling_vs_gtt.c b/tests/intel/gem_set_tiling_vs_gtt.c
> similarity index 100%
> rename from tests/i915/gem_set_tiling_vs_gtt.c
> rename to tests/intel/gem_set_tiling_vs_gtt.c
> diff --git a/tests/i915/gem_set_tiling_vs_pwrite.c b/tests/intel/gem_set_tiling_vs_pwrite.c
> similarity index 100%
> rename from tests/i915/gem_set_tiling_vs_pwrite.c
> rename to tests/intel/gem_set_tiling_vs_pwrite.c
> diff --git a/tests/i915/gem_shrink.c b/tests/intel/gem_shrink.c
> similarity index 100%
> rename from tests/i915/gem_shrink.c
> rename to tests/intel/gem_shrink.c
> diff --git a/tests/i915/gem_softpin.c b/tests/intel/gem_softpin.c
> similarity index 100%
> rename from tests/i915/gem_softpin.c
> rename to tests/intel/gem_softpin.c
> diff --git a/tests/i915/gem_spin_batch.c b/tests/intel/gem_spin_batch.c
> similarity index 100%
> rename from tests/i915/gem_spin_batch.c
> rename to tests/intel/gem_spin_batch.c
> diff --git a/tests/i915/gem_streaming_writes.c b/tests/intel/gem_streaming_writes.c
> similarity index 100%
> rename from tests/i915/gem_streaming_writes.c
> rename to tests/intel/gem_streaming_writes.c
> diff --git a/tests/i915/gem_stress.c b/tests/intel/gem_stress.c
> similarity index 100%
> rename from tests/i915/gem_stress.c
> rename to tests/intel/gem_stress.c
> diff --git a/tests/i915/gem_sync.c b/tests/intel/gem_sync.c
> similarity index 100%
> rename from tests/i915/gem_sync.c
> rename to tests/intel/gem_sync.c
> diff --git a/tests/i915/gem_tiled_blits.c b/tests/intel/gem_tiled_blits.c
> similarity index 100%
> rename from tests/i915/gem_tiled_blits.c
> rename to tests/intel/gem_tiled_blits.c
> diff --git a/tests/i915/gem_tiled_fence_blits.c b/tests/intel/gem_tiled_fence_blits.c
> similarity index 100%
> rename from tests/i915/gem_tiled_fence_blits.c
> rename to tests/intel/gem_tiled_fence_blits.c
> diff --git a/tests/i915/gem_tiled_partial_pwrite_pread.c b/tests/intel/gem_tiled_partial_pwrite_pread.c
> similarity index 100%
> rename from tests/i915/gem_tiled_partial_pwrite_pread.c
> rename to tests/intel/gem_tiled_partial_pwrite_pread.c
> diff --git a/tests/i915/gem_tiled_pread_basic.c b/tests/intel/gem_tiled_pread_basic.c
> similarity index 100%
> rename from tests/i915/gem_tiled_pread_basic.c
> rename to tests/intel/gem_tiled_pread_basic.c
> diff --git a/tests/i915/gem_tiled_pread_pwrite.c b/tests/intel/gem_tiled_pread_pwrite.c
> similarity index 100%
> rename from tests/i915/gem_tiled_pread_pwrite.c
> rename to tests/intel/gem_tiled_pread_pwrite.c
> diff --git a/tests/i915/gem_tiled_swapping.c b/tests/intel/gem_tiled_swapping.c
> similarity index 100%
> rename from tests/i915/gem_tiled_swapping.c
> rename to tests/intel/gem_tiled_swapping.c
> diff --git a/tests/i915/gem_tiled_wb.c b/tests/intel/gem_tiled_wb.c
> similarity index 100%
> rename from tests/i915/gem_tiled_wb.c
> rename to tests/intel/gem_tiled_wb.c
> diff --git a/tests/i915/gem_tiled_wc.c b/tests/intel/gem_tiled_wc.c
> similarity index 100%
> rename from tests/i915/gem_tiled_wc.c
> rename to tests/intel/gem_tiled_wc.c
> diff --git a/tests/i915/gem_tiling_max_stride.c b/tests/intel/gem_tiling_max_stride.c
> similarity index 100%
> rename from tests/i915/gem_tiling_max_stride.c
> rename to tests/intel/gem_tiling_max_stride.c
> diff --git a/tests/i915/gem_unfence_active_buffers.c b/tests/intel/gem_unfence_active_buffers.c
> similarity index 100%
> rename from tests/i915/gem_unfence_active_buffers.c
> rename to tests/intel/gem_unfence_active_buffers.c
> diff --git a/tests/i915/gem_unref_active_buffers.c b/tests/intel/gem_unref_active_buffers.c
> similarity index 100%
> rename from tests/i915/gem_unref_active_buffers.c
> rename to tests/intel/gem_unref_active_buffers.c
> diff --git a/tests/i915/gem_userptr_blits.c b/tests/intel/gem_userptr_blits.c
> similarity index 100%
> rename from tests/i915/gem_userptr_blits.c
> rename to tests/intel/gem_userptr_blits.c
> diff --git a/tests/i915/gem_vm_create.c b/tests/intel/gem_vm_create.c
> similarity index 100%
> rename from tests/i915/gem_vm_create.c
> rename to tests/intel/gem_vm_create.c
> diff --git a/tests/i915/gem_wait.c b/tests/intel/gem_wait.c
> similarity index 100%
> rename from tests/i915/gem_wait.c
> rename to tests/intel/gem_wait.c
> diff --git a/tests/i915/gem_watchdog.c b/tests/intel/gem_watchdog.c
> similarity index 100%
> rename from tests/i915/gem_watchdog.c
> rename to tests/intel/gem_watchdog.c
> diff --git a/tests/i915/gem_workarounds.c b/tests/intel/gem_workarounds.c
> similarity index 100%
> rename from tests/i915/gem_workarounds.c
> rename to tests/intel/gem_workarounds.c
> diff --git a/tests/i915/gen3_mixed_blits.c b/tests/intel/gen3_mixed_blits.c
> similarity index 100%
> rename from tests/i915/gen3_mixed_blits.c
> rename to tests/intel/gen3_mixed_blits.c
> diff --git a/tests/i915/gen3_render_linear_blits.c b/tests/intel/gen3_render_linear_blits.c
> similarity index 100%
> rename from tests/i915/gen3_render_linear_blits.c
> rename to tests/intel/gen3_render_linear_blits.c
> diff --git a/tests/i915/gen3_render_mixed_blits.c b/tests/intel/gen3_render_mixed_blits.c
> similarity index 100%
> rename from tests/i915/gen3_render_mixed_blits.c
> rename to tests/intel/gen3_render_mixed_blits.c
> diff --git a/tests/i915/gen3_render_tiledx_blits.c b/tests/intel/gen3_render_tiledx_blits.c
> similarity index 100%
> rename from tests/i915/gen3_render_tiledx_blits.c
> rename to tests/intel/gen3_render_tiledx_blits.c
> diff --git a/tests/i915/gen3_render_tiledy_blits.c b/tests/intel/gen3_render_tiledy_blits.c
> similarity index 100%
> rename from tests/i915/gen3_render_tiledy_blits.c
> rename to tests/intel/gen3_render_tiledy_blits.c
> diff --git a/tests/i915/gen7_exec_parse.c b/tests/intel/gen7_exec_parse.c
> similarity index 100%
> rename from tests/i915/gen7_exec_parse.c
> rename to tests/intel/gen7_exec_parse.c
> diff --git a/tests/i915/gen9_exec_parse.c b/tests/intel/gen9_exec_parse.c
> similarity index 100%
> rename from tests/i915/gen9_exec_parse.c
> rename to tests/intel/gen9_exec_parse.c
> diff --git a/tests/i915/i915_fb_tiling.c b/tests/intel/i915_fb_tiling.c
> similarity index 100%
> rename from tests/i915/i915_fb_tiling.c
> rename to tests/intel/i915_fb_tiling.c
> diff --git a/tests/i915/i915_getparams_basic.c b/tests/intel/i915_getparams_basic.c
> similarity index 100%
> rename from tests/i915/i915_getparams_basic.c
> rename to tests/intel/i915_getparams_basic.c
> diff --git a/tests/i915/i915_hangman.c b/tests/intel/i915_hangman.c
> similarity index 100%
> rename from tests/i915/i915_hangman.c
> rename to tests/intel/i915_hangman.c
> diff --git a/tests/i915/i915_hwmon.c b/tests/intel/i915_hwmon.c
> similarity index 100%
> rename from tests/i915/i915_hwmon.c
> rename to tests/intel/i915_hwmon.c
> diff --git a/tests/i915/i915_module_load.c b/tests/intel/i915_module_load.c
> similarity index 100%
> rename from tests/i915/i915_module_load.c
> rename to tests/intel/i915_module_load.c
> diff --git a/tests/i915/i915_pciid.c b/tests/intel/i915_pciid.c
> similarity index 100%
> rename from tests/i915/i915_pciid.c
> rename to tests/intel/i915_pciid.c
> diff --git a/tests/i915/i915_pipe_stress.c b/tests/intel/i915_pipe_stress.c
> similarity index 100%
> rename from tests/i915/i915_pipe_stress.c
> rename to tests/intel/i915_pipe_stress.c
> diff --git a/tests/i915/i915_pm_backlight.c b/tests/intel/i915_pm_backlight.c
> similarity index 100%
> rename from tests/i915/i915_pm_backlight.c
> rename to tests/intel/i915_pm_backlight.c
> diff --git a/tests/i915/i915_pm_dc.c b/tests/intel/i915_pm_dc.c
> similarity index 100%
> rename from tests/i915/i915_pm_dc.c
> rename to tests/intel/i915_pm_dc.c
> diff --git a/tests/i915/i915_pm_freq_api.c b/tests/intel/i915_pm_freq_api.c
> similarity index 100%
> rename from tests/i915/i915_pm_freq_api.c
> rename to tests/intel/i915_pm_freq_api.c
> diff --git a/tests/i915/i915_pm_freq_mult.c b/tests/intel/i915_pm_freq_mult.c
> similarity index 100%
> rename from tests/i915/i915_pm_freq_mult.c
> rename to tests/intel/i915_pm_freq_mult.c
> diff --git a/tests/i915/i915_pm_lpsp.c b/tests/intel/i915_pm_lpsp.c
> similarity index 100%
> rename from tests/i915/i915_pm_lpsp.c
> rename to tests/intel/i915_pm_lpsp.c
> diff --git a/tests/i915/i915_pm_rc6_residency.c b/tests/intel/i915_pm_rc6_residency.c
> similarity index 100%
> rename from tests/i915/i915_pm_rc6_residency.c
> rename to tests/intel/i915_pm_rc6_residency.c
> diff --git a/tests/i915/i915_pm_rpm.c b/tests/intel/i915_pm_rpm.c
> similarity index 100%
> rename from tests/i915/i915_pm_rpm.c
> rename to tests/intel/i915_pm_rpm.c
> diff --git a/tests/i915/i915_pm_rps.c b/tests/intel/i915_pm_rps.c
> similarity index 100%
> rename from tests/i915/i915_pm_rps.c
> rename to tests/intel/i915_pm_rps.c
> diff --git a/tests/i915/i915_pm_sseu.c b/tests/intel/i915_pm_sseu.c
> similarity index 100%
> rename from tests/i915/i915_pm_sseu.c
> rename to tests/intel/i915_pm_sseu.c
> diff --git a/tests/i915/i915_power.c b/tests/intel/i915_power.c
> similarity index 100%
> rename from tests/i915/i915_power.c
> rename to tests/intel/i915_power.c
> diff --git a/tests/i915/i915_query.c b/tests/intel/i915_query.c
> similarity index 100%
> rename from tests/i915/i915_query.c
> rename to tests/intel/i915_query.c
> diff --git a/tests/i915/i915_selftest.c b/tests/intel/i915_selftest.c
> similarity index 100%
> rename from tests/i915/i915_selftest.c
> rename to tests/intel/i915_selftest.c
> diff --git a/tests/i915/i915_suspend.c b/tests/intel/i915_suspend.c
> similarity index 100%
> rename from tests/i915/i915_suspend.c
> rename to tests/intel/i915_suspend.c
> diff --git a/tests/i915/i915_test_config.json b/tests/intel/i915_test_config.json
> similarity index 100%
> rename from tests/i915/i915_test_config.json
> rename to tests/intel/i915_test_config.json
> diff --git a/tests/i915/kms_big_fb.c b/tests/intel/kms_big_fb.c
> similarity index 100%
> rename from tests/i915/kms_big_fb.c
> rename to tests/intel/kms_big_fb.c
> diff --git a/tests/i915/kms_big_joiner.c b/tests/intel/kms_big_joiner.c
> similarity index 100%
> rename from tests/i915/kms_big_joiner.c
> rename to tests/intel/kms_big_joiner.c
> diff --git a/tests/i915/kms_busy.c b/tests/intel/kms_busy.c
> similarity index 100%
> rename from tests/i915/kms_busy.c
> rename to tests/intel/kms_busy.c
> diff --git a/tests/i915/kms_ccs.c b/tests/intel/kms_ccs.c
> similarity index 100%
> rename from tests/i915/kms_ccs.c
> rename to tests/intel/kms_ccs.c
> diff --git a/tests/i915/kms_cdclk.c b/tests/intel/kms_cdclk.c
> similarity index 100%
> rename from tests/i915/kms_cdclk.c
> rename to tests/intel/kms_cdclk.c
> diff --git a/tests/i915/kms_dirtyfb.c b/tests/intel/kms_dirtyfb.c
> similarity index 100%
> rename from tests/i915/kms_dirtyfb.c
> rename to tests/intel/kms_dirtyfb.c
> diff --git a/tests/i915/kms_draw_crc.c b/tests/intel/kms_draw_crc.c
> similarity index 100%
> rename from tests/i915/kms_draw_crc.c
> rename to tests/intel/kms_draw_crc.c
> diff --git a/tests/i915/kms_dsc.c b/tests/intel/kms_dsc.c
> similarity index 100%
> rename from tests/i915/kms_dsc.c
> rename to tests/intel/kms_dsc.c
> diff --git a/tests/i915/kms_dsc_helper.c b/tests/intel/kms_dsc_helper.c
> similarity index 100%
> rename from tests/i915/kms_dsc_helper.c
> rename to tests/intel/kms_dsc_helper.c
> diff --git a/tests/i915/kms_dsc_helper.h b/tests/intel/kms_dsc_helper.h
> similarity index 100%
> rename from tests/i915/kms_dsc_helper.h
> rename to tests/intel/kms_dsc_helper.h
> diff --git a/tests/i915/kms_fb_coherency.c b/tests/intel/kms_fb_coherency.c
> similarity index 100%
> rename from tests/i915/kms_fb_coherency.c
> rename to tests/intel/kms_fb_coherency.c
> diff --git a/tests/i915/kms_fbcon_fbt.c b/tests/intel/kms_fbcon_fbt.c
> similarity index 100%
> rename from tests/i915/kms_fbcon_fbt.c
> rename to tests/intel/kms_fbcon_fbt.c
> diff --git a/tests/i915/kms_fence_pin_leak.c b/tests/intel/kms_fence_pin_leak.c
> similarity index 100%
> rename from tests/i915/kms_fence_pin_leak.c
> rename to tests/intel/kms_fence_pin_leak.c
> diff --git a/tests/i915/kms_flip_scaled_crc.c b/tests/intel/kms_flip_scaled_crc.c
> similarity index 100%
> rename from tests/i915/kms_flip_scaled_crc.c
> rename to tests/intel/kms_flip_scaled_crc.c
> diff --git a/tests/i915/kms_flip_tiling.c b/tests/intel/kms_flip_tiling.c
> similarity index 100%
> rename from tests/i915/kms_flip_tiling.c
> rename to tests/intel/kms_flip_tiling.c
> diff --git a/tests/i915/kms_frontbuffer_tracking.c b/tests/intel/kms_frontbuffer_tracking.c
> similarity index 100%
> rename from tests/i915/kms_frontbuffer_tracking.c
> rename to tests/intel/kms_frontbuffer_tracking.c
> diff --git a/tests/i915/kms_legacy_colorkey.c b/tests/intel/kms_legacy_colorkey.c
> similarity index 100%
> rename from tests/i915/kms_legacy_colorkey.c
> rename to tests/intel/kms_legacy_colorkey.c
> diff --git a/tests/i915/kms_mmap_write_crc.c b/tests/intel/kms_mmap_write_crc.c
> similarity index 100%
> rename from tests/i915/kms_mmap_write_crc.c
> rename to tests/intel/kms_mmap_write_crc.c
> diff --git a/tests/i915/kms_pipe_b_c_ivb.c b/tests/intel/kms_pipe_b_c_ivb.c
> similarity index 100%
> rename from tests/i915/kms_pipe_b_c_ivb.c
> rename to tests/intel/kms_pipe_b_c_ivb.c
> diff --git a/tests/i915/kms_psr.c b/tests/intel/kms_psr.c
> similarity index 100%
> rename from tests/i915/kms_psr.c
> rename to tests/intel/kms_psr.c
> diff --git a/tests/i915/kms_psr2_sf.c b/tests/intel/kms_psr2_sf.c
> similarity index 100%
> rename from tests/i915/kms_psr2_sf.c
> rename to tests/intel/kms_psr2_sf.c
> diff --git a/tests/i915/kms_psr2_su.c b/tests/intel/kms_psr2_su.c
> similarity index 100%
> rename from tests/i915/kms_psr2_su.c
> rename to tests/intel/kms_psr2_su.c
> diff --git a/tests/i915/kms_psr_stress_test.c b/tests/intel/kms_psr_stress_test.c
> similarity index 100%
> rename from tests/i915/kms_psr_stress_test.c
> rename to tests/intel/kms_psr_stress_test.c
> diff --git a/tests/i915/kms_pwrite_crc.c b/tests/intel/kms_pwrite_crc.c
> similarity index 100%
> rename from tests/i915/kms_pwrite_crc.c
> rename to tests/intel/kms_pwrite_crc.c
> diff --git a/tests/i915/kms_test_config.json b/tests/intel/kms_test_config.json
> similarity index 100%
> rename from tests/i915/kms_test_config.json
> rename to tests/intel/kms_test_config.json
> diff --git a/tests/i915/perf.c b/tests/intel/perf.c
> similarity index 100%
> rename from tests/i915/perf.c
> rename to tests/intel/perf.c
> diff --git a/tests/i915/perf_pmu.c b/tests/intel/perf_pmu.c
> similarity index 100%
> rename from tests/i915/perf_pmu.c
> rename to tests/intel/perf_pmu.c
> diff --git a/tests/prime_busy.c b/tests/intel/prime_busy.c
> similarity index 100%
> rename from tests/prime_busy.c
> rename to tests/intel/prime_busy.c
> diff --git a/tests/prime_mmap.c b/tests/intel/prime_mmap.c
> similarity index 100%
> rename from tests/prime_mmap.c
> rename to tests/intel/prime_mmap.c
> diff --git a/tests/prime_mmap_coherency.c b/tests/intel/prime_mmap_coherency.c
> similarity index 100%
> rename from tests/prime_mmap_coherency.c
> rename to tests/intel/prime_mmap_coherency.c
> diff --git a/tests/prime_mmap_kms.c b/tests/intel/prime_mmap_kms.c
> similarity index 100%
> rename from tests/prime_mmap_kms.c
> rename to tests/intel/prime_mmap_kms.c
> diff --git a/tests/prime_self_import.c b/tests/intel/prime_self_import.c
> similarity index 100%
> rename from tests/prime_self_import.c
> rename to tests/intel/prime_self_import.c
> diff --git a/tests/i915/sysfs_defaults.c b/tests/intel/sysfs_defaults.c
> similarity index 100%
> rename from tests/i915/sysfs_defaults.c
> rename to tests/intel/sysfs_defaults.c
> diff --git a/tests/i915/sysfs_heartbeat_interval.c b/tests/intel/sysfs_heartbeat_interval.c
> similarity index 100%
> rename from tests/i915/sysfs_heartbeat_interval.c
> rename to tests/intel/sysfs_heartbeat_interval.c
> diff --git a/tests/i915/sysfs_preempt_timeout.c b/tests/intel/sysfs_preempt_timeout.c
> similarity index 100%
> rename from tests/i915/sysfs_preempt_timeout.c
> rename to tests/intel/sysfs_preempt_timeout.c
> diff --git a/tests/i915/sysfs_timeslice_duration.c b/tests/intel/sysfs_timeslice_duration.c
> similarity index 100%
> rename from tests/i915/sysfs_timeslice_duration.c
> rename to tests/intel/sysfs_timeslice_duration.c
> diff --git a/tests/xe/xe_ccs.c b/tests/intel/xe_ccs.c
> similarity index 100%
> rename from tests/xe/xe_ccs.c
> rename to tests/intel/xe_ccs.c
> diff --git a/tests/xe/xe_compute.c b/tests/intel/xe_compute.c
> similarity index 100%
> rename from tests/xe/xe_compute.c
> rename to tests/intel/xe_compute.c
> diff --git a/tests/xe/xe_create.c b/tests/intel/xe_create.c
> similarity index 100%
> rename from tests/xe/xe_create.c
> rename to tests/intel/xe_create.c
> diff --git a/tests/xe/xe_debugfs.c b/tests/intel/xe_debugfs.c
> similarity index 100%
> rename from tests/xe/xe_debugfs.c
> rename to tests/intel/xe_debugfs.c
> diff --git a/tests/xe/xe_dma_buf_sync.c b/tests/intel/xe_dma_buf_sync.c
> similarity index 100%
> rename from tests/xe/xe_dma_buf_sync.c
> rename to tests/intel/xe_dma_buf_sync.c
> diff --git a/tests/xe/xe_evict.c b/tests/intel/xe_evict.c
> similarity index 100%
> rename from tests/xe/xe_evict.c
> rename to tests/intel/xe_evict.c
> diff --git a/tests/xe/xe_exec_balancer.c b/tests/intel/xe_exec_balancer.c
> similarity index 100%
> rename from tests/xe/xe_exec_balancer.c
> rename to tests/intel/xe_exec_balancer.c
> diff --git a/tests/xe/xe_exec_basic.c b/tests/intel/xe_exec_basic.c
> similarity index 100%
> rename from tests/xe/xe_exec_basic.c
> rename to tests/intel/xe_exec_basic.c
> diff --git a/tests/xe/xe_exec_compute_mode.c b/tests/intel/xe_exec_compute_mode.c
> similarity index 100%
> rename from tests/xe/xe_exec_compute_mode.c
> rename to tests/intel/xe_exec_compute_mode.c
> diff --git a/tests/xe/xe_exec_fault_mode.c b/tests/intel/xe_exec_fault_mode.c
> similarity index 100%
> rename from tests/xe/xe_exec_fault_mode.c
> rename to tests/intel/xe_exec_fault_mode.c
> diff --git a/tests/xe/xe_exec_reset.c b/tests/intel/xe_exec_reset.c
> similarity index 100%
> rename from tests/xe/xe_exec_reset.c
> rename to tests/intel/xe_exec_reset.c
> diff --git a/tests/xe/xe_exec_store.c b/tests/intel/xe_exec_store.c
> similarity index 100%
> rename from tests/xe/xe_exec_store.c
> rename to tests/intel/xe_exec_store.c
> diff --git a/tests/xe/xe_exec_threads.c b/tests/intel/xe_exec_threads.c
> similarity index 100%
> rename from tests/xe/xe_exec_threads.c
> rename to tests/intel/xe_exec_threads.c
> diff --git a/tests/xe/xe_exercise_blt.c b/tests/intel/xe_exercise_blt.c
> similarity index 100%
> rename from tests/xe/xe_exercise_blt.c
> rename to tests/intel/xe_exercise_blt.c
> diff --git a/tests/xe/xe_gpgpu_fill.c b/tests/intel/xe_gpgpu_fill.c
> similarity index 100%
> rename from tests/xe/xe_gpgpu_fill.c
> rename to tests/intel/xe_gpgpu_fill.c
> diff --git a/tests/xe/xe_guc_pc.c b/tests/intel/xe_guc_pc.c
> similarity index 100%
> rename from tests/xe/xe_guc_pc.c
> rename to tests/intel/xe_guc_pc.c
> diff --git a/tests/xe/xe_huc_copy.c b/tests/intel/xe_huc_copy.c
> similarity index 100%
> rename from tests/xe/xe_huc_copy.c
> rename to tests/intel/xe_huc_copy.c
> diff --git a/tests/xe/xe_intel_bb.c b/tests/intel/xe_intel_bb.c
> similarity index 100%
> rename from tests/xe/xe_intel_bb.c
> rename to tests/intel/xe_intel_bb.c
> diff --git a/tests/xe/xe_live_ktest.c b/tests/intel/xe_live_ktest.c
> similarity index 100%
> rename from tests/xe/xe_live_ktest.c
> rename to tests/intel/xe_live_ktest.c
> diff --git a/tests/xe/xe_media_fill.c b/tests/intel/xe_media_fill.c
> similarity index 100%
> rename from tests/xe/xe_media_fill.c
> rename to tests/intel/xe_media_fill.c
> diff --git a/tests/xe/xe_mmap.c b/tests/intel/xe_mmap.c
> similarity index 100%
> rename from tests/xe/xe_mmap.c
> rename to tests/intel/xe_mmap.c
> diff --git a/tests/xe/xe_mmio.c b/tests/intel/xe_mmio.c
> similarity index 100%
> rename from tests/xe/xe_mmio.c
> rename to tests/intel/xe_mmio.c
> diff --git a/tests/xe/xe_module_load.c b/tests/intel/xe_module_load.c
> similarity index 100%
> rename from tests/xe/xe_module_load.c
> rename to tests/intel/xe_module_load.c
> diff --git a/tests/xe/xe_noexec_ping_pong.c b/tests/intel/xe_noexec_ping_pong.c
> similarity index 100%
> rename from tests/xe/xe_noexec_ping_pong.c
> rename to tests/intel/xe_noexec_ping_pong.c
> diff --git a/tests/xe/xe_pm.c b/tests/intel/xe_pm.c
> similarity index 100%
> rename from tests/xe/xe_pm.c
> rename to tests/intel/xe_pm.c
> diff --git a/tests/xe/xe_pm_residency.c b/tests/intel/xe_pm_residency.c
> similarity index 100%
> rename from tests/xe/xe_pm_residency.c
> rename to tests/intel/xe_pm_residency.c
> diff --git a/tests/xe/xe_prime_self_import.c b/tests/intel/xe_prime_self_import.c
> similarity index 100%
> rename from tests/xe/xe_prime_self_import.c
> rename to tests/intel/xe_prime_self_import.c
> diff --git a/tests/xe/xe_query.c b/tests/intel/xe_query.c
> similarity index 100%
> rename from tests/xe/xe_query.c
> rename to tests/intel/xe_query.c
> diff --git a/tests/xe/xe_spin_batch.c b/tests/intel/xe_spin_batch.c
> similarity index 100%
> rename from tests/xe/xe_spin_batch.c
> rename to tests/intel/xe_spin_batch.c
> diff --git a/tests/xe/xe_sysfs_defaults.c b/tests/intel/xe_sysfs_defaults.c
> similarity index 100%
> rename from tests/xe/xe_sysfs_defaults.c
> rename to tests/intel/xe_sysfs_defaults.c
> diff --git a/tests/xe/xe_sysfs_scheduler.c b/tests/intel/xe_sysfs_scheduler.c
> similarity index 100%
> rename from tests/xe/xe_sysfs_scheduler.c
> rename to tests/intel/xe_sysfs_scheduler.c
> diff --git a/tests/xe/xe_sysfs_tile.c b/tests/intel/xe_sysfs_tile.c
> similarity index 100%
> rename from tests/xe/xe_sysfs_tile.c
> rename to tests/intel/xe_sysfs_tile.c
> diff --git a/tests/xe/xe_test_config.json b/tests/intel/xe_test_config.json
> similarity index 100%
> rename from tests/xe/xe_test_config.json
> rename to tests/intel/xe_test_config.json
> diff --git a/tests/xe/xe_uevent.c b/tests/intel/xe_uevent.c
> similarity index 100%
> rename from tests/xe/xe_uevent.c
> rename to tests/intel/xe_uevent.c
> diff --git a/tests/xe/xe_vm.c b/tests/intel/xe_vm.c
> similarity index 100%
> rename from tests/xe/xe_vm.c
> rename to tests/intel/xe_vm.c
> diff --git a/tests/xe/xe_waitfence.c b/tests/intel/xe_waitfence.c
> similarity index 100%
> rename from tests/xe/xe_waitfence.c
> rename to tests/intel/xe_waitfence.c
> diff --git a/tests/meson.build b/tests/meson.build
> index e25793b5a..211ecd513 100644
> --- a/tests/meson.build
> +++ b/tests/meson.build
> @@ -6,7 +6,6 @@ test_progs = [
>  	'core_hotunplug',
>  	'core_setmaster',
>  	'core_setmaster_vs_auth',
> -	'debugfs_test',
>  	'dmabuf',
>  	'dmabuf_sync_file',
>  	'device_reset',
> @@ -70,11 +69,6 @@ test_progs = [
>  	'panfrost_gem_new',
>  	'panfrost_prime',
>  	'panfrost_submit',
> -	'prime_busy',
> -	'prime_mmap',
> -	'prime_mmap_coherency',
> -	'prime_mmap_kms',
> -	'prime_self_import',
>  	'prime_udl',
>  	'prime_vgem',
>  	'syncobj_basic',
> @@ -88,9 +82,10 @@ test_progs = [
>  	'vgem_slow',
>  ]
>  
> -i915_progs = [
> +intel_progs = [
>  	'api_intel_allocator',
>  	'api_intel_bb',
> +	'debugfs_test',
>  	'drm_fdinfo',
>  	'gen3_mixed_blits',
>  	'gen3_render_linear_blits',
> @@ -257,6 +252,11 @@ i915_progs = [
>  	'kms_psr2_su',
>  	'kms_psr_stress_test',
>  	'kms_pwrite_crc',
> +	'prime_busy',
> +	'prime_mmap',
> +	'prime_mmap_coherency',
> +	'prime_mmap_kms',
> +	'prime_self_import',
>  	'sysfs_defaults',
>  	'sysfs_heartbeat_interval',
>  	'sysfs_preempt_timeout',
> @@ -340,8 +340,8 @@ extra_sources = {
>  	'kms_chamelium_edid': [ join_paths ('chamelium', 'kms_chamelium_helper.c') ],
>  	'kms_chamelium_frames': [ join_paths ('chamelium', 'kms_chamelium_helper.c') ],
>  	'kms_chamelium_hpd': [ join_paths ('chamelium', 'kms_chamelium_helper.c') ],
> -	'kms_dsc': [ join_paths ('i915', 'kms_dsc_helper.c') ],
> -	'kms_psr2_sf':  [ join_paths ('i915', 'kms_dsc_helper.c') ],
> +	'kms_dsc': [ join_paths ('intel', 'kms_dsc_helper.c') ],
> +	'kms_psr2_sf':  [ join_paths ('intel', 'kms_dsc_helper.c') ],
>  }
>  
>  # Extra dependencies used on core and Intel drivers
> @@ -383,9 +383,9 @@ foreach prog : test_progs
>  		     output : name + '.testlist')
>  endforeach
>  
> -foreach prog : i915_progs
> +foreach prog : intel_progs
>  	testexe = executable(prog,
> -		   [join_paths('i915', prog + '.c')] + extra_sources.get(prog, []),
> +		   [join_paths('intel', prog + '.c')] + extra_sources.get(prog, []),
>  		   dependencies : test_deps + extra_dependencies.get(prog, []),
>  		   install_dir : libexecdir,
>  		   install_rpath : libexecdir_rpathdir,
> @@ -403,7 +403,7 @@ endforeach
>  if build_xe
>  	foreach prog : xe_progs
>  		testexe = executable(prog,
> -			   [join_paths('xe', prog + '.c')] + extra_sources.get(prog, []),
> +			   [join_paths('intel', prog + '.c')] + extra_sources.get(prog, []),
>  			   dependencies : test_deps + extra_dependencies.get(prog, []),
>  			   install_dir : libexecdir,
>  			   install_rpath : libexecdir_rpathdir,
> @@ -464,7 +464,7 @@ test_list_target = custom_target('testlist',
>  	      install : true,
>  	      install_dir : libexecdir)
>  
> -test_executables += executable('gem_concurrent_all', 'i915/gem_concurrent_all.c',
> +test_executables += executable('gem_concurrent_all', 'intel/gem_concurrent_all.c',
>  	   dependencies : test_deps + [ libatomic ],
>  	   install_dir : libexecdir,
>  	   install_rpath : libexecdir_rpathdir,
> @@ -482,7 +482,7 @@ foreach prog : test_list
>  	test('testcase check ' + prog, test_script, args : prog)
>  endforeach
>  
> -testexe = executable('gem_stress', 'i915/gem_stress.c',
> +testexe = executable('gem_stress', 'intel/gem_stress.c',
>  	   install : true,
>  	   install_dir : libexecdir,
>  	   install_rpath : libexecdir_rpathdir,

^ permalink raw reply	[flat|nested] 18+ messages in thread

* [igt-dev] [i-g-t V5 6/7] tests/meson.build: Split intel targets based on their nature
  2023-08-31 14:56 [igt-dev] [i-g-t V5 0/7] New dir structure for intel specific tests Bhanuprakash Modem
                   ` (4 preceding siblings ...)
  2023-08-31 14:56 ` [igt-dev] [i-g-t V5 5/7] tests: Move intel specific tests to new directory Bhanuprakash Modem
@ 2023-08-31 14:56 ` Bhanuprakash Modem
  2023-08-31 16:01   ` Mauro Carvalho Chehab
  2023-08-31 14:56 ` [igt-dev] [i-g-t V5 7/7] tests: Rename all intel specific tests Bhanuprakash Modem
                   ` (3 subsequent siblings)
  9 siblings, 1 reply; 18+ messages in thread
From: Bhanuprakash Modem @ 2023-08-31 14:56 UTC (permalink / raw)
  To: igt-dev, mauro.chehab

Instead of having all intel specific programs in a single list,
split those into multiple lists based on their nature.

Example:
 - intel_i915_xe_progs: List of tests those supports both i915 & xe
 - intel_i915_progs: List of i915 specific tests
 - intel_kms_progs: List of intel specific kms tests
 - intel_xe_progs: List of xe specific tests

As a side effect, this would help if we ever need to add option
to enable/disable i915 and/or kms test builds.

Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
---
 tests/meson.build | 55 +++++++++++++++++++++--------------------------
 1 file changed, 24 insertions(+), 31 deletions(-)

diff --git a/tests/meson.build b/tests/meson.build
index 211ecd513..aa27fd9af 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -82,8 +82,11 @@ test_progs = [
 	'vgem_slow',
 ]
 
-intel_progs = [
+intel_i915_xe_progs = [
 	'api_intel_allocator',
+]
+
+intel_i915_progs = [
 	'api_intel_bb',
 	'debugfs_test',
 	'drm_fdinfo',
@@ -230,6 +233,18 @@ intel_progs = [
 	'i915_query',
 	'i915_selftest',
 	'i915_suspend',
+	'prime_busy',
+	'prime_mmap',
+	'prime_mmap_coherency',
+	'prime_mmap_kms',
+	'prime_self_import',
+	'sysfs_defaults',
+	'sysfs_heartbeat_interval',
+	'sysfs_preempt_timeout',
+	'sysfs_timeslice_duration',
+]
+
+intel_kms_progs = [
 	'kms_big_fb',
 	'kms_big_joiner' ,
 	'kms_busy',
@@ -252,18 +267,9 @@ intel_progs = [
 	'kms_psr2_su',
 	'kms_psr_stress_test',
 	'kms_pwrite_crc',
-	'prime_busy',
-	'prime_mmap',
-	'prime_mmap_coherency',
-	'prime_mmap_kms',
-	'prime_self_import',
-	'sysfs_defaults',
-	'sysfs_heartbeat_interval',
-	'sysfs_preempt_timeout',
-	'sysfs_timeslice_duration',
 ]
 
-xe_progs = [
+intel_xe_progs = [
 	'xe_ccs',
 	'xe_create',
 	'xe_compute',
@@ -383,6 +389,13 @@ foreach prog : test_progs
 		     output : name + '.testlist')
 endforeach
 
+intel_progs = intel_i915_xe_progs
+intel_progs += intel_i915_progs + intel_kms_progs
+if build_xe
+	build_info += 'Xe **experimental** tests enabled.'
+	intel_progs += intel_xe_progs
+endif
+
 foreach prog : intel_progs
 	testexe = executable(prog,
 		   [join_paths('intel', prog + '.c')] + extra_sources.get(prog, []),
@@ -400,26 +413,6 @@ foreach prog : intel_progs
 		     output : name + '.testlist')
 endforeach
 
-if build_xe
-	foreach prog : xe_progs
-		testexe = executable(prog,
-			   [join_paths('intel', prog + '.c')] + extra_sources.get(prog, []),
-			   dependencies : test_deps + extra_dependencies.get(prog, []),
-			   install_dir : libexecdir,
-			   install_rpath : libexecdir_rpathdir,
-			   install : true)
-		test_list += prog
-		test_executables += testexe
-		name = prog.split('/').get(-1)
-		testlist_files += custom_target(name + '.testlist',
-			     build_by_default : true,
-			     command : [testexe, '--show-testlist'],
-			     capture : true,
-			     output : name + '.testlist')
-	endforeach
-	build_info += 'Xe **experimental** tests enabled.'
-endif
-
 foreach prog : msm_progs
 	test_executables += executable(prog, join_paths('msm', prog + '.c'),
 				       dependencies : test_deps,
-- 
2.40.0



^ permalink raw reply related	[flat|nested] 18+ messages in thread

* Re: [igt-dev] [i-g-t V5 6/7] tests/meson.build: Split intel targets based on their nature
  2023-08-31 14:56 ` [igt-dev] [i-g-t V5 6/7] tests/meson.build: Split intel targets based on their nature Bhanuprakash Modem
@ 2023-08-31 16:01   ` Mauro Carvalho Chehab
  0 siblings, 0 replies; 18+ messages in thread
From: Mauro Carvalho Chehab @ 2023-08-31 16:01 UTC (permalink / raw)
  To: Bhanuprakash Modem; +Cc: igt-dev

On Thu, 31 Aug 2023 20:26:21 +0530
Bhanuprakash Modem <bhanuprakash.modem@intel.com> wrote:

> Instead of having all intel specific programs in a single list,
> split those into multiple lists based on their nature.
> 
> Example:
>  - intel_i915_xe_progs: List of tests those supports both i915 & xe
>  - intel_i915_progs: List of i915 specific tests
>  - intel_kms_progs: List of intel specific kms tests
>  - intel_xe_progs: List of xe specific tests
> 
> As a side effect, this would help if we ever need to add option
> to enable/disable i915 and/or kms test builds.
> Cc: Mauro Carvalho Chehab <mchehab@kernel.org>

Reviewed-by: Mauro Carvalho Chehab <mchehab@kernel.org>

> Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
> ---
>  tests/meson.build | 55 +++++++++++++++++++++--------------------------
>  1 file changed, 24 insertions(+), 31 deletions(-)
> 
> diff --git a/tests/meson.build b/tests/meson.build
> index 211ecd513..aa27fd9af 100644
> --- a/tests/meson.build
> +++ b/tests/meson.build
> @@ -82,8 +82,11 @@ test_progs = [
>  	'vgem_slow',
>  ]
>  
> -intel_progs = [
> +intel_i915_xe_progs = [
>  	'api_intel_allocator',
> +]
> +
> +intel_i915_progs = [
>  	'api_intel_bb',
>  	'debugfs_test',
>  	'drm_fdinfo',
> @@ -230,6 +233,18 @@ intel_progs = [
>  	'i915_query',
>  	'i915_selftest',
>  	'i915_suspend',
> +	'prime_busy',
> +	'prime_mmap',
> +	'prime_mmap_coherency',
> +	'prime_mmap_kms',
> +	'prime_self_import',
> +	'sysfs_defaults',
> +	'sysfs_heartbeat_interval',
> +	'sysfs_preempt_timeout',
> +	'sysfs_timeslice_duration',
> +]
> +
> +intel_kms_progs = [
>  	'kms_big_fb',
>  	'kms_big_joiner' ,
>  	'kms_busy',
> @@ -252,18 +267,9 @@ intel_progs = [
>  	'kms_psr2_su',
>  	'kms_psr_stress_test',
>  	'kms_pwrite_crc',
> -	'prime_busy',
> -	'prime_mmap',
> -	'prime_mmap_coherency',
> -	'prime_mmap_kms',
> -	'prime_self_import',
> -	'sysfs_defaults',
> -	'sysfs_heartbeat_interval',
> -	'sysfs_preempt_timeout',
> -	'sysfs_timeslice_duration',
>  ]
>  
> -xe_progs = [
> +intel_xe_progs = [
>  	'xe_ccs',
>  	'xe_create',
>  	'xe_compute',
> @@ -383,6 +389,13 @@ foreach prog : test_progs
>  		     output : name + '.testlist')
>  endforeach
>  
> +intel_progs = intel_i915_xe_progs
> +intel_progs += intel_i915_progs + intel_kms_progs
> +if build_xe
> +	build_info += 'Xe **experimental** tests enabled.'
> +	intel_progs += intel_xe_progs
> +endif
> +
>  foreach prog : intel_progs
>  	testexe = executable(prog,
>  		   [join_paths('intel', prog + '.c')] + extra_sources.get(prog, []),
> @@ -400,26 +413,6 @@ foreach prog : intel_progs
>  		     output : name + '.testlist')
>  endforeach
>  
> -if build_xe
> -	foreach prog : xe_progs
> -		testexe = executable(prog,
> -			   [join_paths('intel', prog + '.c')] + extra_sources.get(prog, []),
> -			   dependencies : test_deps + extra_dependencies.get(prog, []),
> -			   install_dir : libexecdir,
> -			   install_rpath : libexecdir_rpathdir,
> -			   install : true)
> -		test_list += prog
> -		test_executables += testexe
> -		name = prog.split('/').get(-1)
> -		testlist_files += custom_target(name + '.testlist',
> -			     build_by_default : true,
> -			     command : [testexe, '--show-testlist'],
> -			     capture : true,
> -			     output : name + '.testlist')
> -	endforeach
> -	build_info += 'Xe **experimental** tests enabled.'
> -endif
> -
>  foreach prog : msm_progs
>  	test_executables += executable(prog, join_paths('msm', prog + '.c'),
>  				       dependencies : test_deps,

^ permalink raw reply	[flat|nested] 18+ messages in thread

* [igt-dev] [i-g-t V5 7/7] tests: Rename all intel specific tests
  2023-08-31 14:56 [igt-dev] [i-g-t V5 0/7] New dir structure for intel specific tests Bhanuprakash Modem
                   ` (5 preceding siblings ...)
  2023-08-31 14:56 ` [igt-dev] [i-g-t V5 6/7] tests/meson.build: Split intel targets based on their nature Bhanuprakash Modem
@ 2023-08-31 14:56 ` Bhanuprakash Modem
  2023-08-31 16:05   ` Mauro Carvalho Chehab
  2023-08-31 18:45   ` [igt-dev] [i-g-t V6 " Bhanuprakash Modem
  2023-08-31 22:05 ` [igt-dev] ✗ GitLab.Pipeline: warning for New dir structure for intel specific tests (rev9) Patchwork
                   ` (2 subsequent siblings)
  9 siblings, 2 replies; 18+ messages in thread
From: Bhanuprakash Modem @ 2023-08-31 14:56 UTC (permalink / raw)
  To: igt-dev, mauro.chehab

As all intel specific tests got moved to a new directory
"tests/intel", rename all intel specific tests to represent
the supported driver.

Test name should start with the driver_name_ prefix. Below are
the Examples.

 - tests/intel/i915_*.c : All i915 specific tests. Ex: i915_module_load.c
 - tests/intel/intel_*.c: All tests those supports both i915 & XE.
 - tests/intel/kms_*.c  : All kms tests. Ex: kms_psr.c
 - tests/intel/xe_*.c   : All XE specific tests. Ex: xe_module_load.c

Going forward, we need to follow the above rules to maintain the
tests.

Cc: Mauro Carvalho Chehab <mauro.chehab@linux.intel.com>
Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
---
 README.md                                     |   2 +-
 tests/intel-ci/blacklist-pre-merge.txt        |  14 +-
 tests/intel-ci/blacklist.txt                  | 102 +++---
 tests/intel-ci/fast-feedback.testlist         | 104 +++---
 .../{api_intel_bb.c => i915_api_intel_bb.c}   |   0
 .../{debugfs_test.c => i915_debugfs_test.c}   |   0
 .../intel/{drm_fdinfo.c => i915_drm_fdinfo.c} |   0
 .../{gem_bad_reloc.c => i915_gem_bad_reloc.c} |   0
 ...barrier_race.c => i915_gem_barrier_race.c} |   0
 tests/intel/{gem_basic.c => i915_gem_basic.c} |   0
 tests/intel/{gem_blits.c => i915_gem_blits.c} |   0
 tests/intel/{gem_busy.c => i915_gem_busy.c}   |   0
 .../{gem_caching.c => i915_gem_caching.c}     |   0
 tests/intel/{gem_ccs.c => i915_gem_ccs.c}     |   0
 tests/intel/{gem_close.c => i915_gem_close.c} |   0
 ...gem_close_race.c => i915_gem_close_race.c} |   0
 ...urrent_all.c => i915_gem_concurrent_all.c} |   0
 ...rent_blit.c => i915_gem_concurrent_blit.c} |   2 +-
 .../intel/{gem_create.c => i915_gem_create.c} |   0
 .../intel/{gem_cs_tlb.c => i915_gem_cs_tlb.c} |   0
 ...d_destroy.c => i915_gem_ctx_bad_destroy.c} |   0
 ...gem_ctx_create.c => i915_gem_ctx_create.c} |   0
 ...m_ctx_engines.c => i915_gem_ctx_engines.c} |   0
 .../{gem_ctx_exec.c => i915_gem_ctx_exec.c}   |   0
 .../{gem_ctx_freq.c => i915_gem_ctx_freq.c}   |   0
 ...x_isolation.c => i915_gem_ctx_isolation.c} |   0
 .../{gem_ctx_param.c => i915_gem_ctx_param.c} |   0
 ...rsistence.c => i915_gem_ctx_persistence.c} |   0
 ...gem_ctx_shared.c => i915_gem_ctx_shared.c} |   0
 .../{gem_ctx_sseu.c => i915_gem_ctx_sseu.c}   |   0
 ...gem_ctx_switch.c => i915_gem_ctx_switch.c} |   0
 tests/intel/{gem_eio.c => i915_gem_eio.c}     |   0
 ...alignment.c => i915_gem_evict_alignment.c} |   0
 ...erything.c => i915_gem_evict_everything.c} |   0
 ..._alignment.c => i915_gem_exec_alignment.c} |   0
 ...gem_exec_async.c => i915_gem_exec_async.c} |   0
 ...gem_exec_await.c => i915_gem_exec_await.c} |   0
 ...ec_balancer.c => i915_gem_exec_balancer.c} |   0
 ...gem_exec_basic.c => i915_gem_exec_basic.c} |   0
 .../{gem_exec_big.c => i915_gem_exec_big.c}   |   0
 ...exec_capture.c => i915_gem_exec_capture.c} |   0
 ...m_exec_create.c => i915_gem_exec_create.c} |   0
 ...exec_endless.c => i915_gem_exec_endless.c} |   0
 .../{gem_exec_fair.c => i915_gem_exec_fair.c} |   0
 ...gem_exec_fence.c => i915_gem_exec_fence.c} |   0
 ...gem_exec_flush.c => i915_gem_exec_flush.c} |   0
 ...exec_gttfill.c => i915_gem_exec_gttfill.c} |   0
 ...exec_latency.c => i915_gem_exec_latency.c} |   0
 ...ut_handle.c => i915_gem_exec_lut_handle.c} |   0
 .../{gem_exec_nop.c => i915_gem_exec_nop.c}   |   0
 ...ec_parallel.c => i915_gem_exec_parallel.c} |   0
 ...m_exec_params.c => i915_gem_exec_params.c} |   0
 ...gem_exec_reloc.c => i915_gem_exec_reloc.c} |   0
 ...ec_schedule.c => i915_gem_exec_schedule.c} |   0
 ...gem_exec_store.c => i915_gem_exec_store.c} |   0
 ...exec_suspend.c => i915_gem_exec_suspend.c} |   0
 ...exec_whisper.c => i915_gem_exec_whisper.c} |   0
 ...exercise_blt.c => i915_gem_exercise_blt.c} |   0
 ..._exhaustion.c => i915_gem_fd_exhaustion.c} |   0
 ...fence_thrash.c => i915_gem_fence_thrash.c} |   0
 ...fence_upload.c => i915_gem_fence_upload.c} |   0
 ...thrash.c => i915_gem_fenced_exec_thrash.c} |   0
 ...m_flink_basic.c => i915_gem_flink_basic.c} |   0
 ...gem_flink_race.c => i915_gem_flink_race.c} |   0
 ...gem_gpgpu_fill.c => i915_gem_gpgpu_fill.c} |   0
 ...m_gtt_cpu_tlb.c => i915_gem_gtt_cpu_tlb.c} |   0
 .../{gem_gtt_hog.c => i915_gem_gtt_hog.c}     |   0
 .../{gem_gtt_speed.c => i915_gem_gtt_speed.c} |   0
 .../{gem_huc_copy.c => i915_gem_huc_copy.c}   |   0
 ...linear_blits.c => i915_gem_linear_blits.c} |   0
 ...gem_lmem_evict.c => i915_gem_lmem_evict.c} |   0
 ...em_swapping.c => i915_gem_lmem_swapping.c} |   0
 ...gem_lut_handle.c => i915_gem_lut_handle.c} |   0
 .../{gem_madvise.c => i915_gem_madvise.c}     |   0
 ...gem_media_fill.c => i915_gem_media_fill.c} |   0
 .../{gem_media_vme.c => i915_gem_media_vme.c} |   0
 tests/intel/{gem_mmap.c => i915_gem_mmap.c}   |   0
 .../{gem_mmap_gtt.c => i915_gem_mmap_gtt.c}   |   0
 ...m_mmap_offset.c => i915_gem_mmap_offset.c} |   0
 .../{gem_mmap_wc.c => i915_gem_mmap_wc.c}     |   0
 ...read.c => i915_gem_partial_pwrite_pread.c} |   0
 ...p.c => i915_gem_pipe_control_store_loop.c} |   0
 tests/intel/{gem_ppgtt.c => i915_gem_ppgtt.c} |   0
 tests/intel/{gem_pread.c => i915_gem_pread.c} |   0
 ...ter_blit.c => i915_gem_pread_after_blit.c} |   0
 .../intel/{gem_pwrite.c => i915_gem_pwrite.c} |   0
 ...te_snooped.c => i915_gem_pwrite_snooped.c} |   0
 tests/intel/{gem_pxp.c => i915_gem_pxp.c}     |   0
 ...ead_speed.c => i915_gem_read_read_speed.c} |   0
 .../{gem_readwrite.c => i915_gem_readwrite.c} |   0
 .../{gem_reg_read.c => i915_gem_reg_read.c}   |   0
 ...m_render_copy.c => i915_gem_render_copy.c} |   0
 ...y_redux.c => i915_gem_render_copy_redux.c} |   0
 ...blits.c => i915_gem_render_linear_blits.c} |   0
 ..._blits.c => i915_gem_render_tiled_blits.c} |   0
 ...est_retire.c => i915_gem_request_retire.c} |   0
 ...m_reset_stats.c => i915_gem_reset_stats.c} |   0
 .../{gem_ringfill.c => i915_gem_ringfill.c}   |   0
 ..._vs_blt.c => i915_gem_set_tiling_vs_blt.c} |   0
 ..._vs_gtt.c => i915_gem_set_tiling_vs_gtt.c} |   0
 ...rite.c => i915_gem_set_tiling_vs_pwrite.c} |   0
 .../intel/{gem_shrink.c => i915_gem_shrink.c} |   0
 .../{gem_softpin.c => i915_gem_softpin.c}     |   0
 ...gem_spin_batch.c => i915_gem_spin_batch.c} |   0
 ...g_writes.c => i915_gem_streaming_writes.c} |   0
 .../intel/{gem_stress.c => i915_gem_stress.c} |   0
 tests/intel/{gem_sync.c => i915_gem_sync.c}   |   0
 ...m_tiled_blits.c => i915_gem_tiled_blits.c} |   0
 ...e_blits.c => i915_gem_tiled_fence_blits.c} |   0
 ... => i915_gem_tiled_partial_pwrite_pread.c} |   0
 ...d_basic.c => i915_gem_tiled_pread_basic.c} |   0
 ...pwrite.c => i915_gem_tiled_pread_pwrite.c} |   0
 ...d_swapping.c => i915_gem_tiled_swapping.c} |   0
 .../{gem_tiled_wb.c => i915_gem_tiled_wb.c}   |   0
 .../{gem_tiled_wc.c => i915_gem_tiled_wc.c}   |   0
 ..._stride.c => i915_gem_tiling_max_stride.c} |   0
 ...rs.c => i915_gem_unfence_active_buffers.c} |   0
 ...fers.c => i915_gem_unref_active_buffers.c} |   0
 ...erptr_blits.c => i915_gem_userptr_blits.c} |   0
 .../{gem_vm_create.c => i915_gem_vm_create.c} |   0
 tests/intel/{gem_wait.c => i915_gem_wait.c}   |   0
 .../{gem_watchdog.c => i915_gem_watchdog.c}   |   0
 ...m_workarounds.c => i915_gem_workarounds.c} |   0
 ..._mixed_blits.c => i915_gen3_mixed_blits.c} |   0
 ...lits.c => i915_gen3_render_linear_blits.c} |   0
 ...blits.c => i915_gen3_render_mixed_blits.c} |   0
 ...lits.c => i915_gen3_render_tiledx_blits.c} |   0
 ...lits.c => i915_gen3_render_tiledy_blits.c} |   0
 ...n7_exec_parse.c => i915_gen7_exec_parse.c} |   0
 ...n9_exec_parse.c => i915_gen9_exec_parse.c} |   0
 tests/intel/{perf.c => i915_perf.c}           |   0
 tests/intel/{perf_pmu.c => i915_perf_pmu.c}   |   0
 .../intel/{prime_busy.c => i915_prime_busy.c} |   0
 .../intel/{prime_mmap.c => i915_prime_mmap.c} |   0
 ...oherency.c => i915_prime_mmap_coherency.c} |   0
 ...prime_mmap_kms.c => i915_prime_mmap_kms.c} |   0
 ...self_import.c => i915_prime_self_import.c} |   0
 ...sysfs_defaults.c => i915_sysfs_defaults.c} |   0
 ...rval.c => i915_sysfs_heartbeat_interval.c} |   0
 ...timeout.c => i915_sysfs_preempt_timeout.c} |   0
 ...tion.c => i915_sysfs_timeslice_duration.c} |   0
 tests/intel/i915_test_config.json             |   8 +-
 ...llocator.c => intel_api_intel_allocator.c} |   0
 tests/meson.build                             | 308 +++++++++---------
 144 files changed, 269 insertions(+), 271 deletions(-)
 rename tests/intel/{api_intel_bb.c => i915_api_intel_bb.c} (100%)
 rename tests/intel/{debugfs_test.c => i915_debugfs_test.c} (100%)
 rename tests/intel/{drm_fdinfo.c => i915_drm_fdinfo.c} (100%)
 rename tests/intel/{gem_bad_reloc.c => i915_gem_bad_reloc.c} (100%)
 rename tests/intel/{gem_barrier_race.c => i915_gem_barrier_race.c} (100%)
 rename tests/intel/{gem_basic.c => i915_gem_basic.c} (100%)
 rename tests/intel/{gem_blits.c => i915_gem_blits.c} (100%)
 rename tests/intel/{gem_busy.c => i915_gem_busy.c} (100%)
 rename tests/intel/{gem_caching.c => i915_gem_caching.c} (100%)
 rename tests/intel/{gem_ccs.c => i915_gem_ccs.c} (100%)
 rename tests/intel/{gem_close.c => i915_gem_close.c} (100%)
 rename tests/intel/{gem_close_race.c => i915_gem_close_race.c} (100%)
 rename tests/intel/{gem_concurrent_all.c => i915_gem_concurrent_all.c} (100%)
 rename tests/intel/{gem_concurrent_blit.c => i915_gem_concurrent_blit.c} (91%)
 rename tests/intel/{gem_create.c => i915_gem_create.c} (100%)
 rename tests/intel/{gem_cs_tlb.c => i915_gem_cs_tlb.c} (100%)
 rename tests/intel/{gem_ctx_bad_destroy.c => i915_gem_ctx_bad_destroy.c} (100%)
 rename tests/intel/{gem_ctx_create.c => i915_gem_ctx_create.c} (100%)
 rename tests/intel/{gem_ctx_engines.c => i915_gem_ctx_engines.c} (100%)
 rename tests/intel/{gem_ctx_exec.c => i915_gem_ctx_exec.c} (100%)
 rename tests/intel/{gem_ctx_freq.c => i915_gem_ctx_freq.c} (100%)
 rename tests/intel/{gem_ctx_isolation.c => i915_gem_ctx_isolation.c} (100%)
 rename tests/intel/{gem_ctx_param.c => i915_gem_ctx_param.c} (100%)
 rename tests/intel/{gem_ctx_persistence.c => i915_gem_ctx_persistence.c} (100%)
 rename tests/intel/{gem_ctx_shared.c => i915_gem_ctx_shared.c} (100%)
 rename tests/intel/{gem_ctx_sseu.c => i915_gem_ctx_sseu.c} (100%)
 rename tests/intel/{gem_ctx_switch.c => i915_gem_ctx_switch.c} (100%)
 rename tests/intel/{gem_eio.c => i915_gem_eio.c} (100%)
 rename tests/intel/{gem_evict_alignment.c => i915_gem_evict_alignment.c} (100%)
 rename tests/intel/{gem_evict_everything.c => i915_gem_evict_everything.c} (100%)
 rename tests/intel/{gem_exec_alignment.c => i915_gem_exec_alignment.c} (100%)
 rename tests/intel/{gem_exec_async.c => i915_gem_exec_async.c} (100%)
 rename tests/intel/{gem_exec_await.c => i915_gem_exec_await.c} (100%)
 rename tests/intel/{gem_exec_balancer.c => i915_gem_exec_balancer.c} (100%)
 rename tests/intel/{gem_exec_basic.c => i915_gem_exec_basic.c} (100%)
 rename tests/intel/{gem_exec_big.c => i915_gem_exec_big.c} (100%)
 rename tests/intel/{gem_exec_capture.c => i915_gem_exec_capture.c} (100%)
 rename tests/intel/{gem_exec_create.c => i915_gem_exec_create.c} (100%)
 rename tests/intel/{gem_exec_endless.c => i915_gem_exec_endless.c} (100%)
 rename tests/intel/{gem_exec_fair.c => i915_gem_exec_fair.c} (100%)
 rename tests/intel/{gem_exec_fence.c => i915_gem_exec_fence.c} (100%)
 rename tests/intel/{gem_exec_flush.c => i915_gem_exec_flush.c} (100%)
 rename tests/intel/{gem_exec_gttfill.c => i915_gem_exec_gttfill.c} (100%)
 rename tests/intel/{gem_exec_latency.c => i915_gem_exec_latency.c} (100%)
 rename tests/intel/{gem_exec_lut_handle.c => i915_gem_exec_lut_handle.c} (100%)
 rename tests/intel/{gem_exec_nop.c => i915_gem_exec_nop.c} (100%)
 rename tests/intel/{gem_exec_parallel.c => i915_gem_exec_parallel.c} (100%)
 rename tests/intel/{gem_exec_params.c => i915_gem_exec_params.c} (100%)
 rename tests/intel/{gem_exec_reloc.c => i915_gem_exec_reloc.c} (100%)
 rename tests/intel/{gem_exec_schedule.c => i915_gem_exec_schedule.c} (100%)
 rename tests/intel/{gem_exec_store.c => i915_gem_exec_store.c} (100%)
 rename tests/intel/{gem_exec_suspend.c => i915_gem_exec_suspend.c} (100%)
 rename tests/intel/{gem_exec_whisper.c => i915_gem_exec_whisper.c} (100%)
 rename tests/intel/{gem_exercise_blt.c => i915_gem_exercise_blt.c} (100%)
 rename tests/intel/{gem_fd_exhaustion.c => i915_gem_fd_exhaustion.c} (100%)
 rename tests/intel/{gem_fence_thrash.c => i915_gem_fence_thrash.c} (100%)
 rename tests/intel/{gem_fence_upload.c => i915_gem_fence_upload.c} (100%)
 rename tests/intel/{gem_fenced_exec_thrash.c => i915_gem_fenced_exec_thrash.c} (100%)
 rename tests/intel/{gem_flink_basic.c => i915_gem_flink_basic.c} (100%)
 rename tests/intel/{gem_flink_race.c => i915_gem_flink_race.c} (100%)
 rename tests/intel/{gem_gpgpu_fill.c => i915_gem_gpgpu_fill.c} (100%)
 rename tests/intel/{gem_gtt_cpu_tlb.c => i915_gem_gtt_cpu_tlb.c} (100%)
 rename tests/intel/{gem_gtt_hog.c => i915_gem_gtt_hog.c} (100%)
 rename tests/intel/{gem_gtt_speed.c => i915_gem_gtt_speed.c} (100%)
 rename tests/intel/{gem_huc_copy.c => i915_gem_huc_copy.c} (100%)
 rename tests/intel/{gem_linear_blits.c => i915_gem_linear_blits.c} (100%)
 rename tests/intel/{gem_lmem_evict.c => i915_gem_lmem_evict.c} (100%)
 rename tests/intel/{gem_lmem_swapping.c => i915_gem_lmem_swapping.c} (100%)
 rename tests/intel/{gem_lut_handle.c => i915_gem_lut_handle.c} (100%)
 rename tests/intel/{gem_madvise.c => i915_gem_madvise.c} (100%)
 rename tests/intel/{gem_media_fill.c => i915_gem_media_fill.c} (100%)
 rename tests/intel/{gem_media_vme.c => i915_gem_media_vme.c} (100%)
 rename tests/intel/{gem_mmap.c => i915_gem_mmap.c} (100%)
 rename tests/intel/{gem_mmap_gtt.c => i915_gem_mmap_gtt.c} (100%)
 rename tests/intel/{gem_mmap_offset.c => i915_gem_mmap_offset.c} (100%)
 rename tests/intel/{gem_mmap_wc.c => i915_gem_mmap_wc.c} (100%)
 rename tests/intel/{gem_partial_pwrite_pread.c => i915_gem_partial_pwrite_pread.c} (100%)
 rename tests/intel/{gem_pipe_control_store_loop.c => i915_gem_pipe_control_store_loop.c} (100%)
 rename tests/intel/{gem_ppgtt.c => i915_gem_ppgtt.c} (100%)
 rename tests/intel/{gem_pread.c => i915_gem_pread.c} (100%)
 rename tests/intel/{gem_pread_after_blit.c => i915_gem_pread_after_blit.c} (100%)
 rename tests/intel/{gem_pwrite.c => i915_gem_pwrite.c} (100%)
 rename tests/intel/{gem_pwrite_snooped.c => i915_gem_pwrite_snooped.c} (100%)
 rename tests/intel/{gem_pxp.c => i915_gem_pxp.c} (100%)
 rename tests/intel/{gem_read_read_speed.c => i915_gem_read_read_speed.c} (100%)
 rename tests/intel/{gem_readwrite.c => i915_gem_readwrite.c} (100%)
 rename tests/intel/{gem_reg_read.c => i915_gem_reg_read.c} (100%)
 rename tests/intel/{gem_render_copy.c => i915_gem_render_copy.c} (100%)
 rename tests/intel/{gem_render_copy_redux.c => i915_gem_render_copy_redux.c} (100%)
 rename tests/intel/{gem_render_linear_blits.c => i915_gem_render_linear_blits.c} (100%)
 rename tests/intel/{gem_render_tiled_blits.c => i915_gem_render_tiled_blits.c} (100%)
 rename tests/intel/{gem_request_retire.c => i915_gem_request_retire.c} (100%)
 rename tests/intel/{gem_reset_stats.c => i915_gem_reset_stats.c} (100%)
 rename tests/intel/{gem_ringfill.c => i915_gem_ringfill.c} (100%)
 rename tests/intel/{gem_set_tiling_vs_blt.c => i915_gem_set_tiling_vs_blt.c} (100%)
 rename tests/intel/{gem_set_tiling_vs_gtt.c => i915_gem_set_tiling_vs_gtt.c} (100%)
 rename tests/intel/{gem_set_tiling_vs_pwrite.c => i915_gem_set_tiling_vs_pwrite.c} (100%)
 rename tests/intel/{gem_shrink.c => i915_gem_shrink.c} (100%)
 rename tests/intel/{gem_softpin.c => i915_gem_softpin.c} (100%)
 rename tests/intel/{gem_spin_batch.c => i915_gem_spin_batch.c} (100%)
 rename tests/intel/{gem_streaming_writes.c => i915_gem_streaming_writes.c} (100%)
 rename tests/intel/{gem_stress.c => i915_gem_stress.c} (100%)
 rename tests/intel/{gem_sync.c => i915_gem_sync.c} (100%)
 rename tests/intel/{gem_tiled_blits.c => i915_gem_tiled_blits.c} (100%)
 rename tests/intel/{gem_tiled_fence_blits.c => i915_gem_tiled_fence_blits.c} (100%)
 rename tests/intel/{gem_tiled_partial_pwrite_pread.c => i915_gem_tiled_partial_pwrite_pread.c} (100%)
 rename tests/intel/{gem_tiled_pread_basic.c => i915_gem_tiled_pread_basic.c} (100%)
 rename tests/intel/{gem_tiled_pread_pwrite.c => i915_gem_tiled_pread_pwrite.c} (100%)
 rename tests/intel/{gem_tiled_swapping.c => i915_gem_tiled_swapping.c} (100%)
 rename tests/intel/{gem_tiled_wb.c => i915_gem_tiled_wb.c} (100%)
 rename tests/intel/{gem_tiled_wc.c => i915_gem_tiled_wc.c} (100%)
 rename tests/intel/{gem_tiling_max_stride.c => i915_gem_tiling_max_stride.c} (100%)
 rename tests/intel/{gem_unfence_active_buffers.c => i915_gem_unfence_active_buffers.c} (100%)
 rename tests/intel/{gem_unref_active_buffers.c => i915_gem_unref_active_buffers.c} (100%)
 rename tests/intel/{gem_userptr_blits.c => i915_gem_userptr_blits.c} (100%)
 rename tests/intel/{gem_vm_create.c => i915_gem_vm_create.c} (100%)
 rename tests/intel/{gem_wait.c => i915_gem_wait.c} (100%)
 rename tests/intel/{gem_watchdog.c => i915_gem_watchdog.c} (100%)
 rename tests/intel/{gem_workarounds.c => i915_gem_workarounds.c} (100%)
 rename tests/intel/{gen3_mixed_blits.c => i915_gen3_mixed_blits.c} (100%)
 rename tests/intel/{gen3_render_linear_blits.c => i915_gen3_render_linear_blits.c} (100%)
 rename tests/intel/{gen3_render_mixed_blits.c => i915_gen3_render_mixed_blits.c} (100%)
 rename tests/intel/{gen3_render_tiledx_blits.c => i915_gen3_render_tiledx_blits.c} (100%)
 rename tests/intel/{gen3_render_tiledy_blits.c => i915_gen3_render_tiledy_blits.c} (100%)
 rename tests/intel/{gen7_exec_parse.c => i915_gen7_exec_parse.c} (100%)
 rename tests/intel/{gen9_exec_parse.c => i915_gen9_exec_parse.c} (100%)
 rename tests/intel/{perf.c => i915_perf.c} (100%)
 rename tests/intel/{perf_pmu.c => i915_perf_pmu.c} (100%)
 rename tests/intel/{prime_busy.c => i915_prime_busy.c} (100%)
 rename tests/intel/{prime_mmap.c => i915_prime_mmap.c} (100%)
 rename tests/intel/{prime_mmap_coherency.c => i915_prime_mmap_coherency.c} (100%)
 rename tests/intel/{prime_mmap_kms.c => i915_prime_mmap_kms.c} (100%)
 rename tests/intel/{prime_self_import.c => i915_prime_self_import.c} (100%)
 rename tests/intel/{sysfs_defaults.c => i915_sysfs_defaults.c} (100%)
 rename tests/intel/{sysfs_heartbeat_interval.c => i915_sysfs_heartbeat_interval.c} (100%)
 rename tests/intel/{sysfs_preempt_timeout.c => i915_sysfs_preempt_timeout.c} (100%)
 rename tests/intel/{sysfs_timeslice_duration.c => i915_sysfs_timeslice_duration.c} (100%)
 rename tests/intel/{api_intel_allocator.c => intel_api_intel_allocator.c} (100%)

diff --git a/README.md b/README.md
index 9cef60d88..492650e85 100644
--- a/README.md
+++ b/README.md
@@ -129,7 +129,7 @@ The benchmarks require KMS to be enabled.  When run with an X Server
 running, they must be run as root to avoid the authentication
 requirement.
 
-Note that a few other microbenchmarks are in tests (e.g. `gem_gtt_speed`).
+Note that a few other microbenchmarks are in tests (e.g. `i915_gem_gtt_speed`).
 
 ### `tools/`
 
diff --git a/tests/intel-ci/blacklist-pre-merge.txt b/tests/intel-ci/blacklist-pre-merge.txt
index d4e5ef66e..b747bdf42 100644
--- a/tests/intel-ci/blacklist-pre-merge.txt
+++ b/tests/intel-ci/blacklist-pre-merge.txt
@@ -37,7 +37,7 @@ igt@i915_pm_rpm@universal-planes(-dpms)?
 #
 # Data acquired on 2020-02-19 by Martin Peres
 ###############################################################################
-igt@gem_pwrite@big-.*
+igt@i915_gem_pwrite@big-.*
 
 
 ###############################################################################
@@ -46,7 +46,7 @@ igt@gem_pwrite@big-.*
 # outside of drm_mm and i915_gem_execbuffer, for which the authors assure us
 # that they are making deliberate and well tested changes.
 ###############################################################################
-igt@gem_exec_alignment@.*
+igt@i915_gem_exec_alignment@.*
 
 
 ###############################################################################
@@ -85,11 +85,11 @@ igt@i915_pm_rpm@debugfs-read
 #
 # Data acquired on 2020-02-20 by Martin Peres
 ###############################################################################
-igt@gem_fence_thrash@bo-write-verify-threaded-[xy]
-igt@gem_tiled_blits@interruptible
-igt@gem_tiled_fence_blits@normal
-igt@gem_tiled_blits@normal
-igt@gem_tiled_wc
+igt@i915_gem_fence_thrash@bo-write-verify-threaded-[xy]
+igt@i915_gem_tiled_blits@interruptible
+igt@i915_gem_tiled_fence_blits@normal
+igt@i915_gem_tiled_blits@normal
+igt@i915_gem_tiled_wc
 
 
 ###############################################################################
diff --git a/tests/intel-ci/blacklist.txt b/tests/intel-ci/blacklist.txt
index e13759d3e..62996c2c7 100644
--- a/tests/intel-ci/blacklist.txt
+++ b/tests/intel-ci/blacklist.txt
@@ -18,56 +18,56 @@ igt@i915_pm_rpm@gem-execbuf-stress-extra-wait
 ###############################################
 # GEM
 ###############################################
-igt@gem_busy@hang.*
-igt@gem_close_race@(?!.*basic).*
-igt@gem_concurrent_blit(@.*)?
-igt@gem_ctx_create@(?!.*basic).*
-igt@gem_ctx_exec@(?!.*basic).*
-igt@gem_ctx_shared@*exhaust*
-igt@gem_ctx_switch(@.*)?
-igt@gem_evict_alignment(@.*)?
-igt@gem_evict_everything(@.*)?
-igt@gem_exec_big@(?!.*single).*
-igt@gem_exec_capture@many-(?!4K-).*
-igt@gem_exec_fair@(?!.*basic).*
-igt@gem_exec_fence@.*hang.*
-igt@gem_exec_flush@(?!.*basic).*
-igt@gem_exec_latency(@.*)?
-igt@gem_exec_lut_handle(@.*)?
-igt@gem_exec_nop@(?!.*basic).*
-igt@gem_exec_reloc@(?!.*basic).*
-igt@gem_exec_suspend@(?!.*basic).*
-igt@gem_exec_whisper@(?!basic).*
-igt@gem_fd_exhaustion(@.*)?
-igt@gem_fence_upload(@.*)?
-igt@gem_gtt_hog(@.*)?
-igt@gem_gtt_speed(@.*)?
-igt@gem_lut_handle(@.*)?
-igt@gem_mmap_gtt@.*(huge|swap|clflush|forked).*
-igt@gem_mmap@.*(swap|huge).*
-igt@gem_pread_after_blit(@.*)?
-igt@gem_pwrite@(?!.*basic).*
-igt@gem_read_read_speed(@.*)?
-igt@gem_render_linear_blits@(?!.*basic).*
-igt@gem_render_tiled_blits@(?!.*basic).*
-igt@gem_reset_stats(@.*)?
-igt@gem_ringfill@(?!.*basic).*
-igt@gem_shrink@(?!reclaim$).*
-igt@gem_softpin@.*(hang|S4).*
-igt@gem_streaming_writes(@.*)?
-igt@gem_sync@(?!.*basic).*
-igt@gem_tiled_swapping@(?!non-threaded).*
-igt@gem_userptr_blits@(major|minor|forked|mlocked|swapping).*
-igt@gem_wait@hang.*
-igt@gem_watchdog@far-fence
-igt@sysfs_heartbeat_interval@(long|off)
-igt@sysfs_preempt_timeout@off
-igt@sysfs_timeslice_duration@off
+igt@i915_gem_busy@hang.*
+igt@i915_gem_close_race@(?!.*basic).*
+igt@i915_gem_concurrent_blit(@.*)?
+igt@i915_gem_ctx_create@(?!.*basic).*
+igt@i915_gem_ctx_exec@(?!.*basic).*
+igt@i915_gem_ctx_shared@*exhaust*
+igt@i915_gem_ctx_switch(@.*)?
+igt@i915_gem_evict_alignment(@.*)?
+igt@i915_gem_evict_everything(@.*)?
+igt@i915_gem_exec_big@(?!.*single).*
+igt@i915_gem_exec_capture@many-(?!4K-).*
+igt@i915_gem_exec_fair@(?!.*basic).*
+igt@i915_gem_exec_fence@.*hang.*
+igt@i915_gem_exec_flush@(?!.*basic).*
+igt@i915_gem_exec_latency(@.*)?
+igt@i915_gem_exec_lut_handle(@.*)?
+igt@i915_gem_exec_nop@(?!.*basic).*
+igt@i915_gem_exec_reloc@(?!.*basic).*
+igt@i915_gem_exec_suspend@(?!.*basic).*
+igt@i915_gem_exec_whisper@(?!basic).*
+igt@i915_gem_fd_exhaustion(@.*)?
+igt@i915_gem_fence_upload(@.*)?
+igt@i915_gem_gtt_hog(@.*)?
+igt@i915_gem_gtt_speed(@.*)?
+igt@i915_gem_lut_handle(@.*)?
+igt@i915_gem_mmap_gtt@.*(huge|swap|clflush|forked).*
+igt@i915_gem_mmap@.*(swap|huge).*
+igt@i915_gem_pread_after_blit(@.*)?
+igt@i915_gem_pwrite@(?!.*basic).*
+igt@i915_gem_read_read_speed(@.*)?
+igt@i915_gem_render_linear_blits@(?!.*basic).*
+igt@i915_gem_render_tiled_blits@(?!.*basic).*
+igt@i915_gem_reset_stats(@.*)?
+igt@i915_gem_ringfill@(?!.*basic).*
+igt@i915_gem_shrink@(?!reclaim$).*
+igt@i915_gem_softpin@.*(hang|S4).*
+igt@i915_gem_streaming_writes(@.*)?
+igt@i915_gem_sync@(?!.*basic).*
+igt@i915_gem_tiled_swapping@(?!non-threaded).*
+igt@i915_gem_userptr_blits@(major|minor|forked|mlocked|swapping).*
+igt@i915_gem_wait@hang.*
+igt@i915_gem_watchdog@far-fence
+igt@i915_sysfs_heartbeat_interval@(long|off)
+igt@i915_sysfs_preempt_timeout@off
+igt@i915_sysfs_timeslice_duration@off
 ###############################################
 # GEM: Not worth fixing
 ###############################################
-igt@gen7_exec_parse@.*lri.*
-igt@gem_exec_alignment@pi-shared
+igt@i915_gen7_exec_parse@.*lri.*
+igt@i915_gem_exec_alignment@pi-shared
 ###############################################
 # There are no DRRS capable displays in CI lab
 ###############################################
@@ -108,10 +108,10 @@ igt@msm_.*
 # Hibernate: not configured correctly on CI
 ###############################################
 igt@.*@.*-hibernate
-igt@gem_softpin@noreloc-s4
-igt@gem_workarounds@hibernate-.*
-igt@gem_exec_suspend@basic-s4$
-igt@gem_ctx_isolation@.*-s4
+igt@i915_gem_softpin@noreloc-s4
+igt@i915_gem_workarounds@hibernate-.*
+igt@i915_gem_exec_suspend@basic-s4$
+igt@i915_gem_ctx_isolation@.*-s4
 ###############################################
 # Out-of-memory: spammy and often broken
 ###############################################
diff --git a/tests/intel-ci/fast-feedback.testlist b/tests/intel-ci/fast-feedback.testlist
index c09c6c417..83bb8dd64 100644
--- a/tests/intel-ci/fast-feedback.testlist
+++ b/tests/intel-ci/fast-feedback.testlist
@@ -10,48 +10,48 @@ igt@fbdev@info
 igt@fbdev@nullptr
 igt@fbdev@read
 igt@fbdev@write
-igt@gem_basic@bad-close
-igt@gem_basic@create-close
-igt@gem_basic@create-fd-close
-igt@gem_busy@busy@all-engines
-igt@gem_close_race@basic-process
-igt@gem_close_race@basic-threads
-igt@gem_ctx_create@basic
-igt@gem_ctx_create@basic-files
-igt@gem_ctx_exec@basic
-igt@gem_exec_basic@basic
-igt@gem_exec_create@basic
-igt@gem_exec_fence@basic-busy
-igt@gem_exec_fence@basic-wait
-igt@gem_exec_fence@basic-await
-igt@gem_exec_fence@nb-await
-igt@gem_exec_gttfill@basic
-igt@gem_exec_parallel@engines
-igt@gem_exec_store@basic
-igt@gem_flink_basic@bad-flink
-igt@gem_flink_basic@bad-open
-igt@gem_flink_basic@basic
-igt@gem_flink_basic@double-flink
-igt@gem_flink_basic@flink-lifetime
-igt@gem_huc_copy@huc-copy
-igt@gem_linear_blits@basic
-igt@gem_mmap@basic
-igt@gem_mmap_gtt@basic
-igt@gem_render_linear_blits@basic
-igt@gem_render_tiled_blits@basic
-igt@gem_ringfill@basic-all
-igt@gem_softpin@allocator-basic
-igt@gem_softpin@allocator-basic-reserve
-igt@gem_softpin@safe-alignment
-igt@gem_sync@basic-all
-igt@gem_sync@basic-each
-igt@gem_tiled_blits@basic
-igt@gem_tiled_fence_blits@basic
-igt@gem_tiled_pread_basic
-igt@gem_wait@busy@all-engines
-igt@gem_wait@wait@all-engines
+igt@i915_gem_basic@bad-close
+igt@i915_gem_basic@create-close
+igt@i915_gem_basic@create-fd-close
+igt@i915_gem_busy@busy@all-engines
+igt@i915_gem_close_race@basic-process
+igt@i915_gem_close_race@basic-threads
+igt@i915_gem_ctx_create@basic
+igt@i915_gem_ctx_create@basic-files
+igt@i915_gem_ctx_exec@basic
+igt@i915_gem_exec_basic@basic
+igt@i915_gem_exec_create@basic
+igt@i915_gem_exec_fence@basic-busy
+igt@i915_gem_exec_fence@basic-wait
+igt@i915_gem_exec_fence@basic-await
+igt@i915_gem_exec_fence@nb-await
+igt@i915_gem_exec_gttfill@basic
+igt@i915_gem_exec_parallel@engines
+igt@i915_gem_exec_store@basic
+igt@i915_gem_flink_basic@bad-flink
+igt@i915_gem_flink_basic@bad-open
+igt@i915_gem_flink_basic@basic
+igt@i915_gem_flink_basic@double-flink
+igt@i915_gem_flink_basic@flink-lifetime
 igt@i915_getparams_basic@basic-eu-total
 igt@i915_getparams_basic@basic-subslice-total
+igt@i915_gem_huc_copy@huc-copy
+igt@i915_gem_linear_blits@basic
+igt@i915_gem_mmap@basic
+igt@i915_gem_mmap_gtt@basic
+igt@i915_gem_render_linear_blits@basic
+igt@i915_gem_render_tiled_blits@basic
+igt@i915_gem_ringfill@basic-all
+igt@i915_gem_softpin@allocator-basic
+igt@i915_gem_softpin@allocator-basic-reserve
+igt@i915_gem_softpin@safe-alignment
+igt@i915_gem_sync@basic-all
+igt@i915_gem_sync@basic-each
+igt@i915_gem_tiled_blits@basic
+igt@i915_gem_tiled_fence_blits@basic
+igt@i915_gem_tiled_pread_basic
+igt@i915_gem_wait@busy@all-engines
+igt@i915_gem_wait@wait@all-engines
 igt@i915_hangman@error-state-basic
 igt@i915_pciid
 igt@kms_addfb_basic@addfb25-bad-modifier
@@ -126,12 +126,12 @@ igt@i915_pm_backlight@basic-brightness
 igt@i915_pm_rpm@basic-pci-d3-state
 igt@i915_pm_rpm@basic-rte
 igt@i915_pm_rps@basic-api
-igt@prime_self_import@basic-llseek-bad
-igt@prime_self_import@basic-llseek-size
-igt@prime_self_import@basic-with_fd_dup
-igt@prime_self_import@basic-with_one_bo
-igt@prime_self_import@basic-with_one_bo_two_files
-igt@prime_self_import@basic-with_two_bos
+igt@i915_prime_self_import@basic-llseek-bad
+igt@i915_prime_self_import@basic-llseek-size
+igt@i915_prime_self_import@basic-with_fd_dup
+igt@i915_prime_self_import@basic-with_one_bo
+igt@i915_prime_self_import@basic-with_one_bo_two_files
+igt@i915_prime_self_import@basic-with_two_bos
 igt@prime_vgem@basic-fence-flip
 igt@prime_vgem@basic-fence-mmap
 igt@prime_vgem@basic-fence-read
@@ -156,10 +156,10 @@ igt@vgem_basic@sysfs
 igt@core_hotunplug@unbind-rebind
 igt@vgem_basic@unload
 igt@i915_module_load@reload
-igt@gem_lmem_swapping@basic
-igt@gem_lmem_swapping@parallel-random-engines
-igt@gem_lmem_swapping@random-engines
-igt@gem_lmem_swapping@verify-random
+igt@i915_gem_lmem_swapping@basic
+igt@i915_gem_lmem_swapping@parallel-random-engines
+igt@i915_gem_lmem_swapping@random-engines
+igt@i915_gem_lmem_swapping@verify-random
 igt@i915_pm_rpm@module-reload
 
 # Kernel selftests
@@ -169,6 +169,6 @@ igt@dmabuf@all-tests
 # System wide suspend tests
 igt@i915_suspend@basic-s2idle-without-i915
 igt@i915_suspend@basic-s3-without-i915
-igt@gem_exec_suspend@basic-s0
-igt@gem_exec_suspend@basic-s3
+igt@i915_gem_exec_suspend@basic-s0
+igt@i915_gem_exec_suspend@basic-s3
 igt@kms_pipe_crc_basic@suspend-read-crc
diff --git a/tests/intel/api_intel_bb.c b/tests/intel/i915_api_intel_bb.c
similarity index 100%
rename from tests/intel/api_intel_bb.c
rename to tests/intel/i915_api_intel_bb.c
diff --git a/tests/intel/debugfs_test.c b/tests/intel/i915_debugfs_test.c
similarity index 100%
rename from tests/intel/debugfs_test.c
rename to tests/intel/i915_debugfs_test.c
diff --git a/tests/intel/drm_fdinfo.c b/tests/intel/i915_drm_fdinfo.c
similarity index 100%
rename from tests/intel/drm_fdinfo.c
rename to tests/intel/i915_drm_fdinfo.c
diff --git a/tests/intel/gem_bad_reloc.c b/tests/intel/i915_gem_bad_reloc.c
similarity index 100%
rename from tests/intel/gem_bad_reloc.c
rename to tests/intel/i915_gem_bad_reloc.c
diff --git a/tests/intel/gem_barrier_race.c b/tests/intel/i915_gem_barrier_race.c
similarity index 100%
rename from tests/intel/gem_barrier_race.c
rename to tests/intel/i915_gem_barrier_race.c
diff --git a/tests/intel/gem_basic.c b/tests/intel/i915_gem_basic.c
similarity index 100%
rename from tests/intel/gem_basic.c
rename to tests/intel/i915_gem_basic.c
diff --git a/tests/intel/gem_blits.c b/tests/intel/i915_gem_blits.c
similarity index 100%
rename from tests/intel/gem_blits.c
rename to tests/intel/i915_gem_blits.c
diff --git a/tests/intel/gem_busy.c b/tests/intel/i915_gem_busy.c
similarity index 100%
rename from tests/intel/gem_busy.c
rename to tests/intel/i915_gem_busy.c
diff --git a/tests/intel/gem_caching.c b/tests/intel/i915_gem_caching.c
similarity index 100%
rename from tests/intel/gem_caching.c
rename to tests/intel/i915_gem_caching.c
diff --git a/tests/intel/gem_ccs.c b/tests/intel/i915_gem_ccs.c
similarity index 100%
rename from tests/intel/gem_ccs.c
rename to tests/intel/i915_gem_ccs.c
diff --git a/tests/intel/gem_close.c b/tests/intel/i915_gem_close.c
similarity index 100%
rename from tests/intel/gem_close.c
rename to tests/intel/i915_gem_close.c
diff --git a/tests/intel/gem_close_race.c b/tests/intel/i915_gem_close_race.c
similarity index 100%
rename from tests/intel/gem_close_race.c
rename to tests/intel/i915_gem_close_race.c
diff --git a/tests/intel/gem_concurrent_all.c b/tests/intel/i915_gem_concurrent_all.c
similarity index 100%
rename from tests/intel/gem_concurrent_all.c
rename to tests/intel/i915_gem_concurrent_all.c
diff --git a/tests/intel/gem_concurrent_blit.c b/tests/intel/i915_gem_concurrent_blit.c
similarity index 91%
rename from tests/intel/gem_concurrent_blit.c
rename to tests/intel/i915_gem_concurrent_blit.c
index 513de4a1b..03b1483cb 100644
--- a/tests/intel/gem_concurrent_blit.c
+++ b/tests/intel/i915_gem_concurrent_blit.c
@@ -5,4 +5,4 @@
 /* available subtests. This avoids the use of           */
 /* non-standard command line parameters which can cause */
 /* problems for automated testing */
-#include "gem_concurrent_all.c"
+#include "i915_gem_concurrent_all.c"
diff --git a/tests/intel/gem_create.c b/tests/intel/i915_gem_create.c
similarity index 100%
rename from tests/intel/gem_create.c
rename to tests/intel/i915_gem_create.c
diff --git a/tests/intel/gem_cs_tlb.c b/tests/intel/i915_gem_cs_tlb.c
similarity index 100%
rename from tests/intel/gem_cs_tlb.c
rename to tests/intel/i915_gem_cs_tlb.c
diff --git a/tests/intel/gem_ctx_bad_destroy.c b/tests/intel/i915_gem_ctx_bad_destroy.c
similarity index 100%
rename from tests/intel/gem_ctx_bad_destroy.c
rename to tests/intel/i915_gem_ctx_bad_destroy.c
diff --git a/tests/intel/gem_ctx_create.c b/tests/intel/i915_gem_ctx_create.c
similarity index 100%
rename from tests/intel/gem_ctx_create.c
rename to tests/intel/i915_gem_ctx_create.c
diff --git a/tests/intel/gem_ctx_engines.c b/tests/intel/i915_gem_ctx_engines.c
similarity index 100%
rename from tests/intel/gem_ctx_engines.c
rename to tests/intel/i915_gem_ctx_engines.c
diff --git a/tests/intel/gem_ctx_exec.c b/tests/intel/i915_gem_ctx_exec.c
similarity index 100%
rename from tests/intel/gem_ctx_exec.c
rename to tests/intel/i915_gem_ctx_exec.c
diff --git a/tests/intel/gem_ctx_freq.c b/tests/intel/i915_gem_ctx_freq.c
similarity index 100%
rename from tests/intel/gem_ctx_freq.c
rename to tests/intel/i915_gem_ctx_freq.c
diff --git a/tests/intel/gem_ctx_isolation.c b/tests/intel/i915_gem_ctx_isolation.c
similarity index 100%
rename from tests/intel/gem_ctx_isolation.c
rename to tests/intel/i915_gem_ctx_isolation.c
diff --git a/tests/intel/gem_ctx_param.c b/tests/intel/i915_gem_ctx_param.c
similarity index 100%
rename from tests/intel/gem_ctx_param.c
rename to tests/intel/i915_gem_ctx_param.c
diff --git a/tests/intel/gem_ctx_persistence.c b/tests/intel/i915_gem_ctx_persistence.c
similarity index 100%
rename from tests/intel/gem_ctx_persistence.c
rename to tests/intel/i915_gem_ctx_persistence.c
diff --git a/tests/intel/gem_ctx_shared.c b/tests/intel/i915_gem_ctx_shared.c
similarity index 100%
rename from tests/intel/gem_ctx_shared.c
rename to tests/intel/i915_gem_ctx_shared.c
diff --git a/tests/intel/gem_ctx_sseu.c b/tests/intel/i915_gem_ctx_sseu.c
similarity index 100%
rename from tests/intel/gem_ctx_sseu.c
rename to tests/intel/i915_gem_ctx_sseu.c
diff --git a/tests/intel/gem_ctx_switch.c b/tests/intel/i915_gem_ctx_switch.c
similarity index 100%
rename from tests/intel/gem_ctx_switch.c
rename to tests/intel/i915_gem_ctx_switch.c
diff --git a/tests/intel/gem_eio.c b/tests/intel/i915_gem_eio.c
similarity index 100%
rename from tests/intel/gem_eio.c
rename to tests/intel/i915_gem_eio.c
diff --git a/tests/intel/gem_evict_alignment.c b/tests/intel/i915_gem_evict_alignment.c
similarity index 100%
rename from tests/intel/gem_evict_alignment.c
rename to tests/intel/i915_gem_evict_alignment.c
diff --git a/tests/intel/gem_evict_everything.c b/tests/intel/i915_gem_evict_everything.c
similarity index 100%
rename from tests/intel/gem_evict_everything.c
rename to tests/intel/i915_gem_evict_everything.c
diff --git a/tests/intel/gem_exec_alignment.c b/tests/intel/i915_gem_exec_alignment.c
similarity index 100%
rename from tests/intel/gem_exec_alignment.c
rename to tests/intel/i915_gem_exec_alignment.c
diff --git a/tests/intel/gem_exec_async.c b/tests/intel/i915_gem_exec_async.c
similarity index 100%
rename from tests/intel/gem_exec_async.c
rename to tests/intel/i915_gem_exec_async.c
diff --git a/tests/intel/gem_exec_await.c b/tests/intel/i915_gem_exec_await.c
similarity index 100%
rename from tests/intel/gem_exec_await.c
rename to tests/intel/i915_gem_exec_await.c
diff --git a/tests/intel/gem_exec_balancer.c b/tests/intel/i915_gem_exec_balancer.c
similarity index 100%
rename from tests/intel/gem_exec_balancer.c
rename to tests/intel/i915_gem_exec_balancer.c
diff --git a/tests/intel/gem_exec_basic.c b/tests/intel/i915_gem_exec_basic.c
similarity index 100%
rename from tests/intel/gem_exec_basic.c
rename to tests/intel/i915_gem_exec_basic.c
diff --git a/tests/intel/gem_exec_big.c b/tests/intel/i915_gem_exec_big.c
similarity index 100%
rename from tests/intel/gem_exec_big.c
rename to tests/intel/i915_gem_exec_big.c
diff --git a/tests/intel/gem_exec_capture.c b/tests/intel/i915_gem_exec_capture.c
similarity index 100%
rename from tests/intel/gem_exec_capture.c
rename to tests/intel/i915_gem_exec_capture.c
diff --git a/tests/intel/gem_exec_create.c b/tests/intel/i915_gem_exec_create.c
similarity index 100%
rename from tests/intel/gem_exec_create.c
rename to tests/intel/i915_gem_exec_create.c
diff --git a/tests/intel/gem_exec_endless.c b/tests/intel/i915_gem_exec_endless.c
similarity index 100%
rename from tests/intel/gem_exec_endless.c
rename to tests/intel/i915_gem_exec_endless.c
diff --git a/tests/intel/gem_exec_fair.c b/tests/intel/i915_gem_exec_fair.c
similarity index 100%
rename from tests/intel/gem_exec_fair.c
rename to tests/intel/i915_gem_exec_fair.c
diff --git a/tests/intel/gem_exec_fence.c b/tests/intel/i915_gem_exec_fence.c
similarity index 100%
rename from tests/intel/gem_exec_fence.c
rename to tests/intel/i915_gem_exec_fence.c
diff --git a/tests/intel/gem_exec_flush.c b/tests/intel/i915_gem_exec_flush.c
similarity index 100%
rename from tests/intel/gem_exec_flush.c
rename to tests/intel/i915_gem_exec_flush.c
diff --git a/tests/intel/gem_exec_gttfill.c b/tests/intel/i915_gem_exec_gttfill.c
similarity index 100%
rename from tests/intel/gem_exec_gttfill.c
rename to tests/intel/i915_gem_exec_gttfill.c
diff --git a/tests/intel/gem_exec_latency.c b/tests/intel/i915_gem_exec_latency.c
similarity index 100%
rename from tests/intel/gem_exec_latency.c
rename to tests/intel/i915_gem_exec_latency.c
diff --git a/tests/intel/gem_exec_lut_handle.c b/tests/intel/i915_gem_exec_lut_handle.c
similarity index 100%
rename from tests/intel/gem_exec_lut_handle.c
rename to tests/intel/i915_gem_exec_lut_handle.c
diff --git a/tests/intel/gem_exec_nop.c b/tests/intel/i915_gem_exec_nop.c
similarity index 100%
rename from tests/intel/gem_exec_nop.c
rename to tests/intel/i915_gem_exec_nop.c
diff --git a/tests/intel/gem_exec_parallel.c b/tests/intel/i915_gem_exec_parallel.c
similarity index 100%
rename from tests/intel/gem_exec_parallel.c
rename to tests/intel/i915_gem_exec_parallel.c
diff --git a/tests/intel/gem_exec_params.c b/tests/intel/i915_gem_exec_params.c
similarity index 100%
rename from tests/intel/gem_exec_params.c
rename to tests/intel/i915_gem_exec_params.c
diff --git a/tests/intel/gem_exec_reloc.c b/tests/intel/i915_gem_exec_reloc.c
similarity index 100%
rename from tests/intel/gem_exec_reloc.c
rename to tests/intel/i915_gem_exec_reloc.c
diff --git a/tests/intel/gem_exec_schedule.c b/tests/intel/i915_gem_exec_schedule.c
similarity index 100%
rename from tests/intel/gem_exec_schedule.c
rename to tests/intel/i915_gem_exec_schedule.c
diff --git a/tests/intel/gem_exec_store.c b/tests/intel/i915_gem_exec_store.c
similarity index 100%
rename from tests/intel/gem_exec_store.c
rename to tests/intel/i915_gem_exec_store.c
diff --git a/tests/intel/gem_exec_suspend.c b/tests/intel/i915_gem_exec_suspend.c
similarity index 100%
rename from tests/intel/gem_exec_suspend.c
rename to tests/intel/i915_gem_exec_suspend.c
diff --git a/tests/intel/gem_exec_whisper.c b/tests/intel/i915_gem_exec_whisper.c
similarity index 100%
rename from tests/intel/gem_exec_whisper.c
rename to tests/intel/i915_gem_exec_whisper.c
diff --git a/tests/intel/gem_exercise_blt.c b/tests/intel/i915_gem_exercise_blt.c
similarity index 100%
rename from tests/intel/gem_exercise_blt.c
rename to tests/intel/i915_gem_exercise_blt.c
diff --git a/tests/intel/gem_fd_exhaustion.c b/tests/intel/i915_gem_fd_exhaustion.c
similarity index 100%
rename from tests/intel/gem_fd_exhaustion.c
rename to tests/intel/i915_gem_fd_exhaustion.c
diff --git a/tests/intel/gem_fence_thrash.c b/tests/intel/i915_gem_fence_thrash.c
similarity index 100%
rename from tests/intel/gem_fence_thrash.c
rename to tests/intel/i915_gem_fence_thrash.c
diff --git a/tests/intel/gem_fence_upload.c b/tests/intel/i915_gem_fence_upload.c
similarity index 100%
rename from tests/intel/gem_fence_upload.c
rename to tests/intel/i915_gem_fence_upload.c
diff --git a/tests/intel/gem_fenced_exec_thrash.c b/tests/intel/i915_gem_fenced_exec_thrash.c
similarity index 100%
rename from tests/intel/gem_fenced_exec_thrash.c
rename to tests/intel/i915_gem_fenced_exec_thrash.c
diff --git a/tests/intel/gem_flink_basic.c b/tests/intel/i915_gem_flink_basic.c
similarity index 100%
rename from tests/intel/gem_flink_basic.c
rename to tests/intel/i915_gem_flink_basic.c
diff --git a/tests/intel/gem_flink_race.c b/tests/intel/i915_gem_flink_race.c
similarity index 100%
rename from tests/intel/gem_flink_race.c
rename to tests/intel/i915_gem_flink_race.c
diff --git a/tests/intel/gem_gpgpu_fill.c b/tests/intel/i915_gem_gpgpu_fill.c
similarity index 100%
rename from tests/intel/gem_gpgpu_fill.c
rename to tests/intel/i915_gem_gpgpu_fill.c
diff --git a/tests/intel/gem_gtt_cpu_tlb.c b/tests/intel/i915_gem_gtt_cpu_tlb.c
similarity index 100%
rename from tests/intel/gem_gtt_cpu_tlb.c
rename to tests/intel/i915_gem_gtt_cpu_tlb.c
diff --git a/tests/intel/gem_gtt_hog.c b/tests/intel/i915_gem_gtt_hog.c
similarity index 100%
rename from tests/intel/gem_gtt_hog.c
rename to tests/intel/i915_gem_gtt_hog.c
diff --git a/tests/intel/gem_gtt_speed.c b/tests/intel/i915_gem_gtt_speed.c
similarity index 100%
rename from tests/intel/gem_gtt_speed.c
rename to tests/intel/i915_gem_gtt_speed.c
diff --git a/tests/intel/gem_huc_copy.c b/tests/intel/i915_gem_huc_copy.c
similarity index 100%
rename from tests/intel/gem_huc_copy.c
rename to tests/intel/i915_gem_huc_copy.c
diff --git a/tests/intel/gem_linear_blits.c b/tests/intel/i915_gem_linear_blits.c
similarity index 100%
rename from tests/intel/gem_linear_blits.c
rename to tests/intel/i915_gem_linear_blits.c
diff --git a/tests/intel/gem_lmem_evict.c b/tests/intel/i915_gem_lmem_evict.c
similarity index 100%
rename from tests/intel/gem_lmem_evict.c
rename to tests/intel/i915_gem_lmem_evict.c
diff --git a/tests/intel/gem_lmem_swapping.c b/tests/intel/i915_gem_lmem_swapping.c
similarity index 100%
rename from tests/intel/gem_lmem_swapping.c
rename to tests/intel/i915_gem_lmem_swapping.c
diff --git a/tests/intel/gem_lut_handle.c b/tests/intel/i915_gem_lut_handle.c
similarity index 100%
rename from tests/intel/gem_lut_handle.c
rename to tests/intel/i915_gem_lut_handle.c
diff --git a/tests/intel/gem_madvise.c b/tests/intel/i915_gem_madvise.c
similarity index 100%
rename from tests/intel/gem_madvise.c
rename to tests/intel/i915_gem_madvise.c
diff --git a/tests/intel/gem_media_fill.c b/tests/intel/i915_gem_media_fill.c
similarity index 100%
rename from tests/intel/gem_media_fill.c
rename to tests/intel/i915_gem_media_fill.c
diff --git a/tests/intel/gem_media_vme.c b/tests/intel/i915_gem_media_vme.c
similarity index 100%
rename from tests/intel/gem_media_vme.c
rename to tests/intel/i915_gem_media_vme.c
diff --git a/tests/intel/gem_mmap.c b/tests/intel/i915_gem_mmap.c
similarity index 100%
rename from tests/intel/gem_mmap.c
rename to tests/intel/i915_gem_mmap.c
diff --git a/tests/intel/gem_mmap_gtt.c b/tests/intel/i915_gem_mmap_gtt.c
similarity index 100%
rename from tests/intel/gem_mmap_gtt.c
rename to tests/intel/i915_gem_mmap_gtt.c
diff --git a/tests/intel/gem_mmap_offset.c b/tests/intel/i915_gem_mmap_offset.c
similarity index 100%
rename from tests/intel/gem_mmap_offset.c
rename to tests/intel/i915_gem_mmap_offset.c
diff --git a/tests/intel/gem_mmap_wc.c b/tests/intel/i915_gem_mmap_wc.c
similarity index 100%
rename from tests/intel/gem_mmap_wc.c
rename to tests/intel/i915_gem_mmap_wc.c
diff --git a/tests/intel/gem_partial_pwrite_pread.c b/tests/intel/i915_gem_partial_pwrite_pread.c
similarity index 100%
rename from tests/intel/gem_partial_pwrite_pread.c
rename to tests/intel/i915_gem_partial_pwrite_pread.c
diff --git a/tests/intel/gem_pipe_control_store_loop.c b/tests/intel/i915_gem_pipe_control_store_loop.c
similarity index 100%
rename from tests/intel/gem_pipe_control_store_loop.c
rename to tests/intel/i915_gem_pipe_control_store_loop.c
diff --git a/tests/intel/gem_ppgtt.c b/tests/intel/i915_gem_ppgtt.c
similarity index 100%
rename from tests/intel/gem_ppgtt.c
rename to tests/intel/i915_gem_ppgtt.c
diff --git a/tests/intel/gem_pread.c b/tests/intel/i915_gem_pread.c
similarity index 100%
rename from tests/intel/gem_pread.c
rename to tests/intel/i915_gem_pread.c
diff --git a/tests/intel/gem_pread_after_blit.c b/tests/intel/i915_gem_pread_after_blit.c
similarity index 100%
rename from tests/intel/gem_pread_after_blit.c
rename to tests/intel/i915_gem_pread_after_blit.c
diff --git a/tests/intel/gem_pwrite.c b/tests/intel/i915_gem_pwrite.c
similarity index 100%
rename from tests/intel/gem_pwrite.c
rename to tests/intel/i915_gem_pwrite.c
diff --git a/tests/intel/gem_pwrite_snooped.c b/tests/intel/i915_gem_pwrite_snooped.c
similarity index 100%
rename from tests/intel/gem_pwrite_snooped.c
rename to tests/intel/i915_gem_pwrite_snooped.c
diff --git a/tests/intel/gem_pxp.c b/tests/intel/i915_gem_pxp.c
similarity index 100%
rename from tests/intel/gem_pxp.c
rename to tests/intel/i915_gem_pxp.c
diff --git a/tests/intel/gem_read_read_speed.c b/tests/intel/i915_gem_read_read_speed.c
similarity index 100%
rename from tests/intel/gem_read_read_speed.c
rename to tests/intel/i915_gem_read_read_speed.c
diff --git a/tests/intel/gem_readwrite.c b/tests/intel/i915_gem_readwrite.c
similarity index 100%
rename from tests/intel/gem_readwrite.c
rename to tests/intel/i915_gem_readwrite.c
diff --git a/tests/intel/gem_reg_read.c b/tests/intel/i915_gem_reg_read.c
similarity index 100%
rename from tests/intel/gem_reg_read.c
rename to tests/intel/i915_gem_reg_read.c
diff --git a/tests/intel/gem_render_copy.c b/tests/intel/i915_gem_render_copy.c
similarity index 100%
rename from tests/intel/gem_render_copy.c
rename to tests/intel/i915_gem_render_copy.c
diff --git a/tests/intel/gem_render_copy_redux.c b/tests/intel/i915_gem_render_copy_redux.c
similarity index 100%
rename from tests/intel/gem_render_copy_redux.c
rename to tests/intel/i915_gem_render_copy_redux.c
diff --git a/tests/intel/gem_render_linear_blits.c b/tests/intel/i915_gem_render_linear_blits.c
similarity index 100%
rename from tests/intel/gem_render_linear_blits.c
rename to tests/intel/i915_gem_render_linear_blits.c
diff --git a/tests/intel/gem_render_tiled_blits.c b/tests/intel/i915_gem_render_tiled_blits.c
similarity index 100%
rename from tests/intel/gem_render_tiled_blits.c
rename to tests/intel/i915_gem_render_tiled_blits.c
diff --git a/tests/intel/gem_request_retire.c b/tests/intel/i915_gem_request_retire.c
similarity index 100%
rename from tests/intel/gem_request_retire.c
rename to tests/intel/i915_gem_request_retire.c
diff --git a/tests/intel/gem_reset_stats.c b/tests/intel/i915_gem_reset_stats.c
similarity index 100%
rename from tests/intel/gem_reset_stats.c
rename to tests/intel/i915_gem_reset_stats.c
diff --git a/tests/intel/gem_ringfill.c b/tests/intel/i915_gem_ringfill.c
similarity index 100%
rename from tests/intel/gem_ringfill.c
rename to tests/intel/i915_gem_ringfill.c
diff --git a/tests/intel/gem_set_tiling_vs_blt.c b/tests/intel/i915_gem_set_tiling_vs_blt.c
similarity index 100%
rename from tests/intel/gem_set_tiling_vs_blt.c
rename to tests/intel/i915_gem_set_tiling_vs_blt.c
diff --git a/tests/intel/gem_set_tiling_vs_gtt.c b/tests/intel/i915_gem_set_tiling_vs_gtt.c
similarity index 100%
rename from tests/intel/gem_set_tiling_vs_gtt.c
rename to tests/intel/i915_gem_set_tiling_vs_gtt.c
diff --git a/tests/intel/gem_set_tiling_vs_pwrite.c b/tests/intel/i915_gem_set_tiling_vs_pwrite.c
similarity index 100%
rename from tests/intel/gem_set_tiling_vs_pwrite.c
rename to tests/intel/i915_gem_set_tiling_vs_pwrite.c
diff --git a/tests/intel/gem_shrink.c b/tests/intel/i915_gem_shrink.c
similarity index 100%
rename from tests/intel/gem_shrink.c
rename to tests/intel/i915_gem_shrink.c
diff --git a/tests/intel/gem_softpin.c b/tests/intel/i915_gem_softpin.c
similarity index 100%
rename from tests/intel/gem_softpin.c
rename to tests/intel/i915_gem_softpin.c
diff --git a/tests/intel/gem_spin_batch.c b/tests/intel/i915_gem_spin_batch.c
similarity index 100%
rename from tests/intel/gem_spin_batch.c
rename to tests/intel/i915_gem_spin_batch.c
diff --git a/tests/intel/gem_streaming_writes.c b/tests/intel/i915_gem_streaming_writes.c
similarity index 100%
rename from tests/intel/gem_streaming_writes.c
rename to tests/intel/i915_gem_streaming_writes.c
diff --git a/tests/intel/gem_stress.c b/tests/intel/i915_gem_stress.c
similarity index 100%
rename from tests/intel/gem_stress.c
rename to tests/intel/i915_gem_stress.c
diff --git a/tests/intel/gem_sync.c b/tests/intel/i915_gem_sync.c
similarity index 100%
rename from tests/intel/gem_sync.c
rename to tests/intel/i915_gem_sync.c
diff --git a/tests/intel/gem_tiled_blits.c b/tests/intel/i915_gem_tiled_blits.c
similarity index 100%
rename from tests/intel/gem_tiled_blits.c
rename to tests/intel/i915_gem_tiled_blits.c
diff --git a/tests/intel/gem_tiled_fence_blits.c b/tests/intel/i915_gem_tiled_fence_blits.c
similarity index 100%
rename from tests/intel/gem_tiled_fence_blits.c
rename to tests/intel/i915_gem_tiled_fence_blits.c
diff --git a/tests/intel/gem_tiled_partial_pwrite_pread.c b/tests/intel/i915_gem_tiled_partial_pwrite_pread.c
similarity index 100%
rename from tests/intel/gem_tiled_partial_pwrite_pread.c
rename to tests/intel/i915_gem_tiled_partial_pwrite_pread.c
diff --git a/tests/intel/gem_tiled_pread_basic.c b/tests/intel/i915_gem_tiled_pread_basic.c
similarity index 100%
rename from tests/intel/gem_tiled_pread_basic.c
rename to tests/intel/i915_gem_tiled_pread_basic.c
diff --git a/tests/intel/gem_tiled_pread_pwrite.c b/tests/intel/i915_gem_tiled_pread_pwrite.c
similarity index 100%
rename from tests/intel/gem_tiled_pread_pwrite.c
rename to tests/intel/i915_gem_tiled_pread_pwrite.c
diff --git a/tests/intel/gem_tiled_swapping.c b/tests/intel/i915_gem_tiled_swapping.c
similarity index 100%
rename from tests/intel/gem_tiled_swapping.c
rename to tests/intel/i915_gem_tiled_swapping.c
diff --git a/tests/intel/gem_tiled_wb.c b/tests/intel/i915_gem_tiled_wb.c
similarity index 100%
rename from tests/intel/gem_tiled_wb.c
rename to tests/intel/i915_gem_tiled_wb.c
diff --git a/tests/intel/gem_tiled_wc.c b/tests/intel/i915_gem_tiled_wc.c
similarity index 100%
rename from tests/intel/gem_tiled_wc.c
rename to tests/intel/i915_gem_tiled_wc.c
diff --git a/tests/intel/gem_tiling_max_stride.c b/tests/intel/i915_gem_tiling_max_stride.c
similarity index 100%
rename from tests/intel/gem_tiling_max_stride.c
rename to tests/intel/i915_gem_tiling_max_stride.c
diff --git a/tests/intel/gem_unfence_active_buffers.c b/tests/intel/i915_gem_unfence_active_buffers.c
similarity index 100%
rename from tests/intel/gem_unfence_active_buffers.c
rename to tests/intel/i915_gem_unfence_active_buffers.c
diff --git a/tests/intel/gem_unref_active_buffers.c b/tests/intel/i915_gem_unref_active_buffers.c
similarity index 100%
rename from tests/intel/gem_unref_active_buffers.c
rename to tests/intel/i915_gem_unref_active_buffers.c
diff --git a/tests/intel/gem_userptr_blits.c b/tests/intel/i915_gem_userptr_blits.c
similarity index 100%
rename from tests/intel/gem_userptr_blits.c
rename to tests/intel/i915_gem_userptr_blits.c
diff --git a/tests/intel/gem_vm_create.c b/tests/intel/i915_gem_vm_create.c
similarity index 100%
rename from tests/intel/gem_vm_create.c
rename to tests/intel/i915_gem_vm_create.c
diff --git a/tests/intel/gem_wait.c b/tests/intel/i915_gem_wait.c
similarity index 100%
rename from tests/intel/gem_wait.c
rename to tests/intel/i915_gem_wait.c
diff --git a/tests/intel/gem_watchdog.c b/tests/intel/i915_gem_watchdog.c
similarity index 100%
rename from tests/intel/gem_watchdog.c
rename to tests/intel/i915_gem_watchdog.c
diff --git a/tests/intel/gem_workarounds.c b/tests/intel/i915_gem_workarounds.c
similarity index 100%
rename from tests/intel/gem_workarounds.c
rename to tests/intel/i915_gem_workarounds.c
diff --git a/tests/intel/gen3_mixed_blits.c b/tests/intel/i915_gen3_mixed_blits.c
similarity index 100%
rename from tests/intel/gen3_mixed_blits.c
rename to tests/intel/i915_gen3_mixed_blits.c
diff --git a/tests/intel/gen3_render_linear_blits.c b/tests/intel/i915_gen3_render_linear_blits.c
similarity index 100%
rename from tests/intel/gen3_render_linear_blits.c
rename to tests/intel/i915_gen3_render_linear_blits.c
diff --git a/tests/intel/gen3_render_mixed_blits.c b/tests/intel/i915_gen3_render_mixed_blits.c
similarity index 100%
rename from tests/intel/gen3_render_mixed_blits.c
rename to tests/intel/i915_gen3_render_mixed_blits.c
diff --git a/tests/intel/gen3_render_tiledx_blits.c b/tests/intel/i915_gen3_render_tiledx_blits.c
similarity index 100%
rename from tests/intel/gen3_render_tiledx_blits.c
rename to tests/intel/i915_gen3_render_tiledx_blits.c
diff --git a/tests/intel/gen3_render_tiledy_blits.c b/tests/intel/i915_gen3_render_tiledy_blits.c
similarity index 100%
rename from tests/intel/gen3_render_tiledy_blits.c
rename to tests/intel/i915_gen3_render_tiledy_blits.c
diff --git a/tests/intel/gen7_exec_parse.c b/tests/intel/i915_gen7_exec_parse.c
similarity index 100%
rename from tests/intel/gen7_exec_parse.c
rename to tests/intel/i915_gen7_exec_parse.c
diff --git a/tests/intel/gen9_exec_parse.c b/tests/intel/i915_gen9_exec_parse.c
similarity index 100%
rename from tests/intel/gen9_exec_parse.c
rename to tests/intel/i915_gen9_exec_parse.c
diff --git a/tests/intel/perf.c b/tests/intel/i915_perf.c
similarity index 100%
rename from tests/intel/perf.c
rename to tests/intel/i915_perf.c
diff --git a/tests/intel/perf_pmu.c b/tests/intel/i915_perf_pmu.c
similarity index 100%
rename from tests/intel/perf_pmu.c
rename to tests/intel/i915_perf_pmu.c
diff --git a/tests/intel/prime_busy.c b/tests/intel/i915_prime_busy.c
similarity index 100%
rename from tests/intel/prime_busy.c
rename to tests/intel/i915_prime_busy.c
diff --git a/tests/intel/prime_mmap.c b/tests/intel/i915_prime_mmap.c
similarity index 100%
rename from tests/intel/prime_mmap.c
rename to tests/intel/i915_prime_mmap.c
diff --git a/tests/intel/prime_mmap_coherency.c b/tests/intel/i915_prime_mmap_coherency.c
similarity index 100%
rename from tests/intel/prime_mmap_coherency.c
rename to tests/intel/i915_prime_mmap_coherency.c
diff --git a/tests/intel/prime_mmap_kms.c b/tests/intel/i915_prime_mmap_kms.c
similarity index 100%
rename from tests/intel/prime_mmap_kms.c
rename to tests/intel/i915_prime_mmap_kms.c
diff --git a/tests/intel/prime_self_import.c b/tests/intel/i915_prime_self_import.c
similarity index 100%
rename from tests/intel/prime_self_import.c
rename to tests/intel/i915_prime_self_import.c
diff --git a/tests/intel/sysfs_defaults.c b/tests/intel/i915_sysfs_defaults.c
similarity index 100%
rename from tests/intel/sysfs_defaults.c
rename to tests/intel/i915_sysfs_defaults.c
diff --git a/tests/intel/sysfs_heartbeat_interval.c b/tests/intel/i915_sysfs_heartbeat_interval.c
similarity index 100%
rename from tests/intel/sysfs_heartbeat_interval.c
rename to tests/intel/i915_sysfs_heartbeat_interval.c
diff --git a/tests/intel/sysfs_preempt_timeout.c b/tests/intel/i915_sysfs_preempt_timeout.c
similarity index 100%
rename from tests/intel/sysfs_preempt_timeout.c
rename to tests/intel/i915_sysfs_preempt_timeout.c
diff --git a/tests/intel/sysfs_timeslice_duration.c b/tests/intel/i915_sysfs_timeslice_duration.c
similarity index 100%
rename from tests/intel/sysfs_timeslice_duration.c
rename to tests/intel/i915_sysfs_timeslice_duration.c
diff --git a/tests/intel/i915_test_config.json b/tests/intel/i915_test_config.json
index c15ef2580..43b831262 100644
--- a/tests/intel/i915_test_config.json
+++ b/tests/intel/i915_test_config.json
@@ -7,12 +7,10 @@
                "../core_setmaster_vs_auth.c", "../debugfs_test.c",
                "../device_reset.c", "../dmabuf.c",
                "../drm_import_export.c", "../drm_mm.c",
-               "../dumb_buffer.c", "../prime_busy.c", "../prime_mmap.c",
-               "../prime_mmap_coherency.c", "../prime_self_import.c",
-               "../prime_vgem.c", "../sw_sync.c", "../syncobj_basic.c",
-               "../syncobj_timeline.c", "../syncobj_wait.c",
+               "../dumb_buffer.c", "../prime_vgem.c", "../sw_sync.c",
+               "../syncobj_basic.c", "../syncobj_timeline.c", "../syncobj_wait.c",
                "../vgem_basic.c", "../vgem_slow.c" ],
-    "exclude_files": [ "kms_*", "gem_concurrent_all.c", "gem_concurrent_blit.c",
+    "exclude_files": [ "kms_*", "i915_gem_concurrent_all.c", "i915_gem_concurrent_blit.c",
                        "xe_*" ],
     "fields": {
 	"Mega feature": {
diff --git a/tests/intel/api_intel_allocator.c b/tests/intel/intel_api_intel_allocator.c
similarity index 100%
rename from tests/intel/api_intel_allocator.c
rename to tests/intel/intel_api_intel_allocator.c
diff --git a/tests/meson.build b/tests/meson.build
index aa27fd9af..3613eb627 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -83,165 +83,165 @@ test_progs = [
 ]
 
 intel_i915_xe_progs = [
-	'api_intel_allocator',
+	'intel_api_intel_allocator',
 ]
 
 intel_i915_progs = [
-	'api_intel_bb',
-	'debugfs_test',
-	'drm_fdinfo',
-	'gen3_mixed_blits',
-	'gen3_render_linear_blits',
-	'gen3_render_mixed_blits',
-	'gen3_render_tiledx_blits',
-	'gen3_render_tiledy_blits',
-	'gem_bad_reloc',
-	'gem_barrier_race',
-	'gem_basic',
-	'gem_blits',
-	'gem_busy',
-	'gem_caching',
-	'gem_create',
-	'gem_ccs',
-	'gem_close',
-	'gem_close_race',
-	'gem_concurrent_blit',
-	'gem_cs_tlb',
-	'gem_ctx_bad_destroy',
-	'gem_ctx_create',
-	'gem_ctx_engines',
-	'gem_ctx_exec',
-	'gem_ctx_freq',
-	'gem_ctx_isolation',
-	'gem_ctx_param',
-	'gem_ctx_persistence',
-	'gem_ctx_shared',
-	'gem_ctx_sseu',
-	'gem_ctx_switch',
-	'gem_eio',
-	'gem_evict_alignment',
-	'gem_evict_everything',
-	'gem_exec_alignment',
-	'gem_exec_async',
-	'gem_exec_await',
-	'gem_exec_balancer',
-	'gem_exec_basic',
-	'gem_exec_big',
-	'gem_exec_capture',
-	'gem_exec_create',
-	'gem_exec_endless',
-	'gem_exec_fair',
-	'gem_exec_fence',
-	'gem_exec_flush',
-	'gem_exec_gttfill',
-	'gem_exec_latency',
-	'gem_exec_lut_handle',
-	'gem_exec_nop',
-	'gem_exec_parallel',
-	'gem_exec_params',
-	'gem_exercise_blt',
-	'gen7_exec_parse',
-	'gen9_exec_parse',
-	'gem_exec_reloc',
-	'gem_exec_schedule',
-	'gem_exec_store',
-	'gem_exec_suspend',
-	'gem_exec_whisper',
-	'gem_fd_exhaustion',
-	'gem_fence_thrash',
-	'gem_fence_upload',
-	'gem_fenced_exec_thrash',
-	'gem_flink_basic',
-	'gem_flink_race',
-	'gem_gpgpu_fill',
-	'gem_gtt_cpu_tlb',
-	'gem_gtt_hog',
-	'gem_gtt_speed',
-	'gem_huc_copy',
-	'gem_linear_blits',
-	'gem_lmem_evict',
-	'gem_lmem_swapping',
-	'gem_lut_handle',
-	'gem_madvise',
-	'gem_media_fill',
-	'gem_media_vme',
-	'gem_mmap',
-	'gem_mmap_gtt',
-	'gem_mmap_offset',
-	'gem_mmap_wc',
-	'gem_partial_pwrite_pread',
-	'gem_pipe_control_store_loop',
-	'gem_ppgtt',
-	'gem_pread',
-	'gem_pread_after_blit',
-	'gem_pwrite',
-	'gem_pwrite_snooped',
-	'gem_pxp',
-	'gem_read_read_speed',
-	'gem_readwrite',
-	'gem_reg_read',
-	'gem_render_copy',
-	'gem_render_copy_redux',
-	'gem_render_linear_blits',
-	'gem_render_tiled_blits',
-	'gem_request_retire',
-	'gem_reset_stats',
-	'gem_ringfill',
-	'gem_set_tiling_vs_blt',
-	'gem_set_tiling_vs_gtt',
-	'gem_set_tiling_vs_pwrite',
-	'gem_shrink',
-	'gem_softpin',
-	'gem_spin_batch',
-	'gem_streaming_writes',
-	'gem_sync',
-	'gem_tiled_blits',
-	'gem_tiled_fence_blits',
-	'gem_tiled_partial_pwrite_pread',
-	'gem_tiled_pread_basic',
-	'gem_tiled_pread_pwrite',
-	'gem_tiled_swapping',
-	'gem_tiled_wb',
-	'gem_tiled_wc',
-	'gem_tiling_max_stride',
-	'gem_unfence_active_buffers',
-	'gem_unref_active_buffers',
-	'gem_userptr_blits',
-	'gem_vm_create',
-	'gem_wait',
-	'gem_watchdog',
-	'gem_workarounds',
-	'perf',
-	'perf_pmu',
+	'i915_api_intel_bb',
+	'i915_debugfs_test',
+	'i915_drm_fdinfo',
 	'i915_fb_tiling',
+	'i915_gem_bad_reloc',
+	'i915_gem_barrier_race',
+	'i915_gem_basic',
+	'i915_gem_blits',
+	'i915_gem_busy',
+	'i915_gem_caching',
+	'i915_gem_ccs',
+	'i915_gem_close',
+	'i915_gem_close_race',
+	'i915_gem_concurrent_blit',
+	'i915_gem_create',
+	'i915_gem_cs_tlb',
+	'i915_gem_ctx_bad_destroy',
+	'i915_gem_ctx_create',
+	'i915_gem_ctx_engines',
+	'i915_gem_ctx_exec',
+	'i915_gem_ctx_freq',
+	'i915_gem_ctx_isolation',
+	'i915_gem_ctx_param',
+	'i915_gem_ctx_persistence',
+	'i915_gem_ctx_shared',
+	'i915_gem_ctx_sseu',
+	'i915_gem_ctx_switch',
+	'i915_gem_eio',
+	'i915_gem_evict_alignment',
+	'i915_gem_evict_everything',
+	'i915_gem_exec_alignment',
+	'i915_gem_exec_async',
+	'i915_gem_exec_await',
+	'i915_gem_exec_balancer',
+	'i915_gem_exec_basic',
+	'i915_gem_exec_big',
+	'i915_gem_exec_capture',
+	'i915_gem_exec_create',
+	'i915_gem_exec_endless',
+	'i915_gem_exec_fair',
+	'i915_gem_exec_fence',
+	'i915_gem_exec_flush',
+	'i915_gem_exec_gttfill',
+	'i915_gem_exec_latency',
+	'i915_gem_exec_lut_handle',
+	'i915_gem_exec_nop',
+	'i915_gem_exec_parallel',
+	'i915_gem_exec_params',
+	'i915_gem_exec_reloc',
+	'i915_gem_exec_schedule',
+	'i915_gem_exec_store',
+	'i915_gem_exec_suspend',
+	'i915_gem_exec_whisper',
+	'i915_gem_exercise_blt',
+	'i915_gem_fd_exhaustion',
+	'i915_gem_fence_thrash',
+	'i915_gem_fence_upload',
+	'i915_gem_fenced_exec_thrash',
+	'i915_gem_flink_basic',
+	'i915_gem_flink_race',
+	'i915_gem_gpgpu_fill',
+	'i915_gem_gtt_cpu_tlb',
+	'i915_gem_gtt_hog',
+	'i915_gem_gtt_speed',
+	'i915_gem_huc_copy',
+	'i915_gem_linear_blits',
+	'i915_gem_lmem_evict',
+	'i915_gem_lmem_swapping',
+	'i915_gem_lut_handle',
+	'i915_gem_madvise',
+	'i915_gem_media_fill',
+	'i915_gem_media_vme',
+	'i915_gem_mmap',
+	'i915_gem_mmap_gtt',
+	'i915_gem_mmap_offset',
+	'i915_gem_mmap_wc',
+	'i915_gem_partial_pwrite_pread',
+	'i915_gem_pipe_control_store_loop',
+	'i915_gem_ppgtt',
+	'i915_gem_pread',
+	'i915_gem_pread_after_blit',
+	'i915_gem_pwrite',
+	'i915_gem_pwrite_snooped',
+	'i915_gem_pxp',
+	'i915_gem_read_read_speed',
+	'i915_gem_readwrite',
+	'i915_gem_reg_read',
+	'i915_gem_render_copy',
+	'i915_gem_render_copy_redux',
+	'i915_gem_render_linear_blits',
+	'i915_gem_render_tiled_blits',
+	'i915_gem_request_retire',
+	'i915_gem_reset_stats',
+	'i915_gem_ringfill',
+	'i915_gem_set_tiling_vs_blt',
+	'i915_gem_set_tiling_vs_gtt',
+	'i915_gem_set_tiling_vs_pwrite',
+	'i915_gem_shrink',
+	'i915_gem_softpin',
+	'i915_gem_spin_batch',
+	'i915_gem_streaming_writes',
+	'i915_gem_sync',
+	'i915_gem_tiled_blits',
+	'i915_gem_tiled_fence_blits',
+	'i915_gem_tiled_partial_pwrite_pread',
+	'i915_gem_tiled_pread_basic',
+	'i915_gem_tiled_pread_pwrite',
+	'i915_gem_tiled_swapping',
+	'i915_gem_tiled_wb',
+	'i915_gem_tiled_wc',
+	'i915_gem_tiling_max_stride',
+	'i915_gem_unfence_active_buffers',
+	'i915_gem_unref_active_buffers',
+	'i915_gem_userptr_blits',
+	'i915_gem_vm_create',
+	'i915_gem_wait',
+	'i915_gem_watchdog',
+	'i915_gem_workarounds',
+	'i915_gen3_mixed_blits',
+	'i915_gen3_render_linear_blits',
+	'i915_gen3_render_mixed_blits',
+	'i915_gen3_render_tiledx_blits',
+	'i915_gen3_render_tiledy_blits',
+	'i915_gen7_exec_parse',
+	'i915_gen9_exec_parse',
 	'i915_getparams_basic',
-	'i915_pm_freq_api',
 	'i915_hangman',
 	'i915_hwmon',
 	'i915_module_load',
 	'i915_pciid',
+	'i915_perf',
+	'i915_perf_pmu',
 	'i915_pipe_stress',
 	'i915_pm_backlight',
+	'i915_pm_dc',
+	'i915_pm_freq_api',
 	'i915_pm_freq_mult',
 	'i915_pm_lpsp',
-	'i915_pm_rpm',
-	'i915_pm_dc',
 	'i915_pm_rc6_residency',
+	'i915_pm_rpm',
 	'i915_pm_rps',
 	'i915_pm_sseu',
 	'i915_power',
+	'i915_prime_busy',
+	'i915_prime_mmap',
+	'i915_prime_mmap_coherency',
+	'i915_prime_mmap_kms',
+	'i915_prime_self_import',
 	'i915_query',
 	'i915_selftest',
 	'i915_suspend',
-	'prime_busy',
-	'prime_mmap',
-	'prime_mmap_coherency',
-	'prime_mmap_kms',
-	'prime_self_import',
-	'sysfs_defaults',
-	'sysfs_heartbeat_interval',
-	'sysfs_preempt_timeout',
-	'sysfs_timeslice_duration',
+	'i915_sysfs_defaults',
+	'i915_sysfs_heartbeat_interval',
+	'i915_sysfs_preempt_timeout',
+	'i915_sysfs_timeslice_duration',
 ]
 
 intel_kms_progs = [
@@ -353,19 +353,19 @@ extra_sources = {
 # Extra dependencies used on core and Intel drivers
 extra_dependencies = {
 	'core_hotunplug': [ lib_igt_i915_perf ],
-	'drm_fdinfo': [ lib_igt_drm_fdinfo ],
+	'i915_drm_fdinfo': [ lib_igt_drm_fdinfo ],
 	'dumb_buffer':  [ libatomic ],
-	'gem_barrier_race': [ lib_igt_i915_perf ],
-	'gem_create': [ libatomic ],
-	'gem_ctx_freq': [ lib_igt_perf ],
-	'gem_ctx_sseu': [ lib_igt_perf ],
-	'gem_eio': [ realtime ],
-	'gem_exec_balancer': [ lib_igt_perf ],
-	'gem_mmap_offset': [ libatomic ],
+	'i915_gem_barrier_race': [ lib_igt_i915_perf ],
+	'i915_gem_create': [ libatomic ],
+	'i915_gem_ctx_freq': [ lib_igt_perf ],
+	'i915_gem_ctx_sseu': [ lib_igt_perf ],
+	'i915_gem_eio': [ realtime ],
+	'i915_gem_exec_balancer': [ lib_igt_perf ],
+	'i915_gem_mmap_offset': [ libatomic ],
 	'i915_pm_freq_mult': [ lib_igt_perf ],
 	'i915_pm_rc6_residency': [ lib_igt_perf ],
-	'perf': [ lib_igt_i915_perf ],
-	'perf_pmu':  [ lib_igt_perf ],
+	'i915_perf': [ lib_igt_i915_perf ],
+	'i915_perf_pmu':  [ lib_igt_perf ],
 	'sw_sync': [ libatomic ],
 }
 
@@ -457,12 +457,12 @@ test_list_target = custom_target('testlist',
 	      install : true,
 	      install_dir : libexecdir)
 
-test_executables += executable('gem_concurrent_all', 'intel/gem_concurrent_all.c',
+test_executables += executable('i915_gem_concurrent_all', 'intel/i915_gem_concurrent_all.c',
 	   dependencies : test_deps + [ libatomic ],
 	   install_dir : libexecdir,
 	   install_rpath : libexecdir_rpathdir,
 	   install : true)
-test_list += 'gem_concurrent_all'
+test_list += 'i915_gem_concurrent_all'
 
 test_list_full_target = custom_target('testlist-full',
 	      output : 'test-list-full.txt',
@@ -475,16 +475,16 @@ foreach prog : test_list
 	test('testcase check ' + prog, test_script, args : prog)
 endforeach
 
-testexe = executable('gem_stress', 'intel/gem_stress.c',
+testexe = executable('i915_gem_stress', 'intel/i915_gem_stress.c',
 	   install : true,
 	   install_dir : libexecdir,
 	   install_rpath : libexecdir_rpathdir,
 	   dependencies : igt_deps)
-testlist_files += custom_target('gem_stress.testlist',
+testlist_files += custom_target('i915_gem_stress.testlist',
                 build_by_default : true,
                 command : [testexe, '--show-testlist'],
                 capture : true,
-                output : 'gem_stress.testlist')
+                output : 'i915_gem_stress.testlist')
 
 image_files = [
   '1080p-left.png',
-- 
2.40.0



^ permalink raw reply related	[flat|nested] 18+ messages in thread

* Re: [igt-dev] [i-g-t V5 7/7] tests: Rename all intel specific tests
  2023-08-31 14:56 ` [igt-dev] [i-g-t V5 7/7] tests: Rename all intel specific tests Bhanuprakash Modem
@ 2023-08-31 16:05   ` Mauro Carvalho Chehab
  2023-08-31 18:45   ` [igt-dev] [i-g-t V6 " Bhanuprakash Modem
  1 sibling, 0 replies; 18+ messages in thread
From: Mauro Carvalho Chehab @ 2023-08-31 16:05 UTC (permalink / raw)
  To: Bhanuprakash Modem; +Cc: igt-dev

On Thu, 31 Aug 2023 20:26:22 +0530
Bhanuprakash Modem <bhanuprakash.modem@intel.com> wrote:

> As all intel specific tests got moved to a new directory
> "tests/intel", rename all intel specific tests to represent
> the supported driver.
> 
> Test name should start with the driver_name_ prefix. Below are
> the Examples.
> 
>  - tests/intel/i915_*.c : All i915 specific tests. Ex: i915_module_load.c
>  - tests/intel/intel_*.c: All tests those supports both i915 & XE.
>  - tests/intel/kms_*.c  : All kms tests. Ex: kms_psr.c
>  - tests/intel/xe_*.c   : All XE specific tests. Ex: xe_module_load.c
> 
> Going forward, we need to follow the above rules to maintain the
> tests.

I suspect you need to also update the doc reference stuff, e. g.:

	tests/feat_profile.json

and/or the files under:

	docs/reference/

Regards,
Mauro


> 
> Cc: Mauro Carvalho Chehab <mauro.chehab@linux.intel.com>
> Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
> ---
>  README.md                                     |   2 +-
>  tests/intel-ci/blacklist-pre-merge.txt        |  14 +-
>  tests/intel-ci/blacklist.txt                  | 102 +++---
>  tests/intel-ci/fast-feedback.testlist         | 104 +++---
>  .../{api_intel_bb.c => i915_api_intel_bb.c}   |   0
>  .../{debugfs_test.c => i915_debugfs_test.c}   |   0
>  .../intel/{drm_fdinfo.c => i915_drm_fdinfo.c} |   0
>  .../{gem_bad_reloc.c => i915_gem_bad_reloc.c} |   0
>  ...barrier_race.c => i915_gem_barrier_race.c} |   0
>  tests/intel/{gem_basic.c => i915_gem_basic.c} |   0
>  tests/intel/{gem_blits.c => i915_gem_blits.c} |   0
>  tests/intel/{gem_busy.c => i915_gem_busy.c}   |   0
>  .../{gem_caching.c => i915_gem_caching.c}     |   0
>  tests/intel/{gem_ccs.c => i915_gem_ccs.c}     |   0
>  tests/intel/{gem_close.c => i915_gem_close.c} |   0
>  ...gem_close_race.c => i915_gem_close_race.c} |   0
>  ...urrent_all.c => i915_gem_concurrent_all.c} |   0
>  ...rent_blit.c => i915_gem_concurrent_blit.c} |   2 +-
>  .../intel/{gem_create.c => i915_gem_create.c} |   0
>  .../intel/{gem_cs_tlb.c => i915_gem_cs_tlb.c} |   0
>  ...d_destroy.c => i915_gem_ctx_bad_destroy.c} |   0
>  ...gem_ctx_create.c => i915_gem_ctx_create.c} |   0
>  ...m_ctx_engines.c => i915_gem_ctx_engines.c} |   0
>  .../{gem_ctx_exec.c => i915_gem_ctx_exec.c}   |   0
>  .../{gem_ctx_freq.c => i915_gem_ctx_freq.c}   |   0
>  ...x_isolation.c => i915_gem_ctx_isolation.c} |   0
>  .../{gem_ctx_param.c => i915_gem_ctx_param.c} |   0
>  ...rsistence.c => i915_gem_ctx_persistence.c} |   0
>  ...gem_ctx_shared.c => i915_gem_ctx_shared.c} |   0
>  .../{gem_ctx_sseu.c => i915_gem_ctx_sseu.c}   |   0
>  ...gem_ctx_switch.c => i915_gem_ctx_switch.c} |   0
>  tests/intel/{gem_eio.c => i915_gem_eio.c}     |   0
>  ...alignment.c => i915_gem_evict_alignment.c} |   0
>  ...erything.c => i915_gem_evict_everything.c} |   0
>  ..._alignment.c => i915_gem_exec_alignment.c} |   0
>  ...gem_exec_async.c => i915_gem_exec_async.c} |   0
>  ...gem_exec_await.c => i915_gem_exec_await.c} |   0
>  ...ec_balancer.c => i915_gem_exec_balancer.c} |   0
>  ...gem_exec_basic.c => i915_gem_exec_basic.c} |   0
>  .../{gem_exec_big.c => i915_gem_exec_big.c}   |   0
>  ...exec_capture.c => i915_gem_exec_capture.c} |   0
>  ...m_exec_create.c => i915_gem_exec_create.c} |   0
>  ...exec_endless.c => i915_gem_exec_endless.c} |   0
>  .../{gem_exec_fair.c => i915_gem_exec_fair.c} |   0
>  ...gem_exec_fence.c => i915_gem_exec_fence.c} |   0
>  ...gem_exec_flush.c => i915_gem_exec_flush.c} |   0
>  ...exec_gttfill.c => i915_gem_exec_gttfill.c} |   0
>  ...exec_latency.c => i915_gem_exec_latency.c} |   0
>  ...ut_handle.c => i915_gem_exec_lut_handle.c} |   0
>  .../{gem_exec_nop.c => i915_gem_exec_nop.c}   |   0
>  ...ec_parallel.c => i915_gem_exec_parallel.c} |   0
>  ...m_exec_params.c => i915_gem_exec_params.c} |   0
>  ...gem_exec_reloc.c => i915_gem_exec_reloc.c} |   0
>  ...ec_schedule.c => i915_gem_exec_schedule.c} |   0
>  ...gem_exec_store.c => i915_gem_exec_store.c} |   0
>  ...exec_suspend.c => i915_gem_exec_suspend.c} |   0
>  ...exec_whisper.c => i915_gem_exec_whisper.c} |   0
>  ...exercise_blt.c => i915_gem_exercise_blt.c} |   0
>  ..._exhaustion.c => i915_gem_fd_exhaustion.c} |   0
>  ...fence_thrash.c => i915_gem_fence_thrash.c} |   0
>  ...fence_upload.c => i915_gem_fence_upload.c} |   0
>  ...thrash.c => i915_gem_fenced_exec_thrash.c} |   0
>  ...m_flink_basic.c => i915_gem_flink_basic.c} |   0
>  ...gem_flink_race.c => i915_gem_flink_race.c} |   0
>  ...gem_gpgpu_fill.c => i915_gem_gpgpu_fill.c} |   0
>  ...m_gtt_cpu_tlb.c => i915_gem_gtt_cpu_tlb.c} |   0
>  .../{gem_gtt_hog.c => i915_gem_gtt_hog.c}     |   0
>  .../{gem_gtt_speed.c => i915_gem_gtt_speed.c} |   0
>  .../{gem_huc_copy.c => i915_gem_huc_copy.c}   |   0
>  ...linear_blits.c => i915_gem_linear_blits.c} |   0
>  ...gem_lmem_evict.c => i915_gem_lmem_evict.c} |   0
>  ...em_swapping.c => i915_gem_lmem_swapping.c} |   0
>  ...gem_lut_handle.c => i915_gem_lut_handle.c} |   0
>  .../{gem_madvise.c => i915_gem_madvise.c}     |   0
>  ...gem_media_fill.c => i915_gem_media_fill.c} |   0
>  .../{gem_media_vme.c => i915_gem_media_vme.c} |   0
>  tests/intel/{gem_mmap.c => i915_gem_mmap.c}   |   0
>  .../{gem_mmap_gtt.c => i915_gem_mmap_gtt.c}   |   0
>  ...m_mmap_offset.c => i915_gem_mmap_offset.c} |   0
>  .../{gem_mmap_wc.c => i915_gem_mmap_wc.c}     |   0
>  ...read.c => i915_gem_partial_pwrite_pread.c} |   0
>  ...p.c => i915_gem_pipe_control_store_loop.c} |   0
>  tests/intel/{gem_ppgtt.c => i915_gem_ppgtt.c} |   0
>  tests/intel/{gem_pread.c => i915_gem_pread.c} |   0
>  ...ter_blit.c => i915_gem_pread_after_blit.c} |   0
>  .../intel/{gem_pwrite.c => i915_gem_pwrite.c} |   0
>  ...te_snooped.c => i915_gem_pwrite_snooped.c} |   0
>  tests/intel/{gem_pxp.c => i915_gem_pxp.c}     |   0
>  ...ead_speed.c => i915_gem_read_read_speed.c} |   0
>  .../{gem_readwrite.c => i915_gem_readwrite.c} |   0
>  .../{gem_reg_read.c => i915_gem_reg_read.c}   |   0
>  ...m_render_copy.c => i915_gem_render_copy.c} |   0
>  ...y_redux.c => i915_gem_render_copy_redux.c} |   0
>  ...blits.c => i915_gem_render_linear_blits.c} |   0
>  ..._blits.c => i915_gem_render_tiled_blits.c} |   0
>  ...est_retire.c => i915_gem_request_retire.c} |   0
>  ...m_reset_stats.c => i915_gem_reset_stats.c} |   0
>  .../{gem_ringfill.c => i915_gem_ringfill.c}   |   0
>  ..._vs_blt.c => i915_gem_set_tiling_vs_blt.c} |   0
>  ..._vs_gtt.c => i915_gem_set_tiling_vs_gtt.c} |   0
>  ...rite.c => i915_gem_set_tiling_vs_pwrite.c} |   0
>  .../intel/{gem_shrink.c => i915_gem_shrink.c} |   0
>  .../{gem_softpin.c => i915_gem_softpin.c}     |   0
>  ...gem_spin_batch.c => i915_gem_spin_batch.c} |   0
>  ...g_writes.c => i915_gem_streaming_writes.c} |   0
>  .../intel/{gem_stress.c => i915_gem_stress.c} |   0
>  tests/intel/{gem_sync.c => i915_gem_sync.c}   |   0
>  ...m_tiled_blits.c => i915_gem_tiled_blits.c} |   0
>  ...e_blits.c => i915_gem_tiled_fence_blits.c} |   0
>  ... => i915_gem_tiled_partial_pwrite_pread.c} |   0
>  ...d_basic.c => i915_gem_tiled_pread_basic.c} |   0
>  ...pwrite.c => i915_gem_tiled_pread_pwrite.c} |   0
>  ...d_swapping.c => i915_gem_tiled_swapping.c} |   0
>  .../{gem_tiled_wb.c => i915_gem_tiled_wb.c}   |   0
>  .../{gem_tiled_wc.c => i915_gem_tiled_wc.c}   |   0
>  ..._stride.c => i915_gem_tiling_max_stride.c} |   0
>  ...rs.c => i915_gem_unfence_active_buffers.c} |   0
>  ...fers.c => i915_gem_unref_active_buffers.c} |   0
>  ...erptr_blits.c => i915_gem_userptr_blits.c} |   0
>  .../{gem_vm_create.c => i915_gem_vm_create.c} |   0
>  tests/intel/{gem_wait.c => i915_gem_wait.c}   |   0
>  .../{gem_watchdog.c => i915_gem_watchdog.c}   |   0
>  ...m_workarounds.c => i915_gem_workarounds.c} |   0
>  ..._mixed_blits.c => i915_gen3_mixed_blits.c} |   0
>  ...lits.c => i915_gen3_render_linear_blits.c} |   0
>  ...blits.c => i915_gen3_render_mixed_blits.c} |   0
>  ...lits.c => i915_gen3_render_tiledx_blits.c} |   0
>  ...lits.c => i915_gen3_render_tiledy_blits.c} |   0
>  ...n7_exec_parse.c => i915_gen7_exec_parse.c} |   0
>  ...n9_exec_parse.c => i915_gen9_exec_parse.c} |   0
>  tests/intel/{perf.c => i915_perf.c}           |   0
>  tests/intel/{perf_pmu.c => i915_perf_pmu.c}   |   0
>  .../intel/{prime_busy.c => i915_prime_busy.c} |   0
>  .../intel/{prime_mmap.c => i915_prime_mmap.c} |   0
>  ...oherency.c => i915_prime_mmap_coherency.c} |   0
>  ...prime_mmap_kms.c => i915_prime_mmap_kms.c} |   0
>  ...self_import.c => i915_prime_self_import.c} |   0
>  ...sysfs_defaults.c => i915_sysfs_defaults.c} |   0
>  ...rval.c => i915_sysfs_heartbeat_interval.c} |   0
>  ...timeout.c => i915_sysfs_preempt_timeout.c} |   0
>  ...tion.c => i915_sysfs_timeslice_duration.c} |   0
>  tests/intel/i915_test_config.json             |   8 +-
>  ...llocator.c => intel_api_intel_allocator.c} |   0
>  tests/meson.build                             | 308 +++++++++---------
>  144 files changed, 269 insertions(+), 271 deletions(-)
>  rename tests/intel/{api_intel_bb.c => i915_api_intel_bb.c} (100%)
>  rename tests/intel/{debugfs_test.c => i915_debugfs_test.c} (100%)
>  rename tests/intel/{drm_fdinfo.c => i915_drm_fdinfo.c} (100%)
>  rename tests/intel/{gem_bad_reloc.c => i915_gem_bad_reloc.c} (100%)
>  rename tests/intel/{gem_barrier_race.c => i915_gem_barrier_race.c} (100%)
>  rename tests/intel/{gem_basic.c => i915_gem_basic.c} (100%)
>  rename tests/intel/{gem_blits.c => i915_gem_blits.c} (100%)
>  rename tests/intel/{gem_busy.c => i915_gem_busy.c} (100%)
>  rename tests/intel/{gem_caching.c => i915_gem_caching.c} (100%)
>  rename tests/intel/{gem_ccs.c => i915_gem_ccs.c} (100%)
>  rename tests/intel/{gem_close.c => i915_gem_close.c} (100%)
>  rename tests/intel/{gem_close_race.c => i915_gem_close_race.c} (100%)
>  rename tests/intel/{gem_concurrent_all.c => i915_gem_concurrent_all.c} (100%)
>  rename tests/intel/{gem_concurrent_blit.c => i915_gem_concurrent_blit.c} (91%)
>  rename tests/intel/{gem_create.c => i915_gem_create.c} (100%)
>  rename tests/intel/{gem_cs_tlb.c => i915_gem_cs_tlb.c} (100%)
>  rename tests/intel/{gem_ctx_bad_destroy.c => i915_gem_ctx_bad_destroy.c} (100%)
>  rename tests/intel/{gem_ctx_create.c => i915_gem_ctx_create.c} (100%)
>  rename tests/intel/{gem_ctx_engines.c => i915_gem_ctx_engines.c} (100%)
>  rename tests/intel/{gem_ctx_exec.c => i915_gem_ctx_exec.c} (100%)
>  rename tests/intel/{gem_ctx_freq.c => i915_gem_ctx_freq.c} (100%)
>  rename tests/intel/{gem_ctx_isolation.c => i915_gem_ctx_isolation.c} (100%)
>  rename tests/intel/{gem_ctx_param.c => i915_gem_ctx_param.c} (100%)
>  rename tests/intel/{gem_ctx_persistence.c => i915_gem_ctx_persistence.c} (100%)
>  rename tests/intel/{gem_ctx_shared.c => i915_gem_ctx_shared.c} (100%)
>  rename tests/intel/{gem_ctx_sseu.c => i915_gem_ctx_sseu.c} (100%)
>  rename tests/intel/{gem_ctx_switch.c => i915_gem_ctx_switch.c} (100%)
>  rename tests/intel/{gem_eio.c => i915_gem_eio.c} (100%)
>  rename tests/intel/{gem_evict_alignment.c => i915_gem_evict_alignment.c} (100%)
>  rename tests/intel/{gem_evict_everything.c => i915_gem_evict_everything.c} (100%)
>  rename tests/intel/{gem_exec_alignment.c => i915_gem_exec_alignment.c} (100%)
>  rename tests/intel/{gem_exec_async.c => i915_gem_exec_async.c} (100%)
>  rename tests/intel/{gem_exec_await.c => i915_gem_exec_await.c} (100%)
>  rename tests/intel/{gem_exec_balancer.c => i915_gem_exec_balancer.c} (100%)
>  rename tests/intel/{gem_exec_basic.c => i915_gem_exec_basic.c} (100%)
>  rename tests/intel/{gem_exec_big.c => i915_gem_exec_big.c} (100%)
>  rename tests/intel/{gem_exec_capture.c => i915_gem_exec_capture.c} (100%)
>  rename tests/intel/{gem_exec_create.c => i915_gem_exec_create.c} (100%)
>  rename tests/intel/{gem_exec_endless.c => i915_gem_exec_endless.c} (100%)
>  rename tests/intel/{gem_exec_fair.c => i915_gem_exec_fair.c} (100%)
>  rename tests/intel/{gem_exec_fence.c => i915_gem_exec_fence.c} (100%)
>  rename tests/intel/{gem_exec_flush.c => i915_gem_exec_flush.c} (100%)
>  rename tests/intel/{gem_exec_gttfill.c => i915_gem_exec_gttfill.c} (100%)
>  rename tests/intel/{gem_exec_latency.c => i915_gem_exec_latency.c} (100%)
>  rename tests/intel/{gem_exec_lut_handle.c => i915_gem_exec_lut_handle.c} (100%)
>  rename tests/intel/{gem_exec_nop.c => i915_gem_exec_nop.c} (100%)
>  rename tests/intel/{gem_exec_parallel.c => i915_gem_exec_parallel.c} (100%)
>  rename tests/intel/{gem_exec_params.c => i915_gem_exec_params.c} (100%)
>  rename tests/intel/{gem_exec_reloc.c => i915_gem_exec_reloc.c} (100%)
>  rename tests/intel/{gem_exec_schedule.c => i915_gem_exec_schedule.c} (100%)
>  rename tests/intel/{gem_exec_store.c => i915_gem_exec_store.c} (100%)
>  rename tests/intel/{gem_exec_suspend.c => i915_gem_exec_suspend.c} (100%)
>  rename tests/intel/{gem_exec_whisper.c => i915_gem_exec_whisper.c} (100%)
>  rename tests/intel/{gem_exercise_blt.c => i915_gem_exercise_blt.c} (100%)
>  rename tests/intel/{gem_fd_exhaustion.c => i915_gem_fd_exhaustion.c} (100%)
>  rename tests/intel/{gem_fence_thrash.c => i915_gem_fence_thrash.c} (100%)
>  rename tests/intel/{gem_fence_upload.c => i915_gem_fence_upload.c} (100%)
>  rename tests/intel/{gem_fenced_exec_thrash.c => i915_gem_fenced_exec_thrash.c} (100%)
>  rename tests/intel/{gem_flink_basic.c => i915_gem_flink_basic.c} (100%)
>  rename tests/intel/{gem_flink_race.c => i915_gem_flink_race.c} (100%)
>  rename tests/intel/{gem_gpgpu_fill.c => i915_gem_gpgpu_fill.c} (100%)
>  rename tests/intel/{gem_gtt_cpu_tlb.c => i915_gem_gtt_cpu_tlb.c} (100%)
>  rename tests/intel/{gem_gtt_hog.c => i915_gem_gtt_hog.c} (100%)
>  rename tests/intel/{gem_gtt_speed.c => i915_gem_gtt_speed.c} (100%)
>  rename tests/intel/{gem_huc_copy.c => i915_gem_huc_copy.c} (100%)
>  rename tests/intel/{gem_linear_blits.c => i915_gem_linear_blits.c} (100%)
>  rename tests/intel/{gem_lmem_evict.c => i915_gem_lmem_evict.c} (100%)
>  rename tests/intel/{gem_lmem_swapping.c => i915_gem_lmem_swapping.c} (100%)
>  rename tests/intel/{gem_lut_handle.c => i915_gem_lut_handle.c} (100%)
>  rename tests/intel/{gem_madvise.c => i915_gem_madvise.c} (100%)
>  rename tests/intel/{gem_media_fill.c => i915_gem_media_fill.c} (100%)
>  rename tests/intel/{gem_media_vme.c => i915_gem_media_vme.c} (100%)
>  rename tests/intel/{gem_mmap.c => i915_gem_mmap.c} (100%)
>  rename tests/intel/{gem_mmap_gtt.c => i915_gem_mmap_gtt.c} (100%)
>  rename tests/intel/{gem_mmap_offset.c => i915_gem_mmap_offset.c} (100%)
>  rename tests/intel/{gem_mmap_wc.c => i915_gem_mmap_wc.c} (100%)
>  rename tests/intel/{gem_partial_pwrite_pread.c => i915_gem_partial_pwrite_pread.c} (100%)
>  rename tests/intel/{gem_pipe_control_store_loop.c => i915_gem_pipe_control_store_loop.c} (100%)
>  rename tests/intel/{gem_ppgtt.c => i915_gem_ppgtt.c} (100%)
>  rename tests/intel/{gem_pread.c => i915_gem_pread.c} (100%)
>  rename tests/intel/{gem_pread_after_blit.c => i915_gem_pread_after_blit.c} (100%)
>  rename tests/intel/{gem_pwrite.c => i915_gem_pwrite.c} (100%)
>  rename tests/intel/{gem_pwrite_snooped.c => i915_gem_pwrite_snooped.c} (100%)
>  rename tests/intel/{gem_pxp.c => i915_gem_pxp.c} (100%)
>  rename tests/intel/{gem_read_read_speed.c => i915_gem_read_read_speed.c} (100%)
>  rename tests/intel/{gem_readwrite.c => i915_gem_readwrite.c} (100%)
>  rename tests/intel/{gem_reg_read.c => i915_gem_reg_read.c} (100%)
>  rename tests/intel/{gem_render_copy.c => i915_gem_render_copy.c} (100%)
>  rename tests/intel/{gem_render_copy_redux.c => i915_gem_render_copy_redux.c} (100%)
>  rename tests/intel/{gem_render_linear_blits.c => i915_gem_render_linear_blits.c} (100%)
>  rename tests/intel/{gem_render_tiled_blits.c => i915_gem_render_tiled_blits.c} (100%)
>  rename tests/intel/{gem_request_retire.c => i915_gem_request_retire.c} (100%)
>  rename tests/intel/{gem_reset_stats.c => i915_gem_reset_stats.c} (100%)
>  rename tests/intel/{gem_ringfill.c => i915_gem_ringfill.c} (100%)
>  rename tests/intel/{gem_set_tiling_vs_blt.c => i915_gem_set_tiling_vs_blt.c} (100%)
>  rename tests/intel/{gem_set_tiling_vs_gtt.c => i915_gem_set_tiling_vs_gtt.c} (100%)
>  rename tests/intel/{gem_set_tiling_vs_pwrite.c => i915_gem_set_tiling_vs_pwrite.c} (100%)
>  rename tests/intel/{gem_shrink.c => i915_gem_shrink.c} (100%)
>  rename tests/intel/{gem_softpin.c => i915_gem_softpin.c} (100%)
>  rename tests/intel/{gem_spin_batch.c => i915_gem_spin_batch.c} (100%)
>  rename tests/intel/{gem_streaming_writes.c => i915_gem_streaming_writes.c} (100%)
>  rename tests/intel/{gem_stress.c => i915_gem_stress.c} (100%)
>  rename tests/intel/{gem_sync.c => i915_gem_sync.c} (100%)
>  rename tests/intel/{gem_tiled_blits.c => i915_gem_tiled_blits.c} (100%)
>  rename tests/intel/{gem_tiled_fence_blits.c => i915_gem_tiled_fence_blits.c} (100%)
>  rename tests/intel/{gem_tiled_partial_pwrite_pread.c => i915_gem_tiled_partial_pwrite_pread.c} (100%)
>  rename tests/intel/{gem_tiled_pread_basic.c => i915_gem_tiled_pread_basic.c} (100%)
>  rename tests/intel/{gem_tiled_pread_pwrite.c => i915_gem_tiled_pread_pwrite.c} (100%)
>  rename tests/intel/{gem_tiled_swapping.c => i915_gem_tiled_swapping.c} (100%)
>  rename tests/intel/{gem_tiled_wb.c => i915_gem_tiled_wb.c} (100%)
>  rename tests/intel/{gem_tiled_wc.c => i915_gem_tiled_wc.c} (100%)
>  rename tests/intel/{gem_tiling_max_stride.c => i915_gem_tiling_max_stride.c} (100%)
>  rename tests/intel/{gem_unfence_active_buffers.c => i915_gem_unfence_active_buffers.c} (100%)
>  rename tests/intel/{gem_unref_active_buffers.c => i915_gem_unref_active_buffers.c} (100%)
>  rename tests/intel/{gem_userptr_blits.c => i915_gem_userptr_blits.c} (100%)
>  rename tests/intel/{gem_vm_create.c => i915_gem_vm_create.c} (100%)
>  rename tests/intel/{gem_wait.c => i915_gem_wait.c} (100%)
>  rename tests/intel/{gem_watchdog.c => i915_gem_watchdog.c} (100%)
>  rename tests/intel/{gem_workarounds.c => i915_gem_workarounds.c} (100%)
>  rename tests/intel/{gen3_mixed_blits.c => i915_gen3_mixed_blits.c} (100%)
>  rename tests/intel/{gen3_render_linear_blits.c => i915_gen3_render_linear_blits.c} (100%)
>  rename tests/intel/{gen3_render_mixed_blits.c => i915_gen3_render_mixed_blits.c} (100%)
>  rename tests/intel/{gen3_render_tiledx_blits.c => i915_gen3_render_tiledx_blits.c} (100%)
>  rename tests/intel/{gen3_render_tiledy_blits.c => i915_gen3_render_tiledy_blits.c} (100%)
>  rename tests/intel/{gen7_exec_parse.c => i915_gen7_exec_parse.c} (100%)
>  rename tests/intel/{gen9_exec_parse.c => i915_gen9_exec_parse.c} (100%)
>  rename tests/intel/{perf.c => i915_perf.c} (100%)
>  rename tests/intel/{perf_pmu.c => i915_perf_pmu.c} (100%)
>  rename tests/intel/{prime_busy.c => i915_prime_busy.c} (100%)
>  rename tests/intel/{prime_mmap.c => i915_prime_mmap.c} (100%)
>  rename tests/intel/{prime_mmap_coherency.c => i915_prime_mmap_coherency.c} (100%)
>  rename tests/intel/{prime_mmap_kms.c => i915_prime_mmap_kms.c} (100%)
>  rename tests/intel/{prime_self_import.c => i915_prime_self_import.c} (100%)
>  rename tests/intel/{sysfs_defaults.c => i915_sysfs_defaults.c} (100%)
>  rename tests/intel/{sysfs_heartbeat_interval.c => i915_sysfs_heartbeat_interval.c} (100%)
>  rename tests/intel/{sysfs_preempt_timeout.c => i915_sysfs_preempt_timeout.c} (100%)
>  rename tests/intel/{sysfs_timeslice_duration.c => i915_sysfs_timeslice_duration.c} (100%)
>  rename tests/intel/{api_intel_allocator.c => intel_api_intel_allocator.c} (100%)
> 
> diff --git a/README.md b/README.md
> index 9cef60d88..492650e85 100644
> --- a/README.md
> +++ b/README.md
> @@ -129,7 +129,7 @@ The benchmarks require KMS to be enabled.  When run with an X Server
>  running, they must be run as root to avoid the authentication
>  requirement.
>  
> -Note that a few other microbenchmarks are in tests (e.g. `gem_gtt_speed`).
> +Note that a few other microbenchmarks are in tests (e.g. `i915_gem_gtt_speed`).
>  
>  ### `tools/`
>  
> diff --git a/tests/intel-ci/blacklist-pre-merge.txt b/tests/intel-ci/blacklist-pre-merge.txt
> index d4e5ef66e..b747bdf42 100644
> --- a/tests/intel-ci/blacklist-pre-merge.txt
> +++ b/tests/intel-ci/blacklist-pre-merge.txt
> @@ -37,7 +37,7 @@ igt@i915_pm_rpm@universal-planes(-dpms)?
>  #
>  # Data acquired on 2020-02-19 by Martin Peres
>  ###############################################################################
> -igt@gem_pwrite@big-.*
> +igt@i915_gem_pwrite@big-.*
>  
>  
>  ###############################################################################
> @@ -46,7 +46,7 @@ igt@gem_pwrite@big-.*
>  # outside of drm_mm and i915_gem_execbuffer, for which the authors assure us
>  # that they are making deliberate and well tested changes.
>  ###############################################################################
> -igt@gem_exec_alignment@.*
> +igt@i915_gem_exec_alignment@.*
>  
>  
>  ###############################################################################
> @@ -85,11 +85,11 @@ igt@i915_pm_rpm@debugfs-read
>  #
>  # Data acquired on 2020-02-20 by Martin Peres
>  ###############################################################################
> -igt@gem_fence_thrash@bo-write-verify-threaded-[xy]
> -igt@gem_tiled_blits@interruptible
> -igt@gem_tiled_fence_blits@normal
> -igt@gem_tiled_blits@normal
> -igt@gem_tiled_wc
> +igt@i915_gem_fence_thrash@bo-write-verify-threaded-[xy]
> +igt@i915_gem_tiled_blits@interruptible
> +igt@i915_gem_tiled_fence_blits@normal
> +igt@i915_gem_tiled_blits@normal
> +igt@i915_gem_tiled_wc
>  
>  
>  ###############################################################################
> diff --git a/tests/intel-ci/blacklist.txt b/tests/intel-ci/blacklist.txt
> index e13759d3e..62996c2c7 100644
> --- a/tests/intel-ci/blacklist.txt
> +++ b/tests/intel-ci/blacklist.txt
> @@ -18,56 +18,56 @@ igt@i915_pm_rpm@gem-execbuf-stress-extra-wait
>  ###############################################
>  # GEM
>  ###############################################
> -igt@gem_busy@hang.*
> -igt@gem_close_race@(?!.*basic).*
> -igt@gem_concurrent_blit(@.*)?
> -igt@gem_ctx_create@(?!.*basic).*
> -igt@gem_ctx_exec@(?!.*basic).*
> -igt@gem_ctx_shared@*exhaust*
> -igt@gem_ctx_switch(@.*)?
> -igt@gem_evict_alignment(@.*)?
> -igt@gem_evict_everything(@.*)?
> -igt@gem_exec_big@(?!.*single).*
> -igt@gem_exec_capture@many-(?!4K-).*
> -igt@gem_exec_fair@(?!.*basic).*
> -igt@gem_exec_fence@.*hang.*
> -igt@gem_exec_flush@(?!.*basic).*
> -igt@gem_exec_latency(@.*)?
> -igt@gem_exec_lut_handle(@.*)?
> -igt@gem_exec_nop@(?!.*basic).*
> -igt@gem_exec_reloc@(?!.*basic).*
> -igt@gem_exec_suspend@(?!.*basic).*
> -igt@gem_exec_whisper@(?!basic).*
> -igt@gem_fd_exhaustion(@.*)?
> -igt@gem_fence_upload(@.*)?
> -igt@gem_gtt_hog(@.*)?
> -igt@gem_gtt_speed(@.*)?
> -igt@gem_lut_handle(@.*)?
> -igt@gem_mmap_gtt@.*(huge|swap|clflush|forked).*
> -igt@gem_mmap@.*(swap|huge).*
> -igt@gem_pread_after_blit(@.*)?
> -igt@gem_pwrite@(?!.*basic).*
> -igt@gem_read_read_speed(@.*)?
> -igt@gem_render_linear_blits@(?!.*basic).*
> -igt@gem_render_tiled_blits@(?!.*basic).*
> -igt@gem_reset_stats(@.*)?
> -igt@gem_ringfill@(?!.*basic).*
> -igt@gem_shrink@(?!reclaim$).*
> -igt@gem_softpin@.*(hang|S4).*
> -igt@gem_streaming_writes(@.*)?
> -igt@gem_sync@(?!.*basic).*
> -igt@gem_tiled_swapping@(?!non-threaded).*
> -igt@gem_userptr_blits@(major|minor|forked|mlocked|swapping).*
> -igt@gem_wait@hang.*
> -igt@gem_watchdog@far-fence
> -igt@sysfs_heartbeat_interval@(long|off)
> -igt@sysfs_preempt_timeout@off
> -igt@sysfs_timeslice_duration@off
> +igt@i915_gem_busy@hang.*
> +igt@i915_gem_close_race@(?!.*basic).*
> +igt@i915_gem_concurrent_blit(@.*)?
> +igt@i915_gem_ctx_create@(?!.*basic).*
> +igt@i915_gem_ctx_exec@(?!.*basic).*
> +igt@i915_gem_ctx_shared@*exhaust*
> +igt@i915_gem_ctx_switch(@.*)?
> +igt@i915_gem_evict_alignment(@.*)?
> +igt@i915_gem_evict_everything(@.*)?
> +igt@i915_gem_exec_big@(?!.*single).*
> +igt@i915_gem_exec_capture@many-(?!4K-).*
> +igt@i915_gem_exec_fair@(?!.*basic).*
> +igt@i915_gem_exec_fence@.*hang.*
> +igt@i915_gem_exec_flush@(?!.*basic).*
> +igt@i915_gem_exec_latency(@.*)?
> +igt@i915_gem_exec_lut_handle(@.*)?
> +igt@i915_gem_exec_nop@(?!.*basic).*
> +igt@i915_gem_exec_reloc@(?!.*basic).*
> +igt@i915_gem_exec_suspend@(?!.*basic).*
> +igt@i915_gem_exec_whisper@(?!basic).*
> +igt@i915_gem_fd_exhaustion(@.*)?
> +igt@i915_gem_fence_upload(@.*)?
> +igt@i915_gem_gtt_hog(@.*)?
> +igt@i915_gem_gtt_speed(@.*)?
> +igt@i915_gem_lut_handle(@.*)?
> +igt@i915_gem_mmap_gtt@.*(huge|swap|clflush|forked).*
> +igt@i915_gem_mmap@.*(swap|huge).*
> +igt@i915_gem_pread_after_blit(@.*)?
> +igt@i915_gem_pwrite@(?!.*basic).*
> +igt@i915_gem_read_read_speed(@.*)?
> +igt@i915_gem_render_linear_blits@(?!.*basic).*
> +igt@i915_gem_render_tiled_blits@(?!.*basic).*
> +igt@i915_gem_reset_stats(@.*)?
> +igt@i915_gem_ringfill@(?!.*basic).*
> +igt@i915_gem_shrink@(?!reclaim$).*
> +igt@i915_gem_softpin@.*(hang|S4).*
> +igt@i915_gem_streaming_writes(@.*)?
> +igt@i915_gem_sync@(?!.*basic).*
> +igt@i915_gem_tiled_swapping@(?!non-threaded).*
> +igt@i915_gem_userptr_blits@(major|minor|forked|mlocked|swapping).*
> +igt@i915_gem_wait@hang.*
> +igt@i915_gem_watchdog@far-fence
> +igt@i915_sysfs_heartbeat_interval@(long|off)
> +igt@i915_sysfs_preempt_timeout@off
> +igt@i915_sysfs_timeslice_duration@off
>  ###############################################
>  # GEM: Not worth fixing
>  ###############################################
> -igt@gen7_exec_parse@.*lri.*
> -igt@gem_exec_alignment@pi-shared
> +igt@i915_gen7_exec_parse@.*lri.*
> +igt@i915_gem_exec_alignment@pi-shared
>  ###############################################
>  # There are no DRRS capable displays in CI lab
>  ###############################################
> @@ -108,10 +108,10 @@ igt@msm_.*
>  # Hibernate: not configured correctly on CI
>  ###############################################
>  igt@.*@.*-hibernate
> -igt@gem_softpin@noreloc-s4
> -igt@gem_workarounds@hibernate-.*
> -igt@gem_exec_suspend@basic-s4$
> -igt@gem_ctx_isolation@.*-s4
> +igt@i915_gem_softpin@noreloc-s4
> +igt@i915_gem_workarounds@hibernate-.*
> +igt@i915_gem_exec_suspend@basic-s4$
> +igt@i915_gem_ctx_isolation@.*-s4
>  ###############################################
>  # Out-of-memory: spammy and often broken
>  ###############################################
> diff --git a/tests/intel-ci/fast-feedback.testlist b/tests/intel-ci/fast-feedback.testlist
> index c09c6c417..83bb8dd64 100644
> --- a/tests/intel-ci/fast-feedback.testlist
> +++ b/tests/intel-ci/fast-feedback.testlist
> @@ -10,48 +10,48 @@ igt@fbdev@info
>  igt@fbdev@nullptr
>  igt@fbdev@read
>  igt@fbdev@write
> -igt@gem_basic@bad-close
> -igt@gem_basic@create-close
> -igt@gem_basic@create-fd-close
> -igt@gem_busy@busy@all-engines
> -igt@gem_close_race@basic-process
> -igt@gem_close_race@basic-threads
> -igt@gem_ctx_create@basic
> -igt@gem_ctx_create@basic-files
> -igt@gem_ctx_exec@basic
> -igt@gem_exec_basic@basic
> -igt@gem_exec_create@basic
> -igt@gem_exec_fence@basic-busy
> -igt@gem_exec_fence@basic-wait
> -igt@gem_exec_fence@basic-await
> -igt@gem_exec_fence@nb-await
> -igt@gem_exec_gttfill@basic
> -igt@gem_exec_parallel@engines
> -igt@gem_exec_store@basic
> -igt@gem_flink_basic@bad-flink
> -igt@gem_flink_basic@bad-open
> -igt@gem_flink_basic@basic
> -igt@gem_flink_basic@double-flink
> -igt@gem_flink_basic@flink-lifetime
> -igt@gem_huc_copy@huc-copy
> -igt@gem_linear_blits@basic
> -igt@gem_mmap@basic
> -igt@gem_mmap_gtt@basic
> -igt@gem_render_linear_blits@basic
> -igt@gem_render_tiled_blits@basic
> -igt@gem_ringfill@basic-all
> -igt@gem_softpin@allocator-basic
> -igt@gem_softpin@allocator-basic-reserve
> -igt@gem_softpin@safe-alignment
> -igt@gem_sync@basic-all
> -igt@gem_sync@basic-each
> -igt@gem_tiled_blits@basic
> -igt@gem_tiled_fence_blits@basic
> -igt@gem_tiled_pread_basic
> -igt@gem_wait@busy@all-engines
> -igt@gem_wait@wait@all-engines
> +igt@i915_gem_basic@bad-close
> +igt@i915_gem_basic@create-close
> +igt@i915_gem_basic@create-fd-close
> +igt@i915_gem_busy@busy@all-engines
> +igt@i915_gem_close_race@basic-process
> +igt@i915_gem_close_race@basic-threads
> +igt@i915_gem_ctx_create@basic
> +igt@i915_gem_ctx_create@basic-files
> +igt@i915_gem_ctx_exec@basic
> +igt@i915_gem_exec_basic@basic
> +igt@i915_gem_exec_create@basic
> +igt@i915_gem_exec_fence@basic-busy
> +igt@i915_gem_exec_fence@basic-wait
> +igt@i915_gem_exec_fence@basic-await
> +igt@i915_gem_exec_fence@nb-await
> +igt@i915_gem_exec_gttfill@basic
> +igt@i915_gem_exec_parallel@engines
> +igt@i915_gem_exec_store@basic
> +igt@i915_gem_flink_basic@bad-flink
> +igt@i915_gem_flink_basic@bad-open
> +igt@i915_gem_flink_basic@basic
> +igt@i915_gem_flink_basic@double-flink
> +igt@i915_gem_flink_basic@flink-lifetime
>  igt@i915_getparams_basic@basic-eu-total
>  igt@i915_getparams_basic@basic-subslice-total
> +igt@i915_gem_huc_copy@huc-copy
> +igt@i915_gem_linear_blits@basic
> +igt@i915_gem_mmap@basic
> +igt@i915_gem_mmap_gtt@basic
> +igt@i915_gem_render_linear_blits@basic
> +igt@i915_gem_render_tiled_blits@basic
> +igt@i915_gem_ringfill@basic-all
> +igt@i915_gem_softpin@allocator-basic
> +igt@i915_gem_softpin@allocator-basic-reserve
> +igt@i915_gem_softpin@safe-alignment
> +igt@i915_gem_sync@basic-all
> +igt@i915_gem_sync@basic-each
> +igt@i915_gem_tiled_blits@basic
> +igt@i915_gem_tiled_fence_blits@basic
> +igt@i915_gem_tiled_pread_basic
> +igt@i915_gem_wait@busy@all-engines
> +igt@i915_gem_wait@wait@all-engines
>  igt@i915_hangman@error-state-basic
>  igt@i915_pciid
>  igt@kms_addfb_basic@addfb25-bad-modifier
> @@ -126,12 +126,12 @@ igt@i915_pm_backlight@basic-brightness
>  igt@i915_pm_rpm@basic-pci-d3-state
>  igt@i915_pm_rpm@basic-rte
>  igt@i915_pm_rps@basic-api
> -igt@prime_self_import@basic-llseek-bad
> -igt@prime_self_import@basic-llseek-size
> -igt@prime_self_import@basic-with_fd_dup
> -igt@prime_self_import@basic-with_one_bo
> -igt@prime_self_import@basic-with_one_bo_two_files
> -igt@prime_self_import@basic-with_two_bos
> +igt@i915_prime_self_import@basic-llseek-bad
> +igt@i915_prime_self_import@basic-llseek-size
> +igt@i915_prime_self_import@basic-with_fd_dup
> +igt@i915_prime_self_import@basic-with_one_bo
> +igt@i915_prime_self_import@basic-with_one_bo_two_files
> +igt@i915_prime_self_import@basic-with_two_bos
>  igt@prime_vgem@basic-fence-flip
>  igt@prime_vgem@basic-fence-mmap
>  igt@prime_vgem@basic-fence-read
> @@ -156,10 +156,10 @@ igt@vgem_basic@sysfs
>  igt@core_hotunplug@unbind-rebind
>  igt@vgem_basic@unload
>  igt@i915_module_load@reload
> -igt@gem_lmem_swapping@basic
> -igt@gem_lmem_swapping@parallel-random-engines
> -igt@gem_lmem_swapping@random-engines
> -igt@gem_lmem_swapping@verify-random
> +igt@i915_gem_lmem_swapping@basic
> +igt@i915_gem_lmem_swapping@parallel-random-engines
> +igt@i915_gem_lmem_swapping@random-engines
> +igt@i915_gem_lmem_swapping@verify-random
>  igt@i915_pm_rpm@module-reload
>  
>  # Kernel selftests
> @@ -169,6 +169,6 @@ igt@dmabuf@all-tests
>  # System wide suspend tests
>  igt@i915_suspend@basic-s2idle-without-i915
>  igt@i915_suspend@basic-s3-without-i915
> -igt@gem_exec_suspend@basic-s0
> -igt@gem_exec_suspend@basic-s3
> +igt@i915_gem_exec_suspend@basic-s0
> +igt@i915_gem_exec_suspend@basic-s3
>  igt@kms_pipe_crc_basic@suspend-read-crc
> diff --git a/tests/intel/api_intel_bb.c b/tests/intel/i915_api_intel_bb.c
> similarity index 100%
> rename from tests/intel/api_intel_bb.c
> rename to tests/intel/i915_api_intel_bb.c
> diff --git a/tests/intel/debugfs_test.c b/tests/intel/i915_debugfs_test.c
> similarity index 100%
> rename from tests/intel/debugfs_test.c
> rename to tests/intel/i915_debugfs_test.c
> diff --git a/tests/intel/drm_fdinfo.c b/tests/intel/i915_drm_fdinfo.c
> similarity index 100%
> rename from tests/intel/drm_fdinfo.c
> rename to tests/intel/i915_drm_fdinfo.c
> diff --git a/tests/intel/gem_bad_reloc.c b/tests/intel/i915_gem_bad_reloc.c
> similarity index 100%
> rename from tests/intel/gem_bad_reloc.c
> rename to tests/intel/i915_gem_bad_reloc.c
> diff --git a/tests/intel/gem_barrier_race.c b/tests/intel/i915_gem_barrier_race.c
> similarity index 100%
> rename from tests/intel/gem_barrier_race.c
> rename to tests/intel/i915_gem_barrier_race.c
> diff --git a/tests/intel/gem_basic.c b/tests/intel/i915_gem_basic.c
> similarity index 100%
> rename from tests/intel/gem_basic.c
> rename to tests/intel/i915_gem_basic.c
> diff --git a/tests/intel/gem_blits.c b/tests/intel/i915_gem_blits.c
> similarity index 100%
> rename from tests/intel/gem_blits.c
> rename to tests/intel/i915_gem_blits.c
> diff --git a/tests/intel/gem_busy.c b/tests/intel/i915_gem_busy.c
> similarity index 100%
> rename from tests/intel/gem_busy.c
> rename to tests/intel/i915_gem_busy.c
> diff --git a/tests/intel/gem_caching.c b/tests/intel/i915_gem_caching.c
> similarity index 100%
> rename from tests/intel/gem_caching.c
> rename to tests/intel/i915_gem_caching.c
> diff --git a/tests/intel/gem_ccs.c b/tests/intel/i915_gem_ccs.c
> similarity index 100%
> rename from tests/intel/gem_ccs.c
> rename to tests/intel/i915_gem_ccs.c
> diff --git a/tests/intel/gem_close.c b/tests/intel/i915_gem_close.c
> similarity index 100%
> rename from tests/intel/gem_close.c
> rename to tests/intel/i915_gem_close.c
> diff --git a/tests/intel/gem_close_race.c b/tests/intel/i915_gem_close_race.c
> similarity index 100%
> rename from tests/intel/gem_close_race.c
> rename to tests/intel/i915_gem_close_race.c
> diff --git a/tests/intel/gem_concurrent_all.c b/tests/intel/i915_gem_concurrent_all.c
> similarity index 100%
> rename from tests/intel/gem_concurrent_all.c
> rename to tests/intel/i915_gem_concurrent_all.c
> diff --git a/tests/intel/gem_concurrent_blit.c b/tests/intel/i915_gem_concurrent_blit.c
> similarity index 91%
> rename from tests/intel/gem_concurrent_blit.c
> rename to tests/intel/i915_gem_concurrent_blit.c
> index 513de4a1b..03b1483cb 100644
> --- a/tests/intel/gem_concurrent_blit.c
> +++ b/tests/intel/i915_gem_concurrent_blit.c
> @@ -5,4 +5,4 @@
>  /* available subtests. This avoids the use of           */
>  /* non-standard command line parameters which can cause */
>  /* problems for automated testing */
> -#include "gem_concurrent_all.c"
> +#include "i915_gem_concurrent_all.c"
> diff --git a/tests/intel/gem_create.c b/tests/intel/i915_gem_create.c
> similarity index 100%
> rename from tests/intel/gem_create.c
> rename to tests/intel/i915_gem_create.c
> diff --git a/tests/intel/gem_cs_tlb.c b/tests/intel/i915_gem_cs_tlb.c
> similarity index 100%
> rename from tests/intel/gem_cs_tlb.c
> rename to tests/intel/i915_gem_cs_tlb.c
> diff --git a/tests/intel/gem_ctx_bad_destroy.c b/tests/intel/i915_gem_ctx_bad_destroy.c
> similarity index 100%
> rename from tests/intel/gem_ctx_bad_destroy.c
> rename to tests/intel/i915_gem_ctx_bad_destroy.c
> diff --git a/tests/intel/gem_ctx_create.c b/tests/intel/i915_gem_ctx_create.c
> similarity index 100%
> rename from tests/intel/gem_ctx_create.c
> rename to tests/intel/i915_gem_ctx_create.c
> diff --git a/tests/intel/gem_ctx_engines.c b/tests/intel/i915_gem_ctx_engines.c
> similarity index 100%
> rename from tests/intel/gem_ctx_engines.c
> rename to tests/intel/i915_gem_ctx_engines.c
> diff --git a/tests/intel/gem_ctx_exec.c b/tests/intel/i915_gem_ctx_exec.c
> similarity index 100%
> rename from tests/intel/gem_ctx_exec.c
> rename to tests/intel/i915_gem_ctx_exec.c
> diff --git a/tests/intel/gem_ctx_freq.c b/tests/intel/i915_gem_ctx_freq.c
> similarity index 100%
> rename from tests/intel/gem_ctx_freq.c
> rename to tests/intel/i915_gem_ctx_freq.c
> diff --git a/tests/intel/gem_ctx_isolation.c b/tests/intel/i915_gem_ctx_isolation.c
> similarity index 100%
> rename from tests/intel/gem_ctx_isolation.c
> rename to tests/intel/i915_gem_ctx_isolation.c
> diff --git a/tests/intel/gem_ctx_param.c b/tests/intel/i915_gem_ctx_param.c
> similarity index 100%
> rename from tests/intel/gem_ctx_param.c
> rename to tests/intel/i915_gem_ctx_param.c
> diff --git a/tests/intel/gem_ctx_persistence.c b/tests/intel/i915_gem_ctx_persistence.c
> similarity index 100%
> rename from tests/intel/gem_ctx_persistence.c
> rename to tests/intel/i915_gem_ctx_persistence.c
> diff --git a/tests/intel/gem_ctx_shared.c b/tests/intel/i915_gem_ctx_shared.c
> similarity index 100%
> rename from tests/intel/gem_ctx_shared.c
> rename to tests/intel/i915_gem_ctx_shared.c
> diff --git a/tests/intel/gem_ctx_sseu.c b/tests/intel/i915_gem_ctx_sseu.c
> similarity index 100%
> rename from tests/intel/gem_ctx_sseu.c
> rename to tests/intel/i915_gem_ctx_sseu.c
> diff --git a/tests/intel/gem_ctx_switch.c b/tests/intel/i915_gem_ctx_switch.c
> similarity index 100%
> rename from tests/intel/gem_ctx_switch.c
> rename to tests/intel/i915_gem_ctx_switch.c
> diff --git a/tests/intel/gem_eio.c b/tests/intel/i915_gem_eio.c
> similarity index 100%
> rename from tests/intel/gem_eio.c
> rename to tests/intel/i915_gem_eio.c
> diff --git a/tests/intel/gem_evict_alignment.c b/tests/intel/i915_gem_evict_alignment.c
> similarity index 100%
> rename from tests/intel/gem_evict_alignment.c
> rename to tests/intel/i915_gem_evict_alignment.c
> diff --git a/tests/intel/gem_evict_everything.c b/tests/intel/i915_gem_evict_everything.c
> similarity index 100%
> rename from tests/intel/gem_evict_everything.c
> rename to tests/intel/i915_gem_evict_everything.c
> diff --git a/tests/intel/gem_exec_alignment.c b/tests/intel/i915_gem_exec_alignment.c
> similarity index 100%
> rename from tests/intel/gem_exec_alignment.c
> rename to tests/intel/i915_gem_exec_alignment.c
> diff --git a/tests/intel/gem_exec_async.c b/tests/intel/i915_gem_exec_async.c
> similarity index 100%
> rename from tests/intel/gem_exec_async.c
> rename to tests/intel/i915_gem_exec_async.c
> diff --git a/tests/intel/gem_exec_await.c b/tests/intel/i915_gem_exec_await.c
> similarity index 100%
> rename from tests/intel/gem_exec_await.c
> rename to tests/intel/i915_gem_exec_await.c
> diff --git a/tests/intel/gem_exec_balancer.c b/tests/intel/i915_gem_exec_balancer.c
> similarity index 100%
> rename from tests/intel/gem_exec_balancer.c
> rename to tests/intel/i915_gem_exec_balancer.c
> diff --git a/tests/intel/gem_exec_basic.c b/tests/intel/i915_gem_exec_basic.c
> similarity index 100%
> rename from tests/intel/gem_exec_basic.c
> rename to tests/intel/i915_gem_exec_basic.c
> diff --git a/tests/intel/gem_exec_big.c b/tests/intel/i915_gem_exec_big.c
> similarity index 100%
> rename from tests/intel/gem_exec_big.c
> rename to tests/intel/i915_gem_exec_big.c
> diff --git a/tests/intel/gem_exec_capture.c b/tests/intel/i915_gem_exec_capture.c
> similarity index 100%
> rename from tests/intel/gem_exec_capture.c
> rename to tests/intel/i915_gem_exec_capture.c
> diff --git a/tests/intel/gem_exec_create.c b/tests/intel/i915_gem_exec_create.c
> similarity index 100%
> rename from tests/intel/gem_exec_create.c
> rename to tests/intel/i915_gem_exec_create.c
> diff --git a/tests/intel/gem_exec_endless.c b/tests/intel/i915_gem_exec_endless.c
> similarity index 100%
> rename from tests/intel/gem_exec_endless.c
> rename to tests/intel/i915_gem_exec_endless.c
> diff --git a/tests/intel/gem_exec_fair.c b/tests/intel/i915_gem_exec_fair.c
> similarity index 100%
> rename from tests/intel/gem_exec_fair.c
> rename to tests/intel/i915_gem_exec_fair.c
> diff --git a/tests/intel/gem_exec_fence.c b/tests/intel/i915_gem_exec_fence.c
> similarity index 100%
> rename from tests/intel/gem_exec_fence.c
> rename to tests/intel/i915_gem_exec_fence.c
> diff --git a/tests/intel/gem_exec_flush.c b/tests/intel/i915_gem_exec_flush.c
> similarity index 100%
> rename from tests/intel/gem_exec_flush.c
> rename to tests/intel/i915_gem_exec_flush.c
> diff --git a/tests/intel/gem_exec_gttfill.c b/tests/intel/i915_gem_exec_gttfill.c
> similarity index 100%
> rename from tests/intel/gem_exec_gttfill.c
> rename to tests/intel/i915_gem_exec_gttfill.c
> diff --git a/tests/intel/gem_exec_latency.c b/tests/intel/i915_gem_exec_latency.c
> similarity index 100%
> rename from tests/intel/gem_exec_latency.c
> rename to tests/intel/i915_gem_exec_latency.c
> diff --git a/tests/intel/gem_exec_lut_handle.c b/tests/intel/i915_gem_exec_lut_handle.c
> similarity index 100%
> rename from tests/intel/gem_exec_lut_handle.c
> rename to tests/intel/i915_gem_exec_lut_handle.c
> diff --git a/tests/intel/gem_exec_nop.c b/tests/intel/i915_gem_exec_nop.c
> similarity index 100%
> rename from tests/intel/gem_exec_nop.c
> rename to tests/intel/i915_gem_exec_nop.c
> diff --git a/tests/intel/gem_exec_parallel.c b/tests/intel/i915_gem_exec_parallel.c
> similarity index 100%
> rename from tests/intel/gem_exec_parallel.c
> rename to tests/intel/i915_gem_exec_parallel.c
> diff --git a/tests/intel/gem_exec_params.c b/tests/intel/i915_gem_exec_params.c
> similarity index 100%
> rename from tests/intel/gem_exec_params.c
> rename to tests/intel/i915_gem_exec_params.c
> diff --git a/tests/intel/gem_exec_reloc.c b/tests/intel/i915_gem_exec_reloc.c
> similarity index 100%
> rename from tests/intel/gem_exec_reloc.c
> rename to tests/intel/i915_gem_exec_reloc.c
> diff --git a/tests/intel/gem_exec_schedule.c b/tests/intel/i915_gem_exec_schedule.c
> similarity index 100%
> rename from tests/intel/gem_exec_schedule.c
> rename to tests/intel/i915_gem_exec_schedule.c
> diff --git a/tests/intel/gem_exec_store.c b/tests/intel/i915_gem_exec_store.c
> similarity index 100%
> rename from tests/intel/gem_exec_store.c
> rename to tests/intel/i915_gem_exec_store.c
> diff --git a/tests/intel/gem_exec_suspend.c b/tests/intel/i915_gem_exec_suspend.c
> similarity index 100%
> rename from tests/intel/gem_exec_suspend.c
> rename to tests/intel/i915_gem_exec_suspend.c
> diff --git a/tests/intel/gem_exec_whisper.c b/tests/intel/i915_gem_exec_whisper.c
> similarity index 100%
> rename from tests/intel/gem_exec_whisper.c
> rename to tests/intel/i915_gem_exec_whisper.c
> diff --git a/tests/intel/gem_exercise_blt.c b/tests/intel/i915_gem_exercise_blt.c
> similarity index 100%
> rename from tests/intel/gem_exercise_blt.c
> rename to tests/intel/i915_gem_exercise_blt.c
> diff --git a/tests/intel/gem_fd_exhaustion.c b/tests/intel/i915_gem_fd_exhaustion.c
> similarity index 100%
> rename from tests/intel/gem_fd_exhaustion.c
> rename to tests/intel/i915_gem_fd_exhaustion.c
> diff --git a/tests/intel/gem_fence_thrash.c b/tests/intel/i915_gem_fence_thrash.c
> similarity index 100%
> rename from tests/intel/gem_fence_thrash.c
> rename to tests/intel/i915_gem_fence_thrash.c
> diff --git a/tests/intel/gem_fence_upload.c b/tests/intel/i915_gem_fence_upload.c
> similarity index 100%
> rename from tests/intel/gem_fence_upload.c
> rename to tests/intel/i915_gem_fence_upload.c
> diff --git a/tests/intel/gem_fenced_exec_thrash.c b/tests/intel/i915_gem_fenced_exec_thrash.c
> similarity index 100%
> rename from tests/intel/gem_fenced_exec_thrash.c
> rename to tests/intel/i915_gem_fenced_exec_thrash.c
> diff --git a/tests/intel/gem_flink_basic.c b/tests/intel/i915_gem_flink_basic.c
> similarity index 100%
> rename from tests/intel/gem_flink_basic.c
> rename to tests/intel/i915_gem_flink_basic.c
> diff --git a/tests/intel/gem_flink_race.c b/tests/intel/i915_gem_flink_race.c
> similarity index 100%
> rename from tests/intel/gem_flink_race.c
> rename to tests/intel/i915_gem_flink_race.c
> diff --git a/tests/intel/gem_gpgpu_fill.c b/tests/intel/i915_gem_gpgpu_fill.c
> similarity index 100%
> rename from tests/intel/gem_gpgpu_fill.c
> rename to tests/intel/i915_gem_gpgpu_fill.c
> diff --git a/tests/intel/gem_gtt_cpu_tlb.c b/tests/intel/i915_gem_gtt_cpu_tlb.c
> similarity index 100%
> rename from tests/intel/gem_gtt_cpu_tlb.c
> rename to tests/intel/i915_gem_gtt_cpu_tlb.c
> diff --git a/tests/intel/gem_gtt_hog.c b/tests/intel/i915_gem_gtt_hog.c
> similarity index 100%
> rename from tests/intel/gem_gtt_hog.c
> rename to tests/intel/i915_gem_gtt_hog.c
> diff --git a/tests/intel/gem_gtt_speed.c b/tests/intel/i915_gem_gtt_speed.c
> similarity index 100%
> rename from tests/intel/gem_gtt_speed.c
> rename to tests/intel/i915_gem_gtt_speed.c
> diff --git a/tests/intel/gem_huc_copy.c b/tests/intel/i915_gem_huc_copy.c
> similarity index 100%
> rename from tests/intel/gem_huc_copy.c
> rename to tests/intel/i915_gem_huc_copy.c
> diff --git a/tests/intel/gem_linear_blits.c b/tests/intel/i915_gem_linear_blits.c
> similarity index 100%
> rename from tests/intel/gem_linear_blits.c
> rename to tests/intel/i915_gem_linear_blits.c
> diff --git a/tests/intel/gem_lmem_evict.c b/tests/intel/i915_gem_lmem_evict.c
> similarity index 100%
> rename from tests/intel/gem_lmem_evict.c
> rename to tests/intel/i915_gem_lmem_evict.c
> diff --git a/tests/intel/gem_lmem_swapping.c b/tests/intel/i915_gem_lmem_swapping.c
> similarity index 100%
> rename from tests/intel/gem_lmem_swapping.c
> rename to tests/intel/i915_gem_lmem_swapping.c
> diff --git a/tests/intel/gem_lut_handle.c b/tests/intel/i915_gem_lut_handle.c
> similarity index 100%
> rename from tests/intel/gem_lut_handle.c
> rename to tests/intel/i915_gem_lut_handle.c
> diff --git a/tests/intel/gem_madvise.c b/tests/intel/i915_gem_madvise.c
> similarity index 100%
> rename from tests/intel/gem_madvise.c
> rename to tests/intel/i915_gem_madvise.c
> diff --git a/tests/intel/gem_media_fill.c b/tests/intel/i915_gem_media_fill.c
> similarity index 100%
> rename from tests/intel/gem_media_fill.c
> rename to tests/intel/i915_gem_media_fill.c
> diff --git a/tests/intel/gem_media_vme.c b/tests/intel/i915_gem_media_vme.c
> similarity index 100%
> rename from tests/intel/gem_media_vme.c
> rename to tests/intel/i915_gem_media_vme.c
> diff --git a/tests/intel/gem_mmap.c b/tests/intel/i915_gem_mmap.c
> similarity index 100%
> rename from tests/intel/gem_mmap.c
> rename to tests/intel/i915_gem_mmap.c
> diff --git a/tests/intel/gem_mmap_gtt.c b/tests/intel/i915_gem_mmap_gtt.c
> similarity index 100%
> rename from tests/intel/gem_mmap_gtt.c
> rename to tests/intel/i915_gem_mmap_gtt.c
> diff --git a/tests/intel/gem_mmap_offset.c b/tests/intel/i915_gem_mmap_offset.c
> similarity index 100%
> rename from tests/intel/gem_mmap_offset.c
> rename to tests/intel/i915_gem_mmap_offset.c
> diff --git a/tests/intel/gem_mmap_wc.c b/tests/intel/i915_gem_mmap_wc.c
> similarity index 100%
> rename from tests/intel/gem_mmap_wc.c
> rename to tests/intel/i915_gem_mmap_wc.c
> diff --git a/tests/intel/gem_partial_pwrite_pread.c b/tests/intel/i915_gem_partial_pwrite_pread.c
> similarity index 100%
> rename from tests/intel/gem_partial_pwrite_pread.c
> rename to tests/intel/i915_gem_partial_pwrite_pread.c
> diff --git a/tests/intel/gem_pipe_control_store_loop.c b/tests/intel/i915_gem_pipe_control_store_loop.c
> similarity index 100%
> rename from tests/intel/gem_pipe_control_store_loop.c
> rename to tests/intel/i915_gem_pipe_control_store_loop.c
> diff --git a/tests/intel/gem_ppgtt.c b/tests/intel/i915_gem_ppgtt.c
> similarity index 100%
> rename from tests/intel/gem_ppgtt.c
> rename to tests/intel/i915_gem_ppgtt.c
> diff --git a/tests/intel/gem_pread.c b/tests/intel/i915_gem_pread.c
> similarity index 100%
> rename from tests/intel/gem_pread.c
> rename to tests/intel/i915_gem_pread.c
> diff --git a/tests/intel/gem_pread_after_blit.c b/tests/intel/i915_gem_pread_after_blit.c
> similarity index 100%
> rename from tests/intel/gem_pread_after_blit.c
> rename to tests/intel/i915_gem_pread_after_blit.c
> diff --git a/tests/intel/gem_pwrite.c b/tests/intel/i915_gem_pwrite.c
> similarity index 100%
> rename from tests/intel/gem_pwrite.c
> rename to tests/intel/i915_gem_pwrite.c
> diff --git a/tests/intel/gem_pwrite_snooped.c b/tests/intel/i915_gem_pwrite_snooped.c
> similarity index 100%
> rename from tests/intel/gem_pwrite_snooped.c
> rename to tests/intel/i915_gem_pwrite_snooped.c
> diff --git a/tests/intel/gem_pxp.c b/tests/intel/i915_gem_pxp.c
> similarity index 100%
> rename from tests/intel/gem_pxp.c
> rename to tests/intel/i915_gem_pxp.c
> diff --git a/tests/intel/gem_read_read_speed.c b/tests/intel/i915_gem_read_read_speed.c
> similarity index 100%
> rename from tests/intel/gem_read_read_speed.c
> rename to tests/intel/i915_gem_read_read_speed.c
> diff --git a/tests/intel/gem_readwrite.c b/tests/intel/i915_gem_readwrite.c
> similarity index 100%
> rename from tests/intel/gem_readwrite.c
> rename to tests/intel/i915_gem_readwrite.c
> diff --git a/tests/intel/gem_reg_read.c b/tests/intel/i915_gem_reg_read.c
> similarity index 100%
> rename from tests/intel/gem_reg_read.c
> rename to tests/intel/i915_gem_reg_read.c
> diff --git a/tests/intel/gem_render_copy.c b/tests/intel/i915_gem_render_copy.c
> similarity index 100%
> rename from tests/intel/gem_render_copy.c
> rename to tests/intel/i915_gem_render_copy.c
> diff --git a/tests/intel/gem_render_copy_redux.c b/tests/intel/i915_gem_render_copy_redux.c
> similarity index 100%
> rename from tests/intel/gem_render_copy_redux.c
> rename to tests/intel/i915_gem_render_copy_redux.c
> diff --git a/tests/intel/gem_render_linear_blits.c b/tests/intel/i915_gem_render_linear_blits.c
> similarity index 100%
> rename from tests/intel/gem_render_linear_blits.c
> rename to tests/intel/i915_gem_render_linear_blits.c
> diff --git a/tests/intel/gem_render_tiled_blits.c b/tests/intel/i915_gem_render_tiled_blits.c
> similarity index 100%
> rename from tests/intel/gem_render_tiled_blits.c
> rename to tests/intel/i915_gem_render_tiled_blits.c
> diff --git a/tests/intel/gem_request_retire.c b/tests/intel/i915_gem_request_retire.c
> similarity index 100%
> rename from tests/intel/gem_request_retire.c
> rename to tests/intel/i915_gem_request_retire.c
> diff --git a/tests/intel/gem_reset_stats.c b/tests/intel/i915_gem_reset_stats.c
> similarity index 100%
> rename from tests/intel/gem_reset_stats.c
> rename to tests/intel/i915_gem_reset_stats.c
> diff --git a/tests/intel/gem_ringfill.c b/tests/intel/i915_gem_ringfill.c
> similarity index 100%
> rename from tests/intel/gem_ringfill.c
> rename to tests/intel/i915_gem_ringfill.c
> diff --git a/tests/intel/gem_set_tiling_vs_blt.c b/tests/intel/i915_gem_set_tiling_vs_blt.c
> similarity index 100%
> rename from tests/intel/gem_set_tiling_vs_blt.c
> rename to tests/intel/i915_gem_set_tiling_vs_blt.c
> diff --git a/tests/intel/gem_set_tiling_vs_gtt.c b/tests/intel/i915_gem_set_tiling_vs_gtt.c
> similarity index 100%
> rename from tests/intel/gem_set_tiling_vs_gtt.c
> rename to tests/intel/i915_gem_set_tiling_vs_gtt.c
> diff --git a/tests/intel/gem_set_tiling_vs_pwrite.c b/tests/intel/i915_gem_set_tiling_vs_pwrite.c
> similarity index 100%
> rename from tests/intel/gem_set_tiling_vs_pwrite.c
> rename to tests/intel/i915_gem_set_tiling_vs_pwrite.c
> diff --git a/tests/intel/gem_shrink.c b/tests/intel/i915_gem_shrink.c
> similarity index 100%
> rename from tests/intel/gem_shrink.c
> rename to tests/intel/i915_gem_shrink.c
> diff --git a/tests/intel/gem_softpin.c b/tests/intel/i915_gem_softpin.c
> similarity index 100%
> rename from tests/intel/gem_softpin.c
> rename to tests/intel/i915_gem_softpin.c
> diff --git a/tests/intel/gem_spin_batch.c b/tests/intel/i915_gem_spin_batch.c
> similarity index 100%
> rename from tests/intel/gem_spin_batch.c
> rename to tests/intel/i915_gem_spin_batch.c
> diff --git a/tests/intel/gem_streaming_writes.c b/tests/intel/i915_gem_streaming_writes.c
> similarity index 100%
> rename from tests/intel/gem_streaming_writes.c
> rename to tests/intel/i915_gem_streaming_writes.c
> diff --git a/tests/intel/gem_stress.c b/tests/intel/i915_gem_stress.c
> similarity index 100%
> rename from tests/intel/gem_stress.c
> rename to tests/intel/i915_gem_stress.c
> diff --git a/tests/intel/gem_sync.c b/tests/intel/i915_gem_sync.c
> similarity index 100%
> rename from tests/intel/gem_sync.c
> rename to tests/intel/i915_gem_sync.c
> diff --git a/tests/intel/gem_tiled_blits.c b/tests/intel/i915_gem_tiled_blits.c
> similarity index 100%
> rename from tests/intel/gem_tiled_blits.c
> rename to tests/intel/i915_gem_tiled_blits.c
> diff --git a/tests/intel/gem_tiled_fence_blits.c b/tests/intel/i915_gem_tiled_fence_blits.c
> similarity index 100%
> rename from tests/intel/gem_tiled_fence_blits.c
> rename to tests/intel/i915_gem_tiled_fence_blits.c
> diff --git a/tests/intel/gem_tiled_partial_pwrite_pread.c b/tests/intel/i915_gem_tiled_partial_pwrite_pread.c
> similarity index 100%
> rename from tests/intel/gem_tiled_partial_pwrite_pread.c
> rename to tests/intel/i915_gem_tiled_partial_pwrite_pread.c
> diff --git a/tests/intel/gem_tiled_pread_basic.c b/tests/intel/i915_gem_tiled_pread_basic.c
> similarity index 100%
> rename from tests/intel/gem_tiled_pread_basic.c
> rename to tests/intel/i915_gem_tiled_pread_basic.c
> diff --git a/tests/intel/gem_tiled_pread_pwrite.c b/tests/intel/i915_gem_tiled_pread_pwrite.c
> similarity index 100%
> rename from tests/intel/gem_tiled_pread_pwrite.c
> rename to tests/intel/i915_gem_tiled_pread_pwrite.c
> diff --git a/tests/intel/gem_tiled_swapping.c b/tests/intel/i915_gem_tiled_swapping.c
> similarity index 100%
> rename from tests/intel/gem_tiled_swapping.c
> rename to tests/intel/i915_gem_tiled_swapping.c
> diff --git a/tests/intel/gem_tiled_wb.c b/tests/intel/i915_gem_tiled_wb.c
> similarity index 100%
> rename from tests/intel/gem_tiled_wb.c
> rename to tests/intel/i915_gem_tiled_wb.c
> diff --git a/tests/intel/gem_tiled_wc.c b/tests/intel/i915_gem_tiled_wc.c
> similarity index 100%
> rename from tests/intel/gem_tiled_wc.c
> rename to tests/intel/i915_gem_tiled_wc.c
> diff --git a/tests/intel/gem_tiling_max_stride.c b/tests/intel/i915_gem_tiling_max_stride.c
> similarity index 100%
> rename from tests/intel/gem_tiling_max_stride.c
> rename to tests/intel/i915_gem_tiling_max_stride.c
> diff --git a/tests/intel/gem_unfence_active_buffers.c b/tests/intel/i915_gem_unfence_active_buffers.c
> similarity index 100%
> rename from tests/intel/gem_unfence_active_buffers.c
> rename to tests/intel/i915_gem_unfence_active_buffers.c
> diff --git a/tests/intel/gem_unref_active_buffers.c b/tests/intel/i915_gem_unref_active_buffers.c
> similarity index 100%
> rename from tests/intel/gem_unref_active_buffers.c
> rename to tests/intel/i915_gem_unref_active_buffers.c
> diff --git a/tests/intel/gem_userptr_blits.c b/tests/intel/i915_gem_userptr_blits.c
> similarity index 100%
> rename from tests/intel/gem_userptr_blits.c
> rename to tests/intel/i915_gem_userptr_blits.c
> diff --git a/tests/intel/gem_vm_create.c b/tests/intel/i915_gem_vm_create.c
> similarity index 100%
> rename from tests/intel/gem_vm_create.c
> rename to tests/intel/i915_gem_vm_create.c
> diff --git a/tests/intel/gem_wait.c b/tests/intel/i915_gem_wait.c
> similarity index 100%
> rename from tests/intel/gem_wait.c
> rename to tests/intel/i915_gem_wait.c
> diff --git a/tests/intel/gem_watchdog.c b/tests/intel/i915_gem_watchdog.c
> similarity index 100%
> rename from tests/intel/gem_watchdog.c
> rename to tests/intel/i915_gem_watchdog.c
> diff --git a/tests/intel/gem_workarounds.c b/tests/intel/i915_gem_workarounds.c
> similarity index 100%
> rename from tests/intel/gem_workarounds.c
> rename to tests/intel/i915_gem_workarounds.c
> diff --git a/tests/intel/gen3_mixed_blits.c b/tests/intel/i915_gen3_mixed_blits.c
> similarity index 100%
> rename from tests/intel/gen3_mixed_blits.c
> rename to tests/intel/i915_gen3_mixed_blits.c
> diff --git a/tests/intel/gen3_render_linear_blits.c b/tests/intel/i915_gen3_render_linear_blits.c
> similarity index 100%
> rename from tests/intel/gen3_render_linear_blits.c
> rename to tests/intel/i915_gen3_render_linear_blits.c
> diff --git a/tests/intel/gen3_render_mixed_blits.c b/tests/intel/i915_gen3_render_mixed_blits.c
> similarity index 100%
> rename from tests/intel/gen3_render_mixed_blits.c
> rename to tests/intel/i915_gen3_render_mixed_blits.c
> diff --git a/tests/intel/gen3_render_tiledx_blits.c b/tests/intel/i915_gen3_render_tiledx_blits.c
> similarity index 100%
> rename from tests/intel/gen3_render_tiledx_blits.c
> rename to tests/intel/i915_gen3_render_tiledx_blits.c
> diff --git a/tests/intel/gen3_render_tiledy_blits.c b/tests/intel/i915_gen3_render_tiledy_blits.c
> similarity index 100%
> rename from tests/intel/gen3_render_tiledy_blits.c
> rename to tests/intel/i915_gen3_render_tiledy_blits.c
> diff --git a/tests/intel/gen7_exec_parse.c b/tests/intel/i915_gen7_exec_parse.c
> similarity index 100%
> rename from tests/intel/gen7_exec_parse.c
> rename to tests/intel/i915_gen7_exec_parse.c
> diff --git a/tests/intel/gen9_exec_parse.c b/tests/intel/i915_gen9_exec_parse.c
> similarity index 100%
> rename from tests/intel/gen9_exec_parse.c
> rename to tests/intel/i915_gen9_exec_parse.c
> diff --git a/tests/intel/perf.c b/tests/intel/i915_perf.c
> similarity index 100%
> rename from tests/intel/perf.c
> rename to tests/intel/i915_perf.c
> diff --git a/tests/intel/perf_pmu.c b/tests/intel/i915_perf_pmu.c
> similarity index 100%
> rename from tests/intel/perf_pmu.c
> rename to tests/intel/i915_perf_pmu.c
> diff --git a/tests/intel/prime_busy.c b/tests/intel/i915_prime_busy.c
> similarity index 100%
> rename from tests/intel/prime_busy.c
> rename to tests/intel/i915_prime_busy.c
> diff --git a/tests/intel/prime_mmap.c b/tests/intel/i915_prime_mmap.c
> similarity index 100%
> rename from tests/intel/prime_mmap.c
> rename to tests/intel/i915_prime_mmap.c
> diff --git a/tests/intel/prime_mmap_coherency.c b/tests/intel/i915_prime_mmap_coherency.c
> similarity index 100%
> rename from tests/intel/prime_mmap_coherency.c
> rename to tests/intel/i915_prime_mmap_coherency.c
> diff --git a/tests/intel/prime_mmap_kms.c b/tests/intel/i915_prime_mmap_kms.c
> similarity index 100%
> rename from tests/intel/prime_mmap_kms.c
> rename to tests/intel/i915_prime_mmap_kms.c
> diff --git a/tests/intel/prime_self_import.c b/tests/intel/i915_prime_self_import.c
> similarity index 100%
> rename from tests/intel/prime_self_import.c
> rename to tests/intel/i915_prime_self_import.c
> diff --git a/tests/intel/sysfs_defaults.c b/tests/intel/i915_sysfs_defaults.c
> similarity index 100%
> rename from tests/intel/sysfs_defaults.c
> rename to tests/intel/i915_sysfs_defaults.c
> diff --git a/tests/intel/sysfs_heartbeat_interval.c b/tests/intel/i915_sysfs_heartbeat_interval.c
> similarity index 100%
> rename from tests/intel/sysfs_heartbeat_interval.c
> rename to tests/intel/i915_sysfs_heartbeat_interval.c
> diff --git a/tests/intel/sysfs_preempt_timeout.c b/tests/intel/i915_sysfs_preempt_timeout.c
> similarity index 100%
> rename from tests/intel/sysfs_preempt_timeout.c
> rename to tests/intel/i915_sysfs_preempt_timeout.c
> diff --git a/tests/intel/sysfs_timeslice_duration.c b/tests/intel/i915_sysfs_timeslice_duration.c
> similarity index 100%
> rename from tests/intel/sysfs_timeslice_duration.c
> rename to tests/intel/i915_sysfs_timeslice_duration.c
> diff --git a/tests/intel/i915_test_config.json b/tests/intel/i915_test_config.json
> index c15ef2580..43b831262 100644
> --- a/tests/intel/i915_test_config.json
> +++ b/tests/intel/i915_test_config.json
> @@ -7,12 +7,10 @@
>                 "../core_setmaster_vs_auth.c", "../debugfs_test.c",
>                 "../device_reset.c", "../dmabuf.c",
>                 "../drm_import_export.c", "../drm_mm.c",
> -               "../dumb_buffer.c", "../prime_busy.c", "../prime_mmap.c",
> -               "../prime_mmap_coherency.c", "../prime_self_import.c",
> -               "../prime_vgem.c", "../sw_sync.c", "../syncobj_basic.c",
> -               "../syncobj_timeline.c", "../syncobj_wait.c",
> +               "../dumb_buffer.c", "../prime_vgem.c", "../sw_sync.c",
> +               "../syncobj_basic.c", "../syncobj_timeline.c", "../syncobj_wait.c",
>                 "../vgem_basic.c", "../vgem_slow.c" ],
> -    "exclude_files": [ "kms_*", "gem_concurrent_all.c", "gem_concurrent_blit.c",
> +    "exclude_files": [ "kms_*", "i915_gem_concurrent_all.c", "i915_gem_concurrent_blit.c",
>                         "xe_*" ],
>      "fields": {
>  	"Mega feature": {
> diff --git a/tests/intel/api_intel_allocator.c b/tests/intel/intel_api_intel_allocator.c
> similarity index 100%
> rename from tests/intel/api_intel_allocator.c
> rename to tests/intel/intel_api_intel_allocator.c
> diff --git a/tests/meson.build b/tests/meson.build
> index aa27fd9af..3613eb627 100644
> --- a/tests/meson.build
> +++ b/tests/meson.build
> @@ -83,165 +83,165 @@ test_progs = [
>  ]
>  
>  intel_i915_xe_progs = [
> -	'api_intel_allocator',
> +	'intel_api_intel_allocator',
>  ]
>  
>  intel_i915_progs = [
> -	'api_intel_bb',
> -	'debugfs_test',
> -	'drm_fdinfo',
> -	'gen3_mixed_blits',
> -	'gen3_render_linear_blits',
> -	'gen3_render_mixed_blits',
> -	'gen3_render_tiledx_blits',
> -	'gen3_render_tiledy_blits',
> -	'gem_bad_reloc',
> -	'gem_barrier_race',
> -	'gem_basic',
> -	'gem_blits',
> -	'gem_busy',
> -	'gem_caching',
> -	'gem_create',
> -	'gem_ccs',
> -	'gem_close',
> -	'gem_close_race',
> -	'gem_concurrent_blit',
> -	'gem_cs_tlb',
> -	'gem_ctx_bad_destroy',
> -	'gem_ctx_create',
> -	'gem_ctx_engines',
> -	'gem_ctx_exec',
> -	'gem_ctx_freq',
> -	'gem_ctx_isolation',
> -	'gem_ctx_param',
> -	'gem_ctx_persistence',
> -	'gem_ctx_shared',
> -	'gem_ctx_sseu',
> -	'gem_ctx_switch',
> -	'gem_eio',
> -	'gem_evict_alignment',
> -	'gem_evict_everything',
> -	'gem_exec_alignment',
> -	'gem_exec_async',
> -	'gem_exec_await',
> -	'gem_exec_balancer',
> -	'gem_exec_basic',
> -	'gem_exec_big',
> -	'gem_exec_capture',
> -	'gem_exec_create',
> -	'gem_exec_endless',
> -	'gem_exec_fair',
> -	'gem_exec_fence',
> -	'gem_exec_flush',
> -	'gem_exec_gttfill',
> -	'gem_exec_latency',
> -	'gem_exec_lut_handle',
> -	'gem_exec_nop',
> -	'gem_exec_parallel',
> -	'gem_exec_params',
> -	'gem_exercise_blt',
> -	'gen7_exec_parse',
> -	'gen9_exec_parse',
> -	'gem_exec_reloc',
> -	'gem_exec_schedule',
> -	'gem_exec_store',
> -	'gem_exec_suspend',
> -	'gem_exec_whisper',
> -	'gem_fd_exhaustion',
> -	'gem_fence_thrash',
> -	'gem_fence_upload',
> -	'gem_fenced_exec_thrash',
> -	'gem_flink_basic',
> -	'gem_flink_race',
> -	'gem_gpgpu_fill',
> -	'gem_gtt_cpu_tlb',
> -	'gem_gtt_hog',
> -	'gem_gtt_speed',
> -	'gem_huc_copy',
> -	'gem_linear_blits',
> -	'gem_lmem_evict',
> -	'gem_lmem_swapping',
> -	'gem_lut_handle',
> -	'gem_madvise',
> -	'gem_media_fill',
> -	'gem_media_vme',
> -	'gem_mmap',
> -	'gem_mmap_gtt',
> -	'gem_mmap_offset',
> -	'gem_mmap_wc',
> -	'gem_partial_pwrite_pread',
> -	'gem_pipe_control_store_loop',
> -	'gem_ppgtt',
> -	'gem_pread',
> -	'gem_pread_after_blit',
> -	'gem_pwrite',
> -	'gem_pwrite_snooped',
> -	'gem_pxp',
> -	'gem_read_read_speed',
> -	'gem_readwrite',
> -	'gem_reg_read',
> -	'gem_render_copy',
> -	'gem_render_copy_redux',
> -	'gem_render_linear_blits',
> -	'gem_render_tiled_blits',
> -	'gem_request_retire',
> -	'gem_reset_stats',
> -	'gem_ringfill',
> -	'gem_set_tiling_vs_blt',
> -	'gem_set_tiling_vs_gtt',
> -	'gem_set_tiling_vs_pwrite',
> -	'gem_shrink',
> -	'gem_softpin',
> -	'gem_spin_batch',
> -	'gem_streaming_writes',
> -	'gem_sync',
> -	'gem_tiled_blits',
> -	'gem_tiled_fence_blits',
> -	'gem_tiled_partial_pwrite_pread',
> -	'gem_tiled_pread_basic',
> -	'gem_tiled_pread_pwrite',
> -	'gem_tiled_swapping',
> -	'gem_tiled_wb',
> -	'gem_tiled_wc',
> -	'gem_tiling_max_stride',
> -	'gem_unfence_active_buffers',
> -	'gem_unref_active_buffers',
> -	'gem_userptr_blits',
> -	'gem_vm_create',
> -	'gem_wait',
> -	'gem_watchdog',
> -	'gem_workarounds',
> -	'perf',
> -	'perf_pmu',
> +	'i915_api_intel_bb',
> +	'i915_debugfs_test',
> +	'i915_drm_fdinfo',
>  	'i915_fb_tiling',
> +	'i915_gem_bad_reloc',
> +	'i915_gem_barrier_race',
> +	'i915_gem_basic',
> +	'i915_gem_blits',
> +	'i915_gem_busy',
> +	'i915_gem_caching',
> +	'i915_gem_ccs',
> +	'i915_gem_close',
> +	'i915_gem_close_race',
> +	'i915_gem_concurrent_blit',
> +	'i915_gem_create',
> +	'i915_gem_cs_tlb',
> +	'i915_gem_ctx_bad_destroy',
> +	'i915_gem_ctx_create',
> +	'i915_gem_ctx_engines',
> +	'i915_gem_ctx_exec',
> +	'i915_gem_ctx_freq',
> +	'i915_gem_ctx_isolation',
> +	'i915_gem_ctx_param',
> +	'i915_gem_ctx_persistence',
> +	'i915_gem_ctx_shared',
> +	'i915_gem_ctx_sseu',
> +	'i915_gem_ctx_switch',
> +	'i915_gem_eio',
> +	'i915_gem_evict_alignment',
> +	'i915_gem_evict_everything',
> +	'i915_gem_exec_alignment',
> +	'i915_gem_exec_async',
> +	'i915_gem_exec_await',
> +	'i915_gem_exec_balancer',
> +	'i915_gem_exec_basic',
> +	'i915_gem_exec_big',
> +	'i915_gem_exec_capture',
> +	'i915_gem_exec_create',
> +	'i915_gem_exec_endless',
> +	'i915_gem_exec_fair',
> +	'i915_gem_exec_fence',
> +	'i915_gem_exec_flush',
> +	'i915_gem_exec_gttfill',
> +	'i915_gem_exec_latency',
> +	'i915_gem_exec_lut_handle',
> +	'i915_gem_exec_nop',
> +	'i915_gem_exec_parallel',
> +	'i915_gem_exec_params',
> +	'i915_gem_exec_reloc',
> +	'i915_gem_exec_schedule',
> +	'i915_gem_exec_store',
> +	'i915_gem_exec_suspend',
> +	'i915_gem_exec_whisper',
> +	'i915_gem_exercise_blt',
> +	'i915_gem_fd_exhaustion',
> +	'i915_gem_fence_thrash',
> +	'i915_gem_fence_upload',
> +	'i915_gem_fenced_exec_thrash',
> +	'i915_gem_flink_basic',
> +	'i915_gem_flink_race',
> +	'i915_gem_gpgpu_fill',
> +	'i915_gem_gtt_cpu_tlb',
> +	'i915_gem_gtt_hog',
> +	'i915_gem_gtt_speed',
> +	'i915_gem_huc_copy',
> +	'i915_gem_linear_blits',
> +	'i915_gem_lmem_evict',
> +	'i915_gem_lmem_swapping',
> +	'i915_gem_lut_handle',
> +	'i915_gem_madvise',
> +	'i915_gem_media_fill',
> +	'i915_gem_media_vme',
> +	'i915_gem_mmap',
> +	'i915_gem_mmap_gtt',
> +	'i915_gem_mmap_offset',
> +	'i915_gem_mmap_wc',
> +	'i915_gem_partial_pwrite_pread',
> +	'i915_gem_pipe_control_store_loop',
> +	'i915_gem_ppgtt',
> +	'i915_gem_pread',
> +	'i915_gem_pread_after_blit',
> +	'i915_gem_pwrite',
> +	'i915_gem_pwrite_snooped',
> +	'i915_gem_pxp',
> +	'i915_gem_read_read_speed',
> +	'i915_gem_readwrite',
> +	'i915_gem_reg_read',
> +	'i915_gem_render_copy',
> +	'i915_gem_render_copy_redux',
> +	'i915_gem_render_linear_blits',
> +	'i915_gem_render_tiled_blits',
> +	'i915_gem_request_retire',
> +	'i915_gem_reset_stats',
> +	'i915_gem_ringfill',
> +	'i915_gem_set_tiling_vs_blt',
> +	'i915_gem_set_tiling_vs_gtt',
> +	'i915_gem_set_tiling_vs_pwrite',
> +	'i915_gem_shrink',
> +	'i915_gem_softpin',
> +	'i915_gem_spin_batch',
> +	'i915_gem_streaming_writes',
> +	'i915_gem_sync',
> +	'i915_gem_tiled_blits',
> +	'i915_gem_tiled_fence_blits',
> +	'i915_gem_tiled_partial_pwrite_pread',
> +	'i915_gem_tiled_pread_basic',
> +	'i915_gem_tiled_pread_pwrite',
> +	'i915_gem_tiled_swapping',
> +	'i915_gem_tiled_wb',
> +	'i915_gem_tiled_wc',
> +	'i915_gem_tiling_max_stride',
> +	'i915_gem_unfence_active_buffers',
> +	'i915_gem_unref_active_buffers',
> +	'i915_gem_userptr_blits',
> +	'i915_gem_vm_create',
> +	'i915_gem_wait',
> +	'i915_gem_watchdog',
> +	'i915_gem_workarounds',
> +	'i915_gen3_mixed_blits',
> +	'i915_gen3_render_linear_blits',
> +	'i915_gen3_render_mixed_blits',
> +	'i915_gen3_render_tiledx_blits',
> +	'i915_gen3_render_tiledy_blits',
> +	'i915_gen7_exec_parse',
> +	'i915_gen9_exec_parse',
>  	'i915_getparams_basic',
> -	'i915_pm_freq_api',
>  	'i915_hangman',
>  	'i915_hwmon',
>  	'i915_module_load',
>  	'i915_pciid',
> +	'i915_perf',
> +	'i915_perf_pmu',
>  	'i915_pipe_stress',
>  	'i915_pm_backlight',
> +	'i915_pm_dc',
> +	'i915_pm_freq_api',
>  	'i915_pm_freq_mult',
>  	'i915_pm_lpsp',
> -	'i915_pm_rpm',
> -	'i915_pm_dc',
>  	'i915_pm_rc6_residency',
> +	'i915_pm_rpm',
>  	'i915_pm_rps',
>  	'i915_pm_sseu',
>  	'i915_power',
> +	'i915_prime_busy',
> +	'i915_prime_mmap',
> +	'i915_prime_mmap_coherency',
> +	'i915_prime_mmap_kms',
> +	'i915_prime_self_import',
>  	'i915_query',
>  	'i915_selftest',
>  	'i915_suspend',
> -	'prime_busy',
> -	'prime_mmap',
> -	'prime_mmap_coherency',
> -	'prime_mmap_kms',
> -	'prime_self_import',
> -	'sysfs_defaults',
> -	'sysfs_heartbeat_interval',
> -	'sysfs_preempt_timeout',
> -	'sysfs_timeslice_duration',
> +	'i915_sysfs_defaults',
> +	'i915_sysfs_heartbeat_interval',
> +	'i915_sysfs_preempt_timeout',
> +	'i915_sysfs_timeslice_duration',
>  ]
>  
>  intel_kms_progs = [
> @@ -353,19 +353,19 @@ extra_sources = {
>  # Extra dependencies used on core and Intel drivers
>  extra_dependencies = {
>  	'core_hotunplug': [ lib_igt_i915_perf ],
> -	'drm_fdinfo': [ lib_igt_drm_fdinfo ],
> +	'i915_drm_fdinfo': [ lib_igt_drm_fdinfo ],
>  	'dumb_buffer':  [ libatomic ],
> -	'gem_barrier_race': [ lib_igt_i915_perf ],
> -	'gem_create': [ libatomic ],
> -	'gem_ctx_freq': [ lib_igt_perf ],
> -	'gem_ctx_sseu': [ lib_igt_perf ],
> -	'gem_eio': [ realtime ],
> -	'gem_exec_balancer': [ lib_igt_perf ],
> -	'gem_mmap_offset': [ libatomic ],
> +	'i915_gem_barrier_race': [ lib_igt_i915_perf ],
> +	'i915_gem_create': [ libatomic ],
> +	'i915_gem_ctx_freq': [ lib_igt_perf ],
> +	'i915_gem_ctx_sseu': [ lib_igt_perf ],
> +	'i915_gem_eio': [ realtime ],
> +	'i915_gem_exec_balancer': [ lib_igt_perf ],
> +	'i915_gem_mmap_offset': [ libatomic ],
>  	'i915_pm_freq_mult': [ lib_igt_perf ],
>  	'i915_pm_rc6_residency': [ lib_igt_perf ],
> -	'perf': [ lib_igt_i915_perf ],
> -	'perf_pmu':  [ lib_igt_perf ],
> +	'i915_perf': [ lib_igt_i915_perf ],
> +	'i915_perf_pmu':  [ lib_igt_perf ],
>  	'sw_sync': [ libatomic ],
>  }
>  
> @@ -457,12 +457,12 @@ test_list_target = custom_target('testlist',
>  	      install : true,
>  	      install_dir : libexecdir)
>  
> -test_executables += executable('gem_concurrent_all', 'intel/gem_concurrent_all.c',
> +test_executables += executable('i915_gem_concurrent_all', 'intel/i915_gem_concurrent_all.c',
>  	   dependencies : test_deps + [ libatomic ],
>  	   install_dir : libexecdir,
>  	   install_rpath : libexecdir_rpathdir,
>  	   install : true)
> -test_list += 'gem_concurrent_all'
> +test_list += 'i915_gem_concurrent_all'
>  
>  test_list_full_target = custom_target('testlist-full',
>  	      output : 'test-list-full.txt',
> @@ -475,16 +475,16 @@ foreach prog : test_list
>  	test('testcase check ' + prog, test_script, args : prog)
>  endforeach
>  
> -testexe = executable('gem_stress', 'intel/gem_stress.c',
> +testexe = executable('i915_gem_stress', 'intel/i915_gem_stress.c',
>  	   install : true,
>  	   install_dir : libexecdir,
>  	   install_rpath : libexecdir_rpathdir,
>  	   dependencies : igt_deps)
> -testlist_files += custom_target('gem_stress.testlist',
> +testlist_files += custom_target('i915_gem_stress.testlist',
>                  build_by_default : true,
>                  command : [testexe, '--show-testlist'],
>                  capture : true,
> -                output : 'gem_stress.testlist')
> +                output : 'i915_gem_stress.testlist')
>  
>  image_files = [
>    '1080p-left.png',

^ permalink raw reply	[flat|nested] 18+ messages in thread

* [igt-dev] [i-g-t V6 7/7] tests: Rename all intel specific tests
  2023-08-31 14:56 ` [igt-dev] [i-g-t V5 7/7] tests: Rename all intel specific tests Bhanuprakash Modem
  2023-08-31 16:05   ` Mauro Carvalho Chehab
@ 2023-08-31 18:45   ` Bhanuprakash Modem
  1 sibling, 0 replies; 18+ messages in thread
From: Bhanuprakash Modem @ 2023-08-31 18:45 UTC (permalink / raw)
  To: igt-dev

As all intel specific tests got moved to a new directory
"tests/intel", rename all intel specific tests to represent
the supported driver.

Test name should start with the driver_name_ prefix. Below are
the Examples.

 - tests/intel/i915_*.c : All i915 specific tests. Ex: i915_module_load.c
 - tests/intel/intel_*.c: All tests those supports both i915 & XE.
 - tests/intel/kms_*.c  : All kms tests. Ex: kms_psr.c
 - tests/intel/xe_*.c   : All XE specific tests. Ex: xe_module_load.c

Going forward, we need to follow the above rules to maintain the
tests.

V2: - Fix IGT docs
    - Fix tests/feat_profile.json

Cc: Mauro Carvalho Chehab <mauro.chehab@linux.intel.com>
Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
---
 README.md                                     |   2 +-
 .../igt-gpu-tools/igt_test_programs.xml       | 102 +++---
 docs/reference/igt-gpu-tools/meson.build      |  14 +-
 tests/feat_profile.json                       |   8 +-
 tests/intel-ci/blacklist-pre-merge.txt        |  14 +-
 tests/intel-ci/blacklist.txt                  | 102 +++---
 tests/intel-ci/fast-feedback.testlist         | 104 +++---
 .../{api_intel_bb.c => i915_api_intel_bb.c}   |   0
 .../{debugfs_test.c => i915_debugfs_test.c}   |   0
 .../intel/{drm_fdinfo.c => i915_drm_fdinfo.c} |   0
 .../{gem_bad_reloc.c => i915_gem_bad_reloc.c} |   0
 ...barrier_race.c => i915_gem_barrier_race.c} |   0
 tests/intel/{gem_basic.c => i915_gem_basic.c} |   0
 tests/intel/{gem_blits.c => i915_gem_blits.c} |   0
 tests/intel/{gem_busy.c => i915_gem_busy.c}   |   0
 .../{gem_caching.c => i915_gem_caching.c}     |   0
 tests/intel/{gem_ccs.c => i915_gem_ccs.c}     |   0
 tests/intel/{gem_close.c => i915_gem_close.c} |   0
 ...gem_close_race.c => i915_gem_close_race.c} |   0
 ...urrent_all.c => i915_gem_concurrent_all.c} |   0
 ...rent_blit.c => i915_gem_concurrent_blit.c} |   2 +-
 .../intel/{gem_create.c => i915_gem_create.c} |   0
 .../intel/{gem_cs_tlb.c => i915_gem_cs_tlb.c} |   0
 ...d_destroy.c => i915_gem_ctx_bad_destroy.c} |   0
 ...gem_ctx_create.c => i915_gem_ctx_create.c} |   0
 ...m_ctx_engines.c => i915_gem_ctx_engines.c} |   0
 .../{gem_ctx_exec.c => i915_gem_ctx_exec.c}   |   0
 .../{gem_ctx_freq.c => i915_gem_ctx_freq.c}   |   0
 ...x_isolation.c => i915_gem_ctx_isolation.c} |   0
 .../{gem_ctx_param.c => i915_gem_ctx_param.c} |   0
 ...rsistence.c => i915_gem_ctx_persistence.c} |   0
 ...gem_ctx_shared.c => i915_gem_ctx_shared.c} |   0
 .../{gem_ctx_sseu.c => i915_gem_ctx_sseu.c}   |   0
 ...gem_ctx_switch.c => i915_gem_ctx_switch.c} |   0
 tests/intel/{gem_eio.c => i915_gem_eio.c}     |   0
 ...alignment.c => i915_gem_evict_alignment.c} |   0
 ...erything.c => i915_gem_evict_everything.c} |   0
 ..._alignment.c => i915_gem_exec_alignment.c} |   0
 ...gem_exec_async.c => i915_gem_exec_async.c} |   0
 ...gem_exec_await.c => i915_gem_exec_await.c} |   0
 ...ec_balancer.c => i915_gem_exec_balancer.c} |   0
 ...gem_exec_basic.c => i915_gem_exec_basic.c} |   0
 .../{gem_exec_big.c => i915_gem_exec_big.c}   |   0
 ...exec_capture.c => i915_gem_exec_capture.c} |   0
 ...m_exec_create.c => i915_gem_exec_create.c} |   0
 ...exec_endless.c => i915_gem_exec_endless.c} |   0
 .../{gem_exec_fair.c => i915_gem_exec_fair.c} |   0
 ...gem_exec_fence.c => i915_gem_exec_fence.c} |   0
 ...gem_exec_flush.c => i915_gem_exec_flush.c} |   0
 ...exec_gttfill.c => i915_gem_exec_gttfill.c} |   0
 ...exec_latency.c => i915_gem_exec_latency.c} |   0
 ...ut_handle.c => i915_gem_exec_lut_handle.c} |   0
 .../{gem_exec_nop.c => i915_gem_exec_nop.c}   |   0
 ...ec_parallel.c => i915_gem_exec_parallel.c} |   0
 ...m_exec_params.c => i915_gem_exec_params.c} |   0
 ...gem_exec_reloc.c => i915_gem_exec_reloc.c} |   0
 ...ec_schedule.c => i915_gem_exec_schedule.c} |   0
 ...gem_exec_store.c => i915_gem_exec_store.c} |   0
 ...exec_suspend.c => i915_gem_exec_suspend.c} |   0
 ...exec_whisper.c => i915_gem_exec_whisper.c} |   0
 ...exercise_blt.c => i915_gem_exercise_blt.c} |   0
 ..._exhaustion.c => i915_gem_fd_exhaustion.c} |   0
 ...fence_thrash.c => i915_gem_fence_thrash.c} |   0
 ...fence_upload.c => i915_gem_fence_upload.c} |   0
 ...thrash.c => i915_gem_fenced_exec_thrash.c} |   0
 ...m_flink_basic.c => i915_gem_flink_basic.c} |   0
 ...gem_flink_race.c => i915_gem_flink_race.c} |   0
 ...gem_gpgpu_fill.c => i915_gem_gpgpu_fill.c} |   0
 ...m_gtt_cpu_tlb.c => i915_gem_gtt_cpu_tlb.c} |   0
 .../{gem_gtt_hog.c => i915_gem_gtt_hog.c}     |   0
 .../{gem_gtt_speed.c => i915_gem_gtt_speed.c} |   0
 .../{gem_huc_copy.c => i915_gem_huc_copy.c}   |   0
 ...linear_blits.c => i915_gem_linear_blits.c} |   0
 ...gem_lmem_evict.c => i915_gem_lmem_evict.c} |   0
 ...em_swapping.c => i915_gem_lmem_swapping.c} |   0
 ...gem_lut_handle.c => i915_gem_lut_handle.c} |   0
 .../{gem_madvise.c => i915_gem_madvise.c}     |   0
 ...gem_media_fill.c => i915_gem_media_fill.c} |   0
 .../{gem_media_vme.c => i915_gem_media_vme.c} |   0
 tests/intel/{gem_mmap.c => i915_gem_mmap.c}   |   0
 .../{gem_mmap_gtt.c => i915_gem_mmap_gtt.c}   |   0
 ...m_mmap_offset.c => i915_gem_mmap_offset.c} |   0
 .../{gem_mmap_wc.c => i915_gem_mmap_wc.c}     |   0
 ...read.c => i915_gem_partial_pwrite_pread.c} |   0
 ...p.c => i915_gem_pipe_control_store_loop.c} |   0
 tests/intel/{gem_ppgtt.c => i915_gem_ppgtt.c} |   0
 tests/intel/{gem_pread.c => i915_gem_pread.c} |   0
 ...ter_blit.c => i915_gem_pread_after_blit.c} |   0
 .../intel/{gem_pwrite.c => i915_gem_pwrite.c} |   0
 ...te_snooped.c => i915_gem_pwrite_snooped.c} |   0
 tests/intel/{gem_pxp.c => i915_gem_pxp.c}     |   0
 ...ead_speed.c => i915_gem_read_read_speed.c} |   0
 .../{gem_readwrite.c => i915_gem_readwrite.c} |   0
 .../{gem_reg_read.c => i915_gem_reg_read.c}   |   0
 ...m_render_copy.c => i915_gem_render_copy.c} |   0
 ...y_redux.c => i915_gem_render_copy_redux.c} |   0
 ...blits.c => i915_gem_render_linear_blits.c} |   0
 ..._blits.c => i915_gem_render_tiled_blits.c} |   0
 ...est_retire.c => i915_gem_request_retire.c} |   0
 ...m_reset_stats.c => i915_gem_reset_stats.c} |   0
 .../{gem_ringfill.c => i915_gem_ringfill.c}   |   0
 ..._vs_blt.c => i915_gem_set_tiling_vs_blt.c} |   0
 ..._vs_gtt.c => i915_gem_set_tiling_vs_gtt.c} |   0
 ...rite.c => i915_gem_set_tiling_vs_pwrite.c} |   0
 .../intel/{gem_shrink.c => i915_gem_shrink.c} |   0
 .../{gem_softpin.c => i915_gem_softpin.c}     |   0
 ...gem_spin_batch.c => i915_gem_spin_batch.c} |   0
 ...g_writes.c => i915_gem_streaming_writes.c} |   0
 .../intel/{gem_stress.c => i915_gem_stress.c} |   0
 tests/intel/{gem_sync.c => i915_gem_sync.c}   |   0
 ...m_tiled_blits.c => i915_gem_tiled_blits.c} |   0
 ...e_blits.c => i915_gem_tiled_fence_blits.c} |   0
 ... => i915_gem_tiled_partial_pwrite_pread.c} |   0
 ...d_basic.c => i915_gem_tiled_pread_basic.c} |   0
 ...pwrite.c => i915_gem_tiled_pread_pwrite.c} |   0
 ...d_swapping.c => i915_gem_tiled_swapping.c} |   0
 .../{gem_tiled_wb.c => i915_gem_tiled_wb.c}   |   0
 .../{gem_tiled_wc.c => i915_gem_tiled_wc.c}   |   0
 ..._stride.c => i915_gem_tiling_max_stride.c} |   0
 ...rs.c => i915_gem_unfence_active_buffers.c} |   0
 ...fers.c => i915_gem_unref_active_buffers.c} |   0
 ...erptr_blits.c => i915_gem_userptr_blits.c} |   0
 .../{gem_vm_create.c => i915_gem_vm_create.c} |   0
 tests/intel/{gem_wait.c => i915_gem_wait.c}   |   0
 .../{gem_watchdog.c => i915_gem_watchdog.c}   |   0
 ...m_workarounds.c => i915_gem_workarounds.c} |   0
 ..._mixed_blits.c => i915_gen3_mixed_blits.c} |   0
 ...lits.c => i915_gen3_render_linear_blits.c} |   0
 ...blits.c => i915_gen3_render_mixed_blits.c} |   0
 ...lits.c => i915_gen3_render_tiledx_blits.c} |   0
 ...lits.c => i915_gen3_render_tiledy_blits.c} |   0
 ...n7_exec_parse.c => i915_gen7_exec_parse.c} |   0
 ...n9_exec_parse.c => i915_gen9_exec_parse.c} |   0
 tests/intel/{perf.c => i915_perf.c}           |   0
 tests/intel/{perf_pmu.c => i915_perf_pmu.c}   |   0
 .../intel/{prime_busy.c => i915_prime_busy.c} |   0
 .../intel/{prime_mmap.c => i915_prime_mmap.c} |   0
 ...oherency.c => i915_prime_mmap_coherency.c} |   0
 ...prime_mmap_kms.c => i915_prime_mmap_kms.c} |   0
 ...self_import.c => i915_prime_self_import.c} |   0
 ...sysfs_defaults.c => i915_sysfs_defaults.c} |   0
 ...rval.c => i915_sysfs_heartbeat_interval.c} |   0
 ...timeout.c => i915_sysfs_preempt_timeout.c} |   0
 ...tion.c => i915_sysfs_timeslice_duration.c} |   0
 tests/intel/i915_test_config.json             |   8 +-
 ...llocator.c => intel_api_intel_allocator.c} |   0
 tests/meson.build                             | 308 +++++++++---------
 147 files changed, 341 insertions(+), 323 deletions(-)
 rename tests/intel/{api_intel_bb.c => i915_api_intel_bb.c} (100%)
 rename tests/intel/{debugfs_test.c => i915_debugfs_test.c} (100%)
 rename tests/intel/{drm_fdinfo.c => i915_drm_fdinfo.c} (100%)
 rename tests/intel/{gem_bad_reloc.c => i915_gem_bad_reloc.c} (100%)
 rename tests/intel/{gem_barrier_race.c => i915_gem_barrier_race.c} (100%)
 rename tests/intel/{gem_basic.c => i915_gem_basic.c} (100%)
 rename tests/intel/{gem_blits.c => i915_gem_blits.c} (100%)
 rename tests/intel/{gem_busy.c => i915_gem_busy.c} (100%)
 rename tests/intel/{gem_caching.c => i915_gem_caching.c} (100%)
 rename tests/intel/{gem_ccs.c => i915_gem_ccs.c} (100%)
 rename tests/intel/{gem_close.c => i915_gem_close.c} (100%)
 rename tests/intel/{gem_close_race.c => i915_gem_close_race.c} (100%)
 rename tests/intel/{gem_concurrent_all.c => i915_gem_concurrent_all.c} (100%)
 rename tests/intel/{gem_concurrent_blit.c => i915_gem_concurrent_blit.c} (91%)
 rename tests/intel/{gem_create.c => i915_gem_create.c} (100%)
 rename tests/intel/{gem_cs_tlb.c => i915_gem_cs_tlb.c} (100%)
 rename tests/intel/{gem_ctx_bad_destroy.c => i915_gem_ctx_bad_destroy.c} (100%)
 rename tests/intel/{gem_ctx_create.c => i915_gem_ctx_create.c} (100%)
 rename tests/intel/{gem_ctx_engines.c => i915_gem_ctx_engines.c} (100%)
 rename tests/intel/{gem_ctx_exec.c => i915_gem_ctx_exec.c} (100%)
 rename tests/intel/{gem_ctx_freq.c => i915_gem_ctx_freq.c} (100%)
 rename tests/intel/{gem_ctx_isolation.c => i915_gem_ctx_isolation.c} (100%)
 rename tests/intel/{gem_ctx_param.c => i915_gem_ctx_param.c} (100%)
 rename tests/intel/{gem_ctx_persistence.c => i915_gem_ctx_persistence.c} (100%)
 rename tests/intel/{gem_ctx_shared.c => i915_gem_ctx_shared.c} (100%)
 rename tests/intel/{gem_ctx_sseu.c => i915_gem_ctx_sseu.c} (100%)
 rename tests/intel/{gem_ctx_switch.c => i915_gem_ctx_switch.c} (100%)
 rename tests/intel/{gem_eio.c => i915_gem_eio.c} (100%)
 rename tests/intel/{gem_evict_alignment.c => i915_gem_evict_alignment.c} (100%)
 rename tests/intel/{gem_evict_everything.c => i915_gem_evict_everything.c} (100%)
 rename tests/intel/{gem_exec_alignment.c => i915_gem_exec_alignment.c} (100%)
 rename tests/intel/{gem_exec_async.c => i915_gem_exec_async.c} (100%)
 rename tests/intel/{gem_exec_await.c => i915_gem_exec_await.c} (100%)
 rename tests/intel/{gem_exec_balancer.c => i915_gem_exec_balancer.c} (100%)
 rename tests/intel/{gem_exec_basic.c => i915_gem_exec_basic.c} (100%)
 rename tests/intel/{gem_exec_big.c => i915_gem_exec_big.c} (100%)
 rename tests/intel/{gem_exec_capture.c => i915_gem_exec_capture.c} (100%)
 rename tests/intel/{gem_exec_create.c => i915_gem_exec_create.c} (100%)
 rename tests/intel/{gem_exec_endless.c => i915_gem_exec_endless.c} (100%)
 rename tests/intel/{gem_exec_fair.c => i915_gem_exec_fair.c} (100%)
 rename tests/intel/{gem_exec_fence.c => i915_gem_exec_fence.c} (100%)
 rename tests/intel/{gem_exec_flush.c => i915_gem_exec_flush.c} (100%)
 rename tests/intel/{gem_exec_gttfill.c => i915_gem_exec_gttfill.c} (100%)
 rename tests/intel/{gem_exec_latency.c => i915_gem_exec_latency.c} (100%)
 rename tests/intel/{gem_exec_lut_handle.c => i915_gem_exec_lut_handle.c} (100%)
 rename tests/intel/{gem_exec_nop.c => i915_gem_exec_nop.c} (100%)
 rename tests/intel/{gem_exec_parallel.c => i915_gem_exec_parallel.c} (100%)
 rename tests/intel/{gem_exec_params.c => i915_gem_exec_params.c} (100%)
 rename tests/intel/{gem_exec_reloc.c => i915_gem_exec_reloc.c} (100%)
 rename tests/intel/{gem_exec_schedule.c => i915_gem_exec_schedule.c} (100%)
 rename tests/intel/{gem_exec_store.c => i915_gem_exec_store.c} (100%)
 rename tests/intel/{gem_exec_suspend.c => i915_gem_exec_suspend.c} (100%)
 rename tests/intel/{gem_exec_whisper.c => i915_gem_exec_whisper.c} (100%)
 rename tests/intel/{gem_exercise_blt.c => i915_gem_exercise_blt.c} (100%)
 rename tests/intel/{gem_fd_exhaustion.c => i915_gem_fd_exhaustion.c} (100%)
 rename tests/intel/{gem_fence_thrash.c => i915_gem_fence_thrash.c} (100%)
 rename tests/intel/{gem_fence_upload.c => i915_gem_fence_upload.c} (100%)
 rename tests/intel/{gem_fenced_exec_thrash.c => i915_gem_fenced_exec_thrash.c} (100%)
 rename tests/intel/{gem_flink_basic.c => i915_gem_flink_basic.c} (100%)
 rename tests/intel/{gem_flink_race.c => i915_gem_flink_race.c} (100%)
 rename tests/intel/{gem_gpgpu_fill.c => i915_gem_gpgpu_fill.c} (100%)
 rename tests/intel/{gem_gtt_cpu_tlb.c => i915_gem_gtt_cpu_tlb.c} (100%)
 rename tests/intel/{gem_gtt_hog.c => i915_gem_gtt_hog.c} (100%)
 rename tests/intel/{gem_gtt_speed.c => i915_gem_gtt_speed.c} (100%)
 rename tests/intel/{gem_huc_copy.c => i915_gem_huc_copy.c} (100%)
 rename tests/intel/{gem_linear_blits.c => i915_gem_linear_blits.c} (100%)
 rename tests/intel/{gem_lmem_evict.c => i915_gem_lmem_evict.c} (100%)
 rename tests/intel/{gem_lmem_swapping.c => i915_gem_lmem_swapping.c} (100%)
 rename tests/intel/{gem_lut_handle.c => i915_gem_lut_handle.c} (100%)
 rename tests/intel/{gem_madvise.c => i915_gem_madvise.c} (100%)
 rename tests/intel/{gem_media_fill.c => i915_gem_media_fill.c} (100%)
 rename tests/intel/{gem_media_vme.c => i915_gem_media_vme.c} (100%)
 rename tests/intel/{gem_mmap.c => i915_gem_mmap.c} (100%)
 rename tests/intel/{gem_mmap_gtt.c => i915_gem_mmap_gtt.c} (100%)
 rename tests/intel/{gem_mmap_offset.c => i915_gem_mmap_offset.c} (100%)
 rename tests/intel/{gem_mmap_wc.c => i915_gem_mmap_wc.c} (100%)
 rename tests/intel/{gem_partial_pwrite_pread.c => i915_gem_partial_pwrite_pread.c} (100%)
 rename tests/intel/{gem_pipe_control_store_loop.c => i915_gem_pipe_control_store_loop.c} (100%)
 rename tests/intel/{gem_ppgtt.c => i915_gem_ppgtt.c} (100%)
 rename tests/intel/{gem_pread.c => i915_gem_pread.c} (100%)
 rename tests/intel/{gem_pread_after_blit.c => i915_gem_pread_after_blit.c} (100%)
 rename tests/intel/{gem_pwrite.c => i915_gem_pwrite.c} (100%)
 rename tests/intel/{gem_pwrite_snooped.c => i915_gem_pwrite_snooped.c} (100%)
 rename tests/intel/{gem_pxp.c => i915_gem_pxp.c} (100%)
 rename tests/intel/{gem_read_read_speed.c => i915_gem_read_read_speed.c} (100%)
 rename tests/intel/{gem_readwrite.c => i915_gem_readwrite.c} (100%)
 rename tests/intel/{gem_reg_read.c => i915_gem_reg_read.c} (100%)
 rename tests/intel/{gem_render_copy.c => i915_gem_render_copy.c} (100%)
 rename tests/intel/{gem_render_copy_redux.c => i915_gem_render_copy_redux.c} (100%)
 rename tests/intel/{gem_render_linear_blits.c => i915_gem_render_linear_blits.c} (100%)
 rename tests/intel/{gem_render_tiled_blits.c => i915_gem_render_tiled_blits.c} (100%)
 rename tests/intel/{gem_request_retire.c => i915_gem_request_retire.c} (100%)
 rename tests/intel/{gem_reset_stats.c => i915_gem_reset_stats.c} (100%)
 rename tests/intel/{gem_ringfill.c => i915_gem_ringfill.c} (100%)
 rename tests/intel/{gem_set_tiling_vs_blt.c => i915_gem_set_tiling_vs_blt.c} (100%)
 rename tests/intel/{gem_set_tiling_vs_gtt.c => i915_gem_set_tiling_vs_gtt.c} (100%)
 rename tests/intel/{gem_set_tiling_vs_pwrite.c => i915_gem_set_tiling_vs_pwrite.c} (100%)
 rename tests/intel/{gem_shrink.c => i915_gem_shrink.c} (100%)
 rename tests/intel/{gem_softpin.c => i915_gem_softpin.c} (100%)
 rename tests/intel/{gem_spin_batch.c => i915_gem_spin_batch.c} (100%)
 rename tests/intel/{gem_streaming_writes.c => i915_gem_streaming_writes.c} (100%)
 rename tests/intel/{gem_stress.c => i915_gem_stress.c} (100%)
 rename tests/intel/{gem_sync.c => i915_gem_sync.c} (100%)
 rename tests/intel/{gem_tiled_blits.c => i915_gem_tiled_blits.c} (100%)
 rename tests/intel/{gem_tiled_fence_blits.c => i915_gem_tiled_fence_blits.c} (100%)
 rename tests/intel/{gem_tiled_partial_pwrite_pread.c => i915_gem_tiled_partial_pwrite_pread.c} (100%)
 rename tests/intel/{gem_tiled_pread_basic.c => i915_gem_tiled_pread_basic.c} (100%)
 rename tests/intel/{gem_tiled_pread_pwrite.c => i915_gem_tiled_pread_pwrite.c} (100%)
 rename tests/intel/{gem_tiled_swapping.c => i915_gem_tiled_swapping.c} (100%)
 rename tests/intel/{gem_tiled_wb.c => i915_gem_tiled_wb.c} (100%)
 rename tests/intel/{gem_tiled_wc.c => i915_gem_tiled_wc.c} (100%)
 rename tests/intel/{gem_tiling_max_stride.c => i915_gem_tiling_max_stride.c} (100%)
 rename tests/intel/{gem_unfence_active_buffers.c => i915_gem_unfence_active_buffers.c} (100%)
 rename tests/intel/{gem_unref_active_buffers.c => i915_gem_unref_active_buffers.c} (100%)
 rename tests/intel/{gem_userptr_blits.c => i915_gem_userptr_blits.c} (100%)
 rename tests/intel/{gem_vm_create.c => i915_gem_vm_create.c} (100%)
 rename tests/intel/{gem_wait.c => i915_gem_wait.c} (100%)
 rename tests/intel/{gem_watchdog.c => i915_gem_watchdog.c} (100%)
 rename tests/intel/{gem_workarounds.c => i915_gem_workarounds.c} (100%)
 rename tests/intel/{gen3_mixed_blits.c => i915_gen3_mixed_blits.c} (100%)
 rename tests/intel/{gen3_render_linear_blits.c => i915_gen3_render_linear_blits.c} (100%)
 rename tests/intel/{gen3_render_mixed_blits.c => i915_gen3_render_mixed_blits.c} (100%)
 rename tests/intel/{gen3_render_tiledx_blits.c => i915_gen3_render_tiledx_blits.c} (100%)
 rename tests/intel/{gen3_render_tiledy_blits.c => i915_gen3_render_tiledy_blits.c} (100%)
 rename tests/intel/{gen7_exec_parse.c => i915_gen7_exec_parse.c} (100%)
 rename tests/intel/{gen9_exec_parse.c => i915_gen9_exec_parse.c} (100%)
 rename tests/intel/{perf.c => i915_perf.c} (100%)
 rename tests/intel/{perf_pmu.c => i915_perf_pmu.c} (100%)
 rename tests/intel/{prime_busy.c => i915_prime_busy.c} (100%)
 rename tests/intel/{prime_mmap.c => i915_prime_mmap.c} (100%)
 rename tests/intel/{prime_mmap_coherency.c => i915_prime_mmap_coherency.c} (100%)
 rename tests/intel/{prime_mmap_kms.c => i915_prime_mmap_kms.c} (100%)
 rename tests/intel/{prime_self_import.c => i915_prime_self_import.c} (100%)
 rename tests/intel/{sysfs_defaults.c => i915_sysfs_defaults.c} (100%)
 rename tests/intel/{sysfs_heartbeat_interval.c => i915_sysfs_heartbeat_interval.c} (100%)
 rename tests/intel/{sysfs_preempt_timeout.c => i915_sysfs_preempt_timeout.c} (100%)
 rename tests/intel/{sysfs_timeslice_duration.c => i915_sysfs_timeslice_duration.c} (100%)
 rename tests/intel/{api_intel_allocator.c => intel_api_intel_allocator.c} (100%)

diff --git a/README.md b/README.md
index 9cef60d88..492650e85 100644
--- a/README.md
+++ b/README.md
@@ -129,7 +129,7 @@ The benchmarks require KMS to be enabled.  When run with an X Server
 running, they must be run as root to avoid the authentication
 requirement.
 
-Note that a few other microbenchmarks are in tests (e.g. `gem_gtt_speed`).
+Note that a few other microbenchmarks are in tests (e.g. `i915_gem_gtt_speed`).
 
 ### `tools/`
 
diff --git a/docs/reference/igt-gpu-tools/igt_test_programs.xml b/docs/reference/igt-gpu-tools/igt_test_programs.xml
index 92bc33ba8..c0f11a883 100644
--- a/docs/reference/igt-gpu-tools/igt_test_programs.xml
+++ b/docs/reference/igt-gpu-tools/igt_test_programs.xml
@@ -120,15 +120,6 @@
     <xi:include href="igt_test_programs_core_description.xml"/>
   </refentry>
 
-  <refentry id="igt-debugfs-tests">
-    <refnamediv>
-      <refname>Debugfs Tests</refname>
-      <refpurpose>Tests for debugfs behaviour</refpurpose>
-    </refnamediv>
-    <xi:include href="igt_test_programs_debugfs_programs.xml"/>
-    <xi:include href="igt_test_programs_debugfs_description.xml"/>
-  </refentry>
-
   <refentry id="igt-drm-tests">
     <refnamediv>
       <refname>DRM Tests</refname>
@@ -138,31 +129,76 @@
     <xi:include href="igt_test_programs_drm_description.xml"/>
   </refentry>
 
-  <refentry id="igt-gem-tests">
+  <refentry id="igt-i915-debugfs-tests">
+    <refnamediv>
+      <refname>i915 Debugfs Tests</refname>
+      <refpurpose>Tests for i915 debugfs behaviour</refpurpose>
+    </refnamediv>
+    <xi:include href="igt_test_programs_i915_debugfs_programs.xml"/>
+    <xi:include href="igt_test_programs_i915_debugfs_description.xml"/>
+  </refentry>
+
+  <refentry id="igt-i915-gem-tests">
+    <refnamediv>
+      <refname>i915 GEM Tests</refname>
+      <refpurpose>Tests for the i915 graphics execution manager</refpurpose>
+    </refnamediv>
+    <xi:include href="igt_test_programs_i915_gem_programs.xml"/>
+    <xi:include href="igt_test_programs_i915_gem_description.xml"/>
+  </refentry>
+
+  <refentry id="igt-i915-gen3-tests">
+    <refnamediv>
+      <refname>i915 Gen 3 Tests</refname>
+      <refpurpose>Tests specific to Intel gen 3</refpurpose>
+    </refnamediv>
+    <xi:include href="igt_test_programs_i915_gen3_programs.xml"/>
+    <xi:include href="igt_test_programs_i915_gen3_description.xml"/>
+  </refentry>
+
+  <refentry id="igt-i915-gen7-tests">
     <refnamediv>
-      <refname>GEM Tests</refname>
-      <refpurpose>Tests for the graphics execution manager</refpurpose>
+      <refname>i915 Gen 7 Tests</refname>
+      <refpurpose>Tests specific to Intel gen 7</refpurpose>
     </refnamediv>
-    <xi:include href="igt_test_programs_gem_programs.xml"/>
-    <xi:include href="igt_test_programs_gem_description.xml"/>
+    <xi:include href="igt_test_programs_i915_gen7_programs.xml"/>
+    <xi:include href="igt_test_programs_i915_gen7_description.xml"/>
   </refentry>
 
-  <refentry id="igt-gen3-tests">
+  <refentry id="igt-i915-gen9-tests">
     <refnamediv>
-      <refname>Gen 3 Tests</refname>
-      <refpurpose>Tests specific to gen 3</refpurpose>
+      <refname>i915 Gen 9 Tests</refname>
+      <refpurpose>Tests specific to Intel gen 9</refpurpose>
     </refnamediv>
-    <xi:include href="igt_test_programs_gen3_programs.xml"/>
-    <xi:include href="igt_test_programs_gen3_description.xml"/>
+    <xi:include href="igt_test_programs_i915_gen9_programs.xml"/>
+    <xi:include href="igt_test_programs_i915_gen9_description.xml"/>
   </refentry>
 
-  <refentry id="igt-gen7-tests">
+  <refentry id="igt-i915-perf-tests">
     <refnamediv>
-      <refname>Gen 7 Tests</refname>
-      <refpurpose>Tests specific to gen 7</refpurpose>
+      <refname>i915 Perf Tests</refname>
+      <refpurpose>Tests for the i915 performance metrics</refpurpose>
     </refnamediv>
-    <xi:include href="igt_test_programs_gen7_programs.xml"/>
-    <xi:include href="igt_test_programs_gen7_description.xml"/>
+    <xi:include href="igt_test_programs_i915_perf_programs.xml"/>
+    <xi:include href="igt_test_programs_i915_perf_description.xml"/>
+  </refentry>
+
+  <refentry id="igt-i915-pm-tests">
+    <refnamediv>
+      <refname>i915 PM Tests</refname>
+      <refpurpose>Tests for i915 power management features</refpurpose>
+    </refnamediv>
+    <xi:include href="igt_test_programs_i915_pm_programs.xml"/>
+    <xi:include href="igt_test_programs_i915_pm_description.xml"/>
+  </refentry>
+
+  <refentry id="igt-i915-prime-tests">
+    <refnamediv>
+      <refname>i915 Prime Tests</refname>
+      <refpurpose>Tests for i915 buffer sharing</refpurpose>
+    </refnamediv>
+    <xi:include href="igt_test_programs_i915_prime_programs.xml"/>
+    <xi:include href="igt_test_programs_i915_prime_description.xml"/>
   </refentry>
 
   <refentry id="igt-i915-tests">
@@ -192,24 +228,6 @@
     <xi:include href="igt_test_programs_meta_description.xml"/>
   </refentry>
 
-  <refentry id="igt-perf-tests">
-    <refnamediv>
-      <refname>Perf Tests</refname>
-      <refpurpose>Tests for the performance metrics</refpurpose>
-    </refnamediv>
-    <xi:include href="igt_test_programs_perf_programs.xml"/>
-    <xi:include href="igt_test_programs_perf_description.xml"/>
-  </refentry>
-
-  <refentry id="igt-pm-tests">
-    <refnamediv>
-      <refname>PM Tests</refname>
-      <refpurpose>Tests for power management features</refpurpose>
-    </refnamediv>
-    <xi:include href="igt_test_programs_pm_programs.xml"/>
-    <xi:include href="igt_test_programs_pm_description.xml"/>
-  </refentry>
-
   <refentry id="igt-prime-tests">
     <refnamediv>
       <refname>Prime Tests</refname>
diff --git a/docs/reference/igt-gpu-tools/meson.build b/docs/reference/igt-gpu-tools/meson.build
index 6b832ad27..802342db4 100644
--- a/docs/reference/igt-gpu-tools/meson.build
+++ b/docs/reference/igt-gpu-tools/meson.build
@@ -26,16 +26,18 @@ ignore_headers = [
 test_groups = [
 	'amdgpu',
 	'core',
-	'debugfs',
 	'drm',
-	'gem',
-	'gen3',
-	'gen7',
+	'i915_debugfs',
+	'i915_gem',
+	'i915_gen3',
+	'i915_gen7',
+	'i915_gen9',
+	'i915_perf',
+	'i915_pm',
+	'i915_prime',
 	'i915',
 	'kms',
 	'meta',
-	'perf',
-	'pm',
 	'prime',
 	'sw_sync',
 	'testdisplay',
diff --git a/tests/feat_profile.json b/tests/feat_profile.json
index f13d636e3..bd240c36c 100644
--- a/tests/feat_profile.json
+++ b/tests/feat_profile.json
@@ -1,6 +1,6 @@
 {
     "Android Sync Framework" : {
-        "include_tests" : "gem_exec_fence|gem_exec_async|sw_sync|fence",
+        "include_tests" : "i915_gem_exec_fence|i915_gem_exec_async|sw_sync|fence",
         "exclude_tests" : "kms_busy@extended|fbc",
         "target_rate" : 90
     },
@@ -15,7 +15,7 @@
         "target_rate" : 90
     },
     "debugfs" : {
-        "include_tests" : "debugfs",
+        "include_tests" : "i915_debugfs",
         "exclude_tests" : "",
         "target_rate" : 90
     },
@@ -25,7 +25,7 @@
         "target_rate" : 90
     },
     "gem" : {
-        "include_tests" : "gem",
+        "include_tests" : "i915_gem",
         "exclude_tests" : "",
         "target_rate" : 90
     },
@@ -63,7 +63,7 @@
         "target_rate" : 90
     },
     "pm" : {
-        "include_tests" : "pm_|suspend|resume",
+        "include_tests" : "i915_pm_|suspend|resume",
         "exclude_tests" : "",
         "target_rate" : 90
     },
diff --git a/tests/intel-ci/blacklist-pre-merge.txt b/tests/intel-ci/blacklist-pre-merge.txt
index d4e5ef66e..b747bdf42 100644
--- a/tests/intel-ci/blacklist-pre-merge.txt
+++ b/tests/intel-ci/blacklist-pre-merge.txt
@@ -37,7 +37,7 @@ igt@i915_pm_rpm@universal-planes(-dpms)?
 #
 # Data acquired on 2020-02-19 by Martin Peres
 ###############################################################################
-igt@gem_pwrite@big-.*
+igt@i915_gem_pwrite@big-.*
 
 
 ###############################################################################
@@ -46,7 +46,7 @@ igt@gem_pwrite@big-.*
 # outside of drm_mm and i915_gem_execbuffer, for which the authors assure us
 # that they are making deliberate and well tested changes.
 ###############################################################################
-igt@gem_exec_alignment@.*
+igt@i915_gem_exec_alignment@.*
 
 
 ###############################################################################
@@ -85,11 +85,11 @@ igt@i915_pm_rpm@debugfs-read
 #
 # Data acquired on 2020-02-20 by Martin Peres
 ###############################################################################
-igt@gem_fence_thrash@bo-write-verify-threaded-[xy]
-igt@gem_tiled_blits@interruptible
-igt@gem_tiled_fence_blits@normal
-igt@gem_tiled_blits@normal
-igt@gem_tiled_wc
+igt@i915_gem_fence_thrash@bo-write-verify-threaded-[xy]
+igt@i915_gem_tiled_blits@interruptible
+igt@i915_gem_tiled_fence_blits@normal
+igt@i915_gem_tiled_blits@normal
+igt@i915_gem_tiled_wc
 
 
 ###############################################################################
diff --git a/tests/intel-ci/blacklist.txt b/tests/intel-ci/blacklist.txt
index e13759d3e..62996c2c7 100644
--- a/tests/intel-ci/blacklist.txt
+++ b/tests/intel-ci/blacklist.txt
@@ -18,56 +18,56 @@ igt@i915_pm_rpm@gem-execbuf-stress-extra-wait
 ###############################################
 # GEM
 ###############################################
-igt@gem_busy@hang.*
-igt@gem_close_race@(?!.*basic).*
-igt@gem_concurrent_blit(@.*)?
-igt@gem_ctx_create@(?!.*basic).*
-igt@gem_ctx_exec@(?!.*basic).*
-igt@gem_ctx_shared@*exhaust*
-igt@gem_ctx_switch(@.*)?
-igt@gem_evict_alignment(@.*)?
-igt@gem_evict_everything(@.*)?
-igt@gem_exec_big@(?!.*single).*
-igt@gem_exec_capture@many-(?!4K-).*
-igt@gem_exec_fair@(?!.*basic).*
-igt@gem_exec_fence@.*hang.*
-igt@gem_exec_flush@(?!.*basic).*
-igt@gem_exec_latency(@.*)?
-igt@gem_exec_lut_handle(@.*)?
-igt@gem_exec_nop@(?!.*basic).*
-igt@gem_exec_reloc@(?!.*basic).*
-igt@gem_exec_suspend@(?!.*basic).*
-igt@gem_exec_whisper@(?!basic).*
-igt@gem_fd_exhaustion(@.*)?
-igt@gem_fence_upload(@.*)?
-igt@gem_gtt_hog(@.*)?
-igt@gem_gtt_speed(@.*)?
-igt@gem_lut_handle(@.*)?
-igt@gem_mmap_gtt@.*(huge|swap|clflush|forked).*
-igt@gem_mmap@.*(swap|huge).*
-igt@gem_pread_after_blit(@.*)?
-igt@gem_pwrite@(?!.*basic).*
-igt@gem_read_read_speed(@.*)?
-igt@gem_render_linear_blits@(?!.*basic).*
-igt@gem_render_tiled_blits@(?!.*basic).*
-igt@gem_reset_stats(@.*)?
-igt@gem_ringfill@(?!.*basic).*
-igt@gem_shrink@(?!reclaim$).*
-igt@gem_softpin@.*(hang|S4).*
-igt@gem_streaming_writes(@.*)?
-igt@gem_sync@(?!.*basic).*
-igt@gem_tiled_swapping@(?!non-threaded).*
-igt@gem_userptr_blits@(major|minor|forked|mlocked|swapping).*
-igt@gem_wait@hang.*
-igt@gem_watchdog@far-fence
-igt@sysfs_heartbeat_interval@(long|off)
-igt@sysfs_preempt_timeout@off
-igt@sysfs_timeslice_duration@off
+igt@i915_gem_busy@hang.*
+igt@i915_gem_close_race@(?!.*basic).*
+igt@i915_gem_concurrent_blit(@.*)?
+igt@i915_gem_ctx_create@(?!.*basic).*
+igt@i915_gem_ctx_exec@(?!.*basic).*
+igt@i915_gem_ctx_shared@*exhaust*
+igt@i915_gem_ctx_switch(@.*)?
+igt@i915_gem_evict_alignment(@.*)?
+igt@i915_gem_evict_everything(@.*)?
+igt@i915_gem_exec_big@(?!.*single).*
+igt@i915_gem_exec_capture@many-(?!4K-).*
+igt@i915_gem_exec_fair@(?!.*basic).*
+igt@i915_gem_exec_fence@.*hang.*
+igt@i915_gem_exec_flush@(?!.*basic).*
+igt@i915_gem_exec_latency(@.*)?
+igt@i915_gem_exec_lut_handle(@.*)?
+igt@i915_gem_exec_nop@(?!.*basic).*
+igt@i915_gem_exec_reloc@(?!.*basic).*
+igt@i915_gem_exec_suspend@(?!.*basic).*
+igt@i915_gem_exec_whisper@(?!basic).*
+igt@i915_gem_fd_exhaustion(@.*)?
+igt@i915_gem_fence_upload(@.*)?
+igt@i915_gem_gtt_hog(@.*)?
+igt@i915_gem_gtt_speed(@.*)?
+igt@i915_gem_lut_handle(@.*)?
+igt@i915_gem_mmap_gtt@.*(huge|swap|clflush|forked).*
+igt@i915_gem_mmap@.*(swap|huge).*
+igt@i915_gem_pread_after_blit(@.*)?
+igt@i915_gem_pwrite@(?!.*basic).*
+igt@i915_gem_read_read_speed(@.*)?
+igt@i915_gem_render_linear_blits@(?!.*basic).*
+igt@i915_gem_render_tiled_blits@(?!.*basic).*
+igt@i915_gem_reset_stats(@.*)?
+igt@i915_gem_ringfill@(?!.*basic).*
+igt@i915_gem_shrink@(?!reclaim$).*
+igt@i915_gem_softpin@.*(hang|S4).*
+igt@i915_gem_streaming_writes(@.*)?
+igt@i915_gem_sync@(?!.*basic).*
+igt@i915_gem_tiled_swapping@(?!non-threaded).*
+igt@i915_gem_userptr_blits@(major|minor|forked|mlocked|swapping).*
+igt@i915_gem_wait@hang.*
+igt@i915_gem_watchdog@far-fence
+igt@i915_sysfs_heartbeat_interval@(long|off)
+igt@i915_sysfs_preempt_timeout@off
+igt@i915_sysfs_timeslice_duration@off
 ###############################################
 # GEM: Not worth fixing
 ###############################################
-igt@gen7_exec_parse@.*lri.*
-igt@gem_exec_alignment@pi-shared
+igt@i915_gen7_exec_parse@.*lri.*
+igt@i915_gem_exec_alignment@pi-shared
 ###############################################
 # There are no DRRS capable displays in CI lab
 ###############################################
@@ -108,10 +108,10 @@ igt@msm_.*
 # Hibernate: not configured correctly on CI
 ###############################################
 igt@.*@.*-hibernate
-igt@gem_softpin@noreloc-s4
-igt@gem_workarounds@hibernate-.*
-igt@gem_exec_suspend@basic-s4$
-igt@gem_ctx_isolation@.*-s4
+igt@i915_gem_softpin@noreloc-s4
+igt@i915_gem_workarounds@hibernate-.*
+igt@i915_gem_exec_suspend@basic-s4$
+igt@i915_gem_ctx_isolation@.*-s4
 ###############################################
 # Out-of-memory: spammy and often broken
 ###############################################
diff --git a/tests/intel-ci/fast-feedback.testlist b/tests/intel-ci/fast-feedback.testlist
index c09c6c417..83bb8dd64 100644
--- a/tests/intel-ci/fast-feedback.testlist
+++ b/tests/intel-ci/fast-feedback.testlist
@@ -10,48 +10,48 @@ igt@fbdev@info
 igt@fbdev@nullptr
 igt@fbdev@read
 igt@fbdev@write
-igt@gem_basic@bad-close
-igt@gem_basic@create-close
-igt@gem_basic@create-fd-close
-igt@gem_busy@busy@all-engines
-igt@gem_close_race@basic-process
-igt@gem_close_race@basic-threads
-igt@gem_ctx_create@basic
-igt@gem_ctx_create@basic-files
-igt@gem_ctx_exec@basic
-igt@gem_exec_basic@basic
-igt@gem_exec_create@basic
-igt@gem_exec_fence@basic-busy
-igt@gem_exec_fence@basic-wait
-igt@gem_exec_fence@basic-await
-igt@gem_exec_fence@nb-await
-igt@gem_exec_gttfill@basic
-igt@gem_exec_parallel@engines
-igt@gem_exec_store@basic
-igt@gem_flink_basic@bad-flink
-igt@gem_flink_basic@bad-open
-igt@gem_flink_basic@basic
-igt@gem_flink_basic@double-flink
-igt@gem_flink_basic@flink-lifetime
-igt@gem_huc_copy@huc-copy
-igt@gem_linear_blits@basic
-igt@gem_mmap@basic
-igt@gem_mmap_gtt@basic
-igt@gem_render_linear_blits@basic
-igt@gem_render_tiled_blits@basic
-igt@gem_ringfill@basic-all
-igt@gem_softpin@allocator-basic
-igt@gem_softpin@allocator-basic-reserve
-igt@gem_softpin@safe-alignment
-igt@gem_sync@basic-all
-igt@gem_sync@basic-each
-igt@gem_tiled_blits@basic
-igt@gem_tiled_fence_blits@basic
-igt@gem_tiled_pread_basic
-igt@gem_wait@busy@all-engines
-igt@gem_wait@wait@all-engines
+igt@i915_gem_basic@bad-close
+igt@i915_gem_basic@create-close
+igt@i915_gem_basic@create-fd-close
+igt@i915_gem_busy@busy@all-engines
+igt@i915_gem_close_race@basic-process
+igt@i915_gem_close_race@basic-threads
+igt@i915_gem_ctx_create@basic
+igt@i915_gem_ctx_create@basic-files
+igt@i915_gem_ctx_exec@basic
+igt@i915_gem_exec_basic@basic
+igt@i915_gem_exec_create@basic
+igt@i915_gem_exec_fence@basic-busy
+igt@i915_gem_exec_fence@basic-wait
+igt@i915_gem_exec_fence@basic-await
+igt@i915_gem_exec_fence@nb-await
+igt@i915_gem_exec_gttfill@basic
+igt@i915_gem_exec_parallel@engines
+igt@i915_gem_exec_store@basic
+igt@i915_gem_flink_basic@bad-flink
+igt@i915_gem_flink_basic@bad-open
+igt@i915_gem_flink_basic@basic
+igt@i915_gem_flink_basic@double-flink
+igt@i915_gem_flink_basic@flink-lifetime
 igt@i915_getparams_basic@basic-eu-total
 igt@i915_getparams_basic@basic-subslice-total
+igt@i915_gem_huc_copy@huc-copy
+igt@i915_gem_linear_blits@basic
+igt@i915_gem_mmap@basic
+igt@i915_gem_mmap_gtt@basic
+igt@i915_gem_render_linear_blits@basic
+igt@i915_gem_render_tiled_blits@basic
+igt@i915_gem_ringfill@basic-all
+igt@i915_gem_softpin@allocator-basic
+igt@i915_gem_softpin@allocator-basic-reserve
+igt@i915_gem_softpin@safe-alignment
+igt@i915_gem_sync@basic-all
+igt@i915_gem_sync@basic-each
+igt@i915_gem_tiled_blits@basic
+igt@i915_gem_tiled_fence_blits@basic
+igt@i915_gem_tiled_pread_basic
+igt@i915_gem_wait@busy@all-engines
+igt@i915_gem_wait@wait@all-engines
 igt@i915_hangman@error-state-basic
 igt@i915_pciid
 igt@kms_addfb_basic@addfb25-bad-modifier
@@ -126,12 +126,12 @@ igt@i915_pm_backlight@basic-brightness
 igt@i915_pm_rpm@basic-pci-d3-state
 igt@i915_pm_rpm@basic-rte
 igt@i915_pm_rps@basic-api
-igt@prime_self_import@basic-llseek-bad
-igt@prime_self_import@basic-llseek-size
-igt@prime_self_import@basic-with_fd_dup
-igt@prime_self_import@basic-with_one_bo
-igt@prime_self_import@basic-with_one_bo_two_files
-igt@prime_self_import@basic-with_two_bos
+igt@i915_prime_self_import@basic-llseek-bad
+igt@i915_prime_self_import@basic-llseek-size
+igt@i915_prime_self_import@basic-with_fd_dup
+igt@i915_prime_self_import@basic-with_one_bo
+igt@i915_prime_self_import@basic-with_one_bo_two_files
+igt@i915_prime_self_import@basic-with_two_bos
 igt@prime_vgem@basic-fence-flip
 igt@prime_vgem@basic-fence-mmap
 igt@prime_vgem@basic-fence-read
@@ -156,10 +156,10 @@ igt@vgem_basic@sysfs
 igt@core_hotunplug@unbind-rebind
 igt@vgem_basic@unload
 igt@i915_module_load@reload
-igt@gem_lmem_swapping@basic
-igt@gem_lmem_swapping@parallel-random-engines
-igt@gem_lmem_swapping@random-engines
-igt@gem_lmem_swapping@verify-random
+igt@i915_gem_lmem_swapping@basic
+igt@i915_gem_lmem_swapping@parallel-random-engines
+igt@i915_gem_lmem_swapping@random-engines
+igt@i915_gem_lmem_swapping@verify-random
 igt@i915_pm_rpm@module-reload
 
 # Kernel selftests
@@ -169,6 +169,6 @@ igt@dmabuf@all-tests
 # System wide suspend tests
 igt@i915_suspend@basic-s2idle-without-i915
 igt@i915_suspend@basic-s3-without-i915
-igt@gem_exec_suspend@basic-s0
-igt@gem_exec_suspend@basic-s3
+igt@i915_gem_exec_suspend@basic-s0
+igt@i915_gem_exec_suspend@basic-s3
 igt@kms_pipe_crc_basic@suspend-read-crc
diff --git a/tests/intel/api_intel_bb.c b/tests/intel/i915_api_intel_bb.c
similarity index 100%
rename from tests/intel/api_intel_bb.c
rename to tests/intel/i915_api_intel_bb.c
diff --git a/tests/intel/debugfs_test.c b/tests/intel/i915_debugfs_test.c
similarity index 100%
rename from tests/intel/debugfs_test.c
rename to tests/intel/i915_debugfs_test.c
diff --git a/tests/intel/drm_fdinfo.c b/tests/intel/i915_drm_fdinfo.c
similarity index 100%
rename from tests/intel/drm_fdinfo.c
rename to tests/intel/i915_drm_fdinfo.c
diff --git a/tests/intel/gem_bad_reloc.c b/tests/intel/i915_gem_bad_reloc.c
similarity index 100%
rename from tests/intel/gem_bad_reloc.c
rename to tests/intel/i915_gem_bad_reloc.c
diff --git a/tests/intel/gem_barrier_race.c b/tests/intel/i915_gem_barrier_race.c
similarity index 100%
rename from tests/intel/gem_barrier_race.c
rename to tests/intel/i915_gem_barrier_race.c
diff --git a/tests/intel/gem_basic.c b/tests/intel/i915_gem_basic.c
similarity index 100%
rename from tests/intel/gem_basic.c
rename to tests/intel/i915_gem_basic.c
diff --git a/tests/intel/gem_blits.c b/tests/intel/i915_gem_blits.c
similarity index 100%
rename from tests/intel/gem_blits.c
rename to tests/intel/i915_gem_blits.c
diff --git a/tests/intel/gem_busy.c b/tests/intel/i915_gem_busy.c
similarity index 100%
rename from tests/intel/gem_busy.c
rename to tests/intel/i915_gem_busy.c
diff --git a/tests/intel/gem_caching.c b/tests/intel/i915_gem_caching.c
similarity index 100%
rename from tests/intel/gem_caching.c
rename to tests/intel/i915_gem_caching.c
diff --git a/tests/intel/gem_ccs.c b/tests/intel/i915_gem_ccs.c
similarity index 100%
rename from tests/intel/gem_ccs.c
rename to tests/intel/i915_gem_ccs.c
diff --git a/tests/intel/gem_close.c b/tests/intel/i915_gem_close.c
similarity index 100%
rename from tests/intel/gem_close.c
rename to tests/intel/i915_gem_close.c
diff --git a/tests/intel/gem_close_race.c b/tests/intel/i915_gem_close_race.c
similarity index 100%
rename from tests/intel/gem_close_race.c
rename to tests/intel/i915_gem_close_race.c
diff --git a/tests/intel/gem_concurrent_all.c b/tests/intel/i915_gem_concurrent_all.c
similarity index 100%
rename from tests/intel/gem_concurrent_all.c
rename to tests/intel/i915_gem_concurrent_all.c
diff --git a/tests/intel/gem_concurrent_blit.c b/tests/intel/i915_gem_concurrent_blit.c
similarity index 91%
rename from tests/intel/gem_concurrent_blit.c
rename to tests/intel/i915_gem_concurrent_blit.c
index 513de4a1b..03b1483cb 100644
--- a/tests/intel/gem_concurrent_blit.c
+++ b/tests/intel/i915_gem_concurrent_blit.c
@@ -5,4 +5,4 @@
 /* available subtests. This avoids the use of           */
 /* non-standard command line parameters which can cause */
 /* problems for automated testing */
-#include "gem_concurrent_all.c"
+#include "i915_gem_concurrent_all.c"
diff --git a/tests/intel/gem_create.c b/tests/intel/i915_gem_create.c
similarity index 100%
rename from tests/intel/gem_create.c
rename to tests/intel/i915_gem_create.c
diff --git a/tests/intel/gem_cs_tlb.c b/tests/intel/i915_gem_cs_tlb.c
similarity index 100%
rename from tests/intel/gem_cs_tlb.c
rename to tests/intel/i915_gem_cs_tlb.c
diff --git a/tests/intel/gem_ctx_bad_destroy.c b/tests/intel/i915_gem_ctx_bad_destroy.c
similarity index 100%
rename from tests/intel/gem_ctx_bad_destroy.c
rename to tests/intel/i915_gem_ctx_bad_destroy.c
diff --git a/tests/intel/gem_ctx_create.c b/tests/intel/i915_gem_ctx_create.c
similarity index 100%
rename from tests/intel/gem_ctx_create.c
rename to tests/intel/i915_gem_ctx_create.c
diff --git a/tests/intel/gem_ctx_engines.c b/tests/intel/i915_gem_ctx_engines.c
similarity index 100%
rename from tests/intel/gem_ctx_engines.c
rename to tests/intel/i915_gem_ctx_engines.c
diff --git a/tests/intel/gem_ctx_exec.c b/tests/intel/i915_gem_ctx_exec.c
similarity index 100%
rename from tests/intel/gem_ctx_exec.c
rename to tests/intel/i915_gem_ctx_exec.c
diff --git a/tests/intel/gem_ctx_freq.c b/tests/intel/i915_gem_ctx_freq.c
similarity index 100%
rename from tests/intel/gem_ctx_freq.c
rename to tests/intel/i915_gem_ctx_freq.c
diff --git a/tests/intel/gem_ctx_isolation.c b/tests/intel/i915_gem_ctx_isolation.c
similarity index 100%
rename from tests/intel/gem_ctx_isolation.c
rename to tests/intel/i915_gem_ctx_isolation.c
diff --git a/tests/intel/gem_ctx_param.c b/tests/intel/i915_gem_ctx_param.c
similarity index 100%
rename from tests/intel/gem_ctx_param.c
rename to tests/intel/i915_gem_ctx_param.c
diff --git a/tests/intel/gem_ctx_persistence.c b/tests/intel/i915_gem_ctx_persistence.c
similarity index 100%
rename from tests/intel/gem_ctx_persistence.c
rename to tests/intel/i915_gem_ctx_persistence.c
diff --git a/tests/intel/gem_ctx_shared.c b/tests/intel/i915_gem_ctx_shared.c
similarity index 100%
rename from tests/intel/gem_ctx_shared.c
rename to tests/intel/i915_gem_ctx_shared.c
diff --git a/tests/intel/gem_ctx_sseu.c b/tests/intel/i915_gem_ctx_sseu.c
similarity index 100%
rename from tests/intel/gem_ctx_sseu.c
rename to tests/intel/i915_gem_ctx_sseu.c
diff --git a/tests/intel/gem_ctx_switch.c b/tests/intel/i915_gem_ctx_switch.c
similarity index 100%
rename from tests/intel/gem_ctx_switch.c
rename to tests/intel/i915_gem_ctx_switch.c
diff --git a/tests/intel/gem_eio.c b/tests/intel/i915_gem_eio.c
similarity index 100%
rename from tests/intel/gem_eio.c
rename to tests/intel/i915_gem_eio.c
diff --git a/tests/intel/gem_evict_alignment.c b/tests/intel/i915_gem_evict_alignment.c
similarity index 100%
rename from tests/intel/gem_evict_alignment.c
rename to tests/intel/i915_gem_evict_alignment.c
diff --git a/tests/intel/gem_evict_everything.c b/tests/intel/i915_gem_evict_everything.c
similarity index 100%
rename from tests/intel/gem_evict_everything.c
rename to tests/intel/i915_gem_evict_everything.c
diff --git a/tests/intel/gem_exec_alignment.c b/tests/intel/i915_gem_exec_alignment.c
similarity index 100%
rename from tests/intel/gem_exec_alignment.c
rename to tests/intel/i915_gem_exec_alignment.c
diff --git a/tests/intel/gem_exec_async.c b/tests/intel/i915_gem_exec_async.c
similarity index 100%
rename from tests/intel/gem_exec_async.c
rename to tests/intel/i915_gem_exec_async.c
diff --git a/tests/intel/gem_exec_await.c b/tests/intel/i915_gem_exec_await.c
similarity index 100%
rename from tests/intel/gem_exec_await.c
rename to tests/intel/i915_gem_exec_await.c
diff --git a/tests/intel/gem_exec_balancer.c b/tests/intel/i915_gem_exec_balancer.c
similarity index 100%
rename from tests/intel/gem_exec_balancer.c
rename to tests/intel/i915_gem_exec_balancer.c
diff --git a/tests/intel/gem_exec_basic.c b/tests/intel/i915_gem_exec_basic.c
similarity index 100%
rename from tests/intel/gem_exec_basic.c
rename to tests/intel/i915_gem_exec_basic.c
diff --git a/tests/intel/gem_exec_big.c b/tests/intel/i915_gem_exec_big.c
similarity index 100%
rename from tests/intel/gem_exec_big.c
rename to tests/intel/i915_gem_exec_big.c
diff --git a/tests/intel/gem_exec_capture.c b/tests/intel/i915_gem_exec_capture.c
similarity index 100%
rename from tests/intel/gem_exec_capture.c
rename to tests/intel/i915_gem_exec_capture.c
diff --git a/tests/intel/gem_exec_create.c b/tests/intel/i915_gem_exec_create.c
similarity index 100%
rename from tests/intel/gem_exec_create.c
rename to tests/intel/i915_gem_exec_create.c
diff --git a/tests/intel/gem_exec_endless.c b/tests/intel/i915_gem_exec_endless.c
similarity index 100%
rename from tests/intel/gem_exec_endless.c
rename to tests/intel/i915_gem_exec_endless.c
diff --git a/tests/intel/gem_exec_fair.c b/tests/intel/i915_gem_exec_fair.c
similarity index 100%
rename from tests/intel/gem_exec_fair.c
rename to tests/intel/i915_gem_exec_fair.c
diff --git a/tests/intel/gem_exec_fence.c b/tests/intel/i915_gem_exec_fence.c
similarity index 100%
rename from tests/intel/gem_exec_fence.c
rename to tests/intel/i915_gem_exec_fence.c
diff --git a/tests/intel/gem_exec_flush.c b/tests/intel/i915_gem_exec_flush.c
similarity index 100%
rename from tests/intel/gem_exec_flush.c
rename to tests/intel/i915_gem_exec_flush.c
diff --git a/tests/intel/gem_exec_gttfill.c b/tests/intel/i915_gem_exec_gttfill.c
similarity index 100%
rename from tests/intel/gem_exec_gttfill.c
rename to tests/intel/i915_gem_exec_gttfill.c
diff --git a/tests/intel/gem_exec_latency.c b/tests/intel/i915_gem_exec_latency.c
similarity index 100%
rename from tests/intel/gem_exec_latency.c
rename to tests/intel/i915_gem_exec_latency.c
diff --git a/tests/intel/gem_exec_lut_handle.c b/tests/intel/i915_gem_exec_lut_handle.c
similarity index 100%
rename from tests/intel/gem_exec_lut_handle.c
rename to tests/intel/i915_gem_exec_lut_handle.c
diff --git a/tests/intel/gem_exec_nop.c b/tests/intel/i915_gem_exec_nop.c
similarity index 100%
rename from tests/intel/gem_exec_nop.c
rename to tests/intel/i915_gem_exec_nop.c
diff --git a/tests/intel/gem_exec_parallel.c b/tests/intel/i915_gem_exec_parallel.c
similarity index 100%
rename from tests/intel/gem_exec_parallel.c
rename to tests/intel/i915_gem_exec_parallel.c
diff --git a/tests/intel/gem_exec_params.c b/tests/intel/i915_gem_exec_params.c
similarity index 100%
rename from tests/intel/gem_exec_params.c
rename to tests/intel/i915_gem_exec_params.c
diff --git a/tests/intel/gem_exec_reloc.c b/tests/intel/i915_gem_exec_reloc.c
similarity index 100%
rename from tests/intel/gem_exec_reloc.c
rename to tests/intel/i915_gem_exec_reloc.c
diff --git a/tests/intel/gem_exec_schedule.c b/tests/intel/i915_gem_exec_schedule.c
similarity index 100%
rename from tests/intel/gem_exec_schedule.c
rename to tests/intel/i915_gem_exec_schedule.c
diff --git a/tests/intel/gem_exec_store.c b/tests/intel/i915_gem_exec_store.c
similarity index 100%
rename from tests/intel/gem_exec_store.c
rename to tests/intel/i915_gem_exec_store.c
diff --git a/tests/intel/gem_exec_suspend.c b/tests/intel/i915_gem_exec_suspend.c
similarity index 100%
rename from tests/intel/gem_exec_suspend.c
rename to tests/intel/i915_gem_exec_suspend.c
diff --git a/tests/intel/gem_exec_whisper.c b/tests/intel/i915_gem_exec_whisper.c
similarity index 100%
rename from tests/intel/gem_exec_whisper.c
rename to tests/intel/i915_gem_exec_whisper.c
diff --git a/tests/intel/gem_exercise_blt.c b/tests/intel/i915_gem_exercise_blt.c
similarity index 100%
rename from tests/intel/gem_exercise_blt.c
rename to tests/intel/i915_gem_exercise_blt.c
diff --git a/tests/intel/gem_fd_exhaustion.c b/tests/intel/i915_gem_fd_exhaustion.c
similarity index 100%
rename from tests/intel/gem_fd_exhaustion.c
rename to tests/intel/i915_gem_fd_exhaustion.c
diff --git a/tests/intel/gem_fence_thrash.c b/tests/intel/i915_gem_fence_thrash.c
similarity index 100%
rename from tests/intel/gem_fence_thrash.c
rename to tests/intel/i915_gem_fence_thrash.c
diff --git a/tests/intel/gem_fence_upload.c b/tests/intel/i915_gem_fence_upload.c
similarity index 100%
rename from tests/intel/gem_fence_upload.c
rename to tests/intel/i915_gem_fence_upload.c
diff --git a/tests/intel/gem_fenced_exec_thrash.c b/tests/intel/i915_gem_fenced_exec_thrash.c
similarity index 100%
rename from tests/intel/gem_fenced_exec_thrash.c
rename to tests/intel/i915_gem_fenced_exec_thrash.c
diff --git a/tests/intel/gem_flink_basic.c b/tests/intel/i915_gem_flink_basic.c
similarity index 100%
rename from tests/intel/gem_flink_basic.c
rename to tests/intel/i915_gem_flink_basic.c
diff --git a/tests/intel/gem_flink_race.c b/tests/intel/i915_gem_flink_race.c
similarity index 100%
rename from tests/intel/gem_flink_race.c
rename to tests/intel/i915_gem_flink_race.c
diff --git a/tests/intel/gem_gpgpu_fill.c b/tests/intel/i915_gem_gpgpu_fill.c
similarity index 100%
rename from tests/intel/gem_gpgpu_fill.c
rename to tests/intel/i915_gem_gpgpu_fill.c
diff --git a/tests/intel/gem_gtt_cpu_tlb.c b/tests/intel/i915_gem_gtt_cpu_tlb.c
similarity index 100%
rename from tests/intel/gem_gtt_cpu_tlb.c
rename to tests/intel/i915_gem_gtt_cpu_tlb.c
diff --git a/tests/intel/gem_gtt_hog.c b/tests/intel/i915_gem_gtt_hog.c
similarity index 100%
rename from tests/intel/gem_gtt_hog.c
rename to tests/intel/i915_gem_gtt_hog.c
diff --git a/tests/intel/gem_gtt_speed.c b/tests/intel/i915_gem_gtt_speed.c
similarity index 100%
rename from tests/intel/gem_gtt_speed.c
rename to tests/intel/i915_gem_gtt_speed.c
diff --git a/tests/intel/gem_huc_copy.c b/tests/intel/i915_gem_huc_copy.c
similarity index 100%
rename from tests/intel/gem_huc_copy.c
rename to tests/intel/i915_gem_huc_copy.c
diff --git a/tests/intel/gem_linear_blits.c b/tests/intel/i915_gem_linear_blits.c
similarity index 100%
rename from tests/intel/gem_linear_blits.c
rename to tests/intel/i915_gem_linear_blits.c
diff --git a/tests/intel/gem_lmem_evict.c b/tests/intel/i915_gem_lmem_evict.c
similarity index 100%
rename from tests/intel/gem_lmem_evict.c
rename to tests/intel/i915_gem_lmem_evict.c
diff --git a/tests/intel/gem_lmem_swapping.c b/tests/intel/i915_gem_lmem_swapping.c
similarity index 100%
rename from tests/intel/gem_lmem_swapping.c
rename to tests/intel/i915_gem_lmem_swapping.c
diff --git a/tests/intel/gem_lut_handle.c b/tests/intel/i915_gem_lut_handle.c
similarity index 100%
rename from tests/intel/gem_lut_handle.c
rename to tests/intel/i915_gem_lut_handle.c
diff --git a/tests/intel/gem_madvise.c b/tests/intel/i915_gem_madvise.c
similarity index 100%
rename from tests/intel/gem_madvise.c
rename to tests/intel/i915_gem_madvise.c
diff --git a/tests/intel/gem_media_fill.c b/tests/intel/i915_gem_media_fill.c
similarity index 100%
rename from tests/intel/gem_media_fill.c
rename to tests/intel/i915_gem_media_fill.c
diff --git a/tests/intel/gem_media_vme.c b/tests/intel/i915_gem_media_vme.c
similarity index 100%
rename from tests/intel/gem_media_vme.c
rename to tests/intel/i915_gem_media_vme.c
diff --git a/tests/intel/gem_mmap.c b/tests/intel/i915_gem_mmap.c
similarity index 100%
rename from tests/intel/gem_mmap.c
rename to tests/intel/i915_gem_mmap.c
diff --git a/tests/intel/gem_mmap_gtt.c b/tests/intel/i915_gem_mmap_gtt.c
similarity index 100%
rename from tests/intel/gem_mmap_gtt.c
rename to tests/intel/i915_gem_mmap_gtt.c
diff --git a/tests/intel/gem_mmap_offset.c b/tests/intel/i915_gem_mmap_offset.c
similarity index 100%
rename from tests/intel/gem_mmap_offset.c
rename to tests/intel/i915_gem_mmap_offset.c
diff --git a/tests/intel/gem_mmap_wc.c b/tests/intel/i915_gem_mmap_wc.c
similarity index 100%
rename from tests/intel/gem_mmap_wc.c
rename to tests/intel/i915_gem_mmap_wc.c
diff --git a/tests/intel/gem_partial_pwrite_pread.c b/tests/intel/i915_gem_partial_pwrite_pread.c
similarity index 100%
rename from tests/intel/gem_partial_pwrite_pread.c
rename to tests/intel/i915_gem_partial_pwrite_pread.c
diff --git a/tests/intel/gem_pipe_control_store_loop.c b/tests/intel/i915_gem_pipe_control_store_loop.c
similarity index 100%
rename from tests/intel/gem_pipe_control_store_loop.c
rename to tests/intel/i915_gem_pipe_control_store_loop.c
diff --git a/tests/intel/gem_ppgtt.c b/tests/intel/i915_gem_ppgtt.c
similarity index 100%
rename from tests/intel/gem_ppgtt.c
rename to tests/intel/i915_gem_ppgtt.c
diff --git a/tests/intel/gem_pread.c b/tests/intel/i915_gem_pread.c
similarity index 100%
rename from tests/intel/gem_pread.c
rename to tests/intel/i915_gem_pread.c
diff --git a/tests/intel/gem_pread_after_blit.c b/tests/intel/i915_gem_pread_after_blit.c
similarity index 100%
rename from tests/intel/gem_pread_after_blit.c
rename to tests/intel/i915_gem_pread_after_blit.c
diff --git a/tests/intel/gem_pwrite.c b/tests/intel/i915_gem_pwrite.c
similarity index 100%
rename from tests/intel/gem_pwrite.c
rename to tests/intel/i915_gem_pwrite.c
diff --git a/tests/intel/gem_pwrite_snooped.c b/tests/intel/i915_gem_pwrite_snooped.c
similarity index 100%
rename from tests/intel/gem_pwrite_snooped.c
rename to tests/intel/i915_gem_pwrite_snooped.c
diff --git a/tests/intel/gem_pxp.c b/tests/intel/i915_gem_pxp.c
similarity index 100%
rename from tests/intel/gem_pxp.c
rename to tests/intel/i915_gem_pxp.c
diff --git a/tests/intel/gem_read_read_speed.c b/tests/intel/i915_gem_read_read_speed.c
similarity index 100%
rename from tests/intel/gem_read_read_speed.c
rename to tests/intel/i915_gem_read_read_speed.c
diff --git a/tests/intel/gem_readwrite.c b/tests/intel/i915_gem_readwrite.c
similarity index 100%
rename from tests/intel/gem_readwrite.c
rename to tests/intel/i915_gem_readwrite.c
diff --git a/tests/intel/gem_reg_read.c b/tests/intel/i915_gem_reg_read.c
similarity index 100%
rename from tests/intel/gem_reg_read.c
rename to tests/intel/i915_gem_reg_read.c
diff --git a/tests/intel/gem_render_copy.c b/tests/intel/i915_gem_render_copy.c
similarity index 100%
rename from tests/intel/gem_render_copy.c
rename to tests/intel/i915_gem_render_copy.c
diff --git a/tests/intel/gem_render_copy_redux.c b/tests/intel/i915_gem_render_copy_redux.c
similarity index 100%
rename from tests/intel/gem_render_copy_redux.c
rename to tests/intel/i915_gem_render_copy_redux.c
diff --git a/tests/intel/gem_render_linear_blits.c b/tests/intel/i915_gem_render_linear_blits.c
similarity index 100%
rename from tests/intel/gem_render_linear_blits.c
rename to tests/intel/i915_gem_render_linear_blits.c
diff --git a/tests/intel/gem_render_tiled_blits.c b/tests/intel/i915_gem_render_tiled_blits.c
similarity index 100%
rename from tests/intel/gem_render_tiled_blits.c
rename to tests/intel/i915_gem_render_tiled_blits.c
diff --git a/tests/intel/gem_request_retire.c b/tests/intel/i915_gem_request_retire.c
similarity index 100%
rename from tests/intel/gem_request_retire.c
rename to tests/intel/i915_gem_request_retire.c
diff --git a/tests/intel/gem_reset_stats.c b/tests/intel/i915_gem_reset_stats.c
similarity index 100%
rename from tests/intel/gem_reset_stats.c
rename to tests/intel/i915_gem_reset_stats.c
diff --git a/tests/intel/gem_ringfill.c b/tests/intel/i915_gem_ringfill.c
similarity index 100%
rename from tests/intel/gem_ringfill.c
rename to tests/intel/i915_gem_ringfill.c
diff --git a/tests/intel/gem_set_tiling_vs_blt.c b/tests/intel/i915_gem_set_tiling_vs_blt.c
similarity index 100%
rename from tests/intel/gem_set_tiling_vs_blt.c
rename to tests/intel/i915_gem_set_tiling_vs_blt.c
diff --git a/tests/intel/gem_set_tiling_vs_gtt.c b/tests/intel/i915_gem_set_tiling_vs_gtt.c
similarity index 100%
rename from tests/intel/gem_set_tiling_vs_gtt.c
rename to tests/intel/i915_gem_set_tiling_vs_gtt.c
diff --git a/tests/intel/gem_set_tiling_vs_pwrite.c b/tests/intel/i915_gem_set_tiling_vs_pwrite.c
similarity index 100%
rename from tests/intel/gem_set_tiling_vs_pwrite.c
rename to tests/intel/i915_gem_set_tiling_vs_pwrite.c
diff --git a/tests/intel/gem_shrink.c b/tests/intel/i915_gem_shrink.c
similarity index 100%
rename from tests/intel/gem_shrink.c
rename to tests/intel/i915_gem_shrink.c
diff --git a/tests/intel/gem_softpin.c b/tests/intel/i915_gem_softpin.c
similarity index 100%
rename from tests/intel/gem_softpin.c
rename to tests/intel/i915_gem_softpin.c
diff --git a/tests/intel/gem_spin_batch.c b/tests/intel/i915_gem_spin_batch.c
similarity index 100%
rename from tests/intel/gem_spin_batch.c
rename to tests/intel/i915_gem_spin_batch.c
diff --git a/tests/intel/gem_streaming_writes.c b/tests/intel/i915_gem_streaming_writes.c
similarity index 100%
rename from tests/intel/gem_streaming_writes.c
rename to tests/intel/i915_gem_streaming_writes.c
diff --git a/tests/intel/gem_stress.c b/tests/intel/i915_gem_stress.c
similarity index 100%
rename from tests/intel/gem_stress.c
rename to tests/intel/i915_gem_stress.c
diff --git a/tests/intel/gem_sync.c b/tests/intel/i915_gem_sync.c
similarity index 100%
rename from tests/intel/gem_sync.c
rename to tests/intel/i915_gem_sync.c
diff --git a/tests/intel/gem_tiled_blits.c b/tests/intel/i915_gem_tiled_blits.c
similarity index 100%
rename from tests/intel/gem_tiled_blits.c
rename to tests/intel/i915_gem_tiled_blits.c
diff --git a/tests/intel/gem_tiled_fence_blits.c b/tests/intel/i915_gem_tiled_fence_blits.c
similarity index 100%
rename from tests/intel/gem_tiled_fence_blits.c
rename to tests/intel/i915_gem_tiled_fence_blits.c
diff --git a/tests/intel/gem_tiled_partial_pwrite_pread.c b/tests/intel/i915_gem_tiled_partial_pwrite_pread.c
similarity index 100%
rename from tests/intel/gem_tiled_partial_pwrite_pread.c
rename to tests/intel/i915_gem_tiled_partial_pwrite_pread.c
diff --git a/tests/intel/gem_tiled_pread_basic.c b/tests/intel/i915_gem_tiled_pread_basic.c
similarity index 100%
rename from tests/intel/gem_tiled_pread_basic.c
rename to tests/intel/i915_gem_tiled_pread_basic.c
diff --git a/tests/intel/gem_tiled_pread_pwrite.c b/tests/intel/i915_gem_tiled_pread_pwrite.c
similarity index 100%
rename from tests/intel/gem_tiled_pread_pwrite.c
rename to tests/intel/i915_gem_tiled_pread_pwrite.c
diff --git a/tests/intel/gem_tiled_swapping.c b/tests/intel/i915_gem_tiled_swapping.c
similarity index 100%
rename from tests/intel/gem_tiled_swapping.c
rename to tests/intel/i915_gem_tiled_swapping.c
diff --git a/tests/intel/gem_tiled_wb.c b/tests/intel/i915_gem_tiled_wb.c
similarity index 100%
rename from tests/intel/gem_tiled_wb.c
rename to tests/intel/i915_gem_tiled_wb.c
diff --git a/tests/intel/gem_tiled_wc.c b/tests/intel/i915_gem_tiled_wc.c
similarity index 100%
rename from tests/intel/gem_tiled_wc.c
rename to tests/intel/i915_gem_tiled_wc.c
diff --git a/tests/intel/gem_tiling_max_stride.c b/tests/intel/i915_gem_tiling_max_stride.c
similarity index 100%
rename from tests/intel/gem_tiling_max_stride.c
rename to tests/intel/i915_gem_tiling_max_stride.c
diff --git a/tests/intel/gem_unfence_active_buffers.c b/tests/intel/i915_gem_unfence_active_buffers.c
similarity index 100%
rename from tests/intel/gem_unfence_active_buffers.c
rename to tests/intel/i915_gem_unfence_active_buffers.c
diff --git a/tests/intel/gem_unref_active_buffers.c b/tests/intel/i915_gem_unref_active_buffers.c
similarity index 100%
rename from tests/intel/gem_unref_active_buffers.c
rename to tests/intel/i915_gem_unref_active_buffers.c
diff --git a/tests/intel/gem_userptr_blits.c b/tests/intel/i915_gem_userptr_blits.c
similarity index 100%
rename from tests/intel/gem_userptr_blits.c
rename to tests/intel/i915_gem_userptr_blits.c
diff --git a/tests/intel/gem_vm_create.c b/tests/intel/i915_gem_vm_create.c
similarity index 100%
rename from tests/intel/gem_vm_create.c
rename to tests/intel/i915_gem_vm_create.c
diff --git a/tests/intel/gem_wait.c b/tests/intel/i915_gem_wait.c
similarity index 100%
rename from tests/intel/gem_wait.c
rename to tests/intel/i915_gem_wait.c
diff --git a/tests/intel/gem_watchdog.c b/tests/intel/i915_gem_watchdog.c
similarity index 100%
rename from tests/intel/gem_watchdog.c
rename to tests/intel/i915_gem_watchdog.c
diff --git a/tests/intel/gem_workarounds.c b/tests/intel/i915_gem_workarounds.c
similarity index 100%
rename from tests/intel/gem_workarounds.c
rename to tests/intel/i915_gem_workarounds.c
diff --git a/tests/intel/gen3_mixed_blits.c b/tests/intel/i915_gen3_mixed_blits.c
similarity index 100%
rename from tests/intel/gen3_mixed_blits.c
rename to tests/intel/i915_gen3_mixed_blits.c
diff --git a/tests/intel/gen3_render_linear_blits.c b/tests/intel/i915_gen3_render_linear_blits.c
similarity index 100%
rename from tests/intel/gen3_render_linear_blits.c
rename to tests/intel/i915_gen3_render_linear_blits.c
diff --git a/tests/intel/gen3_render_mixed_blits.c b/tests/intel/i915_gen3_render_mixed_blits.c
similarity index 100%
rename from tests/intel/gen3_render_mixed_blits.c
rename to tests/intel/i915_gen3_render_mixed_blits.c
diff --git a/tests/intel/gen3_render_tiledx_blits.c b/tests/intel/i915_gen3_render_tiledx_blits.c
similarity index 100%
rename from tests/intel/gen3_render_tiledx_blits.c
rename to tests/intel/i915_gen3_render_tiledx_blits.c
diff --git a/tests/intel/gen3_render_tiledy_blits.c b/tests/intel/i915_gen3_render_tiledy_blits.c
similarity index 100%
rename from tests/intel/gen3_render_tiledy_blits.c
rename to tests/intel/i915_gen3_render_tiledy_blits.c
diff --git a/tests/intel/gen7_exec_parse.c b/tests/intel/i915_gen7_exec_parse.c
similarity index 100%
rename from tests/intel/gen7_exec_parse.c
rename to tests/intel/i915_gen7_exec_parse.c
diff --git a/tests/intel/gen9_exec_parse.c b/tests/intel/i915_gen9_exec_parse.c
similarity index 100%
rename from tests/intel/gen9_exec_parse.c
rename to tests/intel/i915_gen9_exec_parse.c
diff --git a/tests/intel/perf.c b/tests/intel/i915_perf.c
similarity index 100%
rename from tests/intel/perf.c
rename to tests/intel/i915_perf.c
diff --git a/tests/intel/perf_pmu.c b/tests/intel/i915_perf_pmu.c
similarity index 100%
rename from tests/intel/perf_pmu.c
rename to tests/intel/i915_perf_pmu.c
diff --git a/tests/intel/prime_busy.c b/tests/intel/i915_prime_busy.c
similarity index 100%
rename from tests/intel/prime_busy.c
rename to tests/intel/i915_prime_busy.c
diff --git a/tests/intel/prime_mmap.c b/tests/intel/i915_prime_mmap.c
similarity index 100%
rename from tests/intel/prime_mmap.c
rename to tests/intel/i915_prime_mmap.c
diff --git a/tests/intel/prime_mmap_coherency.c b/tests/intel/i915_prime_mmap_coherency.c
similarity index 100%
rename from tests/intel/prime_mmap_coherency.c
rename to tests/intel/i915_prime_mmap_coherency.c
diff --git a/tests/intel/prime_mmap_kms.c b/tests/intel/i915_prime_mmap_kms.c
similarity index 100%
rename from tests/intel/prime_mmap_kms.c
rename to tests/intel/i915_prime_mmap_kms.c
diff --git a/tests/intel/prime_self_import.c b/tests/intel/i915_prime_self_import.c
similarity index 100%
rename from tests/intel/prime_self_import.c
rename to tests/intel/i915_prime_self_import.c
diff --git a/tests/intel/sysfs_defaults.c b/tests/intel/i915_sysfs_defaults.c
similarity index 100%
rename from tests/intel/sysfs_defaults.c
rename to tests/intel/i915_sysfs_defaults.c
diff --git a/tests/intel/sysfs_heartbeat_interval.c b/tests/intel/i915_sysfs_heartbeat_interval.c
similarity index 100%
rename from tests/intel/sysfs_heartbeat_interval.c
rename to tests/intel/i915_sysfs_heartbeat_interval.c
diff --git a/tests/intel/sysfs_preempt_timeout.c b/tests/intel/i915_sysfs_preempt_timeout.c
similarity index 100%
rename from tests/intel/sysfs_preempt_timeout.c
rename to tests/intel/i915_sysfs_preempt_timeout.c
diff --git a/tests/intel/sysfs_timeslice_duration.c b/tests/intel/i915_sysfs_timeslice_duration.c
similarity index 100%
rename from tests/intel/sysfs_timeslice_duration.c
rename to tests/intel/i915_sysfs_timeslice_duration.c
diff --git a/tests/intel/i915_test_config.json b/tests/intel/i915_test_config.json
index c15ef2580..43b831262 100644
--- a/tests/intel/i915_test_config.json
+++ b/tests/intel/i915_test_config.json
@@ -7,12 +7,10 @@
                "../core_setmaster_vs_auth.c", "../debugfs_test.c",
                "../device_reset.c", "../dmabuf.c",
                "../drm_import_export.c", "../drm_mm.c",
-               "../dumb_buffer.c", "../prime_busy.c", "../prime_mmap.c",
-               "../prime_mmap_coherency.c", "../prime_self_import.c",
-               "../prime_vgem.c", "../sw_sync.c", "../syncobj_basic.c",
-               "../syncobj_timeline.c", "../syncobj_wait.c",
+               "../dumb_buffer.c", "../prime_vgem.c", "../sw_sync.c",
+               "../syncobj_basic.c", "../syncobj_timeline.c", "../syncobj_wait.c",
                "../vgem_basic.c", "../vgem_slow.c" ],
-    "exclude_files": [ "kms_*", "gem_concurrent_all.c", "gem_concurrent_blit.c",
+    "exclude_files": [ "kms_*", "i915_gem_concurrent_all.c", "i915_gem_concurrent_blit.c",
                        "xe_*" ],
     "fields": {
 	"Mega feature": {
diff --git a/tests/intel/api_intel_allocator.c b/tests/intel/intel_api_intel_allocator.c
similarity index 100%
rename from tests/intel/api_intel_allocator.c
rename to tests/intel/intel_api_intel_allocator.c
diff --git a/tests/meson.build b/tests/meson.build
index aa27fd9af..3613eb627 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -83,165 +83,165 @@ test_progs = [
 ]
 
 intel_i915_xe_progs = [
-	'api_intel_allocator',
+	'intel_api_intel_allocator',
 ]
 
 intel_i915_progs = [
-	'api_intel_bb',
-	'debugfs_test',
-	'drm_fdinfo',
-	'gen3_mixed_blits',
-	'gen3_render_linear_blits',
-	'gen3_render_mixed_blits',
-	'gen3_render_tiledx_blits',
-	'gen3_render_tiledy_blits',
-	'gem_bad_reloc',
-	'gem_barrier_race',
-	'gem_basic',
-	'gem_blits',
-	'gem_busy',
-	'gem_caching',
-	'gem_create',
-	'gem_ccs',
-	'gem_close',
-	'gem_close_race',
-	'gem_concurrent_blit',
-	'gem_cs_tlb',
-	'gem_ctx_bad_destroy',
-	'gem_ctx_create',
-	'gem_ctx_engines',
-	'gem_ctx_exec',
-	'gem_ctx_freq',
-	'gem_ctx_isolation',
-	'gem_ctx_param',
-	'gem_ctx_persistence',
-	'gem_ctx_shared',
-	'gem_ctx_sseu',
-	'gem_ctx_switch',
-	'gem_eio',
-	'gem_evict_alignment',
-	'gem_evict_everything',
-	'gem_exec_alignment',
-	'gem_exec_async',
-	'gem_exec_await',
-	'gem_exec_balancer',
-	'gem_exec_basic',
-	'gem_exec_big',
-	'gem_exec_capture',
-	'gem_exec_create',
-	'gem_exec_endless',
-	'gem_exec_fair',
-	'gem_exec_fence',
-	'gem_exec_flush',
-	'gem_exec_gttfill',
-	'gem_exec_latency',
-	'gem_exec_lut_handle',
-	'gem_exec_nop',
-	'gem_exec_parallel',
-	'gem_exec_params',
-	'gem_exercise_blt',
-	'gen7_exec_parse',
-	'gen9_exec_parse',
-	'gem_exec_reloc',
-	'gem_exec_schedule',
-	'gem_exec_store',
-	'gem_exec_suspend',
-	'gem_exec_whisper',
-	'gem_fd_exhaustion',
-	'gem_fence_thrash',
-	'gem_fence_upload',
-	'gem_fenced_exec_thrash',
-	'gem_flink_basic',
-	'gem_flink_race',
-	'gem_gpgpu_fill',
-	'gem_gtt_cpu_tlb',
-	'gem_gtt_hog',
-	'gem_gtt_speed',
-	'gem_huc_copy',
-	'gem_linear_blits',
-	'gem_lmem_evict',
-	'gem_lmem_swapping',
-	'gem_lut_handle',
-	'gem_madvise',
-	'gem_media_fill',
-	'gem_media_vme',
-	'gem_mmap',
-	'gem_mmap_gtt',
-	'gem_mmap_offset',
-	'gem_mmap_wc',
-	'gem_partial_pwrite_pread',
-	'gem_pipe_control_store_loop',
-	'gem_ppgtt',
-	'gem_pread',
-	'gem_pread_after_blit',
-	'gem_pwrite',
-	'gem_pwrite_snooped',
-	'gem_pxp',
-	'gem_read_read_speed',
-	'gem_readwrite',
-	'gem_reg_read',
-	'gem_render_copy',
-	'gem_render_copy_redux',
-	'gem_render_linear_blits',
-	'gem_render_tiled_blits',
-	'gem_request_retire',
-	'gem_reset_stats',
-	'gem_ringfill',
-	'gem_set_tiling_vs_blt',
-	'gem_set_tiling_vs_gtt',
-	'gem_set_tiling_vs_pwrite',
-	'gem_shrink',
-	'gem_softpin',
-	'gem_spin_batch',
-	'gem_streaming_writes',
-	'gem_sync',
-	'gem_tiled_blits',
-	'gem_tiled_fence_blits',
-	'gem_tiled_partial_pwrite_pread',
-	'gem_tiled_pread_basic',
-	'gem_tiled_pread_pwrite',
-	'gem_tiled_swapping',
-	'gem_tiled_wb',
-	'gem_tiled_wc',
-	'gem_tiling_max_stride',
-	'gem_unfence_active_buffers',
-	'gem_unref_active_buffers',
-	'gem_userptr_blits',
-	'gem_vm_create',
-	'gem_wait',
-	'gem_watchdog',
-	'gem_workarounds',
-	'perf',
-	'perf_pmu',
+	'i915_api_intel_bb',
+	'i915_debugfs_test',
+	'i915_drm_fdinfo',
 	'i915_fb_tiling',
+	'i915_gem_bad_reloc',
+	'i915_gem_barrier_race',
+	'i915_gem_basic',
+	'i915_gem_blits',
+	'i915_gem_busy',
+	'i915_gem_caching',
+	'i915_gem_ccs',
+	'i915_gem_close',
+	'i915_gem_close_race',
+	'i915_gem_concurrent_blit',
+	'i915_gem_create',
+	'i915_gem_cs_tlb',
+	'i915_gem_ctx_bad_destroy',
+	'i915_gem_ctx_create',
+	'i915_gem_ctx_engines',
+	'i915_gem_ctx_exec',
+	'i915_gem_ctx_freq',
+	'i915_gem_ctx_isolation',
+	'i915_gem_ctx_param',
+	'i915_gem_ctx_persistence',
+	'i915_gem_ctx_shared',
+	'i915_gem_ctx_sseu',
+	'i915_gem_ctx_switch',
+	'i915_gem_eio',
+	'i915_gem_evict_alignment',
+	'i915_gem_evict_everything',
+	'i915_gem_exec_alignment',
+	'i915_gem_exec_async',
+	'i915_gem_exec_await',
+	'i915_gem_exec_balancer',
+	'i915_gem_exec_basic',
+	'i915_gem_exec_big',
+	'i915_gem_exec_capture',
+	'i915_gem_exec_create',
+	'i915_gem_exec_endless',
+	'i915_gem_exec_fair',
+	'i915_gem_exec_fence',
+	'i915_gem_exec_flush',
+	'i915_gem_exec_gttfill',
+	'i915_gem_exec_latency',
+	'i915_gem_exec_lut_handle',
+	'i915_gem_exec_nop',
+	'i915_gem_exec_parallel',
+	'i915_gem_exec_params',
+	'i915_gem_exec_reloc',
+	'i915_gem_exec_schedule',
+	'i915_gem_exec_store',
+	'i915_gem_exec_suspend',
+	'i915_gem_exec_whisper',
+	'i915_gem_exercise_blt',
+	'i915_gem_fd_exhaustion',
+	'i915_gem_fence_thrash',
+	'i915_gem_fence_upload',
+	'i915_gem_fenced_exec_thrash',
+	'i915_gem_flink_basic',
+	'i915_gem_flink_race',
+	'i915_gem_gpgpu_fill',
+	'i915_gem_gtt_cpu_tlb',
+	'i915_gem_gtt_hog',
+	'i915_gem_gtt_speed',
+	'i915_gem_huc_copy',
+	'i915_gem_linear_blits',
+	'i915_gem_lmem_evict',
+	'i915_gem_lmem_swapping',
+	'i915_gem_lut_handle',
+	'i915_gem_madvise',
+	'i915_gem_media_fill',
+	'i915_gem_media_vme',
+	'i915_gem_mmap',
+	'i915_gem_mmap_gtt',
+	'i915_gem_mmap_offset',
+	'i915_gem_mmap_wc',
+	'i915_gem_partial_pwrite_pread',
+	'i915_gem_pipe_control_store_loop',
+	'i915_gem_ppgtt',
+	'i915_gem_pread',
+	'i915_gem_pread_after_blit',
+	'i915_gem_pwrite',
+	'i915_gem_pwrite_snooped',
+	'i915_gem_pxp',
+	'i915_gem_read_read_speed',
+	'i915_gem_readwrite',
+	'i915_gem_reg_read',
+	'i915_gem_render_copy',
+	'i915_gem_render_copy_redux',
+	'i915_gem_render_linear_blits',
+	'i915_gem_render_tiled_blits',
+	'i915_gem_request_retire',
+	'i915_gem_reset_stats',
+	'i915_gem_ringfill',
+	'i915_gem_set_tiling_vs_blt',
+	'i915_gem_set_tiling_vs_gtt',
+	'i915_gem_set_tiling_vs_pwrite',
+	'i915_gem_shrink',
+	'i915_gem_softpin',
+	'i915_gem_spin_batch',
+	'i915_gem_streaming_writes',
+	'i915_gem_sync',
+	'i915_gem_tiled_blits',
+	'i915_gem_tiled_fence_blits',
+	'i915_gem_tiled_partial_pwrite_pread',
+	'i915_gem_tiled_pread_basic',
+	'i915_gem_tiled_pread_pwrite',
+	'i915_gem_tiled_swapping',
+	'i915_gem_tiled_wb',
+	'i915_gem_tiled_wc',
+	'i915_gem_tiling_max_stride',
+	'i915_gem_unfence_active_buffers',
+	'i915_gem_unref_active_buffers',
+	'i915_gem_userptr_blits',
+	'i915_gem_vm_create',
+	'i915_gem_wait',
+	'i915_gem_watchdog',
+	'i915_gem_workarounds',
+	'i915_gen3_mixed_blits',
+	'i915_gen3_render_linear_blits',
+	'i915_gen3_render_mixed_blits',
+	'i915_gen3_render_tiledx_blits',
+	'i915_gen3_render_tiledy_blits',
+	'i915_gen7_exec_parse',
+	'i915_gen9_exec_parse',
 	'i915_getparams_basic',
-	'i915_pm_freq_api',
 	'i915_hangman',
 	'i915_hwmon',
 	'i915_module_load',
 	'i915_pciid',
+	'i915_perf',
+	'i915_perf_pmu',
 	'i915_pipe_stress',
 	'i915_pm_backlight',
+	'i915_pm_dc',
+	'i915_pm_freq_api',
 	'i915_pm_freq_mult',
 	'i915_pm_lpsp',
-	'i915_pm_rpm',
-	'i915_pm_dc',
 	'i915_pm_rc6_residency',
+	'i915_pm_rpm',
 	'i915_pm_rps',
 	'i915_pm_sseu',
 	'i915_power',
+	'i915_prime_busy',
+	'i915_prime_mmap',
+	'i915_prime_mmap_coherency',
+	'i915_prime_mmap_kms',
+	'i915_prime_self_import',
 	'i915_query',
 	'i915_selftest',
 	'i915_suspend',
-	'prime_busy',
-	'prime_mmap',
-	'prime_mmap_coherency',
-	'prime_mmap_kms',
-	'prime_self_import',
-	'sysfs_defaults',
-	'sysfs_heartbeat_interval',
-	'sysfs_preempt_timeout',
-	'sysfs_timeslice_duration',
+	'i915_sysfs_defaults',
+	'i915_sysfs_heartbeat_interval',
+	'i915_sysfs_preempt_timeout',
+	'i915_sysfs_timeslice_duration',
 ]
 
 intel_kms_progs = [
@@ -353,19 +353,19 @@ extra_sources = {
 # Extra dependencies used on core and Intel drivers
 extra_dependencies = {
 	'core_hotunplug': [ lib_igt_i915_perf ],
-	'drm_fdinfo': [ lib_igt_drm_fdinfo ],
+	'i915_drm_fdinfo': [ lib_igt_drm_fdinfo ],
 	'dumb_buffer':  [ libatomic ],
-	'gem_barrier_race': [ lib_igt_i915_perf ],
-	'gem_create': [ libatomic ],
-	'gem_ctx_freq': [ lib_igt_perf ],
-	'gem_ctx_sseu': [ lib_igt_perf ],
-	'gem_eio': [ realtime ],
-	'gem_exec_balancer': [ lib_igt_perf ],
-	'gem_mmap_offset': [ libatomic ],
+	'i915_gem_barrier_race': [ lib_igt_i915_perf ],
+	'i915_gem_create': [ libatomic ],
+	'i915_gem_ctx_freq': [ lib_igt_perf ],
+	'i915_gem_ctx_sseu': [ lib_igt_perf ],
+	'i915_gem_eio': [ realtime ],
+	'i915_gem_exec_balancer': [ lib_igt_perf ],
+	'i915_gem_mmap_offset': [ libatomic ],
 	'i915_pm_freq_mult': [ lib_igt_perf ],
 	'i915_pm_rc6_residency': [ lib_igt_perf ],
-	'perf': [ lib_igt_i915_perf ],
-	'perf_pmu':  [ lib_igt_perf ],
+	'i915_perf': [ lib_igt_i915_perf ],
+	'i915_perf_pmu':  [ lib_igt_perf ],
 	'sw_sync': [ libatomic ],
 }
 
@@ -457,12 +457,12 @@ test_list_target = custom_target('testlist',
 	      install : true,
 	      install_dir : libexecdir)
 
-test_executables += executable('gem_concurrent_all', 'intel/gem_concurrent_all.c',
+test_executables += executable('i915_gem_concurrent_all', 'intel/i915_gem_concurrent_all.c',
 	   dependencies : test_deps + [ libatomic ],
 	   install_dir : libexecdir,
 	   install_rpath : libexecdir_rpathdir,
 	   install : true)
-test_list += 'gem_concurrent_all'
+test_list += 'i915_gem_concurrent_all'
 
 test_list_full_target = custom_target('testlist-full',
 	      output : 'test-list-full.txt',
@@ -475,16 +475,16 @@ foreach prog : test_list
 	test('testcase check ' + prog, test_script, args : prog)
 endforeach
 
-testexe = executable('gem_stress', 'intel/gem_stress.c',
+testexe = executable('i915_gem_stress', 'intel/i915_gem_stress.c',
 	   install : true,
 	   install_dir : libexecdir,
 	   install_rpath : libexecdir_rpathdir,
 	   dependencies : igt_deps)
-testlist_files += custom_target('gem_stress.testlist',
+testlist_files += custom_target('i915_gem_stress.testlist',
                 build_by_default : true,
                 command : [testexe, '--show-testlist'],
                 capture : true,
-                output : 'gem_stress.testlist')
+                output : 'i915_gem_stress.testlist')
 
 image_files = [
   '1080p-left.png',
-- 
2.40.0



^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [igt-dev] ✗ GitLab.Pipeline: warning for New dir structure for intel specific tests (rev9)
  2023-08-31 14:56 [igt-dev] [i-g-t V5 0/7] New dir structure for intel specific tests Bhanuprakash Modem
                   ` (6 preceding siblings ...)
  2023-08-31 14:56 ` [igt-dev] [i-g-t V5 7/7] tests: Rename all intel specific tests Bhanuprakash Modem
@ 2023-08-31 22:05 ` Patchwork
  2023-08-31 22:41 ` [igt-dev] ✗ Fi.CI.BAT: failure " Patchwork
  2023-08-31 23:09 ` [igt-dev] ✓ CI.xeBAT: success " Patchwork
  9 siblings, 0 replies; 18+ messages in thread
From: Patchwork @ 2023-08-31 22:05 UTC (permalink / raw)
  To: Bhanuprakash Modem; +Cc: igt-dev

== Series Details ==

Series: New dir structure for intel specific tests (rev9)
URL   : https://patchwork.freedesktop.org/series/117227/
State : warning

== Summary ==

Pipeline status: FAILED.

see https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/pipelines/974871 for the overview.

build-containers:build-debian-armhf has failed (https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/48332008):
  time="2023-08-31T22:03:35Z" level=fatal msg="Error determining repository tags: Get https://registry.freedesktop.org/v2/gfx-ci/igt-ci-tags/build-debian-armhf/tags/list?last=commit-ec639c89860b859fdf4b038c2fa8ad593bd6909e&n=100: dial tcp 147.75.198.156:443: i/o timeout" 
  Building!
  STEP 1: FROM debian:buster
  Getting image source signatures
  Copying blob sha256:d6b7393fb4f375905c31c483d81ce2a2905f88aba8cb198874da2b54035bc41d
  Copying config sha256:de08540e8ff0e470ff7956df4bed403725a5f45c186e9bf495da5344ff8fbe84
  Writing manifest to image destination
  Storing signatures
  STEP 2: RUN apt-get update
  error running container: error creating container for [/bin/sh -c apt-get update]: time="2023-08-31T22:03:40Z" level=warning msg="signal: killed"
  time="2023-08-31T22:03:40Z" level=error msg="container_linux.go:346: starting container process caused \"process_linux.go:297: applying cgroup configuration for process caused \\\"mountpoint for cgroup not found\\\"\"\n"
  container_linux.go:346: starting container process caused "process_linux.go:297: applying cgroup configuration for process caused \"mountpoint for cgroup not found\""
  : exit status 1
  Error: error building at STEP "RUN apt-get update": error while running runtime: exit status 1
  section_end:1693519420:step_script
  section_start:1693519420:cleanup_file_variables
  Cleaning up project directory and file based variables
  section_end:1693519420:cleanup_file_variables
  ERROR: Job failed: exit code 1

== Logs ==

For more details see: https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/pipelines/974871

^ permalink raw reply	[flat|nested] 18+ messages in thread

* [igt-dev] ✗ Fi.CI.BAT: failure for New dir structure for intel specific tests (rev9)
  2023-08-31 14:56 [igt-dev] [i-g-t V5 0/7] New dir structure for intel specific tests Bhanuprakash Modem
                   ` (7 preceding siblings ...)
  2023-08-31 22:05 ` [igt-dev] ✗ GitLab.Pipeline: warning for New dir structure for intel specific tests (rev9) Patchwork
@ 2023-08-31 22:41 ` Patchwork
  2023-08-31 23:09 ` [igt-dev] ✓ CI.xeBAT: success " Patchwork
  9 siblings, 0 replies; 18+ messages in thread
From: Patchwork @ 2023-08-31 22:41 UTC (permalink / raw)
  To: Bhanuprakash Modem; +Cc: igt-dev

[-- Attachment #1: Type: text/plain, Size: 44957 bytes --]

== Series Details ==

Series: New dir structure for intel specific tests (rev9)
URL   : https://patchwork.freedesktop.org/series/117227/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_13583 -> IGTPW_9699
====================================================

Summary
-------

  **FAILURE**

  Serious unknown changes coming with IGTPW_9699 absolutely need to be
  verified manually.
  
  If you think the reported changes have nothing to do with the changes
  introduced in IGTPW_9699, please notify your bug team to allow them
  to document this new failure mode, which will reduce false positives in CI.

  External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/index.html

Participating hosts (38 -> 39)
------------------------------

  Additional (2): fi-kbl-soraka bat-rpls-2 
  Missing    (1): fi-snb-2520m 

Possible new issues
-------------------

  Here are the unknown changes that may have been introduced in IGTPW_9699:

### IGT changes ###

#### Possible regressions ####

  * igt@debugfs_test@basic-hwmon:
    - bat-rpls-2:         NOTRUN -> [SKIP][1] +6 similar issues
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-rpls-2/igt@debugfs_test@basic-hwmon.html
    - bat-dg1-5:          [PASS][2] -> [SKIP][3] +1 similar issue
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13583/bat-dg1-5/igt@debugfs_test@basic-hwmon.html
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-dg1-5/igt@debugfs_test@basic-hwmon.html
    - bat-atsm-1:         [PASS][4] -> [SKIP][5] +1 similar issue
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13583/bat-atsm-1/igt@debugfs_test@basic-hwmon.html
   [5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-atsm-1/igt@debugfs_test@basic-hwmon.html
    - bat-dg2-9:          [PASS][6] -> [SKIP][7] +1 similar issue
   [6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13583/bat-dg2-9/igt@debugfs_test@basic-hwmon.html
   [7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-dg2-9/igt@debugfs_test@basic-hwmon.html
    - bat-dg2-11:         [PASS][8] -> [SKIP][9] +1 similar issue
   [8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13583/bat-dg2-11/igt@debugfs_test@basic-hwmon.html
   [9]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-dg2-11/igt@debugfs_test@basic-hwmon.html

  * igt@debugfs_test@read_all_entries:
    - bat-adln-1:         [PASS][10] -> [SKIP][11]
   [10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13583/bat-adln-1/igt@debugfs_test@read_all_entries.html
   [11]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-adln-1/igt@debugfs_test@read_all_entries.html
    - bat-mtlp-8:         [PASS][12] -> [SKIP][13]
   [12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13583/bat-mtlp-8/igt@debugfs_test@read_all_entries.html
   [13]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-mtlp-8/igt@debugfs_test@read_all_entries.html
    - bat-adlm-1:         [PASS][14] -> [SKIP][15]
   [14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13583/bat-adlm-1/igt@debugfs_test@read_all_entries.html
   [15]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-adlm-1/igt@debugfs_test@read_all_entries.html
    - bat-jsl-1:          [PASS][16] -> [SKIP][17]
   [16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13583/bat-jsl-1/igt@debugfs_test@read_all_entries.html
   [17]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-jsl-1/igt@debugfs_test@read_all_entries.html
    - fi-tgl-1115g4:      [PASS][18] -> [SKIP][19]
   [18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13583/fi-tgl-1115g4/igt@debugfs_test@read_all_entries.html
   [19]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/fi-tgl-1115g4/igt@debugfs_test@read_all_entries.html
    - bat-rpls-1:         [PASS][20] -> [SKIP][21]
   [20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13583/bat-rpls-1/igt@debugfs_test@read_all_entries.html
   [21]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-rpls-1/igt@debugfs_test@read_all_entries.html
    - bat-mtlp-6:         [PASS][22] -> [SKIP][23]
   [22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13583/bat-mtlp-6/igt@debugfs_test@read_all_entries.html
   [23]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-mtlp-6/igt@debugfs_test@read_all_entries.html
    - bat-adlp-9:         [PASS][24] -> [SKIP][25]
   [24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13583/bat-adlp-9/igt@debugfs_test@read_all_entries.html
   [25]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-adlp-9/igt@debugfs_test@read_all_entries.html
    - bat-adlp-6:         [PASS][26] -> [SKIP][27]
   [26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13583/bat-adlp-6/igt@debugfs_test@read_all_entries.html
   [27]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-adlp-6/igt@debugfs_test@read_all_entries.html
    - bat-rplp-1:         [PASS][28] -> [SKIP][29]
   [28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13583/bat-rplp-1/igt@debugfs_test@read_all_entries.html
   [29]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-rplp-1/igt@debugfs_test@read_all_entries.html
    - fi-rkl-11600:       [PASS][30] -> [SKIP][31]
   [30]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13583/fi-rkl-11600/igt@debugfs_test@read_all_entries.html
   [31]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/fi-rkl-11600/igt@debugfs_test@read_all_entries.html
    - bat-adls-5:         [PASS][32] -> [SKIP][33]
   [32]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13583/bat-adls-5/igt@debugfs_test@read_all_entries.html
   [33]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-adls-5/igt@debugfs_test@read_all_entries.html
    - bat-jsl-3:          [PASS][34] -> [SKIP][35]
   [34]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13583/bat-jsl-3/igt@debugfs_test@read_all_entries.html
   [35]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-jsl-3/igt@debugfs_test@read_all_entries.html

  * igt@i915_gem_lmem_swapping@basic (NEW):
    - bat-jsl-1:          NOTRUN -> [SKIP][36] +4 similar issues
   [36]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-jsl-1/igt@i915_gem_lmem_swapping@basic.html
    - bat-rpls-1:         NOTRUN -> [SKIP][37] +4 similar issues
   [37]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-rpls-1/igt@i915_gem_lmem_swapping@basic.html
    - fi-rkl-11600:       NOTRUN -> [SKIP][38] +5 similar issues
   [38]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/fi-rkl-11600/igt@i915_gem_lmem_swapping@basic.html
    - bat-adls-5:         NOTRUN -> [SKIP][39] +4 similar issues
   [39]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-adls-5/igt@i915_gem_lmem_swapping@basic.html

  * igt@i915_gem_lmem_swapping@parallel-random-engines (NEW):
    - bat-adlm-1:         NOTRUN -> [SKIP][40] +4 similar issues
   [40]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-adlm-1/igt@i915_gem_lmem_swapping@parallel-random-engines.html
    - fi-tgl-1115g4:      NOTRUN -> [SKIP][41] +4 similar issues
   [41]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/fi-tgl-1115g4/igt@i915_gem_lmem_swapping@parallel-random-engines.html

  * igt@i915_gem_lmem_swapping@random-engines (NEW):
    - bat-mtlp-6:         NOTRUN -> [SKIP][42] +6 similar issues
   [42]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-mtlp-6/igt@i915_gem_lmem_swapping@random-engines.html

  * igt@i915_gem_lmem_swapping@verify-random (NEW):
    - bat-jsl-3:          NOTRUN -> [SKIP][43] +4 similar issues
   [43]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-jsl-3/igt@i915_gem_lmem_swapping@verify-random.html
    - bat-adlp-9:         NOTRUN -> [SKIP][44] +4 similar issues
   [44]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-adlp-9/igt@i915_gem_lmem_swapping@verify-random.html

  * igt@i915_gem_mmap@basic (NEW):
    - bat-dg2-11:         NOTRUN -> [SKIP][45] +2 similar issues
   [45]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-dg2-11/igt@i915_gem_mmap@basic.html
    - {bat-dg2-14}:       NOTRUN -> [SKIP][46] +2 similar issues
   [46]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-dg2-14/igt@i915_gem_mmap@basic.html
    - bat-dg2-9:          NOTRUN -> [SKIP][47] +2 similar issues
   [47]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-dg2-9/igt@i915_gem_mmap@basic.html

  * igt@i915_gem_render_tiled_blits@basic (NEW):
    - bat-dg1-5:          NOTRUN -> [SKIP][48] +2 similar issues
   [48]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-dg1-5/igt@i915_gem_render_tiled_blits@basic.html
    - bat-atsm-1:         NOTRUN -> [SKIP][49] +2 similar issues
   [49]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-atsm-1/igt@i915_gem_render_tiled_blits@basic.html

  * igt@i915_gem_tiled_pread_basic (NEW):
    - bat-mtlp-8:         NOTRUN -> [SKIP][50] +6 similar issues
   [50]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-mtlp-8/igt@i915_gem_tiled_pread_basic.html
    - bat-adlp-6:         NOTRUN -> [SKIP][51]
   [51]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-adlp-6/igt@i915_gem_tiled_pread_basic.html
    - bat-adln-1:         NOTRUN -> [SKIP][52]
   [52]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-adln-1/igt@i915_gem_tiled_pread_basic.html
    - bat-rplp-1:         NOTRUN -> [SKIP][53]
   [53]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-rplp-1/igt@i915_gem_tiled_pread_basic.html

  
#### Warnings ####

  * igt@debugfs_test@basic-hwmon:
    - bat-mtlp-8:         [SKIP][54] ([i915#7456]) -> [SKIP][55]
   [54]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13583/bat-mtlp-8/igt@debugfs_test@basic-hwmon.html
   [55]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-mtlp-8/igt@debugfs_test@basic-hwmon.html
    - bat-adlp-9:         [SKIP][56] ([i915#7456]) -> [SKIP][57]
   [56]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13583/bat-adlp-9/igt@debugfs_test@basic-hwmon.html
   [57]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-adlp-9/igt@debugfs_test@basic-hwmon.html
    - bat-adlp-6:         [SKIP][58] ([i915#7456]) -> [SKIP][59]
   [58]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13583/bat-adlp-6/igt@debugfs_test@basic-hwmon.html
   [59]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-adlp-6/igt@debugfs_test@basic-hwmon.html
    - bat-rplp-1:         [SKIP][60] ([i915#7456]) -> [SKIP][61]
   [60]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13583/bat-rplp-1/igt@debugfs_test@basic-hwmon.html
   [61]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-rplp-1/igt@debugfs_test@basic-hwmon.html
    - fi-rkl-11600:       [SKIP][62] ([i915#7456]) -> [SKIP][63]
   [62]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13583/fi-rkl-11600/igt@debugfs_test@basic-hwmon.html
   [63]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/fi-rkl-11600/igt@debugfs_test@basic-hwmon.html
    - bat-adls-5:         [SKIP][64] ([i915#7456]) -> [SKIP][65]
   [64]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13583/bat-adls-5/igt@debugfs_test@basic-hwmon.html
   [65]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-adls-5/igt@debugfs_test@basic-hwmon.html
    - bat-jsl-3:          [SKIP][66] ([i915#7456]) -> [SKIP][67]
   [66]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13583/bat-jsl-3/igt@debugfs_test@basic-hwmon.html
   [67]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-jsl-3/igt@debugfs_test@basic-hwmon.html
    - bat-adln-1:         [SKIP][68] ([i915#7456]) -> [SKIP][69]
   [68]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13583/bat-adln-1/igt@debugfs_test@basic-hwmon.html
   [69]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-adln-1/igt@debugfs_test@basic-hwmon.html
    - bat-adlm-1:         [SKIP][70] ([i915#7456]) -> [SKIP][71]
   [70]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13583/bat-adlm-1/igt@debugfs_test@basic-hwmon.html
   [71]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-adlm-1/igt@debugfs_test@basic-hwmon.html
    - bat-jsl-1:          [SKIP][72] ([i915#7456]) -> [SKIP][73]
   [72]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13583/bat-jsl-1/igt@debugfs_test@basic-hwmon.html
   [73]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-jsl-1/igt@debugfs_test@basic-hwmon.html
    - fi-tgl-1115g4:      [SKIP][74] ([i915#7456]) -> [SKIP][75]
   [74]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13583/fi-tgl-1115g4/igt@debugfs_test@basic-hwmon.html
   [75]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/fi-tgl-1115g4/igt@debugfs_test@basic-hwmon.html
    - bat-rpls-1:         [SKIP][76] ([i915#7456]) -> [SKIP][77]
   [76]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13583/bat-rpls-1/igt@debugfs_test@basic-hwmon.html
   [77]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-rpls-1/igt@debugfs_test@basic-hwmon.html
    - bat-mtlp-6:         [SKIP][78] ([i915#7456]) -> [SKIP][79]
   [78]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13583/bat-mtlp-6/igt@debugfs_test@basic-hwmon.html
   [79]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-mtlp-6/igt@debugfs_test@basic-hwmon.html

  
#### Suppressed ####

  The following results come from untrusted machines, tests, or statuses.
  They do not affect the overall result.

  * igt@debugfs_test@basic-hwmon:
    - {bat-dg2-14}:       [PASS][80] -> [SKIP][81] +1 similar issue
   [80]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13583/bat-dg2-14/igt@debugfs_test@basic-hwmon.html
   [81]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-dg2-14/igt@debugfs_test@basic-hwmon.html

  
New tests
---------

  New tests have been introduced between CI_DRM_13583 and IGTPW_9699:

### New IGT tests (119) ###

  * igt@i915_gem_basic@bad-close:
    - Statuses : 38 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_basic@create-close:
    - Statuses : 38 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_basic@create-fd-close:
    - Statuses : 38 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_busy@busy@all-engines:
    - Statuses : 38 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_close_race@basic-process:
    - Statuses : 38 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_close_race@basic-threads:
    - Statuses : 38 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_ctx_create@basic:
    - Statuses : 37 pass(s) 1 skip(s)
    - Exec time: [0.0] s

  * igt@i915_gem_ctx_create@basic-files:
    - Statuses : 37 pass(s) 1 skip(s)
    - Exec time: [0.0] s

  * igt@i915_gem_ctx_exec@basic:
    - Statuses : 37 pass(s) 1 skip(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_basic@basic@bcs0-lmem0:
    - Statuses : 5 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_basic@basic@bcs0-smem:
    - Statuses : 35 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_basic@basic@ccs0-lmem0:
    - Statuses : 4 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_basic@basic@ccs0-smem:
    - Statuses : 6 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_basic@basic@ccs1-lmem0:
    - Statuses : 3 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_basic@basic@ccs1-smem:
    - Statuses : 3 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_basic@basic@ccs2-lmem0:
    - Statuses : 2 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_basic@basic@ccs2-smem:
    - Statuses : 2 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_basic@basic@ccs3-lmem0:
    - Statuses : 2 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_basic@basic@ccs3-smem:
    - Statuses : 2 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_basic@basic@rcs0-lmem0:
    - Statuses : 5 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_basic@basic@rcs0-smem:
    - Statuses : 38 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_basic@basic@vcs0-lmem0:
    - Statuses : 5 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_basic@basic@vcs0-smem:
    - Statuses : 37 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_basic@basic@vcs1-lmem0:
    - Statuses : 5 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_basic@basic@vcs1-smem:
    - Statuses : 16 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_basic@basic@vecs0-lmem0:
    - Statuses : 5 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_basic@basic@vecs0-smem:
    - Statuses : 34 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_basic@basic@vecs1-lmem0:
    - Statuses : 4 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_basic@basic@vecs1-smem:
    - Statuses : 4 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_create@basic@lmem0:
    - Statuses : 5 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_create@basic@smem:
    - Statuses : 38 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_fence@basic-await@bcs0:
    - Statuses : 35 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_fence@basic-await@ccs0:
    - Statuses : 6 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_fence@basic-await@ccs1:
    - Statuses : 3 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_fence@basic-await@ccs2:
    - Statuses : 2 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_fence@basic-await@ccs3:
    - Statuses : 2 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_fence@basic-await@rcs0:
    - Statuses : 38 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_fence@basic-await@vcs0:
    - Statuses : 37 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_fence@basic-await@vcs1:
    - Statuses : 16 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_fence@basic-await@vecs0:
    - Statuses : 34 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_fence@basic-await@vecs1:
    - Statuses : 4 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_fence@basic-busy@bcs0:
    - Statuses : 35 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_fence@basic-busy@ccs0:
    - Statuses : 6 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_fence@basic-busy@ccs1:
    - Statuses : 3 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_fence@basic-busy@ccs2:
    - Statuses : 2 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_fence@basic-busy@ccs3:
    - Statuses : 2 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_fence@basic-busy@rcs0:
    - Statuses : 38 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_fence@basic-busy@vcs0:
    - Statuses : 37 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_fence@basic-busy@vcs1:
    - Statuses : 16 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_fence@basic-busy@vecs0:
    - Statuses : 34 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_fence@basic-busy@vecs1:
    - Statuses : 4 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_fence@basic-wait@bcs0:
    - Statuses : 35 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_fence@basic-wait@ccs0:
    - Statuses : 6 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_fence@basic-wait@ccs1:
    - Statuses : 3 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_fence@basic-wait@ccs2:
    - Statuses : 2 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_fence@basic-wait@ccs3:
    - Statuses : 2 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_fence@basic-wait@rcs0:
    - Statuses : 38 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_fence@basic-wait@vcs0:
    - Statuses : 37 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_fence@basic-wait@vcs1:
    - Statuses : 16 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_fence@basic-wait@vecs0:
    - Statuses : 34 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_fence@basic-wait@vecs1:
    - Statuses : 4 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_fence@nb-await@bcs0:
    - Statuses : 35 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_fence@nb-await@ccs0:
    - Statuses : 6 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_fence@nb-await@ccs1:
    - Statuses : 3 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_fence@nb-await@ccs2:
    - Statuses : 2 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_fence@nb-await@ccs3:
    - Statuses : 2 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_fence@nb-await@rcs0:
    - Statuses : 38 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_fence@nb-await@vcs0:
    - Statuses : 37 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_fence@nb-await@vcs1:
    - Statuses : 16 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_fence@nb-await@vecs0:
    - Statuses : 34 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_fence@nb-await@vecs1:
    - Statuses : 4 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_gttfill@basic:
    - Statuses : 36 pass(s) 2 skip(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_parallel@engines@basic:
    - Statuses : 38 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_parallel@engines@contexts:
    - Statuses : 37 pass(s) 1 skip(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_parallel@engines@fds:
    - Statuses : 35 pass(s) 3 skip(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_parallel@engines@userptr:
    - Statuses : 38 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_store@basic:
    - Statuses : 38 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_suspend@basic-s0:
    - Statuses :
    - Exec time: [None] s

  * igt@i915_gem_exec_suspend@basic-s0@lmem0:
    - Statuses : 1 dmesg-warn(s) 1 incomplete(s) 1 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_suspend@basic-s0@smem:
    - Statuses : 3 dmesg-warn(s) 24 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_suspend@basic-s3:
    - Statuses :
    - Exec time: [None] s

  * igt@i915_gem_exec_suspend@basic-s3@lmem0:
    - Statuses : 1 dmesg-warn(s) 1 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_exec_suspend@basic-s3@smem:
    - Statuses : 3 dmesg-warn(s) 23 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_flink_basic@bad-flink:
    - Statuses : 38 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_flink_basic@bad-open:
    - Statuses : 38 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_flink_basic@basic:
    - Statuses : 38 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_flink_basic@double-flink:
    - Statuses : 38 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_flink_basic@flink-lifetime:
    - Statuses : 38 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_huc_copy@huc-copy:
    - Statuses : 19 pass(s) 19 skip(s)
    - Exec time: [0.0] s

  * igt@i915_gem_linear_blits@basic:
    - Statuses : 36 pass(s) 2 skip(s)
    - Exec time: [0.0] s

  * igt@i915_gem_lmem_swapping@basic:
    - Statuses : 29 skip(s)
    - Exec time: [0.0] s

  * igt@i915_gem_lmem_swapping@basic@lmem0:
    - Statuses : 4 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_lmem_swapping@parallel-random-engines:
    - Statuses : 29 skip(s)
    - Exec time: [0.0] s

  * igt@i915_gem_lmem_swapping@parallel-random-engines@lmem0:
    - Statuses : 4 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_lmem_swapping@random-engines:
    - Statuses : 29 skip(s)
    - Exec time: [0.0] s

  * igt@i915_gem_lmem_swapping@random-engines@lmem0:
    - Statuses : 4 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_lmem_swapping@verify-random:
    - Statuses : 29 skip(s)
    - Exec time: [0.0] s

  * igt@i915_gem_lmem_swapping@verify-random@lmem0:
    - Statuses : 4 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_mmap@basic:
    - Statuses : 31 pass(s) 7 skip(s)
    - Exec time: [0.0] s

  * igt@i915_gem_mmap_gtt@basic:
    - Statuses : 31 pass(s) 7 skip(s)
    - Exec time: [0.0] s

  * igt@i915_gem_render_linear_blits@basic:
    - Statuses : 38 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_render_tiled_blits@basic:
    - Statuses : 31 pass(s) 7 skip(s)
    - Exec time: [0.0] s

  * igt@i915_gem_ringfill@basic-all:
    - Statuses : 38 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_softpin@allocator-basic:
    - Statuses : 33 pass(s) 5 skip(s)
    - Exec time: [0.0] s

  * igt@i915_gem_softpin@allocator-basic-reserve:
    - Statuses : 33 pass(s) 5 skip(s)
    - Exec time: [0.0] s

  * igt@i915_gem_softpin@safe-alignment:
    - Statuses : 38 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_sync@basic-all:
    - Statuses : 38 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_sync@basic-each:
    - Statuses : 38 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_tiled_blits@basic:
    - Statuses : 29 pass(s) 9 skip(s)
    - Exec time: [0.0] s

  * igt@i915_gem_tiled_fence_blits@basic:
    - Statuses : 31 pass(s) 7 skip(s)
    - Exec time: [0.0] s

  * igt@i915_gem_tiled_pread_basic:
    - Statuses : 22 pass(s) 16 skip(s)
    - Exec time: [0.0] s

  * igt@i915_gem_wait@busy@all-engines:
    - Statuses : 38 pass(s)
    - Exec time: [0.0] s

  * igt@i915_gem_wait@wait@all-engines:
    - Statuses : 38 pass(s)
    - Exec time: [0.0] s

  * igt@i915_prime_self_import@basic-llseek-bad:
    - Statuses : 33 pass(s)
    - Exec time: [0.0] s

  * igt@i915_prime_self_import@basic-llseek-size:
    - Statuses : 33 pass(s)
    - Exec time: [0.0] s

  * igt@i915_prime_self_import@basic-with_fd_dup:
    - Statuses : 33 pass(s)
    - Exec time: [0.0] s

  * igt@i915_prime_self_import@basic-with_one_bo:
    - Statuses : 33 pass(s)
    - Exec time: [0.0] s

  * igt@i915_prime_self_import@basic-with_one_bo_two_files:
    - Statuses : 33 pass(s)
    - Exec time: [0.0] s

  * igt@i915_prime_self_import@basic-with_two_bos:
    - Statuses : 33 pass(s)
    - Exec time: [0.0] s

  

Known issues
------------

  Here are the changes found in IGTPW_9699 that come from known issues:

### IGT changes ###

#### Issues hit ####

  * igt@debugfs_test@basic-hwmon:
    - fi-kbl-7567u:       NOTRUN -> [SKIP][82] ([fdo#109271]) +1 similar issue
   [82]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/fi-kbl-7567u/igt@debugfs_test@basic-hwmon.html

  * igt@debugfs_test@read_all_entries:
    - fi-kbl-x1275:       [PASS][83] -> [SKIP][84] ([fdo#109271])
   [83]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13583/fi-kbl-x1275/igt@debugfs_test@read_all_entries.html
   [84]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/fi-kbl-x1275/igt@debugfs_test@read_all_entries.html
    - fi-kbl-soraka:      NOTRUN -> [SKIP][85] ([fdo#109271]) +14 similar issues
   [85]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/fi-kbl-soraka/igt@debugfs_test@read_all_entries.html
    - fi-hsw-4770:        [PASS][86] -> [SKIP][87] ([fdo#109271])
   [86]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13583/fi-hsw-4770/igt@debugfs_test@read_all_entries.html
   [87]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/fi-hsw-4770/igt@debugfs_test@read_all_entries.html
    - fi-cfl-8109u:       [PASS][88] -> [SKIP][89] ([fdo#109271])
   [88]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13583/fi-cfl-8109u/igt@debugfs_test@read_all_entries.html
   [89]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/fi-cfl-8109u/igt@debugfs_test@read_all_entries.html
    - fi-kbl-8809g:       [PASS][90] -> [SKIP][91] ([fdo#109271])
   [90]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13583/fi-kbl-8809g/igt@debugfs_test@read_all_entries.html
   [91]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/fi-kbl-8809g/igt@debugfs_test@read_all_entries.html
    - fi-ivb-3770:        [PASS][92] -> [SKIP][93] ([fdo#109271])
   [92]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13583/fi-ivb-3770/igt@debugfs_test@read_all_entries.html
   [93]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/fi-ivb-3770/igt@debugfs_test@read_all_entries.html
    - fi-elk-e7500:       [PASS][94] -> [SKIP][95] ([fdo#109271])
   [94]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13583/fi-elk-e7500/igt@debugfs_test@read_all_entries.html
   [95]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/fi-elk-e7500/igt@debugfs_test@read_all_entries.html
    - fi-kbl-guc:         [PASS][96] -> [SKIP][97] ([fdo#109271])
   [96]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13583/fi-kbl-guc/igt@debugfs_test@read_all_entries.html
   [97]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/fi-kbl-guc/igt@debugfs_test@read_all_entries.html
    - fi-ilk-650:         [PASS][98] -> [SKIP][99] ([fdo#109271])
   [98]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13583/fi-ilk-650/igt@debugfs_test@read_all_entries.html
   [99]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/fi-ilk-650/igt@debugfs_test@read_all_entries.html
    - fi-blb-e6850:       [PASS][100] -> [SKIP][101] ([fdo#109271])
   [100]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13583/fi-blb-e6850/igt@debugfs_test@read_all_entries.html
   [101]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/fi-blb-e6850/igt@debugfs_test@read_all_entries.html
    - fi-bsw-n3050:       [PASS][102] -> [SKIP][103] ([fdo#109271])
   [102]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13583/fi-bsw-n3050/igt@debugfs_test@read_all_entries.html
   [103]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/fi-bsw-n3050/igt@debugfs_test@read_all_entries.html
    - fi-cfl-guc:         [PASS][104] -> [SKIP][105] ([fdo#109271])
   [104]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13583/fi-cfl-guc/igt@debugfs_test@read_all_entries.html
   [105]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/fi-cfl-guc/igt@debugfs_test@read_all_entries.html
    - fi-skl-6600u:       [PASS][106] -> [SKIP][107] ([fdo#109271])
   [106]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13583/fi-skl-6600u/igt@debugfs_test@read_all_entries.html
   [107]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/fi-skl-6600u/igt@debugfs_test@read_all_entries.html
    - fi-apl-guc:         [PASS][108] -> [SKIP][109] ([fdo#109271])
   [108]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13583/fi-apl-guc/igt@debugfs_test@read_all_entries.html
   [109]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/fi-apl-guc/igt@debugfs_test@read_all_entries.html
    - fi-glk-j4005:       [PASS][110] -> [SKIP][111] ([fdo#109271])
   [110]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13583/fi-glk-j4005/igt@debugfs_test@read_all_entries.html
   [111]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/fi-glk-j4005/igt@debugfs_test@read_all_entries.html
    - fi-skl-guc:         [PASS][112] -> [SKIP][113] ([fdo#109271])
   [112]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13583/fi-skl-guc/igt@debugfs_test@read_all_entries.html
   [113]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/fi-skl-guc/igt@debugfs_test@read_all_entries.html
    - fi-cfl-8700k:       [PASS][114] -> [SKIP][115] ([fdo#109271])
   [114]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13583/fi-cfl-8700k/igt@debugfs_test@read_all_entries.html
   [115]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/fi-cfl-8700k/igt@debugfs_test@read_all_entries.html
    - bat-kbl-2:          [PASS][116] -> [SKIP][117] ([fdo#109271])
   [116]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13583/bat-kbl-2/igt@debugfs_test@read_all_entries.html
   [117]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-kbl-2/igt@debugfs_test@read_all_entries.html

  * igt@fbdev@info:
    - bat-rpls-2:         NOTRUN -> [SKIP][118] ([i915#1849] / [i915#2582])
   [118]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-rpls-2/igt@fbdev@info.html

  * igt@fbdev@read:
    - bat-rpls-2:         NOTRUN -> [SKIP][119] ([i915#2582]) +3 similar issues
   [119]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-rpls-2/igt@fbdev@read.html

  * igt@i915_gem_exec_parallel@engines@fds (NEW):
    - fi-elk-e7500:       NOTRUN -> [SKIP][120] ([fdo#109271]) +7 similar issues
   [120]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/fi-elk-e7500/igt@i915_gem_exec_parallel@engines@fds.html
    - fi-ilk-650:         NOTRUN -> [SKIP][121] ([fdo#109271]) +7 similar issues
   [121]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/fi-ilk-650/igt@i915_gem_exec_parallel@engines@fds.html

  * igt@i915_gem_exec_suspend@basic-s0@lmem0 (NEW):
    - bat-atsm-1:         NOTRUN -> [DMESG-WARN][122] ([i915#8841]) +3 similar issues
   [122]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-atsm-1/igt@i915_gem_exec_suspend@basic-s0@lmem0.html
    - bat-dg2-9:          NOTRUN -> [INCOMPLETE][123] ([i915#6311])
   [123]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-dg2-9/igt@i915_gem_exec_suspend@basic-s0@lmem0.html

  * igt@i915_gem_exec_suspend@basic-s0@smem (NEW):
    - fi-ivb-3770:        NOTRUN -> [DMESG-WARN][124] ([i915#8841]) +1 similar issue
   [124]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/fi-ivb-3770/igt@i915_gem_exec_suspend@basic-s0@smem.html

  * igt@i915_gem_exec_suspend@basic-s3@smem (NEW):
    - fi-hsw-4770:        NOTRUN -> [DMESG-WARN][125] ([i915#8841]) +1 similar issue
   [125]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/fi-hsw-4770/igt@i915_gem_exec_suspend@basic-s3@smem.html

  * igt@i915_gem_huc_copy@huc-copy (NEW):
    - fi-hsw-4770:        NOTRUN -> [SKIP][126] ([fdo#109271]) +6 similar issues
   [126]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/fi-hsw-4770/igt@i915_gem_huc_copy@huc-copy.html

  * igt@i915_gem_lmem_swapping@basic (NEW):
    - fi-blb-e6850:       NOTRUN -> [SKIP][127] ([fdo#109271]) +11 similar issues
   [127]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/fi-blb-e6850/igt@i915_gem_lmem_swapping@basic.html
    - fi-bsw-n3050:       NOTRUN -> [SKIP][128] ([fdo#109271]) +7 similar issues
   [128]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/fi-bsw-n3050/igt@i915_gem_lmem_swapping@basic.html
    - bat-kbl-2:          NOTRUN -> [SKIP][129] ([fdo#109271]) +4 similar issues
   [129]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-kbl-2/igt@i915_gem_lmem_swapping@basic.html
    - fi-skl-6600u:       NOTRUN -> [SKIP][130] ([fdo#109271]) +4 similar issues
   [130]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/fi-skl-6600u/igt@i915_gem_lmem_swapping@basic.html
    - fi-apl-guc:         NOTRUN -> [SKIP][131] ([fdo#109271]) +3 similar issues
   [131]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/fi-apl-guc/igt@i915_gem_lmem_swapping@basic.html

  * igt@i915_gem_lmem_swapping@parallel-random-engines (NEW):
    - fi-skl-guc:         NOTRUN -> [SKIP][132] ([fdo#109271]) +3 similar issues
   [132]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/fi-skl-guc/igt@i915_gem_lmem_swapping@parallel-random-engines.html
    - fi-kbl-x1275:       NOTRUN -> [SKIP][133] ([fdo#109271]) +4 similar issues
   [133]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/fi-kbl-x1275/igt@i915_gem_lmem_swapping@parallel-random-engines.html
    - fi-cfl-8109u:       NOTRUN -> [SKIP][134] ([fdo#109271]) +4 similar issues
   [134]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/fi-cfl-8109u/igt@i915_gem_lmem_swapping@parallel-random-engines.html
    - fi-kbl-8809g:       NOTRUN -> [SKIP][135] ([fdo#109271]) +4 similar issues
   [135]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/fi-kbl-8809g/igt@i915_gem_lmem_swapping@parallel-random-engines.html
    - fi-ivb-3770:        NOTRUN -> [SKIP][136] ([fdo#109271]) +6 similar issues
   [136]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/fi-ivb-3770/igt@i915_gem_lmem_swapping@parallel-random-engines.html
    - fi-kbl-guc:         NOTRUN -> [SKIP][137] ([fdo#109271]) +3 similar issues
   [137]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/fi-kbl-guc/igt@i915_gem_lmem_swapping@parallel-random-engines.html

  * igt@i915_gem_lmem_swapping@random-engines (NEW):
    - fi-cfl-guc:         NOTRUN -> [SKIP][138] ([fdo#109271]) +3 similar issues
   [138]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/fi-cfl-guc/igt@i915_gem_lmem_swapping@random-engines.html

  * igt@i915_gem_lmem_swapping@verify-random (NEW):
    - fi-glk-j4005:       NOTRUN -> [SKIP][139] ([fdo#109271]) +4 similar issues
   [139]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/fi-glk-j4005/igt@i915_gem_lmem_swapping@verify-random.html
    - fi-cfl-8700k:       NOTRUN -> [SKIP][140] ([fdo#109271]) +4 similar issues
   [140]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/fi-cfl-8700k/igt@i915_gem_lmem_swapping@verify-random.html

  * igt@i915_gem_mmap_gtt@basic (NEW):
    - bat-mtlp-8:         NOTRUN -> [SKIP][141] ([i915#4077]) +2 similar issues
   [141]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-mtlp-8/igt@i915_gem_mmap_gtt@basic.html

  * igt@i915_gem_tiled_blits@basic (NEW):
    - bat-dg1-5:          NOTRUN -> [SKIP][142] ([i915#4077]) +2 similar issues
   [142]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-dg1-5/igt@i915_gem_tiled_blits@basic.html
    - bat-dg2-11:         NOTRUN -> [SKIP][143] ([i915#4077]) +2 similar issues
   [143]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-dg2-11/igt@i915_gem_tiled_blits@basic.html
    - {bat-dg2-14}:       NOTRUN -> [SKIP][144] ([i915#4077]) +2 similar issues
   [144]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-dg2-14/igt@i915_gem_tiled_blits@basic.html
    - bat-atsm-1:         NOTRUN -> [SKIP][145] ([i915#4077]) +2 similar issues
   [145]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-atsm-1/igt@i915_gem_tiled_blits@basic.html
    - bat-mtlp-6:         NOTRUN -> [SKIP][146] ([i915#4077]) +2 similar issues
   [146]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-mtlp-6/igt@i915_gem_tiled_blits@basic.html
    - bat-dg2-9:          NOTRUN -> [SKIP][147] ([i915#4077]) +2 similar issues
   [147]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-dg2-9/igt@i915_gem_tiled_blits@basic.html

  * igt@i915_pm_backlight@basic-brightness:
    - bat-rpls-2:         NOTRUN -> [SKIP][148] ([i915#7561])
   [148]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-rpls-2/igt@i915_pm_backlight@basic-brightness.html

  * igt@i915_pm_backlight@basic-brightness@edp-1:
    - bat-rplp-1:         NOTRUN -> [ABORT][149] ([i915#7077] / [i915#8668])
   [149]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-rplp-1/igt@i915_pm_backlight@basic-brightness@edp-1.html

  * igt@i915_pm_rps@basic-api:
    - bat-rpls-2:         NOTRUN -> [SKIP][150] ([i915#6621])
   [150]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-rpls-2/igt@i915_pm_rps@basic-api.html

  * igt@i915_selftest@live@gt_pm:
    - bat-rpls-2:         NOTRUN -> [DMESG-FAIL][151] ([i915#4258] / [i915#7913])
   [151]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-rpls-2/igt@i915_selftest@live@gt_pm.html
    - fi-kbl-soraka:      NOTRUN -> [DMESG-FAIL][152] ([i915#1886] / [i915#7913])
   [152]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/fi-kbl-soraka/igt@i915_selftest@live@gt_pm.html

  * igt@kms_addfb_basic@addfb25-bad-modifier:
    - fi-kbl-7567u:       NOTRUN -> [ABORT][153] ([i915#8913])
   [153]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/fi-kbl-7567u/igt@kms_addfb_basic@addfb25-bad-modifier.html

  * igt@kms_busy@basic:
    - bat-rpls-2:         NOTRUN -> [SKIP][154] ([i915#1845]) +16 similar issues
   [154]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-rpls-2/igt@kms_busy@basic.html

  * igt@kms_flip@basic-flip-vs-dpms:
    - bat-rpls-2:         NOTRUN -> [SKIP][155] ([i915#3637]) +3 similar issues
   [155]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-rpls-2/igt@kms_flip@basic-flip-vs-dpms.html

  * igt@kms_force_connector_basic@force-load-detect:
    - bat-rpls-2:         NOTRUN -> [SKIP][156] ([fdo#109285])
   [156]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-rpls-2/igt@kms_force_connector_basic@force-load-detect.html

  * igt@kms_frontbuffer_tracking@basic:
    - bat-rpls-2:         NOTRUN -> [SKIP][157] ([i915#1849])
   [157]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-rpls-2/igt@kms_frontbuffer_tracking@basic.html

  * igt@kms_psr@sprite_plane_onoff:
    - bat-rpls-2:         NOTRUN -> [SKIP][158] ([i915#1072]) +3 similar issues
   [158]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-rpls-2/igt@kms_psr@sprite_plane_onoff.html

  * igt@kms_setmode@basic-clone-single-crtc:
    - bat-rplp-1:         NOTRUN -> [SKIP][159] ([i915#3555])
   [159]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-rplp-1/igt@kms_setmode@basic-clone-single-crtc.html
    - bat-rpls-2:         NOTRUN -> [SKIP][160] ([i915#3555])
   [160]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-rpls-2/igt@kms_setmode@basic-clone-single-crtc.html

  * igt@prime_vgem@basic-fence-flip:
    - bat-rpls-2:         NOTRUN -> [SKIP][161] ([fdo#109295] / [i915#1845] / [i915#3708])
   [161]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-rpls-2/igt@prime_vgem@basic-fence-flip.html

  * igt@prime_vgem@basic-fence-read:
    - bat-rpls-2:         NOTRUN -> [SKIP][162] ([fdo#109295] / [i915#3708]) +2 similar issues
   [162]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-rpls-2/igt@prime_vgem@basic-fence-read.html

  
#### Possible fixes ####

  * igt@kms_chamelium_edid@hdmi-edid-read:
    - {bat-dg2-13}:       [DMESG-WARN][163] ([i915#7952]) -> [PASS][164]
   [163]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13583/bat-dg2-13/igt@kms_chamelium_edid@hdmi-edid-read.html
   [164]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-dg2-13/igt@kms_chamelium_edid@hdmi-edid-read.html

  
#### Warnings ####

  * igt@debugfs_test@read_all_entries:
    - fi-kbl-7567u:       [ABORT][165] ([i915#8913]) -> [SKIP][166] ([fdo#109271])
   [165]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13583/fi-kbl-7567u/igt@debugfs_test@read_all_entries.html
   [166]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/fi-kbl-7567u/igt@debugfs_test@read_all_entries.html

  * igt@kms_pipe_crc_basic@suspend-read-crc@pipe-a-vga-1:
    - fi-hsw-4770:        [DMESG-WARN][167] ([i915#8841]) -> [DMESG-WARN][168] ([i915#1982] / [i915#8841])
   [167]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13583/fi-hsw-4770/igt@kms_pipe_crc_basic@suspend-read-crc@pipe-a-vga-1.html
   [168]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/fi-hsw-4770/igt@kms_pipe_crc_basic@suspend-read-crc@pipe-a-vga-1.html

  * igt@kms_psr@primary_mmap_gtt:
    - bat-rplp-1:         [ABORT][169] ([i915#8469]) -> [SKIP][170] ([i915#1072])
   [169]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13583/bat-rplp-1/igt@kms_psr@primary_mmap_gtt.html
   [170]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/bat-rplp-1/igt@kms_psr@primary_mmap_gtt.html

  
  {name}: This element is suppressed. This means it is ignored when computing
          the status of the difference (SUCCESS, WARNING, or FAILURE).

  [Intel XE#485]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/485
  [fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
  [fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
  [fdo#109295]: https://bugs.freedesktop.org/show_bug.cgi?id=109295
  [i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
  [i915#1845]: https://gitlab.freedesktop.org/drm/intel/issues/1845
  [i915#1849]: https://gitlab.freedesktop.org/drm/intel/issues/1849
  [i915#1886]: https://gitlab.freedesktop.org/drm/intel/issues/1886
  [i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
  [i915#2582]: https://gitlab.freedesktop.org/drm/intel/issues/2582
  [i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
  [i915#3637]: https://gitlab.freedesktop.org/drm/intel/issues/3637
  [i915#3708]: https://gitlab.freedesktop.org/drm/intel/issues/3708
  [i915#4077]: https://gitlab.freedesktop.org/drm/intel/issues/4077
  [i915#4258]: https://gitlab.freedesktop.org/drm/intel/issues/4258
  [i915#6311]: https://gitlab.freedesktop.org/drm/intel/issues/6311
  [i915#6621]: https://gitlab.freedesktop.org/drm/intel/issues/6621
  [i915#7077]: https://gitlab.freedesktop.org/drm/intel/issues/7077
  [i915#7456]: https://gitlab.freedesktop.org/drm/intel/issues/7456
  [i915#7561]: https://gitlab.freedesktop.org/drm/intel/issues/7561
  [i915#7913]: https://gitlab.freedesktop.org/drm/intel/issues/7913
  [i915#7952]: https://gitlab.freedesktop.org/drm/intel/issues/7952
  [i915#8469]: https://gitlab.freedesktop.org/drm/intel/issues/8469
  [i915#8668]: https://gitlab.freedesktop.org/drm/intel/issues/8668
  [i915#8841]: https://gitlab.freedesktop.org/drm/intel/issues/8841
  [i915#8913]: https://gitlab.freedesktop.org/drm/intel/issues/8913


Build changes
-------------

  * CI: CI-20190529 -> None
  * IGT: IGT_7460 -> IGTPW_9699

  CI-20190529: 20190529
  CI_DRM_13583: f299d7585a085ee36999da219c292e265da35886 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGTPW_9699: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/index.html
  IGT_7460: 30b4034ea562952039ba6af58106791d5c39999e @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git


Testlist changes
----------------

+++ 59610 lines
--- 59610 lines

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/index.html

[-- Attachment #2: Type: text/html, Size: 55603 bytes --]

^ permalink raw reply	[flat|nested] 18+ messages in thread

* [igt-dev] ✓ CI.xeBAT: success for New dir structure for intel specific tests (rev9)
  2023-08-31 14:56 [igt-dev] [i-g-t V5 0/7] New dir structure for intel specific tests Bhanuprakash Modem
                   ` (8 preceding siblings ...)
  2023-08-31 22:41 ` [igt-dev] ✗ Fi.CI.BAT: failure " Patchwork
@ 2023-08-31 23:09 ` Patchwork
  9 siblings, 0 replies; 18+ messages in thread
From: Patchwork @ 2023-08-31 23:09 UTC (permalink / raw)
  To: Bhanuprakash Modem; +Cc: igt-dev

[-- Attachment #1: Type: text/plain, Size: 4871 bytes --]

== Series Details ==

Series: New dir structure for intel specific tests (rev9)
URL   : https://patchwork.freedesktop.org/series/117227/
State : success

== Summary ==

CI Bug Log - changes from XEIGT_7460_BAT -> XEIGTPW_9699_BAT
====================================================

Summary
-------

  **WARNING**

  Minor unknown changes coming with XEIGTPW_9699_BAT need to be verified
  manually.
  
  If you think the reported changes have nothing to do with the changes
  introduced in XEIGTPW_9699_BAT, please notify your bug team to allow them
  to document this new failure mode, which will reduce false positives in CI.

  

Participating hosts (4 -> 4)
------------------------------

  No changes in participating hosts

Possible new issues
-------------------

  Here are the unknown changes that may have been introduced in XEIGTPW_9699_BAT:

### IGT changes ###

#### Warnings ####

  * igt@xe_exec_fault_mode@many-basic:
    - bat-dg2-oem2:       [SKIP][1] ([Intel XE#288]) -> [SKIP][2] +17 similar issues
   [1]: https://intel-gfx-ci.01.org/tree/intel-xe/IGT_7460/bat-dg2-oem2/igt@xe_exec_fault_mode@many-basic.html
   [2]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_9699/bat-dg2-oem2/igt@xe_exec_fault_mode@many-basic.html

  * igt@xe_exec_fault_mode@twice-userptr:
    - bat-adlp-7:         [SKIP][3] ([Intel XE#288]) -> [SKIP][4] +17 similar issues
   [3]: https://intel-gfx-ci.01.org/tree/intel-xe/IGT_7460/bat-adlp-7/igt@xe_exec_fault_mode@twice-userptr.html
   [4]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_9699/bat-adlp-7/igt@xe_exec_fault_mode@twice-userptr.html

  * igt@xe_exec_fault_mode@twice-userptr-invalidate-imm:
    - bat-atsm-2:         [SKIP][5] ([Intel XE#288]) -> [SKIP][6] +17 similar issues
   [5]: https://intel-gfx-ci.01.org/tree/intel-xe/IGT_7460/bat-atsm-2/igt@xe_exec_fault_mode@twice-userptr-invalidate-imm.html
   [6]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_9699/bat-atsm-2/igt@xe_exec_fault_mode@twice-userptr-invalidate-imm.html

  
#### Suppressed ####

  The following results come from untrusted machines, tests, or statuses.
  They do not affect the overall result.

  * {igt@xe_exec_fault_mode@twice-bindexecqueue-userptr}:
    - bat-adlp-7:         [SKIP][7] ([Intel XE#288]) -> [SKIP][8] +14 similar issues
   [7]: https://intel-gfx-ci.01.org/tree/intel-xe/IGT_7460/bat-adlp-7/igt@xe_exec_fault_mode@twice-bindexecqueue-userptr.html
   [8]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_9699/bat-adlp-7/igt@xe_exec_fault_mode@twice-bindexecqueue-userptr.html

  * {igt@xe_exec_fault_mode@twice-bindexecqueue-userptr-invalidate}:
    - bat-dg2-oem2:       [SKIP][9] ([Intel XE#288]) -> [SKIP][10] +14 similar issues
   [9]: https://intel-gfx-ci.01.org/tree/intel-xe/IGT_7460/bat-dg2-oem2/igt@xe_exec_fault_mode@twice-bindexecqueue-userptr-invalidate.html
   [10]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_9699/bat-dg2-oem2/igt@xe_exec_fault_mode@twice-bindexecqueue-userptr-invalidate.html

  * {igt@xe_exec_fault_mode@twice-bindexecqueue-userptr-rebind}:
    - bat-atsm-2:         [SKIP][11] ([Intel XE#288]) -> [SKIP][12] +14 similar issues
   [11]: https://intel-gfx-ci.01.org/tree/intel-xe/IGT_7460/bat-atsm-2/igt@xe_exec_fault_mode@twice-bindexecqueue-userptr-rebind.html
   [12]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_9699/bat-atsm-2/igt@xe_exec_fault_mode@twice-bindexecqueue-userptr-rebind.html

  
Known issues
------------

  Here are the changes found in XEIGTPW_9699_BAT that come from known issues:

### IGT changes ###

#### Issues hit ####

  * igt@kms_flip@basic-flip-vs-wf_vblank@d-edp1:
    - bat-adlp-7:         [PASS][13] -> [FAIL][14] ([Intel XE#480]) +1 similar issue
   [13]: https://intel-gfx-ci.01.org/tree/intel-xe/IGT_7460/bat-adlp-7/igt@kms_flip@basic-flip-vs-wf_vblank@d-edp1.html
   [14]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_9699/bat-adlp-7/igt@kms_flip@basic-flip-vs-wf_vblank@d-edp1.html

  
  {name}: This element is suppressed. This means it is ignored when computing
          the status of the difference (SUCCESS, WARNING, or FAILURE).

  [Intel XE#288]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/288
  [Intel XE#480]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/480


Build changes
-------------

  * IGT: IGT_7460 -> IGTPW_9699
  * Linux: xe-348-72da4b45f58f2a95d45743801a10e1f1e1dcce05 -> xe-351-bca3262d221e1402c03a89bb4ba520d6aa610505

  IGTPW_9699: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9699/index.html
  IGT_7460: 30b4034ea562952039ba6af58106791d5c39999e @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
  xe-348-72da4b45f58f2a95d45743801a10e1f1e1dcce05: 72da4b45f58f2a95d45743801a10e1f1e1dcce05
  xe-351-bca3262d221e1402c03a89bb4ba520d6aa610505: bca3262d221e1402c03a89bb4ba520d6aa610505

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_9699/index.html

[-- Attachment #2: Type: text/html, Size: 6007 bytes --]

^ permalink raw reply	[flat|nested] 18+ messages in thread

end of thread, other threads:[~2023-08-31 23:09 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-08-31 14:56 [igt-dev] [i-g-t V5 0/7] New dir structure for intel specific tests Bhanuprakash Modem
2023-08-31 14:56 ` [igt-dev] [i-g-t V5 1/7] testplan/i915: Exclude non-i915 tests from i915 testplan Bhanuprakash Modem
2023-08-31 14:56 ` [igt-dev] [i-g-t V5 2/7] testplan/kms: Move kms testplan to intel dir Bhanuprakash Modem
2023-08-31 15:56   ` Mauro Carvalho Chehab
2023-08-31 14:56 ` [igt-dev] [i-g-t V5 3/7] tests/i915/prime_mmap_kms: Add missing documentation Bhanuprakash Modem
2023-08-31 17:09   ` Kamil Konieczny
2023-08-31 14:56 ` [igt-dev] [i-g-t V5 4/7] tests/meson.build: Simplify builds for Chamelium targets Bhanuprakash Modem
2023-08-31 15:57   ` Mauro Carvalho Chehab
2023-08-31 14:56 ` [igt-dev] [i-g-t V5 5/7] tests: Move intel specific tests to new directory Bhanuprakash Modem
2023-08-31 16:00   ` Mauro Carvalho Chehab
2023-08-31 14:56 ` [igt-dev] [i-g-t V5 6/7] tests/meson.build: Split intel targets based on their nature Bhanuprakash Modem
2023-08-31 16:01   ` Mauro Carvalho Chehab
2023-08-31 14:56 ` [igt-dev] [i-g-t V5 7/7] tests: Rename all intel specific tests Bhanuprakash Modem
2023-08-31 16:05   ` Mauro Carvalho Chehab
2023-08-31 18:45   ` [igt-dev] [i-g-t V6 " Bhanuprakash Modem
2023-08-31 22:05 ` [igt-dev] ✗ GitLab.Pipeline: warning for New dir structure for intel specific tests (rev9) Patchwork
2023-08-31 22:41 ` [igt-dev] ✗ Fi.CI.BAT: failure " Patchwork
2023-08-31 23:09 ` [igt-dev] ✓ CI.xeBAT: success " Patchwork

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox