[igt-dev] [PATCH i-g-t v3 1/3] intel-ci: update blacklists to work with the Xe driver

[Mauro Carvalho Chehab]

On Wed, 22 Mar 2023 18:44:46 +0100
Kamil Konieczny <kamil.konieczny at linux.intel.com> wrote:

> Hi Mauro,
> 
> On 2023-03-22 at 15:00:28 +0100, Mauro Carvalho Chehab wrote:
> > From: Mauro Carvalho Chehab <mchehab at kernel.org>
> > 
> > It doesn't make sense to run i915 tests with Xe driver and
> > vice-versa. Update testlists to make it clear.
> > 
> > In order to avoid disrupts at exiting intel-ci tests, keep a
> > symlink:
> > 	i915-blacklist.txt -> blacklist.txt
> > 
> > Signed-off-by: Mauro Carvalho Chehab <mchehab at kernel.org>
> > ---
> >  tests/intel-ci/blacklist.txt      | 130 +----------------------------
> >  tests/intel-ci/i915-blacklist.txt | 133 ++++++++++++++++++++++++++++++  
> 
> Why not just git mv oldfile newfile ?

I did that. Then, I created a link:
	ln -s blacklist.txt tests/intel-ci/i915-blacklist.txt 

The rationale is to avoid breaking any existing CI pipelines that would
be expecting to find the i915 blacklist as "blacklist.txt.".

> But that aside, imho better solution would be to just
> add xe_* to blacklist. 

That is what I did: once renamed: I added "igt at xe_.*" to the blacklist
file.

Unfortunately, git diff output is weird when there is a rename and
a symlink to the same name at the same patch. If you prefer, I can
split it on two patches to make easier to view the differences.

> I am also not sure you can include
> one blacklist into another.

There's no such thing. Both blacklist files are independent. You
probably got tricked by the weird output git produced with the rename
+ symlink at the same patch.

> 
> +Cc: Petri Latvala <adrinael at adrinael.net>
> 
> >  tests/intel-ci/xe-blacklist.txt   |  21 +++++
> >  3 files changed, 155 insertions(+), 129 deletions(-)
> >  mode change 100644 => 120000 tests/intel-ci/blacklist.txt
> >  create mode 100644 tests/intel-ci/i915-blacklist.txt
> >  create mode 100644 tests/intel-ci/xe-blacklist.txt
> > 
> > diff --git a/tests/intel-ci/blacklist.txt b/tests/intel-ci/blacklist.txt
> > deleted file mode 100644
> > index 6e5cc43667cf..000000000000
> > --- a/tests/intel-ci/blacklist.txt
> > +++ /dev/null
> > @@ -1,129 +0,0 @@
> > -igt at meta_test(@.*)?
> > -###############################################
> > -# Handle module reloads with great care!
> > -#
> > -# Reloading a module is more likely to leave
> > -# the machine in an unexpected state than other
> > -# self-contained tests, leading to random
> > -# failures in tests run afterwards.
> > -###############################################
> > -#igt at i915_module_load(@.*)? # danger, danger; hope for taints!
> > -igt at i915_pm_rpm@module-reload
> > -igt at i915_pm_rpm@gem-execbuf-stress-extra-wait
> > -###############################################
> > -# GEM
> > -###############################################
> > -igt at gem_busy@hang.*
> > -igt at gem_close_race@(?!.*basic).*
> > -igt at gem_concurrent_blit(@.*)?
> > -igt at gem_ctx_create@(?!.*basic).*
> > -igt at gem_ctx_exec@(?!.*basic).*
> > -igt at gem_ctx_shared@*exhaust*
> > -igt at gem_ctx_switch(@.*)?
> > -igt at gem_evict_alignment(@.*)?
> > -igt at gem_evict_everything(@.*)?
> > -igt at gem_exec_big@(?!.*single).*
> > -igt at gem_exec_capture@many-(?!4K-).*
> > -igt at gem_exec_fair@(?!.*basic).*
> > -igt at gem_exec_fence@.*hang.*
> > -igt at gem_exec_flush@(?!.*basic).*
> > -igt at gem_exec_latency(@.*)?
> > -igt at gem_exec_lut_handle(@.*)?
> > -igt at gem_exec_nop@(?!.*basic).*
> > -igt at gem_exec_reloc@(?!.*basic).*
> > -igt at gem_exec_suspend@(?!.*basic).*
> > -igt at gem_exec_whisper@(?!basic).*
> > -igt at gem_fd_exhaustion(@.*)?
> > -igt at gem_fence_upload(@.*)?
> > -igt at gem_gtt_hog(@.*)?
> > -igt at gem_gtt_speed(@.*)?
> > -igt at gem_lut_handle(@.*)?
> > -igt at gem_mmap_gtt@.*(huge|swap|clflush|forked).*
> > -igt at gem_mmap@.*(swap|huge).*
> > -igt at gem_pread_after_blit(@.*)?
> > -igt at gem_pwrite@(?!.*basic).*
> > -igt at gem_read_read_speed(@.*)?
> > -igt at gem_render_linear_blits@(?!.*basic).*
> > -igt at gem_render_tiled_blits@(?!.*basic).*
> > -igt at gem_reset_stats(@.*)?
> > -igt at gem_ringfill@(?!.*basic).*
> > -igt at gem_shrink@(?!reclaim$).*
> > -igt at gem_softpin@.*(hang|S4).*
> > -igt at gem_streaming_writes(@.*)?
> > -igt at gem_sync@(?!.*basic).*
> > -igt at gem_tiled_swapping@(?!non-threaded).*
> > -igt at gem_userptr_blits@(major|minor|forked|mlocked|swapping).*
> > -igt at gem_wait@hang.*
> > -igt at gem_watchdog@far-fence
> > -igt at sysfs_heartbeat_interval@(long|off)
> > -igt at sysfs_preempt_timeout@off
> > -igt at sysfs_timeslice_duration@off
> > -###############################################
> > -# GEM: Not worth fixing
> > -###############################################
> > -igt at gen7_exec_parse@.*lri.*
> > -igt at gem_exec_alignment@pi-shared
> > -###############################################
> > -# There are no DRRS capable displays in CI lab
> > -###############################################
> > -igt at kms_frontbuffer_tracking@.*drrs.*
> > -###############################################
> > -# Tends to generate invalid configurations
> > -# using CCS planes or configurations that
> > -# exceed HW capabilities resulting in sporadic
> > -# failure with -EINVAL.
> > -#
> > -# Maintaining extra constraints for Intel's HW
> > -# is too costly in comparison to the value
> > -# provided.
> > -###############################################
> > -igt at kms_chamelium_frames@hdmi-.*-planes-random
> > -###############################################
> > -# Broadcom
> > -###############################################
> > -igt at vc4_.*
> > -igt at v3d_.*
> > -###############################################
> > -# AMD
> > -###############################################
> > -igt at amdgpu/.*
> > -###############################################
> > -# Panfrost
> > -###############################################
> > -igt at panfrost_.*
> > -###############################################
> > -# Qualcomm
> > -###############################################
> > -igt at msm_.*
> > -###############################################
> > -# Hibernate: not configured correctly on CI
> > -###############################################
> > -igt at .*@.*-hibernate
> > -igt at gem_softpin@noreloc-s4
> > -igt at gem_workarounds@hibernate-.*
> > -igt at gem_exec_suspend@basic-s4$
> > -igt at gem_ctx_isolation@.*-s4
> > -###############################################
> > -# Out-of-memory: spammy and often broken
> > -###############################################
> > -igt at i915_suspend@shrink
> > -###############################################
> > -# pipe-e, pipe-f no current HW support
> > -###############################################
> > -igt at .*@.*pipe-e($|-.*)
> > -igt at .*@.*pipe-f($|-.*)
> > -
> > -###############################################
> > -# Temporary workarounds for CI-impacting bugs
> > -###############################################
> > -
> > -# Currently fails and leaves the machine in a very bad state, and
> > -# causes coverage loss for other tests. IOMMU related.
> > -# https://gitlab.freedesktop.org/drm/intel/-/issues/2644
> > -igt at core_hotunplug@.*(hot|plug).*
> > -
> > -# hangs several gens of hosts, and has no immediate fix
> > -igt at device_reset@reset-bound
> > -
> > -# not working for i915
> > -igt at kms_bw@.*
> > diff --git a/tests/intel-ci/blacklist.txt b/tests/intel-ci/blacklist.txt
> > new file mode 120000
> > index 000000000000..e48e29e27f4e
> > --- /dev/null
> > +++ b/tests/intel-ci/blacklist.txt
> > @@ -0,0 +1 @@
> > +i915-blacklist.txt
> > \ No newline at end of file  
> 
> I am not sure it will work.
> 
> > diff --git a/tests/intel-ci/i915-blacklist.txt b/tests/intel-ci/i915-blacklist.txt
> > new file mode 100644
> > index 000000000000..389a2acb7f44
> > --- /dev/null
> > +++ b/tests/intel-ci/i915-blacklist.txt
> > @@ -0,0 +1,133 @@
> > +igt at meta_test(@.*)?
> > +###############################################
> > +# Handle module reloads with great care!
> > +#
> > +# Reloading a module is more likely to leave
> > +# the machine in an unexpected state than other
> > +# self-contained tests, leading to random
> > +# failures in tests run afterwards.
> > +###############################################
> > +#igt at i915_module_load(@.*)? # danger, danger; hope for taints!
> > +igt at i915_pm_rpm@module-reload
> > +igt at i915_pm_rpm@gem-execbuf-stress-extra-wait
> > +###############################################
> > +# GEM
> > +###############################################
> > +igt at gem_busy@hang.*
> > +igt at gem_close_race@(?!.*basic).*
> > +igt at gem_concurrent_blit(@.*)?
> > +igt at gem_ctx_create@(?!.*basic).*
> > +igt at gem_ctx_exec@(?!.*basic).*
> > +igt at gem_ctx_shared@*exhaust*
> > +igt at gem_ctx_switch(@.*)?
> > +igt at gem_evict_alignment(@.*)?
> > +igt at gem_evict_everything(@.*)?
> > +igt at gem_exec_big@(?!.*single).*
> > +igt at gem_exec_capture@many-(?!4K-).*
> > +igt at gem_exec_fair@(?!.*basic).*
> > +igt at gem_exec_fence@.*hang.*
> > +igt at gem_exec_flush@(?!.*basic).*
> > +igt at gem_exec_latency(@.*)?
> > +igt at gem_exec_lut_handle(@.*)?
> > +igt at gem_exec_nop@(?!.*basic).*
> > +igt at gem_exec_reloc@(?!.*basic).*
> > +igt at gem_exec_suspend@(?!.*basic).*
> > +igt at gem_exec_whisper@(?!basic).*
> > +igt at gem_fd_exhaustion(@.*)?
> > +igt at gem_fence_upload(@.*)?
> > +igt at gem_gtt_hog(@.*)?
> > +igt at gem_gtt_speed(@.*)?
> > +igt at gem_lut_handle(@.*)?
> > +igt at gem_mmap_gtt@.*(huge|swap|clflush|forked).*
> > +igt at gem_mmap@.*(swap|huge).*
> > +igt at gem_pread_after_blit(@.*)?
> > +igt at gem_pwrite@(?!.*basic).*
> > +igt at gem_read_read_speed(@.*)?
> > +igt at gem_render_linear_blits@(?!.*basic).*
> > +igt at gem_render_tiled_blits@(?!.*basic).*
> > +igt at gem_reset_stats(@.*)?
> > +igt at gem_ringfill@(?!.*basic).*
> > +igt at gem_shrink@(?!reclaim$).*
> > +igt at gem_softpin@.*(hang|S4).*
> > +igt at gem_streaming_writes(@.*)?
> > +igt at gem_sync@(?!.*basic).*
> > +igt at gem_tiled_swapping@(?!non-threaded).*
> > +igt at gem_userptr_blits@(major|minor|forked|mlocked|swapping).*
> > +igt at gem_wait@hang.*
> > +igt at gem_watchdog@far-fence
> > +igt at sysfs_heartbeat_interval@(long|off)
> > +igt at sysfs_preempt_timeout@off
> > +igt at sysfs_timeslice_duration@off
> > +###############################################
> > +# GEM: Not worth fixing
> > +###############################################
> > +igt at gen7_exec_parse@.*lri.*
> > +igt at gem_exec_alignment@pi-shared
> > +###############################################
> > +# There are no DRRS capable displays in CI lab
> > +###############################################
> > +igt at kms_frontbuffer_tracking@.*drrs.*
> > +###############################################
> > +# Tends to generate invalid configurations
> > +# using CCS planes or configurations that
> > +# exceed HW capabilities resulting in sporadic
> > +# failure with -EINVAL.
> > +#
> > +# Maintaining extra constraints for Intel's HW
> > +# is too costly in comparison to the value
> > +# provided.
> > +###############################################
> > +igt at kms_chamelium_frames@hdmi-.*-planes-random
> > +###############################################
> > +# Broadcom
> > +###############################################
> > +igt at vc4_.*
> > +igt at v3d_.*
> > +###############################################
> > +# Intel Xe
> > +###############################################
> > +igt at xe/.*  
> -------- ^
> imho this should be
> 
> igt at xe_.*
> 
> > +###############################################
> > +# AMD
> > +###############################################
> > +igt at amdgpu/.*
> > +###############################################
> > +# Panfrost
> > +###############################################
> > +igt at panfrost_.*
> > +###############################################
> > +# Qualcomm
> > +###############################################
> > +igt at msm_.*
> > +###############################################
> > +# Hibernate: not configured correctly on CI
> > +###############################################
> > +igt at .*@.*-hibernate
> > +igt at gem_softpin@noreloc-s4
> > +igt at gem_workarounds@hibernate-.*
> > +igt at gem_exec_suspend@basic-s4$
> > +igt at gem_ctx_isolation@.*-s4
> > +###############################################
> > +# Out-of-memory: spammy and often broken
> > +###############################################
> > +igt at i915_suspend@shrink
> > +###############################################
> > +# pipe-e, pipe-f no current HW support
> > +###############################################
> > +igt at .*@.*pipe-e($|-.*)
> > +igt at .*@.*pipe-f($|-.*)
> > +
> > +###############################################
> > +# Temporary workarounds for CI-impacting bugs
> > +###############################################
> > +
> > +# Currently fails and leaves the machine in a very bad state, and
> > +# causes coverage loss for other tests. IOMMU related.
> > +# https://gitlab.freedesktop.org/drm/intel/-/issues/2644
> > +igt at core_hotunplug@.*(hot|plug).*
> > +
> > +# hangs several gens of hosts, and has no immediate fix
> > +igt at device_reset@reset-bound
> > +
> > +# not working for i915
> > +igt at kms_bw@.*
> > diff --git a/tests/intel-ci/xe-blacklist.txt b/tests/intel-ci/xe-blacklist.txt
> > new file mode 100644
> > index 000000000000..986e91a67069
> > --- /dev/null
> > +++ b/tests/intel-ci/xe-blacklist.txt
> > @@ -0,0 +1,21 @@
> > +###############################################
> > +# Broadcom
> > +###############################################
> > +igt at vc4_.*
> > +igt at v3d_.*
> > +###############################################
> > +# Intel i915
> > +###############################################
> > +igt at i915/.*  
> ---------- ^
> 
> imho:
> igt at i915_.*
> igt at gem_.*
> 
> Regards,
> Kamil
> 
> > +###############################################
> > +# AMD
> > +###############################################
> > +igt at amdgpu/.*
> > +###############################################
> > +# Panfrost
> > +###############################################
> > +igt at panfrost_.*
> > +###############################################
> > +# Qualcomm
> > +###############################################
> > +igt at msm_.*
> > -- 
> > 2.39.2
> >