Add SSE optimizations to SincResampler.

media/base/sinc_resampler_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // MSVC++ requires this to be set before any other includes to get M_PI.
 #define _USE_MATH_DEFINES
 
 #include <cmath>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
+#include "base/format_macros.h"
 #include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/stringprintf.h"
+#include "base/time.h"
 #include "media/base/sinc_resampler.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using testing::_;
 
 namespace media {
 
+static const double kSampleRateRatio = 192000.0 / 44100.0;
+static const double kKernelInterpolationFactor = 0.5;
+
 // Helper class to ensure ChunkedResample() functions properly.
 class MockSource {
  public:
   MOCK_METHOD2(ProvideInput, void(float* destination, int frames));
 };
 
 // Test requesting multiples of ChunkSize() frames results in the proper number
 // of callbacks.
 TEST(SincResamplerTest, ChunkedResample) {
   MockSource mock_source;
 
   // Choose a high ratio of input to output samples which will result in quick
   // exhaustion of SincResampler's internal buffers.
-  static const double kSampleRateRatio = 192000.0 / 44100.0;
   SincResampler resampler(
       kSampleRateRatio,
       base::Bind(&MockSource::ProvideInput, base::Unretained(&mock_source)));
 
   static const int kChunks = 2;
   int max_chunk_size = resampler.ChunkSize() * kChunks;
   scoped_array<float> resampled_destination(new float[max_chunk_size]);
 
   // Verify requesting ChunkSize() frames causes a single callback.
   EXPECT_CALL(mock_source, ProvideInput(_, _)).Times(1);
   resampler.Resample(resampled_destination.get(), resampler.ChunkSize());
 
   // Verify requesting kChunks * ChunkSize() frames causes kChunks callbacks.
   testing::Mock::VerifyAndClear(&mock_source);
   EXPECT_CALL(mock_source, ProvideInput(_, _)).Times(kChunks);
   resampler.Resample(resampled_destination.get(), max_chunk_size);
 }
 
+// Ensure various optimized Convolve() methods return the same value.  Only run
+// this test if other optimized methods exist, otherwise the default Convolve()
+// will be tested by the parameterized SincResampler tests below.
+#if defined(ARCH_CPU_X86_FAMILY) && defined(__SSE__)
+TEST(SincResamplerTest, Convolve) {
+  // Initialize a dummy resampler.
+  MockSource mock_source;
+  SincResampler resampler(
+      kSampleRateRatio,
+      base::Bind(&MockSource::ProvideInput, base::Unretained(&mock_source)));
+
+  // Convolve_SSE() is slightly more precise than Conolve_C(), so comparison
+  // must be done using an epsilon.
+  static const double kEpsilon = 0.00000005;
+
+  // Use a kernel from SincResampler as input and kernel data, this has the
+  // benefit of already being properly sized and aligned for Convolve_SSE().
+  double result = resampler.Convolve_C(
+      resampler.kernel_storage_.get(), resampler.kernel_storage_.get(),
+      resampler.kernel_storage_.get(), kKernelInterpolationFactor);
+  double result2 = resampler.Convolve_SSE(
+      resampler.kernel_storage_.get(), resampler.kernel_storage_.get(),
+      resampler.kernel_storage_.get(), kKernelInterpolationFactor);
+  EXPECT_NEAR(result2, result, kEpsilon);
+
+  // Test Convolve_SSE() w/ unaligned input pointer.
+  result = resampler.Convolve_C(
+      resampler.kernel_storage_.get() + 1, resampler.kernel_storage_.get(),
+      resampler.kernel_storage_.get(), kKernelInterpolationFactor);
+  result2 = resampler.Convolve_SSE(
+      resampler.kernel_storage_.get() + 1, resampler.kernel_storage_.get(),
+      resampler.kernel_storage_.get(), kKernelInterpolationFactor);
+  EXPECT_NEAR(result2, result, kEpsilon);
+}
+#endif
+
+// Benchmark for the various Convolve() methods.

[Ami GONE FROM CHROMIUM, 2012/07/21 17:25:10]

Comment that this is only DISABLED_ for the benefit of bot cycle time?

Maybe a better move is to instead check it in with kConvolveIterations of 10 or
something, and let benchmarkers up that in their builds? (or make it runtime
settable, like with a flag or env var).

[DaleCurtis, 2012/07/24 00:13:07]

Done. --convolve-iterations is runtime settable.

+TEST(SincResamplerTest, DISABLED_ConvolveBenchmark) {
+  // Initialize a dummy resampler.
+  MockSource mock_source;
+  SincResampler resampler(
+      kSampleRateRatio,
+      base::Bind(&MockSource::ProvideInput, base::Unretained(&mock_source)));
+
+  static const int kConvolveIterations = 50000000;
+
+  // Benchmark Convolve_C().
+  base::TimeTicks start = base::TimeTicks::HighResNow();
+  for (int i = 0; i < kConvolveIterations; ++i) {
+    resampler.Convolve_C(
+        resampler.kernel_storage_.get(), resampler.kernel_storage_.get(),
+        resampler.kernel_storage_.get(), kKernelInterpolationFactor);
+  }
+  base::TimeTicks end = base::TimeTicks::HighResNow();
+  printf("Convolve_C took %" PRId64 "ms for %d iterations.\n",
+         (end - start).InMilliseconds(), kConvolveIterations);
+
+#if defined(ARCH_CPU_X86_FAMILY) && defined(__SSE__)
+  // Benchmark Convolve_SSE() with aligned input pointer.
+  start = base::TimeTicks::HighResNow();
+  for (int j = 0; j < kConvolveIterations; ++j) {
+    resampler.Convolve_SSE(
+        resampler.kernel_storage_.get(), resampler.kernel_storage_.get(),
+        resampler.kernel_storage_.get(), kKernelInterpolationFactor);
+  }
+  end = base::TimeTicks::HighResNow();
+  printf("Convolve_SSE (aligned) took %" PRId64 "ms for %d iterations.\n",
+         (end - start).InMilliseconds(), kConvolveIterations);
+
+  // Benchmark Convolve_SSE() with unaligned input pointer.
+  start = base::TimeTicks::HighResNow();
+  for (int j = 0; j < kConvolveIterations; ++j) {
+    resampler.Convolve_SSE(
+        resampler.kernel_storage_.get() + 1, resampler.kernel_storage_.get(),
+        resampler.kernel_storage_.get(), kKernelInterpolationFactor);
+  }
+  end = base::TimeTicks::HighResNow();
+  printf("Convolve_SSE (unaligned) took %" PRId64 "ms for %d iterations.\n",
+         (end - start).InMilliseconds(), kConvolveIterations);
+#endif

[Ami GONE FROM CHROMIUM, 2012/07/21 17:25:10]

Add an output for the relative improvement between C and SSE?

[DaleCurtis, 2012/07/24 00:13:07]

Done.

+}
+
 // Fake audio source for testing the resampler.  Generates a sinusoidal linear
 // chirp (http://en.wikipedia.org/wiki/Chirp) which can be tuned to stress the
 // resampler for the specific sample rate conversion being used.
 class SinusoidalLinearChirpSource {
  public:
   SinusoidalLinearChirpSource(int sample_rate, int samples,
                               double max_frequency)
       : sample_rate_(sample_rate),
         total_samples_(samples),
         max_frequency_(max_frequency),
@@ skipping 179 matching lines @@
         std::tr1::make_tuple(11025, 192000, kResamplingRMSError, -62.61),
         std::tr1::make_tuple(16000, 192000, kResamplingRMSError, -63.14),
         std::tr1::make_tuple(22050, 192000, kResamplingRMSError, -62.42),
         std::tr1::make_tuple(32000, 192000, kResamplingRMSError, -63.38),
         std::tr1::make_tuple(44100, 192000, kResamplingRMSError, -62.63),
         std::tr1::make_tuple(48000, 192000, kResamplingRMSError, -73.44),
         std::tr1::make_tuple(96000, 192000, kResamplingRMSError, -73.52),
         std::tr1::make_tuple(192000, 192000, kResamplingRMSError, -73.52)));
 
 }  // namespace media