Re: [igt-dev] [PATCH] [PATCH i-g-t] tests/i915/gem_double_irq_loop: Removal of test

Antonio Argenziano
2020-02-05T19:24:17Z

On 31/01/20 01:13, priyanka.dandamudi@intel.com wrote:
> From: Priyanka Dandamudi <priyanka.dandamudi@intel.com>
>
> Test tries to detect the missed irq's by executing one large and small batches in a loop
> which has been covered in gem_sync. So,removing the test.

AFAICT, looks good.

Reviewed-by: Antonio Argenziano <antonio.argenziano@intel.com>

>
> Cc: Tahvanainen Jari <jari.tahvanainen@intel.com>
> Signed-off-by: Priyanka Dandamudi <priyanka.dandamudi@intel.com>
> ---
> tests/Makefile.sources | 3 -
> tests/i915/gem_double_irq_loop.c | 122 -------------------------------
> tests/meson.build | 1 -
> 3 files changed, 126 deletions(-)
> delete mode 100644 tests/i915/gem_double_irq_loop.c
>
> diff --git a/tests/Makefile.sources b/tests/Makefile.sources
> index fbf1f3d2..9e5ccf7c 100644
> --- a/tests/Makefile.sources
> +++ b/tests/Makefile.sources
> @@ -178,9 +178,6 @@ gem_ctx_switch_SOURCES = i915/gem_ctx_switch.c
> TESTS_progs += gem_ctx_thrash
> gem_ctx_thrash_SOURCES = i915/gem_ctx_thrash.c
>
> -TESTS_progs += gem_double_irq_loop
> -gem_double_irq_loop_SOURCES = i915/gem_double_irq_loop.c
> -
> TESTS_progs += gem_eio
> gem_eio_SOURCES = i915/gem_eio.c
>
> diff --git a/tests/i915/gem_double_irq_loop.c b/tests/i915/gem_double_irq_loop.c
> deleted file mode 100644
> index 1987d01d..00000000
> --- a/tests/i915/gem_double_irq_loop.c
> +++ /dev/null
> @@ -1,122 +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@ffwll.ch> (based on gem_storedw_*.c)
> - *
> - */
> -
> -#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 "drm.h"
> -#include "intel_bufmgr.h"
> -#include "i830_reg.h"
> -
> -static drm_intel_bufmgr *bufmgr;
> -struct intel_batchbuffer *batch;
> -static drm_intel_bo *target_buffer, *blt_bo;
> -
> -/*
> - * Testcase: Basic check for missed irqs on blt
> - *
> - * Execs one large and then immediately a tiny batch on the blt ring. Then waits
> - * on the second batch. This hopefully catches races in our irq acknowledgement.
> - */
> -
> -IGT_TEST_DESCRIPTION("Basic check for missed IRQs on blt ring.");
> -
> -
> -static void
> -dummy_reloc_loop(void)
> -{
> - int i;
> -
> - for (i = 0; i < 0x800; i++) {
> - BLIT_COPY_BATCH_START(0);
> - OUT_BATCH((3 << 24) | /* 32 bits */
> - (0xcc << 16) | /* copy ROP */
> - 4*4096);
> - OUT_BATCH(2048 << 16 | 0);
> - OUT_BATCH((4096) << 16 | (2048));
> - OUT_RELOC_FENCED(blt_bo, I915_GEM_DOMAIN_RENDER, I915_GEM_DOMAIN_RENDER, 0);
> - OUT_BATCH(0 << 16 | 0);
> - OUT_BATCH(4*4096);
> - OUT_RELOC_FENCED(blt_bo, I915_GEM_DOMAIN_RENDER, 0, 0);
> - ADVANCE_BATCH();
> - intel_batchbuffer_flush(batch);
> -
> - BEGIN_BATCH(4, 1);
> - OUT_BATCH(MI_FLUSH_DW | 1);
> - OUT_BATCH(0); /* reserved */
> - OUT_RELOC(target_buffer, I915_GEM_DOMAIN_RENDER,
> - I915_GEM_DOMAIN_RENDER, 0);
> - OUT_BATCH(MI_NOOP | (1<<22) | (0xf));
> - ADVANCE_BATCH();
> - intel_batchbuffer_flush(batch);
> -
> - drm_intel_bo_map(target_buffer, 0);
> - // map to force completion
> - drm_intel_bo_unmap(target_buffer);
> - }
> -}
> -
> -igt_simple_main
> -{
> - int fd;
> - int devid;
> -
> - fd = drm_open_driver(DRIVER_INTEL);
> - igt_require_gem(fd);
> - gem_require_blitter(fd);
> -
> - devid = intel_get_drm_devid(fd);
> - igt_require_f(HAS_BLT_RING(devid),
> - "not (yet) implemented for pre-snb\n");
> -
> - bufmgr = drm_intel_bufmgr_gem_init(fd, 4096);
> - igt_assert(bufmgr);
> - drm_intel_bufmgr_gem_enable_reuse(bufmgr);
> -
> - batch = intel_batchbuffer_alloc(bufmgr, devid);
> - igt_assert(batch);
> -
> - target_buffer = drm_intel_bo_alloc(bufmgr, "target bo", 4096, 4096);
> - igt_assert(target_buffer);
> -
> - blt_bo = drm_intel_bo_alloc(bufmgr, "target bo", 4*4096*4096, 4096);
> - igt_assert(blt_bo);
> -
> - dummy_reloc_loop();
> -
> - drm_intel_bo_unreference(target_buffer);
> - intel_batchbuffer_free(batch);
> - drm_intel_bufmgr_destroy(bufmgr);
> -
> - close(fd);
> -}
> diff --git a/tests/meson.build b/tests/meson.build
> index 7088cd64..60187025 100644
> --- a/tests/meson.build
> +++ b/tests/meson.build
> @@ -128,7 +128,6 @@ i915_progs = [
> 'gem_ctx_shared',
> 'gem_ctx_switch',
> 'gem_ctx_thrash',
> - 'gem_double_irq_loop',
> 'gem_evict_alignment',
> 'gem_evict_everything',
> 'gem_exec_alignment',
>