[PATCH i-g-t v2 1/8] tests/gem_exec_flush: Remove tests from BAT.

[PATCH i-g-t v2 1/8] tests/gem_exec_flush: Remove tests from BAT.

[Marius Vlad]

Signed-off-by: Marius Vlad <marius.c.vlad@intel.com>
---
 tests/gem_exec_flush.c | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/tests/gem_exec_flush.c b/tests/gem_exec_flush.c
index d08b843..2f271bb 100644
--- a/tests/gem_exec_flush.c
+++ b/tests/gem_exec_flush.c
@@ -532,18 +532,15 @@ igt_main
 		}
 
 		for (const struct batch *b = batches; b->name; b++) {
-			igt_subtest_f("%sbatch-%s-%s-uc",
-				      b == batches && e->exec_id == 0 ? "basic-" : "",
+			igt_subtest_f("batch-%s-%s-uc",
 				      b->name,
 				      e->name)
 				batch(fd, ring, ncpus, timeout, b->mode, 0);
-			igt_subtest_f("%sbatch-%s-%s-wb",
-				      b == batches && e->exec_id == 0 ? "basic-" : "",
+			igt_subtest_f("batch-%s-%s-wb",
 				      b->name,
 				      e->name)
 				batch(fd, ring, ncpus, timeout, b->mode, COHERENT);
-			igt_subtest_f("%sbatch-%s-%s-cmd",
-				      b == batches && e->exec_id == 0 ? "basic-" : "",
+			igt_subtest_f("batch-%s-%s-cmd",
 				      b->name,
 				      e->name)
 				batch(fd, ring, ncpus, timeout, b->mode,
@@ -551,8 +548,7 @@ igt_main
 		}
 
 		for (const struct mode *m = modes; m->name; m++) {
-			igt_subtest_f("%suc-%s-%s",
-				      (m->flags & BASIC && e->exec_id == 0) ? "basic-" : "",
+			igt_subtest_f("uc-%s-%s",
 				      m->name,
 				      e->name)
 				run(fd, ring, ncpus, timeout,
@@ -564,8 +560,7 @@ igt_main
 				run(fd, ring, ncpus, timeout,
 				    UNCACHED | m->flags | INTERRUPTIBLE);
 
-			igt_subtest_f("%swb-%s-%s",
-				      e->exec_id == 0 ? "basic-" : "",
+			igt_subtest_f("wb-%s-%s",
 				      m->name,
 				      e->name)
 				run(fd, ring, ncpus, timeout,
-- 
2.5.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH i-g-t v2 2/8] tests/gem_ctx_switch: Remove test from BAT.

[Marius Vlad]

Signed-off-by: Marius Vlad <marius.c.vlad@intel.com>
---
 tests/gem_ctx_switch.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/gem_ctx_switch.c b/tests/gem_ctx_switch.c
index 7b27336..ce52365 100644
--- a/tests/gem_ctx_switch.c
+++ b/tests/gem_ctx_switch.c
@@ -157,7 +157,7 @@ igt_main
 	igt_fork_hang_detector(fd);
 
 	for (e = intel_execution_engines; e->name; e++) {
-		igt_subtest_f("%s%s", e->exec_id == 0 ? "basic-" : "", e->name)
+		igt_subtest_f("%s", e->name)
 			single(fd, handle, e, 0, 1);
 		igt_subtest_f("%s-interruptible", e->name)
 			single(fd, handle, e, INTERRUPTIBLE, 1);
-- 
2.5.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH i-g-t v2 2/8] tests/gem_ctx_switch: Remove test from BAT.

[Chris Wilson]

On Fri, May 27, 2016 at 07:27:47PM +0300, Marius Vlad wrote:

Nak. This catches bugs quickly.
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH i-g-t v2 3/8] tests/gem_exec_nop: Remove test from BAT.

[Marius Vlad]

Signed-off-by: Marius Vlad <marius.c.vlad@intel.com>
---
 tests/gem_exec_nop.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tests/gem_exec_nop.c b/tests/gem_exec_nop.c
index e90d5eb..8b31b27 100644
--- a/tests/gem_exec_nop.c
+++ b/tests/gem_exec_nop.c
@@ -212,9 +212,6 @@ igt_main
 
 	igt_fork_hang_detector(device);
 
-	igt_subtest("basic")
-		all(device, handle, 10);
-
 	for (e = intel_execution_engines; e->name; e++)
 		igt_subtest_f("%s", e->name)
 			single(device, handle, e->exec_id | e->flags, e->name);
-- 
2.5.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH i-g-t v2 3/8] tests/gem_exec_nop: Remove test from BAT.

[Chris Wilson]

On Fri, May 27, 2016 at 07:27:48PM +0300, Marius Vlad wrote:

Why?
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH i-g-t v2 3/8] tests/gem_exec_nop: Remove test from BAT.

[Tvrtko Ursulin]

On 27/05/16 17:27, Marius Vlad wrote:
> Signed-off-by: Marius Vlad <marius.c.vlad@intel.com>
> ---
>   tests/gem_exec_nop.c | 3 ---
>   1 file changed, 3 deletions(-)
>
> diff --git a/tests/gem_exec_nop.c b/tests/gem_exec_nop.c
> index e90d5eb..8b31b27 100644
> --- a/tests/gem_exec_nop.c
> +++ b/tests/gem_exec_nop.c
> @@ -212,9 +212,6 @@ igt_main
>
>   	igt_fork_hang_detector(device);
>
> -	igt_subtest("basic")
> -		all(device, handle, 10);
> -

Maybe just run it for a second?

Regards,

Tvrtko

>   	for (e = intel_execution_engines; e->name; e++)
>   		igt_subtest_f("%s", e->name)
>   			single(device, handle, e->exec_id | e->flags, e->name);
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH i-g-t v2 4/8] tests/gem_close_race: Remove basic-threads from BAT.

[Marius Vlad]

Signed-off-by: Marius Vlad <marius.c.vlad@intel.com>
---
 tests/gem_close_race.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/gem_close_race.c b/tests/gem_close_race.c
index 94fb905..80da731 100644
--- a/tests/gem_close_race.c
+++ b/tests/gem_close_race.c
@@ -231,7 +231,7 @@ igt_main
 		igt_waitchildren();
 	}
 
-	igt_subtest("basic-threads")
+	igt_subtest("threads")
 		threads(10);
 
 	igt_subtest("process-exit") {
-- 
2.5.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH i-g-t v2 4/8] tests/gem_close_race: Remove basic-threads from BAT.

[Chris Wilson]

On Fri, May 27, 2016 at 07:27:49PM +0300, Marius Vlad wrote:

Please explain why. And why this approach.
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH i-g-t v2 4/8] tests/gem_close_race: Remove basic-threads from BAT.

[Tvrtko Ursulin]

On 27/05/16 17:27, Marius Vlad wrote:
> Signed-off-by: Marius Vlad <marius.c.vlad@intel.com>
> ---
>   tests/gem_close_race.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tests/gem_close_race.c b/tests/gem_close_race.c
> index 94fb905..80da731 100644
> --- a/tests/gem_close_race.c
> +++ b/tests/gem_close_race.c
> @@ -231,7 +231,7 @@ igt_main
>   		igt_waitchildren();
>   	}
>
> -	igt_subtest("basic-threads")
> +	igt_subtest("threads")
>   		threads(10);
>
>   	igt_subtest("process-exit") {
>

Instead of removing decrease to a second or two?

Regards,

Tvrtko
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH i-g-t v2 5/8] tests/gem_sync: Remove basic tests.

[Marius Vlad]

Signed-off-by: Marius Vlad <marius.c.vlad@intel.com>
---
 tests/gem_sync.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/gem_sync.c b/tests/gem_sync.c
index 320bce3..a46f120 100644
--- a/tests/gem_sync.c
+++ b/tests/gem_sync.c
@@ -221,12 +221,12 @@ igt_main
 			sync_ring(fd, e->exec_id | e->flags, ncpus);
 	}
 
-	igt_subtest("basic-each")
+	igt_subtest("each")
 		sync_ring(fd, ~0u, 1);
 	igt_subtest("forked-each")
 		sync_ring(fd, ~0u, ncpus);
 
-	igt_subtest("basic-all")
+	igt_subtest("all")
 		sync_all(fd, 1);
 	igt_subtest("forked-all")
 		sync_all(fd, ncpus);
-- 
2.5.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH i-g-t v2 5/8] tests/gem_sync: Remove basic tests.

[Chris Wilson]

On Fri, May 27, 2016 at 07:27:50PM +0300, Marius Vlad wrote:

No. Please explain what you replace this basic test with.
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH i-g-t v2 5/8] tests/gem_sync: Remove basic tests.

[Tvrtko Ursulin]

On 27/05/16 17:27, Marius Vlad wrote:
> Signed-off-by: Marius Vlad <marius.c.vlad@intel.com>
> ---
>   tests/gem_sync.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/tests/gem_sync.c b/tests/gem_sync.c
> index 320bce3..a46f120 100644
> --- a/tests/gem_sync.c
> +++ b/tests/gem_sync.c
> @@ -221,12 +221,12 @@ igt_main
>   			sync_ring(fd, e->exec_id | e->flags, ncpus);
>   	}
>
> -	igt_subtest("basic-each")
> +	igt_subtest("each")
>   		sync_ring(fd, ~0u, 1);
>   	igt_subtest("forked-each")
>   		sync_ring(fd, ~0u, ncpus);
>
> -	igt_subtest("basic-all")
> +	igt_subtest("all")
>   		sync_all(fd, 1);
>   	igt_subtest("forked-all")
>   		sync_all(fd, ncpus);
>

Same thing, make it faster for BAT and keep the current length for nightly?

Regards,

Tvrtko
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH i-g-t v2 6/8] tests/gem_storedw_loop: Remove from BAT.

[Marius Vlad]

Signed-off-by: Marius Vlad <marius.c.vlad@intel.com>
---
 tests/gem_storedw_loop.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/gem_storedw_loop.c b/tests/gem_storedw_loop.c
index 317b8c6..a0c5af1 100644
--- a/tests/gem_storedw_loop.c
+++ b/tests/gem_storedw_loop.c
@@ -185,7 +185,7 @@ igt_main
 	}
 
 	for (e = intel_execution_engines; e->name; e++) {
-		igt_subtest_f("basic-%s", e->name) {
+		igt_subtest_f("%s", e->name) {
 			check_test_requirements(fd, e->exec_id);
 			store_test(fd, e->exec_id | e->flags, 16*1024);
 		}
-- 
2.5.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH i-g-t v2 6/8] tests/gem_storedw_loop: Remove from BAT.

[Tvrtko Ursulin]

On 27/05/16 17:27, Marius Vlad wrote:
> Signed-off-by: Marius Vlad <marius.c.vlad@intel.com>
> ---
>   tests/gem_storedw_loop.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tests/gem_storedw_loop.c b/tests/gem_storedw_loop.c
> index 317b8c6..a0c5af1 100644
> --- a/tests/gem_storedw_loop.c
> +++ b/tests/gem_storedw_loop.c
> @@ -185,7 +185,7 @@ igt_main
>   	}
>
>   	for (e = intel_execution_engines; e->name; e++) {
> -		igt_subtest_f("basic-%s", e->name) {
> +		igt_subtest_f("%s", e->name) {
>   			check_test_requirements(fd, e->exec_id);
>   			store_test(fd, e->exec_id | e->flags, 16*1024);
>   		}
>

Again instead of removing make a shorter version for BAT?

Regards,

Tvrtko
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH i-g-t v2 6/8] tests/gem_storedw_loop: Remove from BAT.

[Chris Wilson]

On Tue, May 31, 2016 at 01:05:00PM +0100, Tvrtko Ursulin wrote:
> 
> On 27/05/16 17:27, Marius Vlad wrote:
> >Signed-off-by: Marius Vlad <marius.c.vlad@intel.com>
> >---
> >  tests/gem_storedw_loop.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> >diff --git a/tests/gem_storedw_loop.c b/tests/gem_storedw_loop.c
> >index 317b8c6..a0c5af1 100644
> >--- a/tests/gem_storedw_loop.c
> >+++ b/tests/gem_storedw_loop.c
> >@@ -185,7 +185,7 @@ igt_main
> >  	}
> >
> >  	for (e = intel_execution_engines; e->name; e++) {
> >-		igt_subtest_f("basic-%s", e->name) {
> >+		igt_subtest_f("%s", e->name) {
> >  			check_test_requirements(fd, e->exec_id);
> >  			store_test(fd, e->exec_id | e->flags, 16*1024);
> >  		}
> >
> 
> Again instead of removing make a shorter version for BAT?

This one can be dropped.

gem_exec_store covers the inter-ring synchronisation for writes and
gem_sync covers the missed interrupt syndrome.

(gem_exec_whisper would cover the inter-ring synchronisation for reads
and writes, but that is too slow under lockdep/memdebug + execlists.)
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH i-g-t v2 7/8] tests/gem_tile_pread_basic: Remove gem_tiled_pread_basic from BAT.

[Marius Vlad]

Test is renamed to gem_tiled_pread.

Signed-off-by: Marius Vlad <marius.c.vlad@intel.com>
---
 tests/Makefile.sources        |   2 +-
 tests/gem_tiled_pread.c       | 228 ++++++++++++++++++++++++++++++++++++++++++
 tests/gem_tiled_pread_basic.c | 215 ---------------------------------------
 3 files changed, 229 insertions(+), 216 deletions(-)
 create mode 100644 tests/gem_tiled_pread.c
 delete mode 100644 tests/gem_tiled_pread_basic.c

diff --git a/tests/Makefile.sources b/tests/Makefile.sources
index c81eeeb..86328cb 100644
--- a/tests/Makefile.sources
+++ b/tests/Makefile.sources
@@ -175,7 +175,7 @@ TESTS_progs = \
 	gem_sync \
 	gem_threaded_access_tiled \
 	gem_tiled_fence_blits \
-	gem_tiled_pread_basic \
+	gem_tiled_pread \
 	gem_tiled_pread_pwrite \
 	gem_tiled_swapping \
 	gem_tiled_wb \
diff --git a/tests/gem_tiled_pread.c b/tests/gem_tiled_pread.c
new file mode 100644
index 0000000..20ae775
--- /dev/null
+++ b/tests/gem_tiled_pread.c
@@ -0,0 +1,228 @@
+/*
+ * Copyright © 2009 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>
+ *
+ */
+
+/** @file gem_tiled_pread.c
+ *
+ * This is a test of pread's behavior on tiled objects with respect to the
+ * reported swizzling value.
+ *
+ * The goal is to exercise the slow_bit17_copy path for reading on bit17
+ * machines, but will also be useful for catching swizzling value bugs on
+ * other systems.
+ */
+
+#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 <sys/ioctl.h>
+#include "drm.h"
+
+
+IGT_TEST_DESCRIPTION("Test pread behavior on tiled objects with respect to the"
+		     " reported swizzling value.");
+
+#define WIDTH 512
+#define HEIGHT 512
+static uint32_t linear[WIDTH * HEIGHT];
+
+#define PAGE_SIZE 4096
+
+static int tile_width;
+static int tile_height;
+static int tile_size;
+
+static uint32_t
+create_bo(int fd)
+{
+	uint32_t handle;
+	uint32_t *data;
+	int i;
+
+	handle = gem_create(fd, sizeof(linear));
+	gem_set_tiling(fd, handle, I915_TILING_X, WIDTH * sizeof(uint32_t));
+
+	/* Fill the BO with dwords starting at start_val */
+	data = gem_mmap__gtt(fd, handle, sizeof(linear),
+			     PROT_READ | PROT_WRITE);
+	for (i = 0; i < WIDTH*HEIGHT; i++)
+		data[i] = i;
+	munmap(data, sizeof(linear));
+
+	return handle;
+}
+
+static int
+swizzle_bit(int bit, int offset)
+{
+	return (offset & (1 << bit)) >> (bit - 6);
+}
+
+/* Translate from a swizzled offset in the tiled buffer to the corresponding
+ * value from the original linear buffer.
+ */
+static uint32_t
+calculate_expected(int offset)
+{
+	int tile_off = offset & (tile_size - 1);
+	int tile_base = offset & -tile_size;
+	int tile_index = tile_base / tile_size;
+	int tiles_per_row = 4*WIDTH / tile_width;
+
+	/* base x,y values from the tile (page) index. */
+	int base_y = tile_index / tiles_per_row * tile_height;
+	int base_x = tile_index % tiles_per_row * (tile_width/4);
+
+	/* x, y offsets within the tile */
+	int tile_y = tile_off / tile_width;
+	int tile_x = (tile_off % tile_width) / 4;
+
+	igt_debug("%3d, %3d, %3d,%3d\n", base_x, base_y, tile_x, tile_y);
+	return (base_y + tile_y) * WIDTH + base_x + tile_x;
+}
+
+static void
+run(int fd, uint32_t handle, uint32_t swizzle, int iter)
+{
+	int i;
+
+	/* Read a bunch of random subsets of the data and check that they come
+	 * out right.
+	 */
+	for (i = 0; i < iter; i++) {
+		int size = WIDTH * HEIGHT * 4;
+		int offset = (random() % size) & ~3;
+		int len = (random() % size) & ~3;
+		int j;
+
+		if (len == 0)
+			len = 4;
+
+		if (offset + len > size)
+			len = size - offset;
+
+		if (i == 0) {
+			offset = 0;
+			len = size;
+		}
+
+		gem_read(fd, handle, offset, linear, len);
+
+		/* Translate from offsets in the read buffer to the swizzled
+		 * address that it corresponds to.  This is the opposite of
+		 * what Mesa does (calculate offset to be read given the linear
+		 * offset it's looking for).
+		 */
+		for (j = offset; j < offset + len; j += 4) {
+			uint32_t expected_val, found_val;
+			int swizzled_offset;
+			const char *swizzle_str;
+
+			switch (swizzle) {
+			case I915_BIT_6_SWIZZLE_NONE:
+				swizzled_offset = j;
+				swizzle_str = "none";
+				break;
+			case I915_BIT_6_SWIZZLE_9:
+				swizzled_offset = j ^
+					swizzle_bit(9, j);
+				swizzle_str = "bit9";
+				break;
+			case I915_BIT_6_SWIZZLE_9_10:
+				swizzled_offset = j ^
+					swizzle_bit(9, j) ^
+					swizzle_bit(10, j);
+				swizzle_str = "bit9^10";
+				break;
+			case I915_BIT_6_SWIZZLE_9_11:
+				swizzled_offset = j ^
+					swizzle_bit(9, j) ^
+					swizzle_bit(11, j);
+				swizzle_str = "bit9^11";
+				break;
+			case I915_BIT_6_SWIZZLE_9_10_11:
+				swizzled_offset = j ^
+					swizzle_bit(9, j) ^
+					swizzle_bit(10, j) ^
+					swizzle_bit(11, j);
+				swizzle_str = "bit9^10^11";
+				break;
+			default:
+				igt_assert_f(0, "Bad swizzle bits; %d\n",
+					     swizzle);
+			}
+			expected_val = calculate_expected(swizzled_offset);
+			found_val = linear[(j - offset) / 4];
+			igt_assert_f(expected_val == found_val,
+				     "Bad read [%d]: %d instead of %d at 0x%08x "
+				     "for read from 0x%08x to 0x%08x, swizzle=%s\n",
+				     i, found_val, expected_val, j,
+				     offset, offset + len,
+				     swizzle_str);
+		}
+	}
+}
+
+igt_main
+{
+	int fd;
+
+	uint32_t tiling, swizzle;
+	uint32_t handle;
+	uint32_t devid;
+
+	igt_fixture {
+		fd = drm_open_driver(DRIVER_INTEL);
+
+		handle = create_bo(fd);
+		gem_get_tiling(fd, handle, &tiling, &swizzle);
+
+		devid = intel_get_drm_devid(fd);
+	}
+
+	if (IS_GEN2(devid)) {
+		tile_height = 16;
+		tile_width = 128;
+		tile_size = 2048;
+	} else {
+		tile_height = 8;
+		tile_width = 512;
+		tile_size = PAGE_SIZE;
+	}
+
+	igt_subtest("extended")
+		run(fd, handle, swizzle, 100);
+
+	igt_fixture {
+		close(fd);
+	}
+}
diff --git a/tests/gem_tiled_pread_basic.c b/tests/gem_tiled_pread_basic.c
deleted file mode 100644
index 1dfd87c..0000000
--- a/tests/gem_tiled_pread_basic.c
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- * Copyright © 2009 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>
- *
- */
-
-/** @file gem_tiled_pread.c
- *
- * This is a test of pread's behavior on tiled objects with respect to the
- * reported swizzling value.
- *
- * The goal is to exercise the slow_bit17_copy path for reading on bit17
- * machines, but will also be useful for catching swizzling value bugs on
- * other systems.
- */
-
-#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 <sys/ioctl.h>
-#include "drm.h"
-
-
-IGT_TEST_DESCRIPTION("Test pread behavior on tiled objects with respect to the"
-		     " reported swizzling value.");
-
-#define WIDTH 512
-#define HEIGHT 512
-static uint32_t linear[WIDTH * HEIGHT];
-
-#define PAGE_SIZE 4096
-
-static int tile_width;
-static int tile_height;
-static int tile_size;
-
-static uint32_t
-create_bo(int fd)
-{
-	uint32_t handle;
-	uint32_t *data;
-	int i;
-
-	handle = gem_create(fd, sizeof(linear));
-	gem_set_tiling(fd, handle, I915_TILING_X, WIDTH * sizeof(uint32_t));
-
-	/* Fill the BO with dwords starting at start_val */
-	data = gem_mmap__gtt(fd, handle, sizeof(linear),
-			     PROT_READ | PROT_WRITE);
-	for (i = 0; i < WIDTH*HEIGHT; i++)
-		data[i] = i;
-	munmap(data, sizeof(linear));
-
-	return handle;
-}
-
-static int
-swizzle_bit(int bit, int offset)
-{
-	return (offset & (1 << bit)) >> (bit - 6);
-}
-
-/* Translate from a swizzled offset in the tiled buffer to the corresponding
- * value from the original linear buffer.
- */
-static uint32_t
-calculate_expected(int offset)
-{
-	int tile_off = offset & (tile_size - 1);
-	int tile_base = offset & -tile_size;
-	int tile_index = tile_base / tile_size;
-	int tiles_per_row = 4*WIDTH / tile_width;
-
-	/* base x,y values from the tile (page) index. */
-	int base_y = tile_index / tiles_per_row * tile_height;
-	int base_x = tile_index % tiles_per_row * (tile_width/4);
-
-	/* x, y offsets within the tile */
-	int tile_y = tile_off / tile_width;
-	int tile_x = (tile_off % tile_width) / 4;
-
-	igt_debug("%3d, %3d, %3d,%3d\n", base_x, base_y, tile_x, tile_y);
-	return (base_y + tile_y) * WIDTH + base_x + tile_x;
-}
-
-igt_simple_main
-{
-	int fd;
-	int i, iter = 100;
-	uint32_t tiling, swizzle;
-	uint32_t handle;
-	uint32_t devid;
-
-	fd = drm_open_driver(DRIVER_INTEL);
-
-	handle = create_bo(fd);
-	gem_get_tiling(fd, handle, &tiling, &swizzle);
-
-	devid = intel_get_drm_devid(fd);
-
-	if (IS_GEN2(devid)) {
-		tile_height = 16;
-		tile_width = 128;
-		tile_size = 2048;
-	} else {
-		tile_height = 8;
-		tile_width = 512;
-		tile_size = PAGE_SIZE;
-	}
-
-	/* Read a bunch of random subsets of the data and check that they come
-	 * out right.
-	 */
-	for (i = 0; i < iter; i++) {
-		int size = WIDTH * HEIGHT * 4;
-		int offset = (random() % size) & ~3;
-		int len = (random() % size) & ~3;
-		int j;
-
-		if (len == 0)
-			len = 4;
-
-		if (offset + len > size)
-			len = size - offset;
-
-		if (i == 0) {
-			offset = 0;
-			len = size;
-		}
-
-		gem_read(fd, handle, offset, linear, len);
-
-		/* Translate from offsets in the read buffer to the swizzled
-		 * address that it corresponds to.  This is the opposite of
-		 * what Mesa does (calculate offset to be read given the linear
-		 * offset it's looking for).
-		 */
-		for (j = offset; j < offset + len; j += 4) {
-			uint32_t expected_val, found_val;
-			int swizzled_offset;
-			const char *swizzle_str;
-
-			switch (swizzle) {
-			case I915_BIT_6_SWIZZLE_NONE:
-				swizzled_offset = j;
-				swizzle_str = "none";
-				break;
-			case I915_BIT_6_SWIZZLE_9:
-				swizzled_offset = j ^
-					swizzle_bit(9, j);
-				swizzle_str = "bit9";
-				break;
-			case I915_BIT_6_SWIZZLE_9_10:
-				swizzled_offset = j ^
-					swizzle_bit(9, j) ^
-					swizzle_bit(10, j);
-				swizzle_str = "bit9^10";
-				break;
-			case I915_BIT_6_SWIZZLE_9_11:
-				swizzled_offset = j ^
-					swizzle_bit(9, j) ^
-					swizzle_bit(11, j);
-				swizzle_str = "bit9^11";
-				break;
-			case I915_BIT_6_SWIZZLE_9_10_11:
-				swizzled_offset = j ^
-					swizzle_bit(9, j) ^
-					swizzle_bit(10, j) ^
-					swizzle_bit(11, j);
-				swizzle_str = "bit9^10^11";
-				break;
-			default:
-				igt_assert_f(0, "Bad swizzle bits; %d\n",
-					     swizzle);
-			}
-			expected_val = calculate_expected(swizzled_offset);
-			found_val = linear[(j - offset) / 4];
-			igt_assert_f(expected_val == found_val,
-				     "Bad read [%d]: %d instead of %d at 0x%08x "
-				     "for read from 0x%08x to 0x%08x, swizzle=%s\n",
-				     i, found_val, expected_val, j,
-				     offset, offset + len,
-				     swizzle_str);
-		}
-	}
-
-	close(fd);
-}
-- 
2.5.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH i-g-t 8/8] tests/gem_exec_suspend: Remove hibernate from BAT.

[Marius Vlad]

We are already skipping this test in CI on more than one platform,
so migrate them to nightly.

Signed-off-by: Marius Vlad <marius.c.vlad@intel.com>
---
 tests/gem_exec_suspend.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/gem_exec_suspend.c b/tests/gem_exec_suspend.c
index cd133cc..3d529bd 100644
--- a/tests/gem_exec_suspend.c
+++ b/tests/gem_exec_suspend.c
@@ -247,7 +247,7 @@ igt_main
 		run_test(fd, -1, NOSLEEP);
 	igt_subtest("basic-S3")
 		run_test(fd, -1, SUSPEND);
-	igt_subtest("basic-S4")
+	igt_subtest("S4")
 		run_test(fd, -1, HIBERNATE);
 
 	for (e = intel_execution_engines; e->name; e++) {
-- 
2.5.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH i-g-t 8/8] tests/gem_exec_suspend: Remove hibernate from BAT.

[Chris Wilson]

On Fri, May 27, 2016 at 07:27:53PM +0300, Marius Vlad wrote:
> We are already skipping this test in CI on more than one platform,
> so migrate them to nightly.

And? So QA is failing, don't bother testing at all?
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH i-g-t v2 1/8] tests/gem_exec_flush: Remove tests from BAT.

[Chris Wilson]

On Fri, May 27, 2016 at 07:27:46PM +0300, Marius Vlad wrote:

You are lacking an explanation. Please tell me what this test is about
and why it is not suitable criteria for a basic acceptance test.
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH i-g-t v2 1/8] tests/gem_exec_flush: Remove tests from BAT.

[Marius Vlad]

[-- Attachment #1.1: Type: text/plain, Size: 1224 bytes --]

The explanation is the same as in the previous series: the GEM tests are
taking too long. Either I sack them under nightly runs or decrease the
runtime. As new tests are added, it will take too long to provide
meaningful output from BAT. There are platforms that reach the timeout
(of 15minutes), and the slowest platform is the one that provides the
runtime for the entire CI system (as we wait and collect the results
from all of them).

Not being able to complete under a 5min makes BAT useless and more than
once you mention that even at their current runtime some GEM tests have
to have a higher runtime to trigger relevant bugs, which in your own
words it makes sense to have them run for (some) extended period of
time.  Even though running once per night has some disadvantage if the
tests are reliable if won't be that hard to catch the regression(s).

On Fri, May 27, 2016 at 05:37:15PM +0100, Chris Wilson wrote:
> On Fri, May 27, 2016 at 07:27:46PM +0300, Marius Vlad wrote:
> 
> You are lacking an explanation. Please tell me what this test is about
> and why it is not suitable criteria for a basic acceptance test.
> -Chris
> 
> -- 
> Chris Wilson, Intel Open Source Technology Centre

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]

[-- Attachment #2: Type: text/plain, Size: 160 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH i-g-t v2 1/8] tests/gem_exec_flush: Remove tests from BAT.

[Chris Wilson]

On Mon, May 30, 2016 at 01:44:52PM +0300, Marius Vlad wrote:
> The explanation is the same as in the previous series: the GEM tests are
> taking too long. Either I sack them under nightly runs or decrease the
> runtime. As new tests are added, it will take too long to provide
> meaningful output from BAT. There are platforms that reach the timeout
> (of 15minutes), and the slowest platform is the one that provides the
> runtime for the entire CI system (as we wait and collect the results
> from all of them).

I am all for improving BAT, dropping tests is not acceptable imo.
Replacing them with equivalent-or-better that run quickly should be the
goal. Otherwise, you get into the same situation with the nightly runs
(that already exclude gem_concurrent_blit despite it being one of the
few tools that catch basic errors in GEM).
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH i-g-t v2 1/8] tests/gem_exec_flush: Remove tests from BAT.

[Marius Vlad]

[-- Attachment #1.1: Type: text/plain, Size: 1993 bytes --]

On Mon, May 30, 2016 at 11:50:00AM +0100, Chris Wilson wrote:
> On Mon, May 30, 2016 at 01:44:52PM +0300, Marius Vlad wrote:
> > The explanation is the same as in the previous series: the GEM tests are
> > taking too long. Either I sack them under nightly runs or decrease the
> > runtime. As new tests are added, it will take too long to provide
> > meaningful output from BAT. There are platforms that reach the timeout
> > (of 15minutes), and the slowest platform is the one that provides the
> > runtime for the entire CI system (as we wait and collect the results
> > from all of them).
> 
> I am all for improving BAT, dropping tests is not acceptable imo.
> Replacing them with equivalent-or-better that run quickly should be the
> goal. Otherwise, you get into the same situation with the nightly runs
> (that already exclude gem_concurrent_blit despite it being one of the
> few tools that catch basic errors in GEM).
I'm far from being the expert here to work on improving them, hence my
suggestion to tune-down the execution time my first approach. The
consensus is to have some sort of work-around in some acceptable
time-frame. Improving, on different platforms, is an endeavour on
itself.

Have another suggestion, similar to Nightly runs. Have an extended
namespace for GEM test that take/require a longer runtime and run them
before Nightly kicks in. Basically have a shorter run-time for BAT and
longer runtime (under that extended name) for extended runs.  Atm, I'm
timing concurrent_blit on a couple of platforms to see how much time it
normally takes. If under a couple of hours that would be acceptable.
Hoping that by segregating GEM tests would remove the noise
I'm seeing for Nightly runs.


> -Chris
> 
> -- 
> Chris Wilson, Intel Open Source Technology Centre
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]

[-- Attachment #2: Type: text/plain, Size: 160 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx