igt-dev.lists.freedesktop.org archive mirror
 help / color / mirror / Atom feed
* [Intel-gfx] [PATCH i-g-t] igt: Force eviction of test bo directly
@ 2018-07-13  9:54 Chris Wilson
  2018-07-13 10:19 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Chris Wilson @ 2018-07-13  9:54 UTC (permalink / raw)
  To: intel-gfx; +Cc: igt-dev

Currently we indirectly try to evict the test buffers by mmaping enough
bo that should fill the aperture. However, this assumes that the kernel
is trying to fill the aperture and does not use random replacement
(which it does) or use small partials to avoid mmaping the whole object
(which it does). Rather than assume, use the debugfs interface to force
the eviction of the bound objects.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 tests/gem_caching.c                    | 9 +--------
 tests/gem_partial_pwrite_pread.c       | 9 +--------
 tests/gem_tiled_partial_pwrite_pread.c | 9 +--------
 3 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/tests/gem_caching.c b/tests/gem_caching.c
index 7a9f03aa3..09e1a5f97 100644
--- a/tests/gem_caching.c
+++ b/tests/gem_caching.c
@@ -55,7 +55,6 @@ drm_intel_bo *scratch_bo;
 drm_intel_bo *staging_bo;
 #define BO_SIZE (4*4096)
 uint32_t devid;
-uint64_t mappable_gtt_limit;
 int fd;
 
 static void
@@ -90,9 +89,7 @@ blt_bo_fill(drm_intel_bo *tmp_bo, drm_intel_bo *bo, uint8_t val)
 
 	drm_intel_gem_bo_unmap_gtt(tmp_bo);
 
-	if (bo->offset < mappable_gtt_limit &&
-	    (IS_G33(devid) || intel_gen(devid) >= 4))
-		igt_trash_aperture();
+	igt_drop_caches_set(fd, DROP_BOUND);
 
 	copy_bo(tmp_bo, bo);
 }
@@ -136,9 +133,6 @@ igt_main
 		gem_set_caching(fd, scratch_bo->handle, 1);
 
 		staging_bo = drm_intel_bo_alloc(bufmgr, "staging bo", BO_SIZE, 4096);
-
-		igt_init_aperture_trashers(bufmgr);
-		mappable_gtt_limit = gem_mappable_aperture_size();
 	}
 
 	igt_subtest("reads") {
@@ -278,7 +272,6 @@ igt_main
 	}
 
 	igt_fixture {
-		igt_cleanup_aperture_trashers();
 		drm_intel_bufmgr_destroy(bufmgr);
 
 		close(fd);
diff --git a/tests/gem_partial_pwrite_pread.c b/tests/gem_partial_pwrite_pread.c
index d8cdd2a0a..35e39ad7f 100644
--- a/tests/gem_partial_pwrite_pread.c
+++ b/tests/gem_partial_pwrite_pread.c
@@ -56,7 +56,6 @@ drm_intel_bo *scratch_bo;
 drm_intel_bo *staging_bo;
 #define BO_SIZE (4*4096)
 uint32_t devid;
-uint64_t mappable_gtt_limit;
 int fd;
 
 static void
@@ -91,9 +90,7 @@ blt_bo_fill(drm_intel_bo *tmp_bo, drm_intel_bo *bo, uint8_t val)
 
 	drm_intel_gem_bo_unmap_gtt(tmp_bo);
 
-	if (bo->offset < mappable_gtt_limit &&
-	    (IS_G33(devid) || intel_gen(devid) >= 4))
-		igt_trash_aperture();
+	igt_drop_caches_set(fd, DROP_BOUND);
 
 	copy_bo(tmp_bo, bo);
 }
@@ -264,9 +261,6 @@ igt_main
 		/* overallocate the buffers we're actually using because */
 		scratch_bo = drm_intel_bo_alloc(bufmgr, "scratch bo", BO_SIZE, 4096);
 		staging_bo = drm_intel_bo_alloc(bufmgr, "staging bo", BO_SIZE, 4096);
-
-		igt_init_aperture_trashers(bufmgr);
-		mappable_gtt_limit = gem_mappable_aperture_size();
 	}
 
 	do_tests(-1, "");
@@ -277,7 +271,6 @@ igt_main
 	do_tests(2, "-display");
 
 	igt_fixture {
-		igt_cleanup_aperture_trashers();
 		drm_intel_bufmgr_destroy(bufmgr);
 
 		close(fd);
diff --git a/tests/gem_tiled_partial_pwrite_pread.c b/tests/gem_tiled_partial_pwrite_pread.c
index 0b4972e37..c2f44c9d8 100644
--- a/tests/gem_tiled_partial_pwrite_pread.c
+++ b/tests/gem_tiled_partial_pwrite_pread.c
@@ -61,7 +61,6 @@ drm_intel_bo *tiled_staging_bo;
 unsigned long scratch_pitch;
 #define BO_SIZE (32*4096)
 uint32_t devid;
-uint64_t mappable_gtt_limit;
 int fd;
 
 static void
@@ -112,9 +111,7 @@ blt_bo_fill(drm_intel_bo *tmp_bo, drm_intel_bo *bo, int val)
 
 	drm_intel_gem_bo_unmap_gtt(tmp_bo);
 
-	if (bo->offset < mappable_gtt_limit &&
-	    (IS_G33(devid) || intel_gen(devid) >= 4))
-		igt_trash_aperture();
+	igt_drop_caches_set(fd, DROP_BOUND);
 
 	copy_bo(tmp_bo, 0, bo, 1);
 }
@@ -295,9 +292,6 @@ igt_main
 							    BO_SIZE/4096, 4,
 							    &tiling_mode,
 							    &scratch_pitch, 0);
-
-		igt_init_aperture_trashers(bufmgr);
-		mappable_gtt_limit = gem_mappable_aperture_size();
 	}
 
 	igt_subtest("reads")
@@ -310,7 +304,6 @@ igt_main
 		test_partial_read_writes();
 
 	igt_fixture {
-		igt_cleanup_aperture_trashers();
 		drm_intel_bufmgr_destroy(bufmgr);
 
 		close(fd);
-- 
2.18.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-07-18 10:51 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-07-13  9:54 [Intel-gfx] [PATCH i-g-t] igt: Force eviction of test bo directly Chris Wilson
2018-07-13 10:19 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
2018-07-13 12:27 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
2018-07-18 10:51 ` [igt-dev] [PATCH i-g-t] " Michał Winiarski

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).