[igt-dev] [PATCH i-g-t] tests/i915/gem_exec_faulting_reloc: Delete test

Antonio Argenziano antonio.argenziano at intel.com
Mon Feb 3 16:28:10 UTC 2020


Test already covered in gem_exec_reloc, remove duplication.

Signed-off-by: Antonio Argenziano <antonio.argenziano at intel.com>
Cc: Chris Wilson <chris at chris-wilson.co.uk>
---
 tests/Makefile.sources               |   3 -
 tests/i915/gem_exec_faulting_reloc.c | 250 ---------------------------
 tests/meson.build                    |   1 -
 3 files changed, 254 deletions(-)
 delete mode 100644 tests/i915/gem_exec_faulting_reloc.c

diff --git a/tests/Makefile.sources b/tests/Makefile.sources
index 74f87849..b46c6439 100644
--- a/tests/Makefile.sources
+++ b/tests/Makefile.sources
@@ -213,9 +213,6 @@ gem_exec_capture_SOURCES = i915/gem_exec_capture.c
 TESTS_progs += gem_exec_create
 gem_exec_create_SOURCES = i915/gem_exec_create.c
 
-TESTS_progs += gem_exec_faulting_reloc
-gem_exec_faulting_reloc_SOURCES = i915/gem_exec_faulting_reloc.c
-
 TESTS_progs += gem_exec_fence
 gem_exec_fence_SOURCES = i915/gem_exec_fence.c
 
diff --git a/tests/i915/gem_exec_faulting_reloc.c b/tests/i915/gem_exec_faulting_reloc.c
deleted file mode 100644
index c2aea039..00000000
--- a/tests/i915/gem_exec_faulting_reloc.c
+++ /dev/null
@@ -1,250 +0,0 @@
-/*
- * Copyright © 2011 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.
- *
- * Authors:
- *    Daniel Vetter <daniel.vetter at ffwll.ch>
- *
- */
-
-#include "igt.h"
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <string.h>
-#include <fcntl.h>
-#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <sys/time.h>
-#include "drm.h"
-
-/* Testcase: Submit patches with relocations in memory that will fault
- *
- * To be really evil, use a gtt mmap for them.
- */
-
-IGT_TEST_DESCRIPTION("Submit patches with relocations in memory that will"
-		     " fault.");
-
-#define OBJECT_SIZE 16384
-
-#define COPY_BLT_CMD_NOLEN	(2<<29|0x53<<22)
-#define BLT_WRITE_ALPHA		(1<<21)
-#define BLT_WRITE_RGB		(1<<20)
-#define BLT_SRC_TILED		(1<<15)
-#define BLT_DST_TILED		(1<<11)
-
-uint32_t devid;
-
-static int gem_linear_blt(uint32_t *batch,
-			  uint32_t src,
-			  uint32_t dst,
-			  uint32_t length,
-			  struct drm_i915_gem_relocation_entry *reloc)
-{
-	uint32_t *b = batch;
-	int height = length / (16 * 1024);
-
-	igt_assert_lte(height, 1 << 16);
-
-	if (height) {
-		int i = 0;
-		b[i++] = COPY_BLT_CMD_NOLEN | BLT_WRITE_ALPHA | BLT_WRITE_RGB;
-		if (intel_gen(devid) >= 8)
-			b[i-1] |= 8;
-		else
-			b[i-1] |= 6;
-		b[i++] = 0xcc << 16 | 1 << 25 | 1 << 24 | (16*1024);
-		b[i++] = 0;
-		b[i++] = height << 16 | (4*1024);
-		b[i++] = 0;
-		reloc->offset = (b-batch+4) * sizeof(uint32_t);
-		reloc->delta = 0;
-		reloc->target_handle = dst;
-		reloc->read_domains = I915_GEM_DOMAIN_RENDER;
-		reloc->write_domain = I915_GEM_DOMAIN_RENDER;
-		reloc->presumed_offset = 0;
-		reloc++;
-
-		if (intel_gen(devid) >= 8)
-			b[i++] = 0; /* FIXME: use real high dword */
-
-		b[i++] = 0;
-		b[i++] = 16*1024;
-		b[i++] = 0;
-		reloc->offset = (b-batch+7) * sizeof(uint32_t);
-		if (intel_gen(devid) >= 8) {
-			reloc->offset += sizeof(uint32_t);
-			b[i++] = 0; /* FIXME: use real high dword */
-		}
-		reloc->delta = 0;
-		reloc->target_handle = src;
-		reloc->read_domains = I915_GEM_DOMAIN_RENDER;
-		reloc->write_domain = 0;
-		reloc->presumed_offset = 0;
-		reloc++;
-
-		if (intel_gen(devid) >= 8)
-			b += 10;
-		else
-			b += 8;
-		length -= height * 16*1024;
-	}
-	
-	if (length) {
-		int i = 0;
-		b[i++] = COPY_BLT_CMD_NOLEN | BLT_WRITE_ALPHA | BLT_WRITE_RGB;
-		if (intel_gen(devid) >= 8)
-			b[i-1] |= 8;
-		else
-			b[i-1] |= 6;
-		b[i++] = 0xcc << 16 | 1 << 25 | 1 << 24 | (16*1024);
-		b[i++] = height << 16;
-		b[i++] = (1+height) << 16 | (length / 4);
-		b[i++] = 0;
-		reloc->offset = (b-batch+4) * sizeof(uint32_t);
-		reloc->delta = 0;
-		reloc->target_handle = dst;
-		reloc->read_domains = I915_GEM_DOMAIN_RENDER;
-		reloc->write_domain = I915_GEM_DOMAIN_RENDER;
-		reloc->presumed_offset = 0;
-		reloc++;
-		if (intel_gen(devid) >= 8)
-			b[i++] = 0; /* FIXME: use real high dword */
-
-		b[i++] = height << 16;
-		b[i++] = 16*1024;
-		b[i++] = 0;
-		reloc->offset = (b-batch+7) * sizeof(uint32_t);
-		if (intel_gen(devid) >= 8) {
-			reloc->offset += sizeof(uint32_t);
-			b[i++] = 0; /* FIXME: use real high dword */
-		}
-		reloc->delta = 0;
-		reloc->target_handle = src;
-		reloc->read_domains = I915_GEM_DOMAIN_RENDER;
-		reloc->write_domain = 0;
-		reloc->presumed_offset = 0;
-		reloc++;
-
-		if (intel_gen(devid) >= 8)
-			b += 10;
-		else
-			b += 8;
-	}
-
-	b[0] = MI_BATCH_BUFFER_END;
-	b[1] = 0;
-
-	return (b+2 - batch) * sizeof(uint32_t);
-}
-
-static void run(int object_size)
-{
-	struct drm_i915_gem_execbuffer2 execbuf;
-	struct drm_i915_gem_exec_object2 exec[3];
-	struct drm_i915_gem_relocation_entry reloc[4];
-	uint32_t buf[40];
-	uint32_t handle, handle_relocs, src, dst;
-	void *gtt_relocs;
-	int fd, len;
-	int ring;
-
-	fd = drm_open_driver(DRIVER_INTEL);
-	igt_require_gem(fd);
-	gem_require_blitter(fd);
-
-	devid = intel_get_drm_devid(fd);
-	handle = gem_create(fd, 4096);
-	src = gem_create(fd, object_size);
-	dst = gem_create(fd, object_size);
-
-	len = gem_linear_blt(buf, src, dst, object_size, reloc);
-	gem_write(fd, handle, 0, buf, len);
-
-	exec[0].handle = src;
-	exec[0].relocation_count = 0;
-	exec[0].relocs_ptr = 0;
-	exec[0].alignment = 0;
-	exec[0].offset = 0;
-	exec[0].flags = 0;
-	exec[0].rsvd1 = 0;
-	exec[0].rsvd2 = 0;
-
-	exec[1].handle = dst;
-	exec[1].relocation_count = 0;
-	exec[1].relocs_ptr = 0;
-	exec[1].alignment = 0;
-	exec[1].offset = 0;
-	exec[1].flags = 0;
-	exec[1].rsvd1 = 0;
-	exec[1].rsvd2 = 0;
-
-	handle_relocs = gem_create(fd, 4096);
-	gem_write(fd, handle_relocs, 0, reloc, sizeof(reloc));
-	gtt_relocs = gem_mmap__gtt(fd, handle_relocs, 4096,
-				   PROT_READ | PROT_WRITE);
-
-	exec[2].handle = handle;
-	if (intel_gen(devid) >= 8)
-		exec[2].relocation_count = len > 56 ? 4 : 2;
-	else
-		exec[2].relocation_count = len > 40 ? 4 : 2;
-	/* A newly mmap gtt bo will fault on first access. */
-	exec[2].relocs_ptr = to_user_pointer(gtt_relocs);
-	exec[2].alignment = 0;
-	exec[2].offset = 0;
-	exec[2].flags = 0;
-	exec[2].rsvd1 = 0;
-	exec[2].rsvd2 = 0;
-
-	ring = 0;
-	if (HAS_BLT_RING(devid))
-		ring = I915_EXEC_BLT;
-
-	execbuf.buffers_ptr = to_user_pointer(exec);
-	execbuf.buffer_count = 3;
-	execbuf.batch_start_offset = 0;
-	execbuf.batch_len = len;
-	execbuf.cliprects_ptr = 0;
-	execbuf.num_cliprects = 0;
-	execbuf.DR1 = 0;
-	execbuf.DR4 = 0;
-	execbuf.flags = ring;
-	i915_execbuffer2_set_context_id(execbuf, 0);
-	execbuf.rsvd2 = 0;
-
-	gem_execbuf(fd, &execbuf);
-	gem_sync(fd, handle);
-
-	gem_close(fd, handle);
-
-	close(fd);
-}
-
-igt_main
-{
-	igt_subtest("normal")
-		run(OBJECT_SIZE);
-}
diff --git a/tests/meson.build b/tests/meson.build
index 670250a7..08596802 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -137,7 +137,6 @@ i915_progs = [
 	'gem_exec_big',
 	'gem_exec_capture',
 	'gem_exec_create',
-	'gem_exec_faulting_reloc',
 	'gem_exec_fence',
 	'gem_exec_flush',
 	'gem_exec_gttfill',
-- 
2.21.0



More information about the igt-dev mailing list