Chromium Code Reviews| 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..4fc9374757ee6ca740c2bebc10816e56f1f7aae6 100644 |
| --- a/media/base/vector_math_unittest.cc |
| +++ b/media/base/vector_math_unittest.cc |
| @@ -6,24 +6,17 @@ |
| #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; |
| - |
| // Default test values. |
|
scherkus (not reviewing)
2013/10/29 02:16:51
might as well clean these up too by moving into me
|
| static const float kScale = 0.5; |
| static const float kInputFillValue = 1.0; |
| @@ -54,18 +47,7 @@ class VectorMathTest : public testing::Test { |
| 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; |
| - } |
| - |
| protected: |
| - int benchmark_iterations; |
| scoped_ptr_malloc<float, base::ScopedPtrAlignedFree> input_vector; |
| scoped_ptr_malloc<float, base::ScopedPtrAlignedFree> output_vector; |
| @@ -156,136 +138,4 @@ TEST_F(VectorMathTest, FMUL) { |
| #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 |