mirror of
https://chromium.googlesource.com/libyuv/libyuv
synced 2026-01-01 03:12:16 +08:00
Simplify rotate unittests
BUG=233 TEST=*Rotate* R=ryanpetrie@google.com Review URL: https://webrtc-codereview.appspot.com/1581004 git-svn-id: http://libyuv.googlecode.com/svn/trunk@705 16f28f9a-4ce2-e073-06de-1de4eb20be90
This commit is contained in:
fbarchard@google.com
parent
58f50df879
commit
a14b5cdfb3
@ -1,6 +1,6 @@
|
||||
Name: libyuv
|
||||
URL: http://code.google.com/p/libyuv/
|
||||
Version: 704
|
||||
Version: 705
|
||||
License: BSD
|
||||
License File: LICENSE
|
||||
|
||||
|
||||
@ -11,6 +11,6 @@
|
||||
#ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT
|
||||
#define INCLUDE_LIBYUV_VERSION_H_
|
||||
|
||||
#define LIBYUV_VERSION 704
|
||||
#define LIBYUV_VERSION 705
|
||||
|
||||
#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT
|
||||
|
||||
@ -17,178 +17,185 @@
|
||||
|
||||
namespace libyuv {
|
||||
|
||||
static int ARGBTestRotate(int src_width, int src_height,
|
||||
int dst_width, int dst_height,
|
||||
libyuv::RotationMode mode, int benchmark_iterations) {
|
||||
const int b = 128;
|
||||
int src_argb_plane_size = (src_width + b * 2) * (src_height + b * 2) * 4;
|
||||
int src_stride_argb = (b * 2 + src_width) * 4;
|
||||
|
||||
void TestRotateBpp(int src_width, int src_height,
|
||||
int dst_width, int dst_height,
|
||||
libyuv::RotationMode mode,
|
||||
int benchmark_iterations,
|
||||
const int kBpp) {
|
||||
if (src_width < 1) {
|
||||
src_width = 1;
|
||||
}
|
||||
if (src_height < 1) {
|
||||
src_height = 1;
|
||||
}
|
||||
if (dst_width < 1) {
|
||||
dst_width = 1;
|
||||
}
|
||||
if (dst_height < 1) {
|
||||
dst_height = 1;
|
||||
}
|
||||
int src_stride_argb = src_width * kBpp;
|
||||
int src_argb_plane_size = src_stride_argb * src_height;
|
||||
align_buffer_64(src_argb, src_argb_plane_size)
|
||||
memset(src_argb, 1, src_argb_plane_size);
|
||||
|
||||
int dst_argb_plane_size = (dst_width + b * 2) * (dst_height + b * 2) * 4;
|
||||
int dst_stride_argb = (b * 2 + dst_width) * 4;
|
||||
|
||||
srandom(time(NULL));
|
||||
|
||||
int i, j;
|
||||
for (i = b; i < (src_height + b); ++i) {
|
||||
for (j = b; j < (src_width + b) * 4; ++j) {
|
||||
src_argb[(i * src_stride_argb) + j] = (random() & 0xff);
|
||||
}
|
||||
for (int i = 0; i < src_argb_plane_size; ++i) {
|
||||
src_argb[i] = random() & 0xff;
|
||||
}
|
||||
|
||||
int dst_stride_argb = dst_width * kBpp;
|
||||
int dst_argb_plane_size = dst_stride_argb * dst_height;
|
||||
align_buffer_64(dst_argb_c, dst_argb_plane_size)
|
||||
align_buffer_64(dst_argb_opt, dst_argb_plane_size)
|
||||
memset(dst_argb_c, 2, dst_argb_plane_size);
|
||||
memset(dst_argb_opt, 3, dst_argb_plane_size);
|
||||
|
||||
// Warm up both versions for consistent benchmarks.
|
||||
MaskCpuFlags(0); // Disable all CPU optimization.
|
||||
ARGBRotate(src_argb + (src_stride_argb * b) + b * 4, src_stride_argb,
|
||||
dst_argb_c + (dst_stride_argb * b) + b * 4, dst_stride_argb,
|
||||
src_width, src_height, mode);
|
||||
MaskCpuFlags(-1); // Enable all CPU optimization.
|
||||
ARGBRotate(src_argb + (src_stride_argb * b) + b * 4, src_stride_argb,
|
||||
dst_argb_opt + (dst_stride_argb * b) + b * 4, dst_stride_argb,
|
||||
src_width, src_height, mode);
|
||||
if (kBpp == 1) {
|
||||
MaskCpuFlags(0); // Disable all CPU optimization.
|
||||
RotatePlane(src_argb, src_stride_argb,
|
||||
dst_argb_c, dst_stride_argb,
|
||||
src_width, src_height, mode);
|
||||
|
||||
MaskCpuFlags(0); // Disable all CPU optimization.
|
||||
double c_time = get_time();
|
||||
ARGBRotate(src_argb + (src_stride_argb * b) + b * 4, src_stride_argb,
|
||||
dst_argb_c + (dst_stride_argb * b) + b * 4, dst_stride_argb,
|
||||
src_width, src_height, mode);
|
||||
c_time = (get_time() - c_time);
|
||||
|
||||
MaskCpuFlags(-1); // Enable all CPU optimization.
|
||||
double opt_time = get_time();
|
||||
for (i = 0; i < benchmark_iterations; ++i) {
|
||||
ARGBRotate(src_argb + (src_stride_argb * b) + b * 4, src_stride_argb,
|
||||
dst_argb_opt + (dst_stride_argb * b) + b * 4, dst_stride_argb,
|
||||
src_width, src_height, mode);
|
||||
}
|
||||
opt_time = (get_time() - opt_time) / benchmark_iterations;
|
||||
|
||||
// Report performance of C vs OPT
|
||||
printf("filter %d - %8d us C - %8d us OPT\n",
|
||||
mode, static_cast<int>(c_time*1e6), static_cast<int>(opt_time*1e6));
|
||||
|
||||
// C version may be a little off from the optimized. Order of
|
||||
// operations may introduce rounding somewhere. So do a difference
|
||||
// of the buffers and look to see that the max difference isn't
|
||||
// over 2.
|
||||
int max_diff = 0;
|
||||
for (i = b; i < (dst_height + b); ++i) {
|
||||
for (j = b * 4; j < (dst_width + b) * 4; ++j) {
|
||||
int abs_diff = abs(dst_argb_c[(i * dst_stride_argb) + j] -
|
||||
dst_argb_opt[(i * dst_stride_argb) + j]);
|
||||
if (abs_diff > max_diff) {
|
||||
max_diff = abs_diff;
|
||||
}
|
||||
MaskCpuFlags(-1); // Enable all CPU optimization.
|
||||
for (int i = 0; i < benchmark_iterations; ++i) {
|
||||
RotatePlane(src_argb, src_stride_argb,
|
||||
dst_argb_opt, dst_stride_argb,
|
||||
src_width, src_height, mode);
|
||||
}
|
||||
} else if (kBpp == 4) {
|
||||
MaskCpuFlags(0); // Disable all CPU optimization.
|
||||
ARGBRotate(src_argb, src_stride_argb,
|
||||
dst_argb_c, dst_stride_argb,
|
||||
src_width, src_height, mode);
|
||||
|
||||
MaskCpuFlags(-1); // Enable all CPU optimization.
|
||||
for (int i = 0; i < benchmark_iterations; ++i) {
|
||||
ARGBRotate(src_argb, src_stride_argb,
|
||||
dst_argb_opt, dst_stride_argb,
|
||||
src_width, src_height, mode);
|
||||
}
|
||||
}
|
||||
|
||||
// Rotation should be exact.
|
||||
for (int i = 0; i < dst_argb_plane_size; ++i) {
|
||||
EXPECT_EQ(dst_argb_c[i], dst_argb_opt[i]);
|
||||
}
|
||||
|
||||
free_aligned_buffer_64(dst_argb_c)
|
||||
free_aligned_buffer_64(dst_argb_opt)
|
||||
free_aligned_buffer_64(src_argb)
|
||||
return max_diff;
|
||||
}
|
||||
|
||||
static void ARGBTestRotate(int src_width, int src_height,
|
||||
int dst_width, int dst_height,
|
||||
libyuv::RotationMode mode,
|
||||
int benchmark_iterations) {
|
||||
TestRotateBpp(src_width, src_height,
|
||||
dst_width, dst_height,
|
||||
mode, benchmark_iterations, 4);
|
||||
}
|
||||
|
||||
TEST_F(libyuvTest, ARGBRotate0) {
|
||||
const int src_width = benchmark_width_;
|
||||
const int src_height = benchmark_height_;
|
||||
const int dst_width = benchmark_width_;
|
||||
const int dst_height = benchmark_height_;
|
||||
|
||||
int err = ARGBTestRotate(src_width, src_height,
|
||||
dst_width, dst_height, kRotate0,
|
||||
benchmark_iterations_);
|
||||
EXPECT_GE(1, err);
|
||||
ARGBTestRotate(benchmark_width_, benchmark_height_,
|
||||
benchmark_width_, benchmark_height_,
|
||||
kRotate0, benchmark_iterations_);
|
||||
}
|
||||
|
||||
TEST_F(libyuvTest, ARGBRotate90) {
|
||||
const int src_width = benchmark_width_;
|
||||
const int src_height = benchmark_height_;
|
||||
const int dst_width = benchmark_height_;
|
||||
const int dst_height = benchmark_width_;
|
||||
|
||||
int err = ARGBTestRotate(src_width, src_height,
|
||||
dst_width, dst_height, kRotate90,
|
||||
benchmark_iterations_);
|
||||
EXPECT_GE(1, err);
|
||||
ARGBTestRotate(benchmark_width_, benchmark_height_,
|
||||
benchmark_height_, benchmark_width_,
|
||||
kRotate90, benchmark_iterations_);
|
||||
}
|
||||
|
||||
TEST_F(libyuvTest, ARGBRotate180) {
|
||||
const int src_width = benchmark_width_;
|
||||
const int src_height = benchmark_height_;
|
||||
const int dst_width = benchmark_width_;
|
||||
const int dst_height = benchmark_height_;
|
||||
|
||||
int err = ARGBTestRotate(src_width, src_height,
|
||||
dst_width, dst_height, kRotate180,
|
||||
benchmark_iterations_);
|
||||
EXPECT_GE(1, err);
|
||||
ARGBTestRotate(benchmark_width_, benchmark_height_,
|
||||
benchmark_width_, benchmark_height_,
|
||||
kRotate180, benchmark_iterations_);
|
||||
}
|
||||
|
||||
TEST_F(libyuvTest, ARGBRotate270) {
|
||||
const int src_width = benchmark_width_;
|
||||
const int src_height = benchmark_height_;
|
||||
const int dst_width = benchmark_height_;
|
||||
const int dst_height = benchmark_width_;
|
||||
|
||||
int err = ARGBTestRotate(src_width, src_height,
|
||||
dst_width, dst_height, kRotate270,
|
||||
benchmark_iterations_);
|
||||
EXPECT_GE(1, err);
|
||||
ARGBTestRotate(benchmark_width_, benchmark_height_,
|
||||
benchmark_height_, benchmark_width_,
|
||||
kRotate270, benchmark_iterations_);
|
||||
}
|
||||
|
||||
TEST_F(libyuvTest, ARGBRotate0_Odd) {
|
||||
const int src_width = benchmark_width_ - 3;
|
||||
const int src_height = benchmark_height_ - 1;
|
||||
const int dst_width = benchmark_width_ - 3;
|
||||
const int dst_height = benchmark_height_ - 1;
|
||||
|
||||
int err = ARGBTestRotate(src_width, src_height,
|
||||
dst_width, dst_height, kRotate0,
|
||||
benchmark_iterations_);
|
||||
EXPECT_GE(1, err);
|
||||
ARGBTestRotate(benchmark_width_ - 3, benchmark_height_ - 1,
|
||||
benchmark_width_ - 3, benchmark_height_ - 1,
|
||||
kRotate0, benchmark_iterations_);
|
||||
}
|
||||
|
||||
TEST_F(libyuvTest, ARGBRotate90_Odd) {
|
||||
const int src_width = benchmark_width_ - 3;
|
||||
const int src_height = benchmark_height_ - 1;
|
||||
const int dst_width = benchmark_height_ - 1;
|
||||
const int dst_height = benchmark_width_ - 3;
|
||||
|
||||
int err = ARGBTestRotate(src_width, src_height,
|
||||
dst_width, dst_height, kRotate90,
|
||||
benchmark_iterations_);
|
||||
EXPECT_GE(1, err);
|
||||
ARGBTestRotate(benchmark_width_ - 3, benchmark_height_ - 1,
|
||||
benchmark_height_ - 1, benchmark_width_ - 3,
|
||||
kRotate90, benchmark_iterations_);
|
||||
}
|
||||
|
||||
TEST_F(libyuvTest, ARGBRotate180_Odd) {
|
||||
const int src_width = benchmark_width_ - 3;
|
||||
const int src_height = benchmark_height_ - 1;
|
||||
const int dst_width = benchmark_width_ - 3;
|
||||
const int dst_height = benchmark_height_ - 1;
|
||||
|
||||
int err = ARGBTestRotate(src_width, src_height,
|
||||
dst_width, dst_height, kRotate180,
|
||||
benchmark_iterations_);
|
||||
EXPECT_GE(1, err);
|
||||
ARGBTestRotate(benchmark_width_ - 3, benchmark_height_ - 1,
|
||||
benchmark_width_ - 3, benchmark_height_ - 1,
|
||||
kRotate180, benchmark_iterations_);
|
||||
}
|
||||
|
||||
TEST_F(libyuvTest, ARGBRotate270_Odd) {
|
||||
const int src_width = benchmark_width_ - 3;
|
||||
const int src_height = benchmark_height_ - 1;
|
||||
const int dst_width = benchmark_height_ - 1;
|
||||
const int dst_height = benchmark_width_ - 3;
|
||||
ARGBTestRotate(benchmark_width_ - 3, benchmark_height_ - 1,
|
||||
benchmark_height_ - 1, benchmark_width_ - 3,
|
||||
kRotate270, benchmark_iterations_);
|
||||
}
|
||||
|
||||
int err = ARGBTestRotate(src_width, src_height,
|
||||
dst_width, dst_height, kRotate270,
|
||||
benchmark_iterations_);
|
||||
EXPECT_GE(1, err);
|
||||
static void TestRotatePlane(int src_width, int src_height,
|
||||
int dst_width, int dst_height,
|
||||
libyuv::RotationMode mode,
|
||||
int benchmark_iterations) {
|
||||
TestRotateBpp(src_width, src_height,
|
||||
dst_width, dst_height,
|
||||
mode, benchmark_iterations, 1);
|
||||
}
|
||||
|
||||
TEST_F(libyuvTest, RotatePlane0) {
|
||||
TestRotatePlane(benchmark_width_, benchmark_height_,
|
||||
benchmark_width_, benchmark_height_,
|
||||
kRotate0, benchmark_iterations_);
|
||||
}
|
||||
|
||||
TEST_F(libyuvTest, RotatePlane90) {
|
||||
TestRotatePlane(benchmark_width_, benchmark_height_,
|
||||
benchmark_height_, benchmark_width_,
|
||||
kRotate90, benchmark_iterations_);
|
||||
}
|
||||
|
||||
TEST_F(libyuvTest, RotatePlane180) {
|
||||
TestRotatePlane(benchmark_width_, benchmark_height_,
|
||||
benchmark_width_, benchmark_height_,
|
||||
kRotate180, benchmark_iterations_);
|
||||
}
|
||||
|
||||
TEST_F(libyuvTest, RotatePlane270) {
|
||||
TestRotatePlane(benchmark_width_, benchmark_height_,
|
||||
benchmark_height_, benchmark_width_,
|
||||
kRotate270, benchmark_iterations_);
|
||||
}
|
||||
|
||||
TEST_F(libyuvTest, RotatePlane0_Odd) {
|
||||
TestRotatePlane(benchmark_width_ - 3, benchmark_height_ - 1,
|
||||
benchmark_width_ - 3, benchmark_height_ - 1,
|
||||
kRotate0, benchmark_iterations_);
|
||||
}
|
||||
|
||||
TEST_F(libyuvTest, RotatePlane90_Odd) {
|
||||
TestRotatePlane(benchmark_width_ - 3, benchmark_height_ - 1,
|
||||
benchmark_height_ - 1, benchmark_width_ - 3,
|
||||
kRotate90, benchmark_iterations_);
|
||||
}
|
||||
|
||||
TEST_F(libyuvTest, RotatePlane180_Odd) {
|
||||
TestRotatePlane(benchmark_width_ - 3, benchmark_height_ - 1,
|
||||
benchmark_width_ - 3, benchmark_height_ - 1,
|
||||
kRotate180, benchmark_iterations_);
|
||||
}
|
||||
|
||||
TEST_F(libyuvTest, RotatePlane270_Odd) {
|
||||
TestRotatePlane(benchmark_width_ - 3, benchmark_height_ - 1,
|
||||
benchmark_height_ - 1, benchmark_width_ - 3,
|
||||
kRotate270, benchmark_iterations_);
|
||||
}
|
||||
|
||||
} // namespace libyuv
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user