Re: [PATCH] drm/format-helper: Use KUNIT_EXPECT_MEMEQ macro

2023-02-02 Thread Maíra Canal 

On 2/1/23 04:10, Thomas Zimmermann wrote:



Am 30.01.23 um 13:55 schrieb Maíra Canal:

Commit b8a926bea8b1 ("kunit: Introduce KUNIT_EXPECT_MEMEQ and
KUNIT_EXPECT_MEMNEQ macros") introduced a new macro to compare blocks of
memory and, if the test fails, print the result in a human-friendly
format. Therefore, use KUNIT_EXPECT_MEMEQ to compare memory blocks in
replacement of the KUNIT_EXPECT_EQ macro.

Signed-off-by: Maíra Canal 


Reviewed-by: Thomas Zimmermann 


Applied to drm-misc-next!

Best Regards,
- Maíra Canal




---
  drivers/gpu/drm/tests/drm_format_helper_test.c | 10 +-
  1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/tests/drm_format_helper_test.c 
b/drivers/gpu/drm/tests/drm_format_helper_test.c
index 34e80eb6d96e..9536829c6e3a 100644
--- a/drivers/gpu/drm/tests/drm_format_helper_test.c
+++ b/drivers/gpu/drm/tests/drm_format_helper_test.c
@@ -597,7 +597,7 @@ static void drm_test_fb_xrgb_to_xrgb1555(struct kunit 
*test)
  drm_fb_xrgb_to_xrgb1555(, >dst_pitch, , , 
>clip);
  buf = le16buf_to_cpu(test, (__force const __le16 *)buf, dst_size / 
sizeof(__le16));
-    KUNIT_EXPECT_EQ(test, memcmp(buf, result->expected, dst_size), 0);
+    KUNIT_EXPECT_MEMEQ(test, buf, result->expected, dst_size);
  }
  static void drm_test_fb_xrgb_to_argb1555(struct kunit *test)
@@ -628,7 +628,7 @@ static void drm_test_fb_xrgb_to_argb1555(struct kunit 
*test)
  drm_fb_xrgb_to_argb1555(, >dst_pitch, , , 
>clip);
  buf = le16buf_to_cpu(test, (__force const __le16 *)buf, dst_size / 
sizeof(__le16));
-    KUNIT_EXPECT_EQ(test, memcmp(buf, result->expected, dst_size), 0);
+    KUNIT_EXPECT_MEMEQ(test, buf, result->expected, dst_size);
  }
  static void drm_test_fb_xrgb_to_rgba5551(struct kunit *test)
@@ -659,7 +659,7 @@ static void drm_test_fb_xrgb_to_rgba5551(struct kunit 
*test)
  drm_fb_xrgb_to_rgba5551(, >dst_pitch, , , 
>clip);
  buf = le16buf_to_cpu(test, (__force const __le16 *)buf, dst_size / 
sizeof(__le16));
-    KUNIT_EXPECT_EQ(test, memcmp(buf, result->expected, dst_size), 0);
+    KUNIT_EXPECT_MEMEQ(test, buf, result->expected, dst_size);
  }
  static void drm_test_fb_xrgb_to_rgb888(struct kunit *test)
@@ -724,7 +724,7 @@ static void drm_test_fb_xrgb_to_argb(struct kunit 
*test)
  drm_fb_xrgb_to_argb(, >dst_pitch, , , 
>clip);
  buf = le32buf_to_cpu(test, (__force const __le32 *)buf, dst_size / 
sizeof(u32));
-    KUNIT_EXPECT_EQ(test, memcmp(buf, result->expected, dst_size), 0);
+    KUNIT_EXPECT_MEMEQ(test, buf, result->expected, dst_size);
  }
  static void drm_test_fb_xrgb_to_xrgb2101010(struct kunit *test)
@@ -786,7 +786,7 @@ static void drm_test_fb_xrgb_to_argb2101010(struct 
kunit *test)
  drm_fb_xrgb_to_argb2101010(, >dst_pitch, , , 
>clip);
  buf = le32buf_to_cpu(test, (__force const __le32 *)buf, dst_size / 
sizeof(u32));
-    KUNIT_EXPECT_EQ(test, memcmp(buf, result->expected, dst_size), 0);
+    KUNIT_EXPECT_MEMEQ(test, buf, result->expected, dst_size);
  }
  static struct kunit_case drm_format_helper_test_cases[] = {

Re: [PATCH] drm/format-helper: Use KUNIT_EXPECT_MEMEQ macro

2023-01-31 Thread Thomas Zimmermann 



Am 30.01.23 um 13:55 schrieb Maíra Canal:

Commit b8a926bea8b1 ("kunit: Introduce KUNIT_EXPECT_MEMEQ and
KUNIT_EXPECT_MEMNEQ macros") introduced a new macro to compare blocks of
memory and, if the test fails, print the result in a human-friendly
format. Therefore, use KUNIT_EXPECT_MEMEQ to compare memory blocks in
replacement of the KUNIT_EXPECT_EQ macro.

Signed-off-by: Maíra Canal 


Reviewed-by: Thomas Zimmermann 


---
  drivers/gpu/drm/tests/drm_format_helper_test.c | 10 +-
  1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/tests/drm_format_helper_test.c 
b/drivers/gpu/drm/tests/drm_format_helper_test.c
index 34e80eb6d96e..9536829c6e3a 100644
--- a/drivers/gpu/drm/tests/drm_format_helper_test.c
+++ b/drivers/gpu/drm/tests/drm_format_helper_test.c
@@ -597,7 +597,7 @@ static void drm_test_fb_xrgb_to_xrgb1555(struct kunit 
*test)
  
  	drm_fb_xrgb_to_xrgb1555(, >dst_pitch, , , >clip);

buf = le16buf_to_cpu(test, (__force const __le16 *)buf, dst_size / 
sizeof(__le16));
-   KUNIT_EXPECT_EQ(test, memcmp(buf, result->expected, dst_size), 0);
+   KUNIT_EXPECT_MEMEQ(test, buf, result->expected, dst_size);
  }
  
  static void drm_test_fb_xrgb_to_argb1555(struct kunit *test)

@@ -628,7 +628,7 @@ static void drm_test_fb_xrgb_to_argb1555(struct kunit 
*test)
  
  	drm_fb_xrgb_to_argb1555(, >dst_pitch, , , >clip);

buf = le16buf_to_cpu(test, (__force const __le16 *)buf, dst_size / 
sizeof(__le16));
-   KUNIT_EXPECT_EQ(test, memcmp(buf, result->expected, dst_size), 0);
+   KUNIT_EXPECT_MEMEQ(test, buf, result->expected, dst_size);
  }
  
  static void drm_test_fb_xrgb_to_rgba5551(struct kunit *test)

@@ -659,7 +659,7 @@ static void drm_test_fb_xrgb_to_rgba5551(struct kunit 
*test)
  
  	drm_fb_xrgb_to_rgba5551(, >dst_pitch, , , >clip);

buf = le16buf_to_cpu(test, (__force const __le16 *)buf, dst_size / 
sizeof(__le16));
-   KUNIT_EXPECT_EQ(test, memcmp(buf, result->expected, dst_size), 0);
+   KUNIT_EXPECT_MEMEQ(test, buf, result->expected, dst_size);
  }
  
  static void drm_test_fb_xrgb_to_rgb888(struct kunit *test)

@@ -724,7 +724,7 @@ static void drm_test_fb_xrgb_to_argb(struct kunit 
*test)
  
  	drm_fb_xrgb_to_argb(, >dst_pitch, , , >clip);

buf = le32buf_to_cpu(test, (__force const __le32 *)buf, dst_size / 
sizeof(u32));
-   KUNIT_EXPECT_EQ(test, memcmp(buf, result->expected, dst_size), 0);
+   KUNIT_EXPECT_MEMEQ(test, buf, result->expected, dst_size);
  }
  
  static void drm_test_fb_xrgb_to_xrgb2101010(struct kunit *test)

@@ -786,7 +786,7 @@ static void drm_test_fb_xrgb_to_argb2101010(struct 
kunit *test)
  
  	drm_fb_xrgb_to_argb2101010(, >dst_pitch, , , >clip);

buf = le32buf_to_cpu(test, (__force const __le32 *)buf, dst_size / 
sizeof(u32));
-   KUNIT_EXPECT_EQ(test, memcmp(buf, result->expected, dst_size), 0);
+   KUNIT_EXPECT_MEMEQ(test, buf, result->expected, dst_size);
  }
  
  static struct kunit_case drm_format_helper_test_cases[] = {


--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Ivo Totev


OpenPGP_signature
Description: OpenPGP digital signature

Re: [PATCH] drm/format-helper: Use KUNIT_EXPECT_MEMEQ macro

2023-01-31 Thread David Gow 
On Mon, 30 Jan 2023 at 20:58, Maíra Canal  wrote:
>
> Commit b8a926bea8b1 ("kunit: Introduce KUNIT_EXPECT_MEMEQ and
> KUNIT_EXPECT_MEMNEQ macros") introduced a new macro to compare blocks of
> memory and, if the test fails, print the result in a human-friendly
> format. Therefore, use KUNIT_EXPECT_MEMEQ to compare memory blocks in
> replacement of the KUNIT_EXPECT_EQ macro.
>
> Signed-off-by: Maíra Canal 
> ---

Looks good to me! (I'd vaguely assumed we'd already updated these
tests, but apparently not...)

I expect this'll go in via one of the DRM trees, not the KUnit one (it
doesn't apply to the kselftest/kunit tree as-is).

Reviewed-by: David Gow 

Cheers,
-- David

>  drivers/gpu/drm/tests/drm_format_helper_test.c | 10 +-
>  1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/tests/drm_format_helper_test.c 
> b/drivers/gpu/drm/tests/drm_format_helper_test.c
> index 34e80eb6d96e..9536829c6e3a 100644
> --- a/drivers/gpu/drm/tests/drm_format_helper_test.c
> +++ b/drivers/gpu/drm/tests/drm_format_helper_test.c
> @@ -597,7 +597,7 @@ static void drm_test_fb_xrgb_to_xrgb1555(struct kunit 
> *test)
>
> drm_fb_xrgb_to_xrgb1555(, >dst_pitch, , , 
> >clip);
> buf = le16buf_to_cpu(test, (__force const __le16 *)buf, dst_size / 
> sizeof(__le16));
> -   KUNIT_EXPECT_EQ(test, memcmp(buf, result->expected, dst_size), 0);
> +   KUNIT_EXPECT_MEMEQ(test, buf, result->expected, dst_size);
>  }
>
>  static void drm_test_fb_xrgb_to_argb1555(struct kunit *test)
> @@ -628,7 +628,7 @@ static void drm_test_fb_xrgb_to_argb1555(struct kunit 
> *test)
>
> drm_fb_xrgb_to_argb1555(, >dst_pitch, , , 
> >clip);
> buf = le16buf_to_cpu(test, (__force const __le16 *)buf, dst_size / 
> sizeof(__le16));
> -   KUNIT_EXPECT_EQ(test, memcmp(buf, result->expected, dst_size), 0);
> +   KUNIT_EXPECT_MEMEQ(test, buf, result->expected, dst_size);
>  }
>
>  static void drm_test_fb_xrgb_to_rgba5551(struct kunit *test)
> @@ -659,7 +659,7 @@ static void drm_test_fb_xrgb_to_rgba5551(struct kunit 
> *test)
>
> drm_fb_xrgb_to_rgba5551(, >dst_pitch, , , 
> >clip);
> buf = le16buf_to_cpu(test, (__force const __le16 *)buf, dst_size / 
> sizeof(__le16));
> -   KUNIT_EXPECT_EQ(test, memcmp(buf, result->expected, dst_size), 0);
> +   KUNIT_EXPECT_MEMEQ(test, buf, result->expected, dst_size);
>  }
>
>  static void drm_test_fb_xrgb_to_rgb888(struct kunit *test)
> @@ -724,7 +724,7 @@ static void drm_test_fb_xrgb_to_argb(struct kunit 
> *test)
>
> drm_fb_xrgb_to_argb(, >dst_pitch, , , 
> >clip);
> buf = le32buf_to_cpu(test, (__force const __le32 *)buf, dst_size / 
> sizeof(u32));
> -   KUNIT_EXPECT_EQ(test, memcmp(buf, result->expected, dst_size), 0);
> +   KUNIT_EXPECT_MEMEQ(test, buf, result->expected, dst_size);
>  }
>
>  static void drm_test_fb_xrgb_to_xrgb2101010(struct kunit *test)
> @@ -786,7 +786,7 @@ static void drm_test_fb_xrgb_to_argb2101010(struct 
> kunit *test)
>
> drm_fb_xrgb_to_argb2101010(, >dst_pitch, , , 
> >clip);
> buf = le32buf_to_cpu(test, (__force const __le32 *)buf, dst_size / 
> sizeof(u32));
> -   KUNIT_EXPECT_EQ(test, memcmp(buf, result->expected, dst_size), 0);
> +   KUNIT_EXPECT_MEMEQ(test, buf, result->expected, dst_size);
>  }
>
>  static struct kunit_case drm_format_helper_test_cases[] = {
> --
> 2.39.1
>


smime.p7s
Description: S/MIME Cryptographic Signature

[PATCH] drm/format-helper: Use KUNIT_EXPECT_MEMEQ macro

2023-01-30 Thread Maíra Canal 
Commit b8a926bea8b1 ("kunit: Introduce KUNIT_EXPECT_MEMEQ and
KUNIT_EXPECT_MEMNEQ macros") introduced a new macro to compare blocks of
memory and, if the test fails, print the result in a human-friendly
format. Therefore, use KUNIT_EXPECT_MEMEQ to compare memory blocks in
replacement of the KUNIT_EXPECT_EQ macro.

Signed-off-by: Maíra Canal 
---
 drivers/gpu/drm/tests/drm_format_helper_test.c | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/tests/drm_format_helper_test.c 
b/drivers/gpu/drm/tests/drm_format_helper_test.c
index 34e80eb6d96e..9536829c6e3a 100644
--- a/drivers/gpu/drm/tests/drm_format_helper_test.c
+++ b/drivers/gpu/drm/tests/drm_format_helper_test.c
@@ -597,7 +597,7 @@ static void drm_test_fb_xrgb_to_xrgb1555(struct kunit 
*test)
 
drm_fb_xrgb_to_xrgb1555(, >dst_pitch, , , 
>clip);
buf = le16buf_to_cpu(test, (__force const __le16 *)buf, dst_size / 
sizeof(__le16));
-   KUNIT_EXPECT_EQ(test, memcmp(buf, result->expected, dst_size), 0);
+   KUNIT_EXPECT_MEMEQ(test, buf, result->expected, dst_size);
 }
 
 static void drm_test_fb_xrgb_to_argb1555(struct kunit *test)
@@ -628,7 +628,7 @@ static void drm_test_fb_xrgb_to_argb1555(struct kunit 
*test)
 
drm_fb_xrgb_to_argb1555(, >dst_pitch, , , 
>clip);
buf = le16buf_to_cpu(test, (__force const __le16 *)buf, dst_size / 
sizeof(__le16));
-   KUNIT_EXPECT_EQ(test, memcmp(buf, result->expected, dst_size), 0);
+   KUNIT_EXPECT_MEMEQ(test, buf, result->expected, dst_size);
 }
 
 static void drm_test_fb_xrgb_to_rgba5551(struct kunit *test)
@@ -659,7 +659,7 @@ static void drm_test_fb_xrgb_to_rgba5551(struct kunit 
*test)
 
drm_fb_xrgb_to_rgba5551(, >dst_pitch, , , 
>clip);
buf = le16buf_to_cpu(test, (__force const __le16 *)buf, dst_size / 
sizeof(__le16));
-   KUNIT_EXPECT_EQ(test, memcmp(buf, result->expected, dst_size), 0);
+   KUNIT_EXPECT_MEMEQ(test, buf, result->expected, dst_size);
 }
 
 static void drm_test_fb_xrgb_to_rgb888(struct kunit *test)
@@ -724,7 +724,7 @@ static void drm_test_fb_xrgb_to_argb(struct kunit 
*test)
 
drm_fb_xrgb_to_argb(, >dst_pitch, , , 
>clip);
buf = le32buf_to_cpu(test, (__force const __le32 *)buf, dst_size / 
sizeof(u32));
-   KUNIT_EXPECT_EQ(test, memcmp(buf, result->expected, dst_size), 0);
+   KUNIT_EXPECT_MEMEQ(test, buf, result->expected, dst_size);
 }
 
 static void drm_test_fb_xrgb_to_xrgb2101010(struct kunit *test)
@@ -786,7 +786,7 @@ static void drm_test_fb_xrgb_to_argb2101010(struct 
kunit *test)
 
drm_fb_xrgb_to_argb2101010(, >dst_pitch, , , 
>clip);
buf = le32buf_to_cpu(test, (__force const __le32 *)buf, dst_size / 
sizeof(u32));
-   KUNIT_EXPECT_EQ(test, memcmp(buf, result->expected, dst_size), 0);
+   KUNIT_EXPECT_MEMEQ(test, buf, result->expected, dst_size);
 }
 
 static struct kunit_case drm_format_helper_test_cases[] = {
-- 
2.39.1