igt/gem_concurrent_all: Add testcases that split the copying across rings

More inter-ring concurrency tests.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

1 files changed, 59 insertions, 0 deletions

diff --git a/tests/gem_concurrent_all.c b/tests/gem_concurrent_all.c
index 3970fc6f..559964ec 100644
--- a/tests/gem_concurrent_all.c
+++ b/tests/gem_concurrent_all.c
@@ -756,6 +756,26 @@ static void do_read_read_bcs(struct buffers *buffers,
 	igt_post_hang_ring(fd, hang);
 }
 
+static void do_write_read_bcs(struct buffers *buffers,
+			      do_copy do_copy_func,
+			      do_hang do_hang_func)
+{
+	struct igt_hang_ring hang;
+	int i;
+
+	gem_quiescent_gpu(fd);
+	for (i = buffers->count; i--; )
+		buffers->mode->set_bo(buffers->src[i], 0xdeadbeef ^ i, width, height);
+	for (i = 0; i < buffers->count; i++) {
+		blt_copy_bo(buffers->spare, buffers->src[i]);
+		do_copy_func(buffers->dst[i], buffers->spare);
+	}
+	hang = do_hang_func();
+	for (i = buffers->count; i--; )
+		buffers->mode->cmp_bo(buffers->dst[i], 0xdeadbeef ^ i, width, height, buffers->dummy);
+	igt_post_hang_ring(fd, hang);
+}
+
 static void do_read_read_rcs(struct buffers *buffers,
 			     do_copy do_copy_func,
 			     do_hang do_hang_func)
@@ -777,6 +797,26 @@ static void do_read_read_rcs(struct buffers *buffers,
 	igt_post_hang_ring(fd, hang);
 }
 
+static void do_write_read_rcs(struct buffers *buffers,
+			      do_copy do_copy_func,
+			      do_hang do_hang_func)
+{
+	struct igt_hang_ring hang;
+	int i;
+
+	gem_quiescent_gpu(fd);
+	for (i = buffers->count; i--; )
+		buffers->mode->set_bo(buffers->src[i], 0xdeadbeef ^ i, width, height);
+	for (i = 0; i < buffers->count; i++) {
+		render_copy_bo(buffers->spare, buffers->src[i]);
+		do_copy_func(buffers->dst[i], buffers->spare);
+	}
+	hang = do_hang_func();
+	for (i = buffers->count; i--; )
+		buffers->mode->cmp_bo(buffers->dst[i], 0xdeadbeef ^ i, width, height, buffers->dummy);
+	igt_post_hang_ring(fd, hang);
+}
+
 static void do_gpu_read_after_write(struct buffers *buffers,
 				    do_copy do_copy_func,
 				    do_hang do_hang_func)
@@ -1044,6 +1084,25 @@ run_basic_modes(const struct access_mode *mode,
 					      p->copy, h->hang);
 			}
 
+			/* split copying between rings */
+			igt_subtest_f("%s-%s-write-read-bcs%s%s", mode->name, p->prefix, suffix, h->suffix) {
+				h->require();
+				p->require();
+				buffers_create(&buffers, num_buffers);
+				run_wrap_func(&buffers,
+					      do_write_read_bcs,
+					      p->copy, h->hang);
+			}
+			igt_subtest_f("%s-%s-write-read-rcs%s%s", mode->name, p->prefix, suffix, h->suffix) {
+				h->require();
+				p->require();
+				igt_require(rendercopy);
+				buffers_create(&buffers, num_buffers);
+				run_wrap_func(&buffers,
+					      do_write_read_rcs,
+					      p->copy, h->hang);
+			}
+
 			/* and finally try to trick the kernel into loosing the pending write */
 			igt_subtest_f("%s-%s-gpu-read-after-write%s%s", mode->name, p->prefix, suffix, h->suffix) {
 				h->require();