[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next |
|
Date: |
Mon, 30 Mar 2015 05:25:11 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch next
in repository gnuradio.
commit 354c4227f7de718a7cbdc83b90ddf00251e1bc86
Merge: 6d64474 e3df182
Author: Johnathan Corgan <address@hidden>
Date: Sun Mar 29 22:09:27 2015 -0700
Merge branch 'master' into next
.gitmodules | 4 +
CMakeLists.txt | 56 +-
volk | 1 +
volk/CMakeLists.txt | 183 ----
volk/apps/CMakeLists.txt | 61 --
volk/apps/volk-config-info.cc | 96 --
volk/apps/volk_profile.cc | 280 -----
volk/cmake/CMakeParseArgumentsCopy.cmake | 138 ---
volk/cmake/FindORC.cmake | 36 -
volk/cmake/GrPython.cmake | 234 ----
volk/cmake/VolkBoost.cmake | 98 --
volk/cmake/VolkConfig.cmake | 26 -
volk/cmake/msvc/config.h | 58 -
volk/cmake/msvc/inttypes.h | 301 ------
volk/cmake/msvc/stdbool.h | 45 -
volk/cmake/msvc/stdint.h | 251 -----
volk/gen/archs.xml | 204 ----
volk/gen/machines.xml | 55 -
volk/gen/volk_arch_defs.py | 85 --
volk/gen/volk_compile_utils.py | 58 -
volk/gen/volk_kernel_defs.py | 209 ----
volk/gen/volk_machine_defs.py | 74 --
volk/gen/volk_tmpl_utils.py | 74 --
volk/include/volk/constants.h | 39 -
volk/include/volk/volk_common.h | 96 --
volk/include/volk/volk_complex.h | 86 --
volk/include/volk/volk_malloc.h | 66 --
volk/include/volk/volk_prefs.h | 28 -
volk/kernels/README.txt | 67 --
.../asm/neon/volk_16i_max_star_horizontal_16i.s | 52 -
.../asm/neon/volk_32f_s32f_multiply_32f_neonasm.s | 52 -
.../volk/asm/neon/volk_32f_x2_add_32f_a_neonasm.s | 54 -
.../asm/neon/volk_32f_x2_add_32f_a_neonpipeline.s | 68 --
.../asm/neon/volk_32f_x2_dot_prod_32f_neonasm.s | 58 -
.../neon/volk_32f_x2_dot_prod_32f_neonasm_opts.s | 116 --
.../neon/volk_32fc_32f_dot_prod_32fc_a_neonasm.s | 79 --
...volk_32fc_32f_dot_prod_32fc_a_neonasmpipeline.s | 86 --
.../volk_32fc_32f_dot_prod_32fc_a_neonasmvmla.s | 74 --
.../neon/volk_32fc_32f_dot_prod_32fc_unrollasm.s | 146 ---
.../asm/neon/volk_32fc_x2_dot_prod_32fc_neonasm.s | 98 --
.../volk_32fc_x2_dot_prod_32fc_neonasm_opttests.s | 96 --
.../asm/neon/volk_32fc_x2_multiply_32fc_neonasm.s | 45 -
...olk_arm_32fc_32f_dot_prod_32fc_a_neonpipeline.s | 92 --
volk/kernels/volk/volk_16i_32fc_dot_prod_32fc.h | 274 -----
volk/kernels/volk/volk_16i_branch_4_state_8.h | 216 ----
volk/kernels/volk/volk_16i_convert_8i.h | 199 ----
volk/kernels/volk/volk_16i_max_star_16i.h | 170 ---
.../volk/volk_16i_max_star_horizontal_16i.h | 190 ----
.../kernels/volk/volk_16i_permute_and_scalar_add.h | 164 ---
volk/kernels/volk/volk_16i_s32f_convert_32f.h | 423 --------
volk/kernels/volk/volk_16i_x4_quad_max_star_16i.h | 274 -----
volk/kernels/volk/volk_16i_x5_add_quad_16i_x4.h | 205 ----
volk/kernels/volk/volk_16ic_deinterleave_16i_x2.h | 180 ----
.../kernels/volk/volk_16ic_deinterleave_real_16i.h | 142 ---
volk/kernels/volk/volk_16ic_deinterleave_real_8i.h | 116 --
volk/kernels/volk/volk_16ic_magnitude_16i.h | 213 ----
.../volk/volk_16ic_s32f_deinterleave_32f_x2.h | 131 ---
.../volk/volk_16ic_s32f_deinterleave_real_32f.h | 148 ---
volk/kernels/volk/volk_16ic_s32f_magnitude_32f.h | 202 ----
volk/kernels/volk/volk_16u_byteswap.h | 244 -----
volk/kernels/volk/volk_16u_byteswappuppet_16u.h | 55 -
volk/kernels/volk/volk_32f_accumulator_s32f.h | 90 --
volk/kernels/volk/volk_32f_acos_32f.h | 194 ----
volk/kernels/volk/volk_32f_asin_32f.h | 189 ----
volk/kernels/volk/volk_32f_atan_32f.h | 183 ----
volk/kernels/volk/volk_32f_binary_slicer_32i.h | 259 -----
volk/kernels/volk/volk_32f_binary_slicer_8i.h | 289 -----
volk/kernels/volk/volk_32f_convert_64f.h | 234 ----
volk/kernels/volk/volk_32f_cos_32f.h | 211 ----
volk/kernels/volk/volk_32f_expfast_32f.h | 216 ----
volk/kernels/volk/volk_32f_index_max_16u.h | 171 ---
volk/kernels/volk/volk_32f_invsqrt_32f.h | 196 ----
volk/kernels/volk/volk_32f_log2_32f.h | 332 ------
.../kernels/volk/volk_32f_s32f_32f_fm_detect_32f.h | 142 ---
.../volk_32f_s32f_calc_spectral_noise_floor_32f.h | 190 ----
volk/kernels/volk/volk_32f_s32f_convert_16i.h | 438 --------
volk/kernels/volk/volk_32f_s32f_convert_32i.h | 353 -------
volk/kernels/volk/volk_32f_s32f_convert_8i.h | 334 ------
volk/kernels/volk/volk_32f_s32f_multiply_32f.h | 270 -----
volk/kernels/volk/volk_32f_s32f_normalize.h | 103 --
volk/kernels/volk/volk_32f_s32f_power_32f.h | 166 ---
volk/kernels/volk/volk_32f_s32f_stddev_32f.h | 167 ---
volk/kernels/volk/volk_32f_sin_32f.h | 211 ----
volk/kernels/volk/volk_32f_sqrt_32f.h | 130 ---
.../kernels/volk/volk_32f_stddev_and_mean_32f_x2.h | 192 ----
volk/kernels/volk/volk_32f_tan_32f.h | 220 ----
volk/kernels/volk/volk_32f_tanh_32f.h | 318 ------
volk/kernels/volk/volk_32f_x2_add_32f.h | 212 ----
volk/kernels/volk/volk_32f_x2_divide_32f.h | 104 --
volk/kernels/volk/volk_32f_x2_dot_prod_16i.h | 187 ----
volk/kernels/volk/volk_32f_x2_dot_prod_32f.h | 692 ------------
volk/kernels/volk/volk_32f_x2_interleave_32fc.h | 130 ---
volk/kernels/volk/volk_32f_x2_max_32f.h | 143 ---
volk/kernels/volk/volk_32f_x2_min_32f.h | 145 ---
volk/kernels/volk/volk_32f_x2_multiply_32f.h | 277 -----
volk/kernels/volk/volk_32f_x2_pow_32f.h | 298 ------
.../volk/volk_32f_x2_s32f_interleave_16ic.h | 178 ----
volk/kernels/volk/volk_32f_x2_subtract_32f.h | 139 ---
volk/kernels/volk/volk_32f_x3_sum_of_poly_32f.h | 452 --------
volk/kernels/volk/volk_32fc_32f_dot_prod_32fc.h | 539 ----------
volk/kernels/volk/volk_32fc_32f_multiply_32fc.h | 213 ----
volk/kernels/volk/volk_32fc_conjugate_32fc.h | 261 -----
volk/kernels/volk/volk_32fc_deinterleave_32f_x2.h | 179 ----
volk/kernels/volk/volk_32fc_deinterleave_64f_x2.h | 280 -----
.../kernels/volk/volk_32fc_deinterleave_imag_32f.h | 161 ---
.../kernels/volk/volk_32fc_deinterleave_real_32f.h | 116 --
.../kernels/volk/volk_32fc_deinterleave_real_64f.h | 88 --
volk/kernels/volk/volk_32fc_index_max_16u.h | 240 -----
volk/kernels/volk/volk_32fc_magnitude_32f.h | 472 ---------
.../kernels/volk/volk_32fc_magnitude_squared_32f.h | 380 -------
volk/kernels/volk/volk_32fc_s32f_atan2_32f.h | 180 ----
.../volk/volk_32fc_s32f_deinterleave_real_16i.h | 103 --
volk/kernels/volk/volk_32fc_s32f_magnitude_16i.h | 181 ----
volk/kernels/volk/volk_32fc_s32f_power_32fc.h | 133 ---
.../volk/volk_32fc_s32f_power_spectrum_32f.h | 148 ---
.../volk_32fc_s32f_x2_power_spectral_density_32f.h | 248 -----
volk/kernels/volk/volk_32fc_s32fc_multiply_32fc.h | 325 ------
.../volk/volk_32fc_s32fc_rotatorpuppet_32fc.h | 103 --
.../kernels/volk/volk_32fc_s32fc_x2_rotator_32fc.h | 484 ---------
.../volk/volk_32fc_x2_conjugate_dot_prod_32fc.h | 569 ----------
volk/kernels/volk/volk_32fc_x2_dot_prod_32fc.h | 1116 --------------------
volk/kernels/volk/volk_32fc_x2_multiply_32fc.h | 401 -------
.../volk/volk_32fc_x2_multiply_conjugate_32fc.h | 343 ------
...volk_32fc_x2_s32f_square_dist_scalar_mult_32f.h | 152 ---
volk/kernels/volk/volk_32fc_x2_square_dist_32f.h | 168 ---
volk/kernels/volk/volk_32i_s32f_convert_32f.h | 170 ---
volk/kernels/volk/volk_32i_x2_and_32i.h | 137 ---
volk/kernels/volk/volk_32i_x2_or_32i.h | 137 ---
volk/kernels/volk/volk_32u_byteswap.h | 227 ----
volk/kernels/volk/volk_32u_byteswappuppet_32u.h | 45 -
volk/kernels/volk/volk_32u_popcnt.h | 58 -
volk/kernels/volk/volk_32u_popcntpuppet_32u.h | 47 -
volk/kernels/volk/volk_64f_convert_32f.h | 156 ---
volk/kernels/volk/volk_64f_x2_max_64f.h | 93 --
volk/kernels/volk/volk_64f_x2_min_64f.h | 93 --
volk/kernels/volk/volk_64u_byteswap.h | 253 -----
volk/kernels/volk/volk_64u_byteswappuppet_64u.h | 46 -
volk/kernels/volk/volk_64u_popcnt.h | 94 --
volk/kernels/volk/volk_64u_popcntpuppet_64u.h | 58 -
volk/kernels/volk/volk_8i_convert_16i.h | 217 ----
volk/kernels/volk/volk_8i_s32f_convert_32f.h | 222 ----
volk/kernels/volk/volk_8ic_deinterleave_16i_x2.h | 166 ---
volk/kernels/volk/volk_8ic_deinterleave_real_16i.h | 136 ---
volk/kernels/volk/volk_8ic_deinterleave_real_8i.h | 175 ---
.../volk/volk_8ic_s32f_deinterleave_32f_x2.h | 187 ----
.../volk/volk_8ic_s32f_deinterleave_real_32f.h | 156 ---
.../volk/volk_8ic_x2_multiply_conjugate_16ic.h | 123 ---
.../volk_8ic_x2_s32f_multiply_conjugate_32fc.h | 144 ---
volk/kernels/volk/volk_8u_conv_k7_r2puppet_8u.h | 264 -----
volk/kernels/volk/volk_8u_x4_conv_k7_r2_8u.h | 422 --------
volk/lib/CMakeLists.txt | 566 ----------
volk/lib/constants.c.in | 63 --
volk/lib/gcc_x86_cpuid.h | 188 ----
volk/lib/qa_16s_add_quad_aligned16.cc | 89 --
volk/lib/qa_16s_add_quad_aligned16.h | 18 -
volk/lib/qa_16s_branch_4_state_8_aligned16.cc | 106 --
volk/lib/qa_16s_branch_4_state_8_aligned16.h | 18 -
.../lib/qa_16s_permute_and_scalar_add_aligned16.cc | 78 --
volk/lib/qa_16s_permute_and_scalar_add_aligned16.h | 18 -
volk/lib/qa_16s_quad_max_star_aligned16.cc | 60 --
volk/lib/qa_16s_quad_max_star_aligned16.h | 18 -
volk/lib/qa_32f_fm_detect_aligned16.cc | 61 --
volk/lib/qa_32f_fm_detect_aligned16.h | 18 -
volk/lib/qa_32f_index_max_aligned16.cc | 103 --
volk/lib/qa_32f_index_max_aligned16.h | 18 -
volk/lib/qa_32fc_index_max_aligned16.cc | 89 --
volk/lib/qa_32fc_index_max_aligned16.h | 18 -
...qa_32fc_power_spectral_density_32f_aligned16.cc | 64 --
.../qa_32fc_power_spectral_density_32f_aligned16.h | 18 -
volk/lib/qa_32fc_x2_conjugate_dot_prod_32fc_u.cc | 138 ---
volk/lib/qa_32fc_x2_conjugate_dot_prod_32fc_u.h | 18 -
volk/lib/qa_32u_popcnt_aligned16.cc | 62 --
volk/lib/qa_32u_popcnt_aligned16.h | 18 -
volk/lib/qa_64u_popcnt_aligned16.cc | 62 --
volk/lib/qa_64u_popcnt_aligned16.h | 18 -
volk/lib/qa_utils.cc | 584 ----------
volk/lib/qa_utils.h | 80 --
volk/lib/testqa.cc | 126 ---
volk/lib/volk_malloc.c | 142 ---
volk/lib/volk_prefs.c | 50 -
volk/lib/volk_rank_archs.c | 119 ---
volk/lib/volk_rank_archs.h | 50 -
.../volk_16ic_deinterleave_16i_x2_a_orc_impl.orc | 5 -
.../volk_16ic_deinterleave_real_8i_a_orc_impl.orc | 6 -
volk/orc/volk_16ic_magnitude_16i_a_orc_impl.orc | 23 -
...lk_16ic_s32f_deinterleave_32f_x2_a_orc_impl.orc | 12 -
.../volk_16sc_magnitude_32f_aligned16_orc_impl.orc | 25 -
volk/orc/volk_16u_byteswap_a_orc_impl.orc | 3 -
volk/orc/volk_32f_s32f_multiply_32f_a_orc_impl.orc | 5 -
volk/orc/volk_32f_s32f_normalize_a_orc_impl.orc | 5 -
volk/orc/volk_32f_sqrt_32f_a_orc_impl.orc | 4 -
volk/orc/volk_32f_x2_add_32f_a_orc_impl.orc | 5 -
volk/orc/volk_32f_x2_divide_32f_a_orc_impl.orc | 5 -
volk/orc/volk_32f_x2_dot_prod_32f_a_orc_impl.orc | 6 -
volk/orc/volk_32f_x2_max_32f_a_orc_impl.orc | 5 -
volk/orc/volk_32f_x2_min_32f_a_orc_impl.orc | 5 -
volk/orc/volk_32f_x2_multiply_32f_a_orc_impl.orc | 5 -
volk/orc/volk_32f_x2_subtract_32f_a_orc_impl.orc | 5 -
.../orc/volk_32fc_32f_multiply_32fc_a_orc_impl.orc | 7 -
volk/orc/volk_32fc_magnitude_32f_a_orc_impl.orc | 13 -
.../volk_32fc_s32f_magnitude_16i_a_orc_impl.orc | 23 -
.../volk_32fc_s32fc_multiply_32fc_a_orc_impl.orc | 18 -
volk/orc/volk_32fc_x2_multiply_32fc_a_orc_impl.orc | 18 -
volk/orc/volk_32i_x2_and_32i_a_orc_impl.orc | 5 -
volk/orc/volk_32i_x2_or_32i_a_orc_impl.orc | 5 -
volk/orc/volk_8i_convert_16i_a_orc_impl.orc | 6 -
volk/orc/volk_8i_s32f_convert_32f_a_orc_impl.orc | 11 -
volk/python/volk_modtool/CMakeLists.txt | 39 -
volk/python/volk_modtool/README | 114 --
volk/python/volk_modtool/__init__.py | 24 -
volk/python/volk_modtool/cfg.py | 104 --
volk/python/volk_modtool/volk_modtool | 128 ---
volk/python/volk_modtool/volk_modtool_generate.py | 330 ------
volk/tmpl/volk.tmpl.c | 212 ----
volk/tmpl/volk.tmpl.h | 94 --
volk/tmpl/volk_config_fixed.tmpl.h | 29 -
volk/tmpl/volk_cpu.tmpl.c | 191 ----
volk/tmpl/volk_cpu.tmpl.h | 42 -
volk/tmpl/volk_machine_xxx.tmpl.c | 79 --
volk/tmpl/volk_machines.tmpl.c | 34 -
volk/tmpl/volk_machines.tmpl.h | 55 -
volk/tmpl/volk_typedefs.tmpl.h | 32 -
volk/volk.pc.in | 14 -
223 files changed, 40 insertions(+), 32624 deletions(-)