[Commit-gnuradio] r8970 - gnuradio/branches/developers/eb/vmx/gnuradio-core/src/lib/filter

[eb]

Author: eb
Date: 2008-07-21 21:57:22 -0600 (Mon, 21 Jul 2008)
New Revision: 8970

Modified:
   gnuradio/branches/developers/eb/vmx/gnuradio-core/src/lib/filter/gr_cpu.h
   
gnuradio/branches/developers/eb/vmx/gnuradio-core/src/lib/filter/gr_cpu_powerpc.cc
   
gnuradio/branches/developers/eb/vmx/gnuradio-core/src/lib/filter/gr_cpu_x86.cc
   
gnuradio/branches/developers/eb/vmx/gnuradio-core/src/lib/filter/gr_fir_fff_altivec.cc
   
gnuradio/branches/developers/eb/vmx/gnuradio-core/src/lib/filter/gr_fir_fff_altivec.h
   
gnuradio/branches/developers/eb/vmx/gnuradio-core/src/lib/filter/gr_fir_sysconfig_powerpc.cc
Log:
s/vmx/altivec/g

Modified: 
gnuradio/branches/developers/eb/vmx/gnuradio-core/src/lib/filter/gr_cpu.h
===================================================================
--- gnuradio/branches/developers/eb/vmx/gnuradio-core/src/lib/filter/gr_cpu.h   
2008-07-22 03:48:26 UTC (rev 8969)
+++ gnuradio/branches/developers/eb/vmx/gnuradio-core/src/lib/filter/gr_cpu.h   
2008-07-22 03:57:22 UTC (rev 8970)
@@ -29,7 +29,7 @@
   static bool has_sse2 ();
   static bool has_3dnow ();
   static bool has_3dnowext ();
-  static bool has_vmx ();
+  static bool has_altivec ();
 };
 
 #endif /* _GR_CPU_H_ */

Modified: 
gnuradio/branches/developers/eb/vmx/gnuradio-core/src/lib/filter/gr_cpu_powerpc.cc
===================================================================
--- 
gnuradio/branches/developers/eb/vmx/gnuradio-core/src/lib/filter/gr_cpu_powerpc.cc
  2008-07-22 03:48:26 UTC (rev 8969)
+++ 
gnuradio/branches/developers/eb/vmx/gnuradio-core/src/lib/filter/gr_cpu_powerpc.cc
  2008-07-22 03:57:22 UTC (rev 8970)
@@ -53,7 +53,7 @@
 }
 
 bool
-gr_cpu::has_vmx ()
+gr_cpu::has_altivec ()
 {
   return true;         // FIXME assume we've always got it
 }

Modified: 
gnuradio/branches/developers/eb/vmx/gnuradio-core/src/lib/filter/gr_cpu_x86.cc
===================================================================
--- 
gnuradio/branches/developers/eb/vmx/gnuradio-core/src/lib/filter/gr_cpu_x86.cc  
    2008-07-22 03:48:26 UTC (rev 8969)
+++ 
gnuradio/branches/developers/eb/vmx/gnuradio-core/src/lib/filter/gr_cpu_x86.cc  
    2008-07-22 03:57:22 UTC (rev 8970)
@@ -107,7 +107,7 @@
 }
 
 bool
-gr_cpu::has_vmx ()
+gr_cpu::has_altivec ()
 {
   return false;
 }

Modified: 
gnuradio/branches/developers/eb/vmx/gnuradio-core/src/lib/filter/gr_fir_fff_altivec.cc
===================================================================
--- 
gnuradio/branches/developers/eb/vmx/gnuradio-core/src/lib/filter/gr_fir_fff_altivec.cc
      2008-07-22 03:48:26 UTC (rev 8969)
+++ 
gnuradio/branches/developers/eb/vmx/gnuradio-core/src/lib/filter/gr_fir_fff_altivec.cc
      2008-07-22 03:57:22 UTC (rev 8970)
@@ -34,7 +34,7 @@
 #if 0
 
 float
-dotprod_fff_vmx(const float *a, const float *b, size_t n)
+dotprod_fff_altivec(const float *a, const float *b, size_t n)
 {
   float        sum = 0;
   for (size_t i = 0; i < n; i++){
@@ -52,7 +52,7 @@
  *    b  16-byte aligned
  */
 float
-dotprod_fff_vmx(const float *_a, const float *_b, size_t n)
+dotprod_fff_altivec(const float *_a, const float *_b, size_t n)
 {
   const vector float *a = (const vector float *) _a;
   const vector float *b = (const vector float *) _b;
@@ -159,20 +159,20 @@
 #endif
 }
 
-gr_fir_fff_vmx::gr_fir_fff_vmx()
+gr_fir_fff_altivec::gr_fir_fff_altivec()
   : gr_fir_fff_generic(),
     d_naligned_taps(0), d_aligned_taps(0)
 {
 }
 
-gr_fir_fff_vmx::gr_fir_fff_vmx (const std::vector<float> &new_taps)
+gr_fir_fff_altivec::gr_fir_fff_altivec (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_vmx::~gr_fir_fff_vmx()
+gr_fir_fff_altivec::~gr_fir_fff_altivec()
 {
   if (d_aligned_taps){
     free(d_aligned_taps);
@@ -181,7 +181,7 @@
 }
 
 void
-gr_fir_fff_vmx::set_taps(const std::vector<float> &inew_taps)
+gr_fir_fff_altivec::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);
@@ -203,10 +203,10 @@
 
 
 float 
-gr_fir_fff_vmx::filter (const float input[])
+gr_fir_fff_altivec::filter (const float input[])
 {
   if (d_naligned_taps == 0)
     return 0.0;
   
-  return dotprod_fff_vmx(input, d_aligned_taps, d_naligned_taps);
+  return dotprod_fff_altivec(input, d_aligned_taps, d_naligned_taps);
 }

Modified: 
gnuradio/branches/developers/eb/vmx/gnuradio-core/src/lib/filter/gr_fir_fff_altivec.h
===================================================================
--- 
gnuradio/branches/developers/eb/vmx/gnuradio-core/src/lib/filter/gr_fir_fff_altivec.h
       2008-07-22 03:48:26 UTC (rev 8969)
+++ 
gnuradio/branches/developers/eb/vmx/gnuradio-core/src/lib/filter/gr_fir_fff_altivec.h
       2008-07-22 03:57:22 UTC (rev 8970)
@@ -18,15 +18,15 @@
  * 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_VMX_H
-#define INCLUDED_GR_FIR_FFF_VMX_H
+#ifndef INCLUDED_GR_FIR_FFF_ALTIVEC_H
+#define INCLUDED_GR_FIR_FFF_ALTIVEC_H
 
 #include <gr_fir_fff_generic.h>
 
 /*!
- * \brief VMX version of gr_fir_fff
+ * \brief altivec version of gr_fir_fff
  */
-class gr_fir_fff_vmx : public gr_fir_fff_generic
+class gr_fir_fff_altivec : public gr_fir_fff_generic
 {
 protected:
 
@@ -34,12 +34,12 @@
   float           *d_aligned_taps;   // 16-byte aligned, and zero padded to 
multiple of 4
 
 public:
-  gr_fir_fff_vmx();
-  gr_fir_fff_vmx(const std::vector<float> &taps);
-  ~gr_fir_fff_vmx();
+  gr_fir_fff_altivec();
+  gr_fir_fff_altivec(const std::vector<float> &taps);
+  ~gr_fir_fff_altivec();
 
   virtual void set_taps (const std::vector<float> &taps);
   virtual float filter (const float input[]);
 };
 
-#endif /* INCLUDED_GR_FIR_FFF_VMX_H */
+#endif /* INCLUDED_GR_FIR_FFF_ALTIVEC_H */

Modified: 
gnuradio/branches/developers/eb/vmx/gnuradio-core/src/lib/filter/gr_fir_sysconfig_powerpc.cc
===================================================================
--- 
gnuradio/branches/developers/eb/vmx/gnuradio-core/src/lib/filter/gr_fir_sysconfig_powerpc.cc
        2008-07-22 03:48:26 UTC (rev 8969)
+++ 
gnuradio/branches/developers/eb/vmx/gnuradio-core/src/lib/filter/gr_fir_sysconfig_powerpc.cc
        2008-07-22 03:57:22 UTC (rev 8970)
@@ -27,10 +27,10 @@
 
 #include <gr_fir_ccf.h>
 #include <gr_fir_ccf_generic.h>
-//#include <gr_fir_ccf_vmx.h>
+//#include <gr_fir_ccf_altivec.h>
 #include <gr_fir_fcc.h>
 #include <gr_fir_fcc_generic.h>
-//#include <gr_fir_fcc_vmx.h>
+//#include <gr_fir_fcc_altivec.h>
 #include <gr_fir_fff.h>
 #include <gr_fir_fff_generic.h>
 #include <gr_fir_fff_altivec.h>
@@ -39,10 +39,10 @@
 //#include <gr_fir_fsf_powerpc.h>
 #include <gr_fir_ccc.h>
 #include <gr_fir_ccc_generic.h>
-//#include <gr_fir_ccc_vmx.h>
+//#include <gr_fir_ccc_altivec.h>
 #include <gr_fir_scc.h>
 #include <gr_fir_scc_generic.h>
-//#include <gr_fir_scc_vmx.h>
+//#include <gr_fir_scc_altivec.h>
 
 #include <iostream>
 using std::cerr;
@@ -55,41 +55,41 @@
 
 #if 0
 static gr_fir_ccf *
-make_gr_fir_ccf_vmx(const std::vector<float> &taps)
+make_gr_fir_ccf_altivec(const std::vector<float> &taps)
 {
-  return new gr_fir_ccf_vmx(taps);
+  return new gr_fir_ccf_altivec(taps);
 }
 
 static gr_fir_fcc *
-make_gr_fir_fcc_vmx(const std::vector<gr_complex> &taps)
+make_gr_fir_fcc_altivec(const std::vector<gr_complex> &taps)
 {
-  return new gr_fir_fcc_vmx(taps);
+  return new gr_fir_fcc_altivec(taps);
 }
 
 static gr_fir_ccc *
-make_gr_fir_ccc_vmx (const std::vector<gr_complex> &taps)
+make_gr_fir_ccc_altivec (const std::vector<gr_complex> &taps)
 {
-  return new gr_fir_ccc_vmx (taps);
+  return new gr_fir_ccc_altivec (taps);
 }
 #endif
 
 static gr_fir_fff *
-make_gr_fir_fff_vmx (const std::vector<float> &taps)
+make_gr_fir_fff_altivec (const std::vector<float> &taps)
 {
-  return new gr_fir_fff_vmx (taps);
+  return new gr_fir_fff_altivec (taps);
 }
 
 #if 0
 static gr_fir_fsf *
-make_gr_fir_fsf_vmx (const std::vector<float> &taps)
+make_gr_fir_fsf_altivec (const std::vector<float> &taps)
 {
-  return new gr_fir_fsf_vmx (taps);
+  return new gr_fir_fsf_altivec (taps);
 }
 
 static gr_fir_scc *
-make_gr_fir_scc_vmx(const std::vector<gr_complex> &taps)
+make_gr_fir_scc_altivec(const std::vector<gr_complex> &taps)
 {
-  return new gr_fir_scc_vmx(taps);
+  return new gr_fir_scc_altivec(taps);
 }
 #endif
 
@@ -97,7 +97,7 @@
  * ----------------------------------------------------------------
  * Return instances of the fastest powerpc versions of these classes.
  *
- * check CPUID, if has VMX, return VMX version,
+ * check CPUID, if has altivec, return altivec version,
  *             else return generic version.
  * ----------------------------------------------------------------
  */
@@ -108,16 +108,16 @@
   static bool first = true;
 
 #if 0
-  if (gr_cpu::has_vmx ()){
+  if (gr_cpu::has_altivec ()){
     if (first){
-      cerr << ">>> gr_fir_ccf: using VMX\n";
+      cerr << ">>> gr_fir_ccf: using altivec\n";
       first = false;
     }
-    return make_gr_fir_ccf_vmx (taps);
+    return make_gr_fir_ccf_altivec (taps);
   }
 #endif
 
-  if (first){
+  if (0 && first){
     cerr << ">>> gr_fir_ccf: handing off to parent class\n";
     first = false;
   }
@@ -130,16 +130,16 @@
   static bool first = true;
 
 #if 0
-  if (gr_cpu::has_vmx ()){
+  if (gr_cpu::has_altivec ()){
     if (first){
-      cerr << ">>> gr_fir_fcc: using VMX\n";
+      cerr << ">>> gr_fir_fcc: using altivec\n";
       first = false;
     }
-    return make_gr_fir_fcc_vmx (taps);
+    return make_gr_fir_fcc_altivec (taps);
   }
 #endif
 
-  if (first){
+  if (0 && first){
     cerr << ">>> gr_fir_fcc: handing off to parent class\n";
     first = false;
   }
@@ -152,16 +152,16 @@
   static bool first = true;
 
 #if 0
-  if (gr_cpu::has_vmx ()){
+  if (gr_cpu::has_altivec ()){
     if (first){
-      cerr << ">>> gr_fir_ccc: using VMX\n";
+      cerr << ">>> gr_fir_ccc: using altivec\n";
       first = false;
     }
-    return make_gr_fir_ccc_vmx (taps);
+    return make_gr_fir_ccc_altivec (taps);
   }
 #endif
   
-  if (first){
+  if (0 && first){
     cerr << ">>> gr_fir_ccc: handing off to parent class\n";
     first = false;
   }
@@ -173,15 +173,15 @@
 {
   static bool first = true;
 
-  if (gr_cpu::has_vmx ()){
+  if (gr_cpu::has_altivec ()){
     if (first){
-      cerr << ">>> gr_fir_fff: using VMX\n";
+      cerr << ">>> gr_fir_fff: using altivec\n";
       first = false;
     }
-    return make_gr_fir_fff_vmx (taps);
+    return make_gr_fir_fff_altivec (taps);
   }
   
-  if (first){
+  if (0 && first){
     cerr << ">>> gr_fir_fff: handing off to parent class\n";
     first = false;
   }
@@ -194,16 +194,16 @@
   static bool first = true;
 
 #if 0
-  if (gr_cpu::has_vmx ()){
+  if (gr_cpu::has_altivec ()){
     if (first){
-      cerr << ">>> gr_fir_fsf: using VMX\n";
+      cerr << ">>> gr_fir_fsf: using altivec\n";
       first = false;
     }
-    return make_gr_fir_fsf_vmx (taps);
+    return make_gr_fir_fsf_altivec (taps);
   }
 #endif
   
-  if (first){
+  if (0 && first){
     cerr << ">>> gr_fir_fsf: handing off to parent class\n";
     first = false;
   }
@@ -217,16 +217,16 @@
   static bool first = true;
 
 #if 0
-  if (gr_cpu::has_vmx ()){
+  if (gr_cpu::has_altivec ()){
     if (first){
-      cerr << ">>> gr_fir_scc: using VMX\n";
+      cerr << ">>> gr_fir_scc: using altivec\n";
       first = false;
     }
-    return make_gr_fir_scc_vmx (taps);
+    return make_gr_fir_scc_altivec (taps);
   }
 #endif
 
-  if (first){
+  if (0 && first){
     cerr << ">>> gr_fir_scc: handing off to parent class\n";
     first = false;
   }
@@ -248,9 +248,9 @@
 #if 0  
   // add our stuff...
   gr_fir_ccf_info      t;
-  if (gr_cpu::has_vmx ()){
-    t.name = "VMX";
-    t.create = make_gr_fir_ccf_vmx;
+  if (gr_cpu::has_altivec ()){
+    t.name = "altivec";
+    t.create = make_gr_fir_ccf_altivec;
     (*info).push_back (t);
   }
 #endif
@@ -265,9 +265,9 @@
 #if 0
   // add our stuff...
   gr_fir_fcc_info      t;
-  if (gr_cpu::has_vmx ()){
-    t.name = "VMX";
-    t.create = make_gr_fir_fcc_vmx;
+  if (gr_cpu::has_altivec ()){
+    t.name = "altivec";
+    t.create = make_gr_fir_fcc_altivec;
     (*info).push_back (t);
   }
 #endif
@@ -282,9 +282,9 @@
 #if 0
   // add our stuff...
   gr_fir_ccc_info      t;
-  if (gr_cpu::has_vmx ()){
-    t.name = "VMX";
-    t.create = make_gr_fir_ccc_vmx;
+  if (gr_cpu::has_altivec ()){
+    t.name = "altivec";
+    t.create = make_gr_fir_ccc_altivec;
     (*info).push_back (t);
   }
 #endif
@@ -298,9 +298,9 @@
 
   // add our stuff...
   gr_fir_fff_info      t;
-  if (gr_cpu::has_vmx ()){
-    t.name = "VMX";
-    t.create = make_gr_fir_fff_vmx;
+  if (gr_cpu::has_altivec ()){
+    t.name = "altivec";
+    t.create = make_gr_fir_fff_altivec;
     (*info).push_back (t);
   }
 }
@@ -314,9 +314,9 @@
 #if 0
   // add our stuff...
   gr_fir_fsf_info      t;
-  if (gr_cpu::has_vmx ()){
-    t.name = "VMX";
-    t.create = make_gr_fir_fsf_vmx;
+  if (gr_cpu::has_altivec ()){
+    t.name = "altivec";
+    t.create = make_gr_fir_fsf_altivec;
     (*info).push_back (t);
   }
 #endif
@@ -331,9 +331,9 @@
 #if 0
   // add our stuff...
   gr_fir_scc_info      t;
-  if (gr_cpu::has_vmx ()){
-    t.name = "VMX";
-    t.create = make_gr_fir_scc_vmx;
+  if (gr_cpu::has_altivec ()){
+    t.name = "altivec";
+    t.create = make_gr_fir_scc_altivec;
     (*info).push_back (t);
   }
 #endif