summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2016-09-30 21:10:41 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2016-10-15 11:15:47 +0100
commitcd87b4004fbe091e70798337f34152f197deb8da (patch)
tree1fab0b8e154d6217388d3647b94021e6fce73def
parentacd5d3d3657b04a47418a95d9301835e6d64c86c (diff)
benchmarks/gem_blt: Directly compare the cmdparser
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r--benchmarks/ezbench.d/gem_blt.test4
-rw-r--r--benchmarks/gem_blt.c28
2 files changed, 27 insertions, 5 deletions
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)