diff options
| author | Martin Braun <martin.braun@ettus.com> | 2020-03-02 15:25:13 -0800 | 
|---|---|---|
| committer | atrnati <54334261+atrnati@users.noreply.github.com> | 2020-03-03 08:51:32 -0600 | 
| commit | 876d4150aa3da531ddd687b48afada6e43f79146 (patch) | |
| tree | fd72a71419f4cd800d4e500cfcaded4dfc8dc367 /host/lib/convert/ssse3_pack_sc12.cpp | |
| parent | 1393553d623bdf4ba40d5435c9719b6ce990d9ac (diff) | |
| download | uhd-876d4150aa3da531ddd687b48afada6e43f79146.tar.gz uhd-876d4150aa3da531ddd687b48afada6e43f79146.tar.bz2 uhd-876d4150aa3da531ddd687b48afada6e43f79146.zip | |
uhd: Apply clang-format against all .cpp and .hpp files in host/
Note: template_lvbitx.{cpp,hpp} need to be excluded from the list of
files that clang-format gets applied against.
Diffstat (limited to 'host/lib/convert/ssse3_pack_sc12.cpp')
| -rw-r--r-- | host/lib/convert/ssse3_pack_sc12.cpp | 180 | 
1 files changed, 99 insertions, 81 deletions
| diff --git a/host/lib/convert/ssse3_pack_sc12.cpp b/host/lib/convert/ssse3_pack_sc12.cpp index e71c2288b..4ba14db3b 100644 --- a/host/lib/convert/ssse3_pack_sc12.cpp +++ b/host/lib/convert/ssse3_pack_sc12.cpp @@ -5,8 +5,8 @@  // SPDX-License-Identifier: GPL-3.0-or-later  // -#include <tmmintrin.h>  #include "convert_pack_sc12.hpp" +#include <tmmintrin.h>  /*   * Shuffle Orderings - Single 128-bit SSE register @@ -44,24 +44,21 @@   *      -----------------------   *     31                     0   */ -#define SC12_SHIFT_MASK      0xfff0fff0, 0xfff0fff0, 0x0fff0fff, 0x0fff0fff -#define SC12_PACK_SHUFFLE1   13,12,9,8,5,4,1,0,15,14,11,10,7,6,3,2 -#define SC12_PACK_SHUFFLE2   9,8,0,11,10,2,13,12,4,15,14,6,0,0,0,0 -#define SC12_PACK_SHUFFLE3   8,1,8,8,3,8,8,5,8,8,7,8,8,8,8,8 +#define SC12_SHIFT_MASK 0xfff0fff0, 0xfff0fff0, 0x0fff0fff, 0x0fff0fff +#define SC12_PACK_SHUFFLE1 13, 12, 9, 8, 5, 4, 1, 0, 15, 14, 11, 10, 7, 6, 3, 2 +#define SC12_PACK_SHUFFLE2 9, 8, 0, 11, 10, 2, 13, 12, 4, 15, 14, 6, 0, 0, 0, 0 +#define SC12_PACK_SHUFFLE3 8, 1, 8, 8, 3, 8, 8, 5, 8, 8, 7, 8, 8, 8, 8, 8  template <typename type> -inline void convert_star_4_to_sc12_item32_3 -( -    const std::complex<type> *in, -    item32_sc12_3x &output, +inline void convert_star_4_to_sc12_item32_3(const std::complex<type>* in, +    item32_sc12_3x& output,      const double scalar, -    typename std::enable_if<std::is_same<type, float>::value>::type* = NULL -) +    typename std::enable_if<std::is_same<type, float>::value>::type* = NULL)  {      __m128 m0, m1, m2;      m0 = _mm_set1_ps(scalar); -    m1 = _mm_loadu_ps((const float *) &in[0]); -    m2 = _mm_loadu_ps((const float *) &in[2]); +    m1 = _mm_loadu_ps((const float*)&in[0]); +    m2 = _mm_loadu_ps((const float*)&in[2]);      m1 = _mm_mul_ps(m1, m0);      m2 = _mm_mul_ps(m2, m0);      m0 = _mm_shuffle_ps(m1, m2, _MM_SHUFFLE(2, 0, 2, 0)); @@ -84,17 +81,14 @@ inline void convert_star_4_to_sc12_item32_3      m6 = _mm_or_si128(m6, m7);      m6 = _mm_shuffle_epi32(m6, _MM_SHUFFLE(0, 1, 2, 3)); -    _mm_storeu_si128((__m128i*) &output, m6); +    _mm_storeu_si128((__m128i*)&output, m6);  }  template <typename type> -static void convert_star_4_to_sc12_item32_3 -( -    const std::complex<type> *in, -    item32_sc12_3x &output, +static void convert_star_4_to_sc12_item32_3(const std::complex<type>* in, +    item32_sc12_3x& output,      const double, -    typename std::enable_if<std::is_same<type, short>::value>::type* = NULL -) +    typename std::enable_if<std::is_same<type, short>::value>::type* = NULL)  {      __m128i m0, m1, m2, m3, m4, m5;      m0 = _mm_set_epi32(SC12_SHIFT_MASK); @@ -102,7 +96,7 @@ static void convert_star_4_to_sc12_item32_3      m2 = _mm_set_epi8(SC12_PACK_SHUFFLE2);      m3 = _mm_set_epi8(SC12_PACK_SHUFFLE3); -    m4 = _mm_loadu_si128((__m128i*) in); +    m4 = _mm_loadu_si128((__m128i*)in);      m4 = _mm_shuffle_epi8(m4, m1);      m5 = _mm_srli_epi16(m4, 4);      m4 = _mm_shuffle_epi32(m4, _MM_SHUFFLE(0, 0, 3, 2)); @@ -115,57 +109,66 @@ static void convert_star_4_to_sc12_item32_3      m3 = _mm_or_si128(m4, m5);      m3 = _mm_shuffle_epi32(m3, _MM_SHUFFLE(0, 1, 2, 3)); -    _mm_storeu_si128((__m128i*) &output, m3); +    _mm_storeu_si128((__m128i*)&output, m3);  }  template <typename type, towire32_type towire>  struct convert_star_1_to_sc12_item32_2 : public converter  { -    convert_star_1_to_sc12_item32_2(void):_scalar(0.0) -    { -    } +    convert_star_1_to_sc12_item32_2(void) : _scalar(0.0) {}      void set_scalar(const double scalar)      {          _scalar = scalar;      } -    void operator()(const input_type &inputs, const output_type &outputs, const size_t nsamps) +    void operator()( +        const input_type& inputs, const output_type& outputs, const size_t nsamps)      { -        const std::complex<type> *input = reinterpret_cast<const std::complex<type> *>(inputs[0]); +        const std::complex<type>* input = +            reinterpret_cast<const std::complex<type>*>(inputs[0]);          const size_t head_samps = size_t(outputs[0]) & 0x3;          int enable;          size_t rewind = 0; -        switch(head_samps) -        { -            case 0: break; -            case 1: rewind = 9; break; -            case 2: rewind = 6; break; -            case 3: rewind = 3; break; +        switch (head_samps) { +            case 0: +                break; +            case 1: +                rewind = 9; +                break; +            case 2: +                rewind = 6; +                break; +            case 3: +                rewind = 3; +                break;          } -        item32_sc12_3x *output = reinterpret_cast<item32_sc12_3x *>(size_t(outputs[0]) - rewind); +        item32_sc12_3x* output = +            reinterpret_cast<item32_sc12_3x*>(size_t(outputs[0]) - rewind); -        //helper variables +        // helper variables          size_t i = 0, o = 0; -        //handle the head case -        switch (head_samps) -        { -        case 0: -            break; //no head -        case 1: -            enable = CONVERT12_LINE2; -            convert_star_4_to_sc12_item32_3<type, towire>(0, 0, 0, input[0], enable, output[o++], _scalar); -            break; -        case 2: -            enable = CONVERT12_LINE2 | CONVERT12_LINE1; -            convert_star_4_to_sc12_item32_3<type, towire>(0, 0, input[0], input[1], enable, output[o++], _scalar); -            break; -        case 3: -            enable = CONVERT12_LINE2 | CONVERT12_LINE1 | CONVERT12_LINE0; -            convert_star_4_to_sc12_item32_3<type, towire>(0, input[0], input[1], input[2], enable, output[o++], _scalar); -            break; +        // handle the head case +        switch (head_samps) { +            case 0: +                break; // no head +            case 1: +                enable = CONVERT12_LINE2; +                convert_star_4_to_sc12_item32_3<type, towire>( +                    0, 0, 0, input[0], enable, output[o++], _scalar); +                break; +            case 2: +                enable = CONVERT12_LINE2 | CONVERT12_LINE1; +                convert_star_4_to_sc12_item32_3<type, towire>( +                    0, 0, input[0], input[1], enable, output[o++], _scalar); +                break; +            case 3: +                enable = CONVERT12_LINE2 | CONVERT12_LINE1 | CONVERT12_LINE0; +                convert_star_4_to_sc12_item32_3<type, towire>( +                    0, input[0], input[1], input[2], enable, output[o++], _scalar); +                break;          }          i += head_samps; @@ -174,34 +177,47 @@ struct convert_star_1_to_sc12_item32_2 : public converter          // subsequent samples to be converted (writes will simply happen          // twice). So set the conversion loop to force a tail case on the          // final 4 or fewer samples. -        while (i+4 < nsamps) -        { +        while (i + 4 < nsamps) {              convert_star_4_to_sc12_item32_3<type>(&input[i], output[o], _scalar); -            o++; i += 4; +            o++; +            i += 4;          } -        //handle the tail case +        // handle the tail case          const size_t tail_samps = nsamps - i; -        switch (tail_samps) -        { -        case 0: -            break; //no tail -        case 1: -            enable = CONVERT12_LINE0; -            convert_star_4_to_sc12_item32_3<type, towire>(input[i+0], 0, 0, 0, enable, output[o], _scalar); -            break; -        case 2: -            enable = CONVERT12_LINE0 | CONVERT12_LINE1; -            convert_star_4_to_sc12_item32_3<type, towire>(input[i+0], input[i+1], 0, 0, enable, output[o], _scalar); -            break; -        case 3: -            enable = CONVERT12_LINE0 | CONVERT12_LINE1 | CONVERT12_LINE2; -            convert_star_4_to_sc12_item32_3<type, towire>(input[i+0], input[i+1], input[i+2], 0, enable, output[o], _scalar); -            break; -        case 4: -            enable = CONVERT12_LINE_ALL; -            convert_star_4_to_sc12_item32_3<type, towire>(input[i+0], input[i+1], input[i+2], input[i+3], enable, output[o], _scalar); -            break; +        switch (tail_samps) { +            case 0: +                break; // no tail +            case 1: +                enable = CONVERT12_LINE0; +                convert_star_4_to_sc12_item32_3<type, towire>( +                    input[i + 0], 0, 0, 0, enable, output[o], _scalar); +                break; +            case 2: +                enable = CONVERT12_LINE0 | CONVERT12_LINE1; +                convert_star_4_to_sc12_item32_3<type, towire>( +                    input[i + 0], input[i + 1], 0, 0, enable, output[o], _scalar); +                break; +            case 3: +                enable = CONVERT12_LINE0 | CONVERT12_LINE1 | CONVERT12_LINE2; +                convert_star_4_to_sc12_item32_3<type, towire>(input[i + 0], +                    input[i + 1], +                    input[i + 2], +                    0, +                    enable, +                    output[o], +                    _scalar); +                break; +            case 4: +                enable = CONVERT12_LINE_ALL; +                convert_star_4_to_sc12_item32_3<type, towire>(input[i + 0], +                    input[i + 1], +                    input[i + 2], +                    input[i + 3], +                    enable, +                    output[o], +                    _scalar); +                break;          }      } @@ -221,14 +237,16 @@ static converter::sptr make_convert_sc16_1_to_sc12_item32_le_1(void)  UHD_STATIC_BLOCK(register_sse_pack_sc12)  {      uhd::convert::id_type id; -    id.num_inputs = 1; +    id.num_inputs  = 1;      id.num_outputs = 1; -    id.input_format = "fc32"; +    id.input_format  = "fc32";      id.output_format = "sc12_item32_le"; -    uhd::convert::register_converter(id, &make_convert_fc32_1_to_sc12_item32_le_1, PRIORITY_SIMD); +    uhd::convert::register_converter( +        id, &make_convert_fc32_1_to_sc12_item32_le_1, PRIORITY_SIMD); -    id.input_format = "sc16"; +    id.input_format  = "sc16";      id.output_format = "sc12_item32_le"; -    uhd::convert::register_converter(id, &make_convert_sc16_1_to_sc12_item32_le_1, PRIORITY_SIMD); +    uhd::convert::register_converter( +        id, &make_convert_sc16_1_to_sc12_item32_le_1, PRIORITY_SIMD);  } | 
