diff options
author | Nick Foster | 2011-11-28 18:24:13 -0800 |
---|---|---|
committer | Josh Blum | 2011-12-01 09:12:11 -0500 |
commit | de8845266b454e5f94d23799d23ccd50e2af8a8f (patch) | |
tree | 88f931b46b8a58f55c9870ba74178ebe043536b0 /volk | |
parent | b0b474be32e94ec72fc982689464ecb3828fc778 (diff) | |
download | gnuradio-de8845266b454e5f94d23799d23ccd50e2af8a8f.tar.gz gnuradio-de8845266b454e5f94d23799d23ccd50e2af8a8f.tar.bz2 gnuradio-de8845266b454e5f94d23799d23ccd50e2af8a8f.zip |
Volk: fix volk_32fc_s32f_magnitude_16i_a Orc implementation for saturating magnitudes
Conflicts:
volk/lib/testqa.cc
Diffstat (limited to 'volk')
-rw-r--r-- | volk/lib/testqa.cc | 2 | ||||
-rw-r--r-- | volk/orc/volk_32fc_s32f_magnitude_16i_a_orc_impl.orc | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/volk/lib/testqa.cc b/volk/lib/testqa.cc index faf618752..c709819d1 100644 --- a/volk/lib/testqa.cc +++ b/volk/lib/testqa.cc @@ -37,7 +37,7 @@ VOLK_RUN_TESTS(volk_32fc_deinterleave_real_32f_a, 1e-4, 0, 20460, 5000); VOLK_RUN_TESTS(volk_32fc_deinterleave_real_64f_a, 1e-4, 0, 20460, 1000); VOLK_RUN_TESTS(volk_32fc_x2_dot_prod_32fc_a, 1e-4, 0, 20460, 10000); VOLK_RUN_TESTS(volk_32fc_index_max_16u_a, 0, 0, 20460, 10000); -VOLK_RUN_TESTS(volk_32fc_s32f_magnitude_16i_a, 1, 32768, 20460, 100); +VOLK_RUN_TESTS(volk_32fc_s32f_magnitude_16i_a, 1, 32768, 20460, 1000); VOLK_RUN_TESTS(volk_32fc_magnitude_32f_a, 1e-4, 0, 20460, 1000); VOLK_RUN_TESTS(volk_32fc_x2_multiply_32fc_a, 1e-4, 0, 20460, 1000); VOLK_RUN_TESTS(volk_32f_s32f_convert_16i_a, 1, 32768, 20460, 10000); diff --git a/volk/orc/volk_32fc_s32f_magnitude_16i_a_orc_impl.orc b/volk/orc/volk_32fc_s32f_magnitude_16i_a_orc_impl.orc index 505e73f5d..d3bf78935 100644 --- a/volk/orc/volk_32fc_s32f_magnitude_16i_a_orc_impl.orc +++ b/volk/orc/volk_32fc_s32f_magnitude_16i_a_orc_impl.orc @@ -9,15 +9,15 @@ .temp 4 sumf .temp 4 rootf .temp 4 rootl -.temp 4 maskl +#.temp 4 maskl x2 mulf prodiqf, src, src splitql qf, if, prodiqf addf sumf, if, qf sqrtf rootf, sumf mulf rootf, rootf, scalar -cmpltf maskl, 32768.0, rootf -andl maskl, maskl, 0x80000000 -orl rootf, rootf, maskl +#cmpltf maskl, 32768.0, rootf +#andl maskl, maskl, 0x80000000 +#orl rootf, rootf, maskl convfl rootl, rootf -convssslw dst, rootl +convsuslw dst, rootl |