diff options
| author | Marcus Müller <mmueller@gnuradio.org> | 2019-08-07 21:45:12 +0200 |
|---|---|---|
| committer | Marcus Müller <marcus@hostalia.de> | 2019-08-09 23:04:28 +0200 |
| commit | f7bbf2c1d8d780294f3e016aff239ca35eb6516e (patch) | |
| tree | e09ab6112e02b2215b2d59ac24d3d6ea2edac745 /gr-blocks/lib/add_blk_impl.cc | |
| parent | 78431dc6941e3acc67c858277dfe4a0ed583643c (diff) | |
Tree: clang-format without the include sorting
Diffstat (limited to 'gr-blocks/lib/add_blk_impl.cc')
| -rw-r--r-- | gr-blocks/lib/add_blk_impl.cc | 108 |
1 files changed, 52 insertions, 56 deletions
diff --git a/gr-blocks/lib/add_blk_impl.cc b/gr-blocks/lib/add_blk_impl.cc index 9cda4d080e..2b6cdc0b0d 100644 --- a/gr-blocks/lib/add_blk_impl.cc +++ b/gr-blocks/lib/add_blk_impl.cc @@ -30,77 +30,73 @@ #include <volk/volk.h> namespace gr { - namespace blocks { - - template <class T> - typename add_blk<T>::sptr add_blk<T>::make(size_t vlen) - { - return gnuradio::get_initial_sptr(new add_blk_impl<T> (vlen)); - } +namespace blocks { +template <class T> +typename add_blk<T>::sptr add_blk<T>::make(size_t vlen) +{ + return gnuradio::get_initial_sptr(new add_blk_impl<T>(vlen)); +} - template <> - add_blk_impl<float>::add_blk_impl(size_t vlen) - : sync_block("add_ff", - io_signature::make (1, -1, sizeof(float)*vlen), - io_signature::make (1, 1, sizeof(float)*vlen)), - d_vlen(vlen) - { - const int alignment_multiple = - volk_get_alignment() / sizeof(float); - set_alignment(std::max(1, alignment_multiple)); - } - template <> - int - add_blk_impl<float>::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++) +template <> +add_blk_impl<float>::add_blk_impl(size_t vlen) + : sync_block("add_ff", + io_signature::make(1, -1, sizeof(float) * vlen), + io_signature::make(1, 1, sizeof(float) * vlen)), + d_vlen(vlen) +{ + const int alignment_multiple = volk_get_alignment() / sizeof(float); + set_alignment(std::max(1, alignment_multiple)); +} + +template <> +int add_blk_impl<float>::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(out, out, (const float*)input_items[i], noi); - return noutput_items; - } + return noutput_items; +} - - template <class T> - add_blk_impl<T> ::add_blk_impl (size_t vlen) - : sync_block ("add_blk", - io_signature::make (1, -1, sizeof (T)*vlen), - io_signature::make (1, 1, sizeof (T)*vlen)), +template <class T> +add_blk_impl<T>::add_blk_impl(size_t vlen) + : sync_block("add_blk", + io_signature::make(1, -1, sizeof(T) * vlen), + io_signature::make(1, 1, sizeof(T) * vlen)), d_vlen(vlen) - { - } +{ +} - template <class T> - int - add_blk_impl<T> ::work(int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) - { - T *optr = (T *) output_items[0]; +template <class T> +int add_blk_impl<T>::work(int noutput_items, + gr_vector_const_void_star& input_items, + gr_vector_void_star& output_items) +{ + T* optr = (T*)output_items[0]; - int ninputs = input_items.size (); + int ninputs = input_items.size(); - for (size_t i = 0; i < noutput_items*d_vlen; i++){ - T acc = ((T *) input_items[0])[i]; - for (int j = 1; j < ninputs; j++) - acc += ((T *) input_items[j])[i]; + for (size_t i = 0; i < noutput_items * d_vlen; i++) { + T acc = ((T*)input_items[0])[i]; + for (int j = 1; j < ninputs; j++) + acc += ((T*)input_items[j])[i]; - *optr++ = (T) acc; - } - - return noutput_items; + *optr++ = (T)acc; } + return noutput_items; +} + template class add_blk<std::int16_t>; template class add_blk<std::int32_t>; template class add_blk<gr_complex>; template class add_blk<float>; - } /* namespace blocks */ +} /* namespace blocks */ } /* namespace gr */ |