[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
kbr at google.com
kbr at google.com
Wed Dec 22 18:41:35 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit ce8e380f9e2dc22eadccfbd9ca9601d6c65d45f1
Author: kbr at google.com <kbr at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Dec 15 23:12:06 2010 +0000
2010-12-15 Kenneth Russell <kbr at google.com>
Reviewed by James Robinson.
Web Audio API: port FFTFrame to MKL
https://bugs.webkit.org/show_bug.cgi?id=50986
Fixed bug in log2 emulation function provided for Windows port of
Web Audio API.
* wtf/MathExtras.h:
(log2):
2010-12-15 Kenneth Russell <kbr at google.com>
Reviewed by James Robinson.
Web Audio API: port FFTFrame to MKL
https://bugs.webkit.org/show_bug.cgi?id=50986
Ported FFTFrame to Intel's MKL. This patch contains the port and
initial, though not complete, build system changes. Tested so far
with a unit test by Chris Rogers (which requires code changes to
AudioContext.cpp and is not being checked in). Further testing to
follow once layout tests are available for the Web Audio API.
* WebCore.gyp/WebCore.gyp:
* WebCore.gypi:
* platform/audio/FFTFrame.h:
* platform/audio/mkl: Added.
* platform/audio/mkl/FFTFrameMKL.cpp: Added.
(WebCore::FFTFrame::FFTFrame):
(WebCore::FFTFrame::~FFTFrame):
(WebCore::FFTFrame::multiply):
(WebCore::FFTFrame::doFFT):
(WebCore::FFTFrame::doInverseFFT):
(WebCore::FFTFrame::cleanup):
(WebCore::FFTFrame::realData):
(WebCore::FFTFrame::imagData):
(WebCore::FFTFrame::getUpToDateComplexData):
(WebCore::FFTFrame::descriptorHandleForSize):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74147 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index d4bf538..e5d64f4 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-12-15 Kenneth Russell <kbr at google.com>
+
+ Reviewed by James Robinson.
+
+ Web Audio API: port FFTFrame to MKL
+ https://bugs.webkit.org/show_bug.cgi?id=50986
+
+ Fixed bug in log2 emulation function provided for Windows port of
+ Web Audio API.
+
+ * wtf/MathExtras.h:
+ (log2):
+
2010-12-14 Mark Rowe <mrowe at apple.com>
Reviewed by Sam Weinig.
diff --git a/JavaScriptCore/wtf/MathExtras.h b/JavaScriptCore/wtf/MathExtras.h
index 802ba29..095549e 100644
--- a/JavaScriptCore/wtf/MathExtras.h
+++ b/JavaScriptCore/wtf/MathExtras.h
@@ -146,7 +146,7 @@ inline double copysign(double x, double y) { return _copysign(x, y); }
inline int isfinite(double x) { return _finite(x); }
// MSVC's math.h does not currently supply log2.
-inline bool log2(double num)
+inline double log2(double num)
{
// This constant is roughly M_LN2, which is not provided by default on Windows.
return log(num) / 0.693147180559945309417232121458176568;
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c34e123..d02e4fc 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,32 @@
+2010-12-15 Kenneth Russell <kbr at google.com>
+
+ Reviewed by James Robinson.
+
+ Web Audio API: port FFTFrame to MKL
+ https://bugs.webkit.org/show_bug.cgi?id=50986
+
+ Ported FFTFrame to Intel's MKL. This patch contains the port and
+ initial, though not complete, build system changes. Tested so far
+ with a unit test by Chris Rogers (which requires code changes to
+ AudioContext.cpp and is not being checked in). Further testing to
+ follow once layout tests are available for the Web Audio API.
+
+ * WebCore.gyp/WebCore.gyp:
+ * WebCore.gypi:
+ * platform/audio/FFTFrame.h:
+ * platform/audio/mkl: Added.
+ * platform/audio/mkl/FFTFrameMKL.cpp: Added.
+ (WebCore::FFTFrame::FFTFrame):
+ (WebCore::FFTFrame::~FFTFrame):
+ (WebCore::FFTFrame::multiply):
+ (WebCore::FFTFrame::doFFT):
+ (WebCore::FFTFrame::doInverseFFT):
+ (WebCore::FFTFrame::cleanup):
+ (WebCore::FFTFrame::realData):
+ (WebCore::FFTFrame::imagData):
+ (WebCore::FFTFrame::getUpToDateComplexData):
+ (WebCore::FFTFrame::descriptorHandleForSize):
+
2010-12-15 Yong Li <yoli at rim.com>
Reviewed by Darin Adler.
diff --git a/WebCore/WebCore.gyp/WebCore.gyp b/WebCore/WebCore.gyp/WebCore.gyp
index 5689580..66b95c1 100644
--- a/WebCore/WebCore.gyp/WebCore.gyp
+++ b/WebCore/WebCore.gyp/WebCore.gyp
@@ -826,6 +826,13 @@
'include_dirs+++': ['../dom'],
},
}],
+ # FIXME: (kbr) ideally this target should just depend on webcore_prerequisites
+ # to pick up this include directory, but I'm nervous about making that change.
+ ['(OS=="linux" or OS=="win") and "WTF_USE_WEBAUDIO_MKL=1" in feature_defines', {
+ 'include_dirs': [
+ '<(chromium_src_dir)/third_party/mkl/include',
+ ],
+ }],
],
},
{
@@ -994,6 +1001,14 @@
# by a system header on windows.
'include_dirs++': ['../dom'],
}],
+ ['(OS=="linux" or OS=="win") and "WTF_USE_WEBAUDIO_MKL=1" in feature_defines', {
+ # This directory needs to be on the include path for multiple sub-targets of webcore.
+ 'direct_dependent_settings': {
+ 'include_dirs': [
+ '<(chromium_src_dir)/third_party/mkl/include',
+ ],
+ },
+ }],
],
},
{
@@ -1056,7 +1071,7 @@
# Exclude things that don't apply to the Chromium platform on the basis
# of their enclosing directories and tags at the ends of their
# filenames.
- ['exclude', '(android|cairo|cf|cg|curl|gtk|haiku|linux|mac|opentype|posix|qt|soup|svg|symbian|win|wx)/'],
+ ['exclude', '(android|cairo|cf|cg|curl|gtk|haiku|linux|mac|mkl|opentype|posix|qt|soup|svg|symbian|win|wx)/'],
['exclude', '(?<!Chromium)(Android|Cairo|CF|CG|Curl|Gtk|Linux|Mac|OpenType|POSIX|Posix|Qt|Safari|Soup|Symbian|Win|Wx)\\.(cpp|mm?)$'],
# A few things can't be excluded by patterns. List them individually.
@@ -1224,6 +1239,11 @@
['exclude', '/GeolocationService.*$'],
],
}],
+ ['(OS=="linux" or OS=="win") and "WTF_USE_WEBAUDIO_MKL=1" in feature_defines', {
+ 'sources/': [
+ ['include', 'platform/audio/mkl/FFTFrameMKL\\.cpp$'],
+ ],
+ }],
],
},
{
@@ -1435,6 +1455,29 @@
'include_dirs+++': ['../dom'],
},
}],
+ ['OS=="win" and "WTF_USE_WEBAUDIO_MKL=1" in feature_defines', {
+ # FIXME: (kbr) figure out how to make these dependencies
+ # work in a cross-platform way. Attempts to use
+ # "link_settings" and "libraries" in conjunction with the
+ # msvs-specific settings didn't work so far.
+ 'all_dependent_settings': {
+ 'msvs_settings': {
+ 'VCLinkerTool': {
+ 'AdditionalLibraryDirectories': [
+ # This is a hack to make this directory correct
+ # relative to targets like chrome_dll. Should use
+ # <(chromium_src_dir).
+ '../third_party/mkl/lib/win/ia32',
+ ],
+ 'AdditionalDependencies': [
+ 'mkl_intel_c.lib',
+ 'mkl_sequential.lib',
+ 'mkl_core.lib',
+ ],
+ },
+ },
+ },
+ }],
['enable_svg!=0', {
'dependencies': [
'webcore_svg',
diff --git a/WebCore/WebCore.gypi b/WebCore/WebCore.gypi
index df7be09..66fccf4 100644
--- a/WebCore/WebCore.gypi
+++ b/WebCore/WebCore.gypi
@@ -2440,6 +2440,7 @@
'platform/audio/mac/AudioDestinationMac.cpp',
'platform/audio/mac/AudioFileReaderMac.cpp',
'platform/audio/mac/FFTFrameMac.cpp',
+ 'platform/audio/mkl/FFTFrameMKL.cpp',
'platform/animation/Animation.cpp',
'platform/animation/Animation.h',
'platform/animation/AnimationList.cpp',
diff --git a/WebCore/platform/audio/FFTFrame.h b/WebCore/platform/audio/FFTFrame.h
index 6147fc1..1a82ef0 100644
--- a/WebCore/platform/audio/FFTFrame.h
+++ b/WebCore/platform/audio/FFTFrame.h
@@ -35,6 +35,10 @@
#include <Accelerate/Accelerate.h>
#endif
+#if !OS(DARWIN) && USE(WEBAUDIO_MKL)
+#include "mkl_dfti.h"
+#endif
+
#include <wtf/PassOwnPtr.h>
#include <wtf/Platform.h>
@@ -95,6 +99,23 @@ private:
AudioFloatArray m_realData;
AudioFloatArray m_imagData;
#endif // OS(DARWIN)
+#if !OS(DARWIN) && USE(WEBAUDIO_MKL)
+ // Interleaves the planar real and imaginary data and returns a
+ // pointer to the resulting storage which can be used for in-place
+ // or out-of-place operations. FIXME: ideally all of the MKL
+ // routines would operate on planar data and this method would be
+ // removed.
+ float* getUpToDateComplexData();
+
+ static DFTI_DESCRIPTOR_HANDLE descriptorHandleForSize(unsigned fftSize);
+
+ static DFTI_DESCRIPTOR_HANDLE* descriptorHandles;
+
+ DFTI_DESCRIPTOR_HANDLE m_handle;
+ AudioFloatArray m_complexData;
+ AudioFloatArray m_realData;
+ AudioFloatArray m_imagData;
+#endif // !OS(DARWIN) && USE(WEBAUDIO_MKL)
};
} // namespace WebCore
diff --git a/WebCore/platform/audio/mkl/FFTFrameMKL.cpp b/WebCore/platform/audio/mkl/FFTFrameMKL.cpp
new file mode 100644
index 0000000..f66a485
--- /dev/null
+++ b/WebCore/platform/audio/mkl/FFTFrameMKL.cpp
@@ -0,0 +1,260 @@
+/*
+ * Copyright (C) 2010 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+// FFTFrame implementation using Intel's Math Kernel Library (MKL),
+// suitable for use on Windows and Linux.
+
+#include "config.h"
+
+#if ENABLE(WEB_AUDIO)
+
+#include "FFTFrame.h"
+
+#include "mkl_vml.h"
+#include <wtf/MathExtras.h>
+
+namespace {
+
+DFTI_DESCRIPTOR_HANDLE createDescriptorHandle(int fftSize)
+{
+ DFTI_DESCRIPTOR_HANDLE handle = 0;
+
+ // Create DFTI descriptor for 1D single precision transform.
+ MKL_LONG status = DftiCreateDescriptor(&handle, DFTI_SINGLE, DFTI_REAL, 1, fftSize);
+ ASSERT(DftiErrorClass(status, DFTI_NO_ERROR));
+
+ // Set placement of result to DFTI_NOT_INPLACE.
+ status = DftiSetValue(handle, DFTI_PLACEMENT, DFTI_NOT_INPLACE);
+ ASSERT(DftiErrorClass(status, DFTI_NO_ERROR));
+
+ // Set packing format to PERM; this produces the layout which
+ // matches Accelerate.framework's on the Mac, though interleaved.
+ status = DftiSetValue(handle, DFTI_PACKED_FORMAT, DFTI_PERM_FORMAT);
+ ASSERT(DftiErrorClass(status, DFTI_NO_ERROR));
+
+ // Set the forward scale factor to 2 to match Accelerate.framework's.
+ // FIXME: FFTFrameMac's scaling factor could be fixed to be 1.0,
+ // in which case this code would need to be changed as well.
+ status = DftiSetValue(handle, DFTI_FORWARD_SCALE, 2.0);
+ ASSERT(DftiErrorClass(status, DFTI_NO_ERROR));
+
+ // Set the backward scale factor to 1 / 2n to match Accelerate.framework's.
+ // FIXME: if the above scaling factor is fixed then this needs to be as well.
+ double scale = 1.0 / (2.0 * fftSize);
+ status = DftiSetValue(handle, DFTI_BACKWARD_SCALE, scale);
+ ASSERT(DftiErrorClass(status, DFTI_NO_ERROR));
+
+ // Use the default DFTI_CONJUGATE_EVEN_STORAGE = DFTI_COMPLEX_REAL.
+
+ // Commit DFTI descriptor.
+ status = DftiCommitDescriptor(handle);
+ ASSERT(DftiErrorClass(status, DFTI_NO_ERROR));
+
+ return handle;
+}
+
+} // anonymous namespace
+
+namespace WebCore {
+
+const int kMaxFFTPow2Size = 24;
+
+DFTI_DESCRIPTOR_HANDLE* FFTFrame::descriptorHandles = 0;
+
+// Normal constructor: allocates for a given fftSize.
+FFTFrame::FFTFrame(unsigned fftSize)
+ : m_FFTSize(fftSize)
+ , m_log2FFTSize(static_cast<unsigned>(log2(fftSize)))
+ , m_handle(0)
+ , m_complexData(fftSize)
+ , m_realData(fftSize / 2)
+ , m_imagData(fftSize / 2)
+{
+ // We only allow power of two.
+ ASSERT(1UL << m_log2FFTSize == m_FFTSize);
+
+ m_handle = descriptorHandleForSize(fftSize);
+}
+
+// Creates a blank/empty frame (interpolate() must later be called).
+FFTFrame::FFTFrame()
+ : m_FFTSize(0)
+ , m_log2FFTSize(0)
+ , m_handle(0)
+{
+}
+
+// Copy constructor.
+FFTFrame::FFTFrame(const FFTFrame& frame)
+ : m_FFTSize(frame.m_FFTSize)
+ , m_log2FFTSize(frame.m_log2FFTSize)
+ , m_handle(0)
+ , m_complexData(frame.m_FFTSize)
+ , m_realData(frame.m_FFTSize / 2)
+ , m_imagData(frame.m_FFTSize / 2)
+{
+ m_handle = descriptorHandleForSize(m_FFTSize);
+
+ // Copy/setup frame data.
+ unsigned nbytes = sizeof(float) * (m_FFTSize / 2);
+ memcpy(realData(), frame.realData(), nbytes);
+ memcpy(imagData(), frame.imagData(), nbytes);
+}
+
+FFTFrame::~FFTFrame()
+{
+}
+
+void FFTFrame::multiply(const FFTFrame& frame)
+{
+ FFTFrame& frame1 = *this;
+ FFTFrame& frame2 = const_cast<FFTFrame&>(frame);
+
+ float* realP1 = frame1.realData();
+ float* imagP1 = frame1.imagData();
+ const float* realP2 = frame2.realData();
+ const float* imagP2 = frame2.imagData();
+
+ // Scale accounts for vecLib's peculiar scaling.
+ // This ensures the right scaling all the way back to inverse FFT.
+ // FIXME: this scaling factor will be 1.0f if the above 2.0 -> 1.0
+ // scaling factor is fixed.
+ float scale = 0.5f;
+
+ // Multiply packed DC/nyquist component.
+ realP1[0] *= scale * realP2[0];
+ imagP1[0] *= scale * imagP2[0];
+
+ // Multiply the rest, skipping packed DC/Nyquist components.
+ float* interleavedData1 = frame1.getUpToDateComplexData();
+ float* interleavedData2 = frame2.getUpToDateComplexData();
+
+ unsigned halfSize = m_FFTSize / 2;
+
+ // Complex multiply.
+ vcMul(halfSize - 1,
+ reinterpret_cast<MKL_Complex8*>(interleavedData1) + 1,
+ reinterpret_cast<MKL_Complex8*>(interleavedData2) + 1,
+ reinterpret_cast<MKL_Complex8*>(interleavedData1) + 1);
+
+ // De-interleave and scale the rest of the data.
+ // FIXME: find an MKL routine to do at least the scaling more efficiently.
+ for (unsigned i = 1; i < halfSize; ++i) {
+ int baseComplexIndex = 2 * i;
+ realP1[i] = scale * interleavedData1[baseComplexIndex];
+ imagP1[i] = scale * interleavedData1[baseComplexIndex + 1];
+ }
+}
+
+void FFTFrame::doFFT(float* data)
+{
+ // Compute Forward transform.
+ MKL_LONG status = DftiComputeForward(m_handle, data, m_complexData.data());
+ ASSERT(DftiErrorClass(status, DFTI_NO_ERROR));
+
+ // De-interleave to separate real and complex arrays. FIXME:
+ // figure out if it's possible to get MKL to use split-complex
+ // form for 1D real-to-complex out-of-place FFTs.
+ int len = m_FFTSize / 2;
+ for (int i = 0; i < len; ++i) {
+ int baseComplexIndex = 2 * i;
+ // m_realData[0] is the DC component and m_imagData[0] the
+ // Nyquist component since the interleaved complex data is
+ // packed.
+ m_realData[i] = m_complexData[baseComplexIndex];
+ m_imagData[i] = m_complexData[baseComplexIndex + 1];
+ }
+}
+
+void FFTFrame::doInverseFFT(float* data)
+{
+ // Prepare interleaved data. FIXME: figure out if it's possible to
+ // get MKL to use split-complex form for 1D backward
+ // (complex-to-real) out-of-place FFTs.
+ float* interleavedData = getUpToDateComplexData();
+
+ // Compute backward transform.
+ MKL_LONG status = DftiComputeBackward(m_handle, interleavedData, data);
+ ASSERT(DftiErrorClass(status, DFTI_NO_ERROR));
+}
+
+void FFTFrame::cleanup()
+{
+ if (!descriptorHandles)
+ return;
+
+ for (int i = 0; i < kMaxFFTPow2Size; ++i) {
+ if (descriptorHandles[i]) {
+ MKL_LONG status = DftiFreeDescriptor(&descriptorHandles[i]);
+ ASSERT(DftiErrorClass(status, DFTI_NO_ERROR));
+ }
+ }
+
+ delete[] descriptorHandles;
+ descriptorHandles = 0;
+}
+
+float* FFTFrame::realData() const
+{
+ return const_cast<float*>(m_realData.data());
+}
+
+float* FFTFrame::imagData() const
+{
+ return const_cast<float*>(m_imagData.data());
+}
+
+float* FFTFrame::getUpToDateComplexData()
+{
+ // FIXME: if we can't completely get rid of this method, SSE
+ // optimization could be considered if it shows up hot on profiles.
+ int len = m_FFTSize / 2;
+ for (int i = 0; i < len; ++i) {
+ int baseComplexIndex = 2 * i;
+ m_complexData[baseComplexIndex] = m_realData[i];
+ m_complexData[baseComplexIndex + 1] = m_imagData[i];
+ }
+ return const_cast<float*>(m_complexData.data());
+}
+
+DFTI_DESCRIPTOR_HANDLE FFTFrame::descriptorHandleForSize(unsigned fftSize)
+{
+ if (!descriptorHandles) {
+ descriptorHandles = new DFTI_DESCRIPTOR_HANDLE[kMaxFFTPow2Size];
+ for (int i = 0; i < kMaxFFTPow2Size; ++i)
+ descriptorHandles[i] = 0;
+ }
+
+ ASSERT(fftSize);
+ int pow2size = static_cast<int>(log2(fftSize));
+ ASSERT(pow2size < kMaxFFTPow2Size);
+ if (!descriptorHandles[pow2size])
+ descriptorHandles[pow2size] = createDescriptorHandle(fftSize);
+ return descriptorHandles[pow2size];
+}
+
+} // namespace WebCore
+
+#endif // ENABLE(WEB_AUDIO)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list