[PATCH igt 1/2] lib: Refactor igt_wait() to use library timers

[PATCH igt 1/2] lib: Refactor igt_wait() to use library timers

[Chris Wilson]

Use the timer routines for computing elapsed time from igt_core for
smaller code.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 lib/igt_aux.h | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/lib/igt_aux.h b/lib/igt_aux.h
index 02e70126c..48ba7970f 100644
--- a/lib/igt_aux.h
+++ b/lib/igt_aux.h
@@ -29,6 +29,7 @@
 #define IGT_AUX_H
 
 #include <intel_bufmgr.h>
+#include <inttypes.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <sys/time.h>
@@ -251,28 +252,24 @@ void igt_unlock_mem(void);
  * True of COND evaluated to true, false otherwise.
  */
 #define igt_wait(COND, timeout_ms, interval_ms) ({			\
-	struct timeval start_, end_, diff_;				\
-	int elapsed_ms_;						\
-	bool ret_ = false;						\
+	struct timespec tv = {};					\
+	bool ret_;							\
 									\
-	igt_assert(gettimeofday(&start_, NULL) == 0);			\
 	do {								\
+		uint64_t elapsed = igt_nsec_elapsed(&tv) >> 20;		\
+									\
 		if (COND) {						\
+			igt_debug("%s took %"PRIu64"ms\n", #COND, elapsed); \
 			ret_ = true;					\
 			break;						\
+		}							\
+		if (elapsed > timeout_ms) {				\
+			ret_ = false;					\
+			break;						\
 		}							\
 									\
 		usleep(interval_ms * 1000);				\
-									\
-		igt_assert(gettimeofday(&end_, NULL) == 0);		\
-		timersub(&end_, &start_, &diff_);			\
-									\
-		elapsed_ms_ = diff_.tv_sec * 1000 +			\
-			      diff_.tv_usec / 1000;			\
-	} while (elapsed_ms_ < timeout_ms);				\
-									\
-	if (!ret_ && (COND))						\
-		ret_ = true;						\
+	} while (1);							\
 									\
 	ret_;								\
 })
-- 
2.15.1

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

[PATCH igt 2/2] igt/kms_frontbuffer_tracking: Bump the wait time for FBC

[Chris Wilson]

It is taking longer than a couple of seconds for the FBC worker to be
executed after scheduling; and then will take a minimum of a vblank
interval for it activate. So wait longer to reduce the flip flops.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 tests/kms_frontbuffer_tracking.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/kms_frontbuffer_tracking.c b/tests/kms_frontbuffer_tracking.c
index 79e4f5862..fb5627535 100644
--- a/tests/kms_frontbuffer_tracking.c
+++ b/tests/kms_frontbuffer_tracking.c
@@ -920,7 +920,7 @@ static bool fbc_stride_not_supported(void)
 
 static bool fbc_wait_until_enabled(void)
 {
-	return igt_wait(fbc_is_enabled(IGT_LOG_DEBUG), 2000, 1);
+	return igt_wait(fbc_is_enabled(IGT_LOG_DEBUG), 5000, 8);
 }
 
 static bool psr_wait_until_enabled(void)
-- 
2.15.1

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

✓ Fi.CI.BAT: success for series starting with [1/2] lib: Refactor igt_wait() to use library timers

[Patchwork]

== Series Details ==

Series: series starting with [1/2] lib: Refactor igt_wait() to use library timers
URL   : https://patchwork.freedesktop.org/series/37132/
State : success

== Summary ==

IGT patchset tested on top of latest successful build
872fd8f21e22a3ca49739b67c47c6665da450dbf tests/kms_ccs: Grab the CRC when the plane is actually enabled

with latest DRM-Tip kernel build CI_DRM_3684
804d087465e9 drm-tip: 2018y-01m-25d-18h-22m-16s UTC integration manifest

No testlist changes.

Test gem_mmap_gtt:
        Subgroup basic-small-bo-tiledx:
                pass       -> FAIL       (fi-gdg-551) fdo#102575
Test gem_ringfill:
        Subgroup basic-default-hang:
                pass       -> DMESG-WARN (fi-pnv-d510) fdo#101600

fdo#102575 https://bugs.freedesktop.org/show_bug.cgi?id=102575
fdo#101600 https://bugs.freedesktop.org/show_bug.cgi?id=101600

fi-bdw-5557u     total:288  pass:267  dwarn:0   dfail:0   fail:0   skip:21  time:425s
fi-bdw-gvtdvm    total:288  pass:264  dwarn:0   dfail:0   fail:0   skip:24  time:428s
fi-blb-e6850     total:288  pass:223  dwarn:1   dfail:0   fail:0   skip:64  time:373s
fi-bsw-n3050     total:288  pass:242  dwarn:0   dfail:0   fail:0   skip:46  time:492s
fi-bwr-2160      total:288  pass:183  dwarn:0   dfail:0   fail:0   skip:105 time:282s
fi-bxt-dsi       total:288  pass:258  dwarn:0   dfail:0   fail:0   skip:30  time:489s
fi-bxt-j4205     total:288  pass:259  dwarn:0   dfail:0   fail:0   skip:29  time:486s
fi-byt-j1900     total:288  pass:253  dwarn:0   dfail:0   fail:0   skip:35  time:473s
fi-byt-n2820     total:288  pass:249  dwarn:0   dfail:0   fail:0   skip:39  time:463s
fi-cnl-y2        total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:532s
fi-elk-e7500     total:224  pass:168  dwarn:10  dfail:0   fail:0   skip:45 
fi-gdg-551       total:288  pass:179  dwarn:0   dfail:0   fail:1   skip:108 time:278s
fi-glk-1         total:288  pass:260  dwarn:0   dfail:0   fail:0   skip:28  time:517s
fi-hsw-4770      total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:392s
fi-hsw-4770r     total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:402s
fi-ilk-650       total:288  pass:228  dwarn:0   dfail:0   fail:0   skip:60  time:417s
fi-ivb-3520m     total:288  pass:259  dwarn:0   dfail:0   fail:0   skip:29  time:465s
fi-ivb-3770      total:288  pass:255  dwarn:0   dfail:0   fail:0   skip:33  time:412s
fi-kbl-7500u     total:288  pass:263  dwarn:1   dfail:0   fail:0   skip:24  time:459s
fi-kbl-7560u     total:288  pass:269  dwarn:0   dfail:0   fail:0   skip:19  time:499s
fi-kbl-7567u     total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:457s
fi-kbl-r         total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:509s
fi-pnv-d510      total:288  pass:222  dwarn:1   dfail:0   fail:0   skip:65  time:579s
fi-skl-6260u     total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:433s
fi-skl-6600u     total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:510s
fi-skl-6700hq    total:288  pass:262  dwarn:0   dfail:0   fail:0   skip:26  time:534s
fi-skl-6700k2    total:288  pass:264  dwarn:0   dfail:0   fail:0   skip:24  time:489s
fi-skl-6770hq    total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:490s
fi-skl-guc       total:288  pass:260  dwarn:0   dfail:0   fail:0   skip:28  time:420s
fi-skl-gvtdvm    total:288  pass:265  dwarn:0   dfail:0   fail:0   skip:23  time:432s
fi-snb-2520m     total:288  pass:248  dwarn:0   dfail:0   fail:0   skip:40  time:526s
fi-snb-2600      total:288  pass:248  dwarn:0   dfail:0   fail:0   skip:40  time:405s
Blacklisted hosts:
fi-cfl-s2        total:288  pass:262  dwarn:0   dfail:0   fail:0   skip:26  time:564s
fi-glk-dsi       total:288  pass:257  dwarn:0   dfail:0   fail:1   skip:30  time:484s

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_826/issues.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✗ Fi.CI.IGT: failure for series starting with [1/2] lib: Refactor igt_wait() to use library timers

[Patchwork]

== Series Details ==

Series: series starting with [1/2] lib: Refactor igt_wait() to use library timers
URL   : https://patchwork.freedesktop.org/series/37132/
State : failure

== Summary ==

Test kms_pipe_crc_basic:
        Subgroup suspend-read-crc-pipe-b:
                pass       -> SKIP       (shard-snb) fdo#103375
Test kms_setmode:
        Subgroup basic:
                fail       -> PASS       (shard-hsw) fdo#99912
Test kms_flip:
        Subgroup 2x-plain-flip-ts-check:
                pass       -> FAIL       (shard-hsw)
        Subgroup modeset-vs-vblank-race-interruptible:
                fail       -> PASS       (shard-apl) fdo#103060
        Subgroup plain-flip-fb-recreate:
                pass       -> FAIL       (shard-apl) fdo#100368
Test perf_pmu:
        Subgroup busy-double-start-vecs0:
                pass       -> INCOMPLETE (shard-apl) fdo#103927
Test gem_eio:
        Subgroup in-flight-contexts:
                fail       -> PASS       (shard-hsw) fdo#104676

fdo#103375 https://bugs.freedesktop.org/show_bug.cgi?id=103375
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
fdo#103060 https://bugs.freedesktop.org/show_bug.cgi?id=103060
fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#103927 https://bugs.freedesktop.org/show_bug.cgi?id=103927
fdo#104676 https://bugs.freedesktop.org/show_bug.cgi?id=104676

shard-apl        total:2823 pass:1742 dwarn:1   dfail:0   fail:21  skip:1058 time:12074s
shard-hsw        total:2838 pass:1736 dwarn:1   dfail:0   fail:10  skip:1090 time:11921s
shard-snb        total:2838 pass:1329 dwarn:1   dfail:0   fail:10  skip:1498 time:6655s
Blacklisted hosts:
shard-kbl        total:2799 pass:1777 dwarn:67  dfail:1   fail:21  skip:931 time:9157s

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_826/shards.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH igt 1/2] lib: Refactor igt_wait() to use library timers

[Antonio Argenziano]

On 25/01/18 13:28, Chris Wilson wrote:
> Use the timer routines for computing elapsed time from igt_core for
> smaller code.
> 
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> ---
>   lib/igt_aux.h | 25 +++++++++++--------------
>   1 file changed, 11 insertions(+), 14 deletions(-)
> 
> diff --git a/lib/igt_aux.h b/lib/igt_aux.h
> index 02e70126c..48ba7970f 100644
> --- a/lib/igt_aux.h
> +++ b/lib/igt_aux.h
> @@ -29,6 +29,7 @@
>   #define IGT_AUX_H
>   
>   #include <intel_bufmgr.h>
> +#include <inttypes.h>
>   #include <stdbool.h>
>   #include <stddef.h>
>   #include <sys/time.h>
> @@ -251,28 +252,24 @@ void igt_unlock_mem(void);
>    * True of COND evaluated to true, false otherwise.
>    */
>   #define igt_wait(COND, timeout_ms, interval_ms) ({			\
> -	struct timeval start_, end_, diff_;				\
> -	int elapsed_ms_;						\
> -	bool ret_ = false;						\
> +	struct timespec tv = {};					\
> +	bool ret_;							\
>   									\
> -	igt_assert(gettimeofday(&start_, NULL) == 0);			\
>   	do {								\
> +		uint64_t elapsed = igt_nsec_elapsed(&tv) >> 20;		\

Maybe tv_ and elapsed_ just for consistency.

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

> +									\
>   		if (COND) {						\
> +			igt_debug("%s took %"PRIu64"ms\n", #COND, elapsed); \
>   			ret_ = true;					\
>   			break;						\
> +		}							\
> +		if (elapsed > timeout_ms) {				\
> +			ret_ = false;					\
> +			break;						\
>   		}							\
>   									\
>   		usleep(interval_ms * 1000);				\
> -									\
> -		igt_assert(gettimeofday(&end_, NULL) == 0);		\
> -		timersub(&end_, &start_, &diff_);			\
> -									\
> -		elapsed_ms_ = diff_.tv_sec * 1000 +			\
> -			      diff_.tv_usec / 1000;			\
> -	} while (elapsed_ms_ < timeout_ms);				\
> -									\
> -	if (!ret_ && (COND))						\
> -		ret_ = true;						\
> +	} while (1);							\
>   									\
>   	ret_;								\
>   })
> 
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH igt 1/2] lib: Refactor igt_wait() to use library timers

[Chris Wilson]

Quoting Antonio Argenziano (2018-01-26 16:50:15)
> 
> 
> On 25/01/18 13:28, Chris Wilson wrote:
> > Use the timer routines for computing elapsed time from igt_core for
> > smaller code.
> > 
> > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> > ---
> >   lib/igt_aux.h | 25 +++++++++++--------------
> >   1 file changed, 11 insertions(+), 14 deletions(-)
> > 
> > diff --git a/lib/igt_aux.h b/lib/igt_aux.h
> > index 02e70126c..48ba7970f 100644
> > --- a/lib/igt_aux.h
> > +++ b/lib/igt_aux.h
> > @@ -29,6 +29,7 @@
> >   #define IGT_AUX_H
> >   
> >   #include <intel_bufmgr.h>
> > +#include <inttypes.h>
> >   #include <stdbool.h>
> >   #include <stddef.h>
> >   #include <sys/time.h>
> > @@ -251,28 +252,24 @@ void igt_unlock_mem(void);
> >    * True of COND evaluated to true, false otherwise.
> >    */
> >   #define igt_wait(COND, timeout_ms, interval_ms) ({                  \
> > -     struct timeval start_, end_, diff_;                             \
> > -     int elapsed_ms_;                                                \
> > -     bool ret_ = false;                                              \
> > +     struct timespec tv = {};                                        \
> > +     bool ret_;                                                      \
> >                                                                       \
> > -     igt_assert(gettimeofday(&start_, NULL) == 0);                   \
> >       do {                                                            \
> > +             uint64_t elapsed = igt_nsec_elapsed(&tv) >> 20;         \
> 
> Maybe tv_ and elapsed_ just for consistency.
> 
> Reviewed-by: Antonio Argenziano <antonio.argenziano@intel.com>

Corrected and pushed, thanks!
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH igt 2/2] igt/kms_frontbuffer_tracking: Bump the wait time for FBC

[Chris Wilson]

Quoting Chris Wilson (2018-01-25 21:28:49)
> It is taking longer than a couple of seconds for the FBC worker to be
> executed after scheduling; and then will take a minimum of a vblank
> interval for it activate. So wait longer to reduce the flip flops.
> 
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

Any acks?

> ---
>  tests/kms_frontbuffer_tracking.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tests/kms_frontbuffer_tracking.c b/tests/kms_frontbuffer_tracking.c
> index 79e4f5862..fb5627535 100644
> --- a/tests/kms_frontbuffer_tracking.c
> +++ b/tests/kms_frontbuffer_tracking.c
> @@ -920,7 +920,7 @@ static bool fbc_stride_not_supported(void)
>  
>  static bool fbc_wait_until_enabled(void)
>  {
> -       return igt_wait(fbc_is_enabled(IGT_LOG_DEBUG), 2000, 1);
> +       return igt_wait(fbc_is_enabled(IGT_LOG_DEBUG), 5000, 8);
>  }
>  
>  static bool psr_wait_until_enabled(void)
> -- 
> 2.15.1
> 
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH igt 2/2] igt/kms_frontbuffer_tracking: Bump the wait time for FBC

[Chris Wilson]

Quoting Chris Wilson (2018-01-26 21:39:28)
> Quoting Chris Wilson (2018-01-25 21:28:49)
> > It is taking longer than a couple of seconds for the FBC worker to be
> > executed after scheduling; and then will take a minimum of a vblank
> > interval for it activate. So wait longer to reduce the flip flops.
> > 
> > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> 
> Any acks?

Still looking for a response here. CI says that 2s isn't enough for FBC
to kick in (it spends most of that time waiting for an invalidate, and
then at the every end about 5ms waiting for the next vblank).

In terms of human response, we don't care so much how long it takes to
enable FBC, but how long it takes to disable; similarly for PSR. The
downside to it taking longer than expected to enable FBC is power
consumption. Is the display block hooked up to rapl?
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH igt 2/2] igt/kms_frontbuffer_tracking: Bump the wait time for FBC

[Rodrigo Vivi]

On Sat, Feb 03, 2018 at 10:13:36AM +0000, Chris Wilson wrote:
> Quoting Chris Wilson (2018-01-26 21:39:28)
> > Quoting Chris Wilson (2018-01-25 21:28:49)
> > > It is taking longer than a couple of seconds for the FBC worker to be
> > > executed after scheduling; and then will take a minimum of a vblank
> > > interval for it activate. So wait longer to reduce the flip flops.
> > > 
> > > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> > 
> > Any acks?
> 
> Still looking for a response here. CI says that 2s isn't enough for FBC
> to kick in (it spends most of that time waiting for an invalidate, and
> then at the every end about 5ms waiting for the next vblank).
> 
> In terms of human response, we don't care so much how long it takes to
> enable FBC, but how long it takes to disable; similarly for PSR. The
> downside to it taking longer than expected to enable FBC is power
> consumption. Is the display block hooked up to rapl?

Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

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