From 5715089c5139221cb6a0bfda2352cf8e5c416b32 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Mon, 2 May 2016 09:20:00 +0100
Subject: [PATCH] benchmarks/gem_latency: Report throughput

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 benchmarks/ezbench.d/gem_latency.test | 18 +++++++++---------
 benchmarks/gem_latency.c              |  3 +++
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/benchmarks/ezbench.d/gem_latency.test b/benchmarks/ezbench.d/gem_latency.test
index de2a6505..a62e1026 100644
--- a/benchmarks/ezbench.d/gem_latency.test
+++ b/benchmarks/ezbench.d/gem_latency.test
@@ -6,7 +6,7 @@ sudo -n true || return 1
 
 __gem:dispatch__() {
     for (( c=0; c<$1; c++ )); do
-        sudo $IGT_BENCHMARKS/gem_latency -t 2 -n $2 -p $3 -f 1 $4
+        sudo $IGT_BENCHMARKS/gem_latency -t 2 -n $2 -p $3 -f $4
     done
 }
 
@@ -14,20 +14,20 @@ __gem:dispatch__() {
 for n in 0 1 2 4 8 16 32 64 128 256 512 1024; do
 	name="gem:exec:latency:$n"
 	test_name="$test_name $name"
-	eval "${name}_run() { __gem:dispatch__ \$1 $n 1 ; } "
-done
-
-for n in 0 1 2 4 8 16 32 64 128 256 512 1024; do
-	name="gem:parser:latency:$n"
-	test_name="$test_name $name"
-	eval "${name}_run() { __gem:dispatch__ \$1 $n 1 -C ; } "
+	eval "${name}_run() { __gem:dispatch__ \$1 $n 1 1 ; } "
 done
 
 # Measure the execution delay vs contention, just for fun
 for p in 1 2 4 8 16 32 64 128 256 512 1024; do
 	name="gem:latency:dispatch:$p"
 	test_name="$test_name $name"
-	eval "${name}_run() { __gem:dispatch__ \$1 0 $p ; } "
+	eval "${name}_run() { __gem:dispatch__ \$1 0 $p 1 ; } "
+done
+
+for p in 1 2 4 8 16 32 64 128 256 512 1024; do
+	name="gem:throughput:dispatch:$p"
+	test_name="$test_name $name"
+	eval "${name}_run() { __gem:dispatch__ \$1 8 $p 5 ; } "
 done
 
 # Measure the wakeup delay (each wakeup should be uncontended)
diff --git a/benchmarks/gem_latency.c b/benchmarks/gem_latency.c
index 1106695c..d9cb44e3 100644
--- a/benchmarks/gem_latency.c
+++ b/benchmarks/gem_latency.c
@@ -540,6 +540,9 @@ static int run(int seconds,
 	case 4:
 		printf("%f\n", cpu_time(&rused) / complete);
 		break;
+	case 5:
+		printf("%d\n", complete);
+		break;
 	}
 
 	return 0;