[Libva] [PATCH intel-driver 1/2] test: use valarray for raw image comparison

[Eoff, Ullysses A]

> -----Original Message-----
> From: Phillips, Scott D
> Sent: Friday, October 14, 2016 4:59 PM
> To: libva at lists.freedesktop.org
> Cc: Eoff, Ullysses A <ullysses.a.eoff at intel.com>
> Subject: [PATCH intel-driver 1/2] test: use valarray for raw image comparison
> 
> std::valarray can fuse elementwise operations across arrays for
> more efficient comparison.
> 
> Signed-off-by: Scott D Phillips <scott.d.phillips at intel.com>
> ---
>  test/i965_jpeg_encode_test.cpp | 29 +++++++++++++----------------
>  1 file changed, 13 insertions(+), 16 deletions(-)
> 
> diff --git a/test/i965_jpeg_encode_test.cpp b/test/i965_jpeg_encode_test.cpp
> index 29c14dc..209e80d 100644
> --- a/test/i965_jpeg_encode_test.cpp
> +++ b/test/i965_jpeg_encode_test.cpp
> @@ -30,6 +30,7 @@
>  #include <cstring>
>  #include <memory>
>  #include <tuple>
> +#include <valarray>
> 
>  namespace JPEG {
>  namespace Encode {
> @@ -400,23 +401,19 @@ protected:
>          ASSERT_EQ(expect->height(), image.height);
>          ASSERT_NO_FAILURE(uint8_t *data = mapBuffer<uint8_t>(image.buf));
> 
> -        auto isClose = [](const uint8_t& a, const uint8_t& b) {
> -            return std::abs(int(a)-int(b)) <= 2;
> -        };
> -
>          for (size_t i(0); i < image.num_planes; ++i) {
> -            size_t w = expect->widths[i];
> -            size_t h = expect->heights[i];
> -
> -            const ByteData::value_type *source = expect->plane(i);
> -            const uint8_t *result = data + image.offsets[i];
> -            ASSERT_GE(image.pitches[i], w);
> -            for (size_t r(0); r < h; ++r) {
> -                EXPECT_TRUE(std::equal(result, result + w, source, isClose))
> -                    << "Byte(s) mismatch in plane " << i << " row " << r;
> -                source += w;
> -                result += image.pitches[i];
> -            }
> +            ASSERT_GE(image.pitches[i], expect->widths[i]);
> +            std::valarray<int8_t> source(
> +                reinterpret_cast<const int8_t *>(expect->plane(i)),
> +                expect->widths[i] * expect->heights[i]);

expect->widths[i] * expect->heights[i] is already calculated in expect->sizes[i]

> +            std::gslice result_slice(0, {expect->heights[i], expect->widths[i]},
> +                                     {image.pitches[i], 1});
> +            std::valarray<int8_t> result = std::valarray<int8_t>(
> +                reinterpret_cast<const int8_t *>(data + image.offsets[i]),
> +                image.pitches[i] * expect->heights[i])[result_slice];
> +            ASSERT_EQ(source.size(), result.size());
> +            EXPECT_TRUE(std::abs(source - result).max() <= 2)
> +                << "Byte(s) mismatch in plane " << i;
>          }
> 
>          unmapBuffer(image.buf);
> --
> 2.7.4