volk: replace references to __attribute__((aligned... with cross platform macro

This replaces all aligned(16) and aligned(128) (which were incorrect).

Attribute macros are on the left because this makes gcc and ms compilers happy.

8 files changed, 50 insertions, 50 deletions

diff --git a/volk/lib/qa_16s_add_quad_aligned16.cc b/volk/lib/qa_16s_add_quad_aligned16.cc
index 154aa0f17..5d5eb7e18 100644
--- a/volk/lib/qa_16s_add_quad_aligned16.cc
+++ b/volk/lib/qa_16s_add_quad_aligned16.cc
@@ -22,20 +22,20 @@ void qa_16s_add_quad_aligned16::t1() {
   double total;
   const int vlen = 3200;
   const int ITERS = 100000;
-  short input0[vlen] __attribute__ ((aligned (16)));
-  short input1[vlen] __attribute__ ((aligned (16)));
-  short input2[vlen] __attribute__ ((aligned (16)));
-  short input3[vlen] __attribute__ ((aligned (16)));
-  short input4[vlen] __attribute__ ((aligned (16)));
+  __VOLK_ATTR_ALIGNED(16) short input0[vlen];
+  __VOLK_ATTR_ALIGNED(16) short input1[vlen];
+  __VOLK_ATTR_ALIGNED(16) short input2[vlen];
+  __VOLK_ATTR_ALIGNED(16) short input3[vlen];
+  __VOLK_ATTR_ALIGNED(16) short input4[vlen];
   
-  short output0[vlen] __attribute__ ((aligned (16)));
-  short output1[vlen] __attribute__ ((aligned (16)));
-  short output2[vlen] __attribute__ ((aligned (16)));
-  short output3[vlen] __attribute__ ((aligned (16)));
-  short output01[vlen] __attribute__ ((aligned (16)));
-  short output11[vlen] __attribute__ ((aligned (16)));
-  short output21[vlen] __attribute__ ((aligned (16)));
-  short output31[vlen] __attribute__ ((aligned (16)));
+  __VOLK_ATTR_ALIGNED(16) short output0[vlen];
+  __VOLK_ATTR_ALIGNED(16) short output1[vlen];
+  __VOLK_ATTR_ALIGNED(16) short output2[vlen];
+  __VOLK_ATTR_ALIGNED(16) short output3[vlen];
+  __VOLK_ATTR_ALIGNED(16) short output01[vlen];
+  __VOLK_ATTR_ALIGNED(16) short output11[vlen];
+  __VOLK_ATTR_ALIGNED(16) short output21[vlen];
+  __VOLK_ATTR_ALIGNED(16) short output31[vlen];
 
   for(int i = 0; i < vlen; ++i) {
     short plus0 = ((short) (rand() - (RAND_MAX/2))) >> 2;
diff --git a/volk/lib/qa_16s_branch_4_state_8_aligned16.cc b/volk/lib/qa_16s_branch_4_state_8_aligned16.cc
index 62deffaeb..2e6e6a1a0 100644
--- a/volk/lib/qa_16s_branch_4_state_8_aligned16.cc
+++ b/volk/lib/qa_16s_branch_4_state_8_aligned16.cc
@@ -29,22 +29,22 @@ void qa_16s_branch_4_state_8_aligned16::t1() {
   clock_t start, end;
   double total;
   
-  short target[vlen] __attribute__ ((aligned (16)));
-  short target2[vlen] __attribute__ ((aligned (16)));
-  short target3[vlen] __attribute__ ((aligned (16)));
+  __VOLK_ATTR_ALIGNED(16) short target[vlen];
+  __VOLK_ATTR_ALIGNED(16) short target2[vlen];
+  __VOLK_ATTR_ALIGNED(16) short target3[vlen];
   
-  short src0[vlen] __attribute__ ((aligned (16)));
-  short permute_indexes[vlen] __attribute__ ((aligned (16))) =  {
+  __VOLK_ATTR_ALIGNED(16) short src0[vlen];
+  __VOLK_ATTR_ALIGNED(16) short permute_indexes[vlen] =  {
 7, 5, 2, 0, 6, 4, 3, 1, 6, 4, 3, 1, 7, 5, 2, 0, 1, 3, 4, 6, 0, 2, 5, 7, 0, 2, 5, 7, 1, 3, 4, 6 };
-  short cntl0[vlen] __attribute__ ((aligned (16))) = {
+  __VOLK_ATTR_ALIGNED(16) short cntl0[vlen] = {
     0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 };
-  short cntl1[vlen] __attribute__ ((aligned (16))) = {
+  __VOLK_ATTR_ALIGNED(16) short cntl1[vlen] = {
     0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 };
-  short cntl2[vlen] __attribute__ ((aligned (16))) = {
+  __VOLK_ATTR_ALIGNED(16) short cntl2[vlen] = {
     0x0000, 0xffff, 0xffff, 0x0000, 0x0000, 0xffff, 0xffff, 0x0000, 0xffff, 0x0000, 0x0000, 0xffff, 0xffff, 0x0000, 0x0000, 0xffff, 0xffff, 0x0000, 0x0000, 0xffff, 0xffff, 0x0000, 0x0000, 0xffff, 0x0000, 0xffff, 0xffff, 0x0000, 0x0000, 0xffff, 0xffff, 0x0000 };
-  short cntl3[vlen] __attribute__ ((aligned (16))) =  {
+  __VOLK_ATTR_ALIGNED(16) short cntl3[vlen] =  {
     0xffff, 0xffff, 0x0000, 0x0000, 0xffff, 0xffff, 0x0000, 0x0000, 0x0000, 0x0000, 0xffff, 0xffff, 0x0000, 0x0000, 0xffff, 0xffff, 0xffff, 0xffff, 0x0000, 0x0000, 0xffff, 0xffff, 0x0000, 0x0000, 0x0000, 0x0000, 0xffff, 0xffff, 0x0000, 0x0000, 0xffff, 0xffff };
-  short scalars[4] __attribute__ ((aligned (16))) = {1, 2, 3, 4};
+  __VOLK_ATTR_ALIGNED(16) short scalars[4] = {1, 2, 3, 4};
   
   
 
diff --git a/volk/lib/qa_16s_permute_and_scalar_add_aligned16.cc b/volk/lib/qa_16s_permute_and_scalar_add_aligned16.cc
index 819b2256b..3cd4e906d 100644
--- a/volk/lib/qa_16s_permute_and_scalar_add_aligned16.cc
+++ b/volk/lib/qa_16s_permute_and_scalar_add_aligned16.cc
@@ -23,15 +23,15 @@ void qa_16s_permute_and_scalar_add_aligned16::t1() {
   clock_t start, end;
   double total;
   
-  short target[vlen] __attribute__ ((aligned (16)));
-  short target2[vlen] __attribute__ ((aligned (16)));
-  short src0[vlen] __attribute__ ((aligned (16)));
-  short permute_indexes[vlen] __attribute__ ((aligned (16)));
-  short cntl0[vlen] __attribute__ ((aligned (16)));
-  short cntl1[vlen] __attribute__ ((aligned (16)));
-  short cntl2[vlen] __attribute__ ((aligned (16)));
-  short cntl3[vlen] __attribute__ ((aligned (16)));
-  short scalars[4] __attribute__ ((aligned (16))) = {1, 2, 3, 4};
+  __VOLK_ATTR_ALIGNED(16) short target[vlen];
+  __VOLK_ATTR_ALIGNED(16) short target2[vlen];
+  __VOLK_ATTR_ALIGNED(16) short src0[vlen];
+  __VOLK_ATTR_ALIGNED(16) short permute_indexes[vlen];
+  __VOLK_ATTR_ALIGNED(16) short cntl0[vlen];
+  __VOLK_ATTR_ALIGNED(16) short cntl1[vlen];
+  __VOLK_ATTR_ALIGNED(16) short cntl2[vlen];
+  __VOLK_ATTR_ALIGNED(16) short cntl3[vlen];
+  __VOLK_ATTR_ALIGNED(16) short scalars[4] = {1, 2, 3, 4};
 
   for(int i = 0; i < vlen; ++i) {
     src0[i] = i;
diff --git a/volk/lib/qa_16s_quad_max_star_aligned16.cc b/volk/lib/qa_16s_quad_max_star_aligned16.cc
index 66f8c9afa..192a69e35 100644
--- a/volk/lib/qa_16s_quad_max_star_aligned16.cc
+++ b/volk/lib/qa_16s_quad_max_star_aligned16.cc
@@ -17,13 +17,13 @@ void qa_16s_quad_max_star_aligned16::t1() {
 void qa_16s_quad_max_star_aligned16::t1() {
   const int vlen = 34;
   
-  short input0[vlen] __attribute__ ((aligned (16)));
-  short input1[vlen] __attribute__ ((aligned (16)));
-  short input2[vlen] __attribute__ ((aligned (16)));
-  short input3[vlen] __attribute__ ((aligned (16)));
+  __VOLK_ATTR_ALIGNED(16) short input0[vlen];
+  __VOLK_ATTR_ALIGNED(16) short input1[vlen];
+  __VOLK_ATTR_ALIGNED(16) short input2[vlen];
+  __VOLK_ATTR_ALIGNED(16) short input3[vlen];
 
-  short output0[vlen] __attribute__ ((aligned (16)));
-  short output1[vlen] __attribute__ ((aligned (16)));
+  __VOLK_ATTR_ALIGNED(16) short output0[vlen];
+  __VOLK_ATTR_ALIGNED(16) short output1[vlen];
 
   for(int i = 0; i < vlen; ++i) {
     short plus0 = (short) (rand() - (RAND_MAX/2));
diff --git a/volk/lib/qa_32f_fm_detect_aligned16.cc b/volk/lib/qa_32f_fm_detect_aligned16.cc
index 592304f83..a2e7a85be 100644
--- a/volk/lib/qa_32f_fm_detect_aligned16.cc
+++ b/volk/lib/qa_32f_fm_detect_aligned16.cc
@@ -21,10 +21,10 @@ void qa_32f_fm_detect_aligned16::t1() {
   double total;
   const int vlen = 3201;
   const int ITERS = 10000;
-  float input0[vlen] __attribute__ ((aligned (16)));
+  __VOLK_ATTR_ALIGNED(16) float input0[vlen];
   
-  float output0[vlen] __attribute__ ((aligned (16)));
-  float output01[vlen] __attribute__ ((aligned (16)));
+  __VOLK_ATTR_ALIGNED(16) float output0[vlen];
+  __VOLK_ATTR_ALIGNED(16) float output01[vlen];
 
   for(int i = 0; i < vlen; ++i) {   
     input0[i] = ((float) (rand() - (RAND_MAX/2))) / static_cast<float>((RAND_MAX/2));
diff --git a/volk/lib/qa_32fc_power_spectral_density_32f_aligned16.cc b/volk/lib/qa_32fc_power_spectral_density_32f_aligned16.cc
index a3d0955bd..981bb19e6 100644
--- a/volk/lib/qa_32fc_power_spectral_density_32f_aligned16.cc
+++ b/volk/lib/qa_32fc_power_spectral_density_32f_aligned16.cc
@@ -21,10 +21,10 @@ void qa_32fc_power_spectral_density_32f_aligned16::t1() {
   double total;
   const int vlen = 3201;
   const int ITERS = 10000;
-  std::complex<float> input0[vlen] __attribute__ ((aligned (16)));
+  __VOLK_ATTR_ALIGNED(16) std::complex<float> input0[vlen];
   
-  float output_generic[vlen] __attribute__ ((aligned (16)));
-  float output_sse3[vlen] __attribute__ ((aligned (16)));
+  __VOLK_ATTR_ALIGNED(16) float output_generic[vlen];
+  __VOLK_ATTR_ALIGNED(16) float output_sse3[vlen];
 
   const float scalar = vlen;
   const float rbw = 1.7;
diff --git a/volk/lib/qa_32u_popcnt_aligned16.cc b/volk/lib/qa_32u_popcnt_aligned16.cc
index 618a82a02..c880260f2 100644
--- a/volk/lib/qa_32u_popcnt_aligned16.cc
+++ b/volk/lib/qa_32u_popcnt_aligned16.cc
@@ -25,10 +25,10 @@ void qa_32u_popcnt_aligned16::t1() {
   double total;
 
   const int ITERS = 10000000;
-  uint32_t input0 __attribute__ ((aligned (16)));
+  __VOLK_ATTR_ALIGNED(16) uint32_t input0;
   
-  uint32_t output0 __attribute__ ((aligned (16)));
-  uint32_t output01 __attribute__ ((aligned (16)));
+  __VOLK_ATTR_ALIGNED(16) uint32_t output0;
+  __VOLK_ATTR_ALIGNED(16) uint32_t output01;
 
     input0 = ((uint32_t) (rand() - (RAND_MAX/2)));
     output0 = 0;
diff --git a/volk/lib/qa_64u_popcnt_aligned16.cc b/volk/lib/qa_64u_popcnt_aligned16.cc
index 85ef58795..6be4e50ea 100644
--- a/volk/lib/qa_64u_popcnt_aligned16.cc
+++ b/volk/lib/qa_64u_popcnt_aligned16.cc
@@ -25,10 +25,10 @@ void qa_64u_popcnt_aligned16::t1() {
   double total;
 
   const int ITERS = 10000000;
-  uint64_t input0 __attribute__ ((aligned (16)));
+  __VOLK_ATTR_ALIGNED(16) uint64_t input0;
   
-  uint64_t output0 __attribute__ ((aligned (16)));
-  uint64_t output01 __attribute__ ((aligned (16)));
+  __VOLK_ATTR_ALIGNED(16) uint64_t output0;
+  __VOLK_ATTR_ALIGNED(16) uint64_t output01;
 
     input0 = ((uint64_t) (rand() - (RAND_MAX/2)));
     output0 = 0;