[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r11402 - gnuradio/branches/developers/balister/arm-con
|
From: |
balister |
|
Subject: |
[Commit-gnuradio] r11402 - gnuradio/branches/developers/balister/arm-configure/gnuradio-core/src/lib/filter |
|
Date: |
Thu, 9 Jul 2009 13:09:25 -0600 (MDT) |
Author: balister
Date: 2009-07-09 13:09:25 -0600 (Thu, 09 Jul 2009)
New Revision: 11402
Added:
gnuradio/branches/developers/balister/arm-configure/gnuradio-core/src/lib/filter/dotprod_fff_armv7_a.c
gnuradio/branches/developers/balister/arm-configure/gnuradio-core/src/lib/filter/dotprod_fff_armv7_a.h
gnuradio/branches/developers/balister/arm-configure/gnuradio-core/src/lib/filter/gr_cpu_armv7_a.cc
gnuradio/branches/developers/balister/arm-configure/gnuradio-core/src/lib/filter/gr_fir_fff_armv7_a.cc
gnuradio/branches/developers/balister/arm-configure/gnuradio-core/src/lib/filter/gr_fir_fff_armv7_a.h
gnuradio/branches/developers/balister/arm-configure/gnuradio-core/src/lib/filter/gr_fir_sysconfig_armv7_a.cc
gnuradio/branches/developers/balister/arm-configure/gnuradio-core/src/lib/filter/gr_fir_sysconfig_armv7_a.h
gnuradio/branches/developers/balister/arm-configure/gnuradio-core/src/lib/filter/qa_dotprod_armv7_a.cc
gnuradio/branches/developers/balister/arm-configure/gnuradio-core/src/lib/filter/sysconfig_armv7_a.cc
Modified:
gnuradio/branches/developers/balister/arm-configure/gnuradio-core/src/lib/filter/Makefile.am
gnuradio/branches/developers/balister/arm-configure/gnuradio-core/src/lib/filter/gr_cpu.h
gnuradio/branches/developers/balister/arm-configure/gnuradio-core/src/lib/filter/gr_cpu_x86.cc
Log:
Add support for fir_fff filter for armv7-a using NEON.
Modified:
gnuradio/branches/developers/balister/arm-configure/gnuradio-core/src/lib/filter/Makefile.am
===================================================================
---
gnuradio/branches/developers/balister/arm-configure/gnuradio-core/src/lib/filter/Makefile.am
2009-07-09 18:33:04 UTC (rev 11401)
+++
gnuradio/branches/developers/balister/arm-configure/gnuradio-core/src/lib/filter/Makefile.am
2009-07-09 19:09:25 UTC (rev 11402)
@@ -148,7 +148,16 @@
powerpc_qa_CODE = \
qa_dotprod_powerpc.cc
+armv7_a_CODE = \
+ sysconfig_armv7_a.cc \
+ gr_fir_sysconfig_armv7_a.cc \
+ gr_cpu_armv7_a.cc \
+ gr_fir_fff_armv7_a.cc \
+ dotprod_fff_armv7_a.c
+armv7_a_qa_CODE = \
+ qa_dotprod_armv7_a.cc
+
#
# include each <foo>_CODE entry here...
#
@@ -160,7 +169,9 @@
$(x86_64_SUBCODE) \
$(x86_qa_CODE) \
$(powerpc_CODE) \
- $(powerpc_qa_CODE)
+ $(powerpc_qa_CODE) \
+ $(armv7_a_CODE) \
+ $(armv7_a_qa_CODE)
EXTRA_DIST = \
@@ -223,7 +234,12 @@
libfilter_qa_la_SOURCES = $(libfilter_qa_la_common_SOURCES) $(powerpc_qa_CODE)
endif
+if MD_CPU_armv7_a
+libfilter_la_SOURCES = $(libfilter_la_common_SOURCES) $(armv7_a_CODE)
+libfilter_qa_la_SOURCES = $(libfilter_qa_la_common_SOURCES) $(armv7_a_qa_CODE)
+endif
+
grinclude_HEADERS = \
$(GENERATED_H) \
complex_dotprod_generic.h \
@@ -265,6 +281,7 @@
noinst_HEADERS = \
assembly.h \
dotprod_fff_altivec.h \
+ dotprod_fff_armv7_a.h \
gr_fir_scc_simd.h \
gr_fir_scc_x86.h \
gr_fir_fcc_simd.h \
@@ -274,6 +291,7 @@
gr_fir_ccc_simd.h \
gr_fir_ccc_x86.h \
gr_fir_fff_altivec.h \
+ gr_fir_fff_armv7_a.h \
gr_fir_fff_simd.h \
gr_fir_fff_x86.h \
gr_fir_fsf_simd.h \
Added:
gnuradio/branches/developers/balister/arm-configure/gnuradio-core/src/lib/filter/dotprod_fff_armv7_a.c
===================================================================
---
gnuradio/branches/developers/balister/arm-configure/gnuradio-core/src/lib/filter/dotprod_fff_armv7_a.c
(rev 0)
+++
gnuradio/branches/developers/balister/arm-configure/gnuradio-core/src/lib/filter/dotprod_fff_armv7_a.c
2009-07-09 19:09:25 UTC (rev 11402)
@@ -0,0 +1,85 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2008 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <dotprod_fff_armv7_a.h>
+
+/*!
+ * \param x any value
+ * \param pow2 must be a power of 2
+ * \returns \p x rounded down to a multiple of \p pow2.
+ */
+static inline size_t
+gr_p2_round_down(size_t x, size_t pow2)
+{
+ return x & -pow2;
+}
+
+
+#if 0
+
+float
+dotprod_fff_armv7_a(const float *a, const float *b, size_t n)
+{
+ float sum = 0;
+ size_t i;
+ for (i = 0; i < n; i++){
+ sum += a[i] * b[i];
+ }
+ return sum;
+}
+
+#else
+
+/*
+ * preconditions:
+ *
+ * n > 0 and a multiple of 4
+ * a 4-byte aligned
+ * b 16-byte aligned
+ */
+float
+dotprod_fff_armv7_a(const float *a, const float *b, size_t n)
+{
+ float s = 0;
+
+ asm ("vmov.f32 q8, #0.0 \n\t"
+ "vmov.f32 q9, #0.0 \n\t"
+ "1: \n\t"
+ "subs %3, %3, #8 \n\t"
+ "vld1.32 {d0,d1,d2,d3}, [%1]! \n\t"
+ "vld1.32 {d4,d5,d6,d7}, [%2]! \n\t"
+ "vmla.f32 q8, q0, q2 \n\t"
+ "vmla.f32 q9, q1, q3 \n\t"
+ "bgt 1b \n\t"
+ "vadd.f32 q8, q8, q9 \n\t"
+ "vpadd.f32 d0, d16, d17 \n\t"
+ "vadd.f32 %0, s0, s1 \n\t"
+ : "=w"(s), "+r"(a), "+r"(b), "+r"(n)
+ :: "q0", "q1", "q2", "q3", "q8", "q9");
+
+ return s;
+
+}
+
+#endif
Added:
gnuradio/branches/developers/balister/arm-configure/gnuradio-core/src/lib/filter/dotprod_fff_armv7_a.h
===================================================================
---
gnuradio/branches/developers/balister/arm-configure/gnuradio-core/src/lib/filter/dotprod_fff_armv7_a.h
(rev 0)
+++
gnuradio/branches/developers/balister/arm-configure/gnuradio-core/src/lib/filter/dotprod_fff_armv7_a.h
2009-07-09 19:09:25 UTC (rev 11402)
@@ -0,0 +1,49 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2008 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+#ifndef INCLUDED_DOTPROD_FFF_ARMV7_A_H
+#define INCLUDED_DOTPROD_FFF_ARMV7_A_H
+
+#include <stddef.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*!
+ * <pre>
+ *
+ * preconditions:
+ *
+ * n > 0 and a multiple of 4
+ * a 4-byte aligned
+ * b 16-byte aligned
+ *
+ * </pre>
+ */
+float
+dotprod_fff_armv7_a(const float *a, const float *b, size_t n);
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* INCLUDED_DOTPROD_FFF_ARMV7_A_H */
Modified:
gnuradio/branches/developers/balister/arm-configure/gnuradio-core/src/lib/filter/gr_cpu.h
===================================================================
---
gnuradio/branches/developers/balister/arm-configure/gnuradio-core/src/lib/filter/gr_cpu.h
2009-07-09 18:33:04 UTC (rev 11401)
+++
gnuradio/branches/developers/balister/arm-configure/gnuradio-core/src/lib/filter/gr_cpu.h
2009-07-09 19:09:25 UTC (rev 11402)
@@ -34,6 +34,7 @@
static bool has_3dnow ();
static bool has_3dnowext ();
static bool has_altivec ();
+ static bool has_armv7_a ();
};
#endif /* _GR_CPU_H_ */
Added:
gnuradio/branches/developers/balister/arm-configure/gnuradio-core/src/lib/filter/gr_cpu_armv7_a.cc
===================================================================
---
gnuradio/branches/developers/balister/arm-configure/gnuradio-core/src/lib/filter/gr_cpu_armv7_a.cc
(rev 0)
+++
gnuradio/branches/developers/balister/arm-configure/gnuradio-core/src/lib/filter/gr_cpu_armv7_a.cc
2009-07-09 19:09:25 UTC (rev 11402)
@@ -0,0 +1,59 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2002, 2008 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include <gr_cpu.h>
+
+bool
+gr_cpu::has_mmx ()
+{
+ return false;
+}
+
+bool
+gr_cpu::has_sse ()
+{
+ return false;
+}
+
+bool
+gr_cpu::has_sse2 ()
+{
+ return false;
+}
+
+bool
+gr_cpu::has_3dnow ()
+{
+ return false;
+}
+
+bool
+gr_cpu::has_3dnowext ()
+{
+ return false;
+}
+
+bool
+gr_cpu::has_armv7_a ()
+{
+ return true;
+}
Modified:
gnuradio/branches/developers/balister/arm-configure/gnuradio-core/src/lib/filter/gr_cpu_x86.cc
===================================================================
---
gnuradio/branches/developers/balister/arm-configure/gnuradio-core/src/lib/filter/gr_cpu_x86.cc
2009-07-09 18:33:04 UTC (rev 11401)
+++
gnuradio/branches/developers/balister/arm-configure/gnuradio-core/src/lib/filter/gr_cpu_x86.cc
2009-07-09 19:09:25 UTC (rev 11402)
@@ -111,3 +111,10 @@
{
return false;
}
+
+bool
+gr_cpu::has_armv7_a ()
+{
+ return false;
+}
+
Added:
gnuradio/branches/developers/balister/arm-configure/gnuradio-core/src/lib/filter/gr_fir_fff_armv7_a.cc
===================================================================
---
gnuradio/branches/developers/balister/arm-configure/gnuradio-core/src/lib/filter/gr_fir_fff_armv7_a.cc
(rev 0)
+++
gnuradio/branches/developers/balister/arm-configure/gnuradio-core/src/lib/filter/gr_fir_fff_armv7_a.cc
2009-07-09 19:09:25 UTC (rev 11402)
@@ -0,0 +1,85 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2008 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <gr_fir_fff_armv7_a.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdexcept>
+#include <assert.h>
+#include <gr_math.h>
+#include <dotprod_fff_armv7_a.h>
+
+#define FLOATS_PER_VEC 8
+
+gr_fir_fff_armv7_a::gr_fir_fff_armv7_a()
+ : gr_fir_fff_generic(),
+ d_naligned_taps(0), d_aligned_taps(0)
+{
+}
+
+gr_fir_fff_armv7_a::gr_fir_fff_armv7_a (const std::vector<float> &new_taps)
+ : gr_fir_fff_generic(new_taps),
+ d_naligned_taps(0), d_aligned_taps(0)
+{
+ set_taps(new_taps);
+}
+
+gr_fir_fff_armv7_a::~gr_fir_fff_armv7_a()
+{
+ if (d_aligned_taps){
+ free(d_aligned_taps);
+ d_aligned_taps = 0;
+ }
+}
+
+void
+gr_fir_fff_armv7_a::set_taps(const std::vector<float> &inew_taps)
+{
+ gr_fir_fff_generic::set_taps(inew_taps); // call superclass
+ d_naligned_taps = gr_p2_round_up(ntaps(), FLOATS_PER_VEC);
+
+ if (d_aligned_taps){
+ free(d_aligned_taps);
+ d_aligned_taps = 0;
+ }
+ void *p;
+ int r = posix_memalign(&p, sizeof(float), d_naligned_taps *
sizeof(d_aligned_taps[0]));
+ if (r != 0){
+ throw std::bad_alloc();
+ }
+ d_aligned_taps = (float *) p;
+ memcpy(d_aligned_taps, &d_taps[0], ntaps() * sizeof(d_aligned_taps[0]));
+ for (size_t i = ntaps(); i < d_naligned_taps; i++)
+ d_aligned_taps[i] = 0.0;
+}
+
+
+float
+gr_fir_fff_armv7_a::filter (const float input[])
+{
+ if (d_naligned_taps == 0)
+ return 0.0;
+
+ return dotprod_fff_armv7_a(input, d_aligned_taps, d_naligned_taps);
+}
Added:
gnuradio/branches/developers/balister/arm-configure/gnuradio-core/src/lib/filter/gr_fir_fff_armv7_a.h
===================================================================
---
gnuradio/branches/developers/balister/arm-configure/gnuradio-core/src/lib/filter/gr_fir_fff_armv7_a.h
(rev 0)
+++
gnuradio/branches/developers/balister/arm-configure/gnuradio-core/src/lib/filter/gr_fir_fff_armv7_a.h
2009-07-09 19:09:25 UTC (rev 11402)
@@ -0,0 +1,45 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2008 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+#ifndef INCLUDED_GR_FIR_FFF_ARMV7_A_H
+#define INCLUDED_GR_FIR_FFF_ARMV7_A_H
+
+#include <gr_fir_fff_generic.h>
+
+/*!
+ * \brief armv7_a using NEON coprocessor version of gr_fir_fff
+ */
+class gr_fir_fff_armv7_a : public gr_fir_fff_generic
+{
+protected:
+
+ size_t d_naligned_taps; // number of taps (multiple of 4)
+ float *d_aligned_taps; // 16-byte aligned, and zero padded to
multiple of 4
+
+public:
+ gr_fir_fff_armv7_a();
+ gr_fir_fff_armv7_a(const std::vector<float> &taps);
+ ~gr_fir_fff_armv7_a();
+
+ virtual void set_taps (const std::vector<float> &taps);
+ virtual float filter (const float input[]);
+};
+
+#endif /* INCLUDED_GR_FIR_FFF_ARMV7_A*_H */
Added:
gnuradio/branches/developers/balister/arm-configure/gnuradio-core/src/lib/filter/gr_fir_sysconfig_armv7_a.cc
===================================================================
---
gnuradio/branches/developers/balister/arm-configure/gnuradio-core/src/lib/filter/gr_fir_sysconfig_armv7_a.cc
(rev 0)
+++
gnuradio/branches/developers/balister/arm-configure/gnuradio-core/src/lib/filter/gr_fir_sysconfig_armv7_a.cc
2009-07-09 19:09:25 UTC (rev 11402)
@@ -0,0 +1,340 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2002,2008 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <gr_fir_sysconfig_armv7_a.h>
+#include <gr_cpu.h>
+
+#include <gr_fir_ccf.h>
+#include <gr_fir_ccf_generic.h>
+//#include <gr_fir_ccf_altivec.h>
+#include <gr_fir_fcc.h>
+#include <gr_fir_fcc_generic.h>
+//#include <gr_fir_fcc_altivec.h>
+#include <gr_fir_fff.h>
+#include <gr_fir_fff_generic.h>
+#include <gr_fir_fff_armv7_a.h>
+#include <gr_fir_fsf.h>
+#include <gr_fir_fsf_generic.h>
+//#include <gr_fir_fsf_powerpc.h>
+#include <gr_fir_ccc.h>
+#include <gr_fir_ccc_generic.h>
+//#include <gr_fir_ccc_altivec.h>
+#include <gr_fir_scc.h>
+#include <gr_fir_scc_generic.h>
+//#include <gr_fir_scc_altivec.h>
+
+#include <iostream>
+using std::cerr;
+
+/*
+ * ----------------------------------------------------------------
+ * static functions that serve as constructors...
+ * ----------------------------------------------------------------
+ */
+
+#if 0
+static gr_fir_ccf *
+make_gr_fir_ccf_altivec(const std::vector<float> &taps)
+{
+ return new gr_fir_ccf_altivec(taps);
+}
+
+static gr_fir_fcc *
+make_gr_fir_fcc_altivec(const std::vector<gr_complex> &taps)
+{
+ return new gr_fir_fcc_altivec(taps);
+}
+
+static gr_fir_ccc *
+make_gr_fir_ccc_altivec (const std::vector<gr_complex> &taps)
+{
+ return new gr_fir_ccc_altivec (taps);
+}
+#endif
+
+static gr_fir_fff *
+make_gr_fir_fff_armv7_a (const std::vector<float> &taps)
+{
+ return new gr_fir_fff_armv7_a (taps);
+}
+
+#if 0
+static gr_fir_fsf *
+make_gr_fir_fsf_altivec (const std::vector<float> &taps)
+{
+ return new gr_fir_fsf_altivec (taps);
+}
+
+static gr_fir_scc *
+make_gr_fir_scc_altivec(const std::vector<gr_complex> &taps)
+{
+ return new gr_fir_scc_altivec(taps);
+}
+#endif
+
+/*
+ * ----------------------------------------------------------------
+ * Return instances of the fastest powerpc versions of these classes.
+ *
+ * check CPUID, if has altivec, return altivec version,
+ * else return generic version.
+ * ----------------------------------------------------------------
+ */
+
+gr_fir_ccf *
+gr_fir_sysconfig_armv7_a::create_gr_fir_ccf (const std::vector<float> &taps)
+{
+ static bool first = true;
+
+#if 0
+ if (gr_cpu::has_altivec ()){
+ if (first){
+ cerr << ">>> gr_fir_ccf: using altivec\n";
+ first = false;
+ }
+ return make_gr_fir_ccf_altivec (taps);
+ }
+#endif
+
+ if (0 && first){
+ cerr << ">>> gr_fir_ccf: handing off to parent class\n";
+ first = false;
+ }
+ return gr_fir_sysconfig_generic::create_gr_fir_ccf (taps);
+}
+
+gr_fir_fcc *
+gr_fir_sysconfig_armv7_a::create_gr_fir_fcc (const std::vector<gr_complex>
&taps)
+{
+ static bool first = true;
+
+#if 0
+ if (gr_cpu::has_altivec ()){
+ if (first){
+ cerr << ">>> gr_fir_fcc: using altivec\n";
+ first = false;
+ }
+ return make_gr_fir_fcc_altivec (taps);
+ }
+#endif
+
+ if (0 && first){
+ cerr << ">>> gr_fir_fcc: handing off to parent class\n";
+ first = false;
+ }
+ return gr_fir_sysconfig_generic::create_gr_fir_fcc (taps);
+}
+
+gr_fir_ccc *
+gr_fir_sysconfig_armv7_a::create_gr_fir_ccc (const std::vector<gr_complex>
&taps)
+{
+ static bool first = true;
+
+#if 0
+ if (gr_cpu::has_altivec ()){
+ if (first){
+ cerr << ">>> gr_fir_ccc: using altivec\n";
+ first = false;
+ }
+ return make_gr_fir_ccc_altivec (taps);
+ }
+#endif
+
+ if (0 && first){
+ cerr << ">>> gr_fir_ccc: handing off to parent class\n";
+ first = false;
+ }
+ return gr_fir_sysconfig_generic::create_gr_fir_ccc (taps);
+}
+
+gr_fir_fff *
+gr_fir_sysconfig_armv7_a::create_gr_fir_fff (const std::vector<float> &taps)
+{
+ static bool first = true;
+
+ if (gr_cpu::has_armv7_a ()){
+ if (first){
+ cerr << ">>> gr_fir_fff: using armv7_a\n";
+ first = false;
+ }
+ return make_gr_fir_fff_armv7_a (taps);
+ }
+
+ if (0 && first){
+ cerr << ">>> gr_fir_fff: handing off to parent class\n";
+ first = false;
+ }
+ return gr_fir_sysconfig_generic::create_gr_fir_fff (taps);
+}
+
+gr_fir_fsf *
+gr_fir_sysconfig_armv7_a::create_gr_fir_fsf (const std::vector<float> &taps)
+{
+ static bool first = true;
+
+#if 0
+ if (gr_cpu::has_altivec ()){
+ if (first){
+ cerr << ">>> gr_fir_fsf: using altivec\n";
+ first = false;
+ }
+ return make_gr_fir_fsf_altivec (taps);
+ }
+#endif
+
+ if (0 && first){
+ cerr << ">>> gr_fir_fsf: handing off to parent class\n";
+ first = false;
+ }
+ return gr_fir_sysconfig_generic::create_gr_fir_fsf (taps);
+}
+
+
+gr_fir_scc *
+gr_fir_sysconfig_armv7_a::create_gr_fir_scc (const std::vector<gr_complex>
&taps)
+{
+ static bool first = true;
+
+#if 0
+ if (gr_cpu::has_altivec ()){
+ if (first){
+ cerr << ">>> gr_fir_scc: using altivec\n";
+ first = false;
+ }
+ return make_gr_fir_scc_altivec (taps);
+ }
+#endif
+
+ if (0 && first){
+ cerr << ">>> gr_fir_scc: handing off to parent class\n";
+ first = false;
+ }
+ return gr_fir_sysconfig_generic::create_gr_fir_scc (taps);
+}
+
+/*
+ * ----------------------------------------------------------------
+ * Return info about available implementations
+ * ----------------------------------------------------------------
+ */
+
+void
+gr_fir_sysconfig_armv7_a::get_gr_fir_ccf_info (std::vector<gr_fir_ccf_info>
*info)
+{
+ // invoke parent..
+ gr_fir_sysconfig_generic::get_gr_fir_ccf_info (info);
+
+#if 0
+ // add our stuff...
+ gr_fir_ccf_info t;
+ if (gr_cpu::has_altivec ()){
+ t.name = "altivec";
+ t.create = make_gr_fir_ccf_altivec;
+ (*info).push_back (t);
+ }
+#endif
+}
+
+void
+gr_fir_sysconfig_armv7_a::get_gr_fir_fcc_info (std::vector<gr_fir_fcc_info>
*info)
+{
+ // invoke parent..
+ gr_fir_sysconfig_generic::get_gr_fir_fcc_info (info);
+
+#if 0
+ // add our stuff...
+ gr_fir_fcc_info t;
+ if (gr_cpu::has_altivec ()){
+ t.name = "altivec";
+ t.create = make_gr_fir_fcc_altivec;
+ (*info).push_back (t);
+ }
+#endif
+}
+
+void
+gr_fir_sysconfig_armv7_a::get_gr_fir_ccc_info (std::vector<gr_fir_ccc_info>
*info)
+{
+ // invoke parent..
+ gr_fir_sysconfig_generic::get_gr_fir_ccc_info (info);
+
+#if 0
+ // add our stuff...
+ gr_fir_ccc_info t;
+ if (gr_cpu::has_altivec ()){
+ t.name = "altivec";
+ t.create = make_gr_fir_ccc_altivec;
+ (*info).push_back (t);
+ }
+#endif
+}
+
+void
+gr_fir_sysconfig_armv7_a::get_gr_fir_fff_info (std::vector<gr_fir_fff_info>
*info)
+{
+ // invoke parent..
+ gr_fir_sysconfig_generic::get_gr_fir_fff_info (info);
+
+ // add our stuff...
+ gr_fir_fff_info t;
+ if (gr_cpu::has_armv7_a ()){
+ t.name = "armv7_a";
+ t.create = make_gr_fir_fff_armv7_a;
+ (*info).push_back (t);
+ }
+}
+
+void
+gr_fir_sysconfig_armv7_a::get_gr_fir_fsf_info (std::vector<gr_fir_fsf_info>
*info)
+{
+ // invoke parent..
+ gr_fir_sysconfig_generic::get_gr_fir_fsf_info (info);
+
+#if 0
+ // add our stuff...
+ gr_fir_fsf_info t;
+ if (gr_cpu::has_altivec ()){
+ t.name = "altivec";
+ t.create = make_gr_fir_fsf_altivec;
+ (*info).push_back (t);
+ }
+#endif
+}
+
+void
+gr_fir_sysconfig_armv7_a::get_gr_fir_scc_info (std::vector<gr_fir_scc_info>
*info)
+{
+ // invoke parent..
+ gr_fir_sysconfig_generic::get_gr_fir_scc_info (info);
+
+#if 0
+ // add our stuff...
+ gr_fir_scc_info t;
+ if (gr_cpu::has_altivec ()){
+ t.name = "altivec";
+ t.create = make_gr_fir_scc_altivec;
+ (*info).push_back (t);
+ }
+#endif
+}
Added:
gnuradio/branches/developers/balister/arm-configure/gnuradio-core/src/lib/filter/gr_fir_sysconfig_armv7_a.h
===================================================================
---
gnuradio/branches/developers/balister/arm-configure/gnuradio-core/src/lib/filter/gr_fir_sysconfig_armv7_a.h
(rev 0)
+++
gnuradio/branches/developers/balister/arm-configure/gnuradio-core/src/lib/filter/gr_fir_sysconfig_armv7_a.h
2009-07-09 19:09:25 UTC (rev 11402)
@@ -0,0 +1,46 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2002,2008 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+#ifndef INCLUDED_GR_FIR_SYSCONFIG_ARMV7_A_H
+#define INCLUDED_GR_FIR_SYSCONFIG_ARMV7_A_H
+
+#include <gr_fir_sysconfig_generic.h>
+
+class gr_fir_sysconfig_armv7_a : public gr_fir_sysconfig_generic {
+public:
+ virtual gr_fir_ccf *create_gr_fir_ccf (const std::vector<float> &taps);
+ virtual gr_fir_fcc *create_gr_fir_fcc (const std::vector<gr_complex> &taps);
+ virtual gr_fir_fff *create_gr_fir_fff (const std::vector<float> &taps);
+ virtual gr_fir_fsf *create_gr_fir_fsf (const std::vector<float> &taps);
+ virtual gr_fir_scc *create_gr_fir_scc (const std::vector<gr_complex> &taps);
+ virtual gr_fir_ccc *create_gr_fir_ccc (const std::vector<gr_complex> &taps);
+//virtual gr_fir_sss *create_gr_fir_sss (const std::vector<short> &taps);
+
+ virtual void get_gr_fir_ccf_info (std::vector<gr_fir_ccf_info> *info);
+ virtual void get_gr_fir_fcc_info (std::vector<gr_fir_fcc_info> *info);
+ virtual void get_gr_fir_fff_info (std::vector<gr_fir_fff_info> *info);
+ virtual void get_gr_fir_fsf_info (std::vector<gr_fir_fsf_info> *info);
+ virtual void get_gr_fir_scc_info (std::vector<gr_fir_scc_info> *info);
+ virtual void get_gr_fir_ccc_info (std::vector<gr_fir_ccc_info> *info);
+//virtual void get_gr_fir_sss_info (std::vector<gr_fir_sss_info> *info);
+};
+
+#endif
Added:
gnuradio/branches/developers/balister/arm-configure/gnuradio-core/src/lib/filter/qa_dotprod_armv7_a.cc
===================================================================
---
gnuradio/branches/developers/balister/arm-configure/gnuradio-core/src/lib/filter/qa_dotprod_armv7_a.cc
(rev 0)
+++
gnuradio/branches/developers/balister/arm-configure/gnuradio-core/src/lib/filter/qa_dotprod_armv7_a.cc
2009-07-09 19:09:25 UTC (rev 11402)
@@ -0,0 +1,32 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2003 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+#include "qa_dotprod.h"
+
+CppUnit::TestSuite *
+qa_dotprod_suite ()
+{
+ CppUnit::TestSuite *s = new CppUnit::TestSuite ("dotprod");
+
+ // empty test suite
+
+ return s;
+}
Added:
gnuradio/branches/developers/balister/arm-configure/gnuradio-core/src/lib/filter/sysconfig_armv7_a.cc
===================================================================
---
gnuradio/branches/developers/balister/arm-configure/gnuradio-core/src/lib/filter/sysconfig_armv7_a.cc
(rev 0)
+++
gnuradio/branches/developers/balister/arm-configure/gnuradio-core/src/lib/filter/sysconfig_armv7_a.cc
2009-07-09 19:09:25 UTC (rev 11402)
@@ -0,0 +1,38 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2002,2008 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <gr_fir_sysconfig_armv7_a.h>
+
+gr_fir_sysconfig *
+gr_fir_sysconfig_singleton ()
+{
+ static gr_fir_sysconfig *singleton = 0;
+
+ if (singleton)
+ return singleton;
+
+ singleton = new gr_fir_sysconfig_armv7_a ();
+ return singleton;
+}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r11402 - gnuradio/branches/developers/balister/arm-configure/gnuradio-core/src/lib/filter,
balister <=