[igt-dev] [PATCH i-g-t v2] tests/i915/gem_persistent_relocs: remove test
Antonio Argenziano
antonio.argenziano at intel.com
Wed Jan 29 23:02:52 UTC 2020
Test has been superseded by a more complete collection of tests in
gem_exec_reloc, therefore, remove the test.
v2:
- Remove the test from the build systems.
Signed-off-by: Antonio Argenziano <antonio.argenziano at intel.com>
Cc: Chris Wilson <chris at chris-wilson.co.uk>
Reviewed-by: Chris Wilson <chris at chris-wilson.co.uk>
---
tests/Makefile.sources | 3 -
tests/i915/gem_persistent_relocs.c | 357 -----------------------------
tests/meson.build | 1 -
3 files changed, 361 deletions(-)
delete mode 100644 tests/i915/gem_persistent_relocs.c
diff --git a/tests/Makefile.sources b/tests/Makefile.sources
index 17397c8f..5e355583 100644
--- a/tests/Makefile.sources
+++ b/tests/Makefile.sources
@@ -330,9 +330,6 @@ gem_mmap_wc_SOURCES = i915/gem_mmap_wc.c
TESTS_progs += gem_partial_pwrite_pread
gem_partial_pwrite_pread_SOURCES = i915/gem_partial_pwrite_pread.c
-TESTS_progs += gem_persistent_relocs
-gem_persistent_relocs_SOURCES = i915/gem_persistent_relocs.c
-
TESTS_progs += gem_pipe_control_store_loop
gem_pipe_control_store_loop_SOURCES = i915/gem_pipe_control_store_loop.c
diff --git a/tests/i915/gem_persistent_relocs.c b/tests/i915/gem_persistent_relocs.c
deleted file mode 100644
index 442f768e..00000000
--- a/tests/i915/gem_persistent_relocs.c
+++ /dev/null
@@ -1,357 +0,0 @@
-/*
- * Copyright © 2013 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 <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 <signal.h>
-#include <sys/wait.h>
-
-#include <drm.h>
-
-
-IGT_TEST_DESCRIPTION("Test persistent relocations as used by uxa/libva.");
-
-/*
- * Testcase: Persistent relocations as used by uxa/libva
- *
- * Note: this currently fails on byt/full-ppgtt
- * https://bugs.freedesktop.org/show_bug.cgi?id=84859
- */
-
-static drm_intel_bufmgr *bufmgr;
-struct intel_batchbuffer *batch;
-
-uint32_t blob[2048*2048];
-#define NUM_TARGET_BOS 16
-drm_intel_bo *pc_target_bo[NUM_TARGET_BOS];
-drm_intel_bo *dummy_bo;
-drm_intel_bo *special_bos[NUM_TARGET_BOS];
-uint32_t relocs_bo_handle[NUM_TARGET_BOS];
-void *gtt_relocs_ptr[NUM_TARGET_BOS];
-uint32_t devid;
-int special_reloc_ofs;
-int special_line_ofs;
-int special_batch_len;
-
-int small_pitch = 64;
-
-static drm_intel_bo *create_special_bo(void)
-{
- drm_intel_bo *bo;
- uint32_t data[1024];
- int len = 0;
-#define BATCH(dw) data[len++] = (dw);
-
- memset(data, 0, 4096);
- bo = drm_intel_bo_alloc(bufmgr, "special batch", 4096, 4096);
-
- if (intel_gen(devid) >= 8) {
- BATCH(MI_NOOP);
- BATCH(XY_COLOR_BLT_CMD_NOLEN | 5 |
- COLOR_BLT_WRITE_ALPHA | XY_COLOR_BLT_WRITE_RGB);
- } else {
- BATCH(XY_COLOR_BLT_CMD_NOLEN | 4 |
- COLOR_BLT_WRITE_ALPHA | XY_COLOR_BLT_WRITE_RGB);
- }
-
- BATCH((3 << 24) | (0xf0 << 16) | small_pitch);
- special_line_ofs = 4*len;
- BATCH(0);
- BATCH(1 << 16 | 1);
- special_reloc_ofs = 4*len;
- BATCH(0);
- if (intel_gen(devid) >= 8)
- BATCH(0); /* FIXME */
- BATCH(0xdeadbeef);
-
-#define CMD_POLY_STIPPLE_OFFSET 0x7906
- /* batchbuffer end */
- if (IS_GEN5(batch->devid)) {
- BATCH(CMD_POLY_STIPPLE_OFFSET << 16);
- BATCH(0);
- }
- igt_assert_eq(len % 2, 0);
- BATCH(MI_NOOP);
- BATCH(MI_BATCH_BUFFER_END);
-
- drm_intel_bo_subdata(bo, 0, 4096, data);
- special_batch_len = len*4;
-
- return bo;
-}
-
-static void emit_dummy_load(int pitch)
-{
- int i;
- uint32_t tile_flags = 0;
-
- if (IS_965(devid)) {
- pitch /= 4;
- tile_flags = XY_SRC_COPY_BLT_SRC_TILED |
- XY_SRC_COPY_BLT_DST_TILED;
- }
-
- for (i = 0; i < 5; i++) {
- BLIT_COPY_BATCH_START(tile_flags);
- OUT_BATCH((3 << 24) | /* 32 bits */
- (0xcc << 16) | /* copy ROP */
- pitch);
- OUT_BATCH(0 << 16 | 1024);
- OUT_BATCH((2048) << 16 | (2048));
- OUT_RELOC_FENCED(dummy_bo, I915_GEM_DOMAIN_RENDER, I915_GEM_DOMAIN_RENDER, 0);
- OUT_BATCH(0 << 16 | 0);
- OUT_BATCH(pitch);
- OUT_RELOC_FENCED(dummy_bo, I915_GEM_DOMAIN_RENDER, 0, 0);
- ADVANCE_BATCH();
-
- if (batch->gen >= 6) {
- BEGIN_BATCH(3, 0);
- OUT_BATCH(XY_SETUP_CLIP_BLT_CMD);
- OUT_BATCH(0);
- OUT_BATCH(0);
- ADVANCE_BATCH();
- }
- }
- intel_batchbuffer_flush(batch);
-}
-
-static void faulting_reloc_and_emit(int fd, drm_intel_bo *target_bo,
- void *gtt_relocs, drm_intel_bo *special_bo)
-{
- struct drm_i915_gem_execbuffer2 execbuf;
- struct drm_i915_gem_exec_object2 exec[2];
- int ring;
-
- if (intel_gen(devid) >= 6)
- ring = I915_EXEC_BLT;
- else
- ring = 0;
-
- exec[0].handle = target_bo->handle;
- 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 = special_bo->handle;
- exec[1].relocation_count = 1;
- /* A newly mmap gtt bo will fault on first access. */
- exec[1].relocs_ptr = to_user_pointer(gtt_relocs);
- exec[1].alignment = 0;
- exec[1].offset = 0;
- exec[1].flags = 0;
- exec[1].rsvd1 = 0;
- exec[1].rsvd2 = 0;
-
- execbuf.buffers_ptr = to_user_pointer(exec);
- execbuf.buffer_count = 2;
- execbuf.batch_start_offset = 0;
- execbuf.batch_len = special_batch_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);
-}
-
-static void do_test(int fd)
-{
- uint32_t tiling_mode = I915_TILING_X;
- unsigned long pitch, act_size;
- uint32_t test;
- int i, repeat;
-
- act_size = 2048;
- dummy_bo = drm_intel_bo_alloc_tiled(bufmgr, "tiled dummy_bo", act_size, act_size,
- 4, &tiling_mode, &pitch, 0);
-
- drm_intel_bo_subdata(dummy_bo, 0, act_size*act_size*4, blob);
-
- for (i = 0; i < NUM_TARGET_BOS; i++) {
- struct drm_i915_gem_relocation_entry reloc[1];
-
- special_bos[i] = create_special_bo();
- pc_target_bo[i] = drm_intel_bo_alloc(bufmgr, "special batch", 4096, 4096);
- igt_assert(pc_target_bo[i]->offset == 0);
-
- reloc[0].offset = special_reloc_ofs;
- reloc[0].delta = 0;
- reloc[0].target_handle = pc_target_bo[i]->handle;
- reloc[0].read_domains = I915_GEM_DOMAIN_RENDER;
- reloc[0].write_domain = I915_GEM_DOMAIN_RENDER;
- reloc[0].presumed_offset = 0;
-
- relocs_bo_handle[i] = gem_create(fd, 4096);
- gem_write(fd, relocs_bo_handle[i], 0, reloc, sizeof(reloc));
-
- gtt_relocs_ptr[i] = gem_mmap__gtt(fd, relocs_bo_handle[i], 4096,
- PROT_READ | PROT_WRITE);
- gem_set_domain(fd, relocs_bo_handle[i],
- I915_GEM_DOMAIN_GTT, I915_GEM_DOMAIN_GTT);
- }
-
- /* repeat must be smaller than 4096/small_pitch */
- for (repeat = 0; repeat < 8; repeat++) {
- for (i = 0; i < NUM_TARGET_BOS; i++) {
- uint32_t data[2] = {
- (repeat << 16) | 0,
- ((repeat + 1) << 16) | 1
- };
-
- drm_intel_bo_subdata(special_bos[i], special_line_ofs, 8, &data);
-
- emit_dummy_load(pitch);
- faulting_reloc_and_emit(fd, pc_target_bo[i],
- gtt_relocs_ptr[i],
- special_bos[i]);
- }
- }
-
- /* Only check at the end to avoid unnecessarily synchronous behaviour. */
- for (i = 0; i < NUM_TARGET_BOS; i++) {
- /* repeat must be smaller than 4096/small_pitch */
- for (repeat = 0; repeat < 8; repeat++) {
- drm_intel_bo_get_subdata(pc_target_bo[i],
- repeat*small_pitch, 4, &test);
- igt_assert_f(test == 0xdeadbeef,
- "mismatch in buffer %i: 0x%08x instead of 0xdeadbeef at offset %i\n",
- i, test, repeat*small_pitch);
- }
- drm_intel_bo_unreference(pc_target_bo[i]);
- drm_intel_bo_unreference(special_bos[i]);
- gem_close(fd, relocs_bo_handle[i]);
- munmap(gtt_relocs_ptr[i], 4096);
- }
-
- drm_intel_gem_bo_map_gtt(dummy_bo);
- drm_intel_gem_bo_unmap_gtt(dummy_bo);
-
- drm_intel_bo_unreference(dummy_bo);
-}
-
-#define INTERRUPT (1 << 0)
-#define THRASH (1 << 1)
-#define THRASH_INACTIVE (1 << 2)
-#define ALL_FLAGS (INTERRUPT | THRASH | THRASH_INACTIVE)
-static void do_forked_test(int fd, unsigned flags)
-{
- int num_threads = sysconf(_SC_NPROCESSORS_ONLN);
- struct igt_helper_process thrasher = {};
-
- if (flags & (THRASH | THRASH_INACTIVE)) {
- igt_fork_helper(&thrasher) {
- uint64_t val;
-
- val = DROP_RETIRE | DROP_BOUND | DROP_UNBOUND;
- if (!(flags & THRASH_INACTIVE))
- val |= DROP_ACTIVE | DROP_SHRINK_ALL;
-
- while (1) {
- usleep(1000);
- igt_drop_caches_set(fd, val);
- }
- }
- }
-
- igt_fork(i, num_threads) {
- /* re-create process local data */
- bufmgr = drm_intel_bufmgr_gem_init(fd, 4096);
- batch = intel_batchbuffer_alloc(bufmgr, devid);
-
- if (flags & INTERRUPT)
- igt_fork_signal_helper();
-
- do_test(fd);
-
- if (flags & INTERRUPT)
- igt_stop_signal_helper();
- }
-
- igt_waitchildren();
- if (flags & (THRASH | THRASH_INACTIVE))
- igt_stop_helper(&thrasher);
-}
-
-int fd;
-
-#define MAX_BLT_SIZE 128
-igt_main
-{
- memset(blob, 'A', sizeof(blob));
-
- igt_fixture {
- fd = drm_open_driver(DRIVER_INTEL);
- igt_require_gem(fd);
- gem_require_blitter(fd);
-
- bufmgr = drm_intel_bufmgr_gem_init(fd, 4096);
- /* disable reuse, otherwise the test fails */
- //drm_intel_bufmgr_gem_enable_reuse(bufmgr);
- devid = intel_get_drm_devid(fd);
- batch = intel_batchbuffer_alloc(bufmgr, devid);
- }
-
- igt_subtest("normal")
- do_test(fd);
-
- igt_fork_signal_helper();
- igt_subtest("interruptible")
- do_test(fd);
- igt_stop_signal_helper();
-
- for (unsigned flags = 0; flags <= ALL_FLAGS; flags++) {
- if ((flags & THRASH) && (flags & THRASH_INACTIVE))
- continue;
-
- igt_subtest_f("forked%s%s%s",
- flags & INTERRUPT ? "-interruptible" : "",
- flags & THRASH ? "-thrashing" : "",
- flags & THRASH_INACTIVE ? "-thrash-inactive" : "")
- do_forked_test(fd, flags);
- }
-
- igt_fixture {
- intel_batchbuffer_free(batch);
- drm_intel_bufmgr_destroy(bufmgr);
-
- close(fd);
- }
-}
diff --git a/tests/meson.build b/tests/meson.build
index a417ceb9..784cb34c 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -175,7 +175,6 @@ i915_progs = [
'gem_mmap_offset_exhaustion',
'gem_mmap_wc',
'gem_partial_pwrite_pread',
- 'gem_persistent_relocs',
'gem_pipe_control_store_loop',
'gem_ppgtt',
'gem_pread',
--
2.21.0
More information about the igt-dev
mailing list