Skip to contentSkip to conversation

tests/i915: Remove subtests that rely on async relocation behavior

PATCH In review Maarten Lankhorst 3 participants 4 messages Aug 10, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tests/i915: Remove subtests that rely on async relocation behavior

These tests are no longer valid, as they require behavior that was never accepted upstream; it assumes that relocations don't block synchronously, and the reservation_object lock is only held at the end of command submission to install the fences.

---
 tests/i915/gem_exec_reloc.c | 219 ------------------------------------
 1 file changed, 219 deletions(-)
tests/i915/gem_exec_reloc.c +0 -219
index d50a8b69487f..85df3da7e011 100644
@@ -424,76 +424,6 @@ static void many_active(int i915, unsigned engine)
 	}
 }
 
-static void __wide_active(int i915, unsigned engine, unsigned long count)
-{
-	struct drm_i915_gem_relocation_entry *reloc =
-		calloc(count, sizeof(*reloc));
-	struct drm_i915_gem_exec_object2 *obj =
-		calloc(count + 1, sizeof(*obj));
-	struct drm_i915_gem_execbuffer2 execbuf = {
-		.buffers_ptr = to_user_pointer(obj),
-		.buffer_count = count + 1,
-		.flags = engine | I915_EXEC_HANDLE_LUT,
-	};
-	igt_spin_t *spin;
-
-	for (unsigned long i = 0; i < count; i++) {
-		obj[i].handle = gem_create(i915, 4096);
-		obj[i].flags = EXEC_OBJECT_WRITE;
-		obj[i].flags |= EXEC_OBJECT_SUPPORTS_48B_ADDRESS;
-	}
-
-	spin = __igt_spin_new(i915,
-			      .engine = engine,
-			      .flags = (IGT_SPIN_FENCE_OUT |
-					IGT_SPIN_NO_PREEMPTION));
-	obj[count] = spin->obj[1];
-	gem_execbuf(i915, &execbuf); /* mark all the objects as active */
-
-	for (unsigned long i = 0; i < count; i++) {
-		reloc[i].target_handle = i;
-		reloc[i].presumed_offset = ~0ull;
-		obj[i].relocs_ptr = to_user_pointer(&reloc[i]);
-		obj[i].relocation_count = 1;
-	}
-	gem_execbuf(i915, &execbuf); /* relocation onto active objects */
-
-	igt_assert_eq(sync_fence_status(spin->out_fence), 0);
-	igt_spin_free(i915, spin);
-
-	for (unsigned long i = 0; i < count; i++) {
-		uint64_t addr;
-
-		gem_read(i915, obj[i].handle, 0, &addr, sizeof(addr));
-		igt_assert_eq_u64(addr, obj[i].offset);
-
-		gem_close(i915, obj[i].handle);
-	}
-	free(obj);
-	free(reloc);
-}
-
-static void wide_active(int i915, unsigned engine)
-{
-	const uint64_t max = gem_aperture_size(i915) / 4096 / 2;
-	unsigned long count = 256;
-
-	igt_until_timeout(2) {
-		uint64_t required, total;
-
-		if (!__intel_check_memory(count, 4096, CHECK_RAM,
-					  &required, &total))
-			break;
-
-		igt_debug("Testing count:%lu\n", count);
-		__wide_active(i915, engine, count);
-
-		count <<= 1;
-		if (count >= max)
-			break;
-	}
-}
-
 static unsigned int offset_in_page(void *addr)
 {
 	return (uintptr_t)addr & 4095;
@@ -937,145 +867,6 @@ static void basic_softpin(int fd)
 	gem_close(fd, obj[1].handle);
 }
 
-static struct drm_i915_gem_relocation_entry *
-parallel_relocs(int count, unsigned long *out)
-{
-	struct drm_i915_gem_relocation_entry *reloc;
-	unsigned long sz;
-	int i;
-
-	sz = count * sizeof(*reloc);
-	sz = ALIGN(sz, 4096);
-
-	reloc = mmap(0, sz, PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0);
-	igt_assert(reloc != MAP_FAILED);
-	for (i = 0; i < count; i++) {
-		reloc[i].target_handle = 0;
-		reloc[i].presumed_offset = ~0ull;
-		reloc[i].offset = 8 * i;
-		reloc[i].delta = i;
-		reloc[i].read_domains = I915_GEM_DOMAIN_INSTRUCTION;
-		reloc[i].write_domain = 0;
-	}
-	mprotect(reloc, sz, PROT_READ);
-
-	*out = sz;
-	return reloc;
-}
-
-static int __execbuf(int i915, struct drm_i915_gem_execbuffer2 *execbuf)
-{
-	int err;
-
-	err = 0;
-	if (ioctl(i915, DRM_IOCTL_I915_GEM_EXECBUFFER2, execbuf)) {
-		err = -errno;
-		igt_assume(err);
-	}
-
-	errno = 0;
-	return err;
-}
-
-static int stop;
-static void sighandler(int sig)
-{
-	stop = 1;
-}
-
-static void parallel_child(int i915,
-			   const struct intel_execution_engine2 *engine,
-			   struct drm_i915_gem_relocation_entry *reloc,
-			   uint32_t common)
-{
-	igt_spin_t *spin = __igt_spin_new(i915, .engine = engine->flags);
-	struct drm_i915_gem_exec_object2 reloc_target = {
-		.handle = gem_create(i915, 32 * 1024 * 8),
-		.relocation_count = 32 * 1024,
-		.relocs_ptr = to_user_pointer(reloc),
-	};
-	struct drm_i915_gem_exec_object2 obj[3] = {
-		reloc_target,
-		{ .handle = common },
-		spin->obj[1],
-	};
-	struct drm_i915_gem_execbuffer2 execbuf = {
-		.buffers_ptr = to_user_pointer(obj),
-		.buffer_count = ARRAY_SIZE(obj),
-		.flags = engine->flags | I915_EXEC_HANDLE_LUT,
-	};
-	struct sigaction act = {
-		.sa_handler = sighandler,
-	};
-	unsigned long count = 0;
-
-	sigaction(SIGINT, &act, NULL);
-	while (!READ_ONCE(stop)) {
-		int err = __execbuf(i915, &execbuf);
-		if (err == -EINTR)
-			break;
-
-		igt_assert_eq(err, 0);
-		count++;
-	}
-
-	igt_info("%s: count %lu\n", engine->name, count);
-	igt_spin_free(i915, spin);
-}
-
-static void kill_children(int sig)
-{
-	signal(sig, SIG_IGN);
-	kill(-getpgrp(), SIGINT);
-	signal(sig, SIG_DFL);
-}
-
-static void parallel(int i915)
-{
-	const struct intel_execution_engine2 *e;
-	struct drm_i915_gem_relocation_entry *reloc;
-	uint32_t common = gem_create(i915, 4096);
-	uint32_t batch = batch_create(i915);
-	unsigned long reloc_sz;
-
-	reloc = parallel_relocs(32 * 1024, &reloc_sz);
-
-	stop = 0;
-	__for_each_physical_engine(i915, e) {
-		igt_fork(child, 1)
-			parallel_child(i915, e, reloc, common);
-	}
-	sleep(2);
-
-	if (gem_scheduler_has_preemption(i915)) {
-		uint32_t ctx = gem_context_clone_with_engines(i915, 0);
-
-		__for_each_physical_engine(i915, e) {
-			struct drm_i915_gem_exec_object2 obj[2] = {
-				{ .handle = common },
-				{ .handle = batch },
-			};
-			struct drm_i915_gem_execbuffer2 execbuf = {
-				.buffers_ptr = to_user_pointer(obj),
-				.buffer_count = ARRAY_SIZE(obj),
-				.flags = e->flags,
-				.rsvd1 = ctx,
-			};
-			gem_execbuf(i915, &execbuf);
-		}
-
-		gem_context_destroy(i915, ctx);
-	}
-	gem_sync(i915, batch);
-	gem_close(i915, batch);
-
-	kill_children(SIGINT);
-	igt_waitchildren();
-
-	gem_close(i915, common);
-	munmap(reloc, reloc_sz);
-}
-
 #define CONCURRENT 1024
 
 static uint64_t concurrent_relocs(int i915, int idx, int count)
@@ -1487,16 +1278,6 @@ igt_main
 		}
 	}
 
-	igt_subtest_with_dynamic("basic-wide-active") {
-		__for_each_physical_engine(fd, e) {
-			igt_dynamic_f("%s", e->name)
-				wide_active(fd, e->flags);
-		}
-	}
-
-	igt_subtest("basic-parallel")
-		parallel(fd);
-
 	igt_subtest("basic-concurrent0")
 		concurrent(fd, 0);
 	igt_subtest("basic-concurrent16")
Signature · 6 lines
2.28.0

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
#1 lore raw

[igt-dev] ✓ Fi.CI.BAT: success for tests/i915: Remove subtests that rely on async relocation behavior

== Series Details ==

== Series Details ==

Series: tests/i915: Remove subtests that rely on async relocation behavior
URL : https://patchwork.freedesktop.org/series/80460/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_8862 -> IGTPW_4868
====================================================

Summary
-------

**SUCCESS**

No regressions found.

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

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

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

### IGT changes ###

#### Issues hit ####

* igt@i915_module_load@reload:
- fi-apl-guc: [PASS][1] -> [DMESG-WARN][2] ([i915#1635] / [i915#1982])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8862/fi-apl-guc/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4868/fi-apl-guc/igt@[email protected]

* igt@kms_chamelium@common-hpd-after-suspend:
- fi-kbl-7500u: [PASS][3] -> [DMESG-WARN][4] ([i915#2203])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8862/fi-kbl-7500u/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4868/fi-kbl-7500u/igt@[email protected]

* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic:
- fi-bsw-kefka: [PASS][5] -> [DMESG-WARN][6] ([i915#1982]) +1 similar issue
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8862/fi-bsw-kefka/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4868/fi-bsw-kefka/igt@[email protected]

#### Possible fixes ####

* igt@gem_exec_suspend@basic-s0:
- fi-tgl-u2: [FAIL][7] ([i915#1888]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8862/fi-tgl-u2/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4868/fi-tgl-u2/igt@[email protected]

* igt@i915_pm_rpm@module-reload:
- fi-apl-guc: [DMESG-WARN][9] ([i915#1635] / [i915#1982]) -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8862/fi-apl-guc/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4868/fi-apl-guc/igt@[email protected]

* igt@kms_busy@basic@flip:
- fi-kbl-x1275: [DMESG-WARN][11] ([i915#62] / [i915#92] / [i915#95]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8862/fi-kbl-x1275/igt@kms_busy@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4868/fi-kbl-x1275/igt@kms_busy@[email protected]

#### Warnings ####

* igt@kms_cursor_legacy@basic-flip-after-cursor-legacy:
- fi-kbl-x1275: [DMESG-WARN][13] ([i915#62] / [i915#92]) -> [DMESG-WARN][14] ([i915#62] / [i915#92] / [i915#95]) +1 similar issue
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8862/fi-kbl-x1275/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4868/fi-kbl-x1275/igt@[email protected]

* igt@kms_flip@basic-flip-vs-dpms@a-dp1:
- fi-kbl-x1275: [DMESG-WARN][15] ([i915#62] / [i915#92] / [i915#95]) -> [DMESG-WARN][16] ([i915#62] / [i915#92]) +2 similar issues
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8862/fi-kbl-x1275/igt@kms_flip@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4868/fi-kbl-x1275/igt@kms_flip@[email protected]

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

[i915#1635]: https://gitlab.freedesktop.org/drm/intel/issues/1635
[i915#1888]: https://gitlab.freedesktop.org/drm/intel/issues/1888
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2203]: https://gitlab.freedesktop.org/drm/intel/issues/2203
[i915#62]: https://gitlab.freedesktop.org/drm/intel/issues/62
[i915#92]: https://gitlab.freedesktop.org/drm/intel/issues/92
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95

Participating hosts (42 -> 37)
------------------------------

Additional (1): fi-kbl-soraka
Missing (6): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-byt-clapper fi-bdw-samus

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

* CI: CI-20190529 -> None
* IGT: IGT_5765 -> IGTPW_4868

CI-20190529: 20190529
CI_DRM_8862: 147f0d3f7239756494adef31518f87e60a970878 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_4868: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4868/index.html
IGT_5765: 9f0977284d54ed37496260988dfcd6d2ad72dd1e @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools

== Testlist changes ==

-igt@gem_exec_reloc@basic-parallel
-igt@gem_exec_reloc@basic-wide-active

== Logs ==

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

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev

#2 lore raw

[igt-dev] ✓ Fi.CI.IGT: success for tests/i915: Remove subtests that rely on async relocation behavior

In reply to Maarten Lankhorst
== Series Details ==

== Series Details ==

Series: tests/i915: Remove subtests that rely on async relocation behavior
URL : https://patchwork.freedesktop.org/series/80460/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_8862_full -> IGTPW_4868_full
====================================================

Summary
-------

**SUCCESS**

No regressions found.

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

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

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

### IGT changes ###

#### Issues hit ####

* igt@kms_big_fb@x-tiled-32bpp-rotate-180:
- shard-kbl: [PASS][1] -> [DMESG-WARN][2] ([i915#93] / [i915#95])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8862/shard-kbl3/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4868/shard-kbl6/igt@[email protected]

* igt@kms_cursor_crc@pipe-a-cursor-dpms:
- shard-kbl: [PASS][3] -> [FAIL][4] ([i915#54])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8862/shard-kbl3/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4868/shard-kbl6/igt@[email protected]
- shard-apl: [PASS][5] -> [FAIL][6] ([i915#1635] / [i915#54])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8862/shard-apl8/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4868/shard-apl2/igt@[email protected]

* igt@kms_flip@2x-flip-vs-fences-interruptible@ab-vga1-hdmi-a1:
- shard-hsw: [PASS][7] -> [DMESG-WARN][8] ([i915#1982])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8862/shard-hsw6/igt@kms_flip@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4868/shard-hsw6/igt@kms_flip@[email protected]

* igt@kms_flip@flip-vs-suspend@c-dp1:
- shard-kbl: [PASS][9] -> [DMESG-WARN][10] ([i915#180]) +11 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8862/shard-kbl6/igt@kms_flip@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4868/shard-kbl1/igt@kms_flip@[email protected]

* igt@kms_frontbuffer_tracking@psr-1p-primscrn-pri-shrfb-draw-render:
- shard-tglb: [PASS][11] -> [DMESG-WARN][12] ([i915#1982]) +1 similar issue
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8862/shard-tglb5/igt@kms_frontbuffer_tracking@psr-1p-primscrn-pri-shrfb-draw-render.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4868/shard-tglb5/igt@kms_frontbuffer_tracking@psr-1p-primscrn-pri-shrfb-draw-render.html

* igt@kms_lease@lease_invalid_crtc:
- shard-hsw: [PASS][13] -> [TIMEOUT][14] ([i915#1958]) +2 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8862/shard-hsw1/igt@kms_lease@lease_invalid_crtc.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4868/shard-hsw8/igt@kms_lease@lease_invalid_crtc.html

* igt@kms_psr@psr2_cursor_plane_onoff:
- shard-iclb: [PASS][15] -> [SKIP][16] ([fdo#109441]) +2 similar issues
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8862/shard-iclb2/igt@kms_psr@psr2_cursor_plane_onoff.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4868/shard-iclb4/igt@kms_psr@psr2_cursor_plane_onoff.html

* igt@perf@blocking-parameterized:
- shard-iclb: [PASS][17] -> [FAIL][18] ([i915#1542])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8862/shard-iclb4/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4868/shard-iclb6/igt@[email protected]

* igt@perf@polling-parameterized:
- shard-iclb: [PASS][19] -> [DMESG-WARN][20] ([i915#1982]) +1 similar issue
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8862/shard-iclb2/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4868/shard-iclb2/igt@[email protected]

* igt@prime_busy@after-wait@vcs0:
- shard-hsw: [PASS][21] -> [FAIL][22] ([i915#2258]) +2 similar issues
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8862/shard-hsw6/igt@prime_busy@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4868/shard-hsw5/igt@prime_busy@[email protected]

* igt@syncobj_wait@multi-wait-for-submit-submitted-signaled:
- shard-snb: [PASS][23] -> [TIMEOUT][24] ([i915#1958]) +2 similar issues
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8862/shard-snb2/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4868/shard-snb2/igt@[email protected]

* igt@sysfs_preempt_timeout@timeout@vecs0:
- shard-glk: [PASS][25] -> [FAIL][26] ([i915#1755])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8862/shard-glk5/igt@sysfs_preempt_timeout@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4868/shard-glk9/igt@sysfs_preempt_timeout@[email protected]

#### Possible fixes ####

* {igt@feature_discovery@psr2}:
- shard-iclb: [SKIP][27] ([i915#658]) -> [PASS][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8862/shard-iclb8/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4868/shard-iclb2/igt@[email protected]

* igt@gem_ctx_isolation@preservation-s3@vecs0:
- shard-kbl: [DMESG-WARN][29] ([i915#180]) -> [PASS][30] +3 similar issues
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8862/shard-kbl1/igt@gem_ctx_isolation@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4868/shard-kbl7/igt@gem_ctx_isolation@[email protected]

* igt@gem_eio@kms:
- shard-apl: [DMESG-WARN][31] ([i915#1635] / [i915#1982]) -> [PASS][32] +1 similar issue
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8862/shard-apl4/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4868/shard-apl2/igt@[email protected]

* igt@gem_exec_whisper@basic-queues-forked-all:
- shard-glk: [DMESG-WARN][33] ([i915#118] / [i915#95]) -> [PASS][34] +2 similar issues
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8862/shard-glk4/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4868/shard-glk7/igt@[email protected]

* igt@kms_cursor_edge_walk@pipe-c-128x128-bottom-edge:
- shard-glk: [DMESG-WARN][35] ([i915#1982]) -> [PASS][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8862/shard-glk4/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4868/shard-glk3/igt@[email protected]

* igt@kms_cursor_legacy@cursor-vs-flip-toggle:
- shard-hsw: [FAIL][37] ([i915#57]) -> [PASS][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8862/shard-hsw1/igt@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4868/shard-hsw6/igt@[email protected]

* igt@kms_flip@2x-plain-flip-fb-recreate@ab-vga1-hdmi-a1:
- shard-hsw: [DMESG-WARN][39] ([i915#1982]) -> [PASS][40]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8862/shard-hsw6/igt@kms_flip@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4868/shard-hsw2/igt@kms_flip@[email protected]

* igt@kms_flip@modeset-vs-vblank-race-interruptible@a-dp1:
- shard-kbl: [DMESG-WARN][41] ([i915#1982]) -> [PASS][42]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8862/shard-kbl2/igt@kms_flip@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4868/shard-kbl4/igt@kms_flip@[email protected]

* igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-shrfb-draw-mmap-wc:
- shard-tglb: [DMESG-WARN][43] ([i915#1982]) -> [PASS][44] +2 similar issues
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8862/shard-tglb5/igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-shrfb-draw-mmap-wc.html
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4868/shard-tglb8/igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-shrfb-draw-mmap-wc.html
- shard-iclb: [DMESG-WARN][45] ([i915#1982]) -> [PASS][46]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8862/shard-iclb7/igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-shrfb-draw-mmap-wc.html
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4868/shard-iclb6/igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-shrfb-draw-mmap-wc.html

* igt@kms_psr@no_drrs:
- shard-iclb: [FAIL][47] ([i915#173]) -> [PASS][48]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8862/shard-iclb1/igt@kms_psr@no_drrs.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4868/shard-iclb7/igt@kms_psr@no_drrs.html

* igt@kms_psr@psr2_cursor_blt:
- shard-iclb: [SKIP][49] ([fdo#109441]) -> [PASS][50] +2 similar issues
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8862/shard-iclb1/igt@kms_psr@psr2_cursor_blt.html
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4868/shard-iclb2/igt@kms_psr@psr2_cursor_blt.html

* igt@perf_pmu@init-wait@vecs0:
- shard-hsw: [DMESG-WARN][51] ([i915#2316]) -> [PASS][52]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8862/shard-hsw6/igt@perf_pmu@[email protected]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4868/shard-hsw1/igt@perf_pmu@[email protected]

* igt@prime_busy@hang-wait@bcs0:
- shard-hsw: [FAIL][53] ([i915#2258]) -> [PASS][54] +5 similar issues
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8862/shard-hsw6/igt@prime_busy@[email protected]
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4868/shard-hsw7/igt@prime_busy@[email protected]

* {igt@syncobj_timeline@invalid-multi-wait-unsubmitted-submitted}:
- shard-hsw: [TIMEOUT][55] ([i915#1958]) -> [PASS][56]
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8862/shard-hsw6/igt@[email protected]
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4868/shard-hsw2/igt@[email protected]

#### Warnings ####

* igt@gem_ctx_engines@execute-one:
- shard-snb: [SKIP][57] ([fdo#109271]) -> [TIMEOUT][58] ([i915#1958]) +1 similar issue
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8862/shard-snb2/igt@[email protected]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4868/shard-snb2/igt@[email protected]

* igt@gem_exec_reloc@basic-concurrent16:
- shard-snb: [FAIL][59] ([i915#1930]) -> [TIMEOUT][60] ([i915#1958])
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8862/shard-snb6/igt@[email protected]
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4868/shard-snb2/igt@[email protected]

* igt@kms_content_protection@lic:
- shard-kbl: [TIMEOUT][61] ([i915#1319] / [i915#1958]) -> [TIMEOUT][62] ([i915#1319])
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8862/shard-kbl7/igt@[email protected]
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4868/shard-kbl6/igt@[email protected]

* igt@kms_cursor_crc@pipe-a-cursor-suspend:
- shard-kbl: [INCOMPLETE][63] ([i915#155]) -> [DMESG-WARN][64] ([i915#180])
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8862/shard-kbl4/igt@[email protected]
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4868/shard-kbl2/igt@[email protected]

* igt@kms_frontbuffer_tracking@fbcpsr-2p-scndscrn-pri-indfb-draw-mmap-gtt:
- shard-hsw: [TIMEOUT][65] ([i915#1958]) -> [SKIP][66] ([fdo#109271]) +3 similar issues
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8862/shard-hsw6/igt@kms_frontbuffer_tracking@fbcpsr-2p-scndscrn-pri-indfb-draw-mmap-gtt.html
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4868/shard-hsw1/igt@kms_frontbuffer_tracking@fbcpsr-2p-scndscrn-pri-indfb-draw-mmap-gtt.html

* igt@kms_psr@primary_render:
- shard-hsw: [SKIP][67] ([fdo#109271]) -> [TIMEOUT][68] ([i915#1958])
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8862/shard-hsw1/igt@kms_psr@primary_render.html
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4868/shard-hsw8/igt@kms_psr@primary_render.html

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

[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[i915#118]: https://gitlab.freedesktop.org/drm/intel/issues/118
[i915#1319]: https://gitlab.freedesktop.org/drm/intel/issues/1319
[i915#1542]: https://gitlab.freedesktop.org/drm/intel/issues/1542
[i915#155]: https://gitlab.freedesktop.org/drm/intel/issues/155
[i915#1635]: https://gitlab.freedesktop.org/drm/intel/issues/1635
[i915#173]: https://gitlab.freedesktop.org/drm/intel/issues/173
[i915#1755]: https://gitlab.freedesktop.org/drm/intel/issues/1755
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#1930]: https://gitlab.freedesktop.org/drm/intel/issues/1930
[i915#1958]: https://gitlab.freedesktop.org/drm/intel/issues/1958
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2258]: https://gitlab.freedesktop.org/drm/intel/issues/2258
[i915#2316]: https://gitlab.freedesktop.org/drm/intel/issues/2316
[i915#54]: https://gitlab.freedesktop.org/drm/intel/issues/54
[i915#57]: https://gitlab.freedesktop.org/drm/intel/issues/57
[i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
[i915#93]: https://gitlab.freedesktop.org/drm/intel/issues/93
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95

Participating hosts (11 -> 8)
------------------------------

Missing (3): pig-skl-6260u pig-glk-j5005 pig-icl-1065g7

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

* CI: CI-20190529 -> None
* IGT: IGT_5765 -> IGTPW_4868
* Piglit: piglit_4509 -> None

CI-20190529: 20190529
CI_DRM_8862: 147f0d3f7239756494adef31518f87e60a970878 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_4868: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4868/index.html
IGT_5765: 9f0977284d54ed37496260988dfcd6d2ad72dd1e @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit

== Logs ==

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

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev

Acked-by on v1 1/1
#3 lore raw
In reply to Maarten Lankhorst
Quoted 8 lines · Maarten Lankhorst

These tests are no longer valid, as they require behavior that was never accepted upstream; it assumes that relocations don't block synchronously, and the reservation_object lock is only held at the end of command submission to install the fences.

Quoted 249 lines
---
 tests/i915/gem_exec_reloc.c | 219 ------------------------------------
 1 file changed, 219 deletions(-)
tests/i915/gem_exec_reloc.c +0 -220
index d50a8b69487f..85df3da7e011 100644
@@ -424,76 +424,6 @@ static void many_active(int i915, unsigned engine)
        }
 }
 
-static void __wide_active(int i915, unsigned engine, unsigned long count)
-{
-       struct drm_i915_gem_relocation_entry *reloc =
-               calloc(count, sizeof(*reloc));
-       struct drm_i915_gem_exec_object2 *obj =
-               calloc(count + 1, sizeof(*obj));
-       struct drm_i915_gem_execbuffer2 execbuf = {
-               .buffers_ptr = to_user_pointer(obj),
-               .buffer_count = count + 1,
-               .flags = engine | I915_EXEC_HANDLE_LUT,
-       };
-       igt_spin_t *spin;
-
-       for (unsigned long i = 0; i < count; i++) {
-               obj[i].handle = gem_create(i915, 4096);
-               obj[i].flags = EXEC_OBJECT_WRITE;
-               obj[i].flags |= EXEC_OBJECT_SUPPORTS_48B_ADDRESS;
-       }
-
-       spin = __igt_spin_new(i915,
-                             .engine = engine,
-                             .flags = (IGT_SPIN_FENCE_OUT |
-                                       IGT_SPIN_NO_PREEMPTION));
-       obj[count] = spin->obj[1];
-       gem_execbuf(i915, &execbuf); /* mark all the objects as active */
-
-       for (unsigned long i = 0; i < count; i++) {
-               reloc[i].target_handle = i;
-               reloc[i].presumed_offset = ~0ull;
-               obj[i].relocs_ptr = to_user_pointer(&reloc[i]);
-               obj[i].relocation_count = 1;
-       }
-       gem_execbuf(i915, &execbuf); /* relocation onto active objects */
-
-       igt_assert_eq(sync_fence_status(spin->out_fence), 0);
-       igt_spin_free(i915, spin);
-
-       for (unsigned long i = 0; i < count; i++) {
-               uint64_t addr;
-
-               gem_read(i915, obj[i].handle, 0, &addr, sizeof(addr));
-               igt_assert_eq_u64(addr, obj[i].offset);
-
-               gem_close(i915, obj[i].handle);
-       }
-       free(obj);
-       free(reloc);
-}
-
-static void wide_active(int i915, unsigned engine)
-{
-       const uint64_t max = gem_aperture_size(i915) / 4096 / 2;
-       unsigned long count = 256;
-
-       igt_until_timeout(2) {
-               uint64_t required, total;
-
-               if (!__intel_check_memory(count, 4096, CHECK_RAM,
-                                         &required, &total))
-                       break;
-
-               igt_debug("Testing count:%lu\n", count);
-               __wide_active(i915, engine, count);
-
-               count <<= 1;
-               if (count >= max)
-                       break;
-       }
-}
-
 static unsigned int offset_in_page(void *addr)
 {
        return (uintptr_t)addr & 4095;
@@ -937,145 +867,6 @@ static void basic_softpin(int fd)
        gem_close(fd, obj[1].handle);
 }
 
-static struct drm_i915_gem_relocation_entry *
-parallel_relocs(int count, unsigned long *out)
-{
-       struct drm_i915_gem_relocation_entry *reloc;
-       unsigned long sz;
-       int i;
-
-       sz = count * sizeof(*reloc);
-       sz = ALIGN(sz, 4096);
-
-       reloc = mmap(0, sz, PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0);
-       igt_assert(reloc != MAP_FAILED);
-       for (i = 0; i < count; i++) {
-               reloc[i].target_handle = 0;
-               reloc[i].presumed_offset = ~0ull;
-               reloc[i].offset = 8 * i;
-               reloc[i].delta = i;
-               reloc[i].read_domains = I915_GEM_DOMAIN_INSTRUCTION;
-               reloc[i].write_domain = 0;
-       }
-       mprotect(reloc, sz, PROT_READ);
-
-       *out = sz;
-       return reloc;
-}
-
-static int __execbuf(int i915, struct drm_i915_gem_execbuffer2 *execbuf)
-{
-       int err;
-
-       err = 0;
-       if (ioctl(i915, DRM_IOCTL_I915_GEM_EXECBUFFER2, execbuf)) {
-               err = -errno;
-               igt_assume(err);
-       }
-
-       errno = 0;
-       return err;
-}
-
-static int stop;
-static void sighandler(int sig)
-{
-       stop = 1;
-}
-
-static void parallel_child(int i915,
-                          const struct intel_execution_engine2 *engine,
-                          struct drm_i915_gem_relocation_entry *reloc,
-                          uint32_t common)
-{
-       igt_spin_t *spin = __igt_spin_new(i915, .engine = engine->flags);
-       struct drm_i915_gem_exec_object2 reloc_target = {
-               .handle = gem_create(i915, 32 * 1024 * 8),
-               .relocation_count = 32 * 1024,
-               .relocs_ptr = to_user_pointer(reloc),
-       };
-       struct drm_i915_gem_exec_object2 obj[3] = {
-               reloc_target,
-               { .handle = common },
-               spin->obj[1],
-       };
-       struct drm_i915_gem_execbuffer2 execbuf = {
-               .buffers_ptr = to_user_pointer(obj),
-               .buffer_count = ARRAY_SIZE(obj),
-               .flags = engine->flags | I915_EXEC_HANDLE_LUT,
-       };
-       struct sigaction act = {
-               .sa_handler = sighandler,
-       };
-       unsigned long count = 0;
-
-       sigaction(SIGINT, &act, NULL);
-       while (!READ_ONCE(stop)) {
-               int err = __execbuf(i915, &execbuf);
-               if (err == -EINTR)
-                       break;
-
-               igt_assert_eq(err, 0);
-               count++;
-       }
-
-       igt_info("%s: count %lu\n", engine->name, count);
-       igt_spin_free(i915, spin);
-}
-
-static void kill_children(int sig)
-{
-       signal(sig, SIG_IGN);
-       kill(-getpgrp(), SIGINT);
-       signal(sig, SIG_DFL);
-}
-
-static void parallel(int i915)
-{
-       const struct intel_execution_engine2 *e;
-       struct drm_i915_gem_relocation_entry *reloc;
-       uint32_t common = gem_create(i915, 4096);
-       uint32_t batch = batch_create(i915);
-       unsigned long reloc_sz;
-
-       reloc = parallel_relocs(32 * 1024, &reloc_sz);
-
-       stop = 0;
-       __for_each_physical_engine(i915, e) {
-               igt_fork(child, 1)
-                       parallel_child(i915, e, reloc, common);
-       }
-       sleep(2);
-
-       if (gem_scheduler_has_preemption(i915)) {
-               uint32_t ctx = gem_context_clone_with_engines(i915, 0);
-
-               __for_each_physical_engine(i915, e) {
-                       struct drm_i915_gem_exec_object2 obj[2] = {
-                               { .handle = common },
-                               { .handle = batch },
-                       };
-                       struct drm_i915_gem_execbuffer2 execbuf = {
-                               .buffers_ptr = to_user_pointer(obj),
-                               .buffer_count = ARRAY_SIZE(obj),
-                               .flags = e->flags,
-                               .rsvd1 = ctx,
-                       };
-                       gem_execbuf(i915, &execbuf);
-               }
-
-               gem_context_destroy(i915, ctx);
-       }
-       gem_sync(i915, batch);
-       gem_close(i915, batch);
-
-       kill_children(SIGINT);
-       igt_waitchildren();
-
-       gem_close(i915, common);
-       munmap(reloc, reloc_sz);
-}
-
 #define CONCURRENT 1024
 
 static uint64_t concurrent_relocs(int i915, int idx, int count)
@@ -1487,16 +1278,6 @@ igt_main
                }
        }
 
-       igt_subtest_with_dynamic("basic-wide-active") {
-               __for_each_physical_engine(fd, e) {
-                       igt_dynamic_f("%s", e->name)
-                               wide_active(fd, e->flags);
-               }
-       }
-
-       igt_subtest("basic-parallel")
-               parallel(fd);
-
        igt_subtest("basic-concurrent0")
                concurrent(fd, 0);
        igt_subtest("basic-concurrent16")
--
Quoted 2 lines

2.28.0

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev