Skip to content

L
libyuv
Commit e3230e4a authored by fbarchard@google.com's avatar fbarchard@google.com
Browse files
Options

Iterate the rotate functions for benchmarking purposes 

BUG=233
TESTED=runyuv10 Rot*
R=ryanpetrie@google.com

Review URL: https://webrtc-codereview.appspot.com/1580004

git-svn-id: http://libyuv.googlecode.com/svn/trunk@703 16f28f9a-4ce2-e073-06de-1de4eb20be90
parent 23501127
Show whitespace changes
Inline Side-by-side
Showing with 42 additions and 4 deletions
README.chromium
View file @ e3230e4a
Name: libyuv Name: libyuv
URL: http://code.google.com/p/libyuv/ URL: http://code.google.com/p/libyuv/
Version: 702 Version: 703
License: BSD License: BSD
License File: LICENSE License File: LICENSE
......
include/libyuv/version.h
View file @ e3230e4a
...@@ -11,6 +11,6 @@ ...@@ -11,6 +11,6 @@
#ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT #ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT
#define INCLUDE_LIBYUV_VERSION_H_ #define INCLUDE_LIBYUV_VERSION_H_
#define LIBYUV_VERSION 702 #define LIBYUV_VERSION 703
#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT
unit_test/rotate_test.cc
View file @ e3230e4a
...@@ -43,7 +43,9 @@ TEST_F(libyuvTest, Transpose) { ...@@ -43,7 +43,9 @@ TEST_F(libyuvTest, Transpose) {
input[i] = i; input[i] = i;
} }
for (i = 0; i < benchmark_iterations_; ++i) {
TransposePlane(input, iw, output_1, ow, iw, ih); TransposePlane(input, iw, output_1, ow, iw, ih);
}
TransposePlane(output_1, ow, output_2, oh, ow, oh); TransposePlane(output_1, ow, output_2, oh, ow, oh);
for (i = 0; i < iw * ih; ++i) { for (i = 0; i < iw * ih; ++i) {
...@@ -91,8 +93,9 @@ TEST_F(libyuvTest, TransposeUV) { ...@@ -91,8 +93,9 @@ TEST_F(libyuvTest, TransposeUV) {
input[i + 1] = -(i >> 1); input[i + 1] = -(i >> 1);
} }
for (i = 0; i < benchmark_iterations_; ++i) {
TransposeUV(input, iw * 2, output_a1, ow, output_b1, ow, iw, ih); TransposeUV(input, iw * 2, output_a1, ow, output_b1, ow, iw, ih);
}
TransposePlane(output_a1, ow, output_a2, oh, ow, oh); TransposePlane(output_a1, ow, output_a2, oh, ow, oh);
TransposePlane(output_b1, ow, output_b2, oh, ow, oh); TransposePlane(output_b1, ow, output_b2, oh, ow, oh);
...@@ -147,7 +150,9 @@ TEST_F(libyuvTest, RotatePlane90) { ...@@ -147,7 +150,9 @@ TEST_F(libyuvTest, RotatePlane90) {
input[i] = i; input[i] = i;
} }
for (i = 0; i < benchmark_iterations_; ++i) {
RotatePlane90(input, iw, output_90, ow, iw, ih); RotatePlane90(input, iw, output_90, ow, iw, ih);
}
RotatePlane90(output_90, ow, output_180, oh, ow, oh); RotatePlane90(output_90, ow, output_180, oh, ow, oh);
RotatePlane90(output_180, oh, output_270, ow, oh, ow); RotatePlane90(output_180, oh, output_270, ow, oh, ow);
RotatePlane90(output_270, ow, output_0, iw, ow, oh); RotatePlane90(output_270, ow, output_0, iw, ow, oh);
...@@ -207,7 +212,9 @@ TEST_F(libyuvTest, RotateUV90) { ...@@ -207,7 +212,9 @@ TEST_F(libyuvTest, RotateUV90) {
input[i + 1] = -(i >> 1); input[i + 1] = -(i >> 1);
} }
for (i = 0; i < benchmark_iterations_; ++i) {
RotateUV90(input, iw, output_90_u, ow, output_90_v, ow, (iw + 1) / 2, ih); RotateUV90(input, iw, output_90_u, ow, output_90_v, ow, (iw + 1) / 2, ih);
}
RotatePlane90(output_90_u, ow, output_180_u, oh, ow, oh); RotatePlane90(output_90_u, ow, output_180_u, oh, ow, oh);
RotatePlane90(output_90_v, ow, output_180_v, oh, ow, oh); RotatePlane90(output_90_v, ow, output_180_v, oh, ow, oh);
...@@ -281,7 +288,10 @@ TEST_F(libyuvTest, RotateUV180) { ...@@ -281,7 +288,10 @@ TEST_F(libyuvTest, RotateUV180) {
input[i + 1] = -(i >> 1); input[i + 1] = -(i >> 1);
} }
RotateUV180(input, iw, output_180_u, ow, output_180_v, ow, (iw + 1) / 2, ih); for (i = 0; i < benchmark_iterations_; ++i) {
RotateUV180(input, iw, output_180_u, ow, output_180_v, ow,
(iw + 1) / 2, ih);
}
RotatePlane90(output_180_u, ow, output_90_u, oh, ow, oh); RotatePlane90(output_180_u, ow, output_90_u, oh, ow, oh);
RotatePlane90(output_180_v, ow, output_90_v, oh, ow, oh); RotatePlane90(output_180_v, ow, output_90_v, oh, ow, oh);
...@@ -355,8 +365,10 @@ TEST_F(libyuvTest, RotateUV270) { ...@@ -355,8 +365,10 @@ TEST_F(libyuvTest, RotateUV270) {
input[i + 1] = -(i >> 1); input[i + 1] = -(i >> 1);
} }
for (i = 0; i < benchmark_iterations_; ++i) {
RotateUV270(input, iw, output_270_u, ow, output_270_v, ow, RotateUV270(input, iw, output_270_u, ow, output_270_v, ow,
(iw + 1) / 2, ih); (iw + 1) / 2, ih);
}
RotatePlane270(output_270_u, ow, output_180_u, oh, ow, oh); RotatePlane270(output_270_u, ow, output_180_u, oh, ow, oh);
RotatePlane270(output_270_v, ow, output_180_v, oh, ow, oh); RotatePlane270(output_270_v, ow, output_180_v, oh, ow, oh);
...@@ -425,7 +437,9 @@ TEST_F(libyuvTest, RotatePlane180) { ...@@ -425,7 +437,9 @@ TEST_F(libyuvTest, RotatePlane180) {
input[i] = i; input[i] = i;
} }
for (i = 0; i < benchmark_iterations_; ++i) {
RotatePlane180(input, iw, output_180, ow, iw, ih); RotatePlane180(input, iw, output_180, ow, iw, ih);
}
RotatePlane180(output_180, ow, output_0, iw, ow, oh); RotatePlane180(output_180, ow, output_0, iw, ow, oh);
for (i = 0; i < iw * ih; ++i) { for (i = 0; i < iw * ih; ++i) {
...@@ -471,7 +485,9 @@ TEST_F(libyuvTest, RotatePlane270) { ...@@ -471,7 +485,9 @@ TEST_F(libyuvTest, RotatePlane270) {
for (i = 0; i < iw * ih; ++i) for (i = 0; i < iw * ih; ++i)
input[i] = i; input[i] = i;
for (i = 0; i < benchmark_iterations_; ++i) {
RotatePlane270(input, iw, output_270, ow, iw, ih); RotatePlane270(input, iw, output_270, ow, iw, ih);
}
RotatePlane270(output_270, ow, output_180, oh, ow, oh); RotatePlane270(output_270, ow, output_180, oh, ow, oh);
RotatePlane270(output_180, oh, output_90, ow, oh, ow); RotatePlane270(output_180, oh, output_90, ow, oh, ow);
RotatePlane270(output_90, ow, output_0, iw, ow, oh); RotatePlane270(output_90, ow, output_0, iw, ow, oh);
...@@ -526,7 +542,9 @@ TEST_F(libyuvTest, RotatePlane90and270) { ...@@ -526,7 +542,9 @@ TEST_F(libyuvTest, RotatePlane90and270) {
input[i] = i; input[i] = i;
} }
for (i = 0; i < benchmark_iterations_; ++i) {
RotatePlane90(input, iw, output_90, ow, iw, ih); RotatePlane90(input, iw, output_90, ow, iw, ih);
}
RotatePlane270(output_90, ow, output_0, iw, ow, oh); RotatePlane270(output_90, ow, output_0, iw, ow, oh);
for (i = 0; i < iw * ih; ++i) { for (i = 0; i < iw * ih; ++i) {
...@@ -571,9 +589,11 @@ TEST_F(libyuvTest, RotatePlane90Pitch) { ...@@ -571,9 +589,11 @@ TEST_F(libyuvTest, RotatePlane90Pitch) {
input[i] = i; input[i] = i;
} }
for (i = 0; i < benchmark_iterations_; ++i) {
RotatePlane90(input, iw, RotatePlane90(input, iw,
output_90 + (ow + 1) / 2, ow, output_90 + (ow + 1) / 2, ow,
(iw + 1) / 2, (ih + 1) / 2); (iw + 1) / 2, (ih + 1) / 2);
}
RotatePlane90(input + ((iw + 1) / 2), iw, RotatePlane90(input + ((iw + 1) / 2), iw,
output_90 + (ow + 1) / 2 + ow * ((oh + 1) / 2), ow, output_90 + (ow + 1) / 2 + ow * ((oh + 1) / 2), ow,
(iw + 1) / 2, (ih + 1) / 2); (iw + 1) / 2, (ih + 1) / 2);
...@@ -628,9 +648,11 @@ TEST_F(libyuvTest, RotatePlane270Pitch) { ...@@ -628,9 +648,11 @@ TEST_F(libyuvTest, RotatePlane270Pitch) {
input[i] = i; input[i] = i;
} }
for (i = 0; i < benchmark_iterations_; ++i) {
RotatePlane270(input, iw, RotatePlane270(input, iw,
output_270 + ow * ((oh + 1) / 2), ow, output_270 + ow * ((oh + 1) / 2), ow,
(iw + 1) / 2, (ih + 1) / 2); (iw + 1) / 2, (ih + 1) / 2);
}
RotatePlane270(input + ((iw + 1) / 2), iw, RotatePlane270(input + ((iw + 1) / 2), iw,
output_270, ow, output_270, ow,
(iw + 1) / 2, (ih + 1) / 2); (iw + 1) / 2, (ih + 1) / 2);
...@@ -732,6 +754,7 @@ TEST_F(libyuvTest, I420Rotate90) { ...@@ -732,6 +754,7 @@ TEST_F(libyuvTest, I420Rotate90) {
int y_st_90 = yh + b * 2; int y_st_90 = yh + b * 2;
int uv_st_90 = uvh + b * 2; int uv_st_90 = uvh + b * 2;
for (i = 0; i < benchmark_iterations_; ++i) {
I420Rotate(orig_y + y_off_0, y_st_0, I420Rotate(orig_y + y_off_0, y_st_0,
orig_u + uv_off_0, uv_st_0, orig_u + uv_off_0, uv_st_0,
orig_v + uv_off_0, uv_st_0, orig_v + uv_off_0, uv_st_0,
...@@ -740,6 +763,7 @@ TEST_F(libyuvTest, I420Rotate90) { ...@@ -740,6 +763,7 @@ TEST_F(libyuvTest, I420Rotate90) {
ro90_v + uv_off_90, uv_st_90, ro90_v + uv_off_90, uv_st_90,
yw, yh, yw, yh,
kRotateClockwise); kRotateClockwise);
}
I420Rotate(ro90_y + y_off_90, y_st_90, I420Rotate(ro90_y + y_off_90, y_st_90,
ro90_u + uv_off_90, uv_st_90, ro90_u + uv_off_90, uv_st_90,
...@@ -855,6 +879,7 @@ TEST_F(libyuvTest, I420Rotate270) { ...@@ -855,6 +879,7 @@ TEST_F(libyuvTest, I420Rotate270) {
int y_st_90 = yh + b * 2; int y_st_90 = yh + b * 2;
int uv_st_90 = uvh + b * 2; int uv_st_90 = uvh + b * 2;
for (i = 0; i < benchmark_iterations_; ++i) {
I420Rotate(orig_y + y_off_0, y_st_0, I420Rotate(orig_y + y_off_0, y_st_0,
orig_u + uv_off_0, uv_st_0, orig_u + uv_off_0, uv_st_0,
orig_v + uv_off_0, uv_st_0, orig_v + uv_off_0, uv_st_0,
...@@ -863,6 +888,7 @@ TEST_F(libyuvTest, I420Rotate270) { ...@@ -863,6 +888,7 @@ TEST_F(libyuvTest, I420Rotate270) {
ro270_v + uv_off_90, uv_st_90, ro270_v + uv_off_90, uv_st_90,
yw, yh, yw, yh,
kRotateCounterClockwise); kRotateCounterClockwise);
}
I420Rotate(ro270_y + y_off_90, y_st_90, I420Rotate(ro270_y + y_off_90, y_st_90,
ro270_u + uv_off_90, uv_st_90, ro270_u + uv_off_90, uv_st_90,
...@@ -971,6 +997,7 @@ TEST_F(libyuvTest, NV12ToI420Rotate90) { ...@@ -971,6 +997,7 @@ TEST_F(libyuvTest, NV12ToI420Rotate90) {
int y_st_90 = yh + b * 2; int y_st_90 = yh + b * 2;
int uv_st_90 = uvh + b * 2; int uv_st_90 = uvh + b * 2;
for (i = 0; i < benchmark_iterations_; ++i) {
NV12ToI420Rotate(orig_y + y_off_0, y_st_0, NV12ToI420Rotate(orig_y + y_off_0, y_st_0,
orig_uv + y_off_0, y_st_0, orig_uv + y_off_0, y_st_0,
ro90_y + y_off_90, y_st_90, ro90_y + y_off_90, y_st_90,
...@@ -978,6 +1005,7 @@ TEST_F(libyuvTest, NV12ToI420Rotate90) { ...@@ -978,6 +1005,7 @@ TEST_F(libyuvTest, NV12ToI420Rotate90) {
ro90_v + uv_off_90, uv_st_90, ro90_v + uv_off_90, uv_st_90,
yw, yh, yw, yh,
kRotateClockwise); kRotateClockwise);
}
I420Rotate(ro90_y + y_off_90, y_st_90, I420Rotate(ro90_y + y_off_90, y_st_90,
ro90_u + uv_off_90, uv_st_90, ro90_u + uv_off_90, uv_st_90,
...@@ -1079,6 +1107,7 @@ TEST_F(libyuvTest, NV12ToI420Rotate270) { ...@@ -1079,6 +1107,7 @@ TEST_F(libyuvTest, NV12ToI420Rotate270) {
int y_st_270 = yh + b * 2; int y_st_270 = yh + b * 2;
int uv_st_270 = uvh + b * 2; int uv_st_270 = uvh + b * 2;
for (i = 0; i < benchmark_iterations_; ++i) {
NV12ToI420Rotate(orig_y + y_off_0, y_st_0, NV12ToI420Rotate(orig_y + y_off_0, y_st_0,
orig_uv + y_off_0, y_st_0, orig_uv + y_off_0, y_st_0,
ro270_y + y_off_270, y_st_270, ro270_y + y_off_270, y_st_270,
...@@ -1086,6 +1115,7 @@ TEST_F(libyuvTest, NV12ToI420Rotate270) { ...@@ -1086,6 +1115,7 @@ TEST_F(libyuvTest, NV12ToI420Rotate270) {
ro270_v + uv_off_270, uv_st_270, ro270_v + uv_off_270, uv_st_270,
yw, yh, yw, yh,
kRotateCounterClockwise); kRotateCounterClockwise);
}
I420Rotate(ro270_y + y_off_270, y_st_270, I420Rotate(ro270_y + y_off_270, y_st_270,
ro270_u + uv_off_270, uv_st_270, ro270_u + uv_off_270, uv_st_270,
...@@ -1183,6 +1213,7 @@ TEST_F(libyuvTest, NV12ToI420Rotate180) { ...@@ -1183,6 +1213,7 @@ TEST_F(libyuvTest, NV12ToI420Rotate180) {
int y_st = yw + b * 2; int y_st = yw + b * 2;
int uv_st = uvw + b * 2; int uv_st = uvw + b * 2;
for (i = 0; i < benchmark_iterations_; ++i) {
NV12ToI420Rotate(orig_y + y_off, y_st, NV12ToI420Rotate(orig_y + y_off, y_st,
orig_uv + y_off, y_st, orig_uv + y_off, y_st,
ro180_y + y_off, y_st, ro180_y + y_off, y_st,
...@@ -1190,6 +1221,7 @@ TEST_F(libyuvTest, NV12ToI420Rotate180) { ...@@ -1190,6 +1221,7 @@ TEST_F(libyuvTest, NV12ToI420Rotate180) {
ro180_v + uv_off, uv_st, ro180_v + uv_off, uv_st,
yw, yh, yw, yh,
kRotate180); kRotate180);
}
I420Rotate(ro180_y + y_off, y_st, I420Rotate(ro180_y + y_off, y_st,
ro180_u + uv_off, uv_st, ro180_u + uv_off, uv_st,
...@@ -1297,6 +1329,7 @@ TEST_F(libyuvTest, NV12ToI420RotateNegHeight90) { ...@@ -1297,6 +1329,7 @@ TEST_F(libyuvTest, NV12ToI420RotateNegHeight90) {
int y_st_90 = yh + b * 2; int y_st_90 = yh + b * 2;
int uv_st_90 = uvh + b * 2; int uv_st_90 = uvh + b * 2;
for (i = 0; i < benchmark_iterations_; ++i) {
NV12ToI420Rotate(orig_y + y_off_0, y_st_0, NV12ToI420Rotate(orig_y + y_off_0, y_st_0,
orig_uv + y_off_0, y_st_0, orig_uv + y_off_0, y_st_0,
roa_y + y_off_90, y_st_90, roa_y + y_off_90, y_st_90,
...@@ -1304,6 +1337,7 @@ TEST_F(libyuvTest, NV12ToI420RotateNegHeight90) { ...@@ -1304,6 +1337,7 @@ TEST_F(libyuvTest, NV12ToI420RotateNegHeight90) {
roa_v + uv_off_90, uv_st_90, roa_v + uv_off_90, uv_st_90,
yw, -yh, yw, -yh,
kRotateClockwise); kRotateClockwise);
}
I420Rotate(roa_y + y_off_90, y_st_90, I420Rotate(roa_y + y_off_90, y_st_90,
roa_u + uv_off_90, uv_st_90, roa_u + uv_off_90, uv_st_90,
...@@ -1444,6 +1478,7 @@ TEST_F(libyuvTest, NV12ToI420RotateNegHeight180) { ...@@ -1444,6 +1478,7 @@ TEST_F(libyuvTest, NV12ToI420RotateNegHeight180) {
int y_st = yw + b * 2; int y_st = yw + b * 2;
int uv_st = uvw + b * 2; int uv_st = uvw + b * 2;
for (i = 0; i < benchmark_iterations_; ++i) {
NV12ToI420Rotate(orig_y + y_off, y_st, NV12ToI420Rotate(orig_y + y_off, y_st,
orig_uv + y_off, y_st, orig_uv + y_off, y_st,
roa_y + y_off, y_st, roa_y + y_off, y_st,
...@@ -1451,6 +1486,7 @@ TEST_F(libyuvTest, NV12ToI420RotateNegHeight180) { ...@@ -1451,6 +1486,7 @@ TEST_F(libyuvTest, NV12ToI420RotateNegHeight180) {
roa_v + uv_off, uv_st, roa_v + uv_off, uv_st,
yw, -yh, yw, -yh,
kRotate180); kRotate180);
}
I420Rotate(roa_y + y_off, y_st, I420Rotate(roa_y + y_off, y_st,
roa_u + uv_off, uv_st, roa_u + uv_off, uv_st,
...@@ -1578,6 +1614,7 @@ TEST_F(libyuvTest, NV12ToI420SplitUV) { ...@@ -1578,6 +1614,7 @@ TEST_F(libyuvTest, NV12ToI420SplitUV) {
MaskCpuFlags(-1); // Enable all CPU optimization. MaskCpuFlags(-1); // Enable all CPU optimization.
double opt_time = get_time(); double opt_time = get_time();
for (i = 0; i < benchmark_iterations_; ++i) {
NV12ToI420Rotate(src_y, yw, NV12ToI420Rotate(src_y, yw,
src_uv, uvw * 2, src_uv, uvw * 2,
dst_y_opt, yw, dst_y_opt, yw,
...@@ -1585,6 +1622,7 @@ TEST_F(libyuvTest, NV12ToI420SplitUV) { ...@@ -1585,6 +1622,7 @@ TEST_F(libyuvTest, NV12ToI420SplitUV) {
dst_v_opt, uvw, dst_v_opt, uvw,
yw, yh, yw, yh,
kRotate0); kRotate0);
}
opt_time = (get_time() - opt_time); opt_time = (get_time() - opt_time);
// Report performance of C vs OPT. // Report performance of C vs OPT.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment