[i-g-t] perf: Hide any leak in gen8-unprivileged-single-ctx-counters

Commit Message

Chris Wilson May 18, 2020, 10:14 p.m. UTC

gen8-unprivileged-single-counters appears to leak contexts, and does not
appear to be doing so intentionally.. Let's assume it's a bug in the
test and see if the contexts are released along with the device fd.
(If they are not released, that is more clearly an issue.)

Signed-off-by: Chris Wilson <[e-mail]>
---
 tests/i915/gem_exec_fence.c | 2 +-
 tests/perf.c                | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

Patch

diff --git a/tests/i915/gem_exec_fence.c b/tests/i915/gem_exec_fence.c
index 5b504e5c8..b88472c3a 100644
--- a/tests/i915/gem_exec_fence.c
+++ b/tests/i915/gem_exec_fence.c
@@ -1479,7 +1479,7 @@  static void test_syncobj_future_submit(int i915, unsigned int engine)
 	/*
 	 * Here we submit client A waiting on client B, but internally client
 	 * B has a semaphore that waits on client A. This relies on timeslicing
-	 * to reorder B before A, even though userspace has asked to submit
+	 * to reorder A before B, even though userspace has asked to submit
 	 * A & B simultaneously (and due to the sequence we will submit B
 	 * then A).
 	 */
diff --git a/tests/perf.c b/tests/perf.c
index d4ebae30d..c78f02a8d 100644
--- a/tests/perf.c
+++ b/tests/perf.c
@@ -3428,6 +3428,8 @@  gen8_test_single_ctx_render_target_writes_a_counter(void)
 				.format = test_set->perf_oa_format
 			};
 
+			drm_fd = gem_reopen_driver(drm_fd);
+
 			bufmgr = drm_intel_bufmgr_gem_init(drm_fd, 4096);
 			drm_intel_bufmgr_gem_enable_reuse(bufmgr);