From 9b8b765dc6d45e33033c3be2928ab697d0c8c875 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sat, 2 Jan 2016 15:34:27 +0000
Subject: gem:exec:nop

---
 tests.d/gem/gem_exec_nop.test | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/tests.d/gem/gem_exec_nop.test b/tests.d/gem/gem_exec_nop.test
index d3ad7c6..080d5db 100644
--- a/tests.d/gem/gem_exec_nop.test
+++ b/tests.d/gem/gem_exec_nop.test
@@ -1,17 +1,15 @@
-test_name=gem:exec:nop
-test_exec_time=18
-
-# This outputs a graph of time(N), the us it takes to execute N empty batches.
-# e.g. 110 59 34 22 16 13 11 10 10 10 9 4 1.4 1.4 1.2 0.9 0.8
-# As a summary, print the number of nop/s (so that it matches the bigger is
-# better motif of fps).
-#
-# Ideally we want to run this per ring,
-#	gem_exec_nop:rcs, gem_exec_nop:bcs, gem_exec_nop:vcs
-# though for the time being just one will suffice
-
 [ -e $IGT_BENCHMARKS/gem_exec_nop ] || return 1
 sudo -n true || return 1
 
-gem:exec:nop_run() { sudo $IGT_BENCHMARKS/gem_exec_nop -e 1 -r $1; }
-gem:exec:nop_process() { bc -l <<< "1000000 / ${@: -1}"; }
+for ring in rcs bcs vcs vecs; do
+    name="gem:exec:nop:$ring:single"
+    test_name="$test_name $name"
+    eval "${name}_run() { sudo $IGT_BENCHMARKS/gem_exec_nop -s -e $ring -r \$1 ; }"
+
+    name="gem:exec:nop:$ring:continuous"
+    test_name="$test_name $name"
+    eval "${name}_run() { sudo $IGT_BENCHMARKS/gem_exec_nop -e $ring -r \$1 ; }"
+done
+
+test_exec_time=3
+test_invert=1
-- 
cgit v1.2.3