diff options
| author | Tvrtko Ursulin <tvrtko.ursulin@intel.com> | 2017-11-24 17:16:18 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2017-11-24 21:38:26 +0000 |
| commit | 4c57ff468fa48707777184b3da56432602f967af (patch) | |
| tree | 34f2f956a28ca50a151090c4dd8ebb8688e72eae /tests | |
| parent | c6577473df7117b7a6e030605df1e28cd0e55708 (diff) | |
intel/pmu: Catch-up with i915 RC6 aggregation changes
Since i915 PMU is removing separate RC6 counters and now aggregates all
under a single one, catch up the test and intel-gpu-overlay with those
changes.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/perf_pmu.c | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/tests/perf_pmu.c b/tests/perf_pmu.c index a19fd2ac..8d58ecea 100644 --- a/tests/perf_pmu.c +++ b/tests/perf_pmu.c @@ -1019,53 +1019,6 @@ test_rc6(int gem_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]; - unsigned int slept, i; - int fd, ret, fw; - - fd = open_group(I915_PMU_RC6_RESIDENCY, -1); - ret = perf_i915_open_group(I915_PMU_RC6p_RESIDENCY, fd); - if (ret > 0) { - num_pmu++; - ret = perf_i915_open_group(I915_PMU_RC6pp_RESIDENCY, fd); - if (ret > 0) - num_pmu++; - } - - igt_require(num_pmu == 3); - - gem_quiescent_gpu(gem_fd); - usleep(100e3); /* wait for the rc6 cycle counter to kick in */ - - /* Go idle and check full RC6. */ - pmu_read_multi(fd, num_pmu, prev); - slept = measured_usleep(duration_ns / 1000); - pmu_read_multi(fd, num_pmu, idle); - - for (i = 0; i < num_pmu; i++) - assert_within_epsilon(idle[i] - prev[i], 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 */ - - pmu_read_multi(fd, num_pmu, prev); - usleep(duration_ns / 1000); - pmu_read_multi(fd, num_pmu, busy); - - close(fw); - close(fd); - - for (i = 0; i < num_pmu; i++) - assert_within_epsilon(busy[i] - prev[i], 0.0, tolerance); -} - igt_main { const unsigned int num_other_metrics = @@ -1206,12 +1159,6 @@ igt_main test_rc6(fd); /** - * Test RC6p residency reporting. - */ - igt_subtest("rc6p") - test_rc6p(fd); - - /** * Check render nodes are counted. */ igt_subtest_group { |