From a34f397a4ba7e150268d40f87fede4e3663a9853 Mon Sep 17 00:00:00 2001
From: Tom Rondeau <trondeau@vt.edu>
Date: Sun, 14 Mar 2010 22:53:53 -0400
Subject: [PATCH] Removing SSE version of FFT filter until we work out how we
 want to handle the SSE  the use of intrinics. Code for the SSE versions is
 still there just disabled.

---
 gnuradio-core/src/lib/filter/Makefile.am                   | 4 ----
 gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc          | 4 ++--
 gnuradio-core/src/lib/filter/gr_fft_filter_ccc.h           | 4 ++--
 gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc          | 4 ++--
 gnuradio-core/src/lib/filter/gr_fft_filter_fff.h           | 4 ++--
 gnuradio-core/src/lib/filter/gri_fft_filter_ccc_generic.cc | 1 -
 6 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/gnuradio-core/src/lib/filter/Makefile.am b/gnuradio-core/src/lib/filter/Makefile.am
index 7ea8c582..23c1dadc 100644
--- 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 3c92c6a2..4540c6e4 100644
--- 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 c037edeb..68b19e77 100644
--- 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 914744e8..e8857fe8 100644
--- 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 2059d704..6eaa2150 100644
--- 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 91049a92..1e7fbe21 100644
--- 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, 
-- 
2.30.2