Re: [PATCH 2/3] tests/gem_vmap_blits: Remove obsolete test case

Volkin, Bradley D
2014-04-23T17:13:18Z

Reviewed-by: Brad Volkin <bradley.d.volkin@intel.com>

On Wed, Apr 23, 2014 at 05:38:34PM +0100, Tvrtko Ursulin wrote:
> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>
> No need for the old test case once the new one was added.
>
> v2:
> * Just rebase for lib/ reorganization.
>
> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> ---
> tests/.gitignore | 1 -
> tests/Makefile.sources | 1 -
> tests/gem_vmap_blits.c | 345 -------------------------------------------------
> 3 files changed, 347 deletions(-)
> delete mode 100644 tests/gem_vmap_blits.c
>
> diff --git a/tests/.gitignore b/tests/.gitignore
> index ff193bd..d192bb9 100644
> --- a/tests/.gitignore
> +++ b/tests/.gitignore
> @@ -94,7 +94,6 @@ gem_tiled_swapping
> gem_tiling_max_stride
> gem_unfence_active_buffers
> gem_unref_active_buffers
> -gem_vmap_blits
> gem_userptr_blits
> gem_wait_render_timeout
> gem_write_read_ring_switch
> diff --git a/tests/Makefile.sources b/tests/Makefile.sources
> index 09d6aa3..57a0da2 100644
> --- a/tests/Makefile.sources
> +++ b/tests/Makefile.sources
> @@ -120,7 +120,6 @@ TESTS_progs = \
> gem_tiling_max_stride \
> gem_unfence_active_buffers \
> gem_unref_active_buffers \
> - gem_vmap_blits \
> gem_userptr_blits \
> gem_wait_render_timeout \
> gen3_mixed_blits \
> diff --git a/tests/gem_vmap_blits.c b/tests/gem_vmap_blits.c
> deleted file mode 100644
> index 430338b..0000000
> --- a/tests/gem_vmap_blits.c
> +++ /dev/null
> @@ -1,345 +0,0 @@
> -/*
> - * Copyright © 2009,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:
> - * Eric Anholt <eric@anholt.net>
> - * Chris Wilson <chris@chris-wilson.co.uk>
> - *
> - */
> -
> -/** @file gem_vmap_blits.c
> - *
> - * This is a test of doing many blits using a mixture of normal system pages
> - * and uncached linear buffers, with a working set larger than the
> - * aperture size.
> - *
> - * The goal is to simply ensure the basics work.
> - */
> -
> -#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 "drm.h"
> -#include "ioctl_wrappers.h"
> -#include "drmtest.h"
> -#include "intel_bufmgr.h"
> -#include "intel_batchbuffer.h"
> -#include "intel_io.h"
> -
> -#if !defined(I915_PARAM_HAS_VMAP)
> -#pragma message("No vmap support in drm, skipping")
> -int main(int argc, char **argv)
> -{
> - fprintf(stderr, "No vmap support in drm.\n");
> - return 77;
> -}
> -#else
> -
> -#define WIDTH 512
> -#define HEIGHT 512
> -
> -static uint32_t linear[WIDTH*HEIGHT];
> -
> -static uint32_t gem_vmap(int fd, void *ptr, int size, int read_only)
> -{
> - struct drm_i915_gem_vmap vmap;
> -
> - vmap.user_ptr = (uintptr_t)ptr;
> - vmap.user_size = size;
> - vmap.flags = 0;
> - if (read_only)
> - vmap.flags |= I915_VMAP_READ_ONLY;
> -
> - if (drmIoctl(fd, DRM_IOCTL_I915_GEM_VMAP, &vmap))
> - return 0;
> -
> - return vmap.handle;
> -}
> -
> -
> -static void gem_vmap_sync(int fd, uint32_t handle)
> -{
> - gem_set_domain(fd, handle, I915_GEM_DOMAIN_CPU, I915_GEM_DOMAIN_CPU);
> -}
> -
> -static void
> -copy(int fd, uint32_t dst, uint32_t src)
> -{
> - uint32_t batch[10];
> - struct drm_i915_gem_relocation_entry reloc[2];
> - struct drm_i915_gem_exec_object2 obj[3];
> - struct drm_i915_gem_execbuffer2 exec;
> - uint32_t handle;
> - int ret;
> -
> - batch[0] = XY_SRC_COPY_BLT_CMD |
> - XY_SRC_COPY_BLT_WRITE_ALPHA |
> - XY_SRC_COPY_BLT_WRITE_RGB | 6;
> - batch[1] = (3 << 24) | /* 32 bits */
> - (0xcc << 16) | /* copy ROP */
> - WIDTH*4;
> - batch[2] = 0; /* dst x1,y1 */
> - batch[3] = (HEIGHT << 16) | WIDTH; /* dst x2,y2 */
> - batch[4] = 0; /* dst reloc */
> - batch[5] = 0; /* src x1,y1 */
> - batch[6] = WIDTH*4;
> - batch[7] = 0; /* src reloc */
> - batch[8] = MI_BATCH_BUFFER_END;
> - batch[9] = MI_NOOP;
> -
> - handle = gem_create(fd, 4096);
> - gem_write(fd, handle, 0, batch, sizeof(batch));
> -
> - reloc[0].target_handle = dst;
> - reloc[0].delta = 0;
> - reloc[0].offset = 4 * sizeof(batch[0]);
> - reloc[0].presumed_offset = 0;
> - reloc[0].read_domains = I915_GEM_DOMAIN_RENDER;;
> - reloc[0].write_domain = I915_GEM_DOMAIN_RENDER;
> -
> - reloc[1].target_handle = src;
> - reloc[1].delta = 0;
> - reloc[1].offset = 7 * sizeof(batch[0]);
> - reloc[1].presumed_offset = 0;
> - reloc[1].read_domains = I915_GEM_DOMAIN_RENDER;;
> - reloc[1].write_domain = 0;
> -
> - obj[0].handle = dst;
> - obj[0].relocation_count = 0;
> - obj[0].relocs_ptr = 0;
> - obj[0].alignment = 0;
> - obj[0].offset = 0;
> - obj[0].flags = 0;
> - obj[0].rsvd1 = 0;
> - obj[0].rsvd2 = 0;
> -
> - obj[1].handle = src;
> - obj[1].relocation_count = 0;
> - obj[1].relocs_ptr = 0;
> - obj[1].alignment = 0;
> - obj[1].offset = 0;
> - obj[1].flags = 0;
> - obj[1].rsvd1 = 0;
> - obj[1].rsvd2 = 0;
> -
> - obj[2].handle = handle;
> - obj[2].relocation_count = 2;
> - obj[2].relocs_ptr = (uintptr_t)reloc;
> - obj[2].alignment = 0;
> - obj[2].offset = 0;
> - obj[2].flags = 0;
> - obj[2].rsvd1 = obj[2].rsvd2 = 0;
> -
> - exec.buffers_ptr = (uintptr_t)obj;
> - exec.buffer_count = 3;
> - exec.batch_start_offset = 0;
> - exec.batch_len = sizeof(batch);
> - exec.DR1 = exec.DR4 = 0;
> - exec.num_cliprects = 0;
> - exec.cliprects_ptr = 0;
> - exec.flags = HAS_BLT_RING(intel_get_drm_devid(fd)) ? I915_EXEC_BLT : 0;
> - exec.rsvd1 = exec.rsvd2 = 0;
> -
> - ret = drmIoctl(fd, DRM_IOCTL_I915_GEM_EXECBUFFER2, &exec);
> - while (ret && errno == EBUSY) {
> - drmCommandNone(fd, DRM_I915_GEM_THROTTLE);
> - ret = drmIoctl(fd, DRM_IOCTL_I915_GEM_EXECBUFFER2, &exec);
> - }
> - igt_assert(ret == 0);
> -
> - gem_close(fd, handle);
> -}
> -
> -static uint32_t
> -create_vmap(int fd, uint32_t val, uint32_t *ptr)
> -{
> - uint32_t handle;
> - int i;
> -
> - handle = gem_vmap(fd, ptr, sizeof(linear), 0);
> -
> - /* Fill the BO with dwords starting at val */
> - for (i = 0; i < WIDTH*HEIGHT; i++)
> - ptr[i] = val++;
> -
> - return handle;
> -}
> -
> -static uint32_t
> -create_bo(int fd, uint32_t val)
> -{
> - uint32_t handle;
> - int i;
> -
> - handle = gem_create(fd, sizeof(linear));
> -
> - /* Fill the BO with dwords starting at val */
> - for (i = 0; i < WIDTH*HEIGHT; i++)
> - linear[i] = val++;
> - gem_write(fd, handle, 0, linear, sizeof(linear));
> -
> - return handle;
> -}
> -
> -static void
> -check_cpu(uint32_t *ptr, uint32_t val)
> -{
> - int i;
> -
> - for (i = 0; i < WIDTH*HEIGHT; i++) {
> - if (ptr[i] != val) {
> - fprintf(stderr, "Expected 0x%08x, found 0x%08x "
> - "at offset 0x%08x\n",
> - val, ptr[i], i * 4);
> - abort();
> - }
> - val++;
> - }
> -}
> -
> -static void
> -check_gpu(int fd, uint32_t handle, uint32_t val)
> -{
> - gem_read(fd, handle, 0, linear, sizeof(linear));
> - check_cpu(linear, val);
> -}
> -
> -static int has_vmap(int fd)
> -{
> - drm_i915_getparam_t gp;
> - int i;
> -
> - gp.param = I915_PARAM_HAS_VMAP;
> - gp.value = &i;
> -
> - return drmIoctl(fd, DRM_IOCTL_I915_GETPARAM, &gp) == 0 && i > 0;
> -}
> -
> -int main(int argc, char **argv)
> -{
> - uint32_t *memory;
> - uint32_t *cpu, *cpu_val;
> - uint32_t *gpu, *gpu_val;
> - uint32_t start = 0;
> - int i, fd, count;
> -
> - igt_simple_init();
> -
> - igt_skip_on_simulation();
> -
> - fd = drm_open_any();
> -
> - if (!has_vmap(fd)) {
> - fprintf(stderr, "No vmap support, ignoring.\n");
> - return 77;
> - }
> -
> - count = 0;
> - if (argc > 1)
> - count = atoi(argv[1]);
> - if (count == 0)
> - count = 3 * gem_aperture_size(fd) / (1024*1024) / 4;
> - printf("Using 2x%d 1MiB buffers\n", count);
> -
> - memory = malloc(count*sizeof(linear));
> - if (memory == NULL) {
> - fprintf(stderr, "Unable to allocate %lld bytes\n",
> - (long long)count*sizeof(linear));
> - return 1;
> - }
> -
> - gpu = malloc(sizeof(uint32_t)*count*4);
> - gpu_val = gpu + count;
> - cpu = gpu_val + count;
> - cpu_val = cpu + count;
> -
> - for (i = 0; i < count; i++) {
> - gpu[i] = create_bo(fd, start);
> - gpu_val[i] = start;
> - start += WIDTH*HEIGHT;
> - }
> -
> - for (i = 0; i < count; i++) {
> - cpu[i] = create_vmap(fd, start, memory+i*WIDTH*HEIGHT);
> - cpu_val[i] = start;
> - start += WIDTH*HEIGHT;;
> - }
> -
> - printf("Verifying initialisation...\n");
> - for (i = 0; i < count; i++) {
> - check_gpu(fd, gpu[i], gpu_val[i]);
> - check_cpu(memory+i*WIDTH*HEIGHT, cpu_val[i]);
> - }
> -
> - printf("Cyclic blits cpu->gpu, forward...\n");
> - for (i = 0; i < count * 4; i++) {
> - int src = i % count;
> - int dst = (i + 1) % count;
> -
> - copy(fd, gpu[dst], cpu[src]);
> - gpu_val[dst] = cpu_val[src];
> - }
> - for (i = 0; i < count; i++)
> - check_gpu(fd, gpu[i], gpu_val[i]);
> -
> - printf("Cyclic blits gpu->cpu, backward...\n");
> - for (i = 0; i < count * 4; i++) {
> - int src = (i + 1) % count;
> - int dst = i % count;
> -
> - copy(fd, cpu[dst], gpu[src]);
> - cpu_val[dst] = gpu_val[src];
> - }
> - for (i = 0; i < count; i++) {
> - gem_vmap_sync(fd, cpu[i]);
> - check_cpu(memory+i*WIDTH*HEIGHT, cpu_val[i]);
> - }
> -
> - printf("Random blits...\n");
> - for (i = 0; i < count * 4; i++) {
> - int src = random() % count;
> - int dst = random() % count;
> -
> - if (random() & 1) {
> - copy(fd, gpu[dst], cpu[src]);
> - gpu_val[dst] = cpu_val[src];
> - } else {
> - copy(fd, cpu[dst], gpu[src]);
> - cpu_val[dst] = gpu_val[src];
> - }
> - }
> - for (i = 0; i < count; i++) {
> - check_gpu(fd, gpu[i], gpu_val[i]);
> - gem_vmap_sync(fd, cpu[i]);
> - check_cpu(memory+i*WIDTH*HEIGHT, cpu_val[i]);
> - }
> -
> - return 0;
> -}
> -
> -#endif
> --
> 1.9.1
>