[hamradio-commits] [gnss-sdr] 78/149: Merge branch 'new_volk_module' of git+ssh://github.com/gnss-sdr/gnss-sdr into new_volk_module
Carles Fernandez
carles_fernandez-guest at moszumanska.debian.org
Sat Feb 6 19:43:05 UTC 2016
This is an automated email from the git hooks/post-receive script.
carles_fernandez-guest pushed a commit to branch next
in repository gnss-sdr.
commit 090f6524dbbd8c7dac54c415918533ce7a8889ec
Merge: 1d18ff6 4ba75a3
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date: Tue Jan 19 00:01:26 2016 +0100
Merge branch 'new_volk_module' of git+ssh://github.com/gnss-sdr/gnss-sdr
into new_volk_module
# Conflicts:
# src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_dot_prod_16ic.h
.../volk_gnsssdr_16ic_x2_dot_prod_16ic.h | 100 ++++++++++-----------
.../volk_gnsssdr/volk_gnsssdr_32fc_convert_16ic.h | 2 +-
.../kernels/volk_gnsssdr/volk_gnsssdr_8i_max_s8i.h | 21 ++---
.../volk_gnsssdr/lib/qa_utils.cc | 34 +++++--
.../volk_gnsssdr/lib/qa_utils.h | 1 +
5 files changed, 85 insertions(+), 73 deletions(-)
diff --cc src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_convert_16ic.h
index 97bb2de,97bb2de..40babae
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_convert_16ic.h
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_convert_16ic.h
@@@ -110,7 -110,7 +110,7 @@@ static inline void volk_gnsssdr_32fc_co
float max_val = 32767;
__m128 inputVal1, inputVal2;
-- __m128i intInputVal1, intInputVal2;
++ __m128i intInputVal1, intInputVal2; // is __m128i defined in xmmintrin.h?
__m128 ret1, ret2;
__m128 vmin_val = _mm_set_ps1(min_val);
__m128 vmax_val = _mm_set_ps1(max_val);
diff --cc src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8i_max_s8i.h
index e69ea97,e69ea97..7b5d939
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8i_max_s8i.h
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_8i_max_s8i.h
@@@ -77,7 -77,7 +77,7 @@@ static inline void volk_gnsssdr_8i_max_
}
}
-- for(unsigned int i = 0; i<(num_points % 16); ++i)
++ for(unsigned int i = sse_iters * 16; i< num_points; ++i)
{
if(src0[i] > max)
{
@@@ -140,7 -140,7 +140,7 @@@ static inline void volk_gnsssdr_8i_max_
inputPtr += 16;
}
-- for(unsigned int i = 0; i<(num_points % 16); ++i)
++ for(unsigned int i = sse_iters * 16; i < num_points; ++i)
{
if(src0[i] > max)
{
@@@ -228,7 -228,7 +228,7 @@@ static inline void volk_gnsssdr_8i_max_
}
}
-- for(unsigned int i = 0; i<(num_points % 16); ++i)
++ for(unsigned int i = sse_iters * 16; i < num_points; ++i)
{
if(src0[i] > max)
{
@@@ -291,7 -291,7 +291,7 @@@ static inline void volk_gnsssdr_8i_max_
inputPtr += 16;
}
-- for(unsigned int i = 0; i<(num_points % 16); ++i)
++ for(unsigned int i = sse_iters * 16; i < num_points; ++i)
{
if(src0[i] > max)
{
@@@ -315,18 -315,18 +315,15 @@@ static inline void volk_gnsssdr_8i_max_
{
if(num_points > 0)
{
-- if(num_points > 0)
++ char max = src0[0];
++ for(unsigned int i = 1; i < num_points; ++i)
{
-- char max = src0[0];
-- for(unsigned int i = 1; i < num_points; ++i)
++ if(src0[i] > max)
{
-- if(src0[i] > max)
-- {
-- max = src0[i];
-- }
++ max = src0[i];
}
-- target[0] = max;
}
++ target[0] = max;
}
}
diff --cc src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_utils.cc
index 24963f0,24963f0..58649f6
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_utils.cc
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_utils.cc
@@@ -39,7 -39,7 +39,7 @@@
#include <volk_gnsssdr/volk_gnsssdr_malloc.h>
float uniform() {
-- return M_PI*2.0f * ((float) rand() / RAND_MAX - 0.5f); // uniformly (-1, 1)
++ return 2.0f * ((float) rand() / RAND_MAX - 0.5f); // uniformly (-1, 1)
}
template <class t>
@@@ -72,13 -72,13 +72,11 @@@ void load_random_data(void *data, volk_
else ((uint64_t *)data)[i] = (uint64_t) scaled_rand;
break;
case 4:
--
-- if(type.is_signed) ((int32_t *)data)[i] = (int32_t) scaled_rand;
-- else ((uint32_t *)data)[i] = (uint32_t) scaled_rand;
--
++ if(type.is_signed) ((int32_t *)data)[i] = (int32_t) scaled_rand;
++ else ((uint32_t *)data)[i] = (uint32_t) scaled_rand;
break;
case 2:
-- // 16 bits dot product saturates very fast even with moderate lenght vectors
++ // 16 bits dot product saturates very fast even with moderate length vectors
// we produce here only 4 bits input range
if(type.is_signed) ((int16_t *)data)[i] = (int16_t)((int16_t) scaled_rand % 16);
@@@ -190,7 -190,7 +188,7 @@@ static void get_signatures_from_name(st
try {
multiplier = boost::lexical_cast<int>(token.substr(1, token.size()-1)); //will throw if invalid ///////////
} catch(...) {
-- multiplier = 1; // This is our '..._xn' mulriple correlator. Assign a fixed number here for the test?
++ multiplier = 1; // This is our '..._xn' multiple correlator. Assign a fixed number here for the test?
}
for(int i=1; i<multiplier; i++) {
if(side == SIDE_INPUT) inputsig.push_back(inputsig.back());
@@@ -221,6 -221,6 +219,10 @@@ inline void run_cast_test2(volk_gnsssdr
while(iter--) func(buffs[0], buffs[1], vlen, arch.c_str());
}
++//inline void run_cast_test2(volk_gnsssdr_fn_2arg_r func, std::vector<void *> &buffs, float rem_code_phase_chips, float code_phase_step_chips, unsigned int vlen, int code_length_chips, unsigned int iter, std::string arch) {
++// while(iter--) func(buffs[0], buffs[1], rem_code_phase_chips, code_phase_step_chips, vlen, code_length_chips, arch.c_str());
++//}
++
inline void run_cast_test3(volk_gnsssdr_fn_3arg func, std::vector<void *> &buffs, unsigned int vlen, unsigned int iter, std::string arch) {
while(iter--) func(buffs[0], buffs[1], buffs[2], vlen, arch.c_str());
}
@@@ -291,16 -291,16 +293,25 @@@ inline void run_cast_test1_s16ic(volk_g
while(iter--) func(buffs[0], scalar, vlen, arch.c_str());
}
++
++
++
inline void run_cast_test2_s16ic(volk_gnsssdr_fn_2arg_s16ic func, std::vector<void *> &buffs, lv_16sc_t scalar, unsigned int vlen, unsigned int iter, std::string arch)
{
while(iter--) func(buffs[0], buffs[1], scalar, vlen, arch.c_str());
}
++//inline void run_cast_test2_s16ic(volk_gnsssdr_fn_2arg_s16ic func, std::vector<void *> &buffs, float rem_code_phase_chips, float code_phase_step_chips, int code_length_chips, unsigned int vlen, unsigned int iter, std::string arch)
++//{
++// while(iter--) func(buffs[0], buffs[1], rem_code_phase_chips, code_phase_step_chips, vlen, code_length_chips, arch.c_str());
++//}
++
inline void run_cast_test3_s16ic(volk_gnsssdr_fn_3arg_s16ic func, std::vector<void *> &buffs, lv_16sc_t scalar, unsigned int vlen, unsigned int iter, std::string arch)
{
while(iter--) func(buffs[0], buffs[1], buffs[2], scalar, vlen, arch.c_str());
}
++
// end new
inline void run_cast_test8(volk_gnsssdr_fn_8arg func, std::vector<void *> &buffs, unsigned int vlen, unsigned int iter, std::string arch)
@@@ -601,7 -601,7 +612,14 @@@ bool run_volk_gnsssdr_tests(volk_gnsssd
case 2:
if(inputsc.size() == 0)
{
-- run_cast_test2((volk_gnsssdr_fn_2arg)(manual_func), test_data[i], vlen, iter, arch_list[i]);
++ // if(name.find("resampler") != std::string::npos)
++ // {
++ // run_cast_test2((volk_gnsssdr_fn_2arg_r)(manual_func), test_data[i], 1, 1, vlen, 1000, iter, arch_list[i]);
++ // }
++ // else
++ // {
++ run_cast_test2((volk_gnsssdr_fn_2arg)(manual_func), test_data[i], vlen, iter, arch_list[i]);
++ // }
}
else if(inputsc.size() == 1 && inputsc[0].is_float)
{
diff --cc src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_utils.h
index c7a0e76,c7a0e76..c547e60
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_utils.h
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_utils.h
@@@ -151,6 -151,6 +151,7 @@@ bool run_volk_gnsssdr_tests
#define VOLK_PUPPET_PROFILE(func, puppet_master_func, test_params, results) run_volk_gnsssdr_tests(func##_get_func_desc(), (void (*)())func##_manual, std::string(#func), test_params, results, std::string(#puppet_master_func))
typedef void (*volk_gnsssdr_fn_1arg)(void *, unsigned int, const char*); //one input, operate in place
typedef void (*volk_gnsssdr_fn_2arg)(void *, void *, unsigned int, const char*);
++//typedef void (*volk_gnsssdr_fn_2arg_r)(void *, void *, float, float, unsigned int, float, const char*);
typedef void (*volk_gnsssdr_fn_3arg)(void *, void *, void *, unsigned int, const char*);
typedef void (*volk_gnsssdr_fn_4arg)(void *, void *, void *, void *, unsigned int, const char*);
typedef void (*volk_gnsssdr_fn_1arg_s32f)(void *, float, unsigned int, const char*); //one input vector, one scalar float input
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/gnss-sdr.git
More information about the pkg-hamradio-commits
mailing list