From cd87b4004fbe091e70798337f34152f197deb8da Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri, 30 Sep 2016 21:10:41 +0100
Subject: benchmarks/gem_blt: Directly compare the cmdparser

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 benchmarks/ezbench.d/gem_blt.test |  4 ++++
 benchmarks/gem_blt.c              | 28 +++++++++++++++++++++++-----
 2 files changed, 27 insertions(+), 5 deletions(-)

(limited to 'benchmarks')

diff --git a/benchmarks/ezbench.d/gem_blt.test b/benchmarks/ezbench.d/gem_blt.test
index 3335c388..e9c50170 100644
--- a/benchmarks/ezbench.d/gem_blt.test
+++ b/benchmarks/ezbench.d/gem_blt.test
@@ -31,6 +31,10 @@ while read size label; do
     name="gem:blt:copy:${label}:forked"
     test_name="$test_name $name"
     eval "${name}_run() { sudo $IGT_BENCHMARKS/gem_blt -f -S -r \$1 -s $size -b 1 ; }"
+
+    name="gem:blt:copy:${label}:raw"
+    test_name="$test_name $name"
+    eval "${name}_run() { sudo $IGT_BENCHMARKS/gem_blt -C -r \$1 -s $size -b 1 ; }"
 done<<SIZES
 4096	4KiB
 131072	128KiB
diff --git a/benchmarks/gem_blt.c b/benchmarks/gem_blt.c
index 1958b1cd..6fb72394 100644
--- a/benchmarks/gem_blt.c
+++ b/benchmarks/gem_blt.c
@@ -179,6 +179,7 @@ static int gem_linear_blt(int fd,
 }
 
 #define SYNC 0x1
+#define NOCMD 0x2
 
 static int run(int object, int batch, int time, int reps, int ncpus, unsigned flags)
 {
@@ -202,8 +203,8 @@ static int run(int object, int batch, int time, int reps, int ncpus, unsigned fl
 	gen = intel_gen(intel_get_drm_devid(fd));
 	has_64bit_reloc = gen >= 8;
 
-	src = gem_create(fd, object);
-	dst = gem_create(fd, object);
+	src = gem_create(fd, ALIGN(object, 4096));
+	dst = gem_create(fd, ALIGN(object, 4096));
 
 	len = gem_linear_blt(fd, buf, 0, 0, 1, object, reloc);
 	if (has_64bit_reloc)
@@ -266,6 +267,18 @@ static int run(int object, int batch, int time, int reps, int ncpus, unsigned fl
 		time *= count / 2;
 		count = 1;
 	}
+	if (flags & NOCMD) {
+		drm_i915_getparam_t gp;
+		int v;
+
+		gp.param = I915_PARAM_CMD_PARSER_VERSION;
+		gp.value = &v;
+		drmIoctl(fd, DRM_IOCTL_I915_GETPARAM, &gp);
+		if (v < 1)
+			return 77;
+
+		execbuf.batch_len = 0;
+	}
 
 	while (reps--) {
 		memset(shared, 0, 4096);
@@ -311,18 +324,23 @@ int main(int argc, char **argv)
 	unsigned flags = 0;
 	int c;
 
-	while ((c = getopt (argc, argv, "Ss:b:r:t:f")) != -1) {
+	while ((c = getopt (argc, argv, "CSs:b:r:t:f")) != -1) {
 		switch (c) {
 		case 's':
 			size = atoi(optarg);
-			if (size < 4096)
-				size = 4096;
+			size = ALIGN(size, 4);
+			if (size < 4)
+				size = 4;
 			break;
 
 		case 'S':
 			flags |= SYNC;
 			break;
 
+		case 'C':
+			flags |= NOCMD;
+			break;
+
 		case 't':
 			time = atoi(optarg);
 			if (time < 1)
-- 
cgit v1.2.3