[igt-dev] [PATCH][PATCH i-g-t] tests/i915/gem_write_read_ring_switch Removal of IGT Test

* [igt-dev] [PATCH][PATCH i-g-t] tests/i915/gem_write_read_ring_switch Removal of IGT Test
@ 2020-02-13  4:50 Sravan Kumar Nedunoori
  2020-02-13  5:37 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Sravan Kumar Nedunoori @ 2020-02-13  4:50 UTC (permalink / raw)
  To: sravan.kumar.nedunoori, igt-dev

Removal of this test, as it checks read/write syncpoints when switching rings
and doesnt add anything to other tests.

Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Antonio Argenziano <antonio.argenziano@intel.com>
Signed-off-by: Sravan Kumar Nedunoori <sravan.kumar.nedunoori@intel.com>
---
 tests/Makefile.sources                  |   3 -
 tests/i915/gem_write_read_ring_switch.c | 191 ------------------------
 tests/meson.build                       |   1 -
 3 files changed, 195 deletions(-)
 delete mode 100644 tests/i915/gem_write_read_ring_switch.c

diff --git a/tests/Makefile.sources b/tests/Makefile.sources
index 2cfad802..cacc2d2c 100644
--- a/tests/Makefile.sources
+++ b/tests/Makefile.sources
@@ -445,9 +445,6 @@ gem_wait_SOURCES = i915/gem_wait.c
 TESTS_progs += gem_workarounds
 gem_workarounds_SOURCES = i915/gem_workarounds.c
 
-TESTS_progs += gem_write_read_ring_switch
-gem_write_read_ring_switch_SOURCES = i915/gem_write_read_ring_switch.c
-
 TESTS_progs += gen3_mixed_blits
 gen3_mixed_blits_SOURCES = i915/gen3_mixed_blits.c
 
diff --git a/tests/i915/gem_write_read_ring_switch.c b/tests/i915/gem_write_read_ring_switch.c
deleted file mode 100644
index 55bfbeaf..00000000
--- a/tests/i915/gem_write_read_ring_switch.c
+++ /dev/null
@@ -1,191 +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@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 <drm.h>
-
-#include "i830_reg.h"
-
-IGT_TEST_DESCRIPTION("Check read/write syncpoints when switching rings.");
-
-#define LOCAL_I915_EXEC_VEBOX (4<<0)
-
-static drm_intel_bufmgr *bufmgr;
-struct intel_batchbuffer *batch;
-static drm_intel_bo *load_bo, *target_bo, *dummy_bo;
-int fd;
-
-/* Testcase: check read/write syncpoints when switching rings
- *
- * We've had a bug where the syncpoint for the last write was mangled after a
- * ring switch using semaphores. This resulted in cpu reads returning before the
- * write actually completed. This test exercises this.
- */
-
-#define COLOR 0xffffffff
-static void run_test(int ring)
-{
-	uint32_t *ptr;
-	int i;
-
-	gem_require_ring(fd, ring);
-	/* Testing render only makes sense with separate blt. */
-	if (ring == I915_EXEC_RENDER)
-		gem_require_ring(fd, I915_EXEC_BLT);
-
-	target_bo = drm_intel_bo_alloc(bufmgr, "target bo", 4096, 4096);
-	igt_assert(target_bo);
-
-	/* Need to map first so that we can do our own domain mangement with
-	 * set_domain. */
-	drm_intel_bo_map(target_bo, 0);
-	ptr = target_bo->virtual;
-	igt_assert(*ptr == 0);
-
-	/* put some load onto the gpu to keep the light buffers active for long
-	 * enough */
-	for (i = 0; i < 1000; i++) {
-		BLIT_COPY_BATCH_START(0);
-		OUT_BATCH((3 << 24) | /* 32 bits */
-			  (0xcc << 16) | /* copy ROP */
-			  4096);
-		OUT_BATCH(0); /* dst x1,y1 */
-		OUT_BATCH((1024 << 16) | 512);
-		OUT_RELOC_FENCED(load_bo, I915_GEM_DOMAIN_RENDER, I915_GEM_DOMAIN_RENDER, 0);
-		OUT_BATCH((0 << 16) | 512); /* src x1, y1 */
-		OUT_BATCH(4096);
-		OUT_RELOC_FENCED(load_bo, I915_GEM_DOMAIN_RENDER, 0, 0);
-		ADVANCE_BATCH();
-	}
-
-	COLOR_BLIT_COPY_BATCH_START(0);
-	OUT_BATCH((3 << 24) | /* 32 bits */
-		  (0xff << 16) |
-		  128);
-	OUT_BATCH(0); /* dst x1,y1 */
-	OUT_BATCH((1 << 16) | 1);
-	OUT_RELOC_FENCED(target_bo, I915_GEM_DOMAIN_RENDER, I915_GEM_DOMAIN_RENDER, 0);
-	OUT_BATCH(COLOR);
-	ADVANCE_BATCH();
-
-	intel_batchbuffer_flush(batch);
-
-	/* Emit an empty batch so that signalled seqno on the target ring >
-	 * signalled seqnoe on the blt ring. This is required to hit the bug. */
-	BEGIN_BATCH(2, 0);
-	OUT_BATCH(MI_NOOP);
-	OUT_BATCH(MI_NOOP);
-	ADVANCE_BATCH();
-	intel_batchbuffer_flush_on_ring(batch, ring);
-
-	/* For the ring->ring sync it's important to only emit a read reloc, for
-	 * otherwise the obj->last_write_seqno will be updated. */
-	if (ring == I915_EXEC_RENDER) {
-		BEGIN_BATCH(4, 1);
-		OUT_BATCH(MI_COND_BATCH_BUFFER_END | MI_DO_COMPARE | 1);
-		OUT_BATCH(0xffffffff); /* compare dword */
-		OUT_RELOC(target_bo, I915_GEM_DOMAIN_RENDER, 0, 0);
-		OUT_BATCH(MI_NOOP);
-		ADVANCE_BATCH();
-	} else {
-		BEGIN_BATCH(4, 1);
-		OUT_BATCH(MI_FLUSH_DW | 1);
-		OUT_BATCH(0); /* reserved */
-		OUT_RELOC(target_bo, I915_GEM_DOMAIN_RENDER, 0, 0);
-		OUT_BATCH(MI_NOOP | (1<<22) | (0xf));
-		ADVANCE_BATCH();
-	}
-	intel_batchbuffer_flush_on_ring(batch, ring);
-
-	gem_set_domain(fd, target_bo->handle, I915_GEM_DOMAIN_GTT, 0);
-	igt_assert(*ptr == COLOR);
-	drm_intel_bo_unmap(target_bo);
-
-	drm_intel_bo_unreference(target_bo);
-}
-
-igt_main
-{
-	static const struct {
-		const char *name;
-		int ring;
-	} tests[] = {
-		{ "blt2render", I915_EXEC_RENDER },
-		{ "blt2bsd", I915_EXEC_BSD },
-		{ "blt2vebox", LOCAL_I915_EXEC_VEBOX },
-	};
-	int i;
-
-	igt_fixture {
-		fd = drm_open_driver(DRIVER_INTEL);
-		igt_require_gem(fd);
-
-		/* Test requires MI_FLUSH_DW and MI_COND_BATCH_BUFFER_END */
-		igt_require(intel_gen(intel_get_drm_devid(fd)) >= 6);
-
-		bufmgr = drm_intel_bufmgr_gem_init(fd, 4096);
-		igt_assert(bufmgr);
-		/* don't enable buffer reuse!! */
-		//drm_intel_bufmgr_gem_enable_reuse(bufmgr);
-
-		batch = intel_batchbuffer_alloc(bufmgr, intel_get_drm_devid(fd));
-		igt_assert(batch);
-
-		dummy_bo = drm_intel_bo_alloc(bufmgr, "dummy bo", 4096, 4096);
-		igt_assert(dummy_bo);
-
-		load_bo = drm_intel_bo_alloc(bufmgr, "load bo", 1024*4096, 4096);
-		igt_assert(load_bo);
-	}
-
-	for (i = 0; i < ARRAY_SIZE(tests); i++) {
-		igt_subtest(tests[i].name)
-			run_test(tests[i].ring);
-	}
-
-	igt_fork_signal_helper();
-	for (i = 0; i < ARRAY_SIZE(tests); i++) {
-		igt_subtest_f("%s-interruptible", tests[i].name)
-			run_test(tests[i].ring);
-	}
-	igt_stop_signal_helper();
-
-	igt_fixture {
-		drm_intel_bufmgr_destroy(bufmgr);
-
-		close(fd);
-	}
-}
diff --git a/tests/meson.build b/tests/meson.build
index 6dc33a45..91674f4a 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -215,7 +215,6 @@ i915_progs = [
 	'gem_vm_create',
 	'gem_wait',
 	'gem_workarounds',
-	'gem_write_read_ring_switch',
 	'i915_fb_tiling',
 	'i915_getparams_basic',
 	'i915_hangman',
-- 
2.25.0

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

^ permalink raw reply related	[flat|nested] 6+ messages in thread