diff options
| author | schneider <schneider@blinkenlichts.net> | 2021-10-15 23:39:24 +0200 |
|---|---|---|
| committer | mormj <34754695+mormj@users.noreply.github.com> | 2021-10-21 10:56:07 -0400 |
| commit | 61709059f2e40a04ada73785812f19a5fc89cb8a (patch) | |
| tree | e64d0c34cfac8c43367d9e0357f48cb854d316ca | |
| parent | dee640362cb565757f0f09dc2001127e0ffaa33e (diff) | |
pmt: Use VOLK allocator for PMT vectors
This provides deterministic and VOLK compatible alignment of PMT
vectors.
Signed-off-by: schneider <schneider@blinkenlichts.net>
| -rw-r--r-- | gnuradio-runtime/lib/pmt/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | gnuradio-runtime/lib/pmt/pmt_unv_int.h | 26 |
2 files changed, 15 insertions, 12 deletions
diff --git a/gnuradio-runtime/lib/pmt/CMakeLists.txt b/gnuradio-runtime/lib/pmt/CMakeLists.txt index fb36337ea5..a45869d218 100644 --- a/gnuradio-runtime/lib/pmt/CMakeLists.txt +++ b/gnuradio-runtime/lib/pmt/CMakeLists.txt @@ -17,6 +17,7 @@ target_link_libraries(gnuradio-pmt Boost::boost Boost::thread Log4Cpp::log4cpp + Volk::volk ) target_include_directories(gnuradio-pmt diff --git a/gnuradio-runtime/lib/pmt/pmt_unv_int.h b/gnuradio-runtime/lib/pmt/pmt_unv_int.h index e3ac0495c2..ea9ae578fd 100644 --- a/gnuradio-runtime/lib/pmt/pmt_unv_int.h +++ b/gnuradio-runtime/lib/pmt/pmt_unv_int.h @@ -13,6 +13,8 @@ #include "pmt_int.h" +#include <volk/volk_alloc.hh> + #include <cstdint> #include <vector> @@ -22,7 +24,7 @@ namespace pmt { //////////////////////////////////////////////////////////////////////////// class PMT_API pmt_u8vector : public pmt_uniform_vector { - std::vector<uint8_t> d_v; + volk::vector<uint8_t> d_v; public: pmt_u8vector(size_t k, uint8_t fill); @@ -47,7 +49,7 @@ public: class pmt_s8vector : public pmt_uniform_vector { - std::vector<int8_t> d_v; + volk::vector<int8_t> d_v; public: pmt_s8vector(size_t k, int8_t fill); @@ -72,7 +74,7 @@ public: class pmt_u16vector : public pmt_uniform_vector { - std::vector<uint16_t> d_v; + volk::vector<uint16_t> d_v; public: pmt_u16vector(size_t k, uint16_t fill); @@ -97,7 +99,7 @@ public: class pmt_s16vector : public pmt_uniform_vector { - std::vector<int16_t> d_v; + volk::vector<int16_t> d_v; public: pmt_s16vector(size_t k, int16_t fill); @@ -122,7 +124,7 @@ public: class pmt_u32vector : public pmt_uniform_vector { - std::vector<uint32_t> d_v; + volk::vector<uint32_t> d_v; public: pmt_u32vector(size_t k, uint32_t fill); @@ -147,7 +149,7 @@ public: class pmt_s32vector : public pmt_uniform_vector { - std::vector<int32_t> d_v; + volk::vector<int32_t> d_v; public: pmt_s32vector(size_t k, int32_t fill); @@ -172,7 +174,7 @@ public: class pmt_u64vector : public pmt_uniform_vector { - std::vector<uint64_t> d_v; + volk::vector<uint64_t> d_v; public: pmt_u64vector(size_t k, uint64_t fill); @@ -197,7 +199,7 @@ public: class pmt_s64vector : public pmt_uniform_vector { - std::vector<int64_t> d_v; + volk::vector<int64_t> d_v; public: pmt_s64vector(size_t k, int64_t fill); @@ -222,7 +224,7 @@ public: class pmt_f32vector : public pmt_uniform_vector { - std::vector<float> d_v; + volk::vector<float> d_v; public: pmt_f32vector(size_t k, float fill); @@ -247,7 +249,7 @@ public: class pmt_f64vector : public pmt_uniform_vector { - std::vector<double> d_v; + volk::vector<double> d_v; public: pmt_f64vector(size_t k, double fill); @@ -272,7 +274,7 @@ public: class pmt_c32vector : public pmt_uniform_vector { - std::vector<std::complex<float>> d_v; + volk::vector<std::complex<float>> d_v; public: pmt_c32vector(size_t k, std::complex<float> fill); @@ -297,7 +299,7 @@ public: class pmt_c64vector : public pmt_uniform_vector { - std::vector<std::complex<double>> d_v; + volk::vector<std::complex<double>> d_v; public: pmt_c64vector(size_t k, std::complex<double> fill); |