[PATCH i-g-t 1/1] tests/gem_blits: Add no-reloc capability.
Kamil Konieczny
kamil.konieczny at linux.intel.com
Wed Nov 3 14:49:47 UTC 2021
Add no-relocation mode for GPU gens without relocations. Also
while at this, change var name from has_64b_relocs to
has_64b_addresses, as it is related to offset size in both modes.
Signed-off-by: Kamil Konieczny <kamil.konieczny at linux.intel.com>
---
tests/i915/gem_blits.c | 172 ++++++++++++++++++++++++++++++-----------
1 file changed, 125 insertions(+), 47 deletions(-)
diff --git a/tests/i915/gem_blits.c b/tests/i915/gem_blits.c
index 21dcee68..55c7d61f 100644
--- a/tests/i915/gem_blits.c
+++ b/tests/i915/gem_blits.c
@@ -38,6 +38,8 @@ struct device {
int gen;
int pciid;
int llc;
+ uint64_t ahnd;
+ bool no_relocs;
};
struct buffer {
@@ -119,8 +121,10 @@ static struct buffer *buffer_create(const struct device *device,
buffer->size = ALIGN(buffer->stride * height, 4096);
buffer->handle = gem_create(device->fd, buffer->size);
buffer->caching = device->llc;
-
- buffer->gtt_offset = buffer->handle * buffer->size;
+ if (device->no_relocs)
+ buffer->gtt_offset = get_offset(device->ahnd, buffer->handle, buffer->size, 0);
+ else
+ buffer->gtt_offset = buffer->handle * buffer->size;
for (int y = 0; y < height; y++) {
uint32_t *row = buffer->model + y * width;
@@ -143,7 +147,7 @@ static void buffer_set_tiling(const struct device *device,
struct drm_i915_gem_exec_object2 obj[3];
struct drm_i915_gem_relocation_entry reloc[2];
struct drm_i915_gem_execbuffer2 execbuf;
- const bool has_64b_reloc = device->gen >= 8;
+ const bool has_64b_address = device->gen >= 8;
uint32_t stride, size, pitch;
uint32_t *batch;
int i;
@@ -160,20 +164,35 @@ static void buffer_set_tiling(const struct device *device,
execbuf.buffer_count = ARRAY_SIZE(obj);
if (device->gen >= 6)
execbuf.flags = I915_EXEC_BLT;
+ if (device->no_relocs)
+ execbuf.flags |= I915_EXEC_NO_RELOC;
memset(obj, 0, sizeof(obj));
obj[0].handle = gem_create(device->fd, size);
if (__gem_set_tiling(device->fd, obj[0].handle, tiling, stride) == 0)
obj[0].flags = EXEC_OBJECT_NEEDS_FENCE;
+ obj[0].flags |= EXEC_OBJECT_WRITE;
+ if (device->no_relocs) {
+ obj[0].flags |= EXEC_OBJECT_PINNED;
+ obj[0].offset = get_offset(device->ahnd, obj[0].handle, size, 0);
+ }
obj[1].handle = buffer->handle;
obj[1].offset = buffer->gtt_offset;
if (buffer->fenced)
obj[1].flags = EXEC_OBJECT_NEEDS_FENCE;
+ if (device->no_relocs)
+ obj[1].flags |= EXEC_OBJECT_PINNED;
obj[2].handle = gem_create(device->fd, 4096);
- obj[2].relocs_ptr = to_user_pointer(memset(reloc, 0, sizeof(reloc)));
- obj[2].relocation_count = 2;
+ if (device->no_relocs) {
+ obj[2].offset = get_offset(device->ahnd, obj[2].handle, 4096, 0);
+ obj[2].flags |= EXEC_OBJECT_PINNED;
+ } else {
+ obj[2].relocs_ptr = to_user_pointer(memset(reloc, 0, sizeof(reloc)));
+ obj[2].relocation_count = 2;
+ }
+
batch = gem_mmap__cpu(device->fd, obj[2].handle, 0, 4096, PROT_WRITE);
i = 0;
@@ -199,7 +218,7 @@ static void buffer_set_tiling(const struct device *device,
batch[i] |= XY_SRC_COPY_BLT_SRC_TILED;
if (device->gen >= 4 && tiling)
batch[i] |= XY_SRC_COPY_BLT_DST_TILED;
- batch[i++] |= 6 + 2 * has_64b_reloc;
+ batch[i++] |= 6 + 2 * has_64b_address;
pitch = stride;
if (device->gen >= 4 && tiling)
@@ -207,13 +226,16 @@ static void buffer_set_tiling(const struct device *device,
batch[i++] = 3 << 24 | 0xcc << 16 | pitch;
batch[i++] = 0;
batch[i++] = buffer->height << 16 | buffer->width;
- reloc[0].target_handle = obj[0].handle;
- reloc[0].presumed_offset = obj[0].offset;
- reloc[0].offset = sizeof(*batch) * i;
- reloc[0].read_domains = I915_GEM_DOMAIN_RENDER;
- reloc[0].write_domain = I915_GEM_DOMAIN_RENDER;
+ if (!device->no_relocs) {
+ reloc[0].target_handle = obj[0].handle;
+ reloc[0].presumed_offset = obj[0].offset;
+ reloc[0].offset = sizeof(*batch) * i;
+ reloc[0].read_domains = I915_GEM_DOMAIN_RENDER;
+ reloc[0].write_domain = I915_GEM_DOMAIN_RENDER;
+ }
+
batch[i++] = obj[0].offset;
- if (has_64b_reloc)
+ if (has_64b_address)
batch[i++] = obj[0].offset >> 32;
batch[i++] = 0;
@@ -221,12 +243,15 @@ static void buffer_set_tiling(const struct device *device,
if (device->gen >= 4 && buffer->tiling)
pitch /= 4;
batch[i++] = pitch;
- reloc[1].target_handle = obj[1].handle;
- reloc[1].presumed_offset = obj[1].offset;
- reloc[1].offset = sizeof(*batch) * i;
- reloc[1].read_domains = I915_GEM_DOMAIN_RENDER;
+ if (!device->no_relocs) {
+ reloc[1].target_handle = obj[1].handle;
+ reloc[1].presumed_offset = obj[1].offset;
+ reloc[1].offset = sizeof(*batch) * i;
+ reloc[1].read_domains = I915_GEM_DOMAIN_RENDER;
+ }
+
batch[i++] = obj[1].offset;
- if (has_64b_reloc)
+ if (has_64b_address)
batch[i++] = obj[1].offset >> 32;
if ((tiling | buffer->tiling) >= I915_TILING_Y) {
@@ -247,6 +272,9 @@ static void buffer_set_tiling(const struct device *device,
gem_execbuf(device->fd, &execbuf);
gem_close(device->fd, obj[2].handle);
+ if (device->no_relocs)
+ put_offset(device->ahnd, obj[2].offset);
+
gem_close(device->fd, obj[1].handle);
buffer->gtt_offset = obj[0].offset;
@@ -277,7 +305,7 @@ static bool blit_to_linear(const struct device *device,
struct drm_i915_gem_exec_object2 obj[3];
struct drm_i915_gem_relocation_entry reloc[2];
struct drm_i915_gem_execbuffer2 execbuf;
- const bool has_64b_reloc = device->gen >= 8;
+ const bool has_64b_address = device->gen >= 8;
uint32_t *batch;
uint32_t pitch;
int i = 0;
@@ -292,19 +320,34 @@ static bool blit_to_linear(const struct device *device,
execbuf.buffer_count = ARRAY_SIZE(obj);
if (device->gen >= 6)
execbuf.flags = I915_EXEC_BLT;
+ if (device->no_relocs)
+ execbuf.flags |= I915_EXEC_NO_RELOC;
memset(obj, 0, sizeof(obj));
if (__gem_userptr(device->fd, linear, buffer->size, 0, 0, &obj[0].handle))
return false;
+ obj[0].flags |= EXEC_OBJECT_WRITE;
+ if (device->no_relocs) {
+ obj[0].flags |= EXEC_OBJECT_PINNED;
+ obj[0].offset = get_offset(device->ahnd, obj[0].handle, buffer->size, 0);
+ }
obj[1].handle = buffer->handle;
obj[1].offset = buffer->gtt_offset;
obj[1].flags = EXEC_OBJECT_NEEDS_FENCE;
+ if (device->no_relocs)
+ obj[1].flags |= EXEC_OBJECT_PINNED;
memset(reloc, 0, sizeof(reloc));
obj[2].handle = gem_create(device->fd, 4096);
- obj[2].relocs_ptr = to_user_pointer(reloc);
- obj[2].relocation_count = ARRAY_SIZE(reloc);
+ if (device->no_relocs) {
+ obj[2].flags |= EXEC_OBJECT_PINNED;
+ obj[2].offset = get_offset(device->ahnd, obj[2].handle, 4096, 0);
+ } else {
+ obj[2].relocs_ptr = to_user_pointer(reloc);
+ obj[2].relocation_count = ARRAY_SIZE(reloc);
+ }
+
batch = gem_mmap__cpu(device->fd, obj[2].handle, 0, 4096, PROT_WRITE);
if (buffer->tiling >= I915_TILING_Y) {
@@ -324,18 +367,20 @@ static bool blit_to_linear(const struct device *device,
XY_SRC_COPY_BLT_WRITE_RGB);
if (device->gen >= 4 && buffer->tiling)
batch[i] |= XY_SRC_COPY_BLT_SRC_TILED;
- batch[i++] |= 6 + 2 * has_64b_reloc;
+ batch[i++] |= 6 + 2 * has_64b_address;
batch[i++] = 3 << 24 | 0xcc << 16 | buffer->stride;
batch[i++] = 0;
batch[i++] = buffer->height << 16 | buffer->width;
- reloc[0].target_handle = obj[0].handle;
- reloc[0].presumed_offset = obj[0].offset;
- reloc[0].offset = sizeof(*batch) * i;
- reloc[0].read_domains = I915_GEM_DOMAIN_RENDER;
- reloc[0].write_domain = I915_GEM_DOMAIN_RENDER;
+ if (!device->no_relocs) {
+ reloc[0].target_handle = obj[0].handle;
+ reloc[0].presumed_offset = obj[0].offset;
+ reloc[0].offset = sizeof(*batch) * i;
+ reloc[0].read_domains = I915_GEM_DOMAIN_RENDER;
+ reloc[0].write_domain = I915_GEM_DOMAIN_RENDER;
+ }
batch[i++] = obj[0].offset;
- if (has_64b_reloc)
+ if (has_64b_address)
batch[i++] = obj[0].offset >> 32;
batch[i++] = 0;
@@ -343,12 +388,15 @@ static bool blit_to_linear(const struct device *device,
if (device->gen >= 4 && buffer->tiling)
pitch /= 4;
batch[i++] = pitch;
- reloc[1].target_handle = obj[1].handle;
- reloc[1].presumed_offset = obj[1].offset;
- reloc[1].offset = sizeof(*batch) * i;
- reloc[1].read_domains = I915_GEM_DOMAIN_RENDER;
+ if (!device->no_relocs) {
+ reloc[1].target_handle = obj[1].handle;
+ reloc[1].presumed_offset = obj[1].offset;
+ reloc[1].offset = sizeof(*batch) * i;
+ reloc[1].read_domains = I915_GEM_DOMAIN_RENDER;
+ }
+
batch[i++] = obj[1].offset;
- if (has_64b_reloc)
+ if (has_64b_address)
batch[i++] = obj[1].offset >> 32;
if (buffer->tiling >= I915_TILING_Y) {
@@ -368,6 +416,8 @@ static bool blit_to_linear(const struct device *device,
gem_execbuf(device->fd, &execbuf);
gem_close(device->fd, obj[2].handle);
+ if (device->no_relocs)
+ put_offset(device->ahnd, obj[2].offset);
gem_sync(device->fd, obj[0].handle);
gem_close(device->fd, obj[0].handle);
@@ -490,6 +540,8 @@ static void buffer_free(const struct device *device, struct buffer *buffer)
{
igt_assert(buffer_check(device, buffer, GTT));
gem_close(device->fd, buffer->handle);
+ if (device->no_relocs)
+ put_offset(device->ahnd, buffer->gtt_offset);
free(buffer);
}
@@ -557,7 +609,7 @@ blit(const struct device *device,
struct drm_i915_gem_exec_object2 obj[3];
struct drm_i915_gem_relocation_entry reloc[2];
struct drm_i915_gem_execbuffer2 execbuf;
- const bool has_64b_reloc = device->gen >= 8;
+ const bool has_64b_address = device->gen >= 8;
uint32_t *batch;
uint32_t pitch;
int i = 0;
@@ -604,22 +656,34 @@ blit(const struct device *device,
execbuf.buffer_count = ARRAY_SIZE(obj);
if (device->gen >= 6)
execbuf.flags = I915_EXEC_BLT;
+ if (device->no_relocs)
+ execbuf.flags |= I915_EXEC_NO_RELOC;
memset(obj, 0, sizeof(obj));
obj[0].handle = dst->handle;
obj[0].offset = dst->gtt_offset;
if (dst->tiling)
obj[0].flags = EXEC_OBJECT_NEEDS_FENCE;
+ obj[0].flags |= EXEC_OBJECT_WRITE;
+ if (device->no_relocs)
+ obj[0].flags |= EXEC_OBJECT_PINNED;
obj[1].handle = src->handle;
obj[1].offset = src->gtt_offset;
if (src->tiling)
obj[1].flags = EXEC_OBJECT_NEEDS_FENCE;
+ if (device->no_relocs)
+ obj[1].flags |= EXEC_OBJECT_PINNED;
memset(reloc, 0, sizeof(reloc));
obj[2].handle = gem_create(device->fd, 4096);
- obj[2].relocs_ptr = to_user_pointer(reloc);
- obj[2].relocation_count = ARRAY_SIZE(reloc);
+ if (device->no_relocs) {
+ obj[2].offset = get_offset(device->ahnd, obj[2].handle, 4096, 0);
+ obj[2].flags |= EXEC_OBJECT_PINNED;
+ } else {
+ obj[2].relocs_ptr = to_user_pointer(reloc);
+ obj[2].relocation_count = ARRAY_SIZE(reloc);
+ }
batch = gem_mmap__cpu(device->fd, obj[2].handle, 0, 4096, PROT_WRITE);
if ((src->tiling | dst->tiling) >= I915_TILING_Y) {
@@ -643,7 +707,7 @@ blit(const struct device *device,
batch[i] |= XY_SRC_COPY_BLT_SRC_TILED;
if (device->gen >= 4 && dst->tiling)
batch[i] |= XY_SRC_COPY_BLT_DST_TILED;
- batch[i++] |= 6 + 2 * has_64b_reloc;
+ batch[i++] |= 6 + 2 * has_64b_address;
pitch = dst->stride;
if (device->gen >= 4 && dst->tiling)
@@ -652,13 +716,15 @@ blit(const struct device *device,
batch[i++] = dst_y << 16 | dst_x;
batch[i++] = (height + dst_y) << 16 | (width + dst_x);
- reloc[0].target_handle = obj[0].handle;
- reloc[0].presumed_offset = obj[0].offset;
- reloc[0].offset = sizeof(*batch) * i;
- reloc[0].read_domains = I915_GEM_DOMAIN_RENDER;
- reloc[0].write_domain = I915_GEM_DOMAIN_RENDER;
+ if (!device->no_relocs) {
+ reloc[0].target_handle = obj[0].handle;
+ reloc[0].presumed_offset = obj[0].offset;
+ reloc[0].offset = sizeof(*batch) * i;
+ reloc[0].read_domains = I915_GEM_DOMAIN_RENDER;
+ reloc[0].write_domain = I915_GEM_DOMAIN_RENDER;
+ }
batch[i++] = obj[0].offset;
- if (has_64b_reloc)
+ if (has_64b_address)
batch[i++] = obj[0].offset >> 32;
batch[i++] = src_y << 16 | src_x;
@@ -666,12 +732,14 @@ blit(const struct device *device,
if (device->gen >= 4 && src->tiling)
pitch /= 4;
batch[i++] = pitch;
- reloc[1].target_handle = obj[1].handle;
- reloc[1].presumed_offset = obj[1].offset;
- reloc[1].offset = sizeof(*batch) * i;
- reloc[1].read_domains = I915_GEM_DOMAIN_RENDER;
+ if (!device->no_relocs) {
+ reloc[1].target_handle = obj[1].handle;
+ reloc[1].presumed_offset = obj[1].offset;
+ reloc[1].offset = sizeof(*batch) * i;
+ reloc[1].read_domains = I915_GEM_DOMAIN_RENDER;
+ }
batch[i++] = obj[1].offset;
- if (has_64b_reloc)
+ if (has_64b_address)
batch[i++] = obj[1].offset >> 32;
if ((src->tiling | dst->tiling) >= I915_TILING_Y) {
@@ -691,6 +759,8 @@ blit(const struct device *device,
gem_execbuf(device->fd, &execbuf);
gem_close(device->fd, obj[2].handle);
+ if (device->no_relocs)
+ put_offset(device->ahnd, obj[2].offset);
dst->gtt_offset = obj[0].offset;
src->gtt_offset = obj[1].offset;
@@ -733,6 +803,9 @@ igt_main
device.pciid = intel_get_drm_devid(device.fd);
device.gen = intel_gen(device.pciid);
device.llc = gem_has_llc(device.fd);
+ device.no_relocs = !gem_has_relocations(device.fd);
+ if (device.no_relocs)
+ device.ahnd = get_reloc_ahnd(device.fd, 0);
}
igt_subtest("basic") {
@@ -794,4 +867,9 @@ igt_main
}
}
}
+
+ igt_fixture {
+ if (device.no_relocs)
+ put_ahnd(device.ahnd);
+ }
}
--
2.30.2
More information about the Intel-gfx-trybot
mailing list