core: added volk version of add_ff.

11 files changed, 167 insertions, 11 deletions

diff --git a/gnuradio-core/src/lib/general/.gitignore b/gnuradio-core/src/lib/general/.gitignore
index b04ffe4ae..795dc793c 100644
--- a/gnuradio-core/src/lib/general/.gitignore
+++ b/gnuradio-core/src/lib/general/.gitignore
@@ -125,9 +125,6 @@
 /gr_add_const_vss.cc
 /gr_add_const_vss.h
 /gr_add_const_vss.i
-/gr_add_ff.cc
-/gr_add_ff.h
-/gr_add_ff.i
 /gr_add_ii.cc
 /gr_add_ii.h
 /gr_add_ii.i
diff --git a/gnuradio-core/src/lib/general/CMakeLists.txt b/gnuradio-core/src/lib/general/CMakeLists.txt
index 301465361..ab35aa66a 100644
--- a/gnuradio-core/src/lib/general/CMakeLists.txt
+++ b/gnuradio-core/src/lib/general/CMakeLists.txt
@@ -178,6 +178,7 @@ endif(ENABLE_PYTHON)
 ########################################################################
 set(gr_core_general_triple_threats
     complex_vec_test
+    gr_add_ff
     gr_additive_scrambler_bb
     gr_agc_cc
     gr_agc_ff
diff --git a/gnuradio-core/src/lib/general/Makefile.am b/gnuradio-core/src/lib/general/Makefile.am
index b452a5107..89152d663 100644
--- a/gnuradio-core/src/lib/general/Makefile.am
+++ b/gnuradio-core/src/lib/general/Makefile.am
@@ -37,6 +37,7 @@ EXTRA_DIST += \
 
 libgeneral_la_SOURCES = 		\
 	complex_vec_test.cc		\
+	gr_add_ff.cc			\
 	gr_additive_scrambler_bb.cc	\
 	gr_agc_cc.cc                	\
 	gr_agc_ff.cc                	\
@@ -192,6 +193,7 @@ libgeneral_qa_la_SOURCES = 		\
 grinclude_HEADERS = 			\
 	gr_core_api.h			\
 	complex_vec_test.h		\
+	gr_add.h			\
 	gr_additive_scrambler_bb.h	\
 	gr_agc_cc.h                 	\
 	gr_agc_ff.h                 	\
@@ -364,6 +366,7 @@ noinst_HEADERS = 			\
 swiginclude_HEADERS =			\
 	complex_vec_test.i		\
 	general.i			\
+	gr_add.i			\
 	gr_additive_scrambler_bb.i	\
 	gr_agc_cc.i                 	\
 	gr_agc_ff.i                 	\
diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i
index 8e1be02f9..c384ecfbb 100644
--- a/gnuradio-core/src/lib/general/general.i
+++ b/gnuradio-core/src/lib/general/general.i
@@ -140,6 +140,7 @@
 #include <gr_burst_tagger.h>
 #include <gr_cpm.h>
 #include <gr_correlate_access_code_tag_bb.h>
+#include <gr_add_ff.h>
 %}
 
 %include "gri_control_loop.i"
@@ -260,3 +261,4 @@
 %include "gr_burst_tagger.i"
 %include "gr_cpm.i"
 %include "gr_correlate_access_code_tag_bb.i"
+%include "gr_add_ff.i"
diff --git a/gnuradio-core/src/lib/general/general_generated.i b/gnuradio-core/src/lib/general/general_generated.i
index 82f9a6006..e12f2b0ec 100644
--- a/gnuradio-core/src/lib/general/general_generated.i
+++ b/gnuradio-core/src/lib/general/general_generated.i
@@ -12,7 +12,6 @@
 #include <gr_add_const_vff.h>
 #include <gr_add_const_vii.h>
 #include <gr_add_const_vss.h>
-#include <gr_add_ff.h>
 #include <gr_add_ii.h>
 #include <gr_add_ss.h>
 #include <gr_add_vcc.h>
@@ -85,7 +84,6 @@
 %include <gr_add_const_vff.i>
 %include <gr_add_const_vii.i>
 %include <gr_add_const_vss.i>
-%include <gr_add_ff.i>
 %include <gr_add_ii.i>
 %include <gr_add_ss.i>
 %include <gr_add_vcc.i>
diff --git a/gnuradio-core/src/lib/general/gr_add_ff.cc b/gnuradio-core/src/lib/general/gr_add_ff.cc
new file mode 100644
index 000000000..a5db5ec5c
--- /dev/null
+++ b/gnuradio-core/src/lib/general/gr_add_ff.cc
@@ -0,0 +1,70 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ * 
+ * This file is part of GNU Radio
+ * 
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ * 
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gr_add_ff.h>
+#include <gr_io_signature.h>
+#include <volk/volk.h>
+
+gr_add_ff_sptr
+gr_make_add_ff(size_t vlen)
+{
+  return gnuradio::get_initial_sptr(new gr_add_ff(vlen));
+}
+
+gr_add_ff::gr_add_ff (size_t vlen)
+  : gr_sync_block("add_ff",
+		  gr_make_io_signature (1, -1, sizeof(float)*vlen),
+		  gr_make_io_signature (1,  1, sizeof(float)*vlen)),
+    d_vlen (vlen)
+{
+  const int alignment_multiple = 
+    volk_get_alignment() / sizeof(float);
+  set_alignment(alignment_multiple);
+}
+
+int
+gr_add_ff::work(int noutput_items,
+		gr_vector_const_void_star &input_items,
+		gr_vector_void_star &output_items)
+{
+  float *out = (float *) output_items[0];
+  int noi = d_vlen*noutput_items;
+
+  memcpy(out, input_items[0], noi*sizeof(float));
+  for(size_t i = 1; i < input_items.size(); i++)
+    volk_32f_x2_add_32f_u(out, out, (const float*)input_items[i], noi);
+  /*
+  if(is_unaligned()) {
+    for(size_t i = 1; i < input_items.size(); i++)
+      volk_32f_x2_add_32f_u(out, out, (const float*)input_items[i], noi);
+  }
+  else {
+    for(size_t i = 1; i < input_items.size(); i++)
+      volk_32f_x2_add_32f_a(out, out, (const float*)input_items[i], noi);
+  }
+  */
+  return noutput_items;
+}
diff --git a/gnuradio-core/src/lib/general/gr_add_ff.h b/gnuradio-core/src/lib/general/gr_add_ff.h
new file mode 100644
index 000000000..6421f8da2
--- /dev/null
+++ b/gnuradio-core/src/lib/general/gr_add_ff.h
@@ -0,0 +1,56 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ * 
+ * This file is part of GNU Radio
+ * 
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ * 
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_ADD_FF_H
+#define INCLUDED_GR_ADD_FF_H
+
+#include <gr_core_api.h>
+#include <gr_sync_block.h>
+
+class gr_add_ff;
+typedef boost::shared_ptr<gr_add_ff> gr_add_ff_sptr;
+
+GR_CORE_API gr_add_ff_sptr
+gr_make_add_ff (size_t vlen=1);
+
+/*!
+ * \brief Add streams of complex values
+ * \ingroup math_blk
+ */
+
+class GR_CORE_API gr_add_ff : public gr_sync_block
+{
+ private:
+  friend GR_CORE_API gr_add_ff_sptr
+    gr_make_add_ff (size_t vlen);
+  gr_add_ff (size_t vlen);
+  
+  size_t d_vlen;
+
+ public:
+  virtual int work (int noutput_items,
+		    gr_vector_const_void_star &input_items,
+		    gr_vector_void_star &output_items);
+};
+
+
+#endif /* INCLUDED_GR_ADD_FF_H */
diff --git a/gnuradio-core/src/lib/general/gr_add_ff.i b/gnuradio-core/src/lib/general/gr_add_ff.i
new file mode 100644
index 000000000..3c30640b1
--- /dev/null
+++ b/gnuradio-core/src/lib/general/gr_add_ff.i
@@ -0,0 +1,32 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ * 
+ * This file is part of GNU Radio
+ * 
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ * 
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+GR_SWIG_BLOCK_MAGIC(gr,add_ff)
+
+gr_add_ff_sptr
+gr_make_add_ff (size_t vlen=1);
+
+class gr_add_ff : public gr_sync_block
+{
+public:
+
+};
diff --git a/gnuradio-core/src/lib/gengen/.gitignore b/gnuradio-core/src/lib/gengen/.gitignore
index 72c915cb8..b91d2f197 100644
--- a/gnuradio-core/src/lib/gengen/.gitignore
+++ b/gnuradio-core/src/lib/gengen/.gitignore
@@ -124,9 +124,6 @@
 /gr_add_const_vss.cc
 /gr_add_const_vss.h
 /gr_add_const_vss.i
-/gr_add_ff.cc
-/gr_add_ff.h
-/gr_add_ff.i
 /gr_add_ii.cc
 /gr_add_ii.h
 /gr_add_ii.i
diff --git a/gnuradio-core/src/lib/gengen/CMakeLists.txt b/gnuradio-core/src/lib/gengen/CMakeLists.txt
index c3c4a7a35..98b149e97 100644
--- a/gnuradio-core/src/lib/gengen/CMakeLists.txt
+++ b/gnuradio-core/src/lib/gengen/CMakeLists.txt
@@ -87,7 +87,7 @@ expand_h_cc_i(gr_sig_source_X        s i f c)
 
 expand_h_cc_i(gr_add_const_XX           ss ii ff cc sf)
 expand_h_cc_i(gr_multiply_const_XX      ss ii)
-expand_h_cc_i(gr_add_XX                 ss ii ff cc)
+expand_h_cc_i(gr_add_XX                 ss ii cc)
 expand_h_cc_i(gr_sub_XX                 ss ii ff cc)
 expand_h_cc_i(gr_multiply_XX            ss ii)
 expand_h_cc_i(gr_divide_XX              ss ii ff cc)
diff --git a/gnuradio-core/src/lib/gengen/generate_common.py b/gnuradio-core/src/lib/gengen/generate_common.py
index 0c3d4579d..616cc4b06 100755
--- a/gnuradio-core/src/lib/gengen/generate_common.py
+++ b/gnuradio-core/src/lib/gengen/generate_common.py
@@ -41,7 +41,6 @@ reg_signatures = ['ss', 'ii', 'ff', 'cc']
 
 reg_roots = [
     'gr_add_const_XX',
-    'gr_add_XX',
     'gr_sub_XX',
     'gr_divide_XX',
     'gr_mute_XX',
@@ -66,7 +65,8 @@ others = (
     ('gr_max_XX',                   ('ff','ii','ss')),
     ('gr_peak_detector_XX',         ('fb','ib','sb')),
     ('gr_multiply_XX',              ('ss','ii')),
-    ('gr_multiply_const_XX',        ('ss','ii'))
+    ('gr_multiply_const_XX',        ('ss','ii')),
+    ('gr_add_XX',                   ('ss','cc'))
     )