When in rc6p, rc6 doesn't increment. So on rc6p machines, we can't test rc6 in isolation.
Signed-off-by: Chris Wilson <[email protected]> Cc: Tvrtko Ursulin <[email protected]> --- tests/perf_pmu.c | 50 +++++--------------------------------------------- 1 file changed, 5 insertions(+), 45 deletions(-) diff --git a/tests/perf_pmu.c b/tests/perf_pmu.c index b8800e61..1e441e0e 100644 --- a/tests/perf_pmu.c +++ b/tests/perf_pmu.c @@ -998,45 +998,10 @@ test_frequency(int gem_fd) static void test_rc6(int gem_fd) -{ - int64_t duration_ns = 2e9; - uint64_t idle, busy, prev; - unsigned int slept; - int fd, fw; - - fd = open_pmu(I915_PMU_RC6_RESIDENCY); - - gem_quiescent_gpu(gem_fd); - usleep(100e3); /* wait for the rc6 cycle counter to kick in */ - - /* Go idle and check full RC6. */ - prev = pmu_read_single(fd); - slept = measured_usleep(duration_ns / 1000); - idle = pmu_read_single(fd); - - assert_within_epsilon(idle - prev, slept, tolerance); - - /* Wake up device and check no RC6. */ - fw = igt_open_forcewake_handle(gem_fd); - igt_assert(fw >= 0); - usleep(1e3); /* wait for the rc6 cycle counter to stop ticking */ - - prev = pmu_read_single(fd); - usleep(duration_ns / 1000); - busy = pmu_read_single(fd); - - close(fw); - close(fd); - - assert_within_epsilon(busy - prev, 0.0, tolerance); -} - -static void -test_rc6p(int gem_fd) { int64_t duration_ns = 2e9; unsigned int num_pmu = 1; - uint64_t idle[3], busy[3], prev[3]; + uint64_t idle[3], busy[3], prev[3], total; unsigned int slept, i; int fd, ret, fw; @@ -1048,8 +1013,7 @@ test_rc6p(int gem_fd) if (ret > 0) num_pmu++; } - - igt_require(num_pmu == 3); + igt_require(num_pmu >= 1); gem_quiescent_gpu(gem_fd); usleep(100e3); /* wait for the rc6 cycle counter to kick in */ @@ -1059,8 +1023,10 @@ test_rc6p(int gem_fd) slept = measured_usleep(duration_ns / 1000); pmu_read_multi(fd, num_pmu, idle); + total = 0; for (i = 0; i < num_pmu; i++) - assert_within_epsilon(idle[i] - prev[i], slept, tolerance); + total += idle[i] - prev[i]; + assert_within_epsilon(total, slept, tolerance); /* Wake up device and check no RC6. */ fw = igt_open_forcewake_handle(gem_fd); @@ -1217,12 +1183,6 @@ igt_main igt_subtest("rc6") test_rc6(fd); - /** - * Test RC6p residency reporting. - */ - igt_subtest("rc6p") - test_rc6p(fd); - /** * Check render nodes are counted. */ -- 2.15.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
