summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorAntonio Argenziano <antonio.argenziano@intel.com>2018-03-21 14:08:28 -0700
committerAntonio Argenziano <antonio.argenziano@intel.com>2018-03-22 13:15:24 -0700
commit07211614318000b3acd7d8f7ecea1f94caa71ecf (patch)
tree7fc5ccc49569c8a9dfd0db3d6fd5e4359bcbffaf /tests
parent0d5665783284fee1750bc4a9d7a0378cb5ce77fe (diff)
igt/gem_measure_ring_size_inflight: Measure smallest inflight ring size
Some tests measure the render's ring size but are actually meant to measure the smallest across all engines. This patch adds measuring the smallest size in gem_measure_ring_size_inflight() given the appropriate parameter. v2: - Only expose high level API. (Chris) v3: - Use ALL_ENGINES macro. Suggested-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Antonio Argenziano <antonio.argenziano@intel.com> Cc: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'tests')
-rw-r--r--tests/gem_busy.c2
-rw-r--r--tests/gem_exec_await.c2
-rw-r--r--tests/gem_exec_fence.c2
-rw-r--r--tests/gem_exec_latency.c2
-rw-r--r--tests/gem_ringfill.c2
5 files changed, 5 insertions, 5 deletions
diff --git a/tests/gem_busy.c b/tests/gem_busy.c
index fcff51a2..f564651b 100644
--- a/tests/gem_busy.c
+++ b/tests/gem_busy.c
@@ -301,7 +301,7 @@ static void xchg_u32(void *array, unsigned i, unsigned j)
static void close_race(int fd)
{
const unsigned int ncpus = sysconf(_SC_NPROCESSORS_ONLN);
- const unsigned int nhandles = gem_measure_ring_inflight(fd, 0, 0) / 2;
+ const unsigned int nhandles = gem_measure_ring_inflight(fd, ALL_ENGINES, 0) / 2;
unsigned int engines[16], nengine;
unsigned long *control;
uint32_t *handles;
diff --git a/tests/gem_exec_await.c b/tests/gem_exec_await.c
index 2ff180b0..b0d5c904 100644
--- a/tests/gem_exec_await.c
+++ b/tests/gem_exec_await.c
@@ -234,7 +234,7 @@ igt_main
igt_require_gem(device);
gem_submission_print_method(device);
- ring_size = gem_measure_ring_inflight(device, 0, 0) - 10;
+ ring_size = gem_measure_ring_inflight(device, ALL_ENGINES, 0) - 10;
if (!gem_has_execlists(device))
ring_size /= 2;
igt_info("Ring size: %d batches\n", ring_size);
diff --git a/tests/gem_exec_fence.c b/tests/gem_exec_fence.c
index 26bde788..60f80b0d 100644
--- a/tests/gem_exec_fence.c
+++ b/tests/gem_exec_fence.c
@@ -1537,7 +1537,7 @@ igt_main
long ring_size = 0;
igt_fixture {
- ring_size = gem_measure_ring_inflight(i915, 0, 0) - 1;
+ ring_size = gem_measure_ring_inflight(i915, ALL_ENGINES, 0) - 1;
igt_info("Ring size: %ld batches\n", ring_size);
igt_require(ring_size);
diff --git a/tests/gem_exec_latency.c b/tests/gem_exec_latency.c
index f0e13419..9498c092 100644
--- a/tests/gem_exec_latency.c
+++ b/tests/gem_exec_latency.c
@@ -363,7 +363,7 @@ igt_main
gem_submission_print_method(device);
- ring_size = gem_measure_ring_inflight(device, 0, 0);
+ ring_size = gem_measure_ring_inflight(device, ALL_ENGINES, 0);
igt_info("Ring size: %d batches\n", ring_size);
igt_require(ring_size > 8);
ring_size -= 8; /* leave some spare */
diff --git a/tests/gem_ringfill.c b/tests/gem_ringfill.c
index eea1d403..c728e1cd 100644
--- a/tests/gem_ringfill.c
+++ b/tests/gem_ringfill.c
@@ -272,7 +272,7 @@ igt_main
master = true;
}
- ring_size = gem_measure_ring_inflight(fd, 0, 0);
+ ring_size = gem_measure_ring_inflight(fd, ALL_ENGINES, 0);
igt_info("Ring size: %d batches\n", ring_size);
igt_require(ring_size);
}