* [igt-dev] [PATCH i-g-t] igt/gem_measure_ring_size_inflight: Measure smallest inflight ring size
@ 2018-02-26 22:41 Antonio Argenziano
2018-02-26 22:56 ` Chris Wilson
` (5 more replies)
0 siblings, 6 replies; 10+ messages in thread
From: Antonio Argenziano @ 2018-02-26 22:41 UTC (permalink / raw)
To: igt-dev
Some tests measure the render's ring size but are actually meant to
measure the smallest across all engines. This patch adds measuring the
smallest size in gem_measure_ring_size_inflight() given the appropriate
parameter.
Suggested-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Antonio Argenziano <antonio.argenziano@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
---
lib/i915/gem_ring.c | 51 ++++++++++++++++++++++++++++++++++--------------
lib/i915/gem_ring.h | 3 +++
tests/gem_busy.c | 2 +-
tests/gem_exec_await.c | 2 +-
tests/gem_exec_fence.c | 2 +-
tests/gem_exec_latency.c | 2 +-
tests/gem_ringfill.c | 2 +-
7 files changed, 44 insertions(+), 20 deletions(-)
diff --git a/lib/i915/gem_ring.c b/lib/i915/gem_ring.c
index 7326673a..df379f1a 100644
--- a/lib/i915/gem_ring.c
+++ b/lib/i915/gem_ring.c
@@ -30,27 +30,14 @@
#include "drmtest.h"
#include "ioctl_wrappers.h"
#include "igt_dummyload.h"
+#include "igt_gt.h"
static void alarm_handler(int sig)
{
}
-/**
- * gem_measure_ring_inflight:
- * @fd: open i915 drm file descriptor
- * @engine: execbuf engine flag
- * @flags: flags to affect measurement:
- * - MEASURE_RING_NEW_CTX: use a new context to account for the space
- * used by the lrc init.
- *
- * This function calculates the maximum number of batches that can be inserted
- * at the same time in the ring on the selected engine.
- *
- * Returns:
- * Number of batches that fit in the ring
- */
unsigned int
-gem_measure_ring_inflight(int fd, unsigned int engine, enum measure_ring_flags flags)
+__gem_measure_ring_inflight(int fd, unsigned int engine, enum measure_ring_flags flags)
{
struct sigaction old_sa, sa = { .sa_handler = alarm_handler };
struct drm_i915_gem_exec_object2 obj[2];
@@ -115,3 +102,37 @@ gem_measure_ring_inflight(int fd, unsigned int engine, enum measure_ring_flags f
return count;
}
+
+/**
+ * gem_measure_ring_inflight:
+ * @fd: open i915 drm file descriptor
+ * @engine: execbuf engine flag. Use '~0u' to get the minimum size across
+ * all physical engines.
+ * @flags: flags to affect measurement:
+ * - MEASURE_RING_NEW_CTX: use a new context to account for the space
+ * used by the lrc init.
+ *
+ * This function calculates the maximum number of batches that can be inserted
+ * at the same time in the ring on the selected engine.
+ *
+ * Returns:
+ * Number of batches that fit in the ring
+ */
+unsigned int
+gem_measure_ring_inflight(int fd, unsigned int engine, enum measure_ring_flags flags)
+{
+ if (engine == ~0u) { /* Find minimum ring size across all engines */
+ unsigned int global_min = ~0u;
+
+ for_each_physical_engine(fd, engine) {
+ unsigned int engine_min = __gem_measure_ring_inflight(fd, engine, flags);
+
+ if (engine_min < global_min)
+ global_min = engine_min;
+ }
+
+ return global_min;
+ }
+
+ return __gem_measure_ring_inflight(fd, engine, flags);
+}
diff --git a/lib/i915/gem_ring.h b/lib/i915/gem_ring.h
index c69adce0..9fbce59e 100644
--- a/lib/i915/gem_ring.h
+++ b/lib/i915/gem_ring.h
@@ -30,6 +30,9 @@ enum measure_ring_flags {
MEASURE_RING_NEW_CTX = 1
};
+unsigned int
+__gem_measure_ring_inflight(int fd, unsigned int engine, enum measure_ring_flags flags);
+
unsigned int
gem_measure_ring_inflight(int fd, unsigned int engine, enum measure_ring_flags flags);
diff --git a/tests/gem_busy.c b/tests/gem_busy.c
index fcff51a2..0460877e 100644
--- a/tests/gem_busy.c
+++ b/tests/gem_busy.c
@@ -301,7 +301,7 @@ static void xchg_u32(void *array, unsigned i, unsigned j)
static void close_race(int fd)
{
const unsigned int ncpus = sysconf(_SC_NPROCESSORS_ONLN);
- const unsigned int nhandles = gem_measure_ring_inflight(fd, 0, 0) / 2;
+ const unsigned int nhandles = gem_measure_ring_inflight(fd, ~0u, 0) / 2;
unsigned int engines[16], nengine;
unsigned long *control;
uint32_t *handles;
diff --git a/tests/gem_exec_await.c b/tests/gem_exec_await.c
index 2ff180b0..255e0400 100644
--- a/tests/gem_exec_await.c
+++ b/tests/gem_exec_await.c
@@ -234,7 +234,7 @@ igt_main
igt_require_gem(device);
gem_submission_print_method(device);
- ring_size = gem_measure_ring_inflight(device, 0, 0) - 10;
+ ring_size = gem_measure_ring_inflight(device, ~0u, 0) - 10;
if (!gem_has_execlists(device))
ring_size /= 2;
igt_info("Ring size: %d batches\n", ring_size);
diff --git a/tests/gem_exec_fence.c b/tests/gem_exec_fence.c
index 93ed3b9b..45c9eb83 100644
--- a/tests/gem_exec_fence.c
+++ b/tests/gem_exec_fence.c
@@ -1537,7 +1537,7 @@ igt_main
long ring_size = 0;
igt_fixture {
- ring_size = gem_measure_ring_inflight(i915, 0, 0) - 1;
+ ring_size = gem_measure_ring_inflight(i915, ~0u, 0) - 1;
igt_info("Ring size: %ld batches\n", ring_size);
igt_require(ring_size);
diff --git a/tests/gem_exec_latency.c b/tests/gem_exec_latency.c
index f0e13419..e6bbeb9e 100644
--- a/tests/gem_exec_latency.c
+++ b/tests/gem_exec_latency.c
@@ -363,7 +363,7 @@ igt_main
gem_submission_print_method(device);
- ring_size = gem_measure_ring_inflight(device, 0, 0);
+ ring_size = gem_measure_ring_inflight(device, ~0u, 0);
igt_info("Ring size: %d batches\n", ring_size);
igt_require(ring_size > 8);
ring_size -= 8; /* leave some spare */
diff --git a/tests/gem_ringfill.c b/tests/gem_ringfill.c
index eea1d403..cd9ae6c8 100644
--- a/tests/gem_ringfill.c
+++ b/tests/gem_ringfill.c
@@ -272,7 +272,7 @@ igt_main
master = true;
}
- ring_size = gem_measure_ring_inflight(fd, 0, 0);
+ ring_size = gem_measure_ring_inflight(fd, ~0u, 0);
igt_info("Ring size: %d batches\n", ring_size);
igt_require(ring_size);
}
--
2.14.2
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [igt-dev] [PATCH i-g-t] igt/gem_measure_ring_size_inflight: Measure smallest inflight ring size
2018-02-26 22:41 [igt-dev] [PATCH i-g-t] igt/gem_measure_ring_size_inflight: Measure smallest inflight ring size Antonio Argenziano
@ 2018-02-26 22:56 ` Chris Wilson
2018-02-27 18:07 ` Antonio Argenziano
2018-02-26 23:07 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
` (4 subsequent siblings)
5 siblings, 1 reply; 10+ messages in thread
From: Chris Wilson @ 2018-02-26 22:56 UTC (permalink / raw)
To: Antonio Argenziano, igt-dev
Quoting Antonio Argenziano (2018-02-26 22:41:27)
> diff --git a/lib/i915/gem_ring.h b/lib/i915/gem_ring.h
> index c69adce0..9fbce59e 100644
> --- a/lib/i915/gem_ring.h
> +++ b/lib/i915/gem_ring.h
> @@ -30,6 +30,9 @@ enum measure_ring_flags {
> MEASURE_RING_NEW_CTX = 1
> };
>
> +unsigned int
> +__gem_measure_ring_inflight(int fd, unsigned int engine, enum measure_ring_flags flags);
Are you planning to measure the number of batches that can be sent to an
invalid engine, or something? Without a user, adding redundant API seems
overengineering.
Also on the agenda what to call gem_measure_inflight_contexts()?
gem_measure_contexts_inflight? Nah, should have called this
gem_measure_inflight_batches.
-Chris
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 10+ messages in thread
* [igt-dev] ✓ Fi.CI.BAT: success for igt/gem_measure_ring_size_inflight: Measure smallest inflight ring size
2018-02-26 22:41 [igt-dev] [PATCH i-g-t] igt/gem_measure_ring_size_inflight: Measure smallest inflight ring size Antonio Argenziano
2018-02-26 22:56 ` Chris Wilson
@ 2018-02-26 23:07 ` Patchwork
2018-02-27 1:45 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
` (3 subsequent siblings)
5 siblings, 0 replies; 10+ messages in thread
From: Patchwork @ 2018-02-26 23:07 UTC (permalink / raw)
To: Antonio Argenziano; +Cc: igt-dev
== Series Details ==
Series: igt/gem_measure_ring_size_inflight: Measure smallest inflight ring size
URL : https://patchwork.freedesktop.org/series/38990/
State : success
== Summary ==
IGT patchset tested on top of latest successful build
c68b8ee935c75fa4c946f2d97f64ffe9decef010 igt/gem_softpin: Only expect EINVAL for color-overlaps for user objects
with latest DRM-Tip kernel build CI_DRM_3834
3a86cab57850 drm-tip: 2018y-02m-26d-15h-41m-02s UTC integration manifest
No testlist changes.
---- Known issues:
Test debugfs_test:
Subgroup read_all_entries:
incomplete -> PASS (fi-snb-2520m) fdo#103713
fdo#103713 https://bugs.freedesktop.org/show_bug.cgi?id=103713
fi-bdw-5557u total:288 pass:267 dwarn:0 dfail:0 fail:0 skip:21 time:417s
fi-bdw-gvtdvm total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:423s
fi-blb-e6850 total:288 pass:223 dwarn:1 dfail:0 fail:0 skip:64 time:375s
fi-bsw-n3050 total:288 pass:242 dwarn:0 dfail:0 fail:0 skip:46 time:489s
fi-bwr-2160 total:288 pass:183 dwarn:0 dfail:0 fail:0 skip:105 time:286s
fi-bxt-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:482s
fi-bxt-j4205 total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:483s
fi-byt-j1900 total:288 pass:253 dwarn:0 dfail:0 fail:0 skip:35 time:476s
fi-byt-n2820 total:288 pass:249 dwarn:0 dfail:0 fail:0 skip:39 time:465s
fi-cfl-8700k total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:391s
fi-cfl-s2 total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:561s
fi-elk-e7500 total:288 pass:229 dwarn:0 dfail:0 fail:0 skip:59 time:419s
fi-gdg-551 total:288 pass:179 dwarn:0 dfail:0 fail:1 skip:108 time:287s
fi-glk-1 total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:511s
fi-hsw-4770 total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:393s
fi-ilk-650 total:288 pass:228 dwarn:0 dfail:0 fail:0 skip:60 time:412s
fi-ivb-3520m total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:457s
fi-ivb-3770 total:288 pass:255 dwarn:0 dfail:0 fail:0 skip:33 time:410s
fi-kbl-7500u total:288 pass:263 dwarn:1 dfail:0 fail:0 skip:24 time:453s
fi-kbl-7560u total:288 pass:269 dwarn:0 dfail:0 fail:0 skip:19 time:491s
fi-kbl-7567u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:449s
fi-kbl-r total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:492s
fi-pnv-d510 total:288 pass:222 dwarn:1 dfail:0 fail:0 skip:65 time:586s
fi-skl-6260u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:425s
fi-skl-6600u total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:503s
fi-skl-6700hq total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:524s
fi-skl-6700k2 total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:493s
fi-skl-6770hq total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:477s
fi-skl-guc total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:406s
fi-skl-gvtdvm total:288 pass:265 dwarn:0 dfail:0 fail:0 skip:23 time:431s
fi-snb-2520m total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:529s
fi-snb-2600 total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:395s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_1009/issues.html
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 10+ messages in thread
* [igt-dev] ✓ Fi.CI.IGT: success for igt/gem_measure_ring_size_inflight: Measure smallest inflight ring size
2018-02-26 22:41 [igt-dev] [PATCH i-g-t] igt/gem_measure_ring_size_inflight: Measure smallest inflight ring size Antonio Argenziano
2018-02-26 22:56 ` Chris Wilson
2018-02-26 23:07 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
@ 2018-02-27 1:45 ` Patchwork
2018-02-28 23:21 ` [igt-dev] [PATCH i-g-t v2] " Antonio Argenziano
` (2 subsequent siblings)
5 siblings, 0 replies; 10+ messages in thread
From: Patchwork @ 2018-02-27 1:45 UTC (permalink / raw)
To: Antonio Argenziano; +Cc: igt-dev
== Series Details ==
Series: igt/gem_measure_ring_size_inflight: Measure smallest inflight ring size
URL : https://patchwork.freedesktop.org/series/38990/
State : success
== Summary ==
---- Known issues:
Test gem_eio:
Subgroup in-flight:
pass -> INCOMPLETE (shard-apl) fdo#104945 +1
Test kms_cursor_legacy:
Subgroup flip-vs-cursor-toggle:
pass -> FAIL (shard-hsw) fdo#102670
Test kms_flip:
Subgroup dpms-vs-vblank-race-interruptible:
fail -> PASS (shard-hsw) fdo#103060
Subgroup plain-flip-fb-recreate-interruptible:
fail -> PASS (shard-hsw) fdo#100368
Test kms_flip_tiling:
Subgroup flip-yf-tiled:
fail -> PASS (shard-apl) fdo#103822
Test kms_rotation_crc:
Subgroup primary-rotation-180:
fail -> PASS (shard-hsw) fdo#103925
fdo#104945 https://bugs.freedesktop.org/show_bug.cgi?id=104945
fdo#102670 https://bugs.freedesktop.org/show_bug.cgi?id=102670
fdo#103060 https://bugs.freedesktop.org/show_bug.cgi?id=103060
fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#103822 https://bugs.freedesktop.org/show_bug.cgi?id=103822
fdo#103925 https://bugs.freedesktop.org/show_bug.cgi?id=103925
shard-apl total:3403 pass:1784 dwarn:1 dfail:0 fail:7 skip:1608 time:11652s
shard-hsw total:3558 pass:1815 dwarn:1 dfail:0 fail:2 skip:1739 time:12019s
shard-snb total:3460 pass:1359 dwarn:1 dfail:0 fail:1 skip:2099 time:6654s
Blacklisted hosts:
shard-kbl total:3362 pass:1882 dwarn:1 dfail:0 fail:7 skip:1470 time:8883s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_1009/shards.html
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [igt-dev] [PATCH i-g-t] igt/gem_measure_ring_size_inflight: Measure smallest inflight ring size
2018-02-26 22:56 ` Chris Wilson
@ 2018-02-27 18:07 ` Antonio Argenziano
0 siblings, 0 replies; 10+ messages in thread
From: Antonio Argenziano @ 2018-02-27 18:07 UTC (permalink / raw)
To: Chris Wilson, igt-dev
On 26/02/18 14:56, Chris Wilson wrote:
> Quoting Antonio Argenziano (2018-02-26 22:41:27)
>> diff --git a/lib/i915/gem_ring.h b/lib/i915/gem_ring.h
>> index c69adce0..9fbce59e 100644
>> --- a/lib/i915/gem_ring.h
>> +++ b/lib/i915/gem_ring.h
>> @@ -30,6 +30,9 @@ enum measure_ring_flags {
>> MEASURE_RING_NEW_CTX = 1
>> };
>>
>> +unsigned int
>> +__gem_measure_ring_inflight(int fd, unsigned int engine, enum measure_ring_flags flags);
>
> Are you planning to measure the number of batches that can be sent to an
> invalid engine, or something? Without a user, adding redundant API seems
> overengineering.
Agreed, I'll get rid of that extra API.
Thanks,
Antonio
>
> Also on the agenda what to call gem_measure_inflight_contexts()?
> gem_measure_contexts_inflight? Nah, should have called this
> gem_measure_inflight_batches.
> -Chris
>
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 10+ messages in thread
* [igt-dev] [PATCH i-g-t v2] igt/gem_measure_ring_size_inflight: Measure smallest inflight ring size
2018-02-26 22:41 [igt-dev] [PATCH i-g-t] igt/gem_measure_ring_size_inflight: Measure smallest inflight ring size Antonio Argenziano
` (2 preceding siblings ...)
2018-02-27 1:45 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
@ 2018-02-28 23:21 ` Antonio Argenziano
2018-03-01 7:56 ` Chris Wilson
2018-02-28 23:48 ` [igt-dev] ✓ Fi.CI.BAT: success for igt/gem_measure_ring_size_inflight: Measure smallest inflight ring size (rev2) Patchwork
2018-03-01 4:36 ` [igt-dev] ✗ Fi.CI.IGT: warning " Patchwork
5 siblings, 1 reply; 10+ messages in thread
From: Antonio Argenziano @ 2018-02-28 23:21 UTC (permalink / raw)
To: igt-dev
Some tests measure the render's ring size but are actually meant to
measure the smallest across all engines. This patch adds measuring the
smallest size in gem_measure_ring_size_inflight() given the appropriate
parameter.
v2:
- Only expose high level API. (Chris)
Suggested-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Antonio Argenziano <antonio.argenziano@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
---
lib/i915/gem_ring.c | 53 +++++++++++++++++++++++++++++++++---------------
tests/gem_busy.c | 2 +-
tests/gem_exec_await.c | 2 +-
tests/gem_exec_fence.c | 2 +-
tests/gem_exec_latency.c | 2 +-
tests/gem_ringfill.c | 2 +-
6 files changed, 42 insertions(+), 21 deletions(-)
diff --git a/lib/i915/gem_ring.c b/lib/i915/gem_ring.c
index 7326673a..fcb7be7f 100644
--- a/lib/i915/gem_ring.c
+++ b/lib/i915/gem_ring.c
@@ -30,27 +30,14 @@
#include "drmtest.h"
#include "ioctl_wrappers.h"
#include "igt_dummyload.h"
+#include "igt_gt.h"
static void alarm_handler(int sig)
{
}
-/**
- * gem_measure_ring_inflight:
- * @fd: open i915 drm file descriptor
- * @engine: execbuf engine flag
- * @flags: flags to affect measurement:
- * - MEASURE_RING_NEW_CTX: use a new context to account for the space
- * used by the lrc init.
- *
- * This function calculates the maximum number of batches that can be inserted
- * at the same time in the ring on the selected engine.
- *
- * Returns:
- * Number of batches that fit in the ring
- */
-unsigned int
-gem_measure_ring_inflight(int fd, unsigned int engine, enum measure_ring_flags flags)
+static unsigned int
+__gem_measure_ring_inflight(int fd, unsigned int engine, enum measure_ring_flags flags)
{
struct sigaction old_sa, sa = { .sa_handler = alarm_handler };
struct drm_i915_gem_exec_object2 obj[2];
@@ -115,3 +102,37 @@ gem_measure_ring_inflight(int fd, unsigned int engine, enum measure_ring_flags f
return count;
}
+
+/**
+ * gem_measure_ring_inflight:
+ * @fd: open i915 drm file descriptor
+ * @engine: execbuf engine flag. Use '~0u' to get the minimum size across
+ * all physical engines.
+ * @flags: flags to affect measurement:
+ * - MEASURE_RING_NEW_CTX: use a new context to account for the space
+ * used by the lrc init.
+ *
+ * This function calculates the maximum number of batches that can be inserted
+ * at the same time in the ring on the selected engine.
+ *
+ * Returns:
+ * Number of batches that fit in the ring
+ */
+unsigned int
+gem_measure_ring_inflight(int fd, unsigned int engine, enum measure_ring_flags flags)
+{
+ if (engine == ~0u) { /* Find minimum ring size across all engines */
+ unsigned int global_min = ~0u;
+
+ for_each_physical_engine(fd, engine) {
+ unsigned int engine_min = __gem_measure_ring_inflight(fd, engine, flags);
+
+ if (engine_min < global_min)
+ global_min = engine_min;
+ }
+
+ return global_min;
+ }
+
+ return __gem_measure_ring_inflight(fd, engine, flags);
+}
diff --git a/tests/gem_busy.c b/tests/gem_busy.c
index fcff51a2..0460877e 100644
--- a/tests/gem_busy.c
+++ b/tests/gem_busy.c
@@ -301,7 +301,7 @@ static void xchg_u32(void *array, unsigned i, unsigned j)
static void close_race(int fd)
{
const unsigned int ncpus = sysconf(_SC_NPROCESSORS_ONLN);
- const unsigned int nhandles = gem_measure_ring_inflight(fd, 0, 0) / 2;
+ const unsigned int nhandles = gem_measure_ring_inflight(fd, ~0u, 0) / 2;
unsigned int engines[16], nengine;
unsigned long *control;
uint32_t *handles;
diff --git a/tests/gem_exec_await.c b/tests/gem_exec_await.c
index 2ff180b0..255e0400 100644
--- a/tests/gem_exec_await.c
+++ b/tests/gem_exec_await.c
@@ -234,7 +234,7 @@ igt_main
igt_require_gem(device);
gem_submission_print_method(device);
- ring_size = gem_measure_ring_inflight(device, 0, 0) - 10;
+ ring_size = gem_measure_ring_inflight(device, ~0u, 0) - 10;
if (!gem_has_execlists(device))
ring_size /= 2;
igt_info("Ring size: %d batches\n", ring_size);
diff --git a/tests/gem_exec_fence.c b/tests/gem_exec_fence.c
index 93ed3b9b..45c9eb83 100644
--- a/tests/gem_exec_fence.c
+++ b/tests/gem_exec_fence.c
@@ -1537,7 +1537,7 @@ igt_main
long ring_size = 0;
igt_fixture {
- ring_size = gem_measure_ring_inflight(i915, 0, 0) - 1;
+ ring_size = gem_measure_ring_inflight(i915, ~0u, 0) - 1;
igt_info("Ring size: %ld batches\n", ring_size);
igt_require(ring_size);
diff --git a/tests/gem_exec_latency.c b/tests/gem_exec_latency.c
index f0e13419..e6bbeb9e 100644
--- a/tests/gem_exec_latency.c
+++ b/tests/gem_exec_latency.c
@@ -363,7 +363,7 @@ igt_main
gem_submission_print_method(device);
- ring_size = gem_measure_ring_inflight(device, 0, 0);
+ ring_size = gem_measure_ring_inflight(device, ~0u, 0);
igt_info("Ring size: %d batches\n", ring_size);
igt_require(ring_size > 8);
ring_size -= 8; /* leave some spare */
diff --git a/tests/gem_ringfill.c b/tests/gem_ringfill.c
index eea1d403..cd9ae6c8 100644
--- a/tests/gem_ringfill.c
+++ b/tests/gem_ringfill.c
@@ -272,7 +272,7 @@ igt_main
master = true;
}
- ring_size = gem_measure_ring_inflight(fd, 0, 0);
+ ring_size = gem_measure_ring_inflight(fd, ~0u, 0);
igt_info("Ring size: %d batches\n", ring_size);
igt_require(ring_size);
}
--
2.14.2
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [igt-dev] ✓ Fi.CI.BAT: success for igt/gem_measure_ring_size_inflight: Measure smallest inflight ring size (rev2)
2018-02-26 22:41 [igt-dev] [PATCH i-g-t] igt/gem_measure_ring_size_inflight: Measure smallest inflight ring size Antonio Argenziano
` (3 preceding siblings ...)
2018-02-28 23:21 ` [igt-dev] [PATCH i-g-t v2] " Antonio Argenziano
@ 2018-02-28 23:48 ` Patchwork
2018-03-01 4:36 ` [igt-dev] ✗ Fi.CI.IGT: warning " Patchwork
5 siblings, 0 replies; 10+ messages in thread
From: Patchwork @ 2018-02-28 23:48 UTC (permalink / raw)
To: Antonio Argenziano; +Cc: igt-dev
== Series Details ==
Series: igt/gem_measure_ring_size_inflight: Measure smallest inflight ring size (rev2)
URL : https://patchwork.freedesktop.org/series/38990/
State : success
== Summary ==
IGT patchset tested on top of latest successful build
0d47ec161b4eca1b41c5348604aa05b105e5d1cf tests/perf: Fix build warning
with latest DRM-Tip kernel build CI_DRM_3853
d8a07978aff3 drm-tip: 2018y-02m-28d-21h-21m-07s UTC integration manifest
No testlist changes.
---- Known issues:
Test debugfs_test:
Subgroup read_all_entries:
incomplete -> PASS (fi-snb-2520m) fdo#103713
Test prime_vgem:
Subgroup basic-fence-flip:
pass -> FAIL (fi-ilk-650) fdo#104008
fdo#103713 https://bugs.freedesktop.org/show_bug.cgi?id=103713
fdo#104008 https://bugs.freedesktop.org/show_bug.cgi?id=104008
fi-bdw-5557u total:288 pass:267 dwarn:0 dfail:0 fail:0 skip:21 time:417s
fi-blb-e6850 total:288 pass:223 dwarn:1 dfail:0 fail:0 skip:64 time:375s
fi-bsw-n3050 total:288 pass:242 dwarn:0 dfail:0 fail:0 skip:46 time:487s
fi-bwr-2160 total:288 pass:183 dwarn:0 dfail:0 fail:0 skip:105 time:286s
fi-bxt-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:481s
fi-bxt-j4205 total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:482s
fi-byt-j1900 total:288 pass:253 dwarn:0 dfail:0 fail:0 skip:35 time:476s
fi-byt-n2820 total:288 pass:249 dwarn:0 dfail:0 fail:0 skip:39 time:466s
fi-cfl-8700k total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:394s
fi-cfl-s2 total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:569s
fi-cnl-y3 total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:576s
fi-elk-e7500 total:288 pass:229 dwarn:0 dfail:0 fail:0 skip:59 time:419s
fi-gdg-551 total:288 pass:179 dwarn:0 dfail:0 fail:1 skip:108 time:285s
fi-glk-1 total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:509s
fi-hsw-4770 total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:394s
fi-ilk-650 total:288 pass:227 dwarn:0 dfail:0 fail:1 skip:60 time:416s
fi-ivb-3520m total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:456s
fi-ivb-3770 total:288 pass:255 dwarn:0 dfail:0 fail:0 skip:33 time:407s
fi-kbl-7500u total:288 pass:263 dwarn:1 dfail:0 fail:0 skip:24 time:450s
fi-kbl-7560u total:288 pass:269 dwarn:0 dfail:0 fail:0 skip:19 time:490s
fi-kbl-7567u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:451s
fi-kbl-r total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:499s
fi-pnv-d510 total:288 pass:222 dwarn:1 dfail:0 fail:0 skip:65 time:588s
fi-skl-6260u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:424s
fi-skl-6600u total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:504s
fi-skl-6700hq total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:516s
fi-skl-6700k2 total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:486s
fi-skl-6770hq total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:469s
fi-skl-guc total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:406s
fi-skl-gvtdvm total:288 pass:265 dwarn:0 dfail:0 fail:0 skip:23 time:434s
fi-snb-2520m total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:520s
fi-snb-2600 total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:399s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_1030/issues.html
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 10+ messages in thread
* [igt-dev] ✗ Fi.CI.IGT: warning for igt/gem_measure_ring_size_inflight: Measure smallest inflight ring size (rev2)
2018-02-26 22:41 [igt-dev] [PATCH i-g-t] igt/gem_measure_ring_size_inflight: Measure smallest inflight ring size Antonio Argenziano
` (4 preceding siblings ...)
2018-02-28 23:48 ` [igt-dev] ✓ Fi.CI.BAT: success for igt/gem_measure_ring_size_inflight: Measure smallest inflight ring size (rev2) Patchwork
@ 2018-03-01 4:36 ` Patchwork
5 siblings, 0 replies; 10+ messages in thread
From: Patchwork @ 2018-03-01 4:36 UTC (permalink / raw)
To: Antonio Argenziano; +Cc: igt-dev
== Series Details ==
Series: igt/gem_measure_ring_size_inflight: Measure smallest inflight ring size (rev2)
URL : https://patchwork.freedesktop.org/series/38990/
State : warning
== Summary ==
---- Possible new issues:
Test gem_tiled_blits:
Subgroup interruptible:
pass -> SKIP (shard-apl)
Test pm_rpm:
Subgroup system-suspend-modeset:
incomplete -> PASS (shard-hsw)
---- Known issues:
Test gem_eio:
Subgroup in-flight:
incomplete -> PASS (shard-apl) fdo#104945
Test gem_softpin:
Subgroup noreloc-s3:
pass -> SKIP (shard-snb) fdo#103375
Test kms_flip:
Subgroup 2x-plain-flip-ts-check-interruptible:
fail -> PASS (shard-hsw) fdo#100368 +3
Subgroup flip-vs-expired-vblank-interruptible:
pass -> FAIL (shard-hsw) fdo#102887 +1
Subgroup modeset-vs-vblank-race-interruptible:
pass -> FAIL (shard-hsw) fdo#103060
Test kms_rotation_crc:
Subgroup primary-rotation-180:
pass -> FAIL (shard-snb) fdo#103925
Test kms_sysfs_edid_timing:
warn -> PASS (shard-apl) fdo#100047
Test perf:
Subgroup blocking:
pass -> FAIL (shard-hsw) fdo#102252
Subgroup enable-disable:
pass -> FAIL (shard-apl) fdo#103715
fdo#104945 https://bugs.freedesktop.org/show_bug.cgi?id=104945
fdo#103375 https://bugs.freedesktop.org/show_bug.cgi?id=103375
fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#102887 https://bugs.freedesktop.org/show_bug.cgi?id=102887
fdo#103060 https://bugs.freedesktop.org/show_bug.cgi?id=103060
fdo#103925 https://bugs.freedesktop.org/show_bug.cgi?id=103925
fdo#100047 https://bugs.freedesktop.org/show_bug.cgi?id=100047
fdo#102252 https://bugs.freedesktop.org/show_bug.cgi?id=102252
fdo#103715 https://bugs.freedesktop.org/show_bug.cgi?id=103715
shard-apl total:3460 pass:1817 dwarn:1 dfail:0 fail:9 skip:1633 time:12067s
shard-hsw total:3460 pass:1762 dwarn:1 dfail:0 fail:6 skip:1690 time:11746s
shard-snb total:3460 pass:1357 dwarn:1 dfail:0 fail:2 skip:2100 time:6556s
Blacklisted hosts:
shard-kbl total:3460 pass:1943 dwarn:1 dfail:0 fail:7 skip:1509 time:9392s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_1030/shards.html
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [igt-dev] [PATCH i-g-t v2] igt/gem_measure_ring_size_inflight: Measure smallest inflight ring size
2018-02-28 23:21 ` [igt-dev] [PATCH i-g-t v2] " Antonio Argenziano
@ 2018-03-01 7:56 ` Chris Wilson
2018-03-06 21:51 ` Antonio Argenziano
0 siblings, 1 reply; 10+ messages in thread
From: Chris Wilson @ 2018-03-01 7:56 UTC (permalink / raw)
To: Antonio Argenziano, igt-dev
Quoting Antonio Argenziano (2018-02-28 23:21:04)
> Some tests measure the render's ring size but are actually meant to
> measure the smallest across all engines. This patch adds measuring the
> smallest size in gem_measure_ring_size_inflight() given the appropriate
> parameter.
>
> v2:
> - Only expose high level API. (Chris)
>
> Suggested-by: Chris Wilson <chris@chris-wilson.co.uk>
> Signed-off-by: Antonio Argenziano <antonio.argenziano@intel.com>
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
If you want another challenge, find all the places where I've used -1 or
~0u to indicate ALL_ENGINES (and replace with #define ALL_ENGINES) :)
-Chris
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [igt-dev] [PATCH i-g-t v2] igt/gem_measure_ring_size_inflight: Measure smallest inflight ring size
2018-03-01 7:56 ` Chris Wilson
@ 2018-03-06 21:51 ` Antonio Argenziano
0 siblings, 0 replies; 10+ messages in thread
From: Antonio Argenziano @ 2018-03-06 21:51 UTC (permalink / raw)
To: Chris Wilson, igt-dev
On 28/02/18 23:56, Chris Wilson wrote:
> Quoting Antonio Argenziano (2018-02-28 23:21:04)
>> Some tests measure the render's ring size but are actually meant to
>> measure the smallest across all engines. This patch adds measuring the
>> smallest size in gem_measure_ring_size_inflight() given the appropriate
>> parameter.
>>
>> v2:
>> - Only expose high level API. (Chris)
>>
>> Suggested-by: Chris Wilson <chris@chris-wilson.co.uk>
>> Signed-off-by: Antonio Argenziano <antonio.argenziano@intel.com>
>> Cc: Chris Wilson <chris@chris-wilson.co.uk>
>
> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
>
> If you want another challenge, find all the places where I've used -1 or
> ~0u to indicate ALL_ENGINES (and replace with #define ALL_ENGINES) :)
https://paste.debian.net/1013505/ is all the places I could find.
Pretty sure I've missed some.
Thanks,
Antonio
> -Chris
>
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2018-03-06 21:51 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-02-26 22:41 [igt-dev] [PATCH i-g-t] igt/gem_measure_ring_size_inflight: Measure smallest inflight ring size Antonio Argenziano
2018-02-26 22:56 ` Chris Wilson
2018-02-27 18:07 ` Antonio Argenziano
2018-02-26 23:07 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
2018-02-27 1:45 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
2018-02-28 23:21 ` [igt-dev] [PATCH i-g-t v2] " Antonio Argenziano
2018-03-01 7:56 ` Chris Wilson
2018-03-06 21:51 ` Antonio Argenziano
2018-02-28 23:48 ` [igt-dev] ✓ Fi.CI.BAT: success for igt/gem_measure_ring_size_inflight: Measure smallest inflight ring size (rev2) Patchwork
2018-03-01 4:36 ` [igt-dev] ✗ Fi.CI.IGT: warning " Patchwork
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.