diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2017-12-15 15:23:06 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2017-12-22 15:08:51 +0000 |
| commit | 60a1f327556136c7fc03af667bc8be460550610b (patch) | |
| tree | 07b1524e9cc3d60c78893a564787b7d6a4ce1175 | |
| parent | d161bbbc8f17bd81ad75f0e7f9f77d2af9dcbf28 (diff) | |
igt/perf_pmu: Measure the reference batch for busy-check-all
Don't rely on the timer being precise when we can sleep for a known
duration.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
| -rw-r--r-- | tests/perf_pmu.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/perf_pmu.c b/tests/perf_pmu.c index 96091b85..b3b28965 100644 --- a/tests/perf_pmu.c +++ b/tests/perf_pmu.c @@ -183,6 +183,7 @@ busy_check_all(int gem_fd, const struct intel_execution_engine2 *e, const struct intel_execution_engine2 *e_; uint64_t val[num_engines]; int fd[num_engines]; + unsigned long slept; igt_spin_t *spin; unsigned int busy_idx, i; @@ -202,9 +203,8 @@ busy_check_all(int gem_fd, const struct intel_execution_engine2 *e, igt_assert_eq(i, num_engines); spin = igt_spin_batch_new(gem_fd, 0, e2ring(gem_fd, e), 0); - igt_spin_batch_set_timeout(spin, batch_duration_ns); - - gem_sync(gem_fd, spin->handle); + slept = measured_usleep(batch_duration_ns / 1000); + igt_spin_batch_end(spin); pmu_read_multi(fd[0], num_engines, val); log_busy(fd[0], num_engines, val); @@ -212,13 +212,13 @@ busy_check_all(int gem_fd, const struct intel_execution_engine2 *e, igt_spin_batch_free(gem_fd, spin); close(fd[0]); - assert_within_epsilon(val[busy_idx], batch_duration_ns, tolerance); + assert_within_epsilon(val[busy_idx], slept, tolerance); for (i = 0; i < num_engines; i++) { if (i == busy_idx) continue; assert_within_epsilon(val[i], 0.0f, tolerance); } - + gem_quiescent_gpu(gem_fd); } static void |