[i-g-t] i915/gem_blits: Use common igt_fls()
diff mbox series

Message ID 20191109151002.20767-1-chris@chris-wilson.co.uk
State New
Headers show
Series
  • [i-g-t] i915/gem_blits: Use common igt_fls()
Related show

Commit Message

Chris Wilson Nov. 9, 2019, 3:10 p.m. UTC
igt_aux.h already provides the optimal igt_fls(), so use that in
preference to open coding the brute force version.

Reported-by: Stuart Summers <stuart.summers@intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Stuart Summers <stuart.summers@intel.com>
---
 tests/i915/gem_blits.c | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

Comments

Arkadiusz Hiler Nov. 11, 2019, 10:47 a.m. UTC | #1
On Sat, Nov 09, 2019 at 03:10:02PM +0000, Chris Wilson wrote:
> igt_aux.h already provides the optimal igt_fls(), so use that in
> preference to open coding the brute force version.
> 
> Reported-by: Stuart Summers <stuart.summers@intel.com>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Stuart Summers <stuart.summers@intel.com>
Reviewed-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Summers, Stuart Nov. 13, 2019, 8:38 p.m. UTC | #2
On Sat, 2019-11-09 at 15:10 +0000, Chris Wilson wrote:
> igt_aux.h already provides the optimal igt_fls(), so use that in
> preference to open coding the brute force version.
> 
> Reported-by: Stuart Summers <stuart.summers@intel.com>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Stuart Summers <stuart.summers@intel.com>

Thanks for the look here Chris :)

-Stuart

> ---
>  tests/i915/gem_blits.c | 12 +-----------
>  1 file changed, 1 insertion(+), 11 deletions(-)
> 
> diff --git a/tests/i915/gem_blits.c b/tests/i915/gem_blits.c
> index e0346a7c7..f9cb12bb8 100644
> --- a/tests/i915/gem_blits.c
> +++ b/tests/i915/gem_blits.c
> @@ -57,16 +57,6 @@ enum mode {
>  	WC,
>  };
>  
> -static int fls(uint64_t x)
> -{
> -	int t;
> -
> -	for (t = 0; x >> t; t++)
> -		;
> -
> -	return t;
> -}
> -
>  static unsigned int
>  get_tiling_stride(const struct device *device,
>  		  unsigned int width, unsigned int tiling)
> @@ -81,7 +71,7 @@ get_tiling_stride(const struct device *device,
>  		else
>  			stride = ALIGN(stride, 128);
>  		if (device->gen < 4)
> -			stride = 1 << fls(stride - 1);
> +			stride = 1 << igt_fls(stride - 1);
>  	} else {
>  		if (device->gen >= 8)
>  			stride = ALIGN(stride, 64);

Patch
diff mbox series

diff --git a/tests/i915/gem_blits.c b/tests/i915/gem_blits.c
index e0346a7c7..f9cb12bb8 100644
--- a/tests/i915/gem_blits.c
+++ b/tests/i915/gem_blits.c
@@ -57,16 +57,6 @@  enum mode {
 	WC,
 };
 
-static int fls(uint64_t x)
-{
-	int t;
-
-	for (t = 0; x >> t; t++)
-		;
-
-	return t;
-}
-
 static unsigned int
 get_tiling_stride(const struct device *device,
 		  unsigned int width, unsigned int tiling)
@@ -81,7 +71,7 @@  get_tiling_stride(const struct device *device,
 		else
 			stride = ALIGN(stride, 128);
 		if (device->gen < 4)
-			stride = 1 << fls(stride - 1);
+			stride = 1 << igt_fls(stride - 1);
 	} else {
 		if (device->gen >= 8)
 			stride = ALIGN(stride, 64);