Changeset 74147 in webkit

Timestamp:

Dec 15, 2010 3:12:06 PM (13 years ago)

Author:

kbr@google.com

Message:

2010-12-15 Kenneth Russell <​kbr@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@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):

Location:

trunk

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/wtf/MathExtras.h (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.gyp/WebCore.gyp (modified) (5 diffs)
• WebCore/WebCore.gypi (modified) (1 diff)
• WebCore/platform/audio/FFTFrame.h (modified) (2 diffs)
• WebCore/platform/audio/mkl (added)
• WebCore/platform/audio/mkl/FFTFrameMKL.cpp (added)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2010-12-15  Kenneth Russell  <kbr@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@apple.com>
 

trunk/JavaScriptCore/wtf/MathExtras.h

@@ -147 +147 @@
 
 // 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.

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-12-15  Kenneth Russell  <kbr@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@rim.com>
 

trunk/WebCore/WebCore.gyp/WebCore.gyp

@@ -827 +827 @@
           },
         }],
+        # 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',
+          ],
+        }],
       ],
     },
@@ -995 +1002 @@
           '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',
+            ],
+          },
+        }],
       ],
     },
@@ -1057 +1072 @@
         # 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?)$'],
 
@@ -1223 +1238 @@
           'sources/': [
             ['exclude', '/GeolocationService.*$'],
+          ],
+        }],
+        ['(OS=="linux" or OS=="win") and "WTF_USE_WEBAUDIO_MKL=1" in feature_defines', {
+          'sources/': [
+            ['include', 'platform/audio/mkl/FFTFrameMKL\\.cpp$'],
           ],
         }],
@@ -1436 +1456 @@
           },
         }],
+        ['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': [

trunk/WebCore/WebCore.gypi

@@ -2441 +2441 @@
             'platform/audio/mac/AudioFileReaderMac.cpp',
             'platform/audio/mac/FFTFrameMac.cpp',
+            'platform/audio/mkl/FFTFrameMKL.cpp',
             'platform/animation/Animation.cpp',
             'platform/animation/Animation.h',

trunk/WebCore/platform/audio/FFTFrame.h

@@ -34 +34 @@
 #if OS(DARWIN)
 #include <Accelerate/Accelerate.h>
+#endif
+
+#if !OS(DARWIN) && USE(WEBAUDIO_MKL)
+#include "mkl_dfti.h"
 #endif
 
@@ -96 +100 @@
     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)
 };