From f5eff6ed08760b1a78fd1e5dc7eacff4fc0e5033 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Sat, 26 Nov 2011 12:07:15 -0500 Subject: uhd: patch from Marcus Leech to add FFT update rate and averating on/off to command line options of uhd_fft.py. --- gr-uhd/apps/uhd_fft.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gr-uhd/apps/uhd_fft.py b/gr-uhd/apps/uhd_fft.py index c06a23036..7ebf5e106 100755 --- a/gr-uhd/apps/uhd_fft.py +++ b/gr-uhd/apps/uhd_fft.py @@ -63,10 +63,14 @@ class app_top_block(stdgui2.std_top_block): help="Enable oscilloscope display") parser.add_option("", "--avg-alpha", type="eng_float", default=1e-1, help="Set fftsink averaging factor, default=[%default]") + parser.add_option ("", "--averaging", action="store_true", default=False, + help="Enable fftsink averaging, default=[%default]") parser.add_option("", "--ref-scale", type="eng_float", default=1.0, help="Set dBFS=0dB input value, default=[%default]") parser.add_option("--fft-size", type="int", default=1024, help="Set number of FFT bins [default=%default]") + parser.add_option("--fft-rate", type="int", default=30, + help="Set FFT update rate, [default=%default]") (options, args) = parser.parse_args() if len(args) != 0: parser.print_help() @@ -74,7 +78,8 @@ class app_top_block(stdgui2.std_top_block): self.options = options self.show_debug_info = True - self.u = uhd.usrp_source(device_addr=options.args, stream_args=uhd.stream_args('fc32')) + self.u = uhd.usrp_source(device_addr=options.args, + stream_args=uhd.stream_args('fc32')) # Set the subdevice spec if(options.spec): @@ -98,7 +103,9 @@ class app_top_block(stdgui2.std_top_block): ref_scale=options.ref_scale, ref_level=20.0, y_divs = 12, - avg_alpha=options.avg_alpha) + average=options.averaging, + avg_alpha=options.avg_alpha, + fft_rate=options.fft_rate) self.frame.SetMinSize((800, 420)) self.connect(self.u, self.scope) -- cgit From ffa9e710f5a23ad83b611e77ed717bdb01ea9d24 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Sat, 26 Nov 2011 12:07:49 -0500 Subject: docs: don't ignore the entire qtgui directory. --- docs/doxygen/Doxyfile.in | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/doxygen/Doxyfile.in b/docs/doxygen/Doxyfile.in index d5614d90c..a8237305f 100644 --- a/docs/doxygen/Doxyfile.in +++ b/docs/doxygen/Doxyfile.in @@ -630,7 +630,6 @@ EXCLUDE = @abs_top_builddir@/docs/doxygen/html \ @abs_top_builddir@/gr-gsm-fr-vocoder/src/python/encdec.py \ @abs_top_builddir@/gr-howto-write-a-block \ @abs_top_builddir@/gr-pager/src/pager_swig.py \ - @abs_top_builddir@/gr-qtgui \ @abs_top_builddir@/gr-trellis/doc \ @abs_top_builddir@/gr-trellis/src/lib/generate_all.py \ @abs_top_builddir@/gr-trellis/src/lib/generate_trellis.py \ -- cgit From 435dc713e9ea5783729a2205a3c6fb9c9a3380b1 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Sun, 27 Nov 2011 01:25:25 -0500 Subject: uhd: cleanup some -Wall warnings --- CMakeLists.txt | 5 +++-- gr-uhd/examples/tag_sink_demo.h | 5 +++-- gr-uhd/examples/tag_source_demo.h | 2 +- gr-uhd/lib/gr_uhd_usrp_source.cc | 4 ++-- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 17b79c515..8712993e4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -63,7 +63,8 @@ if(CMAKE_COMPILER_IS_GNUCXX AND NOT WIN32) endif() if(CMAKE_COMPILER_IS_GNUCXX) - GR_ADD_CXX_COMPILER_FLAG_IF_AVAILABLE(-Wsign-compare HAVE_SIGN_COMPARE) + GR_ADD_CXX_COMPILER_FLAG_IF_AVAILABLE(-Wsign-compare HAVE_WARN_SIGN_COMPARE) + GR_ADD_CXX_COMPILER_FLAG_IF_AVAILABLE(-Wall HAVE_WARN_ALL) endif(CMAKE_COMPILER_IS_GNUCXX) if(MSVC) @@ -197,7 +198,7 @@ install( ######################################################################## -# Add subdirectories +# Add subdirectories (in order of deps) ######################################################################## add_subdirectory(gruel) add_subdirectory(gnuradio-core) diff --git a/gr-uhd/examples/tag_sink_demo.h b/gr-uhd/examples/tag_sink_demo.h index 524f0ae0f..7d49bd971 100644 --- a/gr-uhd/examples/tag_sink_demo.h +++ b/gr-uhd/examples/tag_sink_demo.h @@ -51,12 +51,13 @@ public: //print all tags BOOST_FOREACH(const gr_tag_t &rx_time_tag, rx_time_tags){ - const uint64_t count = rx_time_tag.offset; + const uint64_t offset = rx_time_tag.offset; const pmt::pmt_t &value = rx_time_tag.value; - std::cout << boost::format("Full seconds %u, Frac seconds %f") + std::cout << boost::format("Full seconds %u, Frac seconds %f, abs sample offset %u") % pmt::pmt_to_uint64(pmt_tuple_ref(value, 0)) % pmt::pmt_to_double(pmt_tuple_ref(value, 1)) + % offset << std::endl; } diff --git a/gr-uhd/examples/tag_source_demo.h b/gr-uhd/examples/tag_source_demo.h index a995762f7..9743c3407 100644 --- a/gr-uhd/examples/tag_source_demo.h +++ b/gr-uhd/examples/tag_source_demo.h @@ -122,7 +122,7 @@ private: const double _samp_rate; const uint64_t _samps_per_burst; const double _cycle_duration; - bool _do_new_burst; uint64_t _samps_left_in_burst; + bool _do_new_burst; }; diff --git a/gr-uhd/lib/gr_uhd_usrp_source.cc b/gr-uhd/lib/gr_uhd_usrp_source.cc index 953ef6995..51a756908 100644 --- a/gr-uhd/lib/gr_uhd_usrp_source.cc +++ b/gr-uhd/lib/gr_uhd_usrp_source.cc @@ -388,11 +388,11 @@ public: while (true){ #ifdef GR_UHD_USE_STREAM_API const size_t bpi = uhd::convert::get_bytes_per_item(_stream_args.cpu_format); - const size_t num_samps = _rx_stream->recv( + _rx_stream->recv( outputs, nbytes/bpi, _metadata, 0.0 ); #else - const size_t num_samps = _dev->get_device()->recv( + _dev->get_device()->recv( outputs, nbytes/_type->size, _metadata, *_type, uhd::device::RECV_MODE_FULL_BUFF, 0.0 ); -- cgit From c2bf4895ca65c9c3f7efaf24c64bc8dae5716830 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Mon, 21 Nov 2011 22:23:51 -0800 Subject: grc: force param text to black to guarantee readability --- grc/gui/Colors.py | 3 +++ grc/gui/Param.py | 13 +++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/grc/gui/Colors.py b/grc/gui/Colors.py index f0b989b37..c79dadee3 100644 --- a/grc/gui/Colors.py +++ b/grc/gui/Colors.py @@ -26,6 +26,9 @@ def get_color(color_code): return _COLORMAP.alloc_color(color_code, True, True) HIGHLIGHT_COLOR = get_color('#00FFFF') BORDER_COLOR = get_color('black') +#param entry boxes +PARAM_ENTRY_TEXT_COLOR = get_color('black') +ENTRYENUM_CUSTOM_COLOR = get_color('#EEEEEE') #flow graph color constants FLOWGRAPH_BACKGROUND_COLOR = get_color('#FFF9FF') #block color constants diff --git a/grc/gui/Param.py b/grc/gui/Param.py index 7c00c1b67..cb6c663e3 100644 --- a/grc/gui/Param.py +++ b/grc/gui/Param.py @@ -1,5 +1,5 @@ """ -Copyright 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +Copyright 2007-2011 Free Software Foundation, Inc. This file is part of GNU Radio GNU Radio Companion is free software; you can redistribute it and/or @@ -22,6 +22,7 @@ from Element import Element import pygtk pygtk.require('2.0') import gtk +import Colors class InputParam(gtk.HBox): """The base class for an input parameter inside the input parameters dialog.""" @@ -82,7 +83,9 @@ class EntryParam(InputParam): self._input.connect('changed', self._handle_changed) self.pack_start(self._input, True) def get_text(self): return self._input.get_text() - def set_color(self, color): self._input.modify_base(gtk.STATE_NORMAL, gtk.gdk.color_parse(color)) + def set_color(self, color): + self._input.modify_base(gtk.STATE_NORMAL, gtk.gdk.color_parse(color)) + self._input.modify_text(gtk.STATE_NORMAL, Colors.PARAM_ENTRY_TEXT_COLOR) def set_tooltip_text(self, text): self._input.set_tooltip_text(text) class EnumParam(InputParam): @@ -122,8 +125,10 @@ class EnumEntryParam(InputParam): def set_color(self, color): if self._input.get_active() == -1: #custom entry, use color self._input.get_child().modify_base(gtk.STATE_NORMAL, gtk.gdk.color_parse(color)) - else: #from enum, make white background - self._input.get_child().modify_base(gtk.STATE_NORMAL, gtk.gdk.color_parse('#ffffff')) + self._input.get_child().modify_text(gtk.STATE_NORMAL, Colors.PARAM_ENTRY_TEXT_COLOR) + else: #from enum, make pale background + self._input.get_child().modify_base(gtk.STATE_NORMAL, Colors.ENTRYENUM_CUSTOM_COLOR) + self._input.get_child().modify_text(gtk.STATE_NORMAL, Colors.PARAM_ENTRY_TEXT_COLOR) PARAM_MARKUP_TMPL="""\ #set $foreground = $param.is_valid() and 'black' or 'red' -- cgit From 6bf88fd950a9606d41d611ace8368f319a4b06e0 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Mon, 14 Nov 2011 09:48:20 -0800 Subject: volk: avx support for MSVC --- volk/gen/compilers.xml | 14 +++++++++++++- volk/gen/machines.xml | 8 ++++++-- volk/gen/make_cpuid_c.py | 2 +- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/volk/gen/compilers.xml b/volk/gen/compilers.xml index 70c82e555..005eda2aa 100644 --- a/volk/gen/compilers.xml +++ b/volk/gen/compilers.xml @@ -2,9 +2,21 @@ + arch:SSE arch:SSE + + arch:SSE2 + + + arch:AVX + arch:AVX + arch:AVX + arch:AVX + arch:AVX + arch:AVX + / @@ -15,4 +27,4 @@ - \ No newline at end of file + diff --git a/volk/gen/machines.xml b/volk/gen/machines.xml index b872b9fb1..9c19c91c6 100644 --- a/volk/gen/machines.xml +++ b/volk/gen/machines.xml @@ -15,9 +15,9 @@ --> @@ -57,6 +57,10 @@ however it does not support the gcc style inline assembly. generic 32|64 mmx sse sse2 sse3 ssse3 sse4_1 sse4_2 popcount avx + +generic mmx sse sse2 sse3 ssse3 sse4_1 sse4_2 popcount avx + + generic altivec diff --git a/volk/gen/make_cpuid_c.py b/volk/gen/make_cpuid_c.py index 7281f45a3..2be1123a8 100644 --- a/volk/gen/make_cpuid_c.py +++ b/volk/gen/make_cpuid_c.py @@ -39,7 +39,7 @@ struct VOLK_CPU volk_cpu; //implement get cpuid for gcc compilers using a copy of cpuid.h #if defined(__GNUC__) #include -#define cpuid_x86(op, r) __get_cpuid(op, r+0, r+1, r+2, r+3) +#define cpuid_x86(op, r) __get_cpuid(op, (unsigned int *)r+0, (unsigned int *)r+1, (unsigned int *)r+2, (unsigned int *)r+3) //implement get cpuid for MSVC compilers using __cpuid intrinsic #elif defined(_MSC_VER) -- cgit From 52c51c983d51ff725238c22571b2d466875a5f22 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Mon, 14 Nov 2011 11:30:59 -0800 Subject: volk: conversion tweaks to build avx on MSVC --- volk/include/volk/volk_16i_max_star_horizontal_16i_a.h | 6 +++--- volk/include/volk/volk_32fc_index_max_16u_a.h | 4 ++-- volk/include/volk/volk_32fc_x2_conjugate_dot_prod_32fc_u.h | 8 ++++---- volk/include/volk/volk_8ic_x2_multiply_conjugate_16ic_a.h | 4 ++-- volk/include/volk/volk_8ic_x2_s32f_multiply_conjugate_32fc_a.h | 4 ++-- volk/include/volk/volk_common.h | 2 ++ 6 files changed, 15 insertions(+), 13 deletions(-) diff --git a/volk/include/volk/volk_16i_max_star_horizontal_16i_a.h b/volk/include/volk/volk_16i_max_star_horizontal_16i_a.h index f60b33a41..a10a62350 100644 --- a/volk/include/volk/volk_16i_max_star_horizontal_16i_a.h +++ b/volk/include/volk/volk_16i_max_star_horizontal_16i_a.h @@ -1,6 +1,7 @@ #ifndef INCLUDED_volk_16i_max_star_horizontal_16i_a_H #define INCLUDED_volk_16i_max_star_horizontal_16i_a_H +#include #include #include @@ -21,7 +22,7 @@ static inline void volk_16i_max_star_horizontal_16i_a_ssse3(int16_t* target, in - volatile __m128i xmm0, xmm1, xmm2, xmm3, xmm4; + __m128i xmm0, xmm1, xmm2, xmm3, xmm4; __m128i xmm5, xmm6, xmm7, xmm8; xmm4 = _mm_load_si128((__m128i*)shufmask0); @@ -92,8 +93,7 @@ static inline void volk_16i_max_star_horizontal_16i_a_ssse3(int16_t* target, in xmm0 = _mm_shuffle_epi8(xmm0, xmm3); - - _mm_storel_pd((double*)p_target, (__m128d)xmm0); + _mm_storel_pd((double*)p_target, bit128_p(&xmm0)->double_vec); p_target = (__m128i*)((int8_t*)p_target + 8); diff --git a/volk/include/volk/volk_32fc_index_max_16u_a.h b/volk/include/volk/volk_32fc_index_max_16u_a.h index 9566aa32e..125a34582 100644 --- a/volk/include/volk/volk_32fc_index_max_16u_a.h +++ b/volk/include/volk/volk_32fc_index_max_16u_a.h @@ -87,8 +87,8 @@ static inline void volk_32fc_index_max_16u_a_sse3(unsigned int* target, lv_32fc_ xmm2 = _mm_load_ps((float*)src0); - xmm1 = _mm_movelh_ps((__m128)xmm8, (__m128)xmm8); - xmm8 = (__m128i)xmm1; + xmm1 = _mm_movelh_ps(bit128_p(&xmm8)->float_vec, bit128_p(&xmm8)->float_vec); + xmm8 = bit128_p(&xmm1)->int_vec; xmm2 = _mm_mul_ps(xmm2, xmm2); diff --git a/volk/include/volk/volk_32fc_x2_conjugate_dot_prod_32fc_u.h b/volk/include/volk/volk_32fc_x2_conjugate_dot_prod_32fc_u.h index f11c93682..02faf86c2 100644 --- a/volk/include/volk/volk_32fc_x2_conjugate_dot_prod_32fc_u.h +++ b/volk/include/volk/volk_32fc_x2_conjugate_dot_prod_32fc_u.h @@ -96,9 +96,9 @@ static inline void volk_32fc_x2_conjugate_dot_prod_32fc_u_sse3(lv_32fc_t* result in1 = _mm_loadu_ps( (float*) (input+offset) ); in2 = _mm_loadu_ps( (float*) (taps+offset) ); - Rv = in1*in2; + Rv = _mm_mul_ps(in1, in2); fehg = _mm_shuffle_ps(in2, in2, _MM_SHUFFLE(2,3,0,1)); - Iv = in1*fehg; + Iv = _mm_mul_ps(in1, fehg); Rs = _mm_hadd_ps( _mm_hadd_ps(Rv, zv) ,zv); Ivm = _mm_xor_ps( negMask.vec, Iv ); Is = _mm_hadd_ps( _mm_hadd_ps(Ivm, zv) ,zv); @@ -119,9 +119,9 @@ static inline void volk_32fc_x2_conjugate_dot_prod_32fc_u_sse3(lv_32fc_t* result in1 = _mm_loadu_ps( (float*) (input+offset) ); in2 = _mm_loadu_ps( (float*) (taps+offset) ); - Rv = _mm_and_ps(in1*in2, halfMask.vec); + Rv = _mm_and_ps(_mm_mul_ps(in1, in2), halfMask.vec); fehg = _mm_shuffle_ps(in2, in2, _MM_SHUFFLE(2,3,0,1)); - Iv = _mm_and_ps(in1*fehg, halfMask.vec); + Iv = _mm_and_ps(_mm_mul_ps(in1, fehg), halfMask.vec); Rs = _mm_hadd_ps(_mm_hadd_ps(Rv, zv),zv); Ivm = _mm_xor_ps( negMask.vec, Iv ); Is = _mm_hadd_ps(_mm_hadd_ps(Ivm, zv),zv); diff --git a/volk/include/volk/volk_8ic_x2_multiply_conjugate_16ic_a.h b/volk/include/volk/volk_8ic_x2_multiply_conjugate_16ic_a.h index 0bb76f1d1..0c280eb6e 100644 --- a/volk/include/volk/volk_8ic_x2_multiply_conjugate_16ic_a.h +++ b/volk/include/volk/volk_8ic_x2_multiply_conjugate_16ic_a.h @@ -26,8 +26,8 @@ static inline void volk_8ic_x2_multiply_conjugate_16ic_a_sse4_1(lv_16sc_t* cVect for(;number < quarterPoints; number++){ // Convert into 8 bit values into 16 bit values - x = _mm_cvtepi8_epi16(_mm_movpi64_epi64(*(__m64*)a)); - y = _mm_cvtepi8_epi16(_mm_movpi64_epi64(*(__m64*)b)); + x = _mm_cvtepi8_epi16(_mm_loadl_epi64((__m128i*)a)); + y = _mm_cvtepi8_epi16(_mm_loadl_epi64((__m128i*)b)); // Calculate the ar*cr - ai*(-ci) portions realz = _mm_madd_epi16(x,y); diff --git a/volk/include/volk/volk_8ic_x2_s32f_multiply_conjugate_32fc_a.h b/volk/include/volk/volk_8ic_x2_s32f_multiply_conjugate_32fc_a.h index 3e05608a4..a2c2b04f6 100644 --- a/volk/include/volk/volk_8ic_x2_s32f_multiply_conjugate_32fc_a.h +++ b/volk/include/volk/volk_8ic_x2_s32f_multiply_conjugate_32fc_a.h @@ -29,8 +29,8 @@ static inline void volk_8ic_x2_s32f_multiply_conjugate_32fc_a_sse4_1(lv_32fc_t* for(;number < quarterPoints; number++){ // Convert into 8 bit values into 16 bit values - x = _mm_cvtepi8_epi16(_mm_movpi64_epi64(*(__m64*)a)); - y = _mm_cvtepi8_epi16(_mm_movpi64_epi64(*(__m64*)b)); + x = _mm_cvtepi8_epi16(_mm_loadl_epi64((__m128i*)a)); + y = _mm_cvtepi8_epi16(_mm_loadl_epi64((__m128i*)b)); // Calculate the ar*cr - ai*(-ci) portions realz = _mm_madd_epi16(x,y); diff --git a/volk/include/volk/volk_common.h b/volk/include/volk/volk_common.h index 2c935d1fb..38263d5f7 100644 --- a/volk/include/volk/volk_common.h +++ b/volk/include/volk/volk_common.h @@ -91,4 +91,6 @@ union bit128{ #endif }; +#define bit128_p(x) ((union bit128 *)(x)) + #endif /*INCLUDED_LIBVOLK_COMMON_H*/ -- cgit From edbfdf08d8e4bfa3ea725dc69089123537403ed6 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Mon, 21 Nov 2011 21:38:06 -0800 Subject: volk: fix #466 deprecated string use, from Pinkava --- volk/gen/volk_regexp.py | 3 +-- volk/gen/volk_register.py | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/volk/gen/volk_regexp.py b/volk/gen/volk_regexp.py index b83ce5206..eb4ceb54b 100644 --- a/volk/gen/volk_regexp.py +++ b/volk/gen/volk_regexp.py @@ -1,5 +1,4 @@ import re -import string remove_after_underscore = re.compile("_.*"); space_remove = re.compile(" "); @@ -10,5 +9,5 @@ replace_volk = re.compile("volk"); def strip_trailing(tostrip, stripstr): lindex = tostrip.rfind(stripstr) - tostrip = tostrip[0:lindex] + string.replace(tostrip[lindex:len(tostrip)], stripstr, ""); + tostrip = tostrip[0:lindex] + tostrip[lindex:len(tostrip)].replace(stripstr, ""); return tostrip diff --git a/volk/gen/volk_register.py b/volk/gen/volk_register.py index cd874e470..0774ece29 100644 --- a/volk/gen/volk_register.py +++ b/volk/gen/volk_register.py @@ -4,7 +4,6 @@ import sys import os import re import glob -import string from xml.dom import minidom from volk_regexp import * from make_cpuid_c import make_cpuid_c @@ -101,7 +100,7 @@ for filearch in filearchs: archs_or = "(" for arch in archs: - archs_or = archs_or + string.upper(arch) + "|"; + archs_or = archs_or + arch.upper() + "|"; archs_or = archs_or[0:len(archs_or)-1]; archs_or = archs_or + ")"; -- cgit From 507c3a2eba8153ab285f0ec8c35598588382d1db Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Wed, 16 Nov 2011 17:27:43 -0800 Subject: cmake: added support for monolithic packaging rpms + debs --- cmake/Modules/GrPackage.cmake | 71 +++++++++++++++++++++++++++++--------- cmake/Packaging/Fedora-15.cmake | 10 ++++++ cmake/Packaging/Fedora-16.cmake | 10 ++++++ cmake/Packaging/Ubuntu-10.04.cmake | 10 ++++++ cmake/Packaging/Ubuntu-10.10.cmake | 10 ++++++ cmake/Packaging/Ubuntu-11.04.cmake | 11 ++++++ cmake/Packaging/Ubuntu-11.10.cmake | 10 ++++++ cmake/debian/postinst.in | 6 ++++ cmake/debian/postrm.in | 5 +++ cmake/debian/preinst.in | 5 +++ cmake/debian/prerm.in | 5 +++ cmake/redhat/post_install.in | 4 +++ cmake/redhat/post_uninstall.in | 3 ++ cmake/redhat/pre_install.in | 1 + cmake/redhat/pre_uninstall.in | 3 ++ debian/postinst | 2 -- debian/prerm | 2 -- 17 files changed, 147 insertions(+), 21 deletions(-) create mode 100644 cmake/Packaging/Fedora-15.cmake create mode 100644 cmake/Packaging/Fedora-16.cmake create mode 100644 cmake/Packaging/Ubuntu-10.04.cmake create mode 100644 cmake/Packaging/Ubuntu-10.10.cmake create mode 100644 cmake/Packaging/Ubuntu-11.04.cmake create mode 100644 cmake/Packaging/Ubuntu-11.10.cmake create mode 100755 cmake/debian/postinst.in create mode 100755 cmake/debian/postrm.in create mode 100755 cmake/debian/preinst.in create mode 100755 cmake/debian/prerm.in create mode 100755 cmake/redhat/post_install.in create mode 100755 cmake/redhat/post_uninstall.in create mode 100755 cmake/redhat/pre_install.in create mode 100755 cmake/redhat/pre_uninstall.in delete mode 100755 debian/postinst delete mode 100755 debian/prerm diff --git a/cmake/Modules/GrPackage.cmake b/cmake/Modules/GrPackage.cmake index d398d7265..8761a9290 100644 --- a/cmake/Modules/GrPackage.cmake +++ b/cmake/Modules/GrPackage.cmake @@ -54,6 +54,15 @@ endfunction(CPACK_SET) # CPACK_FINALIZE - include cpack and the unset all the cpack variables ######################################################################## function(CPACK_FINALIZE) + + #set the package depends for monolithic package + foreach(comp ${CPACK_COMPONENTS_ALL}) + string(TOUPPER "PACKAGE_DEPENDS_${comp}" package_depends_var) + list(APPEND PACKAGE_DEPENDS_ALL ${${package_depends_var}}) + endforeach(comp) + string(REPLACE ";" ", " CPACK_DEBIAN_PACKAGE_DEPENDS "${PACKAGE_DEPENDS_ALL}") + string(REPLACE ";" ", " CPACK_RPM_PACKAGE_REQUIRES "${PACKAGE_DEPENDS_ALL}") + include(CPack) #finalize the cpack settings configured throughout the build system foreach(var ${_cpack_vars}) unset(${var} CACHE) @@ -91,13 +100,39 @@ endfunction(CPACK_COMPONENT) ######################################################################## # Setup CPack ######################################################################## -set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "GNU Radio") +set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "GNU Radio - The GNU Software Radio") set(CPACK_PACKAGE_VENDOR "Free Software Foundation, Inc.") -set(CPACK_PACKAGE_CONTACT "Discuss-gnuradio@gnu.org") +set(CPACK_PACKAGE_CONTACT "Discuss GNURadio ") set(CPACK_PACKAGE_VERSION ${VERSION}) set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/README) set(CPACK_RESOURCE_FILE_README ${CMAKE_SOURCE_DIR}/README) set(CPACK_RESOURCE_FILE_WELCOME ${CMAKE_SOURCE_DIR}/README) + +find_program(LSB_RELEASE_EXECUTABLE lsb_release) + +if((DEBIAN OR REDHAT) AND LSB_RELEASE_EXECUTABLE) + + #extract system information by executing the commands + execute_process( + COMMAND ${LSB_RELEASE_EXECUTABLE} --short --id + OUTPUT_VARIABLE LSB_ID OUTPUT_STRIP_TRAILING_WHITESPACE + ) + execute_process( + COMMAND ${LSB_RELEASE_EXECUTABLE} --short --release + OUTPUT_VARIABLE LSB_RELEASE OUTPUT_STRIP_TRAILING_WHITESPACE + ) + + #set a more sensible package name for this system + SET(CPACK_PACKAGE_FILE_NAME "gnuradio-${CPACK_PACKAGE_VERSION}-${LSB_ID}-${LSB_RELEASE}-${CMAKE_SYSTEM_PROCESSOR}") + + #now try to include the component based dependencies + set(package_deps_file "${CMAKE_SOURCE_DIR}/cmake/Packaging/${LSB_ID}-${LSB_RELEASE}.cmake") + if (EXISTS ${package_deps_file}) + include(${package_deps_file}) + endif() + +endif() + if(${CPACK_GENERATOR} STREQUAL NSIS) set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CMAKE_PROJECT_NAME}") endif() @@ -105,25 +140,27 @@ endif() ######################################################################## # DEB package specific ######################################################################## -set(CPACK_DEBIAN_PACKAGE_DEPENDS - "libboost-all-dev" - "libfftw3-3" - "python" - "python-numpy" - "libqt4-core" - "libqwt5-qt4" - "python-qt4" - "python-gtk2" - "python-lxml" - "python-Cheetah" -) -string(REPLACE ";" ", " CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}") -set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA ${CMAKE_SOURCE_DIR}/debian/postinst ${CMAKE_SOURCE_DIR}/debian/prerm) +foreach(filename preinst postinst prerm postrm) + list(APPEND CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA ${CMAKE_BINARY_DIR}/debian/${filename}) + file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/debian) + configure_file( + ${CMAKE_SOURCE_DIR}/cmake/debian/${filename}.in + ${CMAKE_BINARY_DIR}/debian/${filename} + @ONLY) +endforeach(filename) ######################################################################## # RPM package specific ######################################################################## -set(CPACK_RPM_PACKAGE_REQUIRES "boost-devel") #TODO other packages +foreach(filename post_install post_uninstall pre_install pre_uninstall) + string(TOUPPER ${filename} filename_upper) + list(APPEND CPACK_RPM_${filename_upper}_SCRIPT_FILE ${CMAKE_BINARY_DIR}/redhat/${filename}) + file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/redhat) + configure_file( + ${CMAKE_SOURCE_DIR}/cmake/redhat/${filename}.in + ${CMAKE_BINARY_DIR}/redhat/${filename} + @ONLY) +endforeach(filename) ######################################################################## # NSIS package specific diff --git a/cmake/Packaging/Fedora-15.cmake b/cmake/Packaging/Fedora-15.cmake new file mode 100644 index 000000000..1ec017a7a --- /dev/null +++ b/cmake/Packaging/Fedora-15.cmake @@ -0,0 +1,10 @@ +SET(PACKAGE_DEPENDS_GRUEL_RUNTIME "boost-python" "glibc") +SET(PACKAGE_DEPENDS_GRUEL_PYTHON "python") +SET(PACKAGE_DEPENDS_CORE_RUNTIME "fftw-libs" "gsl") +SET(PACKAGE_DEPENDS_QTGUI_RUNTIME "qt" "qwt4") +SET(PACKAGE_DEPENDS_QTGUI_PYTHON "PyQt4" "PyQwt") +SET(PACKAGE_DEPENDS_GRC "python" "numpy" "gtk2" "python-lxml" "python-cheetah") +SET(PACKAGE_DEPENDS_WXGUI "python-wxgtk2.8" "python" "numpy") +SET(PACKAGE_DEPENDS_VIDEO_SDL_RUNTIME "SDL") +SET(PACKAGE_DEPENDS_UHD_RUNTIME "uhd") +SET(PACKAGE_DEPENDS_AUDIO_RUNTIME "pulseaudio" "alsa-lib" "jack-audio-connection-kit") diff --git a/cmake/Packaging/Fedora-16.cmake b/cmake/Packaging/Fedora-16.cmake new file mode 100644 index 000000000..278d68990 --- /dev/null +++ b/cmake/Packaging/Fedora-16.cmake @@ -0,0 +1,10 @@ +SET(PACKAGE_DEPENDS_GRUEL_RUNTIME "boost-python" "glibc") +SET(PACKAGE_DEPENDS_GRUEL_PYTHON "python") +SET(PACKAGE_DEPENDS_CORE_RUNTIME "fftw-libs" "gsl") +SET(PACKAGE_DEPENDS_QTGUI_RUNTIME "qt" "qwt") +SET(PACKAGE_DEPENDS_QTGUI_PYTHON "PyQt4" "PyQwt") +SET(PACKAGE_DEPENDS_GRC "python" "numpy" "gtk2" "python-lxml" "python-cheetah") +SET(PACKAGE_DEPENDS_WXGUI "wxGTK" "python" "numpy") +SET(PACKAGE_DEPENDS_VIDEO_SDL_RUNTIME "SDL") +SET(PACKAGE_DEPENDS_UHD_RUNTIME "uhd") +SET(PACKAGE_DEPENDS_AUDIO_RUNTIME "pulseaudio" "alsa-lib" "jack-audio-connection-kit") diff --git a/cmake/Packaging/Ubuntu-10.04.cmake b/cmake/Packaging/Ubuntu-10.04.cmake new file mode 100644 index 000000000..a7a60f6b8 --- /dev/null +++ b/cmake/Packaging/Ubuntu-10.04.cmake @@ -0,0 +1,10 @@ +SET(PACKAGE_DEPENDS_GRUEL_RUNTIME "libboost-all-dev" "libc6") +SET(PACKAGE_DEPENDS_GRUEL_PYTHON "python") +SET(PACKAGE_DEPENDS_CORE_RUNTIME "libfftw3-3" "libgsl0ldbl") +SET(PACKAGE_DEPENDS_QTGUI_RUNTIME "libqtcore4" "libqwt5-qt4") +SET(PACKAGE_DEPENDS_QTGUI_PYTHON "python-qt4" "python-qwt5-qt4") +SET(PACKAGE_DEPENDS_GRC "python" "python-numpy" "python-gtk2" "python-lxml" "python-cheetah") +SET(PACKAGE_DEPENDS_WXGUI "python-wxgtk2.8" "python" "python-numpy") +SET(PACKAGE_DEPENDS_VIDEO_SDL_RUNTIME "libsdl1.2debian") +SET(PACKAGE_DEPENDS_UHD_RUNTIME "uhd") +SET(PACKAGE_DEPENDS_AUDIO_RUNTIME "libpulse0" "alsa-base" "libjack0") diff --git a/cmake/Packaging/Ubuntu-10.10.cmake b/cmake/Packaging/Ubuntu-10.10.cmake new file mode 100644 index 000000000..a7a60f6b8 --- /dev/null +++ b/cmake/Packaging/Ubuntu-10.10.cmake @@ -0,0 +1,10 @@ +SET(PACKAGE_DEPENDS_GRUEL_RUNTIME "libboost-all-dev" "libc6") +SET(PACKAGE_DEPENDS_GRUEL_PYTHON "python") +SET(PACKAGE_DEPENDS_CORE_RUNTIME "libfftw3-3" "libgsl0ldbl") +SET(PACKAGE_DEPENDS_QTGUI_RUNTIME "libqtcore4" "libqwt5-qt4") +SET(PACKAGE_DEPENDS_QTGUI_PYTHON "python-qt4" "python-qwt5-qt4") +SET(PACKAGE_DEPENDS_GRC "python" "python-numpy" "python-gtk2" "python-lxml" "python-cheetah") +SET(PACKAGE_DEPENDS_WXGUI "python-wxgtk2.8" "python" "python-numpy") +SET(PACKAGE_DEPENDS_VIDEO_SDL_RUNTIME "libsdl1.2debian") +SET(PACKAGE_DEPENDS_UHD_RUNTIME "uhd") +SET(PACKAGE_DEPENDS_AUDIO_RUNTIME "libpulse0" "alsa-base" "libjack0") diff --git a/cmake/Packaging/Ubuntu-11.04.cmake b/cmake/Packaging/Ubuntu-11.04.cmake new file mode 100644 index 000000000..71882b2e1 --- /dev/null +++ b/cmake/Packaging/Ubuntu-11.04.cmake @@ -0,0 +1,11 @@ +#set the debian package dependencies (parsed by our deb component maker) +SET(PACKAGE_DEPENDS_GRUEL_RUNTIME "libboost-all-dev" "libc6") +SET(PACKAGE_DEPENDS_GRUEL_PYTHON "python") +SET(PACKAGE_DEPENDS_CORE_RUNTIME "libfftw3-3" "libgsl0ldbl") +SET(PACKAGE_DEPENDS_QTGUI_RUNTIME "libqtcore4" "libqwt5-qt4") +SET(PACKAGE_DEPENDS_QTGUI_PYTHON "python-qt4" "python-qwt5-qt4") +SET(PACKAGE_DEPENDS_GRC "python" "python-numpy" "python-gtk2" "python-lxml" "python-cheetah") +SET(PACKAGE_DEPENDS_WXGUI "python-wxgtk2.8") +SET(PACKAGE_DEPENDS_VIDEO_SDL_RUNTIME "libsdl1.2debian") +SET(PACKAGE_DEPENDS_UHD_RUNTIME "uhd") +SET(PACKAGE_DEPENDS_AUDIO_RUNTIME "libpulse0" "alsa-base" "libjack0") diff --git a/cmake/Packaging/Ubuntu-11.10.cmake b/cmake/Packaging/Ubuntu-11.10.cmake new file mode 100644 index 000000000..dcb7b3178 --- /dev/null +++ b/cmake/Packaging/Ubuntu-11.10.cmake @@ -0,0 +1,10 @@ +SET(PACKAGE_DEPENDS_GRUEL_RUNTIME "libboost-all-dev" "libc6") +SET(PACKAGE_DEPENDS_GRUEL_PYTHON "python" "python-numpy") +SET(PACKAGE_DEPENDS_CORE_RUNTIME "libfftw3-3" "libgsl0ldbl") +SET(PACKAGE_DEPENDS_QTGUI_RUNTIME "libqtcore4" "libqwt6") +SET(PACKAGE_DEPENDS_QTGUI_PYTHON "python-qt4" "python-qwt5-qt4") +SET(PACKAGE_DEPENDS_GRC "python" "python-numpy" "python-gtk2" "python-lxml" "python-cheetah") +SET(PACKAGE_DEPENDS_WXGUI "python-wxgtk2.8") +SET(PACKAGE_DEPENDS_VIDEO_SDL_RUNTIME "libsdl1.2debian") +SET(PACKAGE_DEPENDS_UHD_RUNTIME "uhd") +SET(PACKAGE_DEPENDS_AUDIO_RUNTIME "libpulse0" "alsa-base" "libjack0") diff --git a/cmake/debian/postinst.in b/cmake/debian/postinst.in new file mode 100755 index 000000000..7fef2accf --- /dev/null +++ b/cmake/debian/postinst.in @@ -0,0 +1,6 @@ +#!/bin/sh + +if [ "$1" = "configure" ]; then + @CMAKE_INSTALL_PREFIX@/libexec/gnuradio/grc_setup_freedesktop install + ldconfig +fi diff --git a/cmake/debian/postrm.in b/cmake/debian/postrm.in new file mode 100755 index 000000000..b780602a7 --- /dev/null +++ b/cmake/debian/postrm.in @@ -0,0 +1,5 @@ +#!/bin/sh + +if [ "$1" = "remove" ]; then + ldconfig +fi diff --git a/cmake/debian/preinst.in b/cmake/debian/preinst.in new file mode 100755 index 000000000..c60d46568 --- /dev/null +++ b/cmake/debian/preinst.in @@ -0,0 +1,5 @@ +#!/bin/sh + +if [ "$1" = "install" ]; then + ls +fi diff --git a/cmake/debian/prerm.in b/cmake/debian/prerm.in new file mode 100755 index 000000000..d09887850 --- /dev/null +++ b/cmake/debian/prerm.in @@ -0,0 +1,5 @@ +#!/bin/sh + +if [ "$1" = "remove" ]; then + @CMAKE_INSTALL_PREFIX@/libexec/gnuradio/grc_setup_freedesktop uninstall +fi diff --git a/cmake/redhat/post_install.in b/cmake/redhat/post_install.in new file mode 100755 index 000000000..e7245f032 --- /dev/null +++ b/cmake/redhat/post_install.in @@ -0,0 +1,4 @@ +#!/bin/sh + +@CMAKE_INSTALL_PREFIX@/libexec/gnuradio/grc_setup_freedesktop install +ldconfig diff --git a/cmake/redhat/post_uninstall.in b/cmake/redhat/post_uninstall.in new file mode 100755 index 000000000..2d1871b1d --- /dev/null +++ b/cmake/redhat/post_uninstall.in @@ -0,0 +1,3 @@ +#!/bin/sh + +ldconfig diff --git a/cmake/redhat/pre_install.in b/cmake/redhat/pre_install.in new file mode 100755 index 000000000..1a2485251 --- /dev/null +++ b/cmake/redhat/pre_install.in @@ -0,0 +1 @@ +#!/bin/sh diff --git a/cmake/redhat/pre_uninstall.in b/cmake/redhat/pre_uninstall.in new file mode 100755 index 000000000..c5e085e89 --- /dev/null +++ b/cmake/redhat/pre_uninstall.in @@ -0,0 +1,3 @@ +#!/bin/sh + +@CMAKE_INSTALL_PREFIX@/libexec/gnuradio/grc_setup_freedesktop uninstall diff --git a/debian/postinst b/debian/postinst deleted file mode 100755 index 66a0f75c1..000000000 --- a/debian/postinst +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -/usr/libexec/gnuradio/grc_setup_freedesktop install diff --git a/debian/prerm b/debian/prerm deleted file mode 100755 index edc1e1e48..000000000 --- a/debian/prerm +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -/usr/libexec/gnuradio/grc_setup_freedesktop uninstall -- cgit From d56564f5e3d9ccefc9ac34c81dc8d061298301e7 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Wed, 16 Nov 2011 17:41:11 -0800 Subject: cmake: moved post/pre inst/uinst files --- cmake/Modules/GrPackage.cmake | 16 ++++++++-------- cmake/Packaging/post_install.in | 4 ++++ cmake/Packaging/post_uninstall.in | 3 +++ cmake/Packaging/postinst.in | 6 ++++++ cmake/Packaging/postrm.in | 5 +++++ cmake/Packaging/pre_install.in | 1 + cmake/Packaging/pre_uninstall.in | 3 +++ cmake/Packaging/preinst.in | 5 +++++ cmake/Packaging/prerm.in | 5 +++++ cmake/debian/postinst.in | 6 ------ cmake/debian/postrm.in | 5 ----- cmake/debian/preinst.in | 5 ----- cmake/debian/prerm.in | 5 ----- cmake/redhat/post_install.in | 4 ---- cmake/redhat/post_uninstall.in | 3 --- cmake/redhat/pre_install.in | 1 - cmake/redhat/pre_uninstall.in | 3 --- 17 files changed, 40 insertions(+), 40 deletions(-) create mode 100755 cmake/Packaging/post_install.in create mode 100755 cmake/Packaging/post_uninstall.in create mode 100755 cmake/Packaging/postinst.in create mode 100755 cmake/Packaging/postrm.in create mode 100755 cmake/Packaging/pre_install.in create mode 100755 cmake/Packaging/pre_uninstall.in create mode 100755 cmake/Packaging/preinst.in create mode 100755 cmake/Packaging/prerm.in delete mode 100755 cmake/debian/postinst.in delete mode 100755 cmake/debian/postrm.in delete mode 100755 cmake/debian/preinst.in delete mode 100755 cmake/debian/prerm.in delete mode 100755 cmake/redhat/post_install.in delete mode 100755 cmake/redhat/post_uninstall.in delete mode 100755 cmake/redhat/pre_install.in delete mode 100755 cmake/redhat/pre_uninstall.in diff --git a/cmake/Modules/GrPackage.cmake b/cmake/Modules/GrPackage.cmake index 8761a9290..a36ad9162 100644 --- a/cmake/Modules/GrPackage.cmake +++ b/cmake/Modules/GrPackage.cmake @@ -141,11 +141,11 @@ endif() # DEB package specific ######################################################################## foreach(filename preinst postinst prerm postrm) - list(APPEND CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA ${CMAKE_BINARY_DIR}/debian/${filename}) - file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/debian) + list(APPEND CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA ${CMAKE_BINARY_DIR}/Packaging/${filename}) + file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Packaging) configure_file( - ${CMAKE_SOURCE_DIR}/cmake/debian/${filename}.in - ${CMAKE_BINARY_DIR}/debian/${filename} + ${CMAKE_SOURCE_DIR}/cmake/Packaging/${filename}.in + ${CMAKE_BINARY_DIR}/Packaging/${filename} @ONLY) endforeach(filename) @@ -154,11 +154,11 @@ endforeach(filename) ######################################################################## foreach(filename post_install post_uninstall pre_install pre_uninstall) string(TOUPPER ${filename} filename_upper) - list(APPEND CPACK_RPM_${filename_upper}_SCRIPT_FILE ${CMAKE_BINARY_DIR}/redhat/${filename}) - file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/redhat) + list(APPEND CPACK_RPM_${filename_upper}_SCRIPT_FILE ${CMAKE_BINARY_DIR}/Packaging/${filename}) + file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Packaging) configure_file( - ${CMAKE_SOURCE_DIR}/cmake/redhat/${filename}.in - ${CMAKE_BINARY_DIR}/redhat/${filename} + ${CMAKE_SOURCE_DIR}/cmake/Packaging/${filename}.in + ${CMAKE_BINARY_DIR}/Packaging/${filename} @ONLY) endforeach(filename) diff --git a/cmake/Packaging/post_install.in b/cmake/Packaging/post_install.in new file mode 100755 index 000000000..e7245f032 --- /dev/null +++ b/cmake/Packaging/post_install.in @@ -0,0 +1,4 @@ +#!/bin/sh + +@CMAKE_INSTALL_PREFIX@/libexec/gnuradio/grc_setup_freedesktop install +ldconfig diff --git a/cmake/Packaging/post_uninstall.in b/cmake/Packaging/post_uninstall.in new file mode 100755 index 000000000..2d1871b1d --- /dev/null +++ b/cmake/Packaging/post_uninstall.in @@ -0,0 +1,3 @@ +#!/bin/sh + +ldconfig diff --git a/cmake/Packaging/postinst.in b/cmake/Packaging/postinst.in new file mode 100755 index 000000000..7fef2accf --- /dev/null +++ b/cmake/Packaging/postinst.in @@ -0,0 +1,6 @@ +#!/bin/sh + +if [ "$1" = "configure" ]; then + @CMAKE_INSTALL_PREFIX@/libexec/gnuradio/grc_setup_freedesktop install + ldconfig +fi diff --git a/cmake/Packaging/postrm.in b/cmake/Packaging/postrm.in new file mode 100755 index 000000000..b780602a7 --- /dev/null +++ b/cmake/Packaging/postrm.in @@ -0,0 +1,5 @@ +#!/bin/sh + +if [ "$1" = "remove" ]; then + ldconfig +fi diff --git a/cmake/Packaging/pre_install.in b/cmake/Packaging/pre_install.in new file mode 100755 index 000000000..1a2485251 --- /dev/null +++ b/cmake/Packaging/pre_install.in @@ -0,0 +1 @@ +#!/bin/sh diff --git a/cmake/Packaging/pre_uninstall.in b/cmake/Packaging/pre_uninstall.in new file mode 100755 index 000000000..c5e085e89 --- /dev/null +++ b/cmake/Packaging/pre_uninstall.in @@ -0,0 +1,3 @@ +#!/bin/sh + +@CMAKE_INSTALL_PREFIX@/libexec/gnuradio/grc_setup_freedesktop uninstall diff --git a/cmake/Packaging/preinst.in b/cmake/Packaging/preinst.in new file mode 100755 index 000000000..c60d46568 --- /dev/null +++ b/cmake/Packaging/preinst.in @@ -0,0 +1,5 @@ +#!/bin/sh + +if [ "$1" = "install" ]; then + ls +fi diff --git a/cmake/Packaging/prerm.in b/cmake/Packaging/prerm.in new file mode 100755 index 000000000..d09887850 --- /dev/null +++ b/cmake/Packaging/prerm.in @@ -0,0 +1,5 @@ +#!/bin/sh + +if [ "$1" = "remove" ]; then + @CMAKE_INSTALL_PREFIX@/libexec/gnuradio/grc_setup_freedesktop uninstall +fi diff --git a/cmake/debian/postinst.in b/cmake/debian/postinst.in deleted file mode 100755 index 7fef2accf..000000000 --- a/cmake/debian/postinst.in +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -if [ "$1" = "configure" ]; then - @CMAKE_INSTALL_PREFIX@/libexec/gnuradio/grc_setup_freedesktop install - ldconfig -fi diff --git a/cmake/debian/postrm.in b/cmake/debian/postrm.in deleted file mode 100755 index b780602a7..000000000 --- a/cmake/debian/postrm.in +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -if [ "$1" = "remove" ]; then - ldconfig -fi diff --git a/cmake/debian/preinst.in b/cmake/debian/preinst.in deleted file mode 100755 index c60d46568..000000000 --- a/cmake/debian/preinst.in +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -if [ "$1" = "install" ]; then - ls -fi diff --git a/cmake/debian/prerm.in b/cmake/debian/prerm.in deleted file mode 100755 index d09887850..000000000 --- a/cmake/debian/prerm.in +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -if [ "$1" = "remove" ]; then - @CMAKE_INSTALL_PREFIX@/libexec/gnuradio/grc_setup_freedesktop uninstall -fi diff --git a/cmake/redhat/post_install.in b/cmake/redhat/post_install.in deleted file mode 100755 index e7245f032..000000000 --- a/cmake/redhat/post_install.in +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -@CMAKE_INSTALL_PREFIX@/libexec/gnuradio/grc_setup_freedesktop install -ldconfig diff --git a/cmake/redhat/post_uninstall.in b/cmake/redhat/post_uninstall.in deleted file mode 100755 index 2d1871b1d..000000000 --- a/cmake/redhat/post_uninstall.in +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -ldconfig diff --git a/cmake/redhat/pre_install.in b/cmake/redhat/pre_install.in deleted file mode 100755 index 1a2485251..000000000 --- a/cmake/redhat/pre_install.in +++ /dev/null @@ -1 +0,0 @@ -#!/bin/sh diff --git a/cmake/redhat/pre_uninstall.in b/cmake/redhat/pre_uninstall.in deleted file mode 100755 index c5e085e89..000000000 --- a/cmake/redhat/pre_uninstall.in +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -@CMAKE_INSTALL_PREFIX@/libexec/gnuradio/grc_setup_freedesktop uninstall -- cgit From 488f0c614f0e951314c686e7f168bc62cea250d5 Mon Sep 17 00:00:00 2001 From: Nick Foster Date: Wed, 9 Nov 2011 11:32:47 -0800 Subject: Volk: added 32fc x scalar multiply, implemented in Orc & generic. Orc/SSE tested 10x faster than generic. --- .../include/volk/volk_32fc_s32fc_multiply_32fc_a.h | 46 ++++++++++++++++++++++ volk/lib/testqa.cc | 2 +- .../volk_32fc_s32fc_multiply_32fc_a_orc_impl.orc | 18 +++++++++ 3 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 volk/include/volk/volk_32fc_s32fc_multiply_32fc_a.h create mode 100644 volk/orc/volk_32fc_s32fc_multiply_32fc_a_orc_impl.orc diff --git a/volk/include/volk/volk_32fc_s32fc_multiply_32fc_a.h b/volk/include/volk/volk_32fc_s32fc_multiply_32fc_a.h new file mode 100644 index 000000000..b27a7259f --- /dev/null +++ b/volk/include/volk/volk_32fc_s32fc_multiply_32fc_a.h @@ -0,0 +1,46 @@ +#ifndef INCLUDED_volk_32fc_s32fc_multiply_32fc_a_H +#define INCLUDED_volk_32fc_s32fc_multiply_32fc_a_H + +#include +#include +#include +#include + +#ifdef LV_HAVE_GENERIC + /*! + \brief Multiplies the two input complex vectors and stores their results in the third vector + \param cVector The vector where the results will be stored + \param aVector One of the vectors to be multiplied + \param bVector One of the vectors to be multiplied + \param num_points The number of complex values in aVector and bVector to be multiplied together and stored into cVector + */ +static inline void volk_32fc_s32fc_multiply_32fc_a_generic(lv_32fc_t* cVector, const lv_32fc_t* aVector, const lv_32fc_t scalar, unsigned int num_points){ + lv_32fc_t* cPtr = cVector; + const lv_32fc_t* aPtr = aVector; + unsigned int number = 0; + + for(number = 0; number < num_points; number++){ + *cPtr++ = (*aPtr++) * scalar; + } +} +#endif /* LV_HAVE_GENERIC */ + +#ifdef LV_HAVE_ORC + /*! + \brief Multiplies the two input complex vectors and stores their results in the third vector + \param cVector The vector where the results will be stored + \param aVector One of the vectors to be multiplied + \param bVector One of the vectors to be multiplied + \param num_points The number of complex values in aVector and bVector to be multiplied together and stored into cVector + */ +extern void volk_32fc_s32fc_multiply_32fc_a_orc_impl(lv_32fc_t* cVector, const lv_32fc_t* aVector, const lv_32fc_t scalar, unsigned int num_points); +static inline void volk_32fc_s32fc_multiply_32fc_a_orc(lv_32fc_t* cVector, const lv_32fc_t* aVector, const lv_32fc_t scalar, unsigned int num_points){ + volk_32fc_s32fc_multiply_32fc_a_orc_impl(cVector, aVector, scalar, num_points); +} +#endif /* LV_HAVE_ORC */ + + + + + +#endif /* INCLUDED_volk_32fc_x2_multiply_32fc_a_H */ diff --git a/volk/lib/testqa.cc b/volk/lib/testqa.cc index 62e62c2f4..9d1d1bca2 100644 --- a/volk/lib/testqa.cc +++ b/volk/lib/testqa.cc @@ -4,6 +4,7 @@ //VOLK_RUN_TESTS(volk_16i_x5_add_quad_16i_x4_a, 1e-4, 2046, 10000); //VOLK_RUN_TESTS(volk_16i_branch_4_state_8_a, 1e-4, 2046, 10000); +VOLK_RUN_TESTS(volk_32fc_s32fc_multiply_32fc_a, 1e-4, 0, 20460, 10000); VOLK_RUN_TESTS(volk_16ic_s32f_deinterleave_real_32f_a, 1e-5, 32768.0, 204600, 10000); VOLK_RUN_TESTS(volk_16ic_deinterleave_real_8i_a, 0, 0, 20460, 10000); VOLK_RUN_TESTS(volk_16ic_deinterleave_16i_x2_a, 0, 0, 20460, 10000); @@ -90,4 +91,3 @@ VOLK_RUN_TESTS(volk_8i_convert_16i_a, 0, 0, 20460, 20000); VOLK_RUN_TESTS(volk_8i_convert_16i_u, 0, 0, 20460, 2000); VOLK_RUN_TESTS(volk_8i_s32f_convert_32f_a, 1e-4, 100, 20460, 2000); VOLK_RUN_TESTS(volk_8i_s32f_convert_32f_u, 1e-4, 100, 20460, 2000); - diff --git a/volk/orc/volk_32fc_s32fc_multiply_32fc_a_orc_impl.orc b/volk/orc/volk_32fc_s32fc_multiply_32fc_a_orc_impl.orc new file mode 100644 index 000000000..2577e034f --- /dev/null +++ b/volk/orc/volk_32fc_s32fc_multiply_32fc_a_orc_impl.orc @@ -0,0 +1,18 @@ +.function volk_32fc_s32fc_multiply_32fc_a_orc_impl +.source 8 src1 +.floatparam 8 scalar +.dest 8 dst +.temp 8 iqprod +.temp 4 real +.temp 4 imag +.temp 4 ac +.temp 4 bd +.temp 8 swapped +x2 mulf iqprod, src1, scalar +splitql bd, ac, iqprod +subf real, ac, bd +swaplq swapped, src1 +x2 mulf iqprod, swapped, scalar +splitql bd, ac, iqprod +addf imag, ac, bd +mergelq dst, real, imag -- cgit From 73727e316ae9addf8ffbc3b3473ace15d993d7b8 Mon Sep 17 00:00:00 2001 From: Nick Foster Date: Wed, 9 Nov 2011 11:35:17 -0800 Subject: Volk: add 32fc_s32fc_multiply_32fc to profiler --- volk/apps/volk_profile.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/volk/apps/volk_profile.cc b/volk/apps/volk_profile.cc index b9ac9ecc2..86bf72176 100644 --- a/volk/apps/volk_profile.cc +++ b/volk/apps/volk_profile.cc @@ -102,6 +102,7 @@ int main(int argc, char *argv[]) { VOLK_PROFILE(volk_8i_convert_16i_u, 0, 0, 204600, 2000, &results); VOLK_PROFILE(volk_8i_s32f_convert_32f_a, 1e-4, 100, 204600, 2000, &results); VOLK_PROFILE(volk_8i_s32f_convert_32f_u, 1e-4, 100, 204600, 2000, &results); + VOLK_PROFILE(volk_32fc_s32fc_multiply_32fc_a, 1e-4, 0, 204600, 1000, &results); char path[256]; get_config_path(path); -- cgit From 7695ca06f1b565723f3fc302d7b7818e93d86a57 Mon Sep 17 00:00:00 2001 From: Nick Foster Date: Wed, 9 Nov 2011 12:46:00 -0800 Subject: Volk: 32f_s32f_multiply_32f --- volk/apps/volk_profile.cc | 1 + volk/include/volk/volk_32f_s32f_multiply_32f_a.h | 44 ++++++++++++++++++++++++ volk/lib/testqa.cc | 1 + 3 files changed, 46 insertions(+) create mode 100644 volk/include/volk/volk_32f_s32f_multiply_32f_a.h diff --git a/volk/apps/volk_profile.cc b/volk/apps/volk_profile.cc index 86bf72176..674ab7115 100644 --- a/volk/apps/volk_profile.cc +++ b/volk/apps/volk_profile.cc @@ -103,6 +103,7 @@ int main(int argc, char *argv[]) { VOLK_PROFILE(volk_8i_s32f_convert_32f_a, 1e-4, 100, 204600, 2000, &results); VOLK_PROFILE(volk_8i_s32f_convert_32f_u, 1e-4, 100, 204600, 2000, &results); VOLK_PROFILE(volk_32fc_s32fc_multiply_32fc_a, 1e-4, 0, 204600, 1000, &results); + VOLK_PROFILE(volk_32f_s32f_multiply_32f_a, 1e-4, 0, 204600, 1000, &results); char path[256]; get_config_path(path); diff --git a/volk/include/volk/volk_32f_s32f_multiply_32f_a.h b/volk/include/volk/volk_32f_s32f_multiply_32f_a.h new file mode 100644 index 000000000..6aef1735c --- /dev/null +++ b/volk/include/volk/volk_32f_s32f_multiply_32f_a.h @@ -0,0 +1,44 @@ +#ifndef INCLUDED_volk_32f_s32f_multiply_32f_a_H +#define INCLUDED_volk_32f_s32f_multiply_32f_a_H + +#include +#include + +#ifdef LV_HAVE_GENERIC +/*! + \brief Scalar float multiply + \param cVector The vector where the results will be stored + \param aVector One of the vectors to be multiplied + \param scalar the scalar value + \param num_points The number of values in aVector and bVector to be multiplied together and stored into cVector +*/ +static inline void volk_32f_s32f_multiply_32f_a_generic(float* cVector, float* aVector, const float scalar, unsigned int num_points){ + unsigned int number = 0; + float* inputPtr = aVector; + float* outputPtr = cVector; + for(number = 0; number < num_points; number++){ + *outputPtr = (*inputPtr) * scalar; + inputPtr++; + outputPtr++; + } +} +#endif /* LV_HAVE_GENERIC */ + +#ifdef LV_HAVE_ORC +/*! + \brief Scalar float multiply + \param cVector The vector where the results will be stored + \param aVector One of the vectors to be multiplied + \param scalar the scalar value + \param num_points The number of values in aVector and bVector to be multiplied together and stored into cVector +*/ +extern void volk_32f_s32f_multiply_32f_a_orc_impl(float* dst, float* src, const float scalar, unsigned int num_points); +static inline void volk_32f_s32f_multiply_32f_a_orc(float* cVector, float* aVector, const float scalar, unsigned int num_points){ + volk_32f_s32f_multiply_32f_a_orc_impl(cVector, aVector, scalar, num_points); +} +#endif /* LV_HAVE_GENERIC */ + + + + +#endif /* INCLUDED_volk_32f_s32f_multiply_32f_a_H */ diff --git a/volk/lib/testqa.cc b/volk/lib/testqa.cc index 9d1d1bca2..cd9f38dfa 100644 --- a/volk/lib/testqa.cc +++ b/volk/lib/testqa.cc @@ -4,6 +4,7 @@ //VOLK_RUN_TESTS(volk_16i_x5_add_quad_16i_x4_a, 1e-4, 2046, 10000); //VOLK_RUN_TESTS(volk_16i_branch_4_state_8_a, 1e-4, 2046, 10000); +VOLK_RUN_TESTS(volk_32f_s32f_multiply_32f_a, 1e-4, 0, 204600, 10000); VOLK_RUN_TESTS(volk_32fc_s32fc_multiply_32fc_a, 1e-4, 0, 20460, 10000); VOLK_RUN_TESTS(volk_16ic_s32f_deinterleave_real_32f_a, 1e-5, 32768.0, 204600, 10000); VOLK_RUN_TESTS(volk_16ic_deinterleave_real_8i_a, 0, 0, 20460, 10000); -- cgit From 9700623365f4dd322989d57c93bf2f90e12f19eb Mon Sep 17 00:00:00 2001 From: Nick Foster Date: Wed, 9 Nov 2011 13:21:00 -0800 Subject: Volk: whoops --- volk/orc/volk_32f_s32f_multiply_32f_a_orc_impl.orc | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 volk/orc/volk_32f_s32f_multiply_32f_a_orc_impl.orc diff --git a/volk/orc/volk_32f_s32f_multiply_32f_a_orc_impl.orc b/volk/orc/volk_32f_s32f_multiply_32f_a_orc_impl.orc new file mode 100644 index 000000000..ea23fc045 --- /dev/null +++ b/volk/orc/volk_32f_s32f_multiply_32f_a_orc_impl.orc @@ -0,0 +1,5 @@ +.function volk_32f_s32f_multiply_32f_a_orc_impl +.dest 4 dst +.source 4 src1 +.floatparam 4 scalar +mulf dst, src1, scalar -- cgit From b0b474be32e94ec72fc982689464ecb3828fc778 Mon Sep 17 00:00:00 2001 From: Nick Foster Date: Mon, 28 Nov 2011 18:02:19 -0800 Subject: Volk: fix volk_32f_x2_dot_prod_32f_u test (threshold increase) --- volk/lib/testqa.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/volk/lib/testqa.cc b/volk/lib/testqa.cc index cd9f38dfa..faf618752 100644 --- a/volk/lib/testqa.cc +++ b/volk/lib/testqa.cc @@ -54,7 +54,7 @@ VOLK_RUN_TESTS(volk_32fc_x2_square_dist_32f_a, 1e-4, 0, 20460, 10000); VOLK_RUN_TESTS(volk_32fc_x2_s32f_square_dist_scalar_mult_32f_a, 1e-4, 10, 20460, 10000); VOLK_RUN_TESTS(volk_32f_x2_divide_32f_a, 1e-4, 0, 20460, 2000); VOLK_RUN_TESTS(volk_32f_x2_dot_prod_32f_a, 1e-4, 0, 20460, 5000); -VOLK_RUN_TESTS(volk_32f_x2_dot_prod_32f_u, 1e-4, 0, 20460, 5000); +VOLK_RUN_TESTS(volk_32f_x2_dot_prod_32f_u, 3e-4, 0, 20460, 5000); //VOLK_RUN_TESTS(volk_32f_s32f_32f_fm_detect_32f_a, 1e-4, 2046, 10000); VOLK_RUN_TESTS(volk_32f_index_max_16u_a, 0, 0, 20460, 5000); VOLK_RUN_TESTS(volk_32f_x2_s32f_interleave_16ic_a, 1, 32768, 20460, 3000); -- cgit From de8845266b454e5f94d23799d23ccd50e2af8a8f Mon Sep 17 00:00:00 2001 From: Nick Foster Date: Mon, 28 Nov 2011 18:24:13 -0800 Subject: Volk: fix volk_32fc_s32f_magnitude_16i_a Orc implementation for saturating magnitudes Conflicts: volk/lib/testqa.cc --- volk/lib/testqa.cc | 2 +- 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 -- cgit From 627889415a0749de29c3b81308bc67302d5a3ba3 Mon Sep 17 00:00:00 2001 From: Nick Foster Date: Mon, 28 Nov 2011 18:42:35 -0800 Subject: Volk: fix 32fc dot product test. more investigation into ASM64 and ASM32 impls is needed to determine if these have robust tail cases or not. also fixed max_star test by removing it -- can't return ptrs in current test framework, needs custom test. --- volk/lib/testqa.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/volk/lib/testqa.cc b/volk/lib/testqa.cc index c709819d1..dafff1442 100644 --- a/volk/lib/testqa.cc +++ b/volk/lib/testqa.cc @@ -17,7 +17,7 @@ VOLK_RUN_TESTS(volk_16i_s32f_convert_32f_a, 1e-4, 32768.0, 20460, 10000); VOLK_RUN_TESTS(volk_16i_s32f_convert_32f_u, 1e-4, 32768.0, 20460, 10000); VOLK_RUN_TESTS(volk_16i_convert_8i_a, 0, 0, 20460, 10000); VOLK_RUN_TESTS(volk_16i_convert_8i_u, 0, 0, 20460, 10000); -VOLK_RUN_TESTS(volk_16i_max_star_16i_a, 0, 0, 20460, 10000); +//VOLK_RUN_TESTS(volk_16i_max_star_16i_a, 0, 0, 20460, 10000); VOLK_RUN_TESTS(volk_16i_max_star_horizontal_16i_a, 0, 0, 20460, 10000); //VOLK_RUN_TESTS(volk_16i_permute_and_scalar_add_a, 1e-4, 0, 2046, 1000); //VOLK_RUN_TESTS(volk_16i_x4_quad_max_star_16i_a, 1e-4, 0, 2046, 1000); @@ -35,8 +35,8 @@ VOLK_RUN_TESTS(volk_32fc_deinterleave_64f_x2_a, 1e-4, 0, 20460, 1000); VOLK_RUN_TESTS(volk_32fc_s32f_deinterleave_real_16i_a, 0, 32768, 20460, 10000); 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_x2_dot_prod_32fc_a, 1e-4, 0, 204600, 10000); +VOLK_RUN_TESTS(volk_32fc_index_max_16u_a, 3, 0, 20460, 10000); 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); -- cgit From b61e2276d60386143874cc884572e0dc6697ea73 Mon Sep 17 00:00:00 2001 From: Nick Foster Date: Mon, 28 Nov 2011 18:57:07 -0800 Subject: Volk: bring QA test changes into the profiler as well --- volk/apps/volk_profile.cc | 8 ++++---- volk/lib/testqa.cc | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/volk/apps/volk_profile.cc b/volk/apps/volk_profile.cc index 674ab7115..10a699872 100644 --- a/volk/apps/volk_profile.cc +++ b/volk/apps/volk_profile.cc @@ -27,8 +27,8 @@ int main(int argc, char *argv[]) { VOLK_PROFILE(volk_16i_s32f_convert_32f_u, 1e-4, 32768.0, 204600, 10000, &results); VOLK_PROFILE(volk_16i_convert_8i_a, 0, 0, 204600, 10000, &results); VOLK_PROFILE(volk_16i_convert_8i_u, 0, 0, 204600, 10000, &results); - VOLK_PROFILE(volk_16i_max_star_16i_a, 0, 0, 204600, 10000, &results); - VOLK_PROFILE(volk_16i_max_star_horizontal_16i_a, 0, 0, 204600, 10000, &results); + //VOLK_PROFILE(volk_16i_max_star_16i_a, 0, 0, 204600, 10000, &results); + //VOLK_PROFILE(volk_16i_max_star_horizontal_16i_a, 0, 0, 204600, 10000, &results); //VOLK_PROFILE(volk_16i_permute_and_scalar_add_a, 1e-4, 0, 2046, 10000, &results); //VOLK_PROFILE(volk_16i_x4_quad_max_star_16i_a, 1e-4, 0, 2046, 10000, &results); VOLK_PROFILE(volk_16u_byteswap_a, 0, 0, 204600, 10000, &results); @@ -46,7 +46,7 @@ int main(int argc, char *argv[]) { VOLK_PROFILE(volk_32fc_deinterleave_real_32f_a, 1e-4, 0, 204600, 5000, &results); VOLK_PROFILE(volk_32fc_deinterleave_real_64f_a, 1e-4, 0, 204600, 1000, &results); VOLK_PROFILE(volk_32fc_x2_dot_prod_32fc_a, 1e-4, 0, 204600, 10000, &results); - VOLK_PROFILE(volk_32fc_index_max_16u_a, 0, 0, 204600, 10000, &results); + VOLK_PROFILE(volk_32fc_index_max_16u_a, 3, 0, 204600, 10000, &results); VOLK_PROFILE(volk_32fc_s32f_magnitude_16i_a, 1, 32768, 204600, 100, &results); VOLK_PROFILE(volk_32fc_magnitude_32f_a, 1e-4, 0, 204600, 1000, &results); VOLK_PROFILE(volk_32fc_x2_multiply_32fc_a, 1e-4, 0, 204600, 1000, &results); @@ -66,7 +66,7 @@ int main(int argc, char *argv[]) { VOLK_PROFILE(volk_32f_x2_dot_prod_32f_a, 1e-4, 0, 204600, 5000, &results); VOLK_PROFILE(volk_32f_x2_dot_prod_32f_u, 1e-4, 0, 204600, 5000, &results); //VOLK_PROFILE(volk_32f_s32f_32f_fm_detect_32f_a, 1e-4, 2046, 10000, &results); - VOLK_PROFILE(volk_32f_index_max_16u_a, 0, 0, 204600, 5000, &results); + VOLK_PROFILE(volk_32f_index_max_16u_a, 3, 0, 204600, 5000, &results); VOLK_PROFILE(volk_32f_x2_s32f_interleave_16ic_a, 1, 32768, 204600, 3000, &results); VOLK_PROFILE(volk_32f_x2_interleave_32fc_a, 0, 0, 204600, 5000, &results); VOLK_PROFILE(volk_32f_x2_max_32f_a, 1e-4, 0, 204600, 2000, &results); diff --git a/volk/lib/testqa.cc b/volk/lib/testqa.cc index dafff1442..5c3fd6f70 100644 --- a/volk/lib/testqa.cc +++ b/volk/lib/testqa.cc @@ -53,10 +53,10 @@ VOLK_RUN_TESTS(volk_32fc_s32f_power_spectrum_32f_a, 1e-4, 0, 2046, 100); VOLK_RUN_TESTS(volk_32fc_x2_square_dist_32f_a, 1e-4, 0, 20460, 10000); VOLK_RUN_TESTS(volk_32fc_x2_s32f_square_dist_scalar_mult_32f_a, 1e-4, 10, 20460, 10000); VOLK_RUN_TESTS(volk_32f_x2_divide_32f_a, 1e-4, 0, 20460, 2000); -VOLK_RUN_TESTS(volk_32f_x2_dot_prod_32f_a, 1e-4, 0, 20460, 5000); -VOLK_RUN_TESTS(volk_32f_x2_dot_prod_32f_u, 3e-4, 0, 20460, 5000); +VOLK_RUN_TESTS(volk_32f_x2_dot_prod_32f_a, 1e-4, 0, 204600, 1000); +VOLK_RUN_TESTS(volk_32f_x2_dot_prod_32f_u, 1e-4, 0, 204600, 1000); //VOLK_RUN_TESTS(volk_32f_s32f_32f_fm_detect_32f_a, 1e-4, 2046, 10000); -VOLK_RUN_TESTS(volk_32f_index_max_16u_a, 0, 0, 20460, 5000); +VOLK_RUN_TESTS(volk_32f_index_max_16u_a, 3, 0, 20460, 5000); VOLK_RUN_TESTS(volk_32f_x2_s32f_interleave_16ic_a, 1, 32768, 20460, 3000); VOLK_RUN_TESTS(volk_32f_x2_interleave_32fc_a, 0, 0, 20460, 5000); VOLK_RUN_TESTS(volk_32f_x2_max_32f_a, 1e-4, 0, 20460, 2000); -- cgit From bb8f6c8115d39205ea566bf6b70f391f83168a4c Mon Sep 17 00:00:00 2001 From: Nick Foster Date: Mon, 28 Nov 2011 19:16:57 -0800 Subject: Volk: remove index max horizontal star from test, it shouldn't be there either --- volk/lib/testqa.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/volk/lib/testqa.cc b/volk/lib/testqa.cc index 5c3fd6f70..2cc3cd892 100644 --- a/volk/lib/testqa.cc +++ b/volk/lib/testqa.cc @@ -18,7 +18,7 @@ VOLK_RUN_TESTS(volk_16i_s32f_convert_32f_u, 1e-4, 32768.0, 20460, 10000); VOLK_RUN_TESTS(volk_16i_convert_8i_a, 0, 0, 20460, 10000); VOLK_RUN_TESTS(volk_16i_convert_8i_u, 0, 0, 20460, 10000); //VOLK_RUN_TESTS(volk_16i_max_star_16i_a, 0, 0, 20460, 10000); -VOLK_RUN_TESTS(volk_16i_max_star_horizontal_16i_a, 0, 0, 20460, 10000); +//VOLK_RUN_TESTS(volk_16i_max_star_horizontal_16i_a, 0, 0, 20460, 10000); //VOLK_RUN_TESTS(volk_16i_permute_and_scalar_add_a, 1e-4, 0, 2046, 1000); //VOLK_RUN_TESTS(volk_16i_x4_quad_max_star_16i_a, 1e-4, 0, 2046, 1000); VOLK_RUN_TESTS(volk_16u_byteswap_a, 0, 0, 20460, 10000); -- cgit From 955a39bf4bfa67e6af4000d9df865518fbeedbfa Mon Sep 17 00:00:00 2001 From: Nick Foster Date: Mon, 28 Nov 2011 19:21:18 -0800 Subject: Volk: since we have a profiler, we don't need to iterate during QA, so this can go much faster Conflicts: volk/lib/testqa.cc --- volk/lib/testqa.cc | 156 ++++++++++++++++++++++++++--------------------------- 1 file changed, 77 insertions(+), 79 deletions(-) diff --git a/volk/lib/testqa.cc b/volk/lib/testqa.cc index 2cc3cd892..fbd4bdea5 100644 --- a/volk/lib/testqa.cc +++ b/volk/lib/testqa.cc @@ -4,91 +4,89 @@ //VOLK_RUN_TESTS(volk_16i_x5_add_quad_16i_x4_a, 1e-4, 2046, 10000); //VOLK_RUN_TESTS(volk_16i_branch_4_state_8_a, 1e-4, 2046, 10000); -VOLK_RUN_TESTS(volk_32f_s32f_multiply_32f_a, 1e-4, 0, 204600, 10000); -VOLK_RUN_TESTS(volk_32fc_s32fc_multiply_32fc_a, 1e-4, 0, 20460, 10000); -VOLK_RUN_TESTS(volk_16ic_s32f_deinterleave_real_32f_a, 1e-5, 32768.0, 204600, 10000); -VOLK_RUN_TESTS(volk_16ic_deinterleave_real_8i_a, 0, 0, 20460, 10000); -VOLK_RUN_TESTS(volk_16ic_deinterleave_16i_x2_a, 0, 0, 20460, 10000); -VOLK_RUN_TESTS(volk_16ic_s32f_deinterleave_32f_x2_a, 1e-4, 32768.0, 20460, 1000); -VOLK_RUN_TESTS(volk_16ic_deinterleave_real_16i_a, 0, 0, 20460, 10000); -VOLK_RUN_TESTS(volk_16ic_magnitude_16i_a, 1, 0, 20460, 100); -VOLK_RUN_TESTS(volk_16ic_s32f_magnitude_32f_a, 1e-5, 32768.0, 20460, 1000); -VOLK_RUN_TESTS(volk_16i_s32f_convert_32f_a, 1e-4, 32768.0, 20460, 10000); -VOLK_RUN_TESTS(volk_16i_s32f_convert_32f_u, 1e-4, 32768.0, 20460, 10000); -VOLK_RUN_TESTS(volk_16i_convert_8i_a, 0, 0, 20460, 10000); -VOLK_RUN_TESTS(volk_16i_convert_8i_u, 0, 0, 20460, 10000); +VOLK_RUN_TESTS(volk_16ic_s32f_deinterleave_real_32f_a, 1e-5, 32768.0, 20460, 1); +VOLK_RUN_TESTS(volk_16ic_deinterleave_real_8i_a, 0, 0, 20460, 1); +VOLK_RUN_TESTS(volk_16ic_deinterleave_16i_x2_a, 0, 0, 20460, 1); +VOLK_RUN_TESTS(volk_16ic_s32f_deinterleave_32f_x2_a, 1e-4, 32768.0, 20460, 1); +VOLK_RUN_TESTS(volk_16ic_deinterleave_real_16i_a, 0, 0, 20460, 1); +VOLK_RUN_TESTS(volk_16ic_magnitude_16i_a, 1, 0, 20460, 1); +VOLK_RUN_TESTS(volk_16ic_s32f_magnitude_32f_a, 1e-5, 32768.0, 20460, 1); +VOLK_RUN_TESTS(volk_16i_s32f_convert_32f_a, 1e-4, 32768.0, 20460, 1); +VOLK_RUN_TESTS(volk_16i_s32f_convert_32f_u, 1e-4, 32768.0, 20460, 1); +VOLK_RUN_TESTS(volk_16i_convert_8i_a, 0, 0, 20460, 1); +VOLK_RUN_TESTS(volk_16i_convert_8i_u, 0, 0, 20460, 1); //VOLK_RUN_TESTS(volk_16i_max_star_16i_a, 0, 0, 20460, 10000); //VOLK_RUN_TESTS(volk_16i_max_star_horizontal_16i_a, 0, 0, 20460, 10000); //VOLK_RUN_TESTS(volk_16i_permute_and_scalar_add_a, 1e-4, 0, 2046, 1000); //VOLK_RUN_TESTS(volk_16i_x4_quad_max_star_16i_a, 1e-4, 0, 2046, 1000); -VOLK_RUN_TESTS(volk_16u_byteswap_a, 0, 0, 20460, 10000); -VOLK_RUN_TESTS(volk_32f_accumulator_s32f_a, 1e-4, 0, 20460, 10000); -VOLK_RUN_TESTS(volk_32f_x2_add_32f_a, 1e-4, 0, 20460, 10000); -VOLK_RUN_TESTS(volk_32fc_32f_multiply_32fc_a, 1e-4, 0, 20460, 1000); -VOLK_RUN_TESTS(volk_32fc_s32f_power_32fc_a, 1e-4, 0, 20460, 50); -VOLK_RUN_TESTS(volk_32f_s32f_calc_spectral_noise_floor_32f_a, 1e-4, 20.0, 20460, 1000); -VOLK_RUN_TESTS(volk_32fc_s32f_atan2_32f_a, 1e-4, 10.0, 20460, 100); +VOLK_RUN_TESTS(volk_16u_byteswap_a, 0, 0, 20460, 1); +VOLK_RUN_TESTS(volk_32f_accumulator_s32f_a, 1e-4, 0, 20460, 1); +VOLK_RUN_TESTS(volk_32f_x2_add_32f_a, 1e-4, 0, 20460, 1); +VOLK_RUN_TESTS(volk_32fc_32f_multiply_32fc_a, 1e-4, 0, 20460, 1); +VOLK_RUN_TESTS(volk_32fc_s32f_power_32fc_a, 1e-4, 0, 20460, 1); +VOLK_RUN_TESTS(volk_32f_s32f_calc_spectral_noise_floor_32f_a, 1e-4, 20.0, 20460, 1); +VOLK_RUN_TESTS(volk_32fc_s32f_atan2_32f_a, 1e-4, 10.0, 20460, 1); //VOLK_RUN_TESTS(volk_32fc_x2_conjugate_dot_prod_32fc_a, 1e-4, 0, 2046, 10000); -VOLK_RUN_TESTS(volk_32fc_x2_conjugate_dot_prod_32fc_u, 1e-4, 0, 20460, 10000); -VOLK_RUN_TESTS(volk_32fc_deinterleave_32f_x2_a, 1e-4, 0, 20460, 1000); -VOLK_RUN_TESTS(volk_32fc_deinterleave_64f_x2_a, 1e-4, 0, 20460, 1000); -VOLK_RUN_TESTS(volk_32fc_s32f_deinterleave_real_16i_a, 0, 32768, 20460, 10000); -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, 204600, 10000); -VOLK_RUN_TESTS(volk_32fc_index_max_16u_a, 3, 0, 20460, 10000); -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); -VOLK_RUN_TESTS(volk_32f_s32f_convert_16i_u, 1, 32768, 20460, 10000); -VOLK_RUN_TESTS(volk_32f_s32f_convert_32i_a, 1, 2<<31, 20460, 10000); -VOLK_RUN_TESTS(volk_32f_s32f_convert_32i_u, 1, 2<<31, 20460, 10000); -VOLK_RUN_TESTS(volk_32f_convert_64f_a, 1e-4, 0, 20460, 10000); -VOLK_RUN_TESTS(volk_32f_convert_64f_u, 1e-4, 0, 20460, 10000); -VOLK_RUN_TESTS(volk_32f_s32f_convert_8i_a, 1, 128, 20460, 10000); -VOLK_RUN_TESTS(volk_32f_s32f_convert_8i_u, 1, 128, 20460, 10000); +VOLK_RUN_TESTS(volk_32fc_x2_conjugate_dot_prod_32fc_u, 1e-4, 0, 20460, 1); +VOLK_RUN_TESTS(volk_32fc_deinterleave_32f_x2_a, 1e-4, 0, 20460, 1); +VOLK_RUN_TESTS(volk_32fc_deinterleave_64f_x2_a, 1e-4, 0, 20460, 1); +VOLK_RUN_TESTS(volk_32fc_s32f_deinterleave_real_16i_a, 0, 32768, 20460, 1); +VOLK_RUN_TESTS(volk_32fc_deinterleave_real_32f_a, 1e-4, 0, 20460, 1); +VOLK_RUN_TESTS(volk_32fc_deinterleave_real_64f_a, 1e-4, 0, 20460, 1); +VOLK_RUN_TESTS(volk_32fc_x2_dot_prod_32fc_a, 1e-4, 0, 204600, 1); +VOLK_RUN_TESTS(volk_32fc_index_max_16u_a, 3, 0, 20460, 1); +VOLK_RUN_TESTS(volk_32fc_s32f_magnitude_16i_a, 1, 32768, 20460, 1); +VOLK_RUN_TESTS(volk_32fc_magnitude_32f_a, 1e-4, 0, 20460, 1); +VOLK_RUN_TESTS(volk_32fc_x2_multiply_32fc_a, 1e-4, 0, 20460, 1); +VOLK_RUN_TESTS(volk_32f_s32f_convert_16i_a, 1, 32768, 20460, 1); +VOLK_RUN_TESTS(volk_32f_s32f_convert_16i_u, 1, 32768, 20460, 1); +VOLK_RUN_TESTS(volk_32f_s32f_convert_32i_a, 1, 2<<31, 20460, 1); +VOLK_RUN_TESTS(volk_32f_s32f_convert_32i_u, 1, 2<<31, 20460, 1); +VOLK_RUN_TESTS(volk_32f_convert_64f_a, 1e-4, 0, 20460, 1); +VOLK_RUN_TESTS(volk_32f_convert_64f_u, 1e-4, 0, 20460, 1); +VOLK_RUN_TESTS(volk_32f_s32f_convert_8i_a, 1, 128, 20460, 1); +VOLK_RUN_TESTS(volk_32f_s32f_convert_8i_u, 1, 128, 20460, 1); //VOLK_RUN_TESTS(volk_32fc_s32f_x2_power_spectral_density_32f_a, 1e-4, 2046, 10000); -VOLK_RUN_TESTS(volk_32fc_s32f_power_spectrum_32f_a, 1e-4, 0, 2046, 100); -VOLK_RUN_TESTS(volk_32fc_x2_square_dist_32f_a, 1e-4, 0, 20460, 10000); -VOLK_RUN_TESTS(volk_32fc_x2_s32f_square_dist_scalar_mult_32f_a, 1e-4, 10, 20460, 10000); -VOLK_RUN_TESTS(volk_32f_x2_divide_32f_a, 1e-4, 0, 20460, 2000); -VOLK_RUN_TESTS(volk_32f_x2_dot_prod_32f_a, 1e-4, 0, 204600, 1000); -VOLK_RUN_TESTS(volk_32f_x2_dot_prod_32f_u, 1e-4, 0, 204600, 1000); +VOLK_RUN_TESTS(volk_32fc_s32f_power_spectrum_32f_a, 1e-4, 0, 2046, 1); +VOLK_RUN_TESTS(volk_32fc_x2_square_dist_32f_a, 1e-4, 0, 20460, 1); +VOLK_RUN_TESTS(volk_32fc_x2_s32f_square_dist_scalar_mult_32f_a, 1e-4, 10, 20460, 1); +VOLK_RUN_TESTS(volk_32f_x2_divide_32f_a, 1e-4, 0, 20460, 1); +VOLK_RUN_TESTS(volk_32f_x2_dot_prod_32f_a, 1e-4, 0, 204600, 1); +VOLK_RUN_TESTS(volk_32f_x2_dot_prod_32f_u, 1e-4, 0, 204600, 1); //VOLK_RUN_TESTS(volk_32f_s32f_32f_fm_detect_32f_a, 1e-4, 2046, 10000); -VOLK_RUN_TESTS(volk_32f_index_max_16u_a, 3, 0, 20460, 5000); -VOLK_RUN_TESTS(volk_32f_x2_s32f_interleave_16ic_a, 1, 32768, 20460, 3000); -VOLK_RUN_TESTS(volk_32f_x2_interleave_32fc_a, 0, 0, 20460, 5000); -VOLK_RUN_TESTS(volk_32f_x2_max_32f_a, 1e-4, 0, 20460, 2000); -VOLK_RUN_TESTS(volk_32f_x2_min_32f_a, 1e-4, 0, 20460, 2000); -VOLK_RUN_TESTS(volk_32f_x2_multiply_32f_a, 1e-4, 0, 20460, 10000); -VOLK_RUN_TESTS(volk_32f_s32f_normalize_a, 1e-4, 100, 20460, 10000); -VOLK_RUN_TESTS(volk_32f_s32f_power_32f_a, 1e-4, 4, 20460, 100); -VOLK_RUN_TESTS(volk_32f_sqrt_32f_a, 1e-4, 0, 20460, 100); -VOLK_RUN_TESTS(volk_32f_s32f_stddev_32f_a, 1e-4, 100, 20460, 3000); -VOLK_RUN_TESTS(volk_32f_stddev_and_mean_32f_x2_a, 1e-4, 0, 20460, 3000); -VOLK_RUN_TESTS(volk_32f_x2_subtract_32f_a, 1e-4, 0, 20460, 5000); -VOLK_RUN_TESTS(volk_32f_x3_sum_of_poly_32f_a, 1e-4, 0, 20460, 5000); -VOLK_RUN_TESTS(volk_32i_x2_and_32i_a, 0, 0, 20460, 10000); -VOLK_RUN_TESTS(volk_32i_s32f_convert_32f_a, 1e-4, 100, 20460, 10000); -VOLK_RUN_TESTS(volk_32i_s32f_convert_32f_u, 1e-4, 100, 20460, 10000); -VOLK_RUN_TESTS(volk_32i_x2_or_32i_a, 0, 0, 20460, 10000); -VOLK_RUN_TESTS(volk_32u_byteswap_a, 0, 0, 20460, 2000); +VOLK_RUN_TESTS(volk_32f_index_max_16u_a, 3, 0, 20460, 1); +VOLK_RUN_TESTS(volk_32f_x2_s32f_interleave_16ic_a, 1, 32768, 20460, 1); +VOLK_RUN_TESTS(volk_32f_x2_interleave_32fc_a, 0, 0, 20460, 1); +VOLK_RUN_TESTS(volk_32f_x2_max_32f_a, 1e-4, 0, 20460, 1); +VOLK_RUN_TESTS(volk_32f_x2_min_32f_a, 1e-4, 0, 20460, 1); +VOLK_RUN_TESTS(volk_32f_x2_multiply_32f_a, 1e-4, 0, 20460, 1); +VOLK_RUN_TESTS(volk_32f_s32f_normalize_a, 1e-4, 100, 20460, 1); +VOLK_RUN_TESTS(volk_32f_s32f_power_32f_a, 1e-4, 4, 20460, 1); +VOLK_RUN_TESTS(volk_32f_sqrt_32f_a, 1e-4, 0, 20460, 1); +VOLK_RUN_TESTS(volk_32f_s32f_stddev_32f_a, 1e-4, 100, 20460, 1); +VOLK_RUN_TESTS(volk_32f_stddev_and_mean_32f_x2_a, 1e-4, 0, 20460, 1); +VOLK_RUN_TESTS(volk_32f_x2_subtract_32f_a, 1e-4, 0, 20460, 1); +VOLK_RUN_TESTS(volk_32f_x3_sum_of_poly_32f_a, 1e-4, 0, 20460, 1); +VOLK_RUN_TESTS(volk_32i_x2_and_32i_a, 0, 0, 20460, 1); +VOLK_RUN_TESTS(volk_32i_s32f_convert_32f_a, 1e-4, 100, 20460, 1); +VOLK_RUN_TESTS(volk_32i_s32f_convert_32f_u, 1e-4, 100, 20460, 1); +VOLK_RUN_TESTS(volk_32i_x2_or_32i_a, 0, 0, 20460, 1); +VOLK_RUN_TESTS(volk_32u_byteswap_a, 0, 0, 20460, 1); //VOLK_RUN_TESTS(volk_32u_popcnt_a, 0, 0, 2046, 10000); -VOLK_RUN_TESTS(volk_64f_convert_32f_a, 1e-4, 0, 20460, 10000); -VOLK_RUN_TESTS(volk_64f_convert_32f_u, 1e-4, 0, 20460, 10000); -VOLK_RUN_TESTS(volk_64f_x2_max_64f_a, 1e-4, 0, 20460, 1000); -VOLK_RUN_TESTS(volk_64f_x2_min_64f_a, 1e-4, 0, 20460, 1000); -VOLK_RUN_TESTS(volk_64u_byteswap_a, 0, 0, 20460, 1000); +VOLK_RUN_TESTS(volk_64f_convert_32f_a, 1e-4, 0, 20460, 1); +VOLK_RUN_TESTS(volk_64f_convert_32f_u, 1e-4, 0, 20460, 1); +VOLK_RUN_TESTS(volk_64f_x2_max_64f_a, 1e-4, 0, 20460, 1); +VOLK_RUN_TESTS(volk_64f_x2_min_64f_a, 1e-4, 0, 20460, 1); +VOLK_RUN_TESTS(volk_64u_byteswap_a, 0, 0, 20460, 1); //VOLK_RUN_TESTS(volk_64u_popcnt_a, 0, 0, 2046, 10000); -VOLK_RUN_TESTS(volk_8ic_deinterleave_16i_x2_a, 0, 0, 20460, 3000); -VOLK_RUN_TESTS(volk_8ic_s32f_deinterleave_32f_x2_a, 1e-4, 100, 20460, 3000); -VOLK_RUN_TESTS(volk_8ic_deinterleave_real_16i_a, 0, 256, 20460, 3000); -VOLK_RUN_TESTS(volk_8ic_s32f_deinterleave_real_32f_a, 1e-4, 100, 20460, 3000); -VOLK_RUN_TESTS(volk_8ic_deinterleave_real_8i_a, 0, 0, 20460, 10000); -VOLK_RUN_TESTS(volk_8ic_x2_multiply_conjugate_16ic_a, 0, 0, 20460, 400); -VOLK_RUN_TESTS(volk_8ic_x2_s32f_multiply_conjugate_32fc_a, 1e-4, 100, 20460, 400); -VOLK_RUN_TESTS(volk_8i_convert_16i_a, 0, 0, 20460, 20000); -VOLK_RUN_TESTS(volk_8i_convert_16i_u, 0, 0, 20460, 2000); -VOLK_RUN_TESTS(volk_8i_s32f_convert_32f_a, 1e-4, 100, 20460, 2000); -VOLK_RUN_TESTS(volk_8i_s32f_convert_32f_u, 1e-4, 100, 20460, 2000); +VOLK_RUN_TESTS(volk_8ic_deinterleave_16i_x2_a, 0, 0, 20460, 1); +VOLK_RUN_TESTS(volk_8ic_s32f_deinterleave_32f_x2_a, 1e-4, 100, 20460, 1); +VOLK_RUN_TESTS(volk_8ic_deinterleave_real_16i_a, 0, 256, 20460, 1); +VOLK_RUN_TESTS(volk_8ic_s32f_deinterleave_real_32f_a, 1e-4, 100, 20460, 1); +VOLK_RUN_TESTS(volk_8ic_deinterleave_real_8i_a, 0, 0, 20460, 1); +VOLK_RUN_TESTS(volk_8ic_x2_multiply_conjugate_16ic_a, 0, 0, 20460, 1); +VOLK_RUN_TESTS(volk_8ic_x2_s32f_multiply_conjugate_32fc_a, 1e-4, 100, 20460, 1); +VOLK_RUN_TESTS(volk_8i_convert_16i_a, 0, 0, 20460, 1); +VOLK_RUN_TESTS(volk_8i_convert_16i_u, 0, 0, 20460, 1); +VOLK_RUN_TESTS(volk_8i_s32f_convert_32f_a, 1e-4, 100, 20460, 1); +VOLK_RUN_TESTS(volk_8i_s32f_convert_32f_u, 1e-4, 100, 20460, 1); -- cgit From a6b5389139341784edf30d512aa42360d3a8cf02 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Thu, 1 Dec 2011 09:21:11 -0500 Subject: volk: squashed changes 32f_s32f_multiply_32f_a 32fc_x2_dot_prod_32fc_u --- volk/include/volk/volk_32f_s32f_multiply_32f_a.h | 8 +- volk/include/volk/volk_32fc_x2_dot_prod_32fc_u.h | 116 +++++++++++++++++++++++ 2 files changed, 120 insertions(+), 4 deletions(-) create mode 100644 volk/include/volk/volk_32fc_x2_dot_prod_32fc_u.h diff --git a/volk/include/volk/volk_32f_s32f_multiply_32f_a.h b/volk/include/volk/volk_32f_s32f_multiply_32f_a.h index 6aef1735c..37223dc81 100644 --- a/volk/include/volk/volk_32f_s32f_multiply_32f_a.h +++ b/volk/include/volk/volk_32f_s32f_multiply_32f_a.h @@ -12,9 +12,9 @@ \param scalar the scalar value \param num_points The number of values in aVector and bVector to be multiplied together and stored into cVector */ -static inline void volk_32f_s32f_multiply_32f_a_generic(float* cVector, float* aVector, const float scalar, unsigned int num_points){ +static inline void volk_32f_s32f_multiply_32f_a_generic(float* cVector, const float* aVector, const float scalar, unsigned int num_points){ unsigned int number = 0; - float* inputPtr = aVector; + const float* inputPtr = aVector; float* outputPtr = cVector; for(number = 0; number < num_points; number++){ *outputPtr = (*inputPtr) * scalar; @@ -32,8 +32,8 @@ static inline void volk_32f_s32f_multiply_32f_a_generic(float* cVector, float* a \param scalar the scalar value \param num_points The number of values in aVector and bVector to be multiplied together and stored into cVector */ -extern void volk_32f_s32f_multiply_32f_a_orc_impl(float* dst, float* src, const float scalar, unsigned int num_points); -static inline void volk_32f_s32f_multiply_32f_a_orc(float* cVector, float* aVector, const float scalar, unsigned int num_points){ +extern void volk_32f_s32f_multiply_32f_a_orc_impl(float* dst, const float* src, const float scalar, unsigned int num_points); +static inline void volk_32f_s32f_multiply_32f_a_orc(float* cVector, const float* aVector, const float scalar, unsigned int num_points){ volk_32f_s32f_multiply_32f_a_orc_impl(cVector, aVector, scalar, num_points); } #endif /* LV_HAVE_GENERIC */ diff --git a/volk/include/volk/volk_32fc_x2_dot_prod_32fc_u.h b/volk/include/volk/volk_32fc_x2_dot_prod_32fc_u.h new file mode 100644 index 000000000..7c0dba7fd --- /dev/null +++ b/volk/include/volk/volk_32fc_x2_dot_prod_32fc_u.h @@ -0,0 +1,116 @@ +#ifndef INCLUDED_volk_32fc_x2_dot_prod_32fc_u_H +#define INCLUDED_volk_32fc_x2_dot_prod_32fc_u_H + +#include +#include +#include +#include + + +#ifdef LV_HAVE_GENERIC + + +static inline void volk_32fc_x2_dot_prod_32fc_u_generic(lv_32fc_t* result, const lv_32fc_t* input, const lv_32fc_t* taps, unsigned int num_points) { + + float * res = (float*) result; + float * in = (float*) input; + float * tp = (float*) taps; + unsigned int n_2_ccomplex_blocks = num_points/2; + unsigned int isodd = num_points &1; + + + + float sum0[2] = {0,0}; + float sum1[2] = {0,0}; + unsigned int i = 0; + + + for(i = 0; i < n_2_ccomplex_blocks; ++i) { + + + sum0[0] += in[0] * tp[0] - in[1] * tp[1]; + sum0[1] += in[0] * tp[1] + in[1] * tp[0]; + sum1[0] += in[2] * tp[2] - in[3] * tp[3]; + sum1[1] += in[2] * tp[3] + in[3] * tp[2]; + + + in += 4; + tp += 4; + + } + + + res[0] = sum0[0] + sum1[0]; + res[1] = sum0[1] + sum1[1]; + + + + for(i = 0; i < isodd; ++i) { + + + *result += input[num_points - 1] * taps[num_points - 1]; + + } + +} + +#endif /*LV_HAVE_GENERIC*/ + +#ifdef LV_HAVE_SSE3 + +#include + +static inline void volk_32fc_x2_dot_prod_32fc_u_sse3(lv_32fc_t* result, const lv_32fc_t* input, const lv_32fc_t* taps, unsigned int num_points) { + + + lv_32fc_t dotProduct; + memset(&dotProduct, 0x0, 2*sizeof(float)); + + unsigned int number = 0; + const unsigned int halfPoints = num_points/2; + + __m128 x, y, yl, yh, z, tmp1, tmp2, dotProdVal; + + const lv_32fc_t* a = input; + const lv_32fc_t* b = taps; + + dotProdVal = _mm_setzero_ps(); + + for(;number < halfPoints; number++){ + + x = _mm_loadu_ps((float*)a); // Load the ar + ai, br + bi as ar,ai,br,bi + y = _mm_loadu_ps((float*)b); // Load the cr + ci, dr + di as cr,ci,dr,di + + yl = _mm_moveldup_ps(y); // Load yl with cr,cr,dr,dr + yh = _mm_movehdup_ps(y); // Load yh with ci,ci,di,di + + tmp1 = _mm_mul_ps(x,yl); // tmp1 = ar*cr,ai*cr,br*dr,bi*dr + + x = _mm_shuffle_ps(x,x,0xB1); // Re-arrange x to be ai,ar,bi,br + + tmp2 = _mm_mul_ps(x,yh); // tmp2 = ai*ci,ar*ci,bi*di,br*di + + z = _mm_addsub_ps(tmp1,tmp2); // ar*cr-ai*ci, ai*cr+ar*ci, br*dr-bi*di, bi*dr+br*di + + dotProdVal = _mm_add_ps(dotProdVal, z); // Add the complex multiplication results together + + a += 2; + b += 2; + } + + __VOLK_ATTR_ALIGNED(16) lv_32fc_t dotProductVector[2]; + + _mm_storeu_ps((float*)dotProductVector,dotProdVal); // Store the results back into the dot product vector + + dotProduct += ( dotProductVector[0] + dotProductVector[1] ); + + if(num_points % 1 != 0) { + dotProduct += (*a) * (*b); + } + + *result = dotProduct; +} + +#endif /*LV_HAVE_SSE3*/ + +#endif /*INCLUDED_volk_32fc_x2_dot_prod_32fc_u_H*/ -- cgit