aboutsummaryrefslogtreecommitdiff
path: root/unit_test/unit_test.cc
diff options
context:
space:
mode:
authorFrank Barchard <fbarchard@google.com>2015-11-03 19:06:19 -0800
committerFrank Barchard <fbarchard@google.com>2015-11-03 19:06:19 -0800
commit82d74a37fae05cf4bedee6c95799a32a97958fd2 (patch)
tree38519206c99bec1e7a872e61e5903771f21228f5 /unit_test/unit_test.cc
parentab9a42d98233572c9698427005b99e3a8650c933 (diff)
downloadlibyuv-82d74a37fae05cf4bedee6c95799a32a97958fd2.tar.gz
unittest fix for cpu flags.
cpu flags of 1 disables SIMD and uses C. This used to be 0, but the change in auto init behavior means that 0 now means uninitialized, and will cause auto detect to reinit the cpu info. A value of 1 disables the auto init. TBR=harryjin@google.com BUG=none Review URL: https://codereview.chromium.org/1408753004 .
Diffstat (limited to 'unit_test/unit_test.cc')
-rw-r--r--unit_test/unit_test.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/unit_test/unit_test.cc b/unit_test/unit_test.cc
index c6febf87..f5aeac54 100644
--- a/unit_test/unit_test.cc
+++ b/unit_test/unit_test.cc
@@ -36,7 +36,7 @@ DEFINE_int32(libyuv_cpu_info, -1,
LibYUVConvertTest::LibYUVConvertTest() :
benchmark_iterations_(BENCHMARK_ITERATIONS), benchmark_width_(130),
- benchmark_height_(72), disable_cpu_flags_(0), benchmark_cpu_info_(-1) {
+ benchmark_height_(72), disable_cpu_flags_(1), benchmark_cpu_info_(-1) {
const char* repeat = getenv("LIBYUV_REPEAT");
if (repeat) {
benchmark_iterations_ = atoi(repeat); // NOLINT
@@ -88,7 +88,7 @@ LibYUVConvertTest::LibYUVConvertTest() :
LibYUVColorTest::LibYUVColorTest() :
benchmark_iterations_(BENCHMARK_ITERATIONS), benchmark_width_(128),
- benchmark_height_(72), disable_cpu_flags_(0), benchmark_cpu_info_(-1) {
+ benchmark_height_(72), disable_cpu_flags_(1), benchmark_cpu_info_(-1) {
const char* repeat = getenv("LIBYUV_REPEAT");
if (repeat) {
benchmark_iterations_ = atoi(repeat); // NOLINT
@@ -140,7 +140,7 @@ LibYUVColorTest::LibYUVColorTest() :
LibYUVScaleTest::LibYUVScaleTest() :
benchmark_iterations_(BENCHMARK_ITERATIONS), benchmark_width_(128),
- benchmark_height_(72), disable_cpu_flags_(0), benchmark_cpu_info_(-1) {
+ benchmark_height_(72), disable_cpu_flags_(1), benchmark_cpu_info_(-1) {
const char* repeat = getenv("LIBYUV_REPEAT");
if (repeat) {
benchmark_iterations_ = atoi(repeat); // NOLINT
@@ -192,7 +192,7 @@ LibYUVScaleTest::LibYUVScaleTest() :
LibYUVRotateTest::LibYUVRotateTest() :
benchmark_iterations_(BENCHMARK_ITERATIONS), benchmark_width_(128),
- benchmark_height_(72), disable_cpu_flags_(0), benchmark_cpu_info_(-1) {
+ benchmark_height_(72), disable_cpu_flags_(1), benchmark_cpu_info_(-1) {
const char* repeat = getenv("LIBYUV_REPEAT");
if (repeat) {
benchmark_iterations_ = atoi(repeat); // NOLINT
@@ -244,7 +244,7 @@ LibYUVRotateTest::LibYUVRotateTest() :
LibYUVPlanarTest::LibYUVPlanarTest() :
benchmark_iterations_(BENCHMARK_ITERATIONS), benchmark_width_(128),
- benchmark_height_(72), disable_cpu_flags_(0), benchmark_cpu_info_(-1) {
+ benchmark_height_(72), disable_cpu_flags_(1), benchmark_cpu_info_(-1) {
const char* repeat = getenv("LIBYUV_REPEAT");
if (repeat) {
benchmark_iterations_ = atoi(repeat); // NOLINT
@@ -296,7 +296,7 @@ LibYUVPlanarTest::LibYUVPlanarTest() :
LibYUVBaseTest::LibYUVBaseTest() :
benchmark_iterations_(BENCHMARK_ITERATIONS), benchmark_width_(128),
- benchmark_height_(72), disable_cpu_flags_(0), benchmark_cpu_info_(-1) {
+ benchmark_height_(72), disable_cpu_flags_(1), benchmark_cpu_info_(-1) {
const char* repeat = getenv("LIBYUV_REPEAT");
if (repeat) {
benchmark_iterations_ = atoi(repeat); // NOLINT