[Commit-gnuradio] [gnuradio] 01/03: VOLKized the divide block. ~ 10x speedup

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch master
in repository gnuradio.

commit a7dc893fc42d62dcbc84447a8be991f75bac26db
Author: Marcus Müller <address@hidden>
Date:   Thu Jun 9 15:04:22 2016 +0200

    VOLKized the divide block. ~ 10x speedup
---
 gr-blocks/lib/CMakeLists.txt    |  4 ++-
 gr-blocks/lib/divide_cc_impl.cc | 66 +++++++++++++++++++++++++++++++++++++++++
 gr-blocks/lib/divide_cc_impl.h  | 47 +++++++++++++++++++++++++++++
 gr-blocks/lib/divide_ff_impl.cc | 66 +++++++++++++++++++++++++++++++++++++++++
 gr-blocks/lib/divide_ff_impl.h  | 47 +++++++++++++++++++++++++++++
 5 files changed, 229 insertions(+), 1 deletion(-)

diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt
index 869aee0..7c8ea14 100644
--- a/gr-blocks/lib/CMakeLists.txt
+++ b/gr-blocks/lib/CMakeLists.txt
@@ -32,7 +32,7 @@ GR_EXPAND_X_CC_H_IMPL(blocks add_const_vXX      bb ss ii ff 
cc)
 GR_EXPAND_X_CC_H_IMPL(blocks and_XX             bb ss ii)
 GR_EXPAND_X_CC_H_IMPL(blocks and_const_XX       bb ss ii)
 GR_EXPAND_X_CC_H_IMPL(blocks argmax_XX          fs is ss)
-GR_EXPAND_X_CC_H_IMPL(blocks divide_XX          ss ii ff cc)
+GR_EXPAND_X_CC_H_IMPL(blocks divide_XX          ss ii)
 GR_EXPAND_X_CC_H_IMPL(blocks integrate_XX       ss ii ff cc)
 GR_EXPAND_X_CC_H_IMPL(blocks max_XX             ss ii ff)
 GR_EXPAND_X_CC_H_IMPL(blocks min_XX             ss ii ff)
@@ -112,6 +112,8 @@ list(APPEND gr_blocks_sources
     conjugate_cc_impl.cc
     copy_impl.cc
     deinterleave_impl.cc
+    divide_cc_impl.cc
+    divide_ff_impl.cc
     delay_impl.cc
     endian_swap_impl.cc
     file_descriptor_sink_impl.cc
diff --git a/gr-blocks/lib/divide_cc_impl.cc b/gr-blocks/lib/divide_cc_impl.cc
new file mode 100644
index 0000000..56ce09e
--- /dev/null
+++ b/gr-blocks/lib/divide_cc_impl.cc
@@ -0,0 +1,66 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004-2016 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 <divide_cc_impl.h>
+#include <volk/volk.h>
+#include <gnuradio/io_signature.h>
+
+namespace gr {
+  namespace blocks {
+
+    divide_cc::sptr divide_cc::make(size_t vlen)
+    {
+      return gnuradio::get_initial_sptr(new divide_cc_impl(vlen));
+    }
+
+    divide_cc_impl::divide_cc_impl(size_t vlen)
+      : sync_block ("divide_cc",
+                      io_signature::make (2, -1, sizeof (gr_complex)*vlen),
+                      io_signature::make (1,  1, sizeof (gr_complex)*vlen)),
+      d_vlen(vlen)
+    {
+    }
+
+    int
+    divide_cc_impl::work(int noutput_items,
+                     gr_vector_const_void_star &input_items,
+                     gr_vector_void_star &output_items)
+    {
+      gr_complex *optr = (gr_complex *) output_items[0];
+      size_t ninputs = input_items.size ();
+      gr_complex *numerator = (gr_complex *) input_items[0];
+      for(size_t inp = 1; inp < ninputs; ++inp)
+      {
+        volk_32fc_x2_divide_32fc(optr, numerator, (gr_complex*) 
input_items[inp], noutput_items * d_vlen);
+        numerator = optr;
+      }
+
+      return noutput_items;
+    }
+
+  } /* namespace blocks */
+} /* namespace gr */
diff --git a/gr-blocks/lib/divide_cc_impl.h b/gr-blocks/lib/divide_cc_impl.h
new file mode 100644
index 0000000..2bcd698
--- /dev/null
+++ b/gr-blocks/lib/divide_cc_impl.h
@@ -0,0 +1,47 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004-2016 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 __DIVIDE_CC_IMPL_H__
+#define __DIVIDE_CC_IMPL_H__
+
+#include <gnuradio/blocks/divide_cc.h>
+
+namespace gr {
+  namespace blocks {
+
+    class BLOCKS_API divide_cc_impl : public divide_cc
+    {
+      size_t d_vlen;
+
+    public:
+      divide_cc_impl(size_t vlen);
+
+      int work(int noutput_items,
+              gr_vector_const_void_star &input_items,
+              gr_vector_void_star &output_items);
+    };
+
+  } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* include guard */
diff --git a/gr-blocks/lib/divide_ff_impl.cc b/gr-blocks/lib/divide_ff_impl.cc
new file mode 100644
index 0000000..5bd5f88
--- /dev/null
+++ b/gr-blocks/lib/divide_ff_impl.cc
@@ -0,0 +1,66 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004-2016 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 <divide_ff_impl.h>
+#include <volk/volk.h>
+#include <gnuradio/io_signature.h>
+
+namespace gr {
+  namespace blocks {
+
+    divide_ff::sptr divide_ff::make(size_t vlen)
+    {
+      return gnuradio::get_initial_sptr(new divide_ff_impl(vlen));
+    }
+
+    divide_ff_impl::divide_ff_impl(size_t vlen)
+      : sync_block ("divide_ff",
+                      io_signature::make (2, -1, sizeof (float)*vlen),
+                      io_signature::make (1,  1, sizeof (float)*vlen)),
+      d_vlen(vlen)
+    {
+    }
+
+    int
+    divide_ff_impl::work(int noutput_items,
+                     gr_vector_const_void_star &input_items,
+                     gr_vector_void_star &output_items)
+    {
+      float *optr = (float *) output_items[0];
+      size_t ninputs = input_items.size ();
+      float *numerator = (float *) input_items[0];
+      for(size_t inp = 1; inp < ninputs; ++inp)
+      {
+        volk_32f_x2_divide_32f(optr, numerator, (float*) input_items[inp], 
noutput_items * d_vlen);
+        numerator = optr;
+      }
+
+      return noutput_items;
+    }
+
+  } /* namespace blocks */
+} /* namespace gr */
diff --git a/gr-blocks/lib/divide_ff_impl.h b/gr-blocks/lib/divide_ff_impl.h
new file mode 100644
index 0000000..efa099f
--- /dev/null
+++ b/gr-blocks/lib/divide_ff_impl.h
@@ -0,0 +1,47 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004-2016 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 __DIVIDE_FF_IMPL_H__
+#define __DIVIDE_FF_IMPL_H__
+
+#include <gnuradio/blocks/divide_ff.h>
+
+namespace gr {
+  namespace blocks {
+
+    class BLOCKS_API divide_ff_impl : public divide_ff
+    {
+      size_t d_vlen;
+
+    public:
+      divide_ff_impl(size_t vlen);
+
+      int work(int noutput_items,
+              gr_vector_const_void_star &input_items,
+              gr_vector_void_star &output_items);
+    };
+
+  } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* include guard */