volk: missing updates for volk qa and profile from last checkin.

author: Nicholas McCarthy <namccart@gmail.com> 2014-03-27 10:36:26 -0700
committer: Tom Rondeau <tom@trondeau.com> 2014-05-17 17:45:12 -0400
commit: 3bb2c431a547baf97548ec86f89b7a3a770df2cc (patch)
tree: 2ff1a240f009f9bef7888c333a732c1fd38284dd
parent: 2bcd2fe1eaf8070bb6c276ce9992e344034d89e7 (diff)
3 files changed, 80 insertions, 38 deletions
diff --git a/volk/apps/volk_profile.cc b/volk/apps/volk_profile.cc
index 97b0a5b7a8..613e34767d 100644
--- a/volk/apps/volk_profile.cc
+++ b/volk/apps/volk_profile.cc
@@ -1,3 +1,25 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012-2014 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_utils.h"
 
 #include <volk/volk.h>
@@ -67,6 +89,7 @@ int main(int argc, char *argv[]) {
 
     //VOLK_PROFILE(volk_16i_x5_add_quad_16i_x4, 1e-4, 2046, 10000, &results, benchmark_mode, kernel_regex);
     //VOLK_PROFILE(volk_16i_branch_4_state_8, 1e-4, 2046, 10000, &results, benchmark_mode, kernel_regex);
+    VOLK_PUPPET_PROFILE(volk_8u_conv_k7_r2puppet_8u, volk_8u_x4_conv_k7_r2_8u, 0, 0, 2060, 10000, &results, benchmark_mode, kernel_regex);
     VOLK_PUPPET_PROFILE(volk_32fc_s32fc_rotatorpuppet_32fc, volk_32fc_s32fc_x2_rotator_32fc, 1e-2, (lv_32fc_t)lv_cmake(0.953939201, 0.3), 20462, 10000, &results, benchmark_mode, kernel_regex);
     VOLK_PROFILE(volk_16ic_s32f_deinterleave_real_32f, 1e-5, 32768.0, 204602, 10000, &results, benchmark_mode, kernel_regex);
     VOLK_PROFILE(volk_16ic_deinterleave_real_8i, 0, 0, 204602, 10000, &results, benchmark_mode, kernel_regex);
diff --git a/volk/kernels/volk/volk_8u_conv_k7_r2puppet_8u.h b/volk/kernels/volk/volk_8u_conv_k7_r2puppet_8u.h
index 21e1ec0ce9..fef9db5de8 100644
--- a/volk/kernels/volk/volk_8u_conv_k7_r2puppet_8u.h
+++ b/volk/kernels/volk/volk_8u_conv_k7_r2puppet_8u.h
@@ -1,10 +1,8 @@
 #ifndef INCLUDED_volk_8u_conv_k7_r2puppet_8u_H
 #define INCLUDED_volk_8u_conv_k7_r2puppet_8u_H
 
-
-#include<volk/volk_malloc.h>
-#include<volk/volk_8u_x4_conv_k7_r2_8u.h>
-
+#include <volk/volk.h>
+#include <volk/volk_8u_x4_conv_k7_r2_8u.h>
 
 typedef union {
   //decision_t is a BIT vector
@@ -19,8 +17,6 @@ static inline int parity(int x, unsigned char* Partab)
   return Partab[x];
 }
 
-
-
 static inline int chainback_viterbi(unsigned char* data,
                                     unsigned int nbits,
                                     unsigned int endstate,
@@ -38,14 +34,14 @@ static inline int chainback_viterbi(unsigned char* data,
   /* Make room beyond the end of the encoder register so we can
    * accumulate a full byte of decoded data
    */
-  
+
   endstate = (endstate%d_numstates) << d_ADDSHIFT;
-  
+
   /* The store into data[] only needs to be done every 8 bits.
    * But this avoids a conditional branch, and the writes will
    * combine in the cache anyway
    */
-  
+
   d += tailsize * d_decision_t_size ; /* Look past tail */
   int retval;
   int dif = tailsize - (d_k - 1);
@@ -55,23 +51,23 @@ static inline int chainback_viterbi(unsigned char* data,
     int k;
     dec.t =  &d[nbits * d_decision_t_size];
     k = (dec.w[(endstate>>d_ADDSHIFT)/32] >> ((endstate>>d_ADDSHIFT)%32)) & 1;
-    
+
     endstate = (endstate >> 1) | (k << (d_k-2+d_ADDSHIFT));
     //data[((nbits+dif)%nbits)>>3] = endstate>>d_SUBSHIFT;
     //printf("%d, %d\n", k, (nbits+dif)%d_framebits);
     data[((nbits+dif)%d_framebits)] = k;
-    
+
     retval = endstate;
   }
   nbits += 1;
-  
+
   while(nbits-- != 0) {
     int k;
-    
+
     dec.t = &d[nbits * d_decision_t_size];
-    
+
     k = (dec.w[(endstate>>d_ADDSHIFT)/32] >> ((endstate>>d_ADDSHIFT)%32)) & 1;
-    
+
     endstate = (endstate >> 1) | (k << (d_k-2+d_ADDSHIFT));
     data[((nbits+dif)%d_framebits)] = k;
   }
@@ -106,19 +102,19 @@ static inline void volk_8u_conv_k7_r2puppet_8u_spiral(unsigned char* syms, unsig
   static unsigned int excess = 6;
   static unsigned char* Branchtab;
   static unsigned char Partab[256];
-  
+
   int d_polys[2] = {79, 109};
 
-  
+
   if(once) {
-    
+
     X = (unsigned char*)volk_malloc(2*d_numstates, volk_get_alignment());
     Y = X + d_numstates;
     Branchtab = (unsigned char*)volk_malloc(d_numstates/2*rate, volk_get_alignment());
     D = (unsigned char*)volk_malloc((d_numstates/8) * (framebits + 6), volk_get_alignment());
     int state, i;
     int cnt,ti;
-    
+
     /* Initialize parity lookup table */
     for(i=0;i<256;i++){
       cnt = 0;
@@ -136,15 +132,15 @@ static inline void volk_8u_conv_k7_r2puppet_8u_spiral(unsigned char* syms, unsig
         Branchtab[i*d_numstates/2+state] = (d_polys[i] < 0) ^ parity((2*state) & abs(d_polys[i]), Partab) ? 255 : 0;
       }
     }
-    
+
     once = 0;
   }
 
     //unbias the old_metrics
-  memset(X, 31, d_numstates); 
-  
+  memset(X, 31, d_numstates);
+
   volk_8u_x4_conv_k7_r2_8u_spiral(Y, X, syms, D, framebits/2 - excess, excess, Branchtab);
-  
+
   unsigned int min = X[0];
   int i = 0, state = 0;
   for(i = 0; i < (d_numstates); ++i) {
@@ -153,7 +149,7 @@ static inline void volk_8u_conv_k7_r2puppet_8u_spiral(unsigned char* syms, unsig
       state = i;
     }
   }
-  
+
   chainback_viterbi(dec, framebits/2 -excess, state, excess, D);
 
   return;
@@ -171,7 +167,7 @@ static inline void volk_8u_conv_k7_r2puppet_8u_spiral(unsigned char* syms, unsig
 static inline void volk_8u_conv_k7_r2puppet_8u_generic(unsigned char* syms, unsigned char* dec, unsigned int framebits) {
 
 
-  
+
   static int once = 1;
   int d_numstates = (1 << 6);
   int rate = 2;
@@ -181,20 +177,20 @@ static inline void volk_8u_conv_k7_r2puppet_8u_generic(unsigned char* syms, unsi
   static unsigned int excess = 6;
   static unsigned char* Branchtab;
   static unsigned char Partab[256];
-  
+
   int d_polys[2] = {79, 109};
 
-  
+
   if(once) {
-    
+
     X = (unsigned char*)volk_malloc(2*d_numstates, volk_get_alignment());
     Y = X + d_numstates;
     Branchtab = (unsigned char*)volk_malloc(d_numstates/2*rate, volk_get_alignment());
     D = (unsigned char*)volk_malloc((d_numstates/8) * (framebits + 6), volk_get_alignment());
-     
+
     int state, i;
     int cnt,ti;
-    
+
     /* Initialize parity lookup table */
     for(i=0;i<256;i++){
       cnt = 0;
@@ -212,16 +208,16 @@ static inline void volk_8u_conv_k7_r2puppet_8u_generic(unsigned char* syms, unsi
         Branchtab[i*d_numstates/2+state] = (d_polys[i] < 0) ^ parity((2*state) & abs(d_polys[i]), Partab) ? 255 : 0;
       }
     }
-    
+
     once = 0;
   }
 
 
-  
+
 
     //unbias the old_metrics
-  memset(X, 31, d_numstates); 
-  
+  memset(X, 31, d_numstates);
+
   volk_8u_x4_conv_k7_r2_8u_generic(Y, X, syms, D, framebits/2 - excess, excess, Branchtab);
 
   unsigned int min = X[0];
@@ -232,12 +228,12 @@ static inline void volk_8u_conv_k7_r2puppet_8u_generic(unsigned char* syms, unsi
       state = i;
     }
   }
-  
-  chainback_viterbi(dec, framebits/2 -excess, state, excess, D); 
-  
+
+  chainback_viterbi(dec, framebits/2 -excess, state, excess, D);
+
   return;
 
-  
+
 }
 
 #endif /* LV_HAVE_GENERIC */
diff --git a/volk/lib/testqa.cc b/volk/lib/testqa.cc
index f97a6462e4..f4d63481bd 100644
--- a/volk/lib/testqa.cc
+++ b/volk/lib/testqa.cc
@@ -1,3 +1,25 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012-2014 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_utils.h"
 #include <volk/volk.h>
 #include <boost/test/unit_test.hpp>
@@ -88,4 +110,5 @@ VOLK_RUN_TESTS(volk_32f_x2_multiply_32f, 1e-4, 0, 20462, 1);
 VOLK_RUN_TESTS(volk_32fc_s32fc_multiply_32fc, 1e-4, 0, 20462, 1);
 VOLK_RUN_TESTS(volk_32f_s32f_multiply_32f, 1e-4, 0, 20462, 1);
 VOLK_RUN_TESTS(volk_32fc_s32fc_rotatorpuppet_32fc, 1e-3, (lv_32fc_t)lv_cmake(0.953939201, 0.3), 20462, 1);
+VOLK_RUN_TESTS(volk_8u_conv_k7_r2puppet_8u, 0, 0, 2060, 1);
 VOLK_RUN_TESTS(volk_32f_invsqrt_32f, 1e-2, 0, 20462, 1);
author	Nicholas McCarthy <namccart@gmail.com>	2014-03-27 10:36:26 -0700
committer	Tom Rondeau <tom@trondeau.com>	2014-05-17 17:45:12 -0400
commit	3bb2c431a547baf97548ec86f89b7a3a770df2cc (patch)
tree	2ff1a240f009f9bef7888c333a732c1fd38284dd
parent	2bcd2fe1eaf8070bb6c276ce9992e344034d89e7 (diff)