[Discuss-gnuradio] gr-blocks benchmarks

[Gisle Vanem]

The test programs gr-blocks/tests/benchmark_nco.cc and
benchmark_vco.cc seems outdated. AFAICS, there are no
'nco' and 'fxpt_nco' classes in the namespace 'gr::blocks'.

Shouldn't these be patched like so:

--- a/gr-blocks/tests/benchmark_nco.cc 2015-12-16 21:39:46
+++ b/gr-blocks/tests/benchmark_nco.cc 2016-10-11 15:28:59
@@ -112,7 +112,7 @@

 void basic_sincos_vec(float *x, float *y)
 {
-  gr::blocks::nco<float,float> nco;
+  gr::nco<float,float> nco;

   nco.set_freq(2 * M_PI / FREQ);

@@ -126,7 +126,7 @@

 void native_sincos_vec(float *x, float *y)
 {
-  gr::blocks::nco<float,float> nco;
+  gr::nco<float,float> nco;

   nco.set_freq(2 * M_PI / FREQ);

@@ -137,7 +137,7 @@

 void fxpt_sincos_vec(float *x, float *y)
 {
-  gr::blocks::fxpt_nco nco;
+  gr::fxpt_nco nco;

   nco.set_freq (2 * M_PI / FREQ);

@@ -150,7 +150,7 @@

 void native_sincos(float *x, float *y)
 {
-  gr::blocks::nco<float,float> nco;
+  gr::nco<float,float> nco;

   nco.set_freq(2 * M_PI / FREQ);

@@ -162,7 +162,7 @@

 void fxpt_sincos(float *x, float *y)
 {
-  gr::blocks::fxpt_nco nco;
+  gr::fxpt_nco nco;

   nco.set_freq(2 * M_PI / FREQ);

@@ -176,7 +176,7 @@

 void native_sin(float *x, float *y)
 {
-  gr::blocks::nco<float,float> nco;
+  gr::nco<float,float> nco;

   nco.set_freq(2 * M_PI / FREQ);

@@ -188,7 +188,7 @@

 void fxpt_sin(float *x, float *y)
 {
-  gr::blocks::fxpt_nco nco;
+  gr::fxpt_nco nco;

   nco.set_freq(2 * M_PI / FREQ);

--- a/gr-blocks/tests/benchmark_vco.cc 2015-12-16 21:39:46
+++ b/gr-blocks/tests/benchmark_vco.cc 2016-10-11 15:29:27
@@ -133,7 +133,7 @@

 void native_vco(float *output, const float *input)
 {
-  gr::blocks::vco<float,float> vco;
+  gr::vco<float,float> vco;

   for(int j = 0; j < ITERATIONS/BLOCK_SIZE; j++) {
     vco.cos(output, input, BLOCK_SIZE, K, AMPLITUDE);
@@ -142,7 +142,7 @@

 void fxpt_vco(float *output, const float *input)
 {
-  gr::blocks::fxpt_vco vco;
+  gr::fxpt_vco vco;

   for(int j = 0; j < ITERATIONS/BLOCK_SIZE; j++) {
     vco.cos(output, input, BLOCK_SIZE, K, AMPLITUDE);

------

And BTW. From 'dir *co.h /Bs'
  gnuradio-runtime\include\gnuradio\fxpt_nco.h
  gnuradio-runtime\include\gnuradio\fxpt_vco.h
  gnuradio-runtime\include\gnuradio\nco.h
  gnuradio-runtime\lib\math\vco.h

which puzzles me. Why shouldn't this be:
  gnuradio-runtime\include\gnuradio\fxpt_nco.h
  gnuradio-runtime\include\gnuradio\fxpt_vco.h
  gnuradio-runtime\include\gnuradio\nco.h
  gnuradio-runtime\include\gnuradio\vco.h

-- 
--gv