Merge branch 'volk_rename' into next

Conflicts:
	volk/include/volk/Makefile.am
	volk/lib/Makefile.am
	volk/lib/qa_volk.cc

1 files changed, 0 insertions, 61 deletions

diff --git a/volk/lib/qa_32s_convert_32f_aligned16.cc b/volk/lib/qa_32s_convert_32f_aligned16.cc
deleted file mode 100644
index 07d799809..000000000
--- a/volk/lib/qa_32s_convert_32f_aligned16.cc
+++ /dev/null
@@ -1,61 +0,0 @@
-#include <volk/volk.h>
-#include <qa_32s_convert_32f_aligned16.h>
-#include <volk/volk_32s_convert_32f_aligned16.h>
-#include <cstdlib>
-#include <ctime>
-
-//test for sse2
-
-#ifndef LV_HAVE_SSE2
-
-void qa_32s_convert_32f_aligned16::t1() {
-  printf("sse2 not available... no test performed\n");
-}
-
-#else
-
-void qa_32s_convert_32f_aligned16::t1() {
-  volk_environment_init();
-  clock_t start, end;
-  double total;
-  const int vlen = 3201;
-  const int ITERS = 100000;
-
-  int32_t input0[vlen] __attribute__ ((aligned (16)));
-  
-  float output_generic[vlen] __attribute__ ((aligned (16)));
-  float output_sse2[vlen] __attribute__ ((aligned (16)));
-
-  for(int i = 0; i < vlen; ++i) {   
-    input0[i] = ((int32_t)(((float) (rand() - (RAND_MAX/2))) / static_cast<float>((RAND_MAX/2)) * 32768.0));
-  }
-  printf("32s_convert_32f_aligned\n");
-
-  start = clock();
-  for(int count = 0; count < ITERS; ++count) {
-    volk_32s_convert_32f_aligned16_manual(output_generic, input0, 32768.0, vlen, "generic");
-  }
-  end = clock();
-  total = (double)(end-start)/(double)CLOCKS_PER_SEC;
-  printf("generic_time: %f\n", total);
-
-  start = clock();
-  for(int count = 0; count < ITERS; ++count) {
-    volk_32s_convert_32f_aligned16_manual(output_sse2, input0, 32768.0, vlen, "sse2");
-  }
-  end = clock();
-  total = (double)(end-start)/(double)CLOCKS_PER_SEC;
-  printf("sse2_time: %f\n", total);
-
-  for(int i = 0; i < 1; ++i) {
-    //printf("inputs: %d, %d\n", input0[i*2], input0[i*2 + 1]);
-    //printf("generic... %d, ssse3... %d\n", output0[i], output1[i]);
-  }
-  
-  for(int i = 0; i < vlen; ++i) {
-    //printf("%d...%d\n", output0[i], output01[i]);
-    CPPUNIT_ASSERT_EQUAL(output_generic[i], output_sse2[i]);
-  }
-}
-
-#endif