Index: media/base/vector_math_unittest.cc |
diff --git a/media/base/vector_math_unittest.cc b/media/base/vector_math_unittest.cc |
index 2c7740142cb1a3d9b55aab68642dbf553b77a2e6..32e5ea468c2d98abd861be0d6f47bfc4a1ff62cd 100644 |
--- a/media/base/vector_math_unittest.cc |
+++ b/media/base/vector_math_unittest.cc |
@@ -6,68 +6,50 @@ |
#define _USE_MATH_DEFINES |
#include <cmath> |
-#include "base/command_line.h" |
#include "base/cpu.h" |
#include "base/memory/aligned_memory.h" |
#include "base/memory/scoped_ptr.h" |
#include "base/strings/string_number_conversions.h" |
#include "base/strings/stringize_macros.h" |
-#include "base/time/time.h" |
#include "media/base/vector_math.h" |
#include "media/base/vector_math_testing.h" |
#include "testing/gtest/include/gtest/gtest.h" |
-using base::TimeTicks; |
using std::fill; |
-// Command line switch for runtime adjustment of benchmark iterations. |
-static const char kBenchmarkIterations[] = "vector-math-iterations"; |
-static const int kDefaultIterations = 10; |
+namespace media { |
// Default test values. |
static const float kScale = 0.5; |
static const float kInputFillValue = 1.0; |
static const float kOutputFillValue = 3.0; |
- |
-namespace media { |
+static const int kVectorSize = 8192; |
class VectorMathTest : public testing::Test { |
public: |
- static const int kVectorSize = 8192; |
VectorMathTest() { |
// Initialize input and output vectors. |
- input_vector.reset(static_cast<float*>(base::AlignedAlloc( |
+ input_vector_.reset(static_cast<float*>(base::AlignedAlloc( |
sizeof(float) * kVectorSize, vector_math::kRequiredAlignment))); |
- output_vector.reset(static_cast<float*>(base::AlignedAlloc( |
+ output_vector_.reset(static_cast<float*>(base::AlignedAlloc( |
sizeof(float) * kVectorSize, vector_math::kRequiredAlignment))); |
} |
void FillTestVectors(float input, float output) { |
// Setup input and output vectors. |
- fill(input_vector.get(), input_vector.get() + kVectorSize, input); |
- fill(output_vector.get(), output_vector.get() + kVectorSize, output); |
+ fill(input_vector_.get(), input_vector_.get() + kVectorSize, input); |
+ fill(output_vector_.get(), output_vector_.get() + kVectorSize, output); |
} |
void VerifyOutput(float value) { |
for (int i = 0; i < kVectorSize; ++i) |
- ASSERT_FLOAT_EQ(output_vector.get()[i], value); |
- } |
- |
- int BenchmarkIterations() { |
- int vector_math_iterations = kDefaultIterations; |
- std::string iterations( |
- CommandLine::ForCurrentProcess()->GetSwitchValueASCII( |
- kBenchmarkIterations)); |
- if (!iterations.empty()) |
- base::StringToInt(iterations, &vector_math_iterations); |
- return vector_math_iterations; |
+ ASSERT_FLOAT_EQ(output_vector_.get()[i], value); |
} |
protected: |
- int benchmark_iterations; |
- scoped_ptr_malloc<float, base::ScopedPtrAlignedFree> input_vector; |
- scoped_ptr_malloc<float, base::ScopedPtrAlignedFree> output_vector; |
+ scoped_ptr_malloc<float, base::ScopedPtrAlignedFree> input_vector_; |
+ scoped_ptr_malloc<float, base::ScopedPtrAlignedFree> output_vector_; |
DISALLOW_COPY_AND_ASSIGN(VectorMathTest); |
}; |
@@ -80,7 +62,7 @@ TEST_F(VectorMathTest, FMAC) { |
SCOPED_TRACE("FMAC"); |
FillTestVectors(kInputFillValue, kOutputFillValue); |
vector_math::FMAC( |
- input_vector.get(), kScale, kVectorSize, output_vector.get()); |
+ input_vector_.get(), kScale, kVectorSize, output_vector_.get()); |
VerifyOutput(kResult); |
} |
@@ -88,7 +70,7 @@ TEST_F(VectorMathTest, FMAC) { |
SCOPED_TRACE("FMAC_C"); |
FillTestVectors(kInputFillValue, kOutputFillValue); |
vector_math::FMAC_C( |
- input_vector.get(), kScale, kVectorSize, output_vector.get()); |
+ input_vector_.get(), kScale, kVectorSize, output_vector_.get()); |
VerifyOutput(kResult); |
} |
@@ -98,7 +80,7 @@ TEST_F(VectorMathTest, FMAC) { |
SCOPED_TRACE("FMAC_SSE"); |
FillTestVectors(kInputFillValue, kOutputFillValue); |
vector_math::FMAC_SSE( |
- input_vector.get(), kScale, kVectorSize, output_vector.get()); |
+ input_vector_.get(), kScale, kVectorSize, output_vector_.get()); |
VerifyOutput(kResult); |
} |
#endif |
@@ -108,7 +90,7 @@ TEST_F(VectorMathTest, FMAC) { |
SCOPED_TRACE("FMAC_NEON"); |
FillTestVectors(kInputFillValue, kOutputFillValue); |
vector_math::FMAC_NEON( |
- input_vector.get(), kScale, kVectorSize, output_vector.get()); |
+ input_vector_.get(), kScale, kVectorSize, output_vector_.get()); |
VerifyOutput(kResult); |
} |
#endif |
@@ -122,7 +104,7 @@ TEST_F(VectorMathTest, FMUL) { |
SCOPED_TRACE("FMUL"); |
FillTestVectors(kInputFillValue, kOutputFillValue); |
vector_math::FMUL( |
- input_vector.get(), kScale, kVectorSize, output_vector.get()); |
+ input_vector_.get(), kScale, kVectorSize, output_vector_.get()); |
VerifyOutput(kResult); |
} |
@@ -130,7 +112,7 @@ TEST_F(VectorMathTest, FMUL) { |
SCOPED_TRACE("FMUL_C"); |
FillTestVectors(kInputFillValue, kOutputFillValue); |
vector_math::FMUL_C( |
- input_vector.get(), kScale, kVectorSize, output_vector.get()); |
+ input_vector_.get(), kScale, kVectorSize, output_vector_.get()); |
VerifyOutput(kResult); |
} |
@@ -140,7 +122,7 @@ TEST_F(VectorMathTest, FMUL) { |
SCOPED_TRACE("FMUL_SSE"); |
FillTestVectors(kInputFillValue, kOutputFillValue); |
vector_math::FMUL_SSE( |
- input_vector.get(), kScale, kVectorSize, output_vector.get()); |
+ input_vector_.get(), kScale, kVectorSize, output_vector_.get()); |
VerifyOutput(kResult); |
} |
#endif |
@@ -150,142 +132,10 @@ TEST_F(VectorMathTest, FMUL) { |
SCOPED_TRACE("FMUL_NEON"); |
FillTestVectors(kInputFillValue, kOutputFillValue); |
vector_math::FMUL_NEON( |
- input_vector.get(), kScale, kVectorSize, output_vector.get()); |
+ input_vector_.get(), kScale, kVectorSize, output_vector_.get()); |
VerifyOutput(kResult); |
} |
#endif |
} |
-// Define platform independent function name for FMACBenchmark* tests. |
-#if defined(ARCH_CPU_X86_FAMILY) |
-#define FMAC_FUNC FMAC_SSE |
-#elif defined(ARCH_CPU_ARM_FAMILY) && defined(USE_NEON) |
-#define FMAC_FUNC FMAC_NEON |
-#endif |
- |
-// Benchmark for each optimized vector_math::FMAC() method. Original benchmarks |
-// were run with --vector-fmac-iterations=200000. |
-TEST_F(VectorMathTest, FMACBenchmark) { |
- static const int kBenchmarkIterations = BenchmarkIterations(); |
- |
- printf("Benchmarking %d iterations:\n", kBenchmarkIterations); |
- |
- // Benchmark FMAC_C(). |
- FillTestVectors(kInputFillValue, kOutputFillValue); |
- TimeTicks start = TimeTicks::HighResNow(); |
- for (int i = 0; i < kBenchmarkIterations; ++i) { |
- vector_math::FMAC_C( |
- input_vector.get(), kScale, kVectorSize, output_vector.get()); |
- } |
- double total_time_c_ms = (TimeTicks::HighResNow() - start).InMillisecondsF(); |
- printf("FMAC_C took %.2fms.\n", total_time_c_ms); |
- |
-#if defined(FMAC_FUNC) |
-#if defined(ARCH_CPU_X86_FAMILY) |
- ASSERT_TRUE(base::CPU().has_sse()); |
-#endif |
- |
- // Benchmark FMAC_FUNC() with unaligned size. |
- ASSERT_NE((kVectorSize - 1) % (vector_math::kRequiredAlignment / |
- sizeof(float)), 0U); |
- FillTestVectors(kInputFillValue, kOutputFillValue); |
- start = TimeTicks::HighResNow(); |
- for (int j = 0; j < kBenchmarkIterations; ++j) { |
- vector_math::FMAC_FUNC( |
- input_vector.get(), kScale, kVectorSize - 1, output_vector.get()); |
- } |
- double total_time_optimized_unaligned_ms = |
- (TimeTicks::HighResNow() - start).InMillisecondsF(); |
- printf(STRINGIZE(FMAC_FUNC) " (unaligned size) took %.2fms; which is %.2fx " |
- "faster than FMAC_C.\n", total_time_optimized_unaligned_ms, |
- total_time_c_ms / total_time_optimized_unaligned_ms); |
- |
- // Benchmark FMAC_FUNC() with aligned size. |
- ASSERT_EQ(kVectorSize % (vector_math::kRequiredAlignment / sizeof(float)), |
- 0U); |
- FillTestVectors(kInputFillValue, kOutputFillValue); |
- start = TimeTicks::HighResNow(); |
- for (int j = 0; j < kBenchmarkIterations; ++j) { |
- vector_math::FMAC_FUNC( |
- input_vector.get(), kScale, kVectorSize, output_vector.get()); |
- } |
- double total_time_optimized_aligned_ms = |
- (TimeTicks::HighResNow() - start).InMillisecondsF(); |
- printf(STRINGIZE(FMAC_FUNC) " (aligned) took %.2fms; which is %.2fx " |
- "faster than FMAC_C and %.2fx faster than " |
- STRINGIZE(FMAC_FUNC) " (unaligned).\n", |
- total_time_optimized_aligned_ms, |
- total_time_c_ms / total_time_optimized_aligned_ms, |
- total_time_optimized_unaligned_ms / total_time_optimized_aligned_ms); |
-#endif |
-} |
- |
-#undef FMAC_FUNC |
- |
-// Define platform independent function name for FMULBenchmark* tests. |
-#if defined(ARCH_CPU_X86_FAMILY) |
-#define FMUL_FUNC FMUL_SSE |
-#elif defined(ARCH_CPU_ARM_FAMILY) && defined(USE_NEON) |
-#define FMUL_FUNC FMUL_NEON |
-#endif |
- |
-// Benchmark for each optimized vector_math::FMUL() method. Original benchmarks |
-// were run with --vector-math-iterations=200000. |
-TEST_F(VectorMathTest, FMULBenchmark) { |
- static const int kBenchmarkIterations = BenchmarkIterations(); |
- |
- printf("Benchmarking %d iterations:\n", kBenchmarkIterations); |
- |
- // Benchmark FMUL_C(). |
- FillTestVectors(kInputFillValue, kOutputFillValue); |
- TimeTicks start = TimeTicks::HighResNow(); |
- for (int i = 0; i < kBenchmarkIterations; ++i) { |
- vector_math::FMUL_C( |
- input_vector.get(), kScale, kVectorSize, output_vector.get()); |
- } |
- double total_time_c_ms = (TimeTicks::HighResNow() - start).InMillisecondsF(); |
- printf("FMUL_C took %.2fms.\n", total_time_c_ms); |
- |
-#if defined(FMUL_FUNC) |
-#if defined(ARCH_CPU_X86_FAMILY) |
- ASSERT_TRUE(base::CPU().has_sse()); |
-#endif |
- |
- // Benchmark FMUL_SSE() with unaligned size. |
- ASSERT_NE((kVectorSize - 1) % (vector_math::kRequiredAlignment / |
- sizeof(float)), 0U); |
- FillTestVectors(kInputFillValue, kOutputFillValue); |
- start = TimeTicks::HighResNow(); |
- for (int j = 0; j < kBenchmarkIterations; ++j) { |
- vector_math::FMUL_FUNC( |
- input_vector.get(), kScale, kVectorSize - 1, output_vector.get()); |
- } |
- double total_time_optimized_unaligned_ms = |
- (TimeTicks::HighResNow() - start).InMillisecondsF(); |
- printf(STRINGIZE(FMUL_FUNC) " (unaligned size) took %.2fms; which is %.2fx " |
- "faster than FMUL_C.\n", total_time_optimized_unaligned_ms, |
- total_time_c_ms / total_time_optimized_unaligned_ms); |
- |
- // Benchmark FMUL_SSE() with aligned size. |
- ASSERT_EQ(kVectorSize % (vector_math::kRequiredAlignment / sizeof(float)), |
- 0U); |
- FillTestVectors(kInputFillValue, kOutputFillValue); |
- start = TimeTicks::HighResNow(); |
- for (int j = 0; j < kBenchmarkIterations; ++j) { |
- vector_math::FMUL_FUNC( |
- input_vector.get(), kScale, kVectorSize, output_vector.get()); |
- } |
- double total_time_optimized_aligned_ms = |
- (TimeTicks::HighResNow() - start).InMillisecondsF(); |
- printf(STRINGIZE(FMUL_FUNC) " (aligned) took %.2fms; which is %.2fx " |
- "faster than FMUL_C and %.2fx faster than " |
- STRINGIZE(FMUL_FUNC) " (unaligned).\n", |
- total_time_optimized_aligned_ms, |
- total_time_c_ms / total_time_optimized_aligned_ms, |
- total_time_optimized_unaligned_ms / total_time_optimized_aligned_ms); |
-#endif |
-} |
- |
-#undef FMUL_FUNC |
- |
} // namespace media |