[PATCH i-g-t] HAX: i915/perf: Test OA buffer wrap around

Umesh Nerlige Ramappa umesh.nerlige.ramappa at intel.com
Wed Nov 25 01:53:30 UTC 2020


Ensure that reports generated after OA buffer wraps around pass the
sanity check.

Signed-off-by: Umesh Nerlige Ramappa <umesh.nerlige.ramappa at intel.com>
---
 tests/i915/perf.c                     | 119 ++++++++++++++++++
 tests/intel-ci/fast-feedback.testlist | 172 +-------------------------
 2 files changed, 120 insertions(+), 171 deletions(-)

diff --git a/tests/i915/perf.c b/tests/i915/perf.c
index caeabd62..7f3e7a2b 100644
--- a/tests/i915/perf.c
+++ b/tests/i915/perf.c
@@ -1154,6 +1154,95 @@ test_missing_sample_flags(void)
 	do_ioctl_err(drm_fd, DRM_IOCTL_I915_PERF_OPEN, &param, EINVAL);
 }
 
+static const char *header_msg[DRM_I915_PERF_RECORD_MAX] = {
+	[DRM_I915_PERF_RECORD_SAMPLE] = "OA sample",
+	[DRM_I915_PERF_RECORD_OA_REPORT_LOST] = "OA report lost",
+	[DRM_I915_PERF_RECORD_OA_BUFFER_LOST] = "OA buffer lost",
+};
+
+static size_t
+read_reports(int fd, void *buf, size_t count)
+{
+	ssize_t len;
+
+	while ((len = read(fd, buf, count)) < 0 && errno == EINTR)
+		;
+
+	return len;
+}
+
+static uint32_t reports_lost = 0;
+static uint32_t reports_sampled = 0;
+static void *get_report(uint8_t *buf, size_t *offset, size_t len, int format_id)
+{
+	struct drm_i915_perf_record_header *header;
+	size_t format_size = get_oa_format(format_id).size;
+	size_t sample_size = sizeof(*header) + format_size;
+
+	igt_assert(len > sizeof(*header));
+
+	header = (void *)(buf + *offset);
+	igt_assert_eq(header->pad, 0);
+	igt_assert(header->type < DRM_I915_PERF_RECORD_MAX);
+	igt_assert_neq(header->type, DRM_I915_PERF_RECORD_OA_BUFFER_LOST);
+	if (header->type == DRM_I915_PERF_RECORD_OA_REPORT_LOST) {
+		/*
+		 * If a report follows these errors, then the report will have a
+		 * sample record. Adjust len and offset accordingly
+		 */
+		igt_debug("%s\n", header_msg[header->type]);
+		*offset += sizeof(*header);
+		len -= sizeof(header);
+		header++;
+		reports_lost++;
+	}
+
+	igt_assert(len >= sample_size);
+	igt_assert_eq(header->type, DRM_I915_PERF_RECORD_SAMPLE);
+	igt_assert_eq(header->size, sample_size);
+
+	*offset += sample_size;
+	reports_sampled++;
+
+	return (void *)(header + 1);
+}
+
+static void read_oa_reports(int format, int num_reports)
+{
+	size_t format_size = get_oa_format(format).size;
+	size_t sample_size = sizeof(struct drm_i915_perf_record_header) +
+			     format_size;
+	size_t buf_size = num_reports * sample_size;
+	uint8_t *buf = malloc(buf_size);
+	uint32_t *report1, *report0;
+	size_t len = 0, offset = 0;
+	uint32_t count;
+
+	igt_require(buf);
+	/*
+	 * If we are using a fast exponent and a limited read buffer, we will
+	 * reach an OA BUFFER LOST condition soon. Use a buffer that fits all
+	 * reports and read all reports. Sanity check later.
+	 */
+	while (len < buf_size) {
+		len += read_reports(stream_fd, buf + len, buf_size - len);
+		igt_assert(len > 0);
+	}
+	igt_debug("read %lu bytes\n", len);
+
+	for (count = 0; offset < buf_size; count++) {
+		igt_debug("reports: lost %d, sampled %d\n", reports_lost, reports_sampled);
+		report1 = get_report(buf, &offset, buf_size - offset, format);
+		if (count > 0)
+			sanity_check_reports(report0, report1, format);
+
+		report0 = report1;
+	}
+	free(buf);
+
+	igt_assert_eq(count, num_reports);
+}
+
 static void
 read_2_oa_reports(int format_id,
 		  int exponent,
@@ -1457,6 +1546,32 @@ print_report(uint32_t *report, int fmt)
 }
 #endif
 
+static void
+test_oa_buffer_wrap_around(void)
+{
+	int exponent = max_oa_exponent_for_period_lte(40 * 1000);
+	uint64_t properties[] = {
+		DRM_I915_PERF_PROP_SAMPLE_OA, true,
+		DRM_I915_PERF_PROP_OA_METRICS_SET, test_set->perf_oa_metrics_set,
+		DRM_I915_PERF_PROP_OA_FORMAT, test_set->perf_oa_format,
+		DRM_I915_PERF_PROP_OA_EXPONENT, exponent,
+	};
+	struct drm_i915_perf_open_param param = {
+		.flags = I915_PERF_FLAG_FD_CLOEXEC,
+		.num_properties = ARRAY_SIZE(properties) / 2,
+		.properties_ptr = to_user_pointer(properties),
+	};
+	struct oa_format format = get_oa_format(test_set->perf_oa_format);
+	int num_reports = (16 * 1024 * 1024 / format.size) * 2 + 1000;
+
+	igt_assert(format.name);
+	igt_debug("Reading %d reports for OA format %s\n", num_reports, format.name);
+
+	stream_fd = __perf_open(drm_fd, &param, false);
+	read_oa_reports(test_set->perf_oa_format, num_reports);
+	__perf_close(stream_fd);
+}
+
 static void
 test_oa_formats(void)
 {
@@ -4867,6 +4982,10 @@ igt_main
 	igt_subtest("oa-formats")
 		test_oa_formats();
 
+	igt_describe("Test report sanity on OA buffer wrap around");
+	igt_subtest("oa-buffer-wrap-around")
+		test_oa_buffer_wrap_around();
+
 	igt_subtest("invalid-oa-exponent")
 		test_invalid_oa_exponent();
 	igt_subtest("low-oa-exponent-permissions")
diff --git a/tests/intel-ci/fast-feedback.testlist b/tests/intel-ci/fast-feedback.testlist
index eaa904fa..37f43f78 100644
--- a/tests/intel-ci/fast-feedback.testlist
+++ b/tests/intel-ci/fast-feedback.testlist
@@ -1,173 +1,3 @@
 # Keep alphabetically sorted by default
 
-igt at core_auth@basic-auth
-igt at debugfs_test@read_all_entries
-igt at fbdev@eof
-igt at fbdev@info
-igt at fbdev@nullptr
-igt at fbdev@read
-igt at fbdev@write
-igt at gem_basic@bad-close
-igt at gem_basic@create-close
-igt at gem_basic@create-fd-close
-igt at gem_busy@busy at all
-igt at gem_close_race@basic-process
-igt at gem_close_race@basic-threads
-igt at gem_ctx_create@basic
-igt at gem_ctx_create@basic-files
-igt at gem_ctx_exec@basic
-igt at gem_exec_basic@basic
-igt at gem_exec_create@basic
-igt at gem_exec_fence@basic-busy
-igt at gem_exec_fence@basic-wait
-igt at gem_exec_fence@basic-await
-igt at gem_exec_fence@nb-await
-igt at gem_exec_gttfill@basic
-igt at gem_exec_parallel@engines
-igt at gem_exec_store@basic
-igt at gem_exec_suspend@basic-s0
-igt at gem_exec_suspend@basic-s3
-igt at gem_flink_basic@bad-flink
-igt at gem_flink_basic@bad-open
-igt at gem_flink_basic@basic
-igt at gem_flink_basic@double-flink
-igt at gem_flink_basic@flink-lifetime
-igt at gem_huc_copy@huc-copy
-igt at gem_linear_blits@basic
-igt at gem_mmap@basic
-igt at gem_mmap_gtt@basic
-igt at gem_render_linear_blits@basic
-igt at gem_render_tiled_blits@basic
-igt at gem_ringfill@basic-all
-igt at gem_sync@basic-all
-igt at gem_sync@basic-each
-igt at gem_tiled_blits@basic
-igt at gem_tiled_fence_blits@basic
-igt at gem_tiled_pread_basic
-igt at gem_wait@busy at all
-igt at gem_wait@wait at all
-igt at i915_getparams_basic@basic-eu-total
-igt at i915_getparams_basic@basic-subslice-total
-igt at i915_hangman@error-state-basic
-igt at kms_addfb_basic@addfb25-bad-modifier
-igt at kms_addfb_basic@addfb25-framebuffer-vs-set-tiling
-igt at kms_addfb_basic@addfb25-modifier-no-flag
-igt at kms_addfb_basic@addfb25-x-tiled-legacy
-igt at kms_addfb_basic@addfb25-x-tiled-mismatch-legacy
-igt at kms_addfb_basic@addfb25-yf-tiled-legacy
-igt at kms_addfb_basic@addfb25-y-tiled-legacy
-igt at kms_addfb_basic@addfb25-y-tiled-small-legacy
-igt at kms_addfb_basic@bad-pitch-0
-igt at kms_addfb_basic@bad-pitch-1024
-igt at kms_addfb_basic@bad-pitch-128
-igt at kms_addfb_basic@bad-pitch-256
-igt at kms_addfb_basic@bad-pitch-32
-igt at kms_addfb_basic@bad-pitch-63
-igt at kms_addfb_basic@bad-pitch-65536
-igt at kms_addfb_basic@bad-pitch-999
-igt at kms_addfb_basic@basic
-igt at kms_addfb_basic@basic-x-tiled-legacy
-igt at kms_addfb_basic@basic-y-tiled-legacy
-igt at kms_addfb_basic@bo-too-small
-igt at kms_addfb_basic@bo-too-small-due-to-tiling
-igt at kms_addfb_basic@clobberred-modifier
-igt at kms_addfb_basic@framebuffer-vs-set-tiling
-igt at kms_addfb_basic@invalid-get-prop
-igt at kms_addfb_basic@invalid-get-prop-any
-igt at kms_addfb_basic@invalid-set-prop
-igt at kms_addfb_basic@invalid-set-prop-any
-igt at kms_addfb_basic@no-handle
-igt at kms_addfb_basic@size-max
-igt at kms_addfb_basic@small-bo
-igt at kms_addfb_basic@tile-pitch-mismatch
-igt at kms_addfb_basic@too-high
-igt at kms_addfb_basic@too-wide
-igt at kms_addfb_basic@unused-handle
-igt at kms_addfb_basic@unused-modifier
-igt at kms_addfb_basic@unused-offsets
-igt at kms_addfb_basic@unused-pitches
-igt at kms_busy@basic
-igt at kms_chamelium@dp-hpd-fast
-igt at kms_chamelium@dp-edid-read
-igt at kms_chamelium@dp-crc-fast
-igt at kms_chamelium@hdmi-hpd-fast
-igt at kms_chamelium@hdmi-edid-read
-igt at kms_chamelium@hdmi-crc-fast
-igt at kms_chamelium@vga-hpd-fast
-igt at kms_chamelium@vga-edid-read
-igt at kms_chamelium@common-hpd-after-suspend
-igt at kms_prop_blob@basic
-igt at kms_cursor_legacy@basic-busy-flip-before-cursor-atomic
-igt at kms_cursor_legacy@basic-busy-flip-before-cursor-legacy
-igt at kms_cursor_legacy@basic-flip-after-cursor-atomic
-igt at kms_cursor_legacy@basic-flip-after-cursor-legacy
-igt at kms_cursor_legacy@basic-flip-after-cursor-varying-size
-igt at kms_cursor_legacy@basic-flip-before-cursor-atomic
-igt at kms_cursor_legacy@basic-flip-before-cursor-legacy
-igt at kms_cursor_legacy@basic-flip-before-cursor-varying-size
-igt at kms_flip@basic-flip-vs-dpms
-igt at kms_flip@basic-flip-vs-modeset
-igt at kms_flip@basic-flip-vs-wf_vblank
-igt at kms_flip@basic-plain-flip
-igt at kms_force_connector_basic@force-connector-state
-igt at kms_force_connector_basic@force-edid
-igt at kms_force_connector_basic@force-load-detect
-igt at kms_force_connector_basic@prune-stale-modes
-igt at kms_frontbuffer_tracking@basic
-igt at kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-a
-igt at kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-b
-igt at kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-c
-igt at kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-d
-igt at kms_pipe_crc_basic@hang-read-crc-pipe-a
-igt at kms_pipe_crc_basic@nonblocking-crc-pipe-a
-igt at kms_pipe_crc_basic@nonblocking-crc-pipe-a-frame-sequence
-igt at kms_pipe_crc_basic@read-crc-pipe-a
-igt at kms_pipe_crc_basic@read-crc-pipe-b
-igt at kms_pipe_crc_basic@read-crc-pipe-c
-igt at kms_pipe_crc_basic@read-crc-pipe-a-frame-sequence
-igt at kms_pipe_crc_basic@suspend-read-crc-pipe-a
-igt at kms_psr@primary_page_flip
-igt at kms_psr@cursor_plane_move
-igt at kms_psr@sprite_plane_onoff
-igt at kms_psr@primary_mmap_gtt
-igt at kms_setmode@basic-clone-single-crtc
-igt at i915_pm_backlight@basic-brightness
-igt at i915_pm_rpm@basic-pci-d3-state
-igt at i915_pm_rpm@basic-rte
-igt at i915_pm_rps@basic-api
-igt at prime_self_import@basic-llseek-bad
-igt at prime_self_import@basic-llseek-size
-igt at prime_self_import@basic-with_fd_dup
-igt at prime_self_import@basic-with_one_bo
-igt at prime_self_import@basic-with_one_bo_two_files
-igt at prime_self_import@basic-with_two_bos
-igt at prime_vgem@basic-fence-flip
-igt at prime_vgem@basic-fence-mmap
-igt at prime_vgem@basic-fence-read
-igt at prime_vgem@basic-gtt
-igt at prime_vgem@basic-read
-igt at prime_vgem@basic-write
-igt at prime_vgem@basic-userptr
-igt at vgem_basic@setversion
-igt at vgem_basic@create
-igt at vgem_basic@debugfs
-igt at vgem_basic@dmabuf-export
-igt at vgem_basic@dmabuf-fence
-igt at vgem_basic@dmabuf-fence-before
-igt at vgem_basic@dmabuf-mmap
-igt at vgem_basic@mmap
-igt at vgem_basic@second-client
-igt at vgem_basic@sysfs
-
-# All tests that do module unloading and reloading are executed last.
-# They will sometimes reveal issues of earlier tests leaving the
-# driver in a broken state that is not otherwise noticed in that test.
-
-igt at core_hotunplug@unbind-rebind
-igt at vgem_basic@unload
-igt at i915_module_load@reload
-igt at i915_pm_rpm@module-reload
-
-# Kernel selftests
-igt at i915_selftest@live
-igt at dmabuf@all
+igt at perf@oa-buffer-wrap-around
-- 
2.20.1



More information about the Intel-gfx-trybot mailing list