Removing SSE version of FFT filter until we work out how we want to handle the SSE...

diff --git a/gnuradio-core/src/lib/filter/Makefile.am b/gnuradio-core/src/lib/filter/Makefile.am
index 7ea8c582ed2384bf369a92d543dad3e6512f8d01..23c1dadc3607d870d004ed2de1c66cfbb6f70a9e 100644 (file)
--- a/gnuradio-core/src/lib/filter/Makefile.am
+++ b/gnuradio-core/src/lib/filter/Makefile.am
@@ -186,8 +186,6 @@ libfilter_la_common_SOURCES =               \
        gr_cma_equalizer_cc.cc          \
        gri_fft_filter_fff_generic.cc   \
        gri_fft_filter_ccc_generic.cc   \
-       gri_fft_filter_fff_sse.cc       \
-       gri_fft_filter_ccc_sse.cc       \
        gr_fft_filter_ccc.cc            \
        gr_fft_filter_fff.cc            \
        gr_goertzel_fc.cc               \
@@ -264,9 +262,7 @@ grinclude_HEADERS =                         \
        gr_cma_equalizer_cc.h           \
        gr_cpu.h                        \
        gri_fft_filter_fff_generic.h    \
-       gri_fft_filter_fff_sse.h        \
        gri_fft_filter_ccc_generic.h    \
-       gri_fft_filter_ccc_sse.h        \
        gr_fft_filter_ccc.h             \
        gr_fft_filter_fff.h             \
        gr_filter_delay_fc.h            \

diff --git a/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc b/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc
index 3c92c6a258ab9185635ffedc544b9ed3c2deca8c..4540c6e4ad00a4812e26d72d9b19e8cd290557cf 100644 (file)
--- a/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc
+++ b/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc
@@ -30,7 +30,7 @@
 #endif
 
 #include <gr_fft_filter_ccc.h>
-#include <gri_fft_filter_ccc_sse.h>
+//#include <gri_fft_filter_ccc_sse.h>
 #include <gri_fft_filter_ccc_generic.h>
 #include <gr_io_signature.h>
 #include <gri_fft.h>
@@ -57,7 +57,7 @@ gr_fft_filter_ccc::gr_fft_filter_ccc (int decimation, const std::vector<gr_compl
     d_updated(false)
 {
   set_history(1);
-#if 0
+#if 1 // don't enable the sse version until handling it is worked out
   d_filter = new gri_fft_filter_ccc_generic(decimation, taps);
 #else
   d_filter = new gri_fft_filter_ccc_sse(decimation, taps);

diff --git a/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.h b/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.h
index c037edebef52784dae9246ff05ba0f70ce3888ca..68b19e775b9da1c70d0b5f1e0966f73f0ef2e32e 100644 (file)
--- a/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.h
+++ b/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.h
@@ -28,7 +28,7 @@ class gr_fft_filter_ccc;
 typedef boost::shared_ptr<gr_fft_filter_ccc> gr_fft_filter_ccc_sptr;
 gr_fft_filter_ccc_sptr gr_make_fft_filter_ccc (int decimation, const std::vector<gr_complex> &taps);
 
-class gri_fft_filter_ccc_sse;
+//class gri_fft_filter_ccc_sse;
 class gri_fft_filter_ccc_generic;
 
 /*!
@@ -42,7 +42,7 @@ class gr_fft_filter_ccc : public gr_sync_decimator
 
   int                     d_nsamples;
   bool                    d_updated;
-#if 0
+#if 1  // don't enable the sse version until handling it is worked out
   gri_fft_filter_ccc_generic  *d_filter;  
 #else
   gri_fft_filter_ccc_sse  *d_filter;  

diff --git a/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc b/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc
index 914744e8ee4016b7da74d6e59f35ea109921d6b6..e8857fe8cfbd5d45fdfed39bbc95cd6c85e21f47 100644 (file)
--- a/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc
+++ b/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc
@@ -26,7 +26,7 @@
 
 #include <gr_fft_filter_fff.h>
 #include <gri_fft_filter_fff_generic.h>
-#include <gri_fft_filter_fff_sse.h>
+//#include <gri_fft_filter_fff_sse.h>
 #include <gr_io_signature.h>
 #include <assert.h>
 #include <stdexcept>
@@ -50,7 +50,7 @@ gr_fft_filter_fff::gr_fft_filter_fff (int decimation, const std::vector<float> &
 {
   set_history(1);
   
-#if 1
+#if 1 // don't enable the sse version until handling it is worked out
     d_filter = new gri_fft_filter_fff_generic(decimation, taps);
 #else
     d_filter = new gri_fft_filter_fff_sse(decimation, taps);

diff --git a/gnuradio-core/src/lib/filter/gr_fft_filter_fff.h b/gnuradio-core/src/lib/filter/gr_fft_filter_fff.h
index 2059d704b48ad1336606cf8a3af3b59d5d4abd6e..6eaa21500a8c0923cf13eb11eba8dc00ce9c0073 100644 (file)
--- a/gnuradio-core/src/lib/filter/gr_fft_filter_fff.h
+++ b/gnuradio-core/src/lib/filter/gr_fft_filter_fff.h
@@ -29,7 +29,7 @@ typedef boost::shared_ptr<gr_fft_filter_fff> gr_fft_filter_fff_sptr;
 gr_fft_filter_fff_sptr gr_make_fft_filter_fff (int decimation, const std::vector<float> &taps);
 
 class gri_fft_filter_fff_generic;
-class gri_fft_filter_fff_sse;
+//class gri_fft_filter_fff_sse;
 
 /*!
  * \brief Fast FFT filter with float input, float output and float taps
@@ -42,7 +42,7 @@ class gr_fft_filter_fff : public gr_sync_decimator
 
   int                     d_nsamples;
   bool                    d_updated;
-#if 1
+#if 1 // don't enable the sse version until handling it is worked out
   gri_fft_filter_fff_generic  *d_filter;
 #else
   gri_fft_filter_fff_sse  *d_filter;

diff --git a/gnuradio-core/src/lib/filter/gri_fft_filter_ccc_generic.cc b/gnuradio-core/src/lib/filter/gri_fft_filter_ccc_generic.cc
index 91049a92a02036b512d89b26d5a5a70fd6d656d3..1e7fbe214e414bc6eb6fa12be2aededec98c9808 100644 (file)
--- a/gnuradio-core/src/lib/filter/gri_fft_filter_ccc_generic.cc
+++ b/gnuradio-core/src/lib/filter/gri_fft_filter_ccc_generic.cc
@@ -29,7 +29,6 @@
 #include <assert.h>
 #include <stdexcept>
 #include <cstdio>
-#include <xmmintrin.h>
 #include <fftw3.h>
 
 gri_fft_filter_ccc_generic::gri_fft_filter_ccc_generic (int decimation,