[Intel-gfx] [PATCH i-g-t 1/8] tests/perf: Rename perf test to intel_perf

Sagar Arun Kamble sagar.a.kamble at intel.com
Thu Sep 7 10:07:50 UTC 2017


Cc: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Signed-off-by: Sagar Arun Kamble <sagar.a.kamble at intel.com>
---
 tests/Makefile.sources |    2 +-
 tests/intel_perf.c     | 3353 ++++++++++++++++++++++++++++++++++++++++++++++++
 tests/perf.c           | 3353 ------------------------------------------------
 3 files changed, 3354 insertions(+), 3354 deletions(-)
 create mode 100644 tests/intel_perf.c
 delete mode 100644 tests/perf.c

diff --git a/tests/Makefile.sources b/tests/Makefile.sources
index 0f4e39a..69c83ae 100644
--- a/tests/Makefile.sources
+++ b/tests/Makefile.sources
@@ -169,6 +169,7 @@ TESTS_progs = \
 	gen3_render_tiledy_blits \
 	gen7_forcewake_mt \
 	gvt_basic \
+	intel_perf \
 	kms_3d \
 	kms_addfb_basic \
 	kms_atomic \
@@ -215,7 +216,6 @@ TESTS_progs = \
 	kms_universal_plane \
 	kms_vblank \
 	meta_test \
-	perf \
 	pm_backlight \
 	pm_lpsp \
 	pm_rc6_residency \
diff --git a/tests/intel_perf.c b/tests/intel_perf.c
new file mode 100644
index 0000000..a82a3da
--- /dev/null
+++ b/tests/intel_perf.c
@@ -0,0 +1,3353 @@
+/*
+ * Copyright © 2016 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <fcntl.h>
+#include <inttypes.h>
+#include <errno.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/times.h>
+#include <sys/types.h>
+#include <dirent.h>
+#include <time.h>
+#include <poll.h>
+#include <math.h>
+
+#include "igt.h"
+#include "drm.h"
+
+IGT_TEST_DESCRIPTION("Test the i915 perf metrics streaming interface");
+
+#define GEN6_MI_REPORT_PERF_COUNT ((0x28 << 23) | (3 - 2))
+#define GEN8_MI_REPORT_PERF_COUNT ((0x28 << 23) | (4 - 2))
+
+#define OAREPORT_REASON_MASK           0x3f
+#define OAREPORT_REASON_SHIFT          19
+#define OAREPORT_REASON_TIMER          (1<<0)
+#define OAREPORT_REASON_CTX_SWITCH     (1<<3)
+#define OAREPORT_REASON_CLK_RATIO      (1<<5)
+
+#define GFX_OP_PIPE_CONTROL     ((3 << 29) | (3 << 27) | (2 << 24))
+#define PIPE_CONTROL_CS_STALL	   (1 << 20)
+#define PIPE_CONTROL_GLOBAL_SNAPSHOT_COUNT_RESET	(1 << 19)
+#define PIPE_CONTROL_TLB_INVALIDATE     (1 << 18)
+#define PIPE_CONTROL_SYNC_GFDT	  (1 << 17)
+#define PIPE_CONTROL_MEDIA_STATE_CLEAR  (1 << 16)
+#define PIPE_CONTROL_NO_WRITE	   (0 << 14)
+#define PIPE_CONTROL_WRITE_IMMEDIATE    (1 << 14)
+#define PIPE_CONTROL_WRITE_DEPTH_COUNT  (2 << 14)
+#define PIPE_CONTROL_WRITE_TIMESTAMP    (3 << 14)
+#define PIPE_CONTROL_DEPTH_STALL	(1 << 13)
+#define PIPE_CONTROL_RENDER_TARGET_FLUSH (1 << 12)
+#define PIPE_CONTROL_INSTRUCTION_INVALIDATE (1 << 11)
+#define PIPE_CONTROL_TEXTURE_CACHE_INVALIDATE   (1 << 10) /* GM45+ only */
+#define PIPE_CONTROL_ISP_DIS	    (1 << 9)
+#define PIPE_CONTROL_INTERRUPT_ENABLE   (1 << 8)
+#define PIPE_CONTROL_FLUSH_ENABLE       (1 << 7) /* Gen7+ only */
+/* GT */
+#define PIPE_CONTROL_DATA_CACHE_INVALIDATE      (1 << 5)
+#define PIPE_CONTROL_VF_CACHE_INVALIDATE	(1 << 4)
+#define PIPE_CONTROL_CONST_CACHE_INVALIDATE     (1 << 3)
+#define PIPE_CONTROL_STATE_CACHE_INVALIDATE     (1 << 2)
+#define PIPE_CONTROL_STALL_AT_SCOREBOARD	(1 << 1)
+#define PIPE_CONTROL_DEPTH_CACHE_FLUSH	  (1 << 0)
+#define PIPE_CONTROL_PPGTT_WRITE	(0 << 2)
+#define PIPE_CONTROL_GLOBAL_GTT_WRITE   (1 << 2)
+
+/* Temporarily copy i915-perf uapi here to avoid a dependency on libdrm's
+ * i915_drm.h copy being updated with the i915-perf interface before this
+ * test can land in i-g-t.
+ *
+ * TODO: remove this once the interface lands in libdrm
+ */
+#ifndef DRM_I915_PERF_OPEN
+#define DRM_I915_PERF_OPEN		0x36
+#define DRM_IOCTL_I915_PERF_OPEN	DRM_IOW(DRM_COMMAND_BASE + DRM_I915_PERF_OPEN, struct drm_i915_perf_open_param)
+
+enum drm_i915_oa_format {
+	I915_OA_FORMAT_A13 = 1,     /* HSW only */
+	I915_OA_FORMAT_A29,         /* HSW only */
+	I915_OA_FORMAT_A13_B8_C8,   /* HSW only */
+	I915_OA_FORMAT_B4_C8,       /* HSW only */
+	I915_OA_FORMAT_A45_B8_C8,   /* HSW only */
+	I915_OA_FORMAT_B4_C8_A16,   /* HSW only */
+	I915_OA_FORMAT_C4_B8,       /* HSW+ */
+
+	/* Gen8+ */
+	I915_OA_FORMAT_A12,
+	I915_OA_FORMAT_A12_B8_C8,
+	I915_OA_FORMAT_A32u40_A4u32_B8_C8,
+
+	I915_OA_FORMAT_MAX /* non-ABI */
+};
+
+enum drm_i915_perf_property_id {
+       DRM_I915_PERF_PROP_CTX_HANDLE = 1,
+       DRM_I915_PERF_PROP_SAMPLE_OA,
+       DRM_I915_PERF_PROP_OA_METRICS_SET,
+       DRM_I915_PERF_PROP_OA_FORMAT,
+       DRM_I915_PERF_PROP_OA_EXPONENT,
+
+       DRM_I915_PERF_PROP_MAX /* non-ABI */
+};
+
+struct drm_i915_perf_open_param {
+       __u32 flags;
+#define I915_PERF_FLAG_FD_CLOEXEC	(1<<0)
+#define I915_PERF_FLAG_FD_NONBLOCK	(1<<1)
+#define I915_PERF_FLAG_DISABLED		(1<<2)
+
+       __u32 num_properties;
+       __u64 properties_ptr;
+};
+
+#define I915_PERF_IOCTL_ENABLE _IO('i', 0x0)
+#define I915_PERF_IOCTL_DISABLE	_IO('i', 0x1)
+
+struct drm_i915_perf_record_header {
+       __u32 type;
+       __u16 pad;
+       __u16 size;
+};
+
+enum drm_i915_perf_record_type {
+       DRM_I915_PERF_RECORD_SAMPLE = 1,
+       DRM_I915_PERF_RECORD_OA_REPORT_LOST = 2,
+       DRM_I915_PERF_RECORD_OA_BUFFER_LOST = 3,
+
+       DRM_I915_PERF_RECORD_MAX /* non-ABI */
+};
+#endif /* !DRM_I915_PERF_OPEN */
+
+/* There is no ifdef we can use for those formats :( */
+enum {
+	local_I915_OA_FORMAT_A12 = I915_OA_FORMAT_C4_B8 + 1,
+	local_I915_OA_FORMAT_A12_B8_C8 = I915_OA_FORMAT_C4_B8 + 2,
+	local_I915_OA_FORMAT_A32u40_A4u32_B8_C8 = I915_OA_FORMAT_C4_B8 + 3,
+};
+
+#define local_I915_OA_FORMAT_MAX (local_I915_OA_FORMAT_A32u40_A4u32_B8_C8 + 1)
+
+#ifndef DRM_IOCTL_I915_PERF_ADD_CONFIG
+
+#define DRM_I915_PERF_ADD_CONFIG	0x37
+#define DRM_I915_PERF_REMOVE_CONFIG	0x38
+
+#define DRM_IOCTL_I915_PERF_ADD_CONFIG	DRM_IOW(DRM_COMMAND_BASE + DRM_I915_PERF_ADD_CONFIG, struct drm_i915_perf_oa_config)
+#define DRM_IOCTL_I915_PERF_REMOVE_CONFIG	DRM_IOW(DRM_COMMAND_BASE + DRM_I915_PERF_REMOVE_CONFIG, __u64)
+
+/**
+ * Structure to upload perf dynamic configuration into the kernel.
+ */
+struct drm_i915_perf_oa_config {
+	/** String formatted like "%08x-%04x-%04x-%04x-%012x" */
+	char uuid[36];
+
+	__u32 n_mux_regs;
+	__u32 n_boolean_regs;
+	__u32 n_flex_regs;
+
+	__u64 mux_regs_ptr;
+	__u64 boolean_regs_ptr;
+	__u64 flex_regs_ptr;
+};
+
+#endif /* !DRM_IOCTL_I915_PERF_ADD_CONFIG */
+
+struct accumulator {
+#define MAX_RAW_OA_COUNTERS 62
+	enum drm_i915_oa_format format;
+
+	uint64_t deltas[MAX_RAW_OA_COUNTERS];
+};
+
+static struct {
+	const char *name;
+	size_t size;
+	int a40_high_off; /* bytes */
+	int a40_low_off;
+	int n_a40;
+	int a_off;
+	int n_a;
+	int first_a;
+	int b_off;
+	int n_b;
+	int c_off;
+	int n_c;
+	int min_gen;
+	int max_gen;
+} oa_formats[local_I915_OA_FORMAT_MAX] = {
+	[I915_OA_FORMAT_A13] = { /* HSW only */
+		"A13", .size = 64,
+		.a_off = 12, .n_a = 13,
+		.max_gen = 7 },
+	[I915_OA_FORMAT_A29] = { /* HSW only */
+		"A29", .size = 128,
+		.a_off = 12, .n_a = 29,
+		.max_gen = 7 },
+	[I915_OA_FORMAT_A13_B8_C8] = { /* HSW only */
+		"A13_B8_C8", .size = 128,
+		.a_off = 12, .n_a = 13,
+		.b_off = 64, .n_b = 8,
+		.c_off = 96, .n_c = 8,
+		.max_gen = 7 },
+	[I915_OA_FORMAT_A45_B8_C8] = { /* HSW only */
+		"A45_B8_C8", .size = 256,
+		.a_off = 12,  .n_a = 45,
+		.b_off = 192, .n_b = 8,
+		.c_off = 224, .n_c = 8,
+		.max_gen = 7 },
+	[I915_OA_FORMAT_B4_C8] = { /* HSW only */
+		"B4_C8", .size = 64,
+		.b_off = 16, .n_b = 4,
+		.c_off = 32, .n_c = 8,
+		.max_gen = 7 },
+	[I915_OA_FORMAT_B4_C8_A16] = { /* HSW only */
+		"B4_C8_A16", .size = 128,
+		.b_off = 16, .n_b = 4,
+		.c_off = 32, .n_c = 8,
+		.a_off = 60, .n_a = 16, .first_a = 29,
+		.max_gen = 7 },
+	[I915_OA_FORMAT_C4_B8] = { /* HSW+ (header differs from HSW-Gen8+) */
+		"C4_B8", .size = 64,
+		.c_off = 16, .n_c = 4,
+		.b_off = 28, .n_b = 8 },
+
+	/* Gen8+ */
+
+	[local_I915_OA_FORMAT_A12] = {
+		"A12", .size = 64,
+		.a_off = 12, .n_a = 12, .first_a = 7,
+		.min_gen = 8 },
+	[local_I915_OA_FORMAT_A12_B8_C8] = {
+		"A12_B8_C8", .size = 128,
+		.a_off = 12, .n_a = 12,
+		.b_off = 64, .n_b = 8,
+		.c_off = 96, .n_c = 8, .first_a = 7,
+		.min_gen = 8 },
+	[local_I915_OA_FORMAT_A32u40_A4u32_B8_C8] = {
+		"A32u40_A4u32_B8_C8", .size = 256,
+		.a40_high_off = 160, .a40_low_off = 16, .n_a40 = 32,
+		.a_off = 144, .n_a = 4, .first_a = 32,
+		.b_off = 192, .n_b = 8,
+		.c_off = 224, .n_c = 8,
+		.min_gen = 8 },
+	[I915_OA_FORMAT_C4_B8] = {
+		"C4_B8", .size = 64,
+		.c_off = 16, .n_c = 4,
+		.b_off = 32, .n_b = 8,
+		.min_gen = 8 },
+};
+
+static bool hsw_undefined_a_counters[45] = {
+	[4] = true,
+	[6] = true,
+	[9] = true,
+	[11] = true,
+	[14] = true,
+	[16] = true,
+	[19] = true,
+	[21] = true,
+	[24] = true,
+	[26] = true,
+	[29] = true,
+	[31] = true,
+	[34] = true,
+	[43] = true,
+	[44] = true,
+};
+
+/* No A counters currently reserved/undefined for gen8+ so far */
+static bool gen8_undefined_a_counters[45];
+
+static int drm_fd = -1;
+static uint32_t devid;
+static int card = -1;
+static int n_eus;
+
+static uint64_t test_metric_set_id = UINT64_MAX;
+static uint64_t gt_min_freq_mhz_saved = 0;
+static uint64_t gt_max_freq_mhz_saved = 0;
+static uint64_t gt_min_freq_mhz = 0;
+static uint64_t gt_max_freq_mhz = 0;
+
+static uint64_t timestamp_frequency = 12500000;
+static enum drm_i915_oa_format test_oa_format;
+static bool *undefined_a_counters;
+static uint64_t oa_exp_1_millisec;
+
+static igt_render_copyfunc_t render_copy = NULL;
+static uint32_t (*read_report_ticks)(uint32_t *report,
+				     enum drm_i915_oa_format format);
+static void (*sanity_check_reports)(uint32_t *oa_report0, uint32_t *oa_report1,
+				    enum drm_i915_oa_format format);
+
+static int
+__perf_open(int fd, struct drm_i915_perf_open_param *param)
+{
+	int ret = igt_ioctl(fd, DRM_IOCTL_I915_PERF_OPEN, param);
+
+	igt_assert(ret >= 0);
+	errno = 0;
+
+	return ret;
+}
+
+static int
+lookup_format(int i915_perf_fmt_id)
+{
+	igt_assert(i915_perf_fmt_id < local_I915_OA_FORMAT_MAX);
+	igt_assert(oa_formats[i915_perf_fmt_id].name);
+
+	return i915_perf_fmt_id;
+}
+
+static bool
+try_read_u64_file(const char *file, uint64_t *val)
+{
+	char buf[32];
+	int fd, n;
+
+	fd = open(file, O_RDONLY);
+	if (fd < 0)
+		return false;
+
+	while ((n = read(fd, buf, sizeof(buf) - 1)) < 0 && errno == EINTR)
+		;
+	igt_assert(n >= 0);
+
+	close(fd);
+
+	buf[n] = '\0';
+	*val = strtoull(buf, NULL, 0);
+
+	return true;
+}
+
+static uint64_t
+read_u64_file(const char *file)
+{
+	uint64_t val;
+
+	igt_assert_eq(try_read_u64_file(file, &val), true);
+
+	return val;
+}
+
+static void
+write_u64_file(const char *file, uint64_t val)
+{
+	char buf[32];
+	int fd, len, ret;
+
+	fd = open(file, O_WRONLY);
+	igt_assert(fd >= 0);
+
+	len = snprintf(buf, sizeof(buf), "%"PRIu64, val);
+	igt_assert(len > 0);
+
+	while ((ret = write(fd, buf, len)) < 0 && errno == EINTR)
+		;
+	igt_assert_eq(ret, len);
+
+	close(fd);
+}
+
+static uint64_t
+sysfs_read(const char *file)
+{
+	char buf[512];
+
+	snprintf(buf, sizeof(buf), "/sys/class/drm/card%d/%s", card, file);
+
+	return read_u64_file(buf);
+}
+
+static void
+sysfs_write(const char *file, uint64_t val)
+{
+	char buf[512];
+
+	snprintf(buf, sizeof(buf), "/sys/class/drm/card%d/%s", card, file);
+
+	write_u64_file(buf, val);
+}
+
+static char *
+read_debugfs_record(int device, const char *file, const char *key)
+{
+	FILE *fp;
+	int fd;
+	char *line = NULL;
+	size_t line_buf_size = 0;
+	int len = 0;
+	int key_len = strlen(key);
+	char *value = NULL;
+
+	fd = igt_debugfs_open(device, file, O_RDONLY);
+	fp = fdopen(fd, "r");
+	igt_require(fp);
+
+	while ((len = getline(&line, &line_buf_size, fp)) > 0) {
+
+		if (line[len - 1] == '\n')
+			line[len - 1] = '\0';
+
+		if (strncmp(key, line, key_len) == 0 &&
+		    line[key_len] == ':' &&
+		    line[key_len + 1] == ' ')
+		{
+			value = strdup(line + key_len + 2);
+			goto done;
+		}
+	}
+
+	igt_assert(!"reached");
+done:
+	free(line);
+	fclose(fp);
+	close(fd);
+	return value;
+}
+
+static uint64_t
+read_debugfs_u64_record(int fd, const char *file, const char *key)
+{
+	char *str_val = read_debugfs_record(fd, file, key);
+	uint64_t val;
+
+	igt_require(str_val);
+
+	val = strtoull(str_val, NULL, 0);
+	free(str_val);
+
+	return val;
+}
+
+/* XXX: For Haswell this utility is only applicable to the render basic
+ * metric set.
+ *
+ * C2 corresponds to a clock counter for the Haswell render basic metric set
+ * but it's not included in all of the formats.
+ */
+static uint32_t
+hsw_read_report_ticks(uint32_t *report, enum drm_i915_oa_format format)
+{
+	uint32_t *c = (uint32_t *)(((uint8_t *)report) + oa_formats[format].c_off);
+
+	igt_assert_neq(oa_formats[format].n_c, 0);
+
+	return c[2];
+}
+
+static uint32_t
+gen8_read_report_ticks(uint32_t *report, enum drm_i915_oa_format format)
+{
+	return report[3];
+}
+
+static const char *
+gen8_read_report_reason(const uint32_t *report)
+{
+	uint32_t reason = ((report[0] >> OAREPORT_REASON_SHIFT) &
+			   OAREPORT_REASON_MASK);
+
+	if (reason & (1<<0))
+		return "timer";
+	else if (reason & (1<<1))
+	      return "internal trigger 1";
+	else if (reason & (1<<2))
+	      return "internal trigger 2";
+	else if (reason & (1<<3))
+	      return "context switch";
+	else if (reason & (1<<4))
+	      return "GO 1->0 transition (enter RC6)";
+	else if (reason & (1<<5))
+		return "[un]slice clock ratio change";
+	else
+		return "unknown";
+}
+
+static bool
+oa_report_is_periodic(uint32_t oa_exponent, const uint32_t *report)
+{
+	if (IS_HASWELL(devid)) {
+		/* For Haswell we don't have a documented report reason field
+		 * (though empirically report[0] bit 10 does seem to correlate
+		 * with a timer trigger reason) so we instead infer which
+		 * reports are timer triggered by checking if the least
+		 * significant bits are zero and the exponent bit is set.
+		 */
+		uint32_t oa_exponent_mask = (1 << (oa_exponent + 1)) - 1;
+
+		if ((report[1] & oa_exponent_mask) != (1 << oa_exponent))
+			return true;
+	} else {
+		if ((report[0] >> OAREPORT_REASON_SHIFT) &
+		    OAREPORT_REASON_TIMER)
+			return true;
+	}
+
+	return false;
+}
+
+static uint64_t
+timebase_scale(uint32_t u32_delta)
+{
+	return ((uint64_t)u32_delta * NSEC_PER_SEC) / timestamp_frequency;
+}
+
+/* Returns: the largest OA exponent that will still result in a sampling period
+ * less than or equal to the given @period.
+ */
+static int
+max_oa_exponent_for_period_lte(uint64_t period)
+{
+	/* NB: timebase_scale() takes a uint32_t and an exponent of 30
+	 * would already represent a period of ~3 minutes so there's
+	 * really no need to consider higher exponents.
+	 */
+	for (int i = 0; i < 30; i++) {
+		uint64_t oa_period = timebase_scale(2 << i);
+
+		if (oa_period > period)
+			return max(0, i - 1);
+	}
+
+	igt_assert(!"reached");
+	return -1;
+}
+
+/* Return: the largest OA exponent that will still result in a sampling
+ * frequency greater than the given @frequency.
+ */
+static int
+max_oa_exponent_for_freq_gt(uint64_t frequency)
+{
+	uint64_t period = NSEC_PER_SEC / frequency;
+
+	igt_assert_neq(period, 0);
+
+	return max_oa_exponent_for_period_lte(period - 1);
+}
+
+static uint64_t
+oa_exponent_to_ns(int exponent)
+{
+       return 1000000000ULL * (2ULL << exponent) / timestamp_frequency;
+}
+
+static void
+hsw_sanity_check_render_basic_reports(uint32_t *oa_report0, uint32_t *oa_report1,
+				      enum drm_i915_oa_format fmt)
+{
+	uint32_t time_delta = timebase_scale(oa_report1[1] - oa_report0[1]);
+	uint32_t clock_delta;
+	uint32_t max_delta;
+
+	igt_assert_neq(time_delta, 0);
+
+	/* As a special case we have to consider that on Haswell we
+	 * can't explicitly derive a clock delta for all OA report
+	 * formats...
+	 */
+	if (oa_formats[fmt].n_c == 0) {
+		/* Assume running at max freq for sake of
+		 * below sanity check on counters... */
+		clock_delta = (gt_max_freq_mhz *
+			       (uint64_t)time_delta) / 1000;
+	} else {
+		uint32_t ticks0 = read_report_ticks(oa_report0, fmt);
+		uint32_t ticks1 = read_report_ticks(oa_report1, fmt);
+		uint64_t freq;
+
+		clock_delta = ticks1 - ticks0;
+
+		igt_assert_neq(clock_delta, 0);
+
+		freq = ((uint64_t)clock_delta * 1000) / time_delta;
+		igt_debug("freq = %"PRIu64"\n", freq);
+
+		igt_assert(freq <= gt_max_freq_mhz);
+	}
+
+	igt_debug("clock delta = %"PRIu32"\n", clock_delta);
+
+	/* The maximum rate for any HSW counter =
+	 *   clock_delta * N EUs
+	 *
+	 * Sanity check that no counters exceed this delta.
+	 */
+	max_delta = clock_delta * n_eus;
+
+	/* 40bit A counters were only introduced for Gen8+ */
+	igt_assert_eq(oa_formats[fmt].n_a40, 0);
+
+	for (int j = 0; j < oa_formats[fmt].n_a; j++) {
+		uint32_t *a0 = (uint32_t *)(((uint8_t *)oa_report0) +
+					    oa_formats[fmt].a_off);
+		uint32_t *a1 = (uint32_t *)(((uint8_t *)oa_report1) +
+					    oa_formats[fmt].a_off);
+		int a_id = oa_formats[fmt].first_a + j;
+		uint32_t delta = a1[j] - a0[j];
+
+		if (undefined_a_counters[a_id])
+			continue;
+
+		igt_debug("A%d: delta = %"PRIu32"\n", a_id, delta);
+		igt_assert(delta <= max_delta);
+	}
+
+	for (int j = 0; j < oa_formats[fmt].n_b; j++) {
+		uint32_t *b0 = (uint32_t *)(((uint8_t *)oa_report0) +
+					    oa_formats[fmt].b_off);
+		uint32_t *b1 = (uint32_t *)(((uint8_t *)oa_report1) +
+					    oa_formats[fmt].b_off);
+		uint32_t delta = b1[j] - b0[j];
+
+		igt_debug("B%d: delta = %"PRIu32"\n", j, delta);
+		igt_assert(delta <= max_delta);
+	}
+
+	for (int j = 0; j < oa_formats[fmt].n_c; j++) {
+		uint32_t *c0 = (uint32_t *)(((uint8_t *)oa_report0) +
+					    oa_formats[fmt].c_off);
+		uint32_t *c1 = (uint32_t *)(((uint8_t *)oa_report1) +
+					    oa_formats[fmt].c_off);
+		uint32_t delta = c1[j] - c0[j];
+
+		igt_debug("C%d: delta = %"PRIu32"\n", j, delta);
+		igt_assert(delta <= max_delta);
+	}
+}
+
+static uint64_t
+gen8_read_40bit_a_counter(uint32_t *report, enum drm_i915_oa_format fmt, int a_id)
+{
+	uint8_t *a40_high = (((uint8_t *)report) + oa_formats[fmt].a40_high_off);
+	uint32_t *a40_low = (uint32_t *)(((uint8_t *)report) +
+					 oa_formats[fmt].a40_low_off);
+	uint64_t high = (uint64_t)(a40_high[a_id]) << 32;
+
+	return a40_low[a_id] | high;
+}
+
+static uint64_t
+gen8_40bit_a_delta(uint64_t value0, uint64_t value1)
+{
+	if (value0 > value1)
+		return (1ULL << 40) + value1 - value0;
+	else
+		return value1 - value0;
+}
+
+/* The TestOa metric set is designed so */
+static void
+gen8_sanity_check_test_oa_reports(uint32_t *oa_report0, uint32_t *oa_report1,
+				  enum drm_i915_oa_format fmt)
+{
+	uint32_t time_delta = timebase_scale(oa_report1[1] - oa_report0[1]);
+	uint32_t ticks0 = read_report_ticks(oa_report0, fmt);
+	uint32_t ticks1 = read_report_ticks(oa_report1, fmt);
+	uint32_t clock_delta = ticks1 - ticks0;
+	uint32_t max_delta;
+	uint64_t freq;
+	uint32_t *rpt0_b = (uint32_t *)(((uint8_t *)oa_report0) +
+					oa_formats[fmt].b_off);
+	uint32_t *rpt1_b = (uint32_t *)(((uint8_t *)oa_report1) +
+					oa_formats[fmt].b_off);
+	uint32_t b;
+	uint32_t ref;
+
+
+	igt_assert_neq(time_delta, 0);
+	igt_assert_neq(clock_delta, 0);
+
+	freq = ((uint64_t)clock_delta * 1000) / time_delta;
+	igt_debug("freq = %"PRIu64"\n", freq);
+
+	igt_assert(freq <= gt_max_freq_mhz);
+
+	igt_debug("clock delta = %"PRIu32"\n", clock_delta);
+
+	max_delta = clock_delta * n_eus;
+
+	/* Gen8+ has some 40bit A counters... */
+	for (int j = 0; j < oa_formats[fmt].n_a40; j++) {
+		uint64_t value0 = gen8_read_40bit_a_counter(oa_report0, fmt, j);
+		uint64_t value1 = gen8_read_40bit_a_counter(oa_report1, fmt, j);
+		uint64_t delta = gen8_40bit_a_delta(value0, value1);
+
+		if (undefined_a_counters[j])
+			continue;
+
+		igt_debug("A%d: delta = %"PRIu64"\n", j, delta);
+		igt_assert(delta <= max_delta);
+	}
+
+	for (int j = 0; j < oa_formats[fmt].n_a; j++) {
+		uint32_t *a0 = (uint32_t *)(((uint8_t *)oa_report0) +
+					    oa_formats[fmt].a_off);
+		uint32_t *a1 = (uint32_t *)(((uint8_t *)oa_report1) +
+					    oa_formats[fmt].a_off);
+		int a_id = oa_formats[fmt].first_a + j;
+		uint32_t delta = a1[j] - a0[j];
+
+		if (undefined_a_counters[a_id])
+			continue;
+
+		igt_debug("A%d: delta = %"PRIu32"\n", a_id, delta);
+		igt_assert(delta <= max_delta);
+	}
+
+	/* The TestOa metric set defines all B counters to be a
+	 * multiple of the gpu clock
+	 */
+	if (oa_formats[fmt].n_b) {
+		b = rpt1_b[0] - rpt0_b[0];
+		igt_debug("B0: delta = %"PRIu32"\n", b);
+		igt_assert_eq(b, 0);
+
+		b = rpt1_b[1] - rpt0_b[1];
+		igt_debug("B1: delta = %"PRIu32"\n", b);
+		igt_assert_eq(b, clock_delta);
+
+		b = rpt1_b[2] - rpt0_b[2];
+		igt_debug("B2: delta = %"PRIu32"\n", b);
+		igt_assert_eq(b, clock_delta);
+
+		b = rpt1_b[3] - rpt0_b[3];
+		ref = clock_delta / 2;
+		igt_debug("B3: delta = %"PRIu32"\n", b);
+		igt_assert(b >= ref - 1 && b <= ref + 1);
+
+		b = rpt1_b[4] - rpt0_b[4];
+		ref = clock_delta / 3;
+		igt_debug("B4: delta = %"PRIu32"\n", b);
+		igt_assert(b >= ref - 1 && b <= ref + 1);
+
+		b = rpt1_b[5] - rpt0_b[5];
+		ref = clock_delta / 3;
+		igt_debug("B5: delta = %"PRIu32"\n", b);
+		igt_assert(b >= ref - 1 && b <= ref + 1);
+
+		b = rpt1_b[6] - rpt0_b[6];
+		ref = clock_delta / 6;
+		igt_debug("B6: delta = %"PRIu32"\n", b);
+		igt_assert(b >= ref - 1 && b <= ref + 1);
+
+		b = rpt1_b[7] - rpt0_b[7];
+		ref = clock_delta * 2 / 3;
+		igt_debug("B7: delta = %"PRIu32"\n", b);
+		igt_assert(b >= ref - 1 && b <= ref + 1);
+	}
+
+	for (int j = 0; j < oa_formats[fmt].n_c; j++) {
+		uint32_t *c0 = (uint32_t *)(((uint8_t *)oa_report0) +
+					    oa_formats[fmt].c_off);
+		uint32_t *c1 = (uint32_t *)(((uint8_t *)oa_report1) +
+					    oa_formats[fmt].c_off);
+		uint32_t delta = c1[j] - c0[j];
+
+		igt_debug("C%d: delta = %"PRIu32"\n", j, delta);
+		igt_assert(delta <= max_delta);
+	}
+}
+
+static bool
+init_sys_info(void)
+{
+	const char *test_set_name = NULL;
+	const char *test_set_uuid = NULL;
+	char buf[256];
+
+	igt_assert_neq(card, -1);
+	igt_assert_neq(devid, 0);
+
+	timestamp_frequency = 12500000;
+
+	if (IS_HASWELL(devid)) {
+		/* We don't have a TestOa metric set for Haswell so use
+		 * RenderBasic
+		 */
+		test_set_name = "RenderBasic";
+		test_set_uuid = "403d8832-1a27-4aa6-a64e-f5389ce7b212";
+		test_oa_format = I915_OA_FORMAT_A45_B8_C8;
+		undefined_a_counters = hsw_undefined_a_counters;
+		read_report_ticks = hsw_read_report_ticks;
+		sanity_check_reports = hsw_sanity_check_render_basic_reports;
+
+		if (intel_gt(devid) == 0)
+			n_eus = 10;
+		else if (intel_gt(devid) == 1)
+			n_eus = 20;
+		else if (intel_gt(devid) == 2)
+			n_eus = 40;
+		else {
+			igt_assert(!"reached");
+			return false;
+		}
+	} else {
+		drm_i915_getparam_t gp;
+
+		test_set_name = "TestOa";
+		test_oa_format = local_I915_OA_FORMAT_A32u40_A4u32_B8_C8;
+		undefined_a_counters = gen8_undefined_a_counters;
+		read_report_ticks = gen8_read_report_ticks;
+		sanity_check_reports = gen8_sanity_check_test_oa_reports;
+
+		if (IS_BROADWELL(devid)) {
+			test_set_uuid = "d6de6f55-e526-4f79-a6a6-d7315c09044e";
+		} else if (IS_CHERRYVIEW(devid)) {
+			test_set_uuid = "4a534b07-cba3-414d-8d60-874830e883aa";
+		} else if (IS_SKYLAKE(devid)) {
+			switch (intel_gt(devid)) {
+			case 1:
+				test_set_uuid = "1651949f-0ac0-4cb1-a06f-dafd74a407d1";
+				break;
+			case 2:
+				test_set_uuid = "2b985803-d3c9-4629-8a4f-634bfecba0e8";
+				break;
+			case 3:
+				test_set_uuid = "882fa433-1f4a-4a67-a962-c741888fe5f5";
+				break;
+			default:
+				igt_debug("unsupported Skylake GT size\n");
+				return false;
+			}
+			timestamp_frequency = 12000000;
+		} else if (IS_BROXTON(devid)) {
+			test_set_uuid = "5ee72f5c-092f-421e-8b70-225f7c3e9612";
+			timestamp_frequency = 19200000;
+		} else if (IS_KABYLAKE(devid)) {
+			switch (intel_gt(devid)) {
+			case 1:
+				test_set_uuid = "baa3c7e4-52b6-4b85-801e-465a94b746dd";
+				break;
+			case 2:
+				test_set_uuid = "f1792f32-6db2-4b50-b4b2-557128f1688d";
+				break;
+			default:
+				igt_debug("unsupported Kabylake GT size\n");
+				return false;
+			}
+			timestamp_frequency = 12000000;
+		} else if (IS_GEMINILAKE(devid)) {
+			test_set_uuid = "dd3fd789-e783-4204-8cd0-b671bbccb0cf";
+			timestamp_frequency = 19200000;
+		} else {
+			igt_debug("unsupported GT\n");
+			return false;
+		}
+
+		gp.param = I915_PARAM_EU_TOTAL;
+		gp.value = &n_eus;
+		do_ioctl(drm_fd, DRM_IOCTL_I915_GETPARAM, &gp);
+	}
+
+	igt_debug("%s metric set UUID = %s\n",
+		  test_set_name,
+		  test_set_uuid);
+
+	oa_exp_1_millisec = max_oa_exponent_for_period_lte(1000000);
+
+	snprintf(buf, sizeof(buf),
+		 "/sys/class/drm/card%d/metrics/%s/id",
+		 card,
+		 test_set_uuid);
+
+	return try_read_u64_file(buf, &test_metric_set_id);
+}
+
+static void
+gt_frequency_range_save(void)
+{
+	gt_min_freq_mhz_saved = sysfs_read("gt_min_freq_mhz");
+	gt_max_freq_mhz_saved = sysfs_read("gt_max_freq_mhz");
+
+	gt_min_freq_mhz = gt_min_freq_mhz_saved;
+	gt_max_freq_mhz = gt_max_freq_mhz_saved;
+}
+
+static void
+gt_frequency_pin(int gt_freq_mhz)
+{
+	igt_debug("requesting pinned GT freq = %dmhz\n", gt_freq_mhz);
+
+	if (gt_freq_mhz > gt_max_freq_mhz) {
+		sysfs_write("gt_max_freq_mhz", gt_freq_mhz);
+		sysfs_write("gt_min_freq_mhz", gt_freq_mhz);
+	} else {
+		sysfs_write("gt_min_freq_mhz", gt_freq_mhz);
+		sysfs_write("gt_max_freq_mhz", gt_freq_mhz);
+	}
+	gt_min_freq_mhz = gt_freq_mhz;
+	gt_max_freq_mhz = gt_freq_mhz;
+}
+
+static void
+gt_frequency_range_restore(void)
+{
+	igt_debug("restoring GT frequency range: min = %dmhz, max =%dmhz, current: min=%dmhz, max=%dmhz\n",
+		  (int)gt_min_freq_mhz_saved,
+		  (int)gt_max_freq_mhz_saved,
+		  (int)gt_min_freq_mhz,
+		  (int)gt_max_freq_mhz);
+
+	/* Assume current min/max are the same */
+	if (gt_min_freq_mhz_saved > gt_max_freq_mhz) {
+		sysfs_write("gt_max_freq_mhz", gt_max_freq_mhz_saved);
+		sysfs_write("gt_min_freq_mhz", gt_min_freq_mhz_saved);
+	} else {
+		sysfs_write("gt_min_freq_mhz", gt_min_freq_mhz_saved);
+		sysfs_write("gt_max_freq_mhz", gt_max_freq_mhz_saved);
+	}
+
+	gt_min_freq_mhz = gt_min_freq_mhz_saved;
+	gt_max_freq_mhz = gt_max_freq_mhz_saved;
+}
+
+/* CAP_SYS_ADMIN is required to open system wide metrics, unless the system
+ * control parameter dev.i915.perf_stream_paranoid == 0 */
+static void
+test_system_wide_paranoid(void)
+{
+	igt_fork(child, 1) {
+		uint64_t properties[] = {
+			/* Include OA reports in samples */
+			DRM_I915_PERF_PROP_SAMPLE_OA, true,
+
+			/* OA unit configuration */
+			DRM_I915_PERF_PROP_OA_METRICS_SET, test_metric_set_id,
+			DRM_I915_PERF_PROP_OA_FORMAT, test_oa_format,
+			DRM_I915_PERF_PROP_OA_EXPONENT, oa_exp_1_millisec,
+		};
+		struct drm_i915_perf_open_param param = {
+			.flags = I915_PERF_FLAG_FD_CLOEXEC |
+				I915_PERF_FLAG_FD_NONBLOCK,
+			.num_properties = sizeof(properties) / 16,
+			.properties_ptr = to_user_pointer(properties),
+		};
+
+		write_u64_file("/proc/sys/dev/i915/perf_stream_paranoid", 1);
+
+		igt_drop_root();
+
+		do_ioctl_err(drm_fd, DRM_IOCTL_I915_PERF_OPEN, &param, EACCES);
+	}
+
+	igt_waitchildren();
+
+	igt_fork(child, 1) {
+		uint64_t properties[] = {
+			/* Include OA reports in samples */
+			DRM_I915_PERF_PROP_SAMPLE_OA, true,
+
+			/* OA unit configuration */
+			DRM_I915_PERF_PROP_OA_METRICS_SET, test_metric_set_id,
+			DRM_I915_PERF_PROP_OA_FORMAT, test_oa_format,
+			DRM_I915_PERF_PROP_OA_EXPONENT, oa_exp_1_millisec,
+		};
+		struct drm_i915_perf_open_param param = {
+			.flags = I915_PERF_FLAG_FD_CLOEXEC |
+				I915_PERF_FLAG_FD_NONBLOCK,
+			.num_properties = sizeof(properties) / 16,
+			.properties_ptr = to_user_pointer(properties),
+		};
+		int stream_fd;
+
+		write_u64_file("/proc/sys/dev/i915/perf_stream_paranoid", 0);
+
+		igt_drop_root();
+
+		stream_fd = __perf_open(drm_fd, &param);
+		close(stream_fd);
+	}
+
+	igt_waitchildren();
+
+	/* leave in paranoid state */
+	write_u64_file("/proc/sys/dev/i915/perf_stream_paranoid", 1);
+}
+
+static void
+test_invalid_open_flags(void)
+{
+	uint64_t properties[] = {
+		/* Include OA reports in samples */
+		DRM_I915_PERF_PROP_SAMPLE_OA, true,
+
+		/* OA unit configuration */
+		DRM_I915_PERF_PROP_OA_METRICS_SET, test_metric_set_id,
+		DRM_I915_PERF_PROP_OA_FORMAT, test_oa_format,
+		DRM_I915_PERF_PROP_OA_EXPONENT, oa_exp_1_millisec,
+	};
+	struct drm_i915_perf_open_param param = {
+		.flags = ~0, /* Undefined flag bits set! */
+		.num_properties = sizeof(properties) / 16,
+		.properties_ptr = to_user_pointer(properties),
+	};
+
+	do_ioctl_err(drm_fd, DRM_IOCTL_I915_PERF_OPEN, &param, EINVAL);
+}
+
+static void
+test_invalid_oa_metric_set_id(void)
+{
+	uint64_t properties[] = {
+		/* Include OA reports in samples */
+		DRM_I915_PERF_PROP_SAMPLE_OA, true,
+
+		/* OA unit configuration */
+		DRM_I915_PERF_PROP_OA_FORMAT, test_oa_format,
+		DRM_I915_PERF_PROP_OA_EXPONENT, oa_exp_1_millisec,
+		DRM_I915_PERF_PROP_OA_METRICS_SET, UINT64_MAX,
+	};
+	struct drm_i915_perf_open_param param = {
+		.flags = I915_PERF_FLAG_FD_CLOEXEC |
+			I915_PERF_FLAG_FD_NONBLOCK,
+		.num_properties = sizeof(properties) / 16,
+		.properties_ptr = to_user_pointer(properties),
+	};
+	int stream_fd;
+
+	do_ioctl_err(drm_fd, DRM_IOCTL_I915_PERF_OPEN, &param, EINVAL);
+
+	properties[ARRAY_SIZE(properties) - 1] = 0; /* ID 0 is also be reserved as invalid */
+	do_ioctl_err(drm_fd, DRM_IOCTL_I915_PERF_OPEN, &param, EINVAL);
+
+	/* Check that we aren't just seeing false positives... */
+	properties[ARRAY_SIZE(properties) - 1] = test_metric_set_id;
+	stream_fd = __perf_open(drm_fd, &param);
+	close(stream_fd);
+
+	/* There's no valid default OA metric set ID... */
+	param.num_properties--;
+	do_ioctl_err(drm_fd, DRM_IOCTL_I915_PERF_OPEN, &param, EINVAL);
+}
+
+static void
+test_invalid_oa_format_id(void)
+{
+	uint64_t properties[] = {
+		/* Include OA reports in samples */
+		DRM_I915_PERF_PROP_SAMPLE_OA, true,
+
+		/* OA unit configuration */
+		DRM_I915_PERF_PROP_OA_METRICS_SET, test_metric_set_id,
+		DRM_I915_PERF_PROP_OA_EXPONENT, oa_exp_1_millisec,
+		DRM_I915_PERF_PROP_OA_FORMAT, UINT64_MAX,
+	};
+	struct drm_i915_perf_open_param param = {
+		.flags = I915_PERF_FLAG_FD_CLOEXEC |
+			I915_PERF_FLAG_FD_NONBLOCK,
+		.num_properties = sizeof(properties) / 16,
+		.properties_ptr = to_user_pointer(properties),
+	};
+	int stream_fd;
+
+	do_ioctl_err(drm_fd, DRM_IOCTL_I915_PERF_OPEN, &param, EINVAL);
+
+	properties[ARRAY_SIZE(properties) - 1] = 0; /* ID 0 is also be reserved as invalid */
+	do_ioctl_err(drm_fd, DRM_IOCTL_I915_PERF_OPEN, &param, EINVAL);
+
+	/* Check that we aren't just seeing false positives... */
+	properties[ARRAY_SIZE(properties) - 1] = test_oa_format;
+	stream_fd = __perf_open(drm_fd, &param);
+	close(stream_fd);
+
+	/* There's no valid default OA format... */
+	param.num_properties--;
+	do_ioctl_err(drm_fd, DRM_IOCTL_I915_PERF_OPEN, &param, EINVAL);
+}
+
+static void
+test_missing_sample_flags(void)
+{
+	uint64_t properties[] = {
+		/* No _PROP_SAMPLE_xyz flags */
+
+		/* OA unit configuration */
+		DRM_I915_PERF_PROP_OA_METRICS_SET, test_metric_set_id,
+		DRM_I915_PERF_PROP_OA_EXPONENT, oa_exp_1_millisec,
+		DRM_I915_PERF_PROP_OA_FORMAT, test_oa_format,
+	};
+	struct drm_i915_perf_open_param param = {
+		.flags = I915_PERF_FLAG_FD_CLOEXEC,
+		.num_properties = sizeof(properties) / 16,
+		.properties_ptr = to_user_pointer(properties),
+	};
+
+	do_ioctl_err(drm_fd, DRM_IOCTL_I915_PERF_OPEN, &param, EINVAL);
+}
+
+static void
+read_2_oa_reports(int stream_fd,
+		  int format_id,
+		  int exponent,
+		  uint32_t *oa_report0,
+		  uint32_t *oa_report1,
+		  bool timer_only)
+{
+	size_t format_size = oa_formats[format_id].size;
+	size_t sample_size = (sizeof(struct drm_i915_perf_record_header) +
+			      format_size);
+	const struct drm_i915_perf_record_header *header;
+	uint32_t exponent_mask = (1 << (exponent + 1)) - 1;
+
+	/* Note: we allocate a large buffer so that each read() iteration
+	 * should scrape *all* pending records.
+	 *
+	 * The largest buffer the OA unit supports is 16MB and the smallest
+	 * OA report format is 64bytes allowing up to 262144 reports to
+	 * be buffered.
+	 *
+	 * Being sure we are fetching all buffered reports allows us to
+	 * potentially throw away / skip all reports whenever we see
+	 * a _REPORT_LOST notification as a way of being sure are
+	 * measurements aren't skewed by a lost report.
+	 *
+	 * Note: that is is useful for some tests but also not something
+	 * applications would be expected to resort to. Lost reports are
+	 * somewhat unpredictable but typically don't pose a problem - except
+	 * to indicate that the OA unit may be over taxed if lots of reports
+	 * are being lost.
+	 */
+	int buf_size = 262144 * (64 + sizeof(struct drm_i915_perf_record_header));
+	uint8_t *buf = malloc(buf_size);
+	int n = 0;
+
+	for (int i = 0; i < 1000; i++) {
+		ssize_t len;
+
+		while ((len = read(stream_fd, buf, buf_size)) < 0 &&
+		       errno == EINTR)
+			;
+
+		igt_assert(len > 0);
+
+		for (size_t offset = 0; offset < len; offset += header->size) {
+			const uint32_t *report;
+
+			header = (void *)(buf + offset);
+
+			igt_assert_eq(header->pad, 0); /* Reserved */
+
+			/* Currently the only test that should ever expect to
+			 * see a _BUFFER_LOST error is the buffer_fill test,
+			 * otherwise something bad has probably happened...
+			 */
+			igt_assert_neq(header->type, DRM_I915_PERF_RECORD_OA_BUFFER_LOST);
+
+			/* At high sampling frequencies the OA HW might not be
+			 * able to cope with all write requests and will notify
+			 * us that a report was lost. We restart our read of
+			 * two sequential reports due to the timeline blip this
+			 * implies
+			 */
+			if (header->type == DRM_I915_PERF_RECORD_OA_REPORT_LOST) {
+				igt_debug("read restart: OA trigger collision / report lost\n");
+				n = 0;
+
+				/* XXX: break, because we don't know where
+				 * within the series of already read reports
+				 * there could be a blip from the lost report.
+				 */
+				break;
+			}
+
+			/* Currently the only other record type expected is a
+			 * _SAMPLE. Notably this test will need updating if
+			 * i915-perf is extended in the future with additional
+			 * record types.
+			 */
+			igt_assert_eq(header->type, DRM_I915_PERF_RECORD_SAMPLE);
+
+			igt_assert_eq(header->size, sample_size);
+
+			report = (const void *)(header + 1);
+
+			igt_debug("read report: reason = %x, timestamp = %x, exponent mask=%x\n",
+				  report[0], report[1], exponent_mask);
+
+			/* Don't expect zero for timestamps */
+			igt_assert_neq(report[1], 0);
+
+			if (timer_only) {
+				if (!oa_report_is_periodic(exponent, report)) {
+					igt_debug("skipping non timer report\n");
+					continue;
+				}
+			}
+
+			if (n++ == 0)
+				memcpy(oa_report0, report, format_size);
+			else {
+				memcpy(oa_report1, report, format_size);
+				free(buf);
+				return;
+			}
+		}
+	}
+
+	free(buf);
+
+	igt_assert(!"reached");
+}
+
+static void
+open_and_read_2_oa_reports(int format_id,
+			   int exponent,
+			   uint32_t *oa_report0,
+			   uint32_t *oa_report1,
+			   bool timer_only)
+{
+	uint64_t properties[] = {
+		/* Include OA reports in samples */
+		DRM_I915_PERF_PROP_SAMPLE_OA, true,
+
+		/* OA unit configuration */
+		DRM_I915_PERF_PROP_OA_METRICS_SET, test_metric_set_id,
+		DRM_I915_PERF_PROP_OA_FORMAT, format_id,
+		DRM_I915_PERF_PROP_OA_EXPONENT, exponent,
+
+	};
+	struct drm_i915_perf_open_param param = {
+		.flags = I915_PERF_FLAG_FD_CLOEXEC,
+		.num_properties = sizeof(properties) / 16,
+		.properties_ptr = to_user_pointer(properties),
+	};
+	int stream_fd = __perf_open(drm_fd, &param);
+
+	read_2_oa_reports(stream_fd, format_id, exponent,
+			  oa_report0, oa_report1, timer_only);
+
+	close(stream_fd);
+}
+
+static void
+gen8_read_report_clock_ratios(uint32_t *report,
+			      uint32_t *slice_freq_mhz,
+			      uint32_t *unslice_freq_mhz)
+{
+	uint32_t unslice_freq = report[0] & 0x1ff;
+	uint32_t slice_freq_low = (report[0] >> 25) & 0x7f;
+	uint32_t slice_freq_high = (report[0] >> 9) & 0x3;
+	uint32_t slice_freq = slice_freq_low | (slice_freq_high << 7);
+
+	*slice_freq_mhz = (slice_freq * 16666) / 1000;
+	*unslice_freq_mhz = (unslice_freq * 16666) / 1000;
+}
+
+static void
+print_reports(uint32_t *oa_report0, uint32_t *oa_report1, int fmt)
+{
+	igt_debug("TIMESTAMP: 1st = %"PRIu32", 2nd = %"PRIu32", delta = %"PRIu32"\n",
+		  oa_report0[1], oa_report1[1], oa_report1[1] - oa_report0[1]);
+
+	if (IS_HASWELL(devid) && oa_formats[fmt].n_c == 0) {
+		igt_debug("CLOCK = N/A\n");
+	} else {
+		uint32_t clock0 = read_report_ticks(oa_report0, fmt);
+		uint32_t clock1 = read_report_ticks(oa_report1, fmt);
+
+		igt_debug("CLOCK: 1st = %"PRIu32", 2nd = %"PRIu32", delta = %"PRIu32"\n",
+			  clock0, clock1, clock1 - clock0);
+	}
+
+	if (intel_gen(devid) >= 8) {
+		uint32_t slice_freq0, slice_freq1, unslice_freq0, unslice_freq1;
+		const char *reason0 = gen8_read_report_reason(oa_report0);
+		const char *reason1 = gen8_read_report_reason(oa_report1);
+
+		igt_debug("CTX ID: 1st = %"PRIu32", 2nd = %"PRIu32"\n",
+			  oa_report0[2], oa_report1[2]);
+
+		gen8_read_report_clock_ratios(oa_report0,
+					      &slice_freq0, &unslice_freq0);
+		gen8_read_report_clock_ratios(oa_report1,
+					      &slice_freq1, &unslice_freq1);
+
+		igt_debug("SLICE CLK: 1st = %umhz, 2nd = %umhz, delta = %d\n",
+			  slice_freq0, slice_freq1,
+			  ((int)slice_freq1 - (int)slice_freq0));
+		igt_debug("UNSLICE CLK: 1st = %umhz, 2nd = %umhz, delta = %d\n",
+			  unslice_freq0, unslice_freq1,
+			  ((int)unslice_freq1 - (int)unslice_freq0));
+
+		igt_debug("REASONS: 1st = \"%s\", 2nd = \"%s\"\n", reason0, reason1);
+	}
+
+	/* Gen8+ has some 40bit A counters... */
+	for (int j = 0; j < oa_formats[fmt].n_a40; j++) {
+		uint64_t value0 = gen8_read_40bit_a_counter(oa_report0, fmt, j);
+		uint64_t value1 = gen8_read_40bit_a_counter(oa_report1, fmt, j);
+		uint64_t delta = gen8_40bit_a_delta(value0, value1);
+
+		if (undefined_a_counters[j])
+			continue;
+
+		igt_debug("A%d: 1st = %"PRIu64", 2nd = %"PRIu64", delta = %"PRIu64"\n",
+			  j, value0, value1, delta);
+	}
+
+	for (int j = 0; j < oa_formats[fmt].n_a; j++) {
+		uint32_t *a0 = (uint32_t *)(((uint8_t *)oa_report0) +
+					    oa_formats[fmt].a_off);
+		uint32_t *a1 = (uint32_t *)(((uint8_t *)oa_report1) +
+					    oa_formats[fmt].a_off);
+		int a_id = oa_formats[fmt].first_a + j;
+		uint32_t delta = a1[j] - a0[j];
+
+		if (undefined_a_counters[a_id])
+			continue;
+
+		igt_debug("A%d: 1st = %"PRIu32", 2nd = %"PRIu32", delta = %"PRIu32"\n",
+			  a_id, a0[j], a1[j], delta);
+	}
+
+	for (int j = 0; j < oa_formats[fmt].n_b; j++) {
+		uint32_t *b0 = (uint32_t *)(((uint8_t *)oa_report0) +
+					    oa_formats[fmt].b_off);
+		uint32_t *b1 = (uint32_t *)(((uint8_t *)oa_report1) +
+					    oa_formats[fmt].b_off);
+		uint32_t delta = b1[j] - b0[j];
+
+		igt_debug("B%d: 1st = %"PRIu32", 2nd = %"PRIu32", delta = %"PRIu32"\n",
+			  j, b0[j], b1[j], delta);
+	}
+
+	for (int j = 0; j < oa_formats[fmt].n_c; j++) {
+		uint32_t *c0 = (uint32_t *)(((uint8_t *)oa_report0) +
+					    oa_formats[fmt].c_off);
+		uint32_t *c1 = (uint32_t *)(((uint8_t *)oa_report1) +
+					    oa_formats[fmt].c_off);
+		uint32_t delta = c1[j] - c0[j];
+
+		igt_debug("C%d: 1st = %"PRIu32", 2nd = %"PRIu32", delta = %"PRIu32"\n",
+			  j, c0[j], c1[j], delta);
+	}
+}
+
+static void
+test_oa_formats(void)
+{
+	for (int i = 0; i < ARRAY_SIZE(oa_formats); i++) {
+		uint32_t oa_report0[64];
+		uint32_t oa_report1[64];
+
+		if (!oa_formats[i].name) /* sparse, indexed by ID */
+			continue;
+
+		if (oa_formats[i].min_gen &&
+		    intel_gen(devid) < oa_formats[i].min_gen) {
+			igt_debug("skipping unsupported OA format %s\n",
+				  oa_formats[i].name);
+			continue;
+		}
+
+		if (oa_formats[i].max_gen &&
+		    intel_gen(devid) > oa_formats[i].max_gen) {
+			igt_debug("skipping unsupported OA format %s\n",
+				  oa_formats[i].name);
+			continue;
+		}
+
+		igt_debug("Checking OA format %s\n", oa_formats[i].name);
+
+		open_and_read_2_oa_reports(i,
+					   oa_exp_1_millisec,
+					   oa_report0,
+					   oa_report1,
+					   false); /* timer reports only */
+
+		print_reports(oa_report0, oa_report1, i);
+		sanity_check_reports(oa_report0, oa_report1, i);
+	}
+}
+
+static void
+test_oa_exponents(int gt_freq_mhz)
+{
+	uint32_t freq_margin;
+
+	/* This test tries to use the sysfs interface for pinning the GT
+	 * frequency so we have another point of reference for comparing with
+	 * the clock frequency as derived from OA reports.
+	 *
+	 * This test has been finicky to stabilise while the
+	 * gt_min/max_freq_mhz files in sysfs don't seem to be a reliable
+	 * mechanism for fixing the gpu frequency.
+	 *
+	 * Since these unit tests are focused on the OA unit not the ability to
+	 * pin the frequency via sysfs we make the test account for pinning not
+	 * being reliable and read back the current frequency for each
+	 * iteration of this test to take this into account.
+	 */
+	gt_frequency_pin(gt_freq_mhz);
+
+	igt_debug("Testing OA timer exponents with requested GT frequency = %dmhz\n",
+		  gt_freq_mhz);
+
+	/* allow a +- 10% error margin when checking that the frequency
+	 * calculated from the OA reports matches the frequency according to
+	 * sysfs.
+	 */
+	freq_margin = gt_freq_mhz * 0.1;
+
+	/* It's asking a lot to sample with a 160 nanosecond period and the
+	 * test can fail due to buffer overflows if it wasn't possible to
+	 * keep up, so we don't start from an exponent of zero...
+	 */
+	for (int i = 5; i < 20; i++) {
+		uint32_t expected_timestamp_delta;
+		uint32_t timestamp_delta;
+		uint32_t oa_report0[64];
+		uint32_t oa_report1[64];
+		uint32_t time_delta;
+		uint32_t clock_delta;
+		uint32_t freq;
+		int n_tested = 0;
+		int n_freq_matches = 0;
+
+		/* The exponent is effectively selecting a bit in the timestamp
+		 * to trigger reports on and so in practice we expect the raw
+		 * timestamp deltas for periodic reports to exactly match the
+		 * value of next bit.
+		 */
+		expected_timestamp_delta = 2 << i;
+
+		for (int j = 0; n_tested < 10 && j < 100; j++) {
+			int gt_freq_mhz_0, gt_freq_mhz_1;
+			uint32_t ticks0, ticks1;
+
+			gt_freq_mhz_0 = sysfs_read("gt_act_freq_mhz");
+
+			igt_debug("ITER %d: testing OA exponent %d (period = %"PRIu64"ns) with sysfs GT freq = %dmhz +- %u\n",
+				  j, i,
+				  oa_exponent_to_ns(i),
+				  gt_freq_mhz_0, freq_margin);
+
+			open_and_read_2_oa_reports(test_oa_format,
+						   i, /* exponent */
+						   oa_report0,
+						   oa_report1,
+						   true); /* timer triggered
+							     reports only */
+
+			gt_freq_mhz_1 = sysfs_read("gt_act_freq_mhz");
+
+			/* If it looks like the frequency has changed according
+			 * to sysfs then skip looking at this pair of reports
+			 */
+			if (gt_freq_mhz_0 != gt_freq_mhz_1) {
+				igt_debug("skipping OA reports pair due to GT frequency change according to sysfs\n");
+				continue;
+			}
+
+			timestamp_delta = oa_report1[1] - oa_report0[1];
+			igt_assert_neq(timestamp_delta, 0);
+
+			if (timestamp_delta != expected_timestamp_delta) {
+				igt_debug("timestamp0 = %u/0x%x\n",
+					  oa_report0[1], oa_report0[1]);
+				igt_debug("timestamp1 = %u/0x%x\n",
+					  oa_report1[1], oa_report1[1]);
+			}
+
+			igt_assert_eq(timestamp_delta, expected_timestamp_delta);
+
+			ticks0 = read_report_ticks(oa_report0, test_oa_format);
+			ticks1 = read_report_ticks(oa_report1, test_oa_format);
+			clock_delta = ticks1 - ticks0;
+
+			time_delta = timebase_scale(timestamp_delta);
+
+			freq = ((uint64_t)clock_delta * 1000) / time_delta;
+			igt_debug("ITER %d: time delta = %"PRIu32"(ns) clock delta = %"PRIu32" freq = %"PRIu32"(mhz)\n",
+				  j, time_delta, clock_delta, freq);
+
+                        if (freq < (gt_freq_mhz_1 + freq_margin) &&
+                            freq > (gt_freq_mhz_1 - freq_margin))
+				n_freq_matches++;
+
+			n_tested++;
+		}
+
+		if (n_tested < 10)
+			igt_debug("sysfs frequency pinning too unstable for cross-referencing with OA derived frequency");
+		igt_assert_eq(n_tested, 10);
+
+		igt_debug("number of iterations with expected clock frequency = %d\n",
+			  n_freq_matches);
+
+		/* Don't assert the calculated frequency for extremely short
+		 * durations.
+		 *
+		 * Allow some mismatches since can't be can't be sure about
+		 * frequency changes between sysfs reads.
+		 */
+		if (i > 3)
+			igt_assert(n_freq_matches >= 7);
+	}
+
+	gt_frequency_range_restore();
+}
+
+/* The OA exponent selects a timestamp counter bit to trigger reports on.
+ *
+ * With a 64bit timestamp and least significant bit approx == 80ns then the MSB
+ * equates to > 40 thousand years and isn't exposed via the i915 perf interface.
+ *
+ * The max exponent exposed is expected to be 31, which is still a fairly
+ * ridiculous period (>5min) but is the maximum exponent where it's still
+ * possible to use periodic sampling as a means for tracking the overflow of
+ * 32bit OA report timestamps.
+ */
+static void
+test_invalid_oa_exponent(void)
+{
+	uint64_t properties[] = {
+		/* Include OA reports in samples */
+		DRM_I915_PERF_PROP_SAMPLE_OA, true,
+
+		/* OA unit configuration */
+		DRM_I915_PERF_PROP_OA_METRICS_SET, test_metric_set_id,
+		DRM_I915_PERF_PROP_OA_FORMAT, test_oa_format,
+		DRM_I915_PERF_PROP_OA_EXPONENT, 31, /* maximum exponent expected
+						       to be accepted */
+	};
+	struct drm_i915_perf_open_param param = {
+		.flags = I915_PERF_FLAG_FD_CLOEXEC,
+		.num_properties = sizeof(properties) / 16,
+		.properties_ptr = to_user_pointer(properties),
+	};
+	int stream_fd = __perf_open(drm_fd, &param);
+
+	close(stream_fd);
+
+	for (int i = 32; i < 65; i++) {
+		properties[7] = i;
+		do_ioctl_err(drm_fd, DRM_IOCTL_I915_PERF_OPEN, &param, EINVAL);
+	}
+}
+
+/* The lowest periodic sampling exponent equates to a period of 160 nanoseconds
+ * or a frequency of 6.25MHz which is only possible to request as root by
+ * default. By default the maximum OA sampling rate is 100KHz
+ */
+static void
+test_low_oa_exponent_permissions(void)
+{
+	int max_freq = read_u64_file("/proc/sys/dev/i915/oa_max_sample_rate");
+	int bad_exponent = max_oa_exponent_for_freq_gt(max_freq);
+	int ok_exponent = bad_exponent + 1;
+	uint64_t properties[] = {
+		/* Include OA reports in samples */
+		DRM_I915_PERF_PROP_SAMPLE_OA, true,
+
+		/* OA unit configuration */
+		DRM_I915_PERF_PROP_OA_METRICS_SET, test_metric_set_id,
+		DRM_I915_PERF_PROP_OA_FORMAT, test_oa_format,
+		DRM_I915_PERF_PROP_OA_EXPONENT, bad_exponent,
+	};
+	struct drm_i915_perf_open_param param = {
+		.flags = I915_PERF_FLAG_FD_CLOEXEC,
+		.num_properties = sizeof(properties) / 16,
+		.properties_ptr = to_user_pointer(properties),
+	};
+	uint64_t oa_period, oa_freq;
+
+	igt_assert_eq(max_freq, 100000);
+
+	/* Avoid EACCES errors opening a stream without CAP_SYS_ADMIN */
+	write_u64_file("/proc/sys/dev/i915/perf_stream_paranoid", 0);
+
+	igt_fork(child, 1) {
+		igt_drop_root();
+
+		do_ioctl_err(drm_fd, DRM_IOCTL_I915_PERF_OPEN, &param, EACCES);
+	}
+
+	igt_waitchildren();
+
+	properties[7] = ok_exponent;
+
+	igt_fork(child, 1) {
+		int stream_fd;
+
+		igt_drop_root();
+
+		stream_fd = __perf_open(drm_fd, &param);
+		close(stream_fd);
+	}
+
+	igt_waitchildren();
+
+	oa_period = timebase_scale(2 << ok_exponent);
+	oa_freq = NSEC_PER_SEC / oa_period;
+	write_u64_file("/proc/sys/dev/i915/oa_max_sample_rate", oa_freq - 100);
+
+	igt_fork(child, 1) {
+		igt_drop_root();
+
+		do_ioctl_err(drm_fd, DRM_IOCTL_I915_PERF_OPEN, &param, EACCES);
+	}
+
+	igt_waitchildren();
+
+	/* restore the defaults */
+	write_u64_file("/proc/sys/dev/i915/oa_max_sample_rate", 100000);
+	write_u64_file("/proc/sys/dev/i915/perf_stream_paranoid", 1);
+}
+
+static void
+test_per_context_mode_unprivileged(void)
+{
+	uint64_t properties[] = {
+		/* Single context sampling */
+		DRM_I915_PERF_PROP_CTX_HANDLE, UINT64_MAX, /* updated below */
+
+		/* Include OA reports in samples */
+		DRM_I915_PERF_PROP_SAMPLE_OA, true,
+
+		/* OA unit configuration */
+		DRM_I915_PERF_PROP_OA_METRICS_SET, test_metric_set_id,
+		DRM_I915_PERF_PROP_OA_FORMAT, test_oa_format,
+		DRM_I915_PERF_PROP_OA_EXPONENT, oa_exp_1_millisec,
+	};
+	struct drm_i915_perf_open_param param = {
+		.flags = I915_PERF_FLAG_FD_CLOEXEC,
+		.num_properties = sizeof(properties) / 16,
+		.properties_ptr = to_user_pointer(properties),
+	};
+
+	/* should be default, but just to be sure... */
+	write_u64_file("/proc/sys/dev/i915/perf_stream_paranoid", 1);
+
+	igt_fork(child, 1) {
+		drm_intel_context *context;
+		drm_intel_bufmgr *bufmgr;
+		int stream_fd;
+		uint32_t ctx_id = 0xffffffff; /* invalid id */
+		int ret;
+
+		igt_drop_root();
+
+		bufmgr = drm_intel_bufmgr_gem_init(drm_fd, 4096);
+		context = drm_intel_gem_context_create(bufmgr);
+
+		igt_assert(context);
+
+		ret = drm_intel_gem_context_get_id(context, &ctx_id);
+		igt_assert_eq(ret, 0);
+		igt_assert_neq(ctx_id, 0xffffffff);
+
+		properties[1] = ctx_id;
+
+		stream_fd = __perf_open(drm_fd, &param);
+		close(stream_fd);
+
+		drm_intel_gem_context_destroy(context);
+		drm_intel_bufmgr_destroy(bufmgr);
+	}
+
+	igt_waitchildren();
+}
+
+static int64_t
+get_time(void)
+{
+	struct timespec ts;
+
+	clock_gettime(CLOCK_MONOTONIC, &ts);
+
+	return ts.tv_sec * 1000000000 + ts.tv_nsec;
+}
+
+/* Note: The interface doesn't currently provide strict guarantees or control
+ * over the upper bound for how long it might take for a POLLIN event after
+ * some OA report is written by the OA unit.
+ *
+ * The plan is to add a property later that gives some control over the maximum
+ * latency, but for now we expect it is tuned for a fairly low latency
+ * suitable for applications wanting to provide live feedback for captured
+ * metrics.
+ *
+ * At the time of writing this test the driver was using a fixed 200Hz hrtimer
+ * regardless of the OA sampling exponent.
+ *
+ * There is no lower bound since a stream configured for periodic sampling may
+ * still contain other automatically triggered reports.
+ *
+ * What we try and check for here is that blocking reads don't return EAGAIN
+ * and that we aren't spending any significant time burning the cpu in
+ * kernelspace.
+ */
+static void
+test_blocking(void)
+{
+	/* ~40 milliseconds
+	 *
+	 * Having a period somewhat > sysconf(_SC_CLK_TCK) helps to stop
+	 * scheduling (liable to kick in when we make blocking poll()s/reads)
+	 * from interfering with the test.
+	 */
+	int oa_exponent = max_oa_exponent_for_period_lte(40000000);
+	uint64_t oa_period = oa_exponent_to_ns(oa_exponent);
+	uint64_t properties[] = {
+		/* Include OA reports in samples */
+		DRM_I915_PERF_PROP_SAMPLE_OA, true,
+
+		/* OA unit configuration */
+		DRM_I915_PERF_PROP_OA_METRICS_SET, test_metric_set_id,
+		DRM_I915_PERF_PROP_OA_FORMAT, test_oa_format,
+		DRM_I915_PERF_PROP_OA_EXPONENT, oa_exponent,
+	};
+	struct drm_i915_perf_open_param param = {
+		.flags = I915_PERF_FLAG_FD_CLOEXEC,
+		.num_properties = sizeof(properties) / 16,
+		.properties_ptr = to_user_pointer(properties),
+	};
+	int stream_fd = __perf_open(drm_fd, &param);
+	uint8_t buf[1024 * 1024];
+	struct tms start_times;
+	struct tms end_times;
+	int64_t user_ns, kernel_ns;
+	int64_t tick_ns = 1000000000 / sysconf(_SC_CLK_TCK);
+	int64_t test_duration_ns = tick_ns * 1000;
+
+	int max_iterations = (test_duration_ns / oa_period) + 1;
+	int n_extra_iterations = 0;
+
+	/* It's a bit tricky to put a lower limit here, but we expect a
+	 * relatively low latency for seeing reports, while we don't currently
+	 * give any control over this in the api.
+	 *
+	 * We assume a maximum latency of 6 millisecond to deliver a POLLIN and
+	 * read() after a new sample is written (46ms per iteration) considering
+	 * the knowledge that that the driver uses a 200Hz hrtimer (5ms period)
+	 * to check for data and giving some time to read().
+	 */
+	int min_iterations = (test_duration_ns / (oa_period + 6000000ull));
+
+	int64_t start;
+	int n = 0;
+
+	times(&start_times);
+
+	igt_debug("tick length = %dns, test duration = %"PRIu64"ns, min iter. = %d, max iter. = %d\n",
+		  (int)tick_ns, test_duration_ns,
+		  min_iterations, max_iterations);
+
+	/* In the loop we perform blocking polls while the HW is sampling at
+	 * ~25Hz, with the expectation that we spend most of our time blocked
+	 * in the kernel, and shouldn't be burning cpu cycles in the kernel in
+	 * association with this process (verified by looking at stime before
+	 * and after loop).
+	 *
+	 * We're looking to assert that less than 1% of the test duration is
+	 * spent in the kernel dealing with polling and read()ing.
+	 *
+	 * The test runs for a relatively long time considering the very low
+	 * resolution of stime in ticks of typically 10 milliseconds. Since we
+	 * don't know the fractional part of tick values we read from userspace
+	 * so our minimum threshold needs to be >= one tick since any
+	 * measurement might really be +- tick_ns (assuming we effectively get
+	 * floor(real_stime)).
+	 *
+	 * We Loop for 1000 x tick_ns so one tick corresponds to 0.1%
+	 */
+	for (start = get_time(); (get_time() - start) < test_duration_ns; /* nop */) {
+		struct drm_i915_perf_record_header *header;
+		bool timer_report_read = false;
+		bool non_timer_report_read = false;
+		int ret;
+
+		while ((ret = read(stream_fd, buf, sizeof(buf))) < 0 &&
+		       errno == EINTR)
+			;
+
+		igt_assert(ret > 0);
+
+		/* For Haswell reports don't contain a well defined reason
+		 * field we so assume all reports to be 'periodic'. For gen8+
+		 * we want to to consider that the HW automatically writes some
+		 * non periodic reports (e.g. on context switch) which might
+		 * lead to more successful read()s than expected due to
+		 * periodic sampling and we don't want these extra reads to
+		 * cause the test to fail...
+		 */
+		if (intel_gen(devid) >= 8) {
+			for (int offset = 0; offset < ret; offset += header->size) {
+				header = (void *)(buf + offset);
+
+				if (header->type == DRM_I915_PERF_RECORD_SAMPLE) {
+					uint32_t *report = (void *)(header + 1);
+
+					if (oa_report_is_periodic(oa_exponent,
+								  report))
+						timer_report_read = true;
+					else
+						non_timer_report_read = true;
+				}
+			}
+		}
+
+		if (non_timer_report_read && !timer_report_read)
+			n_extra_iterations++;
+
+		n++;
+	}
+
+	times(&end_times);
+
+	/* Using nanosecond units is fairly silly here, given the tick in-
+	 * precision - ah well, it's consistent with the get_time() units.
+	 */
+	user_ns = (end_times.tms_utime - start_times.tms_utime) * tick_ns;
+	kernel_ns = (end_times.tms_stime - start_times.tms_stime) * tick_ns;
+
+	igt_debug("%d blocking reads during test with ~25Hz OA sampling (expect no more than %d)\n",
+		  n, max_iterations);
+	igt_debug("%d extra iterations seen, not related to periodic sampling (e.g. context switches)\n",
+		  n_extra_iterations);
+	igt_debug("time in userspace = %"PRIu64"ns (+-%dns) (start utime = %d, end = %d)\n",
+		  user_ns, (int)tick_ns,
+		  (int)start_times.tms_utime, (int)end_times.tms_utime);
+	igt_debug("time in kernelspace = %"PRIu64"ns (+-%dns) (start stime = %d, end = %d)\n",
+		  kernel_ns, (int)tick_ns,
+		  (int)start_times.tms_stime, (int)end_times.tms_stime);
+
+	/* With completely broken blocking (but also not returning an error) we
+	 * could end up with an open loop,
+	 */
+	igt_assert(n <= (max_iterations + n_extra_iterations));
+
+	/* Make sure the driver is reporting new samples with a reasonably
+	 * low latency...
+	 */
+	igt_assert(n > (min_iterations + n_extra_iterations));
+
+	igt_assert(kernel_ns <= (test_duration_ns / 100ull));
+
+	close(stream_fd);
+}
+
+static void
+test_polling(void)
+{
+	/* ~40 milliseconds
+	 *
+	 * Having a period somewhat > sysconf(_SC_CLK_TCK) helps to stop
+	 * scheduling (liable to kick in when we make blocking poll()s/reads)
+	 * from interfering with the test.
+	 */
+	int oa_exponent = max_oa_exponent_for_period_lte(40000000);
+	uint64_t oa_period = oa_exponent_to_ns(oa_exponent);
+	uint64_t properties[] = {
+		/* Include OA reports in samples */
+		DRM_I915_PERF_PROP_SAMPLE_OA, true,
+
+		/* OA unit configuration */
+		DRM_I915_PERF_PROP_OA_METRICS_SET, test_metric_set_id,
+		DRM_I915_PERF_PROP_OA_FORMAT, test_oa_format,
+		DRM_I915_PERF_PROP_OA_EXPONENT, oa_exponent,
+	};
+	struct drm_i915_perf_open_param param = {
+		.flags = I915_PERF_FLAG_FD_CLOEXEC |
+			I915_PERF_FLAG_FD_NONBLOCK,
+		.num_properties = sizeof(properties) / 16,
+		.properties_ptr = to_user_pointer(properties),
+	};
+	int stream_fd = __perf_open(drm_fd, &param);
+	uint8_t buf[1024 * 1024];
+	struct tms start_times;
+	struct tms end_times;
+	int64_t user_ns, kernel_ns;
+	int64_t tick_ns = 1000000000 / sysconf(_SC_CLK_TCK);
+	int64_t test_duration_ns = tick_ns * 1000;
+
+	int max_iterations = (test_duration_ns / oa_period) + 1;
+	int n_extra_iterations = 0;
+
+	/* It's a bit tricky to put a lower limit here, but we expect a
+	 * relatively low latency for seeing reports, while we don't currently
+	 * give any control over this in the api.
+	 *
+	 * We assume a maximum latency of 6 millisecond to deliver a POLLIN and
+	 * read() after a new sample is written (46ms per iteration) considering
+	 * the knowledge that that the driver uses a 200Hz hrtimer (5ms period)
+	 * to check for data and giving some time to read().
+	 */
+	int min_iterations = (test_duration_ns / (oa_period + 6000000ull));
+	int64_t start;
+	int n = 0;
+
+	times(&start_times);
+
+	igt_debug("tick length = %dns, test duration = %"PRIu64"ns, min iter. = %d, max iter. = %d\n",
+		  (int)tick_ns, test_duration_ns,
+		  min_iterations, max_iterations);
+
+	/* In the loop we perform blocking polls while the HW is sampling at
+	 * ~25Hz, with the expectation that we spend most of our time blocked
+	 * in the kernel, and shouldn't be burning cpu cycles in the kernel in
+	 * association with this process (verified by looking at stime before
+	 * and after loop).
+	 *
+	 * We're looking to assert that less than 1% of the test duration is
+	 * spent in the kernel dealing with polling and read()ing.
+	 *
+	 * The test runs for a relatively long time considering the very low
+	 * resolution of stime in ticks of typically 10 milliseconds. Since we
+	 * don't know the fractional part of tick values we read from userspace
+	 * so our minimum threshold needs to be >= one tick since any
+	 * measurement might really be +- tick_ns (assuming we effectively get
+	 * floor(real_stime)).
+	 *
+	 * We Loop for 1000 x tick_ns so one tick corresponds to 0.1%
+	 */
+	for (start = get_time(); (get_time() - start) < test_duration_ns; /* nop */) {
+		struct pollfd pollfd = { .fd = stream_fd, .events = POLLIN };
+		struct drm_i915_perf_record_header *header;
+		bool timer_report_read = false;
+		bool non_timer_report_read = false;
+		int ret;
+
+		while ((ret = poll(&pollfd, 1, -1)) < 0 &&
+		       errno == EINTR)
+			;
+		igt_assert_eq(ret, 1);
+		igt_assert(pollfd.revents & POLLIN);
+
+		while ((ret = read(stream_fd, buf, sizeof(buf))) < 0 &&
+		       errno == EINTR)
+			;
+
+		/* Don't expect to see EAGAIN if we've had a POLLIN event
+		 *
+		 * XXX: actually this is technically overly strict since we do
+		 * knowingly allow false positive POLLIN events. At least in
+		 * the future when supporting context filtering of metrics for
+		 * Gen8+ handled in the kernel then POLLIN events may be
+		 * delivered when we know there are pending reports to process
+		 * but before we've done any filtering to know for certain that
+		 * any reports are destined to be copied to userspace.
+		 *
+		 * Still, for now it's a reasonable sanity check.
+		 */
+		if (ret < 0)
+			igt_debug("Unexpected error when reading after poll = %d\n", errno);
+		igt_assert_neq(ret, -1);
+
+		/* For Haswell reports don't contain a well defined reason
+		 * field we so assume all reports to be 'periodic'. For gen8+
+		 * we want to to consider that the HW automatically writes some
+		 * non periodic reports (e.g. on context switch) which might
+		 * lead to more successful read()s than expected due to
+		 * periodic sampling and we don't want these extra reads to
+		 * cause the test to fail...
+		 */
+		if (intel_gen(devid) >= 8) {
+			for (int offset = 0; offset < ret; offset += header->size) {
+				header = (void *)(buf + offset);
+
+				if (header->type == DRM_I915_PERF_RECORD_SAMPLE) {
+					uint32_t *report = (void *)(header + 1);
+
+					if (oa_report_is_periodic(oa_exponent,
+								  report))
+						timer_report_read = true;
+					else
+						non_timer_report_read = true;
+				}
+			}
+		}
+
+		if (non_timer_report_read && !timer_report_read)
+			n_extra_iterations++;
+
+		/* At this point, after consuming pending reports (and hoping
+		 * the scheduler hasn't stopped us for too long we now
+		 * expect EAGAIN on read.
+		 */
+		while ((ret = read(stream_fd, buf, sizeof(buf))) < 0 &&
+		       errno == EINTR)
+			;
+		igt_assert_eq(ret, -1);
+		igt_assert_eq(errno, EAGAIN);
+
+		n++;
+	}
+
+	times(&end_times);
+
+	/* Using nanosecond units is fairly silly here, given the tick in-
+	 * precision - ah well, it's consistent with the get_time() units.
+	 */
+	user_ns = (end_times.tms_utime - start_times.tms_utime) * tick_ns;
+	kernel_ns = (end_times.tms_stime - start_times.tms_stime) * tick_ns;
+
+	igt_debug("%d blocking reads during test with ~25Hz OA sampling (expect no more than %d)\n",
+		  n, max_iterations);
+	igt_debug("%d extra iterations seen, not related to periodic sampling (e.g. context switches)\n",
+		  n_extra_iterations);
+	igt_debug("time in userspace = %"PRIu64"ns (+-%dns) (start utime = %d, end = %d)\n",
+		  user_ns, (int)tick_ns,
+		  (int)start_times.tms_utime, (int)end_times.tms_utime);
+	igt_debug("time in kernelspace = %"PRIu64"ns (+-%dns) (start stime = %d, end = %d)\n",
+		  kernel_ns, (int)tick_ns,
+		  (int)start_times.tms_stime, (int)end_times.tms_stime);
+
+	/* With completely broken blocking while polling (but still somehow
+	 * reporting a POLLIN event) we could end up with an open loop.
+	 */
+	igt_assert(n <= (max_iterations + n_extra_iterations));
+
+	/* Make sure the driver is reporting new samples with a reasonably
+	 * low latency...
+	 */
+	igt_assert(n > (min_iterations + n_extra_iterations));
+
+	igt_assert(kernel_ns <= (test_duration_ns / 100ull));
+
+	close(stream_fd);
+}
+
+static void
+test_buffer_fill(void)
+{
+	/* ~5 micro second period */
+	int oa_exponent = max_oa_exponent_for_period_lte(5000);
+	uint64_t oa_period = oa_exponent_to_ns(oa_exponent);
+	uint64_t properties[] = {
+		/* Include OA reports in samples */
+		DRM_I915_PERF_PROP_SAMPLE_OA, true,
+
+		/* OA unit configuration */
+		DRM_I915_PERF_PROP_OA_METRICS_SET, test_metric_set_id,
+		DRM_I915_PERF_PROP_OA_FORMAT, test_oa_format,
+		DRM_I915_PERF_PROP_OA_EXPONENT, oa_exponent,
+	};
+	struct drm_i915_perf_open_param param = {
+		.flags = I915_PERF_FLAG_FD_CLOEXEC,
+		.num_properties = sizeof(properties) / 16,
+		.properties_ptr = to_user_pointer(properties),
+	};
+	int stream_fd = __perf_open(drm_fd, &param);
+	int buf_size = 65536 * (256 + sizeof(struct drm_i915_perf_record_header));
+	uint8_t *buf = malloc(buf_size);
+	size_t oa_buf_size = 16 * 1024 * 1024;
+	size_t report_size = oa_formats[test_oa_format].size;
+	int n_full_oa_reports = oa_buf_size / report_size;
+	uint64_t fill_duration = n_full_oa_reports * oa_period;
+
+	igt_assert(fill_duration < 1000000000);
+
+	for (int i = 0; i < 5; i++) {
+		struct drm_i915_perf_record_header *header;
+		bool overflow_seen;
+		int offset = 0;
+		int len;
+
+		nanosleep(&(struct timespec){ .tv_sec = 0,
+					      .tv_nsec = fill_duration * 1.25 },
+			  NULL);
+
+		while ((len = read(stream_fd, buf, buf_size)) == -1 && errno == EINTR)
+			;
+
+		igt_assert_neq(len, -1);
+
+		overflow_seen = false;
+		for (offset = 0; offset < len; offset += header->size) {
+			header = (void *)(buf + offset);
+
+			if (header->type == DRM_I915_PERF_RECORD_OA_BUFFER_LOST)
+				overflow_seen = true;
+		}
+
+		igt_assert_eq(overflow_seen, true);
+
+		nanosleep(&(struct timespec){ .tv_sec = 0,
+					      .tv_nsec = fill_duration / 2 },
+			  NULL);
+
+		while ((len = read(stream_fd, buf, buf_size)) == -1 && errno == EINTR)
+			;
+
+		igt_assert_neq(len, -1);
+
+		igt_assert(len > report_size * n_full_oa_reports * 0.45);
+		igt_assert(len < report_size * n_full_oa_reports * 0.55);
+
+		overflow_seen = false;
+		for (offset = 0; offset < len; offset += header->size) {
+			header = (void *)(buf + offset);
+
+			if (header->type == DRM_I915_PERF_RECORD_OA_BUFFER_LOST)
+				overflow_seen = true;
+		}
+
+		igt_assert_eq(overflow_seen, false);
+	}
+
+	free(buf);
+
+	close(stream_fd);
+}
+
+static void
+test_enable_disable(void)
+{
+	/* ~5 micro second period */
+	int oa_exponent = max_oa_exponent_for_period_lte(5000);
+	uint64_t oa_period = oa_exponent_to_ns(oa_exponent);
+	uint64_t properties[] = {
+		/* Include OA reports in samples */
+		DRM_I915_PERF_PROP_SAMPLE_OA, true,
+
+		/* OA unit configuration */
+		DRM_I915_PERF_PROP_OA_METRICS_SET, test_metric_set_id,
+		DRM_I915_PERF_PROP_OA_FORMAT, test_oa_format,
+		DRM_I915_PERF_PROP_OA_EXPONENT, oa_exponent,
+	};
+	struct drm_i915_perf_open_param param = {
+		.flags = I915_PERF_FLAG_FD_CLOEXEC |
+			 I915_PERF_FLAG_DISABLED, /* Verify we start disabled */
+		.num_properties = sizeof(properties) / 16,
+		.properties_ptr = to_user_pointer(properties),
+	};
+	int stream_fd = __perf_open(drm_fd, &param);
+	int buf_size = 65536 * (256 + sizeof(struct drm_i915_perf_record_header));
+	uint8_t *buf = malloc(buf_size);
+	size_t oa_buf_size = 16 * 1024 * 1024;
+	size_t report_size = oa_formats[test_oa_format].size;
+	int n_full_oa_reports = oa_buf_size / report_size;
+	uint64_t fill_duration = n_full_oa_reports * oa_period;
+
+
+	for (int i = 0; i < 5; i++) {
+		int len;
+
+		/* Giving enough time for an overflow might help catch whether
+		 * the OA unit has been enabled even if the driver might at
+		 * least avoid copying reports while disabled.
+		 */
+		nanosleep(&(struct timespec){ .tv_sec = 0,
+					      .tv_nsec = fill_duration * 1.25 },
+			  NULL);
+
+		while ((len = read(stream_fd, buf, buf_size)) == -1 && errno == EINTR)
+			;
+
+		igt_assert_eq(len, -1);
+		igt_assert_eq(errno, EIO);
+
+		do_ioctl(stream_fd, I915_PERF_IOCTL_ENABLE, 0);
+
+		nanosleep(&(struct timespec){ .tv_sec = 0,
+					      .tv_nsec = fill_duration / 2 },
+			  NULL);
+
+		while ((len = read(stream_fd, buf, buf_size)) == -1 && errno == EINTR)
+			;
+
+		igt_assert_neq(len, -1);
+
+		igt_assert(len > report_size * n_full_oa_reports * 0.45);
+		igt_assert(len < report_size * n_full_oa_reports * 0.55);
+
+		do_ioctl(stream_fd, I915_PERF_IOCTL_DISABLE, 0);
+
+		/* It's considered an error to read a stream while it's disabled
+		 * since it would block indefinitely...
+		 */
+		len = read(stream_fd, buf, buf_size);
+
+		igt_assert_eq(len, -1);
+		igt_assert_eq(errno, EIO);
+	}
+
+	free(buf);
+
+	close(stream_fd);
+}
+
+static void
+test_short_reads(void)
+{
+	int oa_exponent = max_oa_exponent_for_period_lte(5000);
+	uint64_t properties[] = {
+		/* Include OA reports in samples */
+		DRM_I915_PERF_PROP_SAMPLE_OA, true,
+
+		/* OA unit configuration */
+		DRM_I915_PERF_PROP_OA_METRICS_SET, test_metric_set_id,
+		DRM_I915_PERF_PROP_OA_FORMAT, test_oa_format,
+		DRM_I915_PERF_PROP_OA_EXPONENT, oa_exponent,
+	};
+	struct drm_i915_perf_open_param param = {
+		.flags = I915_PERF_FLAG_FD_CLOEXEC,
+		.num_properties = sizeof(properties) / 16,
+		.properties_ptr = to_user_pointer(properties),
+	};
+	size_t record_size = 256 + sizeof(struct drm_i915_perf_record_header);
+	size_t page_size = sysconf(_SC_PAGE_SIZE);
+	int zero_fd = open("/dev/zero", O_RDWR|O_CLOEXEC);
+	uint8_t *pages = mmap(NULL, page_size * 2,
+			      PROT_READ|PROT_WRITE, MAP_PRIVATE, zero_fd, 0);
+	struct drm_i915_perf_record_header *header;
+	int stream_fd;
+	int ret;
+
+	igt_assert_neq(zero_fd, -1);
+	close(zero_fd);
+	zero_fd = -1;
+
+	igt_assert(pages);
+
+	ret = mprotect(pages + page_size, page_size, PROT_NONE);
+	igt_assert_eq(ret, 0);
+
+	stream_fd = __perf_open(drm_fd, &param);
+
+	nanosleep(&(struct timespec){ .tv_sec = 0, .tv_nsec = 5000000 }, NULL);
+
+	/* At this point there should be lots of pending reports to read */
+
+	/* A read that can return at least one record should result in a short
+	 * read not an EFAULT if the buffer is smaller than the requested read
+	 * size...
+	 *
+	 * Expect to see a sample record here, but at least skip over any
+	 * _RECORD_LOST notifications.
+	 */
+	do {
+		header = (void *)(pages + page_size - record_size);
+		ret = read(stream_fd,
+			   header,
+			   page_size);
+		igt_assert(ret > 0);
+	} while (header->type == DRM_I915_PERF_RECORD_OA_REPORT_LOST);
+
+	igt_assert_eq(ret, record_size);
+
+	/* A read that can't return a single record because it would result
+	 * in a fault on buffer overrun should result in an EFAULT error...
+	 */
+	ret = read(stream_fd, pages + page_size - 16, page_size);
+	igt_assert_eq(ret, -1);
+	igt_assert_eq(errno, EFAULT);
+
+	/* A read that can't return a single record because the buffer is too
+	 * small should result in an ENOSPC error..
+	 *
+	 * Again, skip over _RECORD_LOST records (smaller than record_size/2)
+	 */
+	do {
+		header = (void *)(pages + page_size - record_size / 2);
+		ret = read(stream_fd,
+			   header,
+			   record_size / 2);
+	} while (ret > 0 && header->type == DRM_I915_PERF_RECORD_OA_REPORT_LOST);
+
+	igt_assert_eq(ret, -1);
+	igt_assert_eq(errno, ENOSPC);
+
+	close(stream_fd);
+
+	munmap(pages, page_size * 2);
+}
+
+static void
+test_non_sampling_read_error(void)
+{
+	uint64_t properties[] = {
+		/* XXX: even without periodic sampling we have to
+		 * specify at least one sample layout property...
+		 */
+		DRM_I915_PERF_PROP_SAMPLE_OA, true,
+
+		/* OA unit configuration */
+		DRM_I915_PERF_PROP_OA_METRICS_SET, test_metric_set_id,
+		DRM_I915_PERF_PROP_OA_FORMAT, test_oa_format,
+
+		/* XXX: no sampling exponent */
+	};
+	struct drm_i915_perf_open_param param = {
+		.flags = I915_PERF_FLAG_FD_CLOEXEC,
+		.num_properties = sizeof(properties) / 16,
+		.properties_ptr = to_user_pointer(properties),
+	};
+	int stream_fd = __perf_open(drm_fd, &param);
+	uint8_t buf[1024];
+
+	int ret = read(stream_fd, buf, sizeof(buf));
+	igt_assert_eq(ret, -1);
+	igt_assert_eq(errno, EIO);
+
+	close(stream_fd);
+}
+
+/* Check that attempts to read from a stream while it is disable will return
+ * EIO instead of blocking indefinitely.
+ */
+static void
+test_disabled_read_error(void)
+{
+	int oa_exponent = 5; /* 5 micro seconds */
+	uint64_t properties[] = {
+		/* XXX: even without periodic sampling we have to
+		 * specify at least one sample layout property...
+		 */
+		DRM_I915_PERF_PROP_SAMPLE_OA, true,
+
+		/* OA unit configuration */
+		DRM_I915_PERF_PROP_OA_METRICS_SET, test_metric_set_id,
+		DRM_I915_PERF_PROP_OA_FORMAT, test_oa_format,
+		DRM_I915_PERF_PROP_OA_EXPONENT, oa_exponent,
+	};
+	struct drm_i915_perf_open_param param = {
+		.flags = I915_PERF_FLAG_FD_CLOEXEC |
+			 I915_PERF_FLAG_DISABLED, /* XXX: open disabled */
+		.num_properties = sizeof(properties) / 16,
+		.properties_ptr = to_user_pointer(properties),
+	};
+	int stream_fd = __perf_open(drm_fd, &param);
+	uint32_t oa_report0[64];
+	uint32_t oa_report1[64];
+	uint32_t buf[128] = { 0 };
+	int ret;
+
+
+	ret = read(stream_fd, buf, sizeof(buf));
+	igt_assert_eq(ret, -1);
+	igt_assert_eq(errno, EIO);
+
+	close(stream_fd);
+
+
+	param.flags &= ~I915_PERF_FLAG_DISABLED;
+	stream_fd = __perf_open(drm_fd, &param);
+
+	read_2_oa_reports(stream_fd,
+			  test_oa_format,
+			  oa_exponent,
+			  oa_report0,
+			  oa_report1,
+			  false); /* not just timer reports */
+
+	do_ioctl(stream_fd, I915_PERF_IOCTL_DISABLE, 0);
+
+	ret = read(stream_fd, buf, sizeof(buf));
+	igt_assert_eq(ret, -1);
+	igt_assert_eq(errno, EIO);
+
+	do_ioctl(stream_fd, I915_PERF_IOCTL_ENABLE, 0);
+
+	read_2_oa_reports(stream_fd,
+			  test_oa_format,
+			  oa_exponent,
+			  oa_report0,
+			  oa_report1,
+			  false); /* not just timer reports */
+
+	close(stream_fd);
+}
+
+static void
+emit_report_perf_count(struct intel_batchbuffer *batch,
+		       drm_intel_bo *dst_bo,
+		       int dst_offset,
+		       uint32_t report_id)
+{
+	if (IS_HASWELL(devid)) {
+		BEGIN_BATCH(3, 1);
+		OUT_BATCH(GEN6_MI_REPORT_PERF_COUNT);
+		OUT_RELOC(dst_bo, I915_GEM_DOMAIN_INSTRUCTION, I915_GEM_DOMAIN_INSTRUCTION,
+			  dst_offset);
+		OUT_BATCH(report_id);
+		ADVANCE_BATCH();
+	} else {
+		/* XXX: NB: n dwords arg is actually magic since it internally
+		 * automatically accounts for larger addresses on gen >= 8...
+		 */
+		BEGIN_BATCH(3, 1);
+		OUT_BATCH(GEN8_MI_REPORT_PERF_COUNT);
+		OUT_RELOC(dst_bo, I915_GEM_DOMAIN_INSTRUCTION, I915_GEM_DOMAIN_INSTRUCTION,
+			  dst_offset);
+		OUT_BATCH(report_id);
+		ADVANCE_BATCH();
+	}
+}
+
+static void
+test_mi_rpc(void)
+{
+	uint64_t properties[] = {
+		/* Note: we have to specify at least one sample property even
+		 * though we aren't interested in samples in this case.
+		 */
+		DRM_I915_PERF_PROP_SAMPLE_OA, true,
+
+		/* OA unit configuration */
+		DRM_I915_PERF_PROP_OA_METRICS_SET, test_metric_set_id,
+		DRM_I915_PERF_PROP_OA_FORMAT, test_oa_format,
+
+		/* Note: no OA exponent specified in this case */
+	};
+	struct drm_i915_perf_open_param param = {
+		.flags = I915_PERF_FLAG_FD_CLOEXEC,
+		.num_properties = sizeof(properties) / 16,
+		.properties_ptr = to_user_pointer(properties),
+	};
+	int stream_fd = __perf_open(drm_fd, &param);
+	drm_intel_bufmgr *bufmgr = drm_intel_bufmgr_gem_init(drm_fd, 4096);
+	drm_intel_context *context;
+	struct intel_batchbuffer *batch;
+	drm_intel_bo *bo;
+	uint32_t *report32;
+	int ret;
+
+	drm_intel_bufmgr_gem_enable_reuse(bufmgr);
+
+	context = drm_intel_gem_context_create(bufmgr);
+	igt_assert(context);
+
+	batch = intel_batchbuffer_alloc(bufmgr, devid);
+
+	bo = drm_intel_bo_alloc(bufmgr, "mi_rpc dest bo", 4096, 64);
+
+	ret = drm_intel_bo_map(bo, true);
+	igt_assert_eq(ret, 0);
+
+	memset(bo->virtual, 0x80, 4096);
+	drm_intel_bo_unmap(bo);
+
+	emit_report_perf_count(batch,
+			       bo, /* dst */
+			       0, /* dst offset in bytes */
+			       0xdeadbeef); /* report ID */
+
+	intel_batchbuffer_flush_with_context(batch, context);
+
+	ret = drm_intel_bo_map(bo, false /* write enable */);
+	igt_assert_eq(ret, 0);
+
+	report32 = bo->virtual;
+	igt_assert_eq(report32[0], 0xdeadbeef); /* report ID */
+	igt_assert_neq(report32[1], 0); /* timestamp */
+
+	igt_assert_neq(report32[63], 0x80808080); /* end of report */
+	igt_assert_eq(report32[64], 0x80808080); /* after 256 byte report */
+
+	drm_intel_bo_unmap(bo);
+	drm_intel_bo_unreference(bo);
+	intel_batchbuffer_free(batch);
+	drm_intel_gem_context_destroy(context);
+	drm_intel_bufmgr_destroy(bufmgr);
+	close(stream_fd);
+}
+
+static void
+scratch_buf_init(drm_intel_bufmgr *bufmgr,
+		 struct igt_buf *buf,
+		 int width, int height,
+		 uint32_t color)
+{
+	size_t stride = width * 4;
+	size_t size = stride * height;
+	drm_intel_bo *bo = drm_intel_bo_alloc(bufmgr, "", size, 4096);
+	int ret;
+
+	ret = drm_intel_bo_map(bo, true /* writable */);
+	igt_assert_eq(ret, 0);
+
+	for (int i = 0; i < width * height; i++)
+		((uint32_t *)bo->virtual)[i] = color;
+
+	drm_intel_bo_unmap(bo);
+
+	buf->bo = bo;
+	buf->stride = stride;
+	buf->tiling = I915_TILING_NONE;
+	buf->size = size;
+}
+
+static void
+emit_stall_timestamp_and_rpc(struct intel_batchbuffer *batch,
+			     drm_intel_bo *dst,
+			     int timestamp_offset,
+			     int report_dst_offset,
+			     uint32_t report_id)
+{
+	uint32_t pipe_ctl_flags = (PIPE_CONTROL_CS_STALL |
+				   PIPE_CONTROL_RENDER_TARGET_FLUSH |
+				   PIPE_CONTROL_WRITE_TIMESTAMP);
+
+	BEGIN_BATCH(5, 1);
+	OUT_BATCH(GFX_OP_PIPE_CONTROL | (5 - 2));
+	OUT_BATCH(pipe_ctl_flags);
+	OUT_RELOC(dst, I915_GEM_DOMAIN_INSTRUCTION, I915_GEM_DOMAIN_INSTRUCTION,
+		  timestamp_offset);
+	OUT_BATCH(0); /* imm lower */
+	OUT_BATCH(0); /* imm upper */
+	ADVANCE_BATCH();
+
+	emit_report_perf_count(batch, dst, report_dst_offset, report_id);
+}
+
+/* Tests the INTEL_performance_query use case where an unprivileged process
+ * should be able to configure the OA unit for per-context metrics (for a
+ * context associated with that process' drm file descriptor) and the counters
+ * should only relate to that specific context.
+ *
+ * Unfortunately only Haswell limits the progression of OA counters for a
+ * single context and so this unit test is Haswell specific. For Gen8+ although
+ * reports read via i915 perf can be filtered for a single context the counters
+ * themselves always progress as global/system-wide counters affected by all
+ * contexts.
+ */
+static void
+hsw_test_single_ctx_counters(void)
+{
+	uint64_t properties[] = {
+		DRM_I915_PERF_PROP_CTX_HANDLE, UINT64_MAX, /* updated below */
+
+		/* Note: we have to specify at least one sample property even
+		 * though we aren't interested in samples in this case
+		 */
+		DRM_I915_PERF_PROP_SAMPLE_OA, true,
+
+		/* OA unit configuration */
+		DRM_I915_PERF_PROP_OA_METRICS_SET, test_metric_set_id,
+		DRM_I915_PERF_PROP_OA_FORMAT, test_oa_format,
+
+		/* Note: no OA exponent specified in this case */
+	};
+	struct drm_i915_perf_open_param param = {
+		.flags = I915_PERF_FLAG_FD_CLOEXEC,
+		.num_properties = sizeof(properties) / 16,
+		.properties_ptr = to_user_pointer(properties),
+	};
+
+	/* should be default, but just to be sure... */
+	write_u64_file("/proc/sys/dev/i915/perf_stream_paranoid", 1);
+
+	igt_fork(child, 1) {
+		drm_intel_bufmgr *bufmgr;
+		drm_intel_context *context0, *context1;
+		int stream_fd;
+		struct intel_batchbuffer *batch;
+		struct igt_buf src, dst;
+		drm_intel_bo *bo;
+		uint32_t *report0_32, *report1_32;
+		uint64_t timestamp0_64, timestamp1_64;
+		uint32_t delta_ts64, delta_oa32;
+		uint64_t delta_ts64_ns, delta_oa32_ns;
+		uint32_t delta_delta;
+		int n_samples_written;
+		int width = 800;
+		int height = 600;
+		uint32_t ctx_id = 0xffffffff; /* invalid id */
+		int ret;
+
+		igt_drop_root();
+
+		bufmgr = drm_intel_bufmgr_gem_init(drm_fd, 4096);
+		drm_intel_bufmgr_gem_enable_reuse(bufmgr);
+
+		scratch_buf_init(bufmgr, &src, width, height, 0xff0000ff);
+		scratch_buf_init(bufmgr, &dst, width, height, 0x00ff00ff);
+
+		batch = intel_batchbuffer_alloc(bufmgr, devid);
+
+		context0 = drm_intel_gem_context_create(bufmgr);
+		igt_assert(context0);
+
+		context1 = drm_intel_gem_context_create(bufmgr);
+		igt_assert(context1);
+
+		igt_debug("submitting warm up render_copy\n");
+
+		/* Submit some early, unmeasured, work to the context we want
+		 * to measure to try and catch issues with i915-perf
+		 * initializing the HW context ID for filtering.
+		 *
+		 * We do this because i915-perf single context filtering had
+		 * previously only relied on a hook into context pinning to
+		 * initialize the HW context ID, instead of also trying to
+		 * determine the HW ID while opening the stream, in case it
+		 * has already been pinned.
+		 *
+		 * This wasn't noticed by the previous unit test because we
+		 * were opening the stream while the context hadn't been
+		 * touched or pinned yet and so it worked out correctly to wait
+		 * for the pinning hook.
+		 *
+		 * Now a buggy version of i915-perf will fail to measure
+		 * anything for context0 once this initial render_copy() ends
+		 * up pinning the context since there won't ever be a pinning
+		 * hook callback.
+		 */
+		render_copy(batch,
+			    context0,
+			    &src, 0, 0, width, height,
+			    &dst, 0, 0);
+
+		ret = drm_intel_gem_context_get_id(context0, &ctx_id);
+		igt_assert_eq(ret, 0);
+		igt_assert_neq(ctx_id, 0xffffffff);
+		properties[1] = ctx_id;
+
+		igt_debug("opening i915-perf stream\n");
+		stream_fd = __perf_open(drm_fd, &param);
+
+		bo = drm_intel_bo_alloc(bufmgr, "mi_rpc dest bo", 4096, 64);
+
+		ret = drm_intel_bo_map(bo, true /* write enable */);
+		igt_assert_eq(ret, 0);
+
+		memset(bo->virtual, 0x80, 4096);
+		drm_intel_bo_unmap(bo);
+
+		emit_stall_timestamp_and_rpc(batch,
+					     bo,
+					     512 /* timestamp offset */,
+					     0, /* report dst offset */
+					     0xdeadbeef); /* report id */
+
+		/* Explicitly flush here (even though the render_copy() call
+		 * will itself flush before/after the copy) to clarify that
+		 * that the PIPE_CONTROL + MI_RPC commands will be in a
+		 * separate batch from the copy.
+		 */
+		intel_batchbuffer_flush_with_context(batch, context0);
+
+		render_copy(batch,
+			    context0,
+			    &src, 0, 0, width, height,
+			    &dst, 0, 0);
+
+		/* Another redundant flush to clarify batch bo is free to reuse */
+		intel_batchbuffer_flush_with_context(batch, context0);
+
+		/* submit two copies on the other context to avoid a false
+		 * positive in case the driver somehow ended up filtering for
+		 * context1
+		 */
+		render_copy(batch,
+			    context1,
+			    &src, 0, 0, width, height,
+			    &dst, 0, 0);
+
+		render_copy(batch,
+			    context1,
+			    &src, 0, 0, width, height,
+			    &dst, 0, 0);
+
+		/* And another */
+		intel_batchbuffer_flush_with_context(batch, context1);
+
+		emit_stall_timestamp_and_rpc(batch,
+					     bo,
+					     520 /* timestamp offset */,
+					     256, /* report dst offset */
+					     0xbeefbeef); /* report id */
+
+		intel_batchbuffer_flush_with_context(batch, context0);
+
+		ret = drm_intel_bo_map(bo, false /* write enable */);
+		igt_assert_eq(ret, 0);
+
+		report0_32 = bo->virtual;
+		igt_assert_eq(report0_32[0], 0xdeadbeef); /* report ID */
+		igt_assert_neq(report0_32[1], 0); /* timestamp */
+
+		report1_32 = report0_32 + 64;
+		igt_assert_eq(report1_32[0], 0xbeefbeef); /* report ID */
+		igt_assert_neq(report1_32[1], 0); /* timestamp */
+
+		print_reports(report0_32, report1_32,
+			      lookup_format(test_oa_format));
+
+		/* A40 == N samples written to all render targets */
+		n_samples_written = report1_32[43] - report0_32[43];
+		igt_debug("n samples written = %d\n", n_samples_written);
+		igt_assert_eq(n_samples_written, width * height);
+
+		igt_debug("timestamp32 0 = %u\n", report0_32[1]);
+		igt_debug("timestamp32 1 = %u\n", report1_32[1]);
+
+		timestamp0_64 = *(uint64_t *)(((uint8_t *)bo->virtual) + 512);
+		timestamp1_64 = *(uint64_t *)(((uint8_t *)bo->virtual) + 520);
+
+		igt_debug("timestamp64 0 = %"PRIu64"\n", timestamp0_64);
+		igt_debug("timestamp64 1 = %"PRIu64"\n", timestamp1_64);
+
+		delta_ts64 = timestamp1_64 - timestamp0_64;
+		delta_oa32 = report1_32[1] - report0_32[1];
+
+		/* sanity check that we can pass the delta to timebase_scale */
+		igt_assert(delta_ts64 < UINT32_MAX);
+		delta_oa32_ns = timebase_scale(delta_oa32);
+		delta_ts64_ns = timebase_scale(delta_ts64);
+
+		igt_debug("ts32 delta = %u, = %uns\n",
+			  delta_oa32, (unsigned)delta_oa32_ns);
+		igt_debug("ts64 delta = %u, = %uns\n",
+			  delta_ts64, (unsigned)delta_ts64_ns);
+
+		/* The delta as calculated via the PIPE_CONTROL timestamp or
+		 * the OA report timestamps should be almost identical but
+		 * allow a 320 nanoseconds margin.
+		 */
+		delta_delta = delta_ts64_ns > delta_oa32_ns ?
+			(delta_ts64_ns - delta_oa32_ns) :
+			(delta_oa32_ns - delta_ts64_ns);
+		igt_assert(delta_delta <= 320);
+
+		drm_intel_bo_unreference(src.bo);
+		drm_intel_bo_unreference(dst.bo);
+
+		drm_intel_bo_unmap(bo);
+		drm_intel_bo_unreference(bo);
+		intel_batchbuffer_free(batch);
+		drm_intel_gem_context_destroy(context0);
+		drm_intel_gem_context_destroy(context1);
+		drm_intel_bufmgr_destroy(bufmgr);
+		close(stream_fd);
+	}
+
+	igt_waitchildren();
+}
+
+static void
+test_rc6_disable(void)
+{
+	uint64_t properties[] = {
+		/* Include OA reports in samples */
+		DRM_I915_PERF_PROP_SAMPLE_OA, true,
+
+		/* OA unit configuration */
+		DRM_I915_PERF_PROP_OA_METRICS_SET, test_metric_set_id,
+		DRM_I915_PERF_PROP_OA_FORMAT, test_oa_format,
+		DRM_I915_PERF_PROP_OA_EXPONENT, oa_exp_1_millisec,
+	};
+	struct drm_i915_perf_open_param param = {
+		.flags = I915_PERF_FLAG_FD_CLOEXEC,
+		.num_properties = sizeof(properties) / 16,
+		.properties_ptr = to_user_pointer(properties),
+	};
+	int stream_fd = __perf_open(drm_fd, &param);
+	uint64_t n_events_start = read_debugfs_u64_record(drm_fd, "i915_drpc_info",
+							  "RC6 residency since boot");
+	uint64_t n_events_end;
+
+	nanosleep(&(struct timespec){ .tv_sec = 0, .tv_nsec = 500000000 }, NULL);
+
+	n_events_end = read_debugfs_u64_record(drm_fd, "i915_drpc_info",
+					       "RC6 residency since boot");
+
+	igt_assert_eq(n_events_end - n_events_start, 0);
+
+	close(stream_fd);
+
+	n_events_start = read_debugfs_u64_record(drm_fd, "i915_drpc_info",
+						 "RC6 residency since boot");
+
+	nanosleep(&(struct timespec){ .tv_sec = 0, .tv_nsec = 500000000 }, NULL);
+
+	n_events_end = read_debugfs_u64_record(drm_fd, "i915_drpc_info",
+					       "RC6 residency since boot");
+
+	igt_assert_neq(n_events_end - n_events_start, 0);
+}
+
+static int __i915_perf_add_config(int fd, struct drm_i915_perf_oa_config *config)
+{
+	int ret = igt_ioctl(fd, DRM_IOCTL_I915_PERF_ADD_CONFIG, config);
+	if (ret < 0)
+		ret = -errno;
+	return ret;
+}
+
+static int i915_perf_add_config(int fd, struct drm_i915_perf_oa_config *config)
+{
+	int config_id = __i915_perf_add_config(fd, config);
+
+	igt_debug("config_id=%i\n", config_id);
+	igt_assert(config_id > 0);
+
+	return config_id;
+}
+
+static void i915_perf_remove_config(int fd, uint64_t config_id)
+{
+	igt_assert_eq(igt_ioctl(fd, DRM_IOCTL_I915_PERF_REMOVE_CONFIG,
+				&config_id), 0);
+}
+
+static void
+test_invalid_create_userspace_config(void)
+{
+	struct drm_i915_perf_oa_config config;
+	const char *uuid = "01234567-0123-0123-0123-0123456789ab";
+	const char *invalid_uuid = "blablabla-wrong";
+	uint32_t mux_regs[] = { 0x9888 /* NOA_WRITE */, 0x0 };
+	uint32_t invalid_mux_regs[] = { 0x12345678 /* invalid register */, 0x0 };
+
+	memset(&config, 0, sizeof(config));
+
+	/* invalid uuid */
+	strncpy(config.uuid, invalid_uuid, sizeof(config.uuid));
+	config.n_mux_regs = 1;
+	config.mux_regs_ptr = to_user_pointer(mux_regs);
+	config.n_boolean_regs = 0;
+	config.n_flex_regs = 0;
+
+	igt_assert_eq(__i915_perf_add_config(drm_fd, &config), -EINVAL);
+
+	/* invalid mux_regs */
+	strncpy(config.uuid, uuid, sizeof(config.uuid));
+	config.n_mux_regs = 1;
+	config.mux_regs_ptr = to_user_pointer(invalid_mux_regs);
+	config.n_boolean_regs = 0;
+	config.n_flex_regs = 0;
+
+	igt_assert_eq(__i915_perf_add_config(drm_fd, &config), -EINVAL);
+
+	/* empty config */
+	strncpy(config.uuid, uuid, sizeof(config.uuid));
+	config.n_mux_regs = 0;
+	config.mux_regs_ptr = to_user_pointer(mux_regs);
+	config.n_boolean_regs = 0;
+	config.n_flex_regs = 0;
+
+	igt_assert_eq(__i915_perf_add_config(drm_fd, &config), -EINVAL);
+
+	/* empty config with null pointers */
+	strncpy(config.uuid, uuid, sizeof(config.uuid));
+	config.n_mux_regs = 1;
+	config.mux_regs_ptr = to_user_pointer(NULL);
+	config.n_boolean_regs = 2;
+	config.boolean_regs_ptr = to_user_pointer(NULL);
+	config.n_flex_regs = 3;
+	config.flex_regs_ptr = to_user_pointer(NULL);
+
+	igt_assert_eq(__i915_perf_add_config(drm_fd, &config), -EINVAL);
+
+	/* invalid pointers */
+	strncpy(config.uuid, uuid, sizeof(config.uuid));
+	config.n_mux_regs = 42;
+	config.mux_regs_ptr = to_user_pointer((void *) 0xDEADBEEF);
+	config.n_boolean_regs = 0;
+	config.n_flex_regs = 0;
+
+	igt_assert_eq(__i915_perf_add_config(drm_fd, &config), -EFAULT);
+}
+
+static void
+test_invalid_remove_userspace_config(void)
+{
+	struct drm_i915_perf_oa_config config;
+	const char *uuid = "01234567-0123-0123-0123-0123456789ab";
+	uint32_t mux_regs[] = { 0x9888 /* NOA_WRITE */, 0x0 };
+	uint64_t config_id, wrong_config_id = 999999999;
+	char path[512];
+
+	snprintf(path, sizeof(path), "/sys/class/drm/card%d/metrics/%s/id", card, uuid);
+
+	/* Destroy previous configuration if present */
+	if (try_read_u64_file(path, &config_id))
+		i915_perf_remove_config(drm_fd, config_id);
+
+	memset(&config, 0, sizeof(config));
+
+	memcpy(config.uuid, uuid, sizeof(config.uuid));
+
+	config.n_mux_regs = 1;
+	config.mux_regs_ptr = to_user_pointer(mux_regs);
+	config.n_boolean_regs = 0;
+	config.n_flex_regs = 0;
+
+	config_id = i915_perf_add_config(drm_fd, &config);
+
+	/* Removing configs without permissions should fail. */
+	igt_fork(child, 1) {
+		igt_drop_root();
+
+		do_ioctl_err(drm_fd, DRM_IOCTL_I915_PERF_REMOVE_CONFIG, &config_id, EACCES);
+	}
+	igt_waitchildren();
+
+	/* Removing invalid config ID should fail. */
+	do_ioctl_err(drm_fd, DRM_IOCTL_I915_PERF_REMOVE_CONFIG, &wrong_config_id, ENOENT);
+
+	i915_perf_remove_config(drm_fd, config_id);
+}
+
+static void
+test_create_destroy_userspace_config(void)
+{
+	struct drm_i915_perf_oa_config config;
+	const char *uuid = "01234567-0123-0123-0123-0123456789ab";
+	uint32_t mux_regs[] = { 0x9888 /* NOA_WRITE */, 0x0 };
+	uint32_t flex_regs[100];
+	int i, stream_fd;
+	uint64_t config_id;
+	uint64_t properties[] = {
+		DRM_I915_PERF_PROP_OA_METRICS_SET, 0, /* Filled later */
+
+		/* OA unit configuration */
+		DRM_I915_PERF_PROP_SAMPLE_OA, true,
+		DRM_I915_PERF_PROP_OA_FORMAT, test_oa_format,
+		DRM_I915_PERF_PROP_OA_EXPONENT, oa_exp_1_millisec,
+		DRM_I915_PERF_PROP_OA_METRICS_SET
+	};
+	struct drm_i915_perf_open_param param = {
+		.flags = I915_PERF_FLAG_FD_CLOEXEC |
+		I915_PERF_FLAG_FD_NONBLOCK |
+		I915_PERF_FLAG_DISABLED,
+		.num_properties = ARRAY_SIZE(properties) / 2,
+		.properties_ptr = to_user_pointer(properties),
+	};
+	char path[512];
+
+	snprintf(path, sizeof(path), "/sys/class/drm/card%d/metrics/%s/id", card, uuid);
+
+	/* Destroy previous configuration if present */
+	if (try_read_u64_file(path, &config_id))
+		i915_perf_remove_config(drm_fd, config_id);
+
+	memset(&config, 0, sizeof(config));
+	strncpy(config.uuid, uuid, sizeof(config.uuid));
+
+	config.n_mux_regs = 1;
+	config.mux_regs_ptr = to_user_pointer(mux_regs);
+
+	/* Flex EU counters are only available on gen8+ */
+	if (intel_gen(devid) >= 8) {
+		for (i = 0; i < ARRAY_SIZE(flex_regs) / 2; i++) {
+			flex_regs[i * 2] = 0xe458; /* EU_PERF_CNTL0 */
+			flex_regs[i * 2 + 1] = 0x0;
+		}
+		config.flex_regs_ptr = to_user_pointer(flex_regs);
+		config.n_flex_regs = ARRAY_SIZE(flex_regs) / 2;
+	}
+
+	config.n_boolean_regs = 0;
+
+	/* Creating configs without permissions shouldn't work. */
+	igt_fork(child, 1) {
+		igt_drop_root();
+
+		igt_assert_eq(__i915_perf_add_config(drm_fd, &config), -EACCES);
+	}
+	igt_waitchildren();
+
+	/* Create a new config */
+	config_id = i915_perf_add_config(drm_fd, &config);
+
+	/* Verify that adding the another config with the same uuid fails. */
+	igt_assert_eq(__i915_perf_add_config(drm_fd, &config), -EADDRINUSE);
+
+	/* Try to use the new config */
+	properties[1] = config_id;
+	stream_fd = __perf_open(drm_fd, &param);
+
+	/* Verify that destroying the config doesn't yield any error. */
+	i915_perf_remove_config(drm_fd, config_id);
+
+	/* Read the config to verify shouldn't raise any issue. */
+	config_id = i915_perf_add_config(drm_fd, &config);
+
+	close(stream_fd);
+
+	i915_perf_remove_config(drm_fd, config_id);
+}
+
+/* Registers required by userspace. This list should be maintained by
+ * the OA configs developers and agreed upon with kernel developers as
+ * some of the registers have bits used by the kernel (for workarounds
+ * for instance) and other bits that need to be set by the OA configs.
+ */
+static void
+test_whitelisted_registers_userspace_config(void)
+{
+	struct drm_i915_perf_oa_config config;
+	const char *uuid = "01234567-0123-0123-0123-0123456789ab";
+	uint32_t mux_regs[200];
+	uint32_t b_counters_regs[200];
+	uint32_t flex_regs[200];
+	uint32_t i;
+	uint64_t config_id;
+	char path[512];
+	int ret;
+	const uint32_t flex[] = {
+		0xe458,
+		0xe558,
+		0xe658,
+		0xe758,
+		0xe45c,
+		0xe55c,
+		0xe65c
+	};
+
+	snprintf(path, sizeof(path), "/sys/class/drm/card%d/metrics/%s/id", card, uuid);
+
+	if (try_read_u64_file(path, &config_id))
+		i915_perf_remove_config(drm_fd, config_id);
+
+	memset(&config, 0, sizeof(config));
+	memcpy(config.uuid, uuid, sizeof(config.uuid));
+
+	/* OASTARTTRIG[1-8] */
+	for (i = 0x2710; i <= 0x272c; i += 4) {
+		b_counters_regs[config.n_boolean_regs * 2] = i;
+		b_counters_regs[config.n_boolean_regs * 2 + 1] = 0;
+		config.n_boolean_regs++;
+	}
+	/* OAREPORTTRIG[1-8] */
+	for (i = 0x2740; i <= 0x275c; i += 4) {
+		b_counters_regs[config.n_boolean_regs * 2] = i;
+		b_counters_regs[config.n_boolean_regs * 2 + 1] = 0;
+		config.n_boolean_regs++;
+	}
+	config.boolean_regs_ptr = (uintptr_t) b_counters_regs;
+
+	if (intel_gen(devid) >= 8) {
+		/* Flex EU registers, only from Gen8+. */
+		for (i = 0; i < ARRAY_SIZE(flex); i++) {
+			flex_regs[config.n_flex_regs * 2] = flex[i];
+			flex_regs[config.n_flex_regs * 2 + 1] = 0;
+			config.n_flex_regs++;
+		}
+		config.flex_regs_ptr = (uintptr_t) flex_regs;
+	}
+
+	/* Mux registers (too many of them, just checking bounds) */
+	i = 0;
+
+	/* NOA_WRITE */
+	mux_regs[i++] = 0x9800;
+	mux_regs[i++] = 0;
+
+	if (IS_HASWELL(devid)) {
+		/* Haswell specific. undocumented... */
+		mux_regs[i++] = 0x9ec0;
+		mux_regs[i++] = 0;
+
+		mux_regs[i++] = 0x25100;
+		mux_regs[i++] = 0;
+		mux_regs[i++] = 0x2ff90;
+		mux_regs[i++] = 0;
+	}
+
+	if (intel_gen(devid) >= 8) {
+		/* NOA_CONFIG */
+		mux_regs[i++] = 0xD04;
+		mux_regs[i++] = 0;
+		mux_regs[i++] = 0xD2C;
+		mux_regs[i++] = 0;
+		/* WAIT_FOR_RC6_EXIT */
+		mux_regs[i++] = 0x20CC;
+		mux_regs[i++] = 0;
+	}
+
+	/* HALF_SLICE_CHICKEN2 (shared with kernel workaround) */
+	mux_regs[i++] = 0xE180;
+	mux_regs[i++] = 0;
+
+	if (IS_CHERRYVIEW(devid)) {
+		/* Cherryview specific. undocumented... */
+		mux_regs[i++] = 0x182300;
+		mux_regs[i++] = 0;
+		mux_regs[i++] = 0x1823A4;
+		mux_regs[i++] = 0;
+	}
+
+	/* PERFCNT[12] */
+	mux_regs[i++] = 0x91B8;
+	mux_regs[i++] = 0;
+	/* PERFMATRIX */
+	mux_regs[i++] = 0x91C8;
+	mux_regs[i++] = 0;
+
+	config.mux_regs_ptr = (uintptr_t) mux_regs;
+	config.n_mux_regs = i / 2;
+
+	/* Create a new config */
+	ret = igt_ioctl(drm_fd, DRM_IOCTL_I915_PERF_ADD_CONFIG, &config);
+	igt_assert(ret > 0); /* Config 0 should be used by the kernel */
+	config_id = ret;
+
+	i915_perf_remove_config(drm_fd, config_id);
+}
+
+static unsigned
+read_i915_module_ref(void)
+{
+	FILE *fp = fopen("/proc/modules", "r");
+	char *line = NULL;
+	size_t line_buf_size = 0;
+	int len = 0;
+	unsigned ref_count;
+
+	igt_assert(fp);
+
+	while ((len = getline(&line, &line_buf_size, fp)) > 0) {
+		if (strncmp(line, "i915 ", 5) == 0) {
+			unsigned long mem;
+			int ret = sscanf(line + 5, "%lu %u", &mem, &ref_count);
+			igt_assert(ret == 2);
+			goto done;
+		}
+	}
+
+	igt_assert(!"reached");
+
+done:
+	free(line);
+	fclose(fp);
+	return ref_count;
+}
+
+/* check that an open i915 perf stream holds a reference on the drm i915 module
+ * including in the corner case where the original drm fd has been closed.
+ */
+static void
+test_i915_ref_count(void)
+{
+	uint64_t properties[] = {
+		/* Include OA reports in samples */
+		DRM_I915_PERF_PROP_SAMPLE_OA, true,
+
+		/* OA unit configuration */
+		DRM_I915_PERF_PROP_OA_METRICS_SET, 0 /* updated below */,
+		DRM_I915_PERF_PROP_OA_FORMAT, 0, /* update below */
+		DRM_I915_PERF_PROP_OA_EXPONENT, 0, /* update below */
+	};
+	struct drm_i915_perf_open_param param = {
+		.flags = I915_PERF_FLAG_FD_CLOEXEC,
+		.num_properties = sizeof(properties) / 16,
+		.properties_ptr = to_user_pointer(properties),
+	};
+	unsigned baseline, ref_count0, ref_count1;
+	int stream_fd;
+	uint32_t oa_report0[64];
+	uint32_t oa_report1[64];
+
+	/* This should be the first test before the first fixture so no drm_fd
+	 * should have been opened so far...
+	 */
+	igt_assert_eq(drm_fd, -1);
+
+	baseline = read_i915_module_ref();
+	igt_debug("baseline ref count (drm fd closed) = %u\n", baseline);
+
+	drm_fd = __drm_open_driver(DRIVER_INTEL);
+	devid = intel_get_drm_devid(drm_fd);
+	card = drm_get_card();
+
+	/* Note: these global variables are only initialized after calling
+	 * init_sys_info()...
+	 */
+	igt_require(init_sys_info());
+	properties[3] = test_metric_set_id;
+	properties[5] = test_oa_format;
+	properties[7] = oa_exp_1_millisec;
+
+	ref_count0 = read_i915_module_ref();
+	igt_debug("initial ref count with drm_fd open = %u\n", ref_count0);
+	igt_assert(ref_count0 > baseline);
+
+	stream_fd = __perf_open(drm_fd, &param);
+	ref_count1 = read_i915_module_ref();
+	igt_debug("ref count after opening i915 perf stream = %u\n", ref_count1);
+	igt_assert(ref_count1 > ref_count0);
+
+	close(drm_fd);
+	drm_fd = -1;
+	ref_count0 = read_i915_module_ref();
+	igt_debug("ref count after closing drm fd = %u\n", ref_count0);
+
+	igt_assert(ref_count0 > baseline);
+
+	read_2_oa_reports(stream_fd,
+			  test_oa_format,
+			  oa_exp_1_millisec,
+			  oa_report0,
+			  oa_report1,
+			  false); /* not just timer reports */
+
+	close(stream_fd);
+	ref_count0 = read_i915_module_ref();
+	igt_debug("ref count after closing i915 perf stream fd = %u\n", ref_count0);
+	igt_assert_eq(ref_count0, baseline);
+}
+
+static void
+test_sysctl_defaults(void)
+{
+	int paranoid = read_u64_file("/proc/sys/dev/i915/perf_stream_paranoid");
+	int max_freq = read_u64_file("/proc/sys/dev/i915/oa_max_sample_rate");
+
+	igt_assert_eq(paranoid, 1);
+	igt_assert_eq(max_freq, 100000);
+}
+
+igt_main
+{
+	igt_skip_on_simulation();
+
+	igt_fixture {
+		struct stat sb;
+
+		igt_require(stat("/proc/sys/dev/i915/perf_stream_paranoid", &sb)
+			    == 0);
+		igt_require(stat("/proc/sys/dev/i915/oa_max_sample_rate", &sb)
+			    == 0);
+	}
+
+	igt_subtest("i915-ref-count")
+		test_i915_ref_count();
+
+	igt_subtest("sysctl-defaults")
+		test_sysctl_defaults();
+
+	igt_fixture {
+		/* We expect that the ref count test before these fixtures
+		 * should have closed drm_fd...
+		 */
+		igt_assert_eq(drm_fd, -1);
+		drm_fd = drm_open_driver_render(DRIVER_INTEL);
+		devid = intel_get_drm_devid(drm_fd);
+		card = drm_get_card();
+
+		igt_require(init_sys_info());
+
+		gt_frequency_range_save();
+
+		write_u64_file("/proc/sys/dev/i915/perf_stream_paranoid", 1);
+		write_u64_file("/proc/sys/dev/i915/oa_max_sample_rate", 100000);
+
+		render_copy = igt_get_render_copyfunc(devid);
+		igt_require_f(render_copy, "no render-copy function\n");
+	}
+
+	igt_subtest("non-system-wide-paranoid")
+		test_system_wide_paranoid();
+
+	igt_subtest("invalid-open-flags")
+		test_invalid_open_flags();
+
+	igt_subtest("invalid-oa-metric-set-id")
+		test_invalid_oa_metric_set_id();
+
+	igt_subtest("invalid-oa-format-id")
+		test_invalid_oa_format_id();
+
+	igt_subtest("missing-sample-flags")
+		test_missing_sample_flags();
+
+	igt_subtest("oa-formats")
+		test_oa_formats();
+
+	igt_subtest("invalid-oa-exponent")
+		test_invalid_oa_exponent();
+	igt_subtest("low-oa-exponent-permissions")
+		test_low_oa_exponent_permissions();
+	igt_subtest("oa-exponents") {
+		test_oa_exponents(450);
+		test_oa_exponents(550);
+	}
+
+	igt_subtest("per-context-mode-unprivileged")
+		test_per_context_mode_unprivileged();
+
+	igt_subtest("buffer-fill")
+		test_buffer_fill();
+
+	igt_subtest("disabled-read-error")
+		test_disabled_read_error();
+	igt_subtest("non-sampling-read-error")
+		test_non_sampling_read_error();
+
+	igt_subtest("enable-disable")
+		test_enable_disable();
+
+	igt_subtest("blocking")
+		test_blocking();
+
+	igt_subtest("polling")
+		test_polling();
+
+	igt_subtest("short-reads")
+		test_short_reads();
+
+	igt_subtest("mi-rpc")
+		test_mi_rpc();
+
+	igt_subtest("unprivileged-singled-ctx-counters") {
+		/* For Gen8+ the OA unit can no longer be made to clock gate
+		 * for a specific context. Additionally the partial-replacement
+		 * functionality to HW filter timer reports for a specific
+		 * context (SKL+) can't stop multiple applications viewing
+		 * system-wide data via MI_REPORT_PERF_COUNT commands.
+		 */
+		igt_require(IS_HASWELL(devid));
+		hsw_test_single_ctx_counters();
+	}
+
+	igt_subtest("rc6-disable")
+		test_rc6_disable();
+
+	igt_subtest("invalid-create-userspace-config")
+		test_invalid_create_userspace_config();
+
+	igt_subtest("invalid-remove-userspace-config")
+		test_invalid_remove_userspace_config();
+
+	igt_subtest("create-destroy-userspace-config")
+		test_create_destroy_userspace_config();
+
+	igt_subtest("whitelisted-registers-userspace-config")
+		test_whitelisted_registers_userspace_config();
+
+	igt_fixture {
+		/* leave sysctl options in their default state... */
+		write_u64_file("/proc/sys/dev/i915/oa_max_sample_rate", 100000);
+		write_u64_file("/proc/sys/dev/i915/perf_stream_paranoid", 1);
+
+		gt_frequency_range_restore();
+
+		close(drm_fd);
+	}
+}
diff --git a/tests/perf.c b/tests/perf.c
deleted file mode 100644
index a82a3da..0000000
--- a/tests/perf.c
+++ /dev/null
@@ -1,3353 +0,0 @@
-/*
- * Copyright © 2016 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- *
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <fcntl.h>
-#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/times.h>
-#include <sys/types.h>
-#include <dirent.h>
-#include <time.h>
-#include <poll.h>
-#include <math.h>
-
-#include "igt.h"
-#include "drm.h"
-
-IGT_TEST_DESCRIPTION("Test the i915 perf metrics streaming interface");
-
-#define GEN6_MI_REPORT_PERF_COUNT ((0x28 << 23) | (3 - 2))
-#define GEN8_MI_REPORT_PERF_COUNT ((0x28 << 23) | (4 - 2))
-
-#define OAREPORT_REASON_MASK           0x3f
-#define OAREPORT_REASON_SHIFT          19
-#define OAREPORT_REASON_TIMER          (1<<0)
-#define OAREPORT_REASON_CTX_SWITCH     (1<<3)
-#define OAREPORT_REASON_CLK_RATIO      (1<<5)
-
-#define GFX_OP_PIPE_CONTROL     ((3 << 29) | (3 << 27) | (2 << 24))
-#define PIPE_CONTROL_CS_STALL	   (1 << 20)
-#define PIPE_CONTROL_GLOBAL_SNAPSHOT_COUNT_RESET	(1 << 19)
-#define PIPE_CONTROL_TLB_INVALIDATE     (1 << 18)
-#define PIPE_CONTROL_SYNC_GFDT	  (1 << 17)
-#define PIPE_CONTROL_MEDIA_STATE_CLEAR  (1 << 16)
-#define PIPE_CONTROL_NO_WRITE	   (0 << 14)
-#define PIPE_CONTROL_WRITE_IMMEDIATE    (1 << 14)
-#define PIPE_CONTROL_WRITE_DEPTH_COUNT  (2 << 14)
-#define PIPE_CONTROL_WRITE_TIMESTAMP    (3 << 14)
-#define PIPE_CONTROL_DEPTH_STALL	(1 << 13)
-#define PIPE_CONTROL_RENDER_TARGET_FLUSH (1 << 12)
-#define PIPE_CONTROL_INSTRUCTION_INVALIDATE (1 << 11)
-#define PIPE_CONTROL_TEXTURE_CACHE_INVALIDATE   (1 << 10) /* GM45+ only */
-#define PIPE_CONTROL_ISP_DIS	    (1 << 9)
-#define PIPE_CONTROL_INTERRUPT_ENABLE   (1 << 8)
-#define PIPE_CONTROL_FLUSH_ENABLE       (1 << 7) /* Gen7+ only */
-/* GT */
-#define PIPE_CONTROL_DATA_CACHE_INVALIDATE      (1 << 5)
-#define PIPE_CONTROL_VF_CACHE_INVALIDATE	(1 << 4)
-#define PIPE_CONTROL_CONST_CACHE_INVALIDATE     (1 << 3)
-#define PIPE_CONTROL_STATE_CACHE_INVALIDATE     (1 << 2)
-#define PIPE_CONTROL_STALL_AT_SCOREBOARD	(1 << 1)
-#define PIPE_CONTROL_DEPTH_CACHE_FLUSH	  (1 << 0)
-#define PIPE_CONTROL_PPGTT_WRITE	(0 << 2)
-#define PIPE_CONTROL_GLOBAL_GTT_WRITE   (1 << 2)
-
-/* Temporarily copy i915-perf uapi here to avoid a dependency on libdrm's
- * i915_drm.h copy being updated with the i915-perf interface before this
- * test can land in i-g-t.
- *
- * TODO: remove this once the interface lands in libdrm
- */
-#ifndef DRM_I915_PERF_OPEN
-#define DRM_I915_PERF_OPEN		0x36
-#define DRM_IOCTL_I915_PERF_OPEN	DRM_IOW(DRM_COMMAND_BASE + DRM_I915_PERF_OPEN, struct drm_i915_perf_open_param)
-
-enum drm_i915_oa_format {
-	I915_OA_FORMAT_A13 = 1,     /* HSW only */
-	I915_OA_FORMAT_A29,         /* HSW only */
-	I915_OA_FORMAT_A13_B8_C8,   /* HSW only */
-	I915_OA_FORMAT_B4_C8,       /* HSW only */
-	I915_OA_FORMAT_A45_B8_C8,   /* HSW only */
-	I915_OA_FORMAT_B4_C8_A16,   /* HSW only */
-	I915_OA_FORMAT_C4_B8,       /* HSW+ */
-
-	/* Gen8+ */
-	I915_OA_FORMAT_A12,
-	I915_OA_FORMAT_A12_B8_C8,
-	I915_OA_FORMAT_A32u40_A4u32_B8_C8,
-
-	I915_OA_FORMAT_MAX /* non-ABI */
-};
-
-enum drm_i915_perf_property_id {
-       DRM_I915_PERF_PROP_CTX_HANDLE = 1,
-       DRM_I915_PERF_PROP_SAMPLE_OA,
-       DRM_I915_PERF_PROP_OA_METRICS_SET,
-       DRM_I915_PERF_PROP_OA_FORMAT,
-       DRM_I915_PERF_PROP_OA_EXPONENT,
-
-       DRM_I915_PERF_PROP_MAX /* non-ABI */
-};
-
-struct drm_i915_perf_open_param {
-       __u32 flags;
-#define I915_PERF_FLAG_FD_CLOEXEC	(1<<0)
-#define I915_PERF_FLAG_FD_NONBLOCK	(1<<1)
-#define I915_PERF_FLAG_DISABLED		(1<<2)
-
-       __u32 num_properties;
-       __u64 properties_ptr;
-};
-
-#define I915_PERF_IOCTL_ENABLE _IO('i', 0x0)
-#define I915_PERF_IOCTL_DISABLE	_IO('i', 0x1)
-
-struct drm_i915_perf_record_header {
-       __u32 type;
-       __u16 pad;
-       __u16 size;
-};
-
-enum drm_i915_perf_record_type {
-       DRM_I915_PERF_RECORD_SAMPLE = 1,
-       DRM_I915_PERF_RECORD_OA_REPORT_LOST = 2,
-       DRM_I915_PERF_RECORD_OA_BUFFER_LOST = 3,
-
-       DRM_I915_PERF_RECORD_MAX /* non-ABI */
-};
-#endif /* !DRM_I915_PERF_OPEN */
-
-/* There is no ifdef we can use for those formats :( */
-enum {
-	local_I915_OA_FORMAT_A12 = I915_OA_FORMAT_C4_B8 + 1,
-	local_I915_OA_FORMAT_A12_B8_C8 = I915_OA_FORMAT_C4_B8 + 2,
-	local_I915_OA_FORMAT_A32u40_A4u32_B8_C8 = I915_OA_FORMAT_C4_B8 + 3,
-};
-
-#define local_I915_OA_FORMAT_MAX (local_I915_OA_FORMAT_A32u40_A4u32_B8_C8 + 1)
-
-#ifndef DRM_IOCTL_I915_PERF_ADD_CONFIG
-
-#define DRM_I915_PERF_ADD_CONFIG	0x37
-#define DRM_I915_PERF_REMOVE_CONFIG	0x38
-
-#define DRM_IOCTL_I915_PERF_ADD_CONFIG	DRM_IOW(DRM_COMMAND_BASE + DRM_I915_PERF_ADD_CONFIG, struct drm_i915_perf_oa_config)
-#define DRM_IOCTL_I915_PERF_REMOVE_CONFIG	DRM_IOW(DRM_COMMAND_BASE + DRM_I915_PERF_REMOVE_CONFIG, __u64)
-
-/**
- * Structure to upload perf dynamic configuration into the kernel.
- */
-struct drm_i915_perf_oa_config {
-	/** String formatted like "%08x-%04x-%04x-%04x-%012x" */
-	char uuid[36];
-
-	__u32 n_mux_regs;
-	__u32 n_boolean_regs;
-	__u32 n_flex_regs;
-
-	__u64 mux_regs_ptr;
-	__u64 boolean_regs_ptr;
-	__u64 flex_regs_ptr;
-};
-
-#endif /* !DRM_IOCTL_I915_PERF_ADD_CONFIG */
-
-struct accumulator {
-#define MAX_RAW_OA_COUNTERS 62
-	enum drm_i915_oa_format format;
-
-	uint64_t deltas[MAX_RAW_OA_COUNTERS];
-};
-
-static struct {
-	const char *name;
-	size_t size;
-	int a40_high_off; /* bytes */
-	int a40_low_off;
-	int n_a40;
-	int a_off;
-	int n_a;
-	int first_a;
-	int b_off;
-	int n_b;
-	int c_off;
-	int n_c;
-	int min_gen;
-	int max_gen;
-} oa_formats[local_I915_OA_FORMAT_MAX] = {
-	[I915_OA_FORMAT_A13] = { /* HSW only */
-		"A13", .size = 64,
-		.a_off = 12, .n_a = 13,
-		.max_gen = 7 },
-	[I915_OA_FORMAT_A29] = { /* HSW only */
-		"A29", .size = 128,
-		.a_off = 12, .n_a = 29,
-		.max_gen = 7 },
-	[I915_OA_FORMAT_A13_B8_C8] = { /* HSW only */
-		"A13_B8_C8", .size = 128,
-		.a_off = 12, .n_a = 13,
-		.b_off = 64, .n_b = 8,
-		.c_off = 96, .n_c = 8,
-		.max_gen = 7 },
-	[I915_OA_FORMAT_A45_B8_C8] = { /* HSW only */
-		"A45_B8_C8", .size = 256,
-		.a_off = 12,  .n_a = 45,
-		.b_off = 192, .n_b = 8,
-		.c_off = 224, .n_c = 8,
-		.max_gen = 7 },
-	[I915_OA_FORMAT_B4_C8] = { /* HSW only */
-		"B4_C8", .size = 64,
-		.b_off = 16, .n_b = 4,
-		.c_off = 32, .n_c = 8,
-		.max_gen = 7 },
-	[I915_OA_FORMAT_B4_C8_A16] = { /* HSW only */
-		"B4_C8_A16", .size = 128,
-		.b_off = 16, .n_b = 4,
-		.c_off = 32, .n_c = 8,
-		.a_off = 60, .n_a = 16, .first_a = 29,
-		.max_gen = 7 },
-	[I915_OA_FORMAT_C4_B8] = { /* HSW+ (header differs from HSW-Gen8+) */
-		"C4_B8", .size = 64,
-		.c_off = 16, .n_c = 4,
-		.b_off = 28, .n_b = 8 },
-
-	/* Gen8+ */
-
-	[local_I915_OA_FORMAT_A12] = {
-		"A12", .size = 64,
-		.a_off = 12, .n_a = 12, .first_a = 7,
-		.min_gen = 8 },
-	[local_I915_OA_FORMAT_A12_B8_C8] = {
-		"A12_B8_C8", .size = 128,
-		.a_off = 12, .n_a = 12,
-		.b_off = 64, .n_b = 8,
-		.c_off = 96, .n_c = 8, .first_a = 7,
-		.min_gen = 8 },
-	[local_I915_OA_FORMAT_A32u40_A4u32_B8_C8] = {
-		"A32u40_A4u32_B8_C8", .size = 256,
-		.a40_high_off = 160, .a40_low_off = 16, .n_a40 = 32,
-		.a_off = 144, .n_a = 4, .first_a = 32,
-		.b_off = 192, .n_b = 8,
-		.c_off = 224, .n_c = 8,
-		.min_gen = 8 },
-	[I915_OA_FORMAT_C4_B8] = {
-		"C4_B8", .size = 64,
-		.c_off = 16, .n_c = 4,
-		.b_off = 32, .n_b = 8,
-		.min_gen = 8 },
-};
-
-static bool hsw_undefined_a_counters[45] = {
-	[4] = true,
-	[6] = true,
-	[9] = true,
-	[11] = true,
-	[14] = true,
-	[16] = true,
-	[19] = true,
-	[21] = true,
-	[24] = true,
-	[26] = true,
-	[29] = true,
-	[31] = true,
-	[34] = true,
-	[43] = true,
-	[44] = true,
-};
-
-/* No A counters currently reserved/undefined for gen8+ so far */
-static bool gen8_undefined_a_counters[45];
-
-static int drm_fd = -1;
-static uint32_t devid;
-static int card = -1;
-static int n_eus;
-
-static uint64_t test_metric_set_id = UINT64_MAX;
-static uint64_t gt_min_freq_mhz_saved = 0;
-static uint64_t gt_max_freq_mhz_saved = 0;
-static uint64_t gt_min_freq_mhz = 0;
-static uint64_t gt_max_freq_mhz = 0;
-
-static uint64_t timestamp_frequency = 12500000;
-static enum drm_i915_oa_format test_oa_format;
-static bool *undefined_a_counters;
-static uint64_t oa_exp_1_millisec;
-
-static igt_render_copyfunc_t render_copy = NULL;
-static uint32_t (*read_report_ticks)(uint32_t *report,
-				     enum drm_i915_oa_format format);
-static void (*sanity_check_reports)(uint32_t *oa_report0, uint32_t *oa_report1,
-				    enum drm_i915_oa_format format);
-
-static int
-__perf_open(int fd, struct drm_i915_perf_open_param *param)
-{
-	int ret = igt_ioctl(fd, DRM_IOCTL_I915_PERF_OPEN, param);
-
-	igt_assert(ret >= 0);
-	errno = 0;
-
-	return ret;
-}
-
-static int
-lookup_format(int i915_perf_fmt_id)
-{
-	igt_assert(i915_perf_fmt_id < local_I915_OA_FORMAT_MAX);
-	igt_assert(oa_formats[i915_perf_fmt_id].name);
-
-	return i915_perf_fmt_id;
-}
-
-static bool
-try_read_u64_file(const char *file, uint64_t *val)
-{
-	char buf[32];
-	int fd, n;
-
-	fd = open(file, O_RDONLY);
-	if (fd < 0)
-		return false;
-
-	while ((n = read(fd, buf, sizeof(buf) - 1)) < 0 && errno == EINTR)
-		;
-	igt_assert(n >= 0);
-
-	close(fd);
-
-	buf[n] = '\0';
-	*val = strtoull(buf, NULL, 0);
-
-	return true;
-}
-
-static uint64_t
-read_u64_file(const char *file)
-{
-	uint64_t val;
-
-	igt_assert_eq(try_read_u64_file(file, &val), true);
-
-	return val;
-}
-
-static void
-write_u64_file(const char *file, uint64_t val)
-{
-	char buf[32];
-	int fd, len, ret;
-
-	fd = open(file, O_WRONLY);
-	igt_assert(fd >= 0);
-
-	len = snprintf(buf, sizeof(buf), "%"PRIu64, val);
-	igt_assert(len > 0);
-
-	while ((ret = write(fd, buf, len)) < 0 && errno == EINTR)
-		;
-	igt_assert_eq(ret, len);
-
-	close(fd);
-}
-
-static uint64_t
-sysfs_read(const char *file)
-{
-	char buf[512];
-
-	snprintf(buf, sizeof(buf), "/sys/class/drm/card%d/%s", card, file);
-
-	return read_u64_file(buf);
-}
-
-static void
-sysfs_write(const char *file, uint64_t val)
-{
-	char buf[512];
-
-	snprintf(buf, sizeof(buf), "/sys/class/drm/card%d/%s", card, file);
-
-	write_u64_file(buf, val);
-}
-
-static char *
-read_debugfs_record(int device, const char *file, const char *key)
-{
-	FILE *fp;
-	int fd;
-	char *line = NULL;
-	size_t line_buf_size = 0;
-	int len = 0;
-	int key_len = strlen(key);
-	char *value = NULL;
-
-	fd = igt_debugfs_open(device, file, O_RDONLY);
-	fp = fdopen(fd, "r");
-	igt_require(fp);
-
-	while ((len = getline(&line, &line_buf_size, fp)) > 0) {
-
-		if (line[len - 1] == '\n')
-			line[len - 1] = '\0';
-
-		if (strncmp(key, line, key_len) == 0 &&
-		    line[key_len] == ':' &&
-		    line[key_len + 1] == ' ')
-		{
-			value = strdup(line + key_len + 2);
-			goto done;
-		}
-	}
-
-	igt_assert(!"reached");
-done:
-	free(line);
-	fclose(fp);
-	close(fd);
-	return value;
-}
-
-static uint64_t
-read_debugfs_u64_record(int fd, const char *file, const char *key)
-{
-	char *str_val = read_debugfs_record(fd, file, key);
-	uint64_t val;
-
-	igt_require(str_val);
-
-	val = strtoull(str_val, NULL, 0);
-	free(str_val);
-
-	return val;
-}
-
-/* XXX: For Haswell this utility is only applicable to the render basic
- * metric set.
- *
- * C2 corresponds to a clock counter for the Haswell render basic metric set
- * but it's not included in all of the formats.
- */
-static uint32_t
-hsw_read_report_ticks(uint32_t *report, enum drm_i915_oa_format format)
-{
-	uint32_t *c = (uint32_t *)(((uint8_t *)report) + oa_formats[format].c_off);
-
-	igt_assert_neq(oa_formats[format].n_c, 0);
-
-	return c[2];
-}
-
-static uint32_t
-gen8_read_report_ticks(uint32_t *report, enum drm_i915_oa_format format)
-{
-	return report[3];
-}
-
-static const char *
-gen8_read_report_reason(const uint32_t *report)
-{
-	uint32_t reason = ((report[0] >> OAREPORT_REASON_SHIFT) &
-			   OAREPORT_REASON_MASK);
-
-	if (reason & (1<<0))
-		return "timer";
-	else if (reason & (1<<1))
-	      return "internal trigger 1";
-	else if (reason & (1<<2))
-	      return "internal trigger 2";
-	else if (reason & (1<<3))
-	      return "context switch";
-	else if (reason & (1<<4))
-	      return "GO 1->0 transition (enter RC6)";
-	else if (reason & (1<<5))
-		return "[un]slice clock ratio change";
-	else
-		return "unknown";
-}
-
-static bool
-oa_report_is_periodic(uint32_t oa_exponent, const uint32_t *report)
-{
-	if (IS_HASWELL(devid)) {
-		/* For Haswell we don't have a documented report reason field
-		 * (though empirically report[0] bit 10 does seem to correlate
-		 * with a timer trigger reason) so we instead infer which
-		 * reports are timer triggered by checking if the least
-		 * significant bits are zero and the exponent bit is set.
-		 */
-		uint32_t oa_exponent_mask = (1 << (oa_exponent + 1)) - 1;
-
-		if ((report[1] & oa_exponent_mask) != (1 << oa_exponent))
-			return true;
-	} else {
-		if ((report[0] >> OAREPORT_REASON_SHIFT) &
-		    OAREPORT_REASON_TIMER)
-			return true;
-	}
-
-	return false;
-}
-
-static uint64_t
-timebase_scale(uint32_t u32_delta)
-{
-	return ((uint64_t)u32_delta * NSEC_PER_SEC) / timestamp_frequency;
-}
-
-/* Returns: the largest OA exponent that will still result in a sampling period
- * less than or equal to the given @period.
- */
-static int
-max_oa_exponent_for_period_lte(uint64_t period)
-{
-	/* NB: timebase_scale() takes a uint32_t and an exponent of 30
-	 * would already represent a period of ~3 minutes so there's
-	 * really no need to consider higher exponents.
-	 */
-	for (int i = 0; i < 30; i++) {
-		uint64_t oa_period = timebase_scale(2 << i);
-
-		if (oa_period > period)
-			return max(0, i - 1);
-	}
-
-	igt_assert(!"reached");
-	return -1;
-}
-
-/* Return: the largest OA exponent that will still result in a sampling
- * frequency greater than the given @frequency.
- */
-static int
-max_oa_exponent_for_freq_gt(uint64_t frequency)
-{
-	uint64_t period = NSEC_PER_SEC / frequency;
-
-	igt_assert_neq(period, 0);
-
-	return max_oa_exponent_for_period_lte(period - 1);
-}
-
-static uint64_t
-oa_exponent_to_ns(int exponent)
-{
-       return 1000000000ULL * (2ULL << exponent) / timestamp_frequency;
-}
-
-static void
-hsw_sanity_check_render_basic_reports(uint32_t *oa_report0, uint32_t *oa_report1,
-				      enum drm_i915_oa_format fmt)
-{
-	uint32_t time_delta = timebase_scale(oa_report1[1] - oa_report0[1]);
-	uint32_t clock_delta;
-	uint32_t max_delta;
-
-	igt_assert_neq(time_delta, 0);
-
-	/* As a special case we have to consider that on Haswell we
-	 * can't explicitly derive a clock delta for all OA report
-	 * formats...
-	 */
-	if (oa_formats[fmt].n_c == 0) {
-		/* Assume running at max freq for sake of
-		 * below sanity check on counters... */
-		clock_delta = (gt_max_freq_mhz *
-			       (uint64_t)time_delta) / 1000;
-	} else {
-		uint32_t ticks0 = read_report_ticks(oa_report0, fmt);
-		uint32_t ticks1 = read_report_ticks(oa_report1, fmt);
-		uint64_t freq;
-
-		clock_delta = ticks1 - ticks0;
-
-		igt_assert_neq(clock_delta, 0);
-
-		freq = ((uint64_t)clock_delta * 1000) / time_delta;
-		igt_debug("freq = %"PRIu64"\n", freq);
-
-		igt_assert(freq <= gt_max_freq_mhz);
-	}
-
-	igt_debug("clock delta = %"PRIu32"\n", clock_delta);
-
-	/* The maximum rate for any HSW counter =
-	 *   clock_delta * N EUs
-	 *
-	 * Sanity check that no counters exceed this delta.
-	 */
-	max_delta = clock_delta * n_eus;
-
-	/* 40bit A counters were only introduced for Gen8+ */
-	igt_assert_eq(oa_formats[fmt].n_a40, 0);
-
-	for (int j = 0; j < oa_formats[fmt].n_a; j++) {
-		uint32_t *a0 = (uint32_t *)(((uint8_t *)oa_report0) +
-					    oa_formats[fmt].a_off);
-		uint32_t *a1 = (uint32_t *)(((uint8_t *)oa_report1) +
-					    oa_formats[fmt].a_off);
-		int a_id = oa_formats[fmt].first_a + j;
-		uint32_t delta = a1[j] - a0[j];
-
-		if (undefined_a_counters[a_id])
-			continue;
-
-		igt_debug("A%d: delta = %"PRIu32"\n", a_id, delta);
-		igt_assert(delta <= max_delta);
-	}
-
-	for (int j = 0; j < oa_formats[fmt].n_b; j++) {
-		uint32_t *b0 = (uint32_t *)(((uint8_t *)oa_report0) +
-					    oa_formats[fmt].b_off);
-		uint32_t *b1 = (uint32_t *)(((uint8_t *)oa_report1) +
-					    oa_formats[fmt].b_off);
-		uint32_t delta = b1[j] - b0[j];
-
-		igt_debug("B%d: delta = %"PRIu32"\n", j, delta);
-		igt_assert(delta <= max_delta);
-	}
-
-	for (int j = 0; j < oa_formats[fmt].n_c; j++) {
-		uint32_t *c0 = (uint32_t *)(((uint8_t *)oa_report0) +
-					    oa_formats[fmt].c_off);
-		uint32_t *c1 = (uint32_t *)(((uint8_t *)oa_report1) +
-					    oa_formats[fmt].c_off);
-		uint32_t delta = c1[j] - c0[j];
-
-		igt_debug("C%d: delta = %"PRIu32"\n", j, delta);
-		igt_assert(delta <= max_delta);
-	}
-}
-
-static uint64_t
-gen8_read_40bit_a_counter(uint32_t *report, enum drm_i915_oa_format fmt, int a_id)
-{
-	uint8_t *a40_high = (((uint8_t *)report) + oa_formats[fmt].a40_high_off);
-	uint32_t *a40_low = (uint32_t *)(((uint8_t *)report) +
-					 oa_formats[fmt].a40_low_off);
-	uint64_t high = (uint64_t)(a40_high[a_id]) << 32;
-
-	return a40_low[a_id] | high;
-}
-
-static uint64_t
-gen8_40bit_a_delta(uint64_t value0, uint64_t value1)
-{
-	if (value0 > value1)
-		return (1ULL << 40) + value1 - value0;
-	else
-		return value1 - value0;
-}
-
-/* The TestOa metric set is designed so */
-static void
-gen8_sanity_check_test_oa_reports(uint32_t *oa_report0, uint32_t *oa_report1,
-				  enum drm_i915_oa_format fmt)
-{
-	uint32_t time_delta = timebase_scale(oa_report1[1] - oa_report0[1]);
-	uint32_t ticks0 = read_report_ticks(oa_report0, fmt);
-	uint32_t ticks1 = read_report_ticks(oa_report1, fmt);
-	uint32_t clock_delta = ticks1 - ticks0;
-	uint32_t max_delta;
-	uint64_t freq;
-	uint32_t *rpt0_b = (uint32_t *)(((uint8_t *)oa_report0) +
-					oa_formats[fmt].b_off);
-	uint32_t *rpt1_b = (uint32_t *)(((uint8_t *)oa_report1) +
-					oa_formats[fmt].b_off);
-	uint32_t b;
-	uint32_t ref;
-
-
-	igt_assert_neq(time_delta, 0);
-	igt_assert_neq(clock_delta, 0);
-
-	freq = ((uint64_t)clock_delta * 1000) / time_delta;
-	igt_debug("freq = %"PRIu64"\n", freq);
-
-	igt_assert(freq <= gt_max_freq_mhz);
-
-	igt_debug("clock delta = %"PRIu32"\n", clock_delta);
-
-	max_delta = clock_delta * n_eus;
-
-	/* Gen8+ has some 40bit A counters... */
-	for (int j = 0; j < oa_formats[fmt].n_a40; j++) {
-		uint64_t value0 = gen8_read_40bit_a_counter(oa_report0, fmt, j);
-		uint64_t value1 = gen8_read_40bit_a_counter(oa_report1, fmt, j);
-		uint64_t delta = gen8_40bit_a_delta(value0, value1);
-
-		if (undefined_a_counters[j])
-			continue;
-
-		igt_debug("A%d: delta = %"PRIu64"\n", j, delta);
-		igt_assert(delta <= max_delta);
-	}
-
-	for (int j = 0; j < oa_formats[fmt].n_a; j++) {
-		uint32_t *a0 = (uint32_t *)(((uint8_t *)oa_report0) +
-					    oa_formats[fmt].a_off);
-		uint32_t *a1 = (uint32_t *)(((uint8_t *)oa_report1) +
-					    oa_formats[fmt].a_off);
-		int a_id = oa_formats[fmt].first_a + j;
-		uint32_t delta = a1[j] - a0[j];
-
-		if (undefined_a_counters[a_id])
-			continue;
-
-		igt_debug("A%d: delta = %"PRIu32"\n", a_id, delta);
-		igt_assert(delta <= max_delta);
-	}
-
-	/* The TestOa metric set defines all B counters to be a
-	 * multiple of the gpu clock
-	 */
-	if (oa_formats[fmt].n_b) {
-		b = rpt1_b[0] - rpt0_b[0];
-		igt_debug("B0: delta = %"PRIu32"\n", b);
-		igt_assert_eq(b, 0);
-
-		b = rpt1_b[1] - rpt0_b[1];
-		igt_debug("B1: delta = %"PRIu32"\n", b);
-		igt_assert_eq(b, clock_delta);
-
-		b = rpt1_b[2] - rpt0_b[2];
-		igt_debug("B2: delta = %"PRIu32"\n", b);
-		igt_assert_eq(b, clock_delta);
-
-		b = rpt1_b[3] - rpt0_b[3];
-		ref = clock_delta / 2;
-		igt_debug("B3: delta = %"PRIu32"\n", b);
-		igt_assert(b >= ref - 1 && b <= ref + 1);
-
-		b = rpt1_b[4] - rpt0_b[4];
-		ref = clock_delta / 3;
-		igt_debug("B4: delta = %"PRIu32"\n", b);
-		igt_assert(b >= ref - 1 && b <= ref + 1);
-
-		b = rpt1_b[5] - rpt0_b[5];
-		ref = clock_delta / 3;
-		igt_debug("B5: delta = %"PRIu32"\n", b);
-		igt_assert(b >= ref - 1 && b <= ref + 1);
-
-		b = rpt1_b[6] - rpt0_b[6];
-		ref = clock_delta / 6;
-		igt_debug("B6: delta = %"PRIu32"\n", b);
-		igt_assert(b >= ref - 1 && b <= ref + 1);
-
-		b = rpt1_b[7] - rpt0_b[7];
-		ref = clock_delta * 2 / 3;
-		igt_debug("B7: delta = %"PRIu32"\n", b);
-		igt_assert(b >= ref - 1 && b <= ref + 1);
-	}
-
-	for (int j = 0; j < oa_formats[fmt].n_c; j++) {
-		uint32_t *c0 = (uint32_t *)(((uint8_t *)oa_report0) +
-					    oa_formats[fmt].c_off);
-		uint32_t *c1 = (uint32_t *)(((uint8_t *)oa_report1) +
-					    oa_formats[fmt].c_off);
-		uint32_t delta = c1[j] - c0[j];
-
-		igt_debug("C%d: delta = %"PRIu32"\n", j, delta);
-		igt_assert(delta <= max_delta);
-	}
-}
-
-static bool
-init_sys_info(void)
-{
-	const char *test_set_name = NULL;
-	const char *test_set_uuid = NULL;
-	char buf[256];
-
-	igt_assert_neq(card, -1);
-	igt_assert_neq(devid, 0);
-
-	timestamp_frequency = 12500000;
-
-	if (IS_HASWELL(devid)) {
-		/* We don't have a TestOa metric set for Haswell so use
-		 * RenderBasic
-		 */
-		test_set_name = "RenderBasic";
-		test_set_uuid = "403d8832-1a27-4aa6-a64e-f5389ce7b212";
-		test_oa_format = I915_OA_FORMAT_A45_B8_C8;
-		undefined_a_counters = hsw_undefined_a_counters;
-		read_report_ticks = hsw_read_report_ticks;
-		sanity_check_reports = hsw_sanity_check_render_basic_reports;
-
-		if (intel_gt(devid) == 0)
-			n_eus = 10;
-		else if (intel_gt(devid) == 1)
-			n_eus = 20;
-		else if (intel_gt(devid) == 2)
-			n_eus = 40;
-		else {
-			igt_assert(!"reached");
-			return false;
-		}
-	} else {
-		drm_i915_getparam_t gp;
-
-		test_set_name = "TestOa";
-		test_oa_format = local_I915_OA_FORMAT_A32u40_A4u32_B8_C8;
-		undefined_a_counters = gen8_undefined_a_counters;
-		read_report_ticks = gen8_read_report_ticks;
-		sanity_check_reports = gen8_sanity_check_test_oa_reports;
-
-		if (IS_BROADWELL(devid)) {
-			test_set_uuid = "d6de6f55-e526-4f79-a6a6-d7315c09044e";
-		} else if (IS_CHERRYVIEW(devid)) {
-			test_set_uuid = "4a534b07-cba3-414d-8d60-874830e883aa";
-		} else if (IS_SKYLAKE(devid)) {
-			switch (intel_gt(devid)) {
-			case 1:
-				test_set_uuid = "1651949f-0ac0-4cb1-a06f-dafd74a407d1";
-				break;
-			case 2:
-				test_set_uuid = "2b985803-d3c9-4629-8a4f-634bfecba0e8";
-				break;
-			case 3:
-				test_set_uuid = "882fa433-1f4a-4a67-a962-c741888fe5f5";
-				break;
-			default:
-				igt_debug("unsupported Skylake GT size\n");
-				return false;
-			}
-			timestamp_frequency = 12000000;
-		} else if (IS_BROXTON(devid)) {
-			test_set_uuid = "5ee72f5c-092f-421e-8b70-225f7c3e9612";
-			timestamp_frequency = 19200000;
-		} else if (IS_KABYLAKE(devid)) {
-			switch (intel_gt(devid)) {
-			case 1:
-				test_set_uuid = "baa3c7e4-52b6-4b85-801e-465a94b746dd";
-				break;
-			case 2:
-				test_set_uuid = "f1792f32-6db2-4b50-b4b2-557128f1688d";
-				break;
-			default:
-				igt_debug("unsupported Kabylake GT size\n");
-				return false;
-			}
-			timestamp_frequency = 12000000;
-		} else if (IS_GEMINILAKE(devid)) {
-			test_set_uuid = "dd3fd789-e783-4204-8cd0-b671bbccb0cf";
-			timestamp_frequency = 19200000;
-		} else {
-			igt_debug("unsupported GT\n");
-			return false;
-		}
-
-		gp.param = I915_PARAM_EU_TOTAL;
-		gp.value = &n_eus;
-		do_ioctl(drm_fd, DRM_IOCTL_I915_GETPARAM, &gp);
-	}
-
-	igt_debug("%s metric set UUID = %s\n",
-		  test_set_name,
-		  test_set_uuid);
-
-	oa_exp_1_millisec = max_oa_exponent_for_period_lte(1000000);
-
-	snprintf(buf, sizeof(buf),
-		 "/sys/class/drm/card%d/metrics/%s/id",
-		 card,
-		 test_set_uuid);
-
-	return try_read_u64_file(buf, &test_metric_set_id);
-}
-
-static void
-gt_frequency_range_save(void)
-{
-	gt_min_freq_mhz_saved = sysfs_read("gt_min_freq_mhz");
-	gt_max_freq_mhz_saved = sysfs_read("gt_max_freq_mhz");
-
-	gt_min_freq_mhz = gt_min_freq_mhz_saved;
-	gt_max_freq_mhz = gt_max_freq_mhz_saved;
-}
-
-static void
-gt_frequency_pin(int gt_freq_mhz)
-{
-	igt_debug("requesting pinned GT freq = %dmhz\n", gt_freq_mhz);
-
-	if (gt_freq_mhz > gt_max_freq_mhz) {
-		sysfs_write("gt_max_freq_mhz", gt_freq_mhz);
-		sysfs_write("gt_min_freq_mhz", gt_freq_mhz);
-	} else {
-		sysfs_write("gt_min_freq_mhz", gt_freq_mhz);
-		sysfs_write("gt_max_freq_mhz", gt_freq_mhz);
-	}
-	gt_min_freq_mhz = gt_freq_mhz;
-	gt_max_freq_mhz = gt_freq_mhz;
-}
-
-static void
-gt_frequency_range_restore(void)
-{
-	igt_debug("restoring GT frequency range: min = %dmhz, max =%dmhz, current: min=%dmhz, max=%dmhz\n",
-		  (int)gt_min_freq_mhz_saved,
-		  (int)gt_max_freq_mhz_saved,
-		  (int)gt_min_freq_mhz,
-		  (int)gt_max_freq_mhz);
-
-	/* Assume current min/max are the same */
-	if (gt_min_freq_mhz_saved > gt_max_freq_mhz) {
-		sysfs_write("gt_max_freq_mhz", gt_max_freq_mhz_saved);
-		sysfs_write("gt_min_freq_mhz", gt_min_freq_mhz_saved);
-	} else {
-		sysfs_write("gt_min_freq_mhz", gt_min_freq_mhz_saved);
-		sysfs_write("gt_max_freq_mhz", gt_max_freq_mhz_saved);
-	}
-
-	gt_min_freq_mhz = gt_min_freq_mhz_saved;
-	gt_max_freq_mhz = gt_max_freq_mhz_saved;
-}
-
-/* CAP_SYS_ADMIN is required to open system wide metrics, unless the system
- * control parameter dev.i915.perf_stream_paranoid == 0 */
-static void
-test_system_wide_paranoid(void)
-{
-	igt_fork(child, 1) {
-		uint64_t properties[] = {
-			/* Include OA reports in samples */
-			DRM_I915_PERF_PROP_SAMPLE_OA, true,
-
-			/* OA unit configuration */
-			DRM_I915_PERF_PROP_OA_METRICS_SET, test_metric_set_id,
-			DRM_I915_PERF_PROP_OA_FORMAT, test_oa_format,
-			DRM_I915_PERF_PROP_OA_EXPONENT, oa_exp_1_millisec,
-		};
-		struct drm_i915_perf_open_param param = {
-			.flags = I915_PERF_FLAG_FD_CLOEXEC |
-				I915_PERF_FLAG_FD_NONBLOCK,
-			.num_properties = sizeof(properties) / 16,
-			.properties_ptr = to_user_pointer(properties),
-		};
-
-		write_u64_file("/proc/sys/dev/i915/perf_stream_paranoid", 1);
-
-		igt_drop_root();
-
-		do_ioctl_err(drm_fd, DRM_IOCTL_I915_PERF_OPEN, &param, EACCES);
-	}
-
-	igt_waitchildren();
-
-	igt_fork(child, 1) {
-		uint64_t properties[] = {
-			/* Include OA reports in samples */
-			DRM_I915_PERF_PROP_SAMPLE_OA, true,
-
-			/* OA unit configuration */
-			DRM_I915_PERF_PROP_OA_METRICS_SET, test_metric_set_id,
-			DRM_I915_PERF_PROP_OA_FORMAT, test_oa_format,
-			DRM_I915_PERF_PROP_OA_EXPONENT, oa_exp_1_millisec,
-		};
-		struct drm_i915_perf_open_param param = {
-			.flags = I915_PERF_FLAG_FD_CLOEXEC |
-				I915_PERF_FLAG_FD_NONBLOCK,
-			.num_properties = sizeof(properties) / 16,
-			.properties_ptr = to_user_pointer(properties),
-		};
-		int stream_fd;
-
-		write_u64_file("/proc/sys/dev/i915/perf_stream_paranoid", 0);
-
-		igt_drop_root();
-
-		stream_fd = __perf_open(drm_fd, &param);
-		close(stream_fd);
-	}
-
-	igt_waitchildren();
-
-	/* leave in paranoid state */
-	write_u64_file("/proc/sys/dev/i915/perf_stream_paranoid", 1);
-}
-
-static void
-test_invalid_open_flags(void)
-{
-	uint64_t properties[] = {
-		/* Include OA reports in samples */
-		DRM_I915_PERF_PROP_SAMPLE_OA, true,
-
-		/* OA unit configuration */
-		DRM_I915_PERF_PROP_OA_METRICS_SET, test_metric_set_id,
-		DRM_I915_PERF_PROP_OA_FORMAT, test_oa_format,
-		DRM_I915_PERF_PROP_OA_EXPONENT, oa_exp_1_millisec,
-	};
-	struct drm_i915_perf_open_param param = {
-		.flags = ~0, /* Undefined flag bits set! */
-		.num_properties = sizeof(properties) / 16,
-		.properties_ptr = to_user_pointer(properties),
-	};
-
-	do_ioctl_err(drm_fd, DRM_IOCTL_I915_PERF_OPEN, &param, EINVAL);
-}
-
-static void
-test_invalid_oa_metric_set_id(void)
-{
-	uint64_t properties[] = {
-		/* Include OA reports in samples */
-		DRM_I915_PERF_PROP_SAMPLE_OA, true,
-
-		/* OA unit configuration */
-		DRM_I915_PERF_PROP_OA_FORMAT, test_oa_format,
-		DRM_I915_PERF_PROP_OA_EXPONENT, oa_exp_1_millisec,
-		DRM_I915_PERF_PROP_OA_METRICS_SET, UINT64_MAX,
-	};
-	struct drm_i915_perf_open_param param = {
-		.flags = I915_PERF_FLAG_FD_CLOEXEC |
-			I915_PERF_FLAG_FD_NONBLOCK,
-		.num_properties = sizeof(properties) / 16,
-		.properties_ptr = to_user_pointer(properties),
-	};
-	int stream_fd;
-
-	do_ioctl_err(drm_fd, DRM_IOCTL_I915_PERF_OPEN, &param, EINVAL);
-
-	properties[ARRAY_SIZE(properties) - 1] = 0; /* ID 0 is also be reserved as invalid */
-	do_ioctl_err(drm_fd, DRM_IOCTL_I915_PERF_OPEN, &param, EINVAL);
-
-	/* Check that we aren't just seeing false positives... */
-	properties[ARRAY_SIZE(properties) - 1] = test_metric_set_id;
-	stream_fd = __perf_open(drm_fd, &param);
-	close(stream_fd);
-
-	/* There's no valid default OA metric set ID... */
-	param.num_properties--;
-	do_ioctl_err(drm_fd, DRM_IOCTL_I915_PERF_OPEN, &param, EINVAL);
-}
-
-static void
-test_invalid_oa_format_id(void)
-{
-	uint64_t properties[] = {
-		/* Include OA reports in samples */
-		DRM_I915_PERF_PROP_SAMPLE_OA, true,
-
-		/* OA unit configuration */
-		DRM_I915_PERF_PROP_OA_METRICS_SET, test_metric_set_id,
-		DRM_I915_PERF_PROP_OA_EXPONENT, oa_exp_1_millisec,
-		DRM_I915_PERF_PROP_OA_FORMAT, UINT64_MAX,
-	};
-	struct drm_i915_perf_open_param param = {
-		.flags = I915_PERF_FLAG_FD_CLOEXEC |
-			I915_PERF_FLAG_FD_NONBLOCK,
-		.num_properties = sizeof(properties) / 16,
-		.properties_ptr = to_user_pointer(properties),
-	};
-	int stream_fd;
-
-	do_ioctl_err(drm_fd, DRM_IOCTL_I915_PERF_OPEN, &param, EINVAL);
-
-	properties[ARRAY_SIZE(properties) - 1] = 0; /* ID 0 is also be reserved as invalid */
-	do_ioctl_err(drm_fd, DRM_IOCTL_I915_PERF_OPEN, &param, EINVAL);
-
-	/* Check that we aren't just seeing false positives... */
-	properties[ARRAY_SIZE(properties) - 1] = test_oa_format;
-	stream_fd = __perf_open(drm_fd, &param);
-	close(stream_fd);
-
-	/* There's no valid default OA format... */
-	param.num_properties--;
-	do_ioctl_err(drm_fd, DRM_IOCTL_I915_PERF_OPEN, &param, EINVAL);
-}
-
-static void
-test_missing_sample_flags(void)
-{
-	uint64_t properties[] = {
-		/* No _PROP_SAMPLE_xyz flags */
-
-		/* OA unit configuration */
-		DRM_I915_PERF_PROP_OA_METRICS_SET, test_metric_set_id,
-		DRM_I915_PERF_PROP_OA_EXPONENT, oa_exp_1_millisec,
-		DRM_I915_PERF_PROP_OA_FORMAT, test_oa_format,
-	};
-	struct drm_i915_perf_open_param param = {
-		.flags = I915_PERF_FLAG_FD_CLOEXEC,
-		.num_properties = sizeof(properties) / 16,
-		.properties_ptr = to_user_pointer(properties),
-	};
-
-	do_ioctl_err(drm_fd, DRM_IOCTL_I915_PERF_OPEN, &param, EINVAL);
-}
-
-static void
-read_2_oa_reports(int stream_fd,
-		  int format_id,
-		  int exponent,
-		  uint32_t *oa_report0,
-		  uint32_t *oa_report1,
-		  bool timer_only)
-{
-	size_t format_size = oa_formats[format_id].size;
-	size_t sample_size = (sizeof(struct drm_i915_perf_record_header) +
-			      format_size);
-	const struct drm_i915_perf_record_header *header;
-	uint32_t exponent_mask = (1 << (exponent + 1)) - 1;
-
-	/* Note: we allocate a large buffer so that each read() iteration
-	 * should scrape *all* pending records.
-	 *
-	 * The largest buffer the OA unit supports is 16MB and the smallest
-	 * OA report format is 64bytes allowing up to 262144 reports to
-	 * be buffered.
-	 *
-	 * Being sure we are fetching all buffered reports allows us to
-	 * potentially throw away / skip all reports whenever we see
-	 * a _REPORT_LOST notification as a way of being sure are
-	 * measurements aren't skewed by a lost report.
-	 *
-	 * Note: that is is useful for some tests but also not something
-	 * applications would be expected to resort to. Lost reports are
-	 * somewhat unpredictable but typically don't pose a problem - except
-	 * to indicate that the OA unit may be over taxed if lots of reports
-	 * are being lost.
-	 */
-	int buf_size = 262144 * (64 + sizeof(struct drm_i915_perf_record_header));
-	uint8_t *buf = malloc(buf_size);
-	int n = 0;
-
-	for (int i = 0; i < 1000; i++) {
-		ssize_t len;
-
-		while ((len = read(stream_fd, buf, buf_size)) < 0 &&
-		       errno == EINTR)
-			;
-
-		igt_assert(len > 0);
-
-		for (size_t offset = 0; offset < len; offset += header->size) {
-			const uint32_t *report;
-
-			header = (void *)(buf + offset);
-
-			igt_assert_eq(header->pad, 0); /* Reserved */
-
-			/* Currently the only test that should ever expect to
-			 * see a _BUFFER_LOST error is the buffer_fill test,
-			 * otherwise something bad has probably happened...
-			 */
-			igt_assert_neq(header->type, DRM_I915_PERF_RECORD_OA_BUFFER_LOST);
-
-			/* At high sampling frequencies the OA HW might not be
-			 * able to cope with all write requests and will notify
-			 * us that a report was lost. We restart our read of
-			 * two sequential reports due to the timeline blip this
-			 * implies
-			 */
-			if (header->type == DRM_I915_PERF_RECORD_OA_REPORT_LOST) {
-				igt_debug("read restart: OA trigger collision / report lost\n");
-				n = 0;
-
-				/* XXX: break, because we don't know where
-				 * within the series of already read reports
-				 * there could be a blip from the lost report.
-				 */
-				break;
-			}
-
-			/* Currently the only other record type expected is a
-			 * _SAMPLE. Notably this test will need updating if
-			 * i915-perf is extended in the future with additional
-			 * record types.
-			 */
-			igt_assert_eq(header->type, DRM_I915_PERF_RECORD_SAMPLE);
-
-			igt_assert_eq(header->size, sample_size);
-
-			report = (const void *)(header + 1);
-
-			igt_debug("read report: reason = %x, timestamp = %x, exponent mask=%x\n",
-				  report[0], report[1], exponent_mask);
-
-			/* Don't expect zero for timestamps */
-			igt_assert_neq(report[1], 0);
-
-			if (timer_only) {
-				if (!oa_report_is_periodic(exponent, report)) {
-					igt_debug("skipping non timer report\n");
-					continue;
-				}
-			}
-
-			if (n++ == 0)
-				memcpy(oa_report0, report, format_size);
-			else {
-				memcpy(oa_report1, report, format_size);
-				free(buf);
-				return;
-			}
-		}
-	}
-
-	free(buf);
-
-	igt_assert(!"reached");
-}
-
-static void
-open_and_read_2_oa_reports(int format_id,
-			   int exponent,
-			   uint32_t *oa_report0,
-			   uint32_t *oa_report1,
-			   bool timer_only)
-{
-	uint64_t properties[] = {
-		/* Include OA reports in samples */
-		DRM_I915_PERF_PROP_SAMPLE_OA, true,
-
-		/* OA unit configuration */
-		DRM_I915_PERF_PROP_OA_METRICS_SET, test_metric_set_id,
-		DRM_I915_PERF_PROP_OA_FORMAT, format_id,
-		DRM_I915_PERF_PROP_OA_EXPONENT, exponent,
-
-	};
-	struct drm_i915_perf_open_param param = {
-		.flags = I915_PERF_FLAG_FD_CLOEXEC,
-		.num_properties = sizeof(properties) / 16,
-		.properties_ptr = to_user_pointer(properties),
-	};
-	int stream_fd = __perf_open(drm_fd, &param);
-
-	read_2_oa_reports(stream_fd, format_id, exponent,
-			  oa_report0, oa_report1, timer_only);
-
-	close(stream_fd);
-}
-
-static void
-gen8_read_report_clock_ratios(uint32_t *report,
-			      uint32_t *slice_freq_mhz,
-			      uint32_t *unslice_freq_mhz)
-{
-	uint32_t unslice_freq = report[0] & 0x1ff;
-	uint32_t slice_freq_low = (report[0] >> 25) & 0x7f;
-	uint32_t slice_freq_high = (report[0] >> 9) & 0x3;
-	uint32_t slice_freq = slice_freq_low | (slice_freq_high << 7);
-
-	*slice_freq_mhz = (slice_freq * 16666) / 1000;
-	*unslice_freq_mhz = (unslice_freq * 16666) / 1000;
-}
-
-static void
-print_reports(uint32_t *oa_report0, uint32_t *oa_report1, int fmt)
-{
-	igt_debug("TIMESTAMP: 1st = %"PRIu32", 2nd = %"PRIu32", delta = %"PRIu32"\n",
-		  oa_report0[1], oa_report1[1], oa_report1[1] - oa_report0[1]);
-
-	if (IS_HASWELL(devid) && oa_formats[fmt].n_c == 0) {
-		igt_debug("CLOCK = N/A\n");
-	} else {
-		uint32_t clock0 = read_report_ticks(oa_report0, fmt);
-		uint32_t clock1 = read_report_ticks(oa_report1, fmt);
-
-		igt_debug("CLOCK: 1st = %"PRIu32", 2nd = %"PRIu32", delta = %"PRIu32"\n",
-			  clock0, clock1, clock1 - clock0);
-	}
-
-	if (intel_gen(devid) >= 8) {
-		uint32_t slice_freq0, slice_freq1, unslice_freq0, unslice_freq1;
-		const char *reason0 = gen8_read_report_reason(oa_report0);
-		const char *reason1 = gen8_read_report_reason(oa_report1);
-
-		igt_debug("CTX ID: 1st = %"PRIu32", 2nd = %"PRIu32"\n",
-			  oa_report0[2], oa_report1[2]);
-
-		gen8_read_report_clock_ratios(oa_report0,
-					      &slice_freq0, &unslice_freq0);
-		gen8_read_report_clock_ratios(oa_report1,
-					      &slice_freq1, &unslice_freq1);
-
-		igt_debug("SLICE CLK: 1st = %umhz, 2nd = %umhz, delta = %d\n",
-			  slice_freq0, slice_freq1,
-			  ((int)slice_freq1 - (int)slice_freq0));
-		igt_debug("UNSLICE CLK: 1st = %umhz, 2nd = %umhz, delta = %d\n",
-			  unslice_freq0, unslice_freq1,
-			  ((int)unslice_freq1 - (int)unslice_freq0));
-
-		igt_debug("REASONS: 1st = \"%s\", 2nd = \"%s\"\n", reason0, reason1);
-	}
-
-	/* Gen8+ has some 40bit A counters... */
-	for (int j = 0; j < oa_formats[fmt].n_a40; j++) {
-		uint64_t value0 = gen8_read_40bit_a_counter(oa_report0, fmt, j);
-		uint64_t value1 = gen8_read_40bit_a_counter(oa_report1, fmt, j);
-		uint64_t delta = gen8_40bit_a_delta(value0, value1);
-
-		if (undefined_a_counters[j])
-			continue;
-
-		igt_debug("A%d: 1st = %"PRIu64", 2nd = %"PRIu64", delta = %"PRIu64"\n",
-			  j, value0, value1, delta);
-	}
-
-	for (int j = 0; j < oa_formats[fmt].n_a; j++) {
-		uint32_t *a0 = (uint32_t *)(((uint8_t *)oa_report0) +
-					    oa_formats[fmt].a_off);
-		uint32_t *a1 = (uint32_t *)(((uint8_t *)oa_report1) +
-					    oa_formats[fmt].a_off);
-		int a_id = oa_formats[fmt].first_a + j;
-		uint32_t delta = a1[j] - a0[j];
-
-		if (undefined_a_counters[a_id])
-			continue;
-
-		igt_debug("A%d: 1st = %"PRIu32", 2nd = %"PRIu32", delta = %"PRIu32"\n",
-			  a_id, a0[j], a1[j], delta);
-	}
-
-	for (int j = 0; j < oa_formats[fmt].n_b; j++) {
-		uint32_t *b0 = (uint32_t *)(((uint8_t *)oa_report0) +
-					    oa_formats[fmt].b_off);
-		uint32_t *b1 = (uint32_t *)(((uint8_t *)oa_report1) +
-					    oa_formats[fmt].b_off);
-		uint32_t delta = b1[j] - b0[j];
-
-		igt_debug("B%d: 1st = %"PRIu32", 2nd = %"PRIu32", delta = %"PRIu32"\n",
-			  j, b0[j], b1[j], delta);
-	}
-
-	for (int j = 0; j < oa_formats[fmt].n_c; j++) {
-		uint32_t *c0 = (uint32_t *)(((uint8_t *)oa_report0) +
-					    oa_formats[fmt].c_off);
-		uint32_t *c1 = (uint32_t *)(((uint8_t *)oa_report1) +
-					    oa_formats[fmt].c_off);
-		uint32_t delta = c1[j] - c0[j];
-
-		igt_debug("C%d: 1st = %"PRIu32", 2nd = %"PRIu32", delta = %"PRIu32"\n",
-			  j, c0[j], c1[j], delta);
-	}
-}
-
-static void
-test_oa_formats(void)
-{
-	for (int i = 0; i < ARRAY_SIZE(oa_formats); i++) {
-		uint32_t oa_report0[64];
-		uint32_t oa_report1[64];
-
-		if (!oa_formats[i].name) /* sparse, indexed by ID */
-			continue;
-
-		if (oa_formats[i].min_gen &&
-		    intel_gen(devid) < oa_formats[i].min_gen) {
-			igt_debug("skipping unsupported OA format %s\n",
-				  oa_formats[i].name);
-			continue;
-		}
-
-		if (oa_formats[i].max_gen &&
-		    intel_gen(devid) > oa_formats[i].max_gen) {
-			igt_debug("skipping unsupported OA format %s\n",
-				  oa_formats[i].name);
-			continue;
-		}
-
-		igt_debug("Checking OA format %s\n", oa_formats[i].name);
-
-		open_and_read_2_oa_reports(i,
-					   oa_exp_1_millisec,
-					   oa_report0,
-					   oa_report1,
-					   false); /* timer reports only */
-
-		print_reports(oa_report0, oa_report1, i);
-		sanity_check_reports(oa_report0, oa_report1, i);
-	}
-}
-
-static void
-test_oa_exponents(int gt_freq_mhz)
-{
-	uint32_t freq_margin;
-
-	/* This test tries to use the sysfs interface for pinning the GT
-	 * frequency so we have another point of reference for comparing with
-	 * the clock frequency as derived from OA reports.
-	 *
-	 * This test has been finicky to stabilise while the
-	 * gt_min/max_freq_mhz files in sysfs don't seem to be a reliable
-	 * mechanism for fixing the gpu frequency.
-	 *
-	 * Since these unit tests are focused on the OA unit not the ability to
-	 * pin the frequency via sysfs we make the test account for pinning not
-	 * being reliable and read back the current frequency for each
-	 * iteration of this test to take this into account.
-	 */
-	gt_frequency_pin(gt_freq_mhz);
-
-	igt_debug("Testing OA timer exponents with requested GT frequency = %dmhz\n",
-		  gt_freq_mhz);
-
-	/* allow a +- 10% error margin when checking that the frequency
-	 * calculated from the OA reports matches the frequency according to
-	 * sysfs.
-	 */
-	freq_margin = gt_freq_mhz * 0.1;
-
-	/* It's asking a lot to sample with a 160 nanosecond period and the
-	 * test can fail due to buffer overflows if it wasn't possible to
-	 * keep up, so we don't start from an exponent of zero...
-	 */
-	for (int i = 5; i < 20; i++) {
-		uint32_t expected_timestamp_delta;
-		uint32_t timestamp_delta;
-		uint32_t oa_report0[64];
-		uint32_t oa_report1[64];
-		uint32_t time_delta;
-		uint32_t clock_delta;
-		uint32_t freq;
-		int n_tested = 0;
-		int n_freq_matches = 0;
-
-		/* The exponent is effectively selecting a bit in the timestamp
-		 * to trigger reports on and so in practice we expect the raw
-		 * timestamp deltas for periodic reports to exactly match the
-		 * value of next bit.
-		 */
-		expected_timestamp_delta = 2 << i;
-
-		for (int j = 0; n_tested < 10 && j < 100; j++) {
-			int gt_freq_mhz_0, gt_freq_mhz_1;
-			uint32_t ticks0, ticks1;
-
-			gt_freq_mhz_0 = sysfs_read("gt_act_freq_mhz");
-
-			igt_debug("ITER %d: testing OA exponent %d (period = %"PRIu64"ns) with sysfs GT freq = %dmhz +- %u\n",
-				  j, i,
-				  oa_exponent_to_ns(i),
-				  gt_freq_mhz_0, freq_margin);
-
-			open_and_read_2_oa_reports(test_oa_format,
-						   i, /* exponent */
-						   oa_report0,
-						   oa_report1,
-						   true); /* timer triggered
-							     reports only */
-
-			gt_freq_mhz_1 = sysfs_read("gt_act_freq_mhz");
-
-			/* If it looks like the frequency has changed according
-			 * to sysfs then skip looking at this pair of reports
-			 */
-			if (gt_freq_mhz_0 != gt_freq_mhz_1) {
-				igt_debug("skipping OA reports pair due to GT frequency change according to sysfs\n");
-				continue;
-			}
-
-			timestamp_delta = oa_report1[1] - oa_report0[1];
-			igt_assert_neq(timestamp_delta, 0);
-
-			if (timestamp_delta != expected_timestamp_delta) {
-				igt_debug("timestamp0 = %u/0x%x\n",
-					  oa_report0[1], oa_report0[1]);
-				igt_debug("timestamp1 = %u/0x%x\n",
-					  oa_report1[1], oa_report1[1]);
-			}
-
-			igt_assert_eq(timestamp_delta, expected_timestamp_delta);
-
-			ticks0 = read_report_ticks(oa_report0, test_oa_format);
-			ticks1 = read_report_ticks(oa_report1, test_oa_format);
-			clock_delta = ticks1 - ticks0;
-
-			time_delta = timebase_scale(timestamp_delta);
-
-			freq = ((uint64_t)clock_delta * 1000) / time_delta;
-			igt_debug("ITER %d: time delta = %"PRIu32"(ns) clock delta = %"PRIu32" freq = %"PRIu32"(mhz)\n",
-				  j, time_delta, clock_delta, freq);
-
-                        if (freq < (gt_freq_mhz_1 + freq_margin) &&
-                            freq > (gt_freq_mhz_1 - freq_margin))
-				n_freq_matches++;
-
-			n_tested++;
-		}
-
-		if (n_tested < 10)
-			igt_debug("sysfs frequency pinning too unstable for cross-referencing with OA derived frequency");
-		igt_assert_eq(n_tested, 10);
-
-		igt_debug("number of iterations with expected clock frequency = %d\n",
-			  n_freq_matches);
-
-		/* Don't assert the calculated frequency for extremely short
-		 * durations.
-		 *
-		 * Allow some mismatches since can't be can't be sure about
-		 * frequency changes between sysfs reads.
-		 */
-		if (i > 3)
-			igt_assert(n_freq_matches >= 7);
-	}
-
-	gt_frequency_range_restore();
-}
-
-/* The OA exponent selects a timestamp counter bit to trigger reports on.
- *
- * With a 64bit timestamp and least significant bit approx == 80ns then the MSB
- * equates to > 40 thousand years and isn't exposed via the i915 perf interface.
- *
- * The max exponent exposed is expected to be 31, which is still a fairly
- * ridiculous period (>5min) but is the maximum exponent where it's still
- * possible to use periodic sampling as a means for tracking the overflow of
- * 32bit OA report timestamps.
- */
-static void
-test_invalid_oa_exponent(void)
-{
-	uint64_t properties[] = {
-		/* Include OA reports in samples */
-		DRM_I915_PERF_PROP_SAMPLE_OA, true,
-
-		/* OA unit configuration */
-		DRM_I915_PERF_PROP_OA_METRICS_SET, test_metric_set_id,
-		DRM_I915_PERF_PROP_OA_FORMAT, test_oa_format,
-		DRM_I915_PERF_PROP_OA_EXPONENT, 31, /* maximum exponent expected
-						       to be accepted */
-	};
-	struct drm_i915_perf_open_param param = {
-		.flags = I915_PERF_FLAG_FD_CLOEXEC,
-		.num_properties = sizeof(properties) / 16,
-		.properties_ptr = to_user_pointer(properties),
-	};
-	int stream_fd = __perf_open(drm_fd, &param);
-
-	close(stream_fd);
-
-	for (int i = 32; i < 65; i++) {
-		properties[7] = i;
-		do_ioctl_err(drm_fd, DRM_IOCTL_I915_PERF_OPEN, &param, EINVAL);
-	}
-}
-
-/* The lowest periodic sampling exponent equates to a period of 160 nanoseconds
- * or a frequency of 6.25MHz which is only possible to request as root by
- * default. By default the maximum OA sampling rate is 100KHz
- */
-static void
-test_low_oa_exponent_permissions(void)
-{
-	int max_freq = read_u64_file("/proc/sys/dev/i915/oa_max_sample_rate");
-	int bad_exponent = max_oa_exponent_for_freq_gt(max_freq);
-	int ok_exponent = bad_exponent + 1;
-	uint64_t properties[] = {
-		/* Include OA reports in samples */
-		DRM_I915_PERF_PROP_SAMPLE_OA, true,
-
-		/* OA unit configuration */
-		DRM_I915_PERF_PROP_OA_METRICS_SET, test_metric_set_id,
-		DRM_I915_PERF_PROP_OA_FORMAT, test_oa_format,
-		DRM_I915_PERF_PROP_OA_EXPONENT, bad_exponent,
-	};
-	struct drm_i915_perf_open_param param = {
-		.flags = I915_PERF_FLAG_FD_CLOEXEC,
-		.num_properties = sizeof(properties) / 16,
-		.properties_ptr = to_user_pointer(properties),
-	};
-	uint64_t oa_period, oa_freq;
-
-	igt_assert_eq(max_freq, 100000);
-
-	/* Avoid EACCES errors opening a stream without CAP_SYS_ADMIN */
-	write_u64_file("/proc/sys/dev/i915/perf_stream_paranoid", 0);
-
-	igt_fork(child, 1) {
-		igt_drop_root();
-
-		do_ioctl_err(drm_fd, DRM_IOCTL_I915_PERF_OPEN, &param, EACCES);
-	}
-
-	igt_waitchildren();
-
-	properties[7] = ok_exponent;
-
-	igt_fork(child, 1) {
-		int stream_fd;
-
-		igt_drop_root();
-
-		stream_fd = __perf_open(drm_fd, &param);
-		close(stream_fd);
-	}
-
-	igt_waitchildren();
-
-	oa_period = timebase_scale(2 << ok_exponent);
-	oa_freq = NSEC_PER_SEC / oa_period;
-	write_u64_file("/proc/sys/dev/i915/oa_max_sample_rate", oa_freq - 100);
-
-	igt_fork(child, 1) {
-		igt_drop_root();
-
-		do_ioctl_err(drm_fd, DRM_IOCTL_I915_PERF_OPEN, &param, EACCES);
-	}
-
-	igt_waitchildren();
-
-	/* restore the defaults */
-	write_u64_file("/proc/sys/dev/i915/oa_max_sample_rate", 100000);
-	write_u64_file("/proc/sys/dev/i915/perf_stream_paranoid", 1);
-}
-
-static void
-test_per_context_mode_unprivileged(void)
-{
-	uint64_t properties[] = {
-		/* Single context sampling */
-		DRM_I915_PERF_PROP_CTX_HANDLE, UINT64_MAX, /* updated below */
-
-		/* Include OA reports in samples */
-		DRM_I915_PERF_PROP_SAMPLE_OA, true,
-
-		/* OA unit configuration */
-		DRM_I915_PERF_PROP_OA_METRICS_SET, test_metric_set_id,
-		DRM_I915_PERF_PROP_OA_FORMAT, test_oa_format,
-		DRM_I915_PERF_PROP_OA_EXPONENT, oa_exp_1_millisec,
-	};
-	struct drm_i915_perf_open_param param = {
-		.flags = I915_PERF_FLAG_FD_CLOEXEC,
-		.num_properties = sizeof(properties) / 16,
-		.properties_ptr = to_user_pointer(properties),
-	};
-
-	/* should be default, but just to be sure... */
-	write_u64_file("/proc/sys/dev/i915/perf_stream_paranoid", 1);
-
-	igt_fork(child, 1) {
-		drm_intel_context *context;
-		drm_intel_bufmgr *bufmgr;
-		int stream_fd;
-		uint32_t ctx_id = 0xffffffff; /* invalid id */
-		int ret;
-
-		igt_drop_root();
-
-		bufmgr = drm_intel_bufmgr_gem_init(drm_fd, 4096);
-		context = drm_intel_gem_context_create(bufmgr);
-
-		igt_assert(context);
-
-		ret = drm_intel_gem_context_get_id(context, &ctx_id);
-		igt_assert_eq(ret, 0);
-		igt_assert_neq(ctx_id, 0xffffffff);
-
-		properties[1] = ctx_id;
-
-		stream_fd = __perf_open(drm_fd, &param);
-		close(stream_fd);
-
-		drm_intel_gem_context_destroy(context);
-		drm_intel_bufmgr_destroy(bufmgr);
-	}
-
-	igt_waitchildren();
-}
-
-static int64_t
-get_time(void)
-{
-	struct timespec ts;
-
-	clock_gettime(CLOCK_MONOTONIC, &ts);
-
-	return ts.tv_sec * 1000000000 + ts.tv_nsec;
-}
-
-/* Note: The interface doesn't currently provide strict guarantees or control
- * over the upper bound for how long it might take for a POLLIN event after
- * some OA report is written by the OA unit.
- *
- * The plan is to add a property later that gives some control over the maximum
- * latency, but for now we expect it is tuned for a fairly low latency
- * suitable for applications wanting to provide live feedback for captured
- * metrics.
- *
- * At the time of writing this test the driver was using a fixed 200Hz hrtimer
- * regardless of the OA sampling exponent.
- *
- * There is no lower bound since a stream configured for periodic sampling may
- * still contain other automatically triggered reports.
- *
- * What we try and check for here is that blocking reads don't return EAGAIN
- * and that we aren't spending any significant time burning the cpu in
- * kernelspace.
- */
-static void
-test_blocking(void)
-{
-	/* ~40 milliseconds
-	 *
-	 * Having a period somewhat > sysconf(_SC_CLK_TCK) helps to stop
-	 * scheduling (liable to kick in when we make blocking poll()s/reads)
-	 * from interfering with the test.
-	 */
-	int oa_exponent = max_oa_exponent_for_period_lte(40000000);
-	uint64_t oa_period = oa_exponent_to_ns(oa_exponent);
-	uint64_t properties[] = {
-		/* Include OA reports in samples */
-		DRM_I915_PERF_PROP_SAMPLE_OA, true,
-
-		/* OA unit configuration */
-		DRM_I915_PERF_PROP_OA_METRICS_SET, test_metric_set_id,
-		DRM_I915_PERF_PROP_OA_FORMAT, test_oa_format,
-		DRM_I915_PERF_PROP_OA_EXPONENT, oa_exponent,
-	};
-	struct drm_i915_perf_open_param param = {
-		.flags = I915_PERF_FLAG_FD_CLOEXEC,
-		.num_properties = sizeof(properties) / 16,
-		.properties_ptr = to_user_pointer(properties),
-	};
-	int stream_fd = __perf_open(drm_fd, &param);
-	uint8_t buf[1024 * 1024];
-	struct tms start_times;
-	struct tms end_times;
-	int64_t user_ns, kernel_ns;
-	int64_t tick_ns = 1000000000 / sysconf(_SC_CLK_TCK);
-	int64_t test_duration_ns = tick_ns * 1000;
-
-	int max_iterations = (test_duration_ns / oa_period) + 1;
-	int n_extra_iterations = 0;
-
-	/* It's a bit tricky to put a lower limit here, but we expect a
-	 * relatively low latency for seeing reports, while we don't currently
-	 * give any control over this in the api.
-	 *
-	 * We assume a maximum latency of 6 millisecond to deliver a POLLIN and
-	 * read() after a new sample is written (46ms per iteration) considering
-	 * the knowledge that that the driver uses a 200Hz hrtimer (5ms period)
-	 * to check for data and giving some time to read().
-	 */
-	int min_iterations = (test_duration_ns / (oa_period + 6000000ull));
-
-	int64_t start;
-	int n = 0;
-
-	times(&start_times);
-
-	igt_debug("tick length = %dns, test duration = %"PRIu64"ns, min iter. = %d, max iter. = %d\n",
-		  (int)tick_ns, test_duration_ns,
-		  min_iterations, max_iterations);
-
-	/* In the loop we perform blocking polls while the HW is sampling at
-	 * ~25Hz, with the expectation that we spend most of our time blocked
-	 * in the kernel, and shouldn't be burning cpu cycles in the kernel in
-	 * association with this process (verified by looking at stime before
-	 * and after loop).
-	 *
-	 * We're looking to assert that less than 1% of the test duration is
-	 * spent in the kernel dealing with polling and read()ing.
-	 *
-	 * The test runs for a relatively long time considering the very low
-	 * resolution of stime in ticks of typically 10 milliseconds. Since we
-	 * don't know the fractional part of tick values we read from userspace
-	 * so our minimum threshold needs to be >= one tick since any
-	 * measurement might really be +- tick_ns (assuming we effectively get
-	 * floor(real_stime)).
-	 *
-	 * We Loop for 1000 x tick_ns so one tick corresponds to 0.1%
-	 */
-	for (start = get_time(); (get_time() - start) < test_duration_ns; /* nop */) {
-		struct drm_i915_perf_record_header *header;
-		bool timer_report_read = false;
-		bool non_timer_report_read = false;
-		int ret;
-
-		while ((ret = read(stream_fd, buf, sizeof(buf))) < 0 &&
-		       errno == EINTR)
-			;
-
-		igt_assert(ret > 0);
-
-		/* For Haswell reports don't contain a well defined reason
-		 * field we so assume all reports to be 'periodic'. For gen8+
-		 * we want to to consider that the HW automatically writes some
-		 * non periodic reports (e.g. on context switch) which might
-		 * lead to more successful read()s than expected due to
-		 * periodic sampling and we don't want these extra reads to
-		 * cause the test to fail...
-		 */
-		if (intel_gen(devid) >= 8) {
-			for (int offset = 0; offset < ret; offset += header->size) {
-				header = (void *)(buf + offset);
-
-				if (header->type == DRM_I915_PERF_RECORD_SAMPLE) {
-					uint32_t *report = (void *)(header + 1);
-
-					if (oa_report_is_periodic(oa_exponent,
-								  report))
-						timer_report_read = true;
-					else
-						non_timer_report_read = true;
-				}
-			}
-		}
-
-		if (non_timer_report_read && !timer_report_read)
-			n_extra_iterations++;
-
-		n++;
-	}
-
-	times(&end_times);
-
-	/* Using nanosecond units is fairly silly here, given the tick in-
-	 * precision - ah well, it's consistent with the get_time() units.
-	 */
-	user_ns = (end_times.tms_utime - start_times.tms_utime) * tick_ns;
-	kernel_ns = (end_times.tms_stime - start_times.tms_stime) * tick_ns;
-
-	igt_debug("%d blocking reads during test with ~25Hz OA sampling (expect no more than %d)\n",
-		  n, max_iterations);
-	igt_debug("%d extra iterations seen, not related to periodic sampling (e.g. context switches)\n",
-		  n_extra_iterations);
-	igt_debug("time in userspace = %"PRIu64"ns (+-%dns) (start utime = %d, end = %d)\n",
-		  user_ns, (int)tick_ns,
-		  (int)start_times.tms_utime, (int)end_times.tms_utime);
-	igt_debug("time in kernelspace = %"PRIu64"ns (+-%dns) (start stime = %d, end = %d)\n",
-		  kernel_ns, (int)tick_ns,
-		  (int)start_times.tms_stime, (int)end_times.tms_stime);
-
-	/* With completely broken blocking (but also not returning an error) we
-	 * could end up with an open loop,
-	 */
-	igt_assert(n <= (max_iterations + n_extra_iterations));
-
-	/* Make sure the driver is reporting new samples with a reasonably
-	 * low latency...
-	 */
-	igt_assert(n > (min_iterations + n_extra_iterations));
-
-	igt_assert(kernel_ns <= (test_duration_ns / 100ull));
-
-	close(stream_fd);
-}
-
-static void
-test_polling(void)
-{
-	/* ~40 milliseconds
-	 *
-	 * Having a period somewhat > sysconf(_SC_CLK_TCK) helps to stop
-	 * scheduling (liable to kick in when we make blocking poll()s/reads)
-	 * from interfering with the test.
-	 */
-	int oa_exponent = max_oa_exponent_for_period_lte(40000000);
-	uint64_t oa_period = oa_exponent_to_ns(oa_exponent);
-	uint64_t properties[] = {
-		/* Include OA reports in samples */
-		DRM_I915_PERF_PROP_SAMPLE_OA, true,
-
-		/* OA unit configuration */
-		DRM_I915_PERF_PROP_OA_METRICS_SET, test_metric_set_id,
-		DRM_I915_PERF_PROP_OA_FORMAT, test_oa_format,
-		DRM_I915_PERF_PROP_OA_EXPONENT, oa_exponent,
-	};
-	struct drm_i915_perf_open_param param = {
-		.flags = I915_PERF_FLAG_FD_CLOEXEC |
-			I915_PERF_FLAG_FD_NONBLOCK,
-		.num_properties = sizeof(properties) / 16,
-		.properties_ptr = to_user_pointer(properties),
-	};
-	int stream_fd = __perf_open(drm_fd, &param);
-	uint8_t buf[1024 * 1024];
-	struct tms start_times;
-	struct tms end_times;
-	int64_t user_ns, kernel_ns;
-	int64_t tick_ns = 1000000000 / sysconf(_SC_CLK_TCK);
-	int64_t test_duration_ns = tick_ns * 1000;
-
-	int max_iterations = (test_duration_ns / oa_period) + 1;
-	int n_extra_iterations = 0;
-
-	/* It's a bit tricky to put a lower limit here, but we expect a
-	 * relatively low latency for seeing reports, while we don't currently
-	 * give any control over this in the api.
-	 *
-	 * We assume a maximum latency of 6 millisecond to deliver a POLLIN and
-	 * read() after a new sample is written (46ms per iteration) considering
-	 * the knowledge that that the driver uses a 200Hz hrtimer (5ms period)
-	 * to check for data and giving some time to read().
-	 */
-	int min_iterations = (test_duration_ns / (oa_period + 6000000ull));
-	int64_t start;
-	int n = 0;
-
-	times(&start_times);
-
-	igt_debug("tick length = %dns, test duration = %"PRIu64"ns, min iter. = %d, max iter. = %d\n",
-		  (int)tick_ns, test_duration_ns,
-		  min_iterations, max_iterations);
-
-	/* In the loop we perform blocking polls while the HW is sampling at
-	 * ~25Hz, with the expectation that we spend most of our time blocked
-	 * in the kernel, and shouldn't be burning cpu cycles in the kernel in
-	 * association with this process (verified by looking at stime before
-	 * and after loop).
-	 *
-	 * We're looking to assert that less than 1% of the test duration is
-	 * spent in the kernel dealing with polling and read()ing.
-	 *
-	 * The test runs for a relatively long time considering the very low
-	 * resolution of stime in ticks of typically 10 milliseconds. Since we
-	 * don't know the fractional part of tick values we read from userspace
-	 * so our minimum threshold needs to be >= one tick since any
-	 * measurement might really be +- tick_ns (assuming we effectively get
-	 * floor(real_stime)).
-	 *
-	 * We Loop for 1000 x tick_ns so one tick corresponds to 0.1%
-	 */
-	for (start = get_time(); (get_time() - start) < test_duration_ns; /* nop */) {
-		struct pollfd pollfd = { .fd = stream_fd, .events = POLLIN };
-		struct drm_i915_perf_record_header *header;
-		bool timer_report_read = false;
-		bool non_timer_report_read = false;
-		int ret;
-
-		while ((ret = poll(&pollfd, 1, -1)) < 0 &&
-		       errno == EINTR)
-			;
-		igt_assert_eq(ret, 1);
-		igt_assert(pollfd.revents & POLLIN);
-
-		while ((ret = read(stream_fd, buf, sizeof(buf))) < 0 &&
-		       errno == EINTR)
-			;
-
-		/* Don't expect to see EAGAIN if we've had a POLLIN event
-		 *
-		 * XXX: actually this is technically overly strict since we do
-		 * knowingly allow false positive POLLIN events. At least in
-		 * the future when supporting context filtering of metrics for
-		 * Gen8+ handled in the kernel then POLLIN events may be
-		 * delivered when we know there are pending reports to process
-		 * but before we've done any filtering to know for certain that
-		 * any reports are destined to be copied to userspace.
-		 *
-		 * Still, for now it's a reasonable sanity check.
-		 */
-		if (ret < 0)
-			igt_debug("Unexpected error when reading after poll = %d\n", errno);
-		igt_assert_neq(ret, -1);
-
-		/* For Haswell reports don't contain a well defined reason
-		 * field we so assume all reports to be 'periodic'. For gen8+
-		 * we want to to consider that the HW automatically writes some
-		 * non periodic reports (e.g. on context switch) which might
-		 * lead to more successful read()s than expected due to
-		 * periodic sampling and we don't want these extra reads to
-		 * cause the test to fail...
-		 */
-		if (intel_gen(devid) >= 8) {
-			for (int offset = 0; offset < ret; offset += header->size) {
-				header = (void *)(buf + offset);
-
-				if (header->type == DRM_I915_PERF_RECORD_SAMPLE) {
-					uint32_t *report = (void *)(header + 1);
-
-					if (oa_report_is_periodic(oa_exponent,
-								  report))
-						timer_report_read = true;
-					else
-						non_timer_report_read = true;
-				}
-			}
-		}
-
-		if (non_timer_report_read && !timer_report_read)
-			n_extra_iterations++;
-
-		/* At this point, after consuming pending reports (and hoping
-		 * the scheduler hasn't stopped us for too long we now
-		 * expect EAGAIN on read.
-		 */
-		while ((ret = read(stream_fd, buf, sizeof(buf))) < 0 &&
-		       errno == EINTR)
-			;
-		igt_assert_eq(ret, -1);
-		igt_assert_eq(errno, EAGAIN);
-
-		n++;
-	}
-
-	times(&end_times);
-
-	/* Using nanosecond units is fairly silly here, given the tick in-
-	 * precision - ah well, it's consistent with the get_time() units.
-	 */
-	user_ns = (end_times.tms_utime - start_times.tms_utime) * tick_ns;
-	kernel_ns = (end_times.tms_stime - start_times.tms_stime) * tick_ns;
-
-	igt_debug("%d blocking reads during test with ~25Hz OA sampling (expect no more than %d)\n",
-		  n, max_iterations);
-	igt_debug("%d extra iterations seen, not related to periodic sampling (e.g. context switches)\n",
-		  n_extra_iterations);
-	igt_debug("time in userspace = %"PRIu64"ns (+-%dns) (start utime = %d, end = %d)\n",
-		  user_ns, (int)tick_ns,
-		  (int)start_times.tms_utime, (int)end_times.tms_utime);
-	igt_debug("time in kernelspace = %"PRIu64"ns (+-%dns) (start stime = %d, end = %d)\n",
-		  kernel_ns, (int)tick_ns,
-		  (int)start_times.tms_stime, (int)end_times.tms_stime);
-
-	/* With completely broken blocking while polling (but still somehow
-	 * reporting a POLLIN event) we could end up with an open loop.
-	 */
-	igt_assert(n <= (max_iterations + n_extra_iterations));
-
-	/* Make sure the driver is reporting new samples with a reasonably
-	 * low latency...
-	 */
-	igt_assert(n > (min_iterations + n_extra_iterations));
-
-	igt_assert(kernel_ns <= (test_duration_ns / 100ull));
-
-	close(stream_fd);
-}
-
-static void
-test_buffer_fill(void)
-{
-	/* ~5 micro second period */
-	int oa_exponent = max_oa_exponent_for_period_lte(5000);
-	uint64_t oa_period = oa_exponent_to_ns(oa_exponent);
-	uint64_t properties[] = {
-		/* Include OA reports in samples */
-		DRM_I915_PERF_PROP_SAMPLE_OA, true,
-
-		/* OA unit configuration */
-		DRM_I915_PERF_PROP_OA_METRICS_SET, test_metric_set_id,
-		DRM_I915_PERF_PROP_OA_FORMAT, test_oa_format,
-		DRM_I915_PERF_PROP_OA_EXPONENT, oa_exponent,
-	};
-	struct drm_i915_perf_open_param param = {
-		.flags = I915_PERF_FLAG_FD_CLOEXEC,
-		.num_properties = sizeof(properties) / 16,
-		.properties_ptr = to_user_pointer(properties),
-	};
-	int stream_fd = __perf_open(drm_fd, &param);
-	int buf_size = 65536 * (256 + sizeof(struct drm_i915_perf_record_header));
-	uint8_t *buf = malloc(buf_size);
-	size_t oa_buf_size = 16 * 1024 * 1024;
-	size_t report_size = oa_formats[test_oa_format].size;
-	int n_full_oa_reports = oa_buf_size / report_size;
-	uint64_t fill_duration = n_full_oa_reports * oa_period;
-
-	igt_assert(fill_duration < 1000000000);
-
-	for (int i = 0; i < 5; i++) {
-		struct drm_i915_perf_record_header *header;
-		bool overflow_seen;
-		int offset = 0;
-		int len;
-
-		nanosleep(&(struct timespec){ .tv_sec = 0,
-					      .tv_nsec = fill_duration * 1.25 },
-			  NULL);
-
-		while ((len = read(stream_fd, buf, buf_size)) == -1 && errno == EINTR)
-			;
-
-		igt_assert_neq(len, -1);
-
-		overflow_seen = false;
-		for (offset = 0; offset < len; offset += header->size) {
-			header = (void *)(buf + offset);
-
-			if (header->type == DRM_I915_PERF_RECORD_OA_BUFFER_LOST)
-				overflow_seen = true;
-		}
-
-		igt_assert_eq(overflow_seen, true);
-
-		nanosleep(&(struct timespec){ .tv_sec = 0,
-					      .tv_nsec = fill_duration / 2 },
-			  NULL);
-
-		while ((len = read(stream_fd, buf, buf_size)) == -1 && errno == EINTR)
-			;
-
-		igt_assert_neq(len, -1);
-
-		igt_assert(len > report_size * n_full_oa_reports * 0.45);
-		igt_assert(len < report_size * n_full_oa_reports * 0.55);
-
-		overflow_seen = false;
-		for (offset = 0; offset < len; offset += header->size) {
-			header = (void *)(buf + offset);
-
-			if (header->type == DRM_I915_PERF_RECORD_OA_BUFFER_LOST)
-				overflow_seen = true;
-		}
-
-		igt_assert_eq(overflow_seen, false);
-	}
-
-	free(buf);
-
-	close(stream_fd);
-}
-
-static void
-test_enable_disable(void)
-{
-	/* ~5 micro second period */
-	int oa_exponent = max_oa_exponent_for_period_lte(5000);
-	uint64_t oa_period = oa_exponent_to_ns(oa_exponent);
-	uint64_t properties[] = {
-		/* Include OA reports in samples */
-		DRM_I915_PERF_PROP_SAMPLE_OA, true,
-
-		/* OA unit configuration */
-		DRM_I915_PERF_PROP_OA_METRICS_SET, test_metric_set_id,
-		DRM_I915_PERF_PROP_OA_FORMAT, test_oa_format,
-		DRM_I915_PERF_PROP_OA_EXPONENT, oa_exponent,
-	};
-	struct drm_i915_perf_open_param param = {
-		.flags = I915_PERF_FLAG_FD_CLOEXEC |
-			 I915_PERF_FLAG_DISABLED, /* Verify we start disabled */
-		.num_properties = sizeof(properties) / 16,
-		.properties_ptr = to_user_pointer(properties),
-	};
-	int stream_fd = __perf_open(drm_fd, &param);
-	int buf_size = 65536 * (256 + sizeof(struct drm_i915_perf_record_header));
-	uint8_t *buf = malloc(buf_size);
-	size_t oa_buf_size = 16 * 1024 * 1024;
-	size_t report_size = oa_formats[test_oa_format].size;
-	int n_full_oa_reports = oa_buf_size / report_size;
-	uint64_t fill_duration = n_full_oa_reports * oa_period;
-
-
-	for (int i = 0; i < 5; i++) {
-		int len;
-
-		/* Giving enough time for an overflow might help catch whether
-		 * the OA unit has been enabled even if the driver might at
-		 * least avoid copying reports while disabled.
-		 */
-		nanosleep(&(struct timespec){ .tv_sec = 0,
-					      .tv_nsec = fill_duration * 1.25 },
-			  NULL);
-
-		while ((len = read(stream_fd, buf, buf_size)) == -1 && errno == EINTR)
-			;
-
-		igt_assert_eq(len, -1);
-		igt_assert_eq(errno, EIO);
-
-		do_ioctl(stream_fd, I915_PERF_IOCTL_ENABLE, 0);
-
-		nanosleep(&(struct timespec){ .tv_sec = 0,
-					      .tv_nsec = fill_duration / 2 },
-			  NULL);
-
-		while ((len = read(stream_fd, buf, buf_size)) == -1 && errno == EINTR)
-			;
-
-		igt_assert_neq(len, -1);
-
-		igt_assert(len > report_size * n_full_oa_reports * 0.45);
-		igt_assert(len < report_size * n_full_oa_reports * 0.55);
-
-		do_ioctl(stream_fd, I915_PERF_IOCTL_DISABLE, 0);
-
-		/* It's considered an error to read a stream while it's disabled
-		 * since it would block indefinitely...
-		 */
-		len = read(stream_fd, buf, buf_size);
-
-		igt_assert_eq(len, -1);
-		igt_assert_eq(errno, EIO);
-	}
-
-	free(buf);
-
-	close(stream_fd);
-}
-
-static void
-test_short_reads(void)
-{
-	int oa_exponent = max_oa_exponent_for_period_lte(5000);
-	uint64_t properties[] = {
-		/* Include OA reports in samples */
-		DRM_I915_PERF_PROP_SAMPLE_OA, true,
-
-		/* OA unit configuration */
-		DRM_I915_PERF_PROP_OA_METRICS_SET, test_metric_set_id,
-		DRM_I915_PERF_PROP_OA_FORMAT, test_oa_format,
-		DRM_I915_PERF_PROP_OA_EXPONENT, oa_exponent,
-	};
-	struct drm_i915_perf_open_param param = {
-		.flags = I915_PERF_FLAG_FD_CLOEXEC,
-		.num_properties = sizeof(properties) / 16,
-		.properties_ptr = to_user_pointer(properties),
-	};
-	size_t record_size = 256 + sizeof(struct drm_i915_perf_record_header);
-	size_t page_size = sysconf(_SC_PAGE_SIZE);
-	int zero_fd = open("/dev/zero", O_RDWR|O_CLOEXEC);
-	uint8_t *pages = mmap(NULL, page_size * 2,
-			      PROT_READ|PROT_WRITE, MAP_PRIVATE, zero_fd, 0);
-	struct drm_i915_perf_record_header *header;
-	int stream_fd;
-	int ret;
-
-	igt_assert_neq(zero_fd, -1);
-	close(zero_fd);
-	zero_fd = -1;
-
-	igt_assert(pages);
-
-	ret = mprotect(pages + page_size, page_size, PROT_NONE);
-	igt_assert_eq(ret, 0);
-
-	stream_fd = __perf_open(drm_fd, &param);
-
-	nanosleep(&(struct timespec){ .tv_sec = 0, .tv_nsec = 5000000 }, NULL);
-
-	/* At this point there should be lots of pending reports to read */
-
-	/* A read that can return at least one record should result in a short
-	 * read not an EFAULT if the buffer is smaller than the requested read
-	 * size...
-	 *
-	 * Expect to see a sample record here, but at least skip over any
-	 * _RECORD_LOST notifications.
-	 */
-	do {
-		header = (void *)(pages + page_size - record_size);
-		ret = read(stream_fd,
-			   header,
-			   page_size);
-		igt_assert(ret > 0);
-	} while (header->type == DRM_I915_PERF_RECORD_OA_REPORT_LOST);
-
-	igt_assert_eq(ret, record_size);
-
-	/* A read that can't return a single record because it would result
-	 * in a fault on buffer overrun should result in an EFAULT error...
-	 */
-	ret = read(stream_fd, pages + page_size - 16, page_size);
-	igt_assert_eq(ret, -1);
-	igt_assert_eq(errno, EFAULT);
-
-	/* A read that can't return a single record because the buffer is too
-	 * small should result in an ENOSPC error..
-	 *
-	 * Again, skip over _RECORD_LOST records (smaller than record_size/2)
-	 */
-	do {
-		header = (void *)(pages + page_size - record_size / 2);
-		ret = read(stream_fd,
-			   header,
-			   record_size / 2);
-	} while (ret > 0 && header->type == DRM_I915_PERF_RECORD_OA_REPORT_LOST);
-
-	igt_assert_eq(ret, -1);
-	igt_assert_eq(errno, ENOSPC);
-
-	close(stream_fd);
-
-	munmap(pages, page_size * 2);
-}
-
-static void
-test_non_sampling_read_error(void)
-{
-	uint64_t properties[] = {
-		/* XXX: even without periodic sampling we have to
-		 * specify at least one sample layout property...
-		 */
-		DRM_I915_PERF_PROP_SAMPLE_OA, true,
-
-		/* OA unit configuration */
-		DRM_I915_PERF_PROP_OA_METRICS_SET, test_metric_set_id,
-		DRM_I915_PERF_PROP_OA_FORMAT, test_oa_format,
-
-		/* XXX: no sampling exponent */
-	};
-	struct drm_i915_perf_open_param param = {
-		.flags = I915_PERF_FLAG_FD_CLOEXEC,
-		.num_properties = sizeof(properties) / 16,
-		.properties_ptr = to_user_pointer(properties),
-	};
-	int stream_fd = __perf_open(drm_fd, &param);
-	uint8_t buf[1024];
-
-	int ret = read(stream_fd, buf, sizeof(buf));
-	igt_assert_eq(ret, -1);
-	igt_assert_eq(errno, EIO);
-
-	close(stream_fd);
-}
-
-/* Check that attempts to read from a stream while it is disable will return
- * EIO instead of blocking indefinitely.
- */
-static void
-test_disabled_read_error(void)
-{
-	int oa_exponent = 5; /* 5 micro seconds */
-	uint64_t properties[] = {
-		/* XXX: even without periodic sampling we have to
-		 * specify at least one sample layout property...
-		 */
-		DRM_I915_PERF_PROP_SAMPLE_OA, true,
-
-		/* OA unit configuration */
-		DRM_I915_PERF_PROP_OA_METRICS_SET, test_metric_set_id,
-		DRM_I915_PERF_PROP_OA_FORMAT, test_oa_format,
-		DRM_I915_PERF_PROP_OA_EXPONENT, oa_exponent,
-	};
-	struct drm_i915_perf_open_param param = {
-		.flags = I915_PERF_FLAG_FD_CLOEXEC |
-			 I915_PERF_FLAG_DISABLED, /* XXX: open disabled */
-		.num_properties = sizeof(properties) / 16,
-		.properties_ptr = to_user_pointer(properties),
-	};
-	int stream_fd = __perf_open(drm_fd, &param);
-	uint32_t oa_report0[64];
-	uint32_t oa_report1[64];
-	uint32_t buf[128] = { 0 };
-	int ret;
-
-
-	ret = read(stream_fd, buf, sizeof(buf));
-	igt_assert_eq(ret, -1);
-	igt_assert_eq(errno, EIO);
-
-	close(stream_fd);
-
-
-	param.flags &= ~I915_PERF_FLAG_DISABLED;
-	stream_fd = __perf_open(drm_fd, &param);
-
-	read_2_oa_reports(stream_fd,
-			  test_oa_format,
-			  oa_exponent,
-			  oa_report0,
-			  oa_report1,
-			  false); /* not just timer reports */
-
-	do_ioctl(stream_fd, I915_PERF_IOCTL_DISABLE, 0);
-
-	ret = read(stream_fd, buf, sizeof(buf));
-	igt_assert_eq(ret, -1);
-	igt_assert_eq(errno, EIO);
-
-	do_ioctl(stream_fd, I915_PERF_IOCTL_ENABLE, 0);
-
-	read_2_oa_reports(stream_fd,
-			  test_oa_format,
-			  oa_exponent,
-			  oa_report0,
-			  oa_report1,
-			  false); /* not just timer reports */
-
-	close(stream_fd);
-}
-
-static void
-emit_report_perf_count(struct intel_batchbuffer *batch,
-		       drm_intel_bo *dst_bo,
-		       int dst_offset,
-		       uint32_t report_id)
-{
-	if (IS_HASWELL(devid)) {
-		BEGIN_BATCH(3, 1);
-		OUT_BATCH(GEN6_MI_REPORT_PERF_COUNT);
-		OUT_RELOC(dst_bo, I915_GEM_DOMAIN_INSTRUCTION, I915_GEM_DOMAIN_INSTRUCTION,
-			  dst_offset);
-		OUT_BATCH(report_id);
-		ADVANCE_BATCH();
-	} else {
-		/* XXX: NB: n dwords arg is actually magic since it internally
-		 * automatically accounts for larger addresses on gen >= 8...
-		 */
-		BEGIN_BATCH(3, 1);
-		OUT_BATCH(GEN8_MI_REPORT_PERF_COUNT);
-		OUT_RELOC(dst_bo, I915_GEM_DOMAIN_INSTRUCTION, I915_GEM_DOMAIN_INSTRUCTION,
-			  dst_offset);
-		OUT_BATCH(report_id);
-		ADVANCE_BATCH();
-	}
-}
-
-static void
-test_mi_rpc(void)
-{
-	uint64_t properties[] = {
-		/* Note: we have to specify at least one sample property even
-		 * though we aren't interested in samples in this case.
-		 */
-		DRM_I915_PERF_PROP_SAMPLE_OA, true,
-
-		/* OA unit configuration */
-		DRM_I915_PERF_PROP_OA_METRICS_SET, test_metric_set_id,
-		DRM_I915_PERF_PROP_OA_FORMAT, test_oa_format,
-
-		/* Note: no OA exponent specified in this case */
-	};
-	struct drm_i915_perf_open_param param = {
-		.flags = I915_PERF_FLAG_FD_CLOEXEC,
-		.num_properties = sizeof(properties) / 16,
-		.properties_ptr = to_user_pointer(properties),
-	};
-	int stream_fd = __perf_open(drm_fd, &param);
-	drm_intel_bufmgr *bufmgr = drm_intel_bufmgr_gem_init(drm_fd, 4096);
-	drm_intel_context *context;
-	struct intel_batchbuffer *batch;
-	drm_intel_bo *bo;
-	uint32_t *report32;
-	int ret;
-
-	drm_intel_bufmgr_gem_enable_reuse(bufmgr);
-
-	context = drm_intel_gem_context_create(bufmgr);
-	igt_assert(context);
-
-	batch = intel_batchbuffer_alloc(bufmgr, devid);
-
-	bo = drm_intel_bo_alloc(bufmgr, "mi_rpc dest bo", 4096, 64);
-
-	ret = drm_intel_bo_map(bo, true);
-	igt_assert_eq(ret, 0);
-
-	memset(bo->virtual, 0x80, 4096);
-	drm_intel_bo_unmap(bo);
-
-	emit_report_perf_count(batch,
-			       bo, /* dst */
-			       0, /* dst offset in bytes */
-			       0xdeadbeef); /* report ID */
-
-	intel_batchbuffer_flush_with_context(batch, context);
-
-	ret = drm_intel_bo_map(bo, false /* write enable */);
-	igt_assert_eq(ret, 0);
-
-	report32 = bo->virtual;
-	igt_assert_eq(report32[0], 0xdeadbeef); /* report ID */
-	igt_assert_neq(report32[1], 0); /* timestamp */
-
-	igt_assert_neq(report32[63], 0x80808080); /* end of report */
-	igt_assert_eq(report32[64], 0x80808080); /* after 256 byte report */
-
-	drm_intel_bo_unmap(bo);
-	drm_intel_bo_unreference(bo);
-	intel_batchbuffer_free(batch);
-	drm_intel_gem_context_destroy(context);
-	drm_intel_bufmgr_destroy(bufmgr);
-	close(stream_fd);
-}
-
-static void
-scratch_buf_init(drm_intel_bufmgr *bufmgr,
-		 struct igt_buf *buf,
-		 int width, int height,
-		 uint32_t color)
-{
-	size_t stride = width * 4;
-	size_t size = stride * height;
-	drm_intel_bo *bo = drm_intel_bo_alloc(bufmgr, "", size, 4096);
-	int ret;
-
-	ret = drm_intel_bo_map(bo, true /* writable */);
-	igt_assert_eq(ret, 0);
-
-	for (int i = 0; i < width * height; i++)
-		((uint32_t *)bo->virtual)[i] = color;
-
-	drm_intel_bo_unmap(bo);
-
-	buf->bo = bo;
-	buf->stride = stride;
-	buf->tiling = I915_TILING_NONE;
-	buf->size = size;
-}
-
-static void
-emit_stall_timestamp_and_rpc(struct intel_batchbuffer *batch,
-			     drm_intel_bo *dst,
-			     int timestamp_offset,
-			     int report_dst_offset,
-			     uint32_t report_id)
-{
-	uint32_t pipe_ctl_flags = (PIPE_CONTROL_CS_STALL |
-				   PIPE_CONTROL_RENDER_TARGET_FLUSH |
-				   PIPE_CONTROL_WRITE_TIMESTAMP);
-
-	BEGIN_BATCH(5, 1);
-	OUT_BATCH(GFX_OP_PIPE_CONTROL | (5 - 2));
-	OUT_BATCH(pipe_ctl_flags);
-	OUT_RELOC(dst, I915_GEM_DOMAIN_INSTRUCTION, I915_GEM_DOMAIN_INSTRUCTION,
-		  timestamp_offset);
-	OUT_BATCH(0); /* imm lower */
-	OUT_BATCH(0); /* imm upper */
-	ADVANCE_BATCH();
-
-	emit_report_perf_count(batch, dst, report_dst_offset, report_id);
-}
-
-/* Tests the INTEL_performance_query use case where an unprivileged process
- * should be able to configure the OA unit for per-context metrics (for a
- * context associated with that process' drm file descriptor) and the counters
- * should only relate to that specific context.
- *
- * Unfortunately only Haswell limits the progression of OA counters for a
- * single context and so this unit test is Haswell specific. For Gen8+ although
- * reports read via i915 perf can be filtered for a single context the counters
- * themselves always progress as global/system-wide counters affected by all
- * contexts.
- */
-static void
-hsw_test_single_ctx_counters(void)
-{
-	uint64_t properties[] = {
-		DRM_I915_PERF_PROP_CTX_HANDLE, UINT64_MAX, /* updated below */
-
-		/* Note: we have to specify at least one sample property even
-		 * though we aren't interested in samples in this case
-		 */
-		DRM_I915_PERF_PROP_SAMPLE_OA, true,
-
-		/* OA unit configuration */
-		DRM_I915_PERF_PROP_OA_METRICS_SET, test_metric_set_id,
-		DRM_I915_PERF_PROP_OA_FORMAT, test_oa_format,
-
-		/* Note: no OA exponent specified in this case */
-	};
-	struct drm_i915_perf_open_param param = {
-		.flags = I915_PERF_FLAG_FD_CLOEXEC,
-		.num_properties = sizeof(properties) / 16,
-		.properties_ptr = to_user_pointer(properties),
-	};
-
-	/* should be default, but just to be sure... */
-	write_u64_file("/proc/sys/dev/i915/perf_stream_paranoid", 1);
-
-	igt_fork(child, 1) {
-		drm_intel_bufmgr *bufmgr;
-		drm_intel_context *context0, *context1;
-		int stream_fd;
-		struct intel_batchbuffer *batch;
-		struct igt_buf src, dst;
-		drm_intel_bo *bo;
-		uint32_t *report0_32, *report1_32;
-		uint64_t timestamp0_64, timestamp1_64;
-		uint32_t delta_ts64, delta_oa32;
-		uint64_t delta_ts64_ns, delta_oa32_ns;
-		uint32_t delta_delta;
-		int n_samples_written;
-		int width = 800;
-		int height = 600;
-		uint32_t ctx_id = 0xffffffff; /* invalid id */
-		int ret;
-
-		igt_drop_root();
-
-		bufmgr = drm_intel_bufmgr_gem_init(drm_fd, 4096);
-		drm_intel_bufmgr_gem_enable_reuse(bufmgr);
-
-		scratch_buf_init(bufmgr, &src, width, height, 0xff0000ff);
-		scratch_buf_init(bufmgr, &dst, width, height, 0x00ff00ff);
-
-		batch = intel_batchbuffer_alloc(bufmgr, devid);
-
-		context0 = drm_intel_gem_context_create(bufmgr);
-		igt_assert(context0);
-
-		context1 = drm_intel_gem_context_create(bufmgr);
-		igt_assert(context1);
-
-		igt_debug("submitting warm up render_copy\n");
-
-		/* Submit some early, unmeasured, work to the context we want
-		 * to measure to try and catch issues with i915-perf
-		 * initializing the HW context ID for filtering.
-		 *
-		 * We do this because i915-perf single context filtering had
-		 * previously only relied on a hook into context pinning to
-		 * initialize the HW context ID, instead of also trying to
-		 * determine the HW ID while opening the stream, in case it
-		 * has already been pinned.
-		 *
-		 * This wasn't noticed by the previous unit test because we
-		 * were opening the stream while the context hadn't been
-		 * touched or pinned yet and so it worked out correctly to wait
-		 * for the pinning hook.
-		 *
-		 * Now a buggy version of i915-perf will fail to measure
-		 * anything for context0 once this initial render_copy() ends
-		 * up pinning the context since there won't ever be a pinning
-		 * hook callback.
-		 */
-		render_copy(batch,
-			    context0,
-			    &src, 0, 0, width, height,
-			    &dst, 0, 0);
-
-		ret = drm_intel_gem_context_get_id(context0, &ctx_id);
-		igt_assert_eq(ret, 0);
-		igt_assert_neq(ctx_id, 0xffffffff);
-		properties[1] = ctx_id;
-
-		igt_debug("opening i915-perf stream\n");
-		stream_fd = __perf_open(drm_fd, &param);
-
-		bo = drm_intel_bo_alloc(bufmgr, "mi_rpc dest bo", 4096, 64);
-
-		ret = drm_intel_bo_map(bo, true /* write enable */);
-		igt_assert_eq(ret, 0);
-
-		memset(bo->virtual, 0x80, 4096);
-		drm_intel_bo_unmap(bo);
-
-		emit_stall_timestamp_and_rpc(batch,
-					     bo,
-					     512 /* timestamp offset */,
-					     0, /* report dst offset */
-					     0xdeadbeef); /* report id */
-
-		/* Explicitly flush here (even though the render_copy() call
-		 * will itself flush before/after the copy) to clarify that
-		 * that the PIPE_CONTROL + MI_RPC commands will be in a
-		 * separate batch from the copy.
-		 */
-		intel_batchbuffer_flush_with_context(batch, context0);
-
-		render_copy(batch,
-			    context0,
-			    &src, 0, 0, width, height,
-			    &dst, 0, 0);
-
-		/* Another redundant flush to clarify batch bo is free to reuse */
-		intel_batchbuffer_flush_with_context(batch, context0);
-
-		/* submit two copies on the other context to avoid a false
-		 * positive in case the driver somehow ended up filtering for
-		 * context1
-		 */
-		render_copy(batch,
-			    context1,
-			    &src, 0, 0, width, height,
-			    &dst, 0, 0);
-
-		render_copy(batch,
-			    context1,
-			    &src, 0, 0, width, height,
-			    &dst, 0, 0);
-
-		/* And another */
-		intel_batchbuffer_flush_with_context(batch, context1);
-
-		emit_stall_timestamp_and_rpc(batch,
-					     bo,
-					     520 /* timestamp offset */,
-					     256, /* report dst offset */
-					     0xbeefbeef); /* report id */
-
-		intel_batchbuffer_flush_with_context(batch, context0);
-
-		ret = drm_intel_bo_map(bo, false /* write enable */);
-		igt_assert_eq(ret, 0);
-
-		report0_32 = bo->virtual;
-		igt_assert_eq(report0_32[0], 0xdeadbeef); /* report ID */
-		igt_assert_neq(report0_32[1], 0); /* timestamp */
-
-		report1_32 = report0_32 + 64;
-		igt_assert_eq(report1_32[0], 0xbeefbeef); /* report ID */
-		igt_assert_neq(report1_32[1], 0); /* timestamp */
-
-		print_reports(report0_32, report1_32,
-			      lookup_format(test_oa_format));
-
-		/* A40 == N samples written to all render targets */
-		n_samples_written = report1_32[43] - report0_32[43];
-		igt_debug("n samples written = %d\n", n_samples_written);
-		igt_assert_eq(n_samples_written, width * height);
-
-		igt_debug("timestamp32 0 = %u\n", report0_32[1]);
-		igt_debug("timestamp32 1 = %u\n", report1_32[1]);
-
-		timestamp0_64 = *(uint64_t *)(((uint8_t *)bo->virtual) + 512);
-		timestamp1_64 = *(uint64_t *)(((uint8_t *)bo->virtual) + 520);
-
-		igt_debug("timestamp64 0 = %"PRIu64"\n", timestamp0_64);
-		igt_debug("timestamp64 1 = %"PRIu64"\n", timestamp1_64);
-
-		delta_ts64 = timestamp1_64 - timestamp0_64;
-		delta_oa32 = report1_32[1] - report0_32[1];
-
-		/* sanity check that we can pass the delta to timebase_scale */
-		igt_assert(delta_ts64 < UINT32_MAX);
-		delta_oa32_ns = timebase_scale(delta_oa32);
-		delta_ts64_ns = timebase_scale(delta_ts64);
-
-		igt_debug("ts32 delta = %u, = %uns\n",
-			  delta_oa32, (unsigned)delta_oa32_ns);
-		igt_debug("ts64 delta = %u, = %uns\n",
-			  delta_ts64, (unsigned)delta_ts64_ns);
-
-		/* The delta as calculated via the PIPE_CONTROL timestamp or
-		 * the OA report timestamps should be almost identical but
-		 * allow a 320 nanoseconds margin.
-		 */
-		delta_delta = delta_ts64_ns > delta_oa32_ns ?
-			(delta_ts64_ns - delta_oa32_ns) :
-			(delta_oa32_ns - delta_ts64_ns);
-		igt_assert(delta_delta <= 320);
-
-		drm_intel_bo_unreference(src.bo);
-		drm_intel_bo_unreference(dst.bo);
-
-		drm_intel_bo_unmap(bo);
-		drm_intel_bo_unreference(bo);
-		intel_batchbuffer_free(batch);
-		drm_intel_gem_context_destroy(context0);
-		drm_intel_gem_context_destroy(context1);
-		drm_intel_bufmgr_destroy(bufmgr);
-		close(stream_fd);
-	}
-
-	igt_waitchildren();
-}
-
-static void
-test_rc6_disable(void)
-{
-	uint64_t properties[] = {
-		/* Include OA reports in samples */
-		DRM_I915_PERF_PROP_SAMPLE_OA, true,
-
-		/* OA unit configuration */
-		DRM_I915_PERF_PROP_OA_METRICS_SET, test_metric_set_id,
-		DRM_I915_PERF_PROP_OA_FORMAT, test_oa_format,
-		DRM_I915_PERF_PROP_OA_EXPONENT, oa_exp_1_millisec,
-	};
-	struct drm_i915_perf_open_param param = {
-		.flags = I915_PERF_FLAG_FD_CLOEXEC,
-		.num_properties = sizeof(properties) / 16,
-		.properties_ptr = to_user_pointer(properties),
-	};
-	int stream_fd = __perf_open(drm_fd, &param);
-	uint64_t n_events_start = read_debugfs_u64_record(drm_fd, "i915_drpc_info",
-							  "RC6 residency since boot");
-	uint64_t n_events_end;
-
-	nanosleep(&(struct timespec){ .tv_sec = 0, .tv_nsec = 500000000 }, NULL);
-
-	n_events_end = read_debugfs_u64_record(drm_fd, "i915_drpc_info",
-					       "RC6 residency since boot");
-
-	igt_assert_eq(n_events_end - n_events_start, 0);
-
-	close(stream_fd);
-
-	n_events_start = read_debugfs_u64_record(drm_fd, "i915_drpc_info",
-						 "RC6 residency since boot");
-
-	nanosleep(&(struct timespec){ .tv_sec = 0, .tv_nsec = 500000000 }, NULL);
-
-	n_events_end = read_debugfs_u64_record(drm_fd, "i915_drpc_info",
-					       "RC6 residency since boot");
-
-	igt_assert_neq(n_events_end - n_events_start, 0);
-}
-
-static int __i915_perf_add_config(int fd, struct drm_i915_perf_oa_config *config)
-{
-	int ret = igt_ioctl(fd, DRM_IOCTL_I915_PERF_ADD_CONFIG, config);
-	if (ret < 0)
-		ret = -errno;
-	return ret;
-}
-
-static int i915_perf_add_config(int fd, struct drm_i915_perf_oa_config *config)
-{
-	int config_id = __i915_perf_add_config(fd, config);
-
-	igt_debug("config_id=%i\n", config_id);
-	igt_assert(config_id > 0);
-
-	return config_id;
-}
-
-static void i915_perf_remove_config(int fd, uint64_t config_id)
-{
-	igt_assert_eq(igt_ioctl(fd, DRM_IOCTL_I915_PERF_REMOVE_CONFIG,
-				&config_id), 0);
-}
-
-static void
-test_invalid_create_userspace_config(void)
-{
-	struct drm_i915_perf_oa_config config;
-	const char *uuid = "01234567-0123-0123-0123-0123456789ab";
-	const char *invalid_uuid = "blablabla-wrong";
-	uint32_t mux_regs[] = { 0x9888 /* NOA_WRITE */, 0x0 };
-	uint32_t invalid_mux_regs[] = { 0x12345678 /* invalid register */, 0x0 };
-
-	memset(&config, 0, sizeof(config));
-
-	/* invalid uuid */
-	strncpy(config.uuid, invalid_uuid, sizeof(config.uuid));
-	config.n_mux_regs = 1;
-	config.mux_regs_ptr = to_user_pointer(mux_regs);
-	config.n_boolean_regs = 0;
-	config.n_flex_regs = 0;
-
-	igt_assert_eq(__i915_perf_add_config(drm_fd, &config), -EINVAL);
-
-	/* invalid mux_regs */
-	strncpy(config.uuid, uuid, sizeof(config.uuid));
-	config.n_mux_regs = 1;
-	config.mux_regs_ptr = to_user_pointer(invalid_mux_regs);
-	config.n_boolean_regs = 0;
-	config.n_flex_regs = 0;
-
-	igt_assert_eq(__i915_perf_add_config(drm_fd, &config), -EINVAL);
-
-	/* empty config */
-	strncpy(config.uuid, uuid, sizeof(config.uuid));
-	config.n_mux_regs = 0;
-	config.mux_regs_ptr = to_user_pointer(mux_regs);
-	config.n_boolean_regs = 0;
-	config.n_flex_regs = 0;
-
-	igt_assert_eq(__i915_perf_add_config(drm_fd, &config), -EINVAL);
-
-	/* empty config with null pointers */
-	strncpy(config.uuid, uuid, sizeof(config.uuid));
-	config.n_mux_regs = 1;
-	config.mux_regs_ptr = to_user_pointer(NULL);
-	config.n_boolean_regs = 2;
-	config.boolean_regs_ptr = to_user_pointer(NULL);
-	config.n_flex_regs = 3;
-	config.flex_regs_ptr = to_user_pointer(NULL);
-
-	igt_assert_eq(__i915_perf_add_config(drm_fd, &config), -EINVAL);
-
-	/* invalid pointers */
-	strncpy(config.uuid, uuid, sizeof(config.uuid));
-	config.n_mux_regs = 42;
-	config.mux_regs_ptr = to_user_pointer((void *) 0xDEADBEEF);
-	config.n_boolean_regs = 0;
-	config.n_flex_regs = 0;
-
-	igt_assert_eq(__i915_perf_add_config(drm_fd, &config), -EFAULT);
-}
-
-static void
-test_invalid_remove_userspace_config(void)
-{
-	struct drm_i915_perf_oa_config config;
-	const char *uuid = "01234567-0123-0123-0123-0123456789ab";
-	uint32_t mux_regs[] = { 0x9888 /* NOA_WRITE */, 0x0 };
-	uint64_t config_id, wrong_config_id = 999999999;
-	char path[512];
-
-	snprintf(path, sizeof(path), "/sys/class/drm/card%d/metrics/%s/id", card, uuid);
-
-	/* Destroy previous configuration if present */
-	if (try_read_u64_file(path, &config_id))
-		i915_perf_remove_config(drm_fd, config_id);
-
-	memset(&config, 0, sizeof(config));
-
-	memcpy(config.uuid, uuid, sizeof(config.uuid));
-
-	config.n_mux_regs = 1;
-	config.mux_regs_ptr = to_user_pointer(mux_regs);
-	config.n_boolean_regs = 0;
-	config.n_flex_regs = 0;
-
-	config_id = i915_perf_add_config(drm_fd, &config);
-
-	/* Removing configs without permissions should fail. */
-	igt_fork(child, 1) {
-		igt_drop_root();
-
-		do_ioctl_err(drm_fd, DRM_IOCTL_I915_PERF_REMOVE_CONFIG, &config_id, EACCES);
-	}
-	igt_waitchildren();
-
-	/* Removing invalid config ID should fail. */
-	do_ioctl_err(drm_fd, DRM_IOCTL_I915_PERF_REMOVE_CONFIG, &wrong_config_id, ENOENT);
-
-	i915_perf_remove_config(drm_fd, config_id);
-}
-
-static void
-test_create_destroy_userspace_config(void)
-{
-	struct drm_i915_perf_oa_config config;
-	const char *uuid = "01234567-0123-0123-0123-0123456789ab";
-	uint32_t mux_regs[] = { 0x9888 /* NOA_WRITE */, 0x0 };
-	uint32_t flex_regs[100];
-	int i, stream_fd;
-	uint64_t config_id;
-	uint64_t properties[] = {
-		DRM_I915_PERF_PROP_OA_METRICS_SET, 0, /* Filled later */
-
-		/* OA unit configuration */
-		DRM_I915_PERF_PROP_SAMPLE_OA, true,
-		DRM_I915_PERF_PROP_OA_FORMAT, test_oa_format,
-		DRM_I915_PERF_PROP_OA_EXPONENT, oa_exp_1_millisec,
-		DRM_I915_PERF_PROP_OA_METRICS_SET
-	};
-	struct drm_i915_perf_open_param param = {
-		.flags = I915_PERF_FLAG_FD_CLOEXEC |
-		I915_PERF_FLAG_FD_NONBLOCK |
-		I915_PERF_FLAG_DISABLED,
-		.num_properties = ARRAY_SIZE(properties) / 2,
-		.properties_ptr = to_user_pointer(properties),
-	};
-	char path[512];
-
-	snprintf(path, sizeof(path), "/sys/class/drm/card%d/metrics/%s/id", card, uuid);
-
-	/* Destroy previous configuration if present */
-	if (try_read_u64_file(path, &config_id))
-		i915_perf_remove_config(drm_fd, config_id);
-
-	memset(&config, 0, sizeof(config));
-	strncpy(config.uuid, uuid, sizeof(config.uuid));
-
-	config.n_mux_regs = 1;
-	config.mux_regs_ptr = to_user_pointer(mux_regs);
-
-	/* Flex EU counters are only available on gen8+ */
-	if (intel_gen(devid) >= 8) {
-		for (i = 0; i < ARRAY_SIZE(flex_regs) / 2; i++) {
-			flex_regs[i * 2] = 0xe458; /* EU_PERF_CNTL0 */
-			flex_regs[i * 2 + 1] = 0x0;
-		}
-		config.flex_regs_ptr = to_user_pointer(flex_regs);
-		config.n_flex_regs = ARRAY_SIZE(flex_regs) / 2;
-	}
-
-	config.n_boolean_regs = 0;
-
-	/* Creating configs without permissions shouldn't work. */
-	igt_fork(child, 1) {
-		igt_drop_root();
-
-		igt_assert_eq(__i915_perf_add_config(drm_fd, &config), -EACCES);
-	}
-	igt_waitchildren();
-
-	/* Create a new config */
-	config_id = i915_perf_add_config(drm_fd, &config);
-
-	/* Verify that adding the another config with the same uuid fails. */
-	igt_assert_eq(__i915_perf_add_config(drm_fd, &config), -EADDRINUSE);
-
-	/* Try to use the new config */
-	properties[1] = config_id;
-	stream_fd = __perf_open(drm_fd, &param);
-
-	/* Verify that destroying the config doesn't yield any error. */
-	i915_perf_remove_config(drm_fd, config_id);
-
-	/* Read the config to verify shouldn't raise any issue. */
-	config_id = i915_perf_add_config(drm_fd, &config);
-
-	close(stream_fd);
-
-	i915_perf_remove_config(drm_fd, config_id);
-}
-
-/* Registers required by userspace. This list should be maintained by
- * the OA configs developers and agreed upon with kernel developers as
- * some of the registers have bits used by the kernel (for workarounds
- * for instance) and other bits that need to be set by the OA configs.
- */
-static void
-test_whitelisted_registers_userspace_config(void)
-{
-	struct drm_i915_perf_oa_config config;
-	const char *uuid = "01234567-0123-0123-0123-0123456789ab";
-	uint32_t mux_regs[200];
-	uint32_t b_counters_regs[200];
-	uint32_t flex_regs[200];
-	uint32_t i;
-	uint64_t config_id;
-	char path[512];
-	int ret;
-	const uint32_t flex[] = {
-		0xe458,
-		0xe558,
-		0xe658,
-		0xe758,
-		0xe45c,
-		0xe55c,
-		0xe65c
-	};
-
-	snprintf(path, sizeof(path), "/sys/class/drm/card%d/metrics/%s/id", card, uuid);
-
-	if (try_read_u64_file(path, &config_id))
-		i915_perf_remove_config(drm_fd, config_id);
-
-	memset(&config, 0, sizeof(config));
-	memcpy(config.uuid, uuid, sizeof(config.uuid));
-
-	/* OASTARTTRIG[1-8] */
-	for (i = 0x2710; i <= 0x272c; i += 4) {
-		b_counters_regs[config.n_boolean_regs * 2] = i;
-		b_counters_regs[config.n_boolean_regs * 2 + 1] = 0;
-		config.n_boolean_regs++;
-	}
-	/* OAREPORTTRIG[1-8] */
-	for (i = 0x2740; i <= 0x275c; i += 4) {
-		b_counters_regs[config.n_boolean_regs * 2] = i;
-		b_counters_regs[config.n_boolean_regs * 2 + 1] = 0;
-		config.n_boolean_regs++;
-	}
-	config.boolean_regs_ptr = (uintptr_t) b_counters_regs;
-
-	if (intel_gen(devid) >= 8) {
-		/* Flex EU registers, only from Gen8+. */
-		for (i = 0; i < ARRAY_SIZE(flex); i++) {
-			flex_regs[config.n_flex_regs * 2] = flex[i];
-			flex_regs[config.n_flex_regs * 2 + 1] = 0;
-			config.n_flex_regs++;
-		}
-		config.flex_regs_ptr = (uintptr_t) flex_regs;
-	}
-
-	/* Mux registers (too many of them, just checking bounds) */
-	i = 0;
-
-	/* NOA_WRITE */
-	mux_regs[i++] = 0x9800;
-	mux_regs[i++] = 0;
-
-	if (IS_HASWELL(devid)) {
-		/* Haswell specific. undocumented... */
-		mux_regs[i++] = 0x9ec0;
-		mux_regs[i++] = 0;
-
-		mux_regs[i++] = 0x25100;
-		mux_regs[i++] = 0;
-		mux_regs[i++] = 0x2ff90;
-		mux_regs[i++] = 0;
-	}
-
-	if (intel_gen(devid) >= 8) {
-		/* NOA_CONFIG */
-		mux_regs[i++] = 0xD04;
-		mux_regs[i++] = 0;
-		mux_regs[i++] = 0xD2C;
-		mux_regs[i++] = 0;
-		/* WAIT_FOR_RC6_EXIT */
-		mux_regs[i++] = 0x20CC;
-		mux_regs[i++] = 0;
-	}
-
-	/* HALF_SLICE_CHICKEN2 (shared with kernel workaround) */
-	mux_regs[i++] = 0xE180;
-	mux_regs[i++] = 0;
-
-	if (IS_CHERRYVIEW(devid)) {
-		/* Cherryview specific. undocumented... */
-		mux_regs[i++] = 0x182300;
-		mux_regs[i++] = 0;
-		mux_regs[i++] = 0x1823A4;
-		mux_regs[i++] = 0;
-	}
-
-	/* PERFCNT[12] */
-	mux_regs[i++] = 0x91B8;
-	mux_regs[i++] = 0;
-	/* PERFMATRIX */
-	mux_regs[i++] = 0x91C8;
-	mux_regs[i++] = 0;
-
-	config.mux_regs_ptr = (uintptr_t) mux_regs;
-	config.n_mux_regs = i / 2;
-
-	/* Create a new config */
-	ret = igt_ioctl(drm_fd, DRM_IOCTL_I915_PERF_ADD_CONFIG, &config);
-	igt_assert(ret > 0); /* Config 0 should be used by the kernel */
-	config_id = ret;
-
-	i915_perf_remove_config(drm_fd, config_id);
-}
-
-static unsigned
-read_i915_module_ref(void)
-{
-	FILE *fp = fopen("/proc/modules", "r");
-	char *line = NULL;
-	size_t line_buf_size = 0;
-	int len = 0;
-	unsigned ref_count;
-
-	igt_assert(fp);
-
-	while ((len = getline(&line, &line_buf_size, fp)) > 0) {
-		if (strncmp(line, "i915 ", 5) == 0) {
-			unsigned long mem;
-			int ret = sscanf(line + 5, "%lu %u", &mem, &ref_count);
-			igt_assert(ret == 2);
-			goto done;
-		}
-	}
-
-	igt_assert(!"reached");
-
-done:
-	free(line);
-	fclose(fp);
-	return ref_count;
-}
-
-/* check that an open i915 perf stream holds a reference on the drm i915 module
- * including in the corner case where the original drm fd has been closed.
- */
-static void
-test_i915_ref_count(void)
-{
-	uint64_t properties[] = {
-		/* Include OA reports in samples */
-		DRM_I915_PERF_PROP_SAMPLE_OA, true,
-
-		/* OA unit configuration */
-		DRM_I915_PERF_PROP_OA_METRICS_SET, 0 /* updated below */,
-		DRM_I915_PERF_PROP_OA_FORMAT, 0, /* update below */
-		DRM_I915_PERF_PROP_OA_EXPONENT, 0, /* update below */
-	};
-	struct drm_i915_perf_open_param param = {
-		.flags = I915_PERF_FLAG_FD_CLOEXEC,
-		.num_properties = sizeof(properties) / 16,
-		.properties_ptr = to_user_pointer(properties),
-	};
-	unsigned baseline, ref_count0, ref_count1;
-	int stream_fd;
-	uint32_t oa_report0[64];
-	uint32_t oa_report1[64];
-
-	/* This should be the first test before the first fixture so no drm_fd
-	 * should have been opened so far...
-	 */
-	igt_assert_eq(drm_fd, -1);
-
-	baseline = read_i915_module_ref();
-	igt_debug("baseline ref count (drm fd closed) = %u\n", baseline);
-
-	drm_fd = __drm_open_driver(DRIVER_INTEL);
-	devid = intel_get_drm_devid(drm_fd);
-	card = drm_get_card();
-
-	/* Note: these global variables are only initialized after calling
-	 * init_sys_info()...
-	 */
-	igt_require(init_sys_info());
-	properties[3] = test_metric_set_id;
-	properties[5] = test_oa_format;
-	properties[7] = oa_exp_1_millisec;
-
-	ref_count0 = read_i915_module_ref();
-	igt_debug("initial ref count with drm_fd open = %u\n", ref_count0);
-	igt_assert(ref_count0 > baseline);
-
-	stream_fd = __perf_open(drm_fd, &param);
-	ref_count1 = read_i915_module_ref();
-	igt_debug("ref count after opening i915 perf stream = %u\n", ref_count1);
-	igt_assert(ref_count1 > ref_count0);
-
-	close(drm_fd);
-	drm_fd = -1;
-	ref_count0 = read_i915_module_ref();
-	igt_debug("ref count after closing drm fd = %u\n", ref_count0);
-
-	igt_assert(ref_count0 > baseline);
-
-	read_2_oa_reports(stream_fd,
-			  test_oa_format,
-			  oa_exp_1_millisec,
-			  oa_report0,
-			  oa_report1,
-			  false); /* not just timer reports */
-
-	close(stream_fd);
-	ref_count0 = read_i915_module_ref();
-	igt_debug("ref count after closing i915 perf stream fd = %u\n", ref_count0);
-	igt_assert_eq(ref_count0, baseline);
-}
-
-static void
-test_sysctl_defaults(void)
-{
-	int paranoid = read_u64_file("/proc/sys/dev/i915/perf_stream_paranoid");
-	int max_freq = read_u64_file("/proc/sys/dev/i915/oa_max_sample_rate");
-
-	igt_assert_eq(paranoid, 1);
-	igt_assert_eq(max_freq, 100000);
-}
-
-igt_main
-{
-	igt_skip_on_simulation();
-
-	igt_fixture {
-		struct stat sb;
-
-		igt_require(stat("/proc/sys/dev/i915/perf_stream_paranoid", &sb)
-			    == 0);
-		igt_require(stat("/proc/sys/dev/i915/oa_max_sample_rate", &sb)
-			    == 0);
-	}
-
-	igt_subtest("i915-ref-count")
-		test_i915_ref_count();
-
-	igt_subtest("sysctl-defaults")
-		test_sysctl_defaults();
-
-	igt_fixture {
-		/* We expect that the ref count test before these fixtures
-		 * should have closed drm_fd...
-		 */
-		igt_assert_eq(drm_fd, -1);
-		drm_fd = drm_open_driver_render(DRIVER_INTEL);
-		devid = intel_get_drm_devid(drm_fd);
-		card = drm_get_card();
-
-		igt_require(init_sys_info());
-
-		gt_frequency_range_save();
-
-		write_u64_file("/proc/sys/dev/i915/perf_stream_paranoid", 1);
-		write_u64_file("/proc/sys/dev/i915/oa_max_sample_rate", 100000);
-
-		render_copy = igt_get_render_copyfunc(devid);
-		igt_require_f(render_copy, "no render-copy function\n");
-	}
-
-	igt_subtest("non-system-wide-paranoid")
-		test_system_wide_paranoid();
-
-	igt_subtest("invalid-open-flags")
-		test_invalid_open_flags();
-
-	igt_subtest("invalid-oa-metric-set-id")
-		test_invalid_oa_metric_set_id();
-
-	igt_subtest("invalid-oa-format-id")
-		test_invalid_oa_format_id();
-
-	igt_subtest("missing-sample-flags")
-		test_missing_sample_flags();
-
-	igt_subtest("oa-formats")
-		test_oa_formats();
-
-	igt_subtest("invalid-oa-exponent")
-		test_invalid_oa_exponent();
-	igt_subtest("low-oa-exponent-permissions")
-		test_low_oa_exponent_permissions();
-	igt_subtest("oa-exponents") {
-		test_oa_exponents(450);
-		test_oa_exponents(550);
-	}
-
-	igt_subtest("per-context-mode-unprivileged")
-		test_per_context_mode_unprivileged();
-
-	igt_subtest("buffer-fill")
-		test_buffer_fill();
-
-	igt_subtest("disabled-read-error")
-		test_disabled_read_error();
-	igt_subtest("non-sampling-read-error")
-		test_non_sampling_read_error();
-
-	igt_subtest("enable-disable")
-		test_enable_disable();
-
-	igt_subtest("blocking")
-		test_blocking();
-
-	igt_subtest("polling")
-		test_polling();
-
-	igt_subtest("short-reads")
-		test_short_reads();
-
-	igt_subtest("mi-rpc")
-		test_mi_rpc();
-
-	igt_subtest("unprivileged-singled-ctx-counters") {
-		/* For Gen8+ the OA unit can no longer be made to clock gate
-		 * for a specific context. Additionally the partial-replacement
-		 * functionality to HW filter timer reports for a specific
-		 * context (SKL+) can't stop multiple applications viewing
-		 * system-wide data via MI_REPORT_PERF_COUNT commands.
-		 */
-		igt_require(IS_HASWELL(devid));
-		hsw_test_single_ctx_counters();
-	}
-
-	igt_subtest("rc6-disable")
-		test_rc6_disable();
-
-	igt_subtest("invalid-create-userspace-config")
-		test_invalid_create_userspace_config();
-
-	igt_subtest("invalid-remove-userspace-config")
-		test_invalid_remove_userspace_config();
-
-	igt_subtest("create-destroy-userspace-config")
-		test_create_destroy_userspace_config();
-
-	igt_subtest("whitelisted-registers-userspace-config")
-		test_whitelisted_registers_userspace_config();
-
-	igt_fixture {
-		/* leave sysctl options in their default state... */
-		write_u64_file("/proc/sys/dev/i915/oa_max_sample_rate", 100000);
-		write_u64_file("/proc/sys/dev/i915/perf_stream_paranoid", 1);
-
-		gt_frequency_range_restore();
-
-		close(drm_fd);
-	}
-}
-- 
1.9.1



More information about the Intel-gfx mailing list