[PATCH i-g-t v2 2/2] tests/intel/xe_oa: Remove hardcoded time heuristics

[Sai Teja Pottumuttu]

Some tests in xe_oa tests have hardcoded timing heuristics. Refactor it to
make it more robust and reliable. The patch extends the wait time logically
but usually it would take a single iteration for the required reports to be
available so wait time doesn't change much.

v2:
 - Extend commit message [Lucas]
 - Make wait function more generic [Lucas]

Signed-off-by: Sai Teja Pottumuttu <sai.teja.pottumuttu at intel.com>
---
 tests/intel/xe_oa.c | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/tests/intel/xe_oa.c b/tests/intel/xe_oa.c
index ad3526406..b271278d6 100644
--- a/tests/intel/xe_oa.c
+++ b/tests/intel/xe_oa.c
@@ -4367,6 +4367,29 @@ static void map_oa_buffer_forked_access(const struct drm_xe_engine_class_instanc
 	munmap(vaddr, size);
 }
 
+static void wait_for_periodic_reports(void *oa_vaddr,
+				      uint32_t n,
+				      const struct drm_xe_engine_class_instance *hwe)
+{
+	uint32_t period_us = oa_exponent_to_ns(oa_exp_1_millisec) / 1000;
+	struct intel_xe_perf_metric_set *test_set = metric_set(hwe);
+	uint64_t fmt = test_set->perf_oa_format;
+	struct oa_format format = get_oa_format(fmt);
+	uint32_t num_periodic_reports = 0;
+	uint32_t *reports;
+
+	while (num_periodic_reports < n) {
+		usleep(100 * period_us);
+		num_periodic_reports = 0;
+		for (reports = (uint32_t *)oa_vaddr;
+		     reports[0] && oa_timestamp(reports, fmt);
+		     reports += format.size) {
+			if (oa_report_is_periodic(reports))
+				num_periodic_reports++;
+		}
+	}
+}
+
 static void check_reports(void *oa_vaddr, uint32_t oa_size,
 			  const struct drm_xe_engine_class_instance *hwe)
 {
@@ -4396,12 +4419,10 @@ static void check_reports_from_mapped_buffer(const struct drm_xe_engine_class_in
 {
 	void *vaddr;
 	uint32_t size;
-	uint32_t period_us = oa_exponent_to_ns(oa_exp_1_millisec) / 1000;
 
 	vaddr = map_oa_buffer(&size);
 
-	/* wait for approx 100 reports */
-	usleep(100 * period_us);
+	wait_for_periodic_reports(vaddr, 20, hwe);
 	check_reports(vaddr, size, hwe);
 
 	munmap(vaddr, size);
@@ -4426,12 +4447,11 @@ static void closed_fd_and_unmapped_access(const struct drm_xe_engine_class_insta
 	};
 	void *vaddr;
 	uint32_t size;
-	uint32_t period_us = oa_exponent_to_ns(oa_exp_1_millisec) / 1000;
 
 	stream_fd = __perf_open(drm_fd, &param, false);
 	vaddr = map_oa_buffer(&size);
 
-	usleep(100 * period_us);
+	wait_for_periodic_reports(vaddr, 20, hwe);
 	check_reports(vaddr, size, hwe);
 
 	munmap(vaddr, size);
-- 
2.34.1