diff options
| author | Nick Foster | 2010-12-13 19:18:45 -0800 |
|---|---|---|
| committer | Nick Foster | 2010-12-13 19:20:51 -0800 |
| commit | bef3db60e73953f2d2ecdc6a86a81e11df3b103d (patch) | |
| tree | 106ecec19d9b3fcf77c535c14ed9bcd9c3c090f9 /volk/include | |
| parent | 09c84f41c3265d27a7812e95a2906b17a7f01ca8 (diff) | |
| download | gnuradio-bef3db60e73953f2d2ecdc6a86a81e11df3b103d.tar.gz gnuradio-bef3db60e73953f2d2ecdc6a86a81e11df3b103d.tar.bz2 gnuradio-bef3db60e73953f2d2ecdc6a86a81e11df3b103d.zip | |
volk: committed some stuff i neglected
Diffstat (limited to 'volk/include')
| -rw-r--r-- | volk/include/volk/Makefile.am | 2 | ||||
| -rw-r--r-- | volk/include/volk/archs.xml | 4 | ||||
| -rw-r--r-- | volk/include/volk/make_set_simd.py | 3 | ||||
| -rw-r--r-- | volk/include/volk/volk_32f_sqrt_aligned16.h | 13 |
4 files changed, 21 insertions, 1 deletions
diff --git a/volk/include/volk/Makefile.am b/volk/include/volk/Makefile.am index 04a43bd34..99276ab87 100644 --- a/volk/include/volk/Makefile.am +++ b/volk/include/volk/Makefile.am @@ -179,4 +179,4 @@ distclean-local: rm -f Makefile.in rm -f volk_environment_init.h rm -f volk_mktables - rm -f $(BUILT_SOURCES)
\ No newline at end of file + rm -f $(BUILT_SOURCES) diff --git a/volk/include/volk/archs.xml b/volk/include/volk/archs.xml index b7c98500f..a828e5ad0 100644 --- a/volk/include/volk/archs.xml +++ b/volk/include/volk/archs.xml @@ -5,6 +5,10 @@ <flag>none</flag> </arch> +<arch name="orc" type="all"> + <flag>lorc-0.4</flag> +</arch> + <arch name="altivec" type="powerpc"> <flag>maltivec</flag> </arch> diff --git a/volk/include/volk/make_set_simd.py b/volk/include/volk/make_set_simd.py index 842366b18..e568aebfa 100644 --- a/volk/include/volk/make_set_simd.py +++ b/volk/include/volk/make_set_simd.py @@ -111,6 +111,9 @@ def make_set_simd(dom) : tempstring = tempstring + " AC_DEFINE(LV_HAVE_" + arch.swapcase() + ", 1, [always set "+ arch + "!])\n"; tempstring = tempstring + " ADDONS=\"\"\n"; tempstring = tempstring + " BUILT_ARCHS=\"generic\"\n"; + tempstring = tempstring + " if test $HAVE_ORC = yes; then\n"; + tempstring = tempstring + " BUILT_ARCHS=\"${BUILT_ARCHS} orc\"\n"; + tempstring = tempstring + " fi\n"; tempstring = tempstring + " _MAKE_FAKE_PROCCPU\n"; tempstring = tempstring + " OVERRULE_FLAG=\"no\"\n"; tempstring = tempstring + " if test -z \"$cf_with_lv_arch\"; then\n"; diff --git a/volk/include/volk/volk_32f_sqrt_aligned16.h b/volk/include/volk/volk_32f_sqrt_aligned16.h index 0b2eaf251..f6996ad5f 100644 --- a/volk/include/volk/volk_32f_sqrt_aligned16.h +++ b/volk/include/volk/volk_32f_sqrt_aligned16.h @@ -58,6 +58,19 @@ static inline void volk_32f_sqrt_aligned16_generic(float* cVector, const float* } #endif /* LV_HAVE_GENERIC */ +#if LV_HAVE_ORC +extern void volk_32f_sqrt_aligned16_orc_impl(float *, const float*, unsigned int); +/*! + \brief Sqrts the two input vectors and store their results in the third vector + \param cVector The vector where the results will be stored + \param aVector One of the vectors to be sqrted + \param num_points The number of values in aVector and bVector to be sqrted together and stored into cVector +*/ +static inline void volk_32f_sqrt_aligned16_orc(float* cVector, const float* aVector, unsigned int num_points){ + volk_32f_sqrt_aligned16_orc_impl(cVector, aVector, num_points); +} + +#endif /* LV_HAVE_ORC */ |