Cleanup real 128bit kernels

src/elpa2/kernels/real_sparc64_2hv_double_precision.c

@@ -49,7 +49,7 @@
 #define REALCASE 1
 #define DOUBLE_PRECISION 1
 #define BLOCK2 1
-#define VEC_SET 1281
+#define VEC_SET SPARC64_SSE
 #include "../../general/precision_macros.h"
 #include "real_128bit_256bit_512bit_BLOCK_template.c"
 #undef REALCASE

src/elpa2/kernels/real_sparc64_2hv_single_precision.c

@@ -49,7 +49,7 @@
 #define REALCASE 1
 #define SINGLE_PRECISION 1
 #define BLOCK2 1
-#define VEC_SET 1281
+#define VEC_SET SPARC64_SSE
 #include "../../general/precision_macros.h"
 #include "real_128bit_256bit_512bit_BLOCK_template.c"
 #undef BLOCK2

src/elpa2/kernels/real_sparc64_4hv_double_precision.c

@@ -49,7 +49,7 @@
 #define REALCASE 1
 #define DOUBLE_PRECISION 1
 #define BLOCK4 1
-#define VEC_SET 1281
+#define VEC_SET SPARC64_SSE
 #include "../../general/precision_macros.h"
 #include "real_128bit_256bit_512bit_BLOCK_template.c"
 #undef BLOCK4

src/elpa2/kernels/real_sparc64_4hv_single_precision.c

@@ -49,7 +49,7 @@
 #define REALCASE 1
 #define SINGLE_PRECISION 1
 #define BLOCK4 1
-#define VEC_SET 1281
+#define VEC_SET SPARC64_SSE
 #include "../../general/precision_macros.h"
 #include "real_128bit_256bit_512bit_BLOCK_template.c"
 #undef BLOCK4

src/elpa2/kernels/real_sparc64_6hv_double_precision.c

@@ -49,7 +49,7 @@
 #define REALCASE 1
 #define DOUBLE_PRECISION 1
 #define BLOCK6 1
-#define VEC_SET 1281
+#define VEC_SET SPARC64_SSE
 #include "../../general/precision_macros.h"
 #include "real_128bit_256bit_512bit_BLOCK_template.c"
 #undef REALCASE

src/elpa2/kernels/real_sparc64_6hv_single_precision.c

@@ -49,7 +49,7 @@
 #define REALCASE 1
 #define SINGLE_PRECISION 1
 #define BLOCK6 1
-#define VEC_SET 1281
+#define VEC_SET SPARC64_SSE
 #include "../../general/precision_macros.h"
 #include "real_128bit_256bit_512bit_BLOCK_template.c"
 #undef REALCASE

src/elpa2/kernels/real_sse_2hv_double_precision.c

@@ -49,7 +49,7 @@
 #define REALCASE 1
 #define DOUBLE_PRECISION 1
 #define BLOCK2 1
-#define VEC_SET 128
+#define VEC_SET SSE_128
 #include "../../general/precision_macros.h"
 #include "real_128bit_256bit_512bit_BLOCK_template.c"
 #undef BLOCK2

src/elpa2/kernels/real_sse_2hv_single_precision.c

@@ -49,7 +49,7 @@
 #define REALCASE 1
 #define SINGLE_PRECISION 1
 #define BLOCK2 1
-#define VEC_SET 128
+#define VEC_SET SSE_128
 #include "../../general/precision_macros.h"
 #include "real_128bit_256bit_512bit_BLOCK_template.c"
 #undef BLOCK2

src/elpa2/kernels/real_sse_4hv_double_precision.c

@@ -49,7 +49,7 @@
 #define REALCASE 1
 #define DOUBLE_PRECISION 1
 #define BLOCK4 1
-#define VEC_SET 128
+#define VEC_SET SSE_128
 #include "../../general/precision_macros.h"
 #include "real_128bit_256bit_512bit_BLOCK_template.c"
 #undef BLOCK4

src/elpa2/kernels/real_sse_4hv_single_precision.c

@@ -49,7 +49,7 @@
 #define REALCASE 1
 #define SINGLE_PRECISION 1
 #define BLOCK4 1
-#define VEC_SET 128
+#define VEC_SET SSE_128
 #include "../../general/precision_macros.h"
 #include "real_128bit_256bit_512bit_BLOCK_template.c"
 #undef BLOCK4

src/elpa2/kernels/real_sse_6hv_double_precision.c

@@ -49,7 +49,7 @@
 #define REALCASE 1
 #define DOUBLE_PRECISION 1
 #define BLOCK6 1
-#define VEC_SET 128
+#define VEC_SET SSE_128
 #include "../../general/precision_macros.h"
 #include "real_128bit_256bit_512bit_BLOCK_template.c"
 #undef REALCASE

src/elpa2/kernels/real_sse_6hv_single_precision.c

@@ -49,7 +49,7 @@
 #define REALCASE 1
 #define SINGLE_PRECISION 1
 #define BLOCK6 1
-#define VEC_SET 128
+#define VEC_SET SSE_128
 #include "../../general/precision_macros.h"
 #include "real_128bit_256bit_512bit_BLOCK_template.c"
 #undef REALCASE

src/elpa2/kernels/real_vsx_2hv_double_precision.c

@@ -49,11 +49,11 @@
 #define REALCASE 1
 #define DOUBLE_PRECISION 1
 #define BLOCK2 1
-#define VEC_SET 1282
+#define VEC_SET VSX_SSE
 #include "../../general/precision_macros.h"
 #include "real_128bit_256bit_512bit_BLOCK_template.c"
 #undef BLOCK2
-#undef VEC_SET 1282
+#undef VEC_SET
 #undef REALCASE
 #undef DOUBLE_PRECISION
 

src/elpa2/kernels/real_vsx_2hv_single_precision.c

@@ -49,7 +49,7 @@
 #define REALCASE 1
 #define SINGLE_PRECISION 1
 #define BLOCK2 1
-#define VEC_SET 1282
+#define VEC_SET VSX_SSE
 #include "../../general/precision_macros.h"
 #include "real_128bit_256bit_512bit_BLOCK_template.c"
 #undef BLOCK2

src/elpa2/kernels/real_vsx_4hv_double_precision.c

@@ -48,8 +48,12 @@
 
 #define REALCASE 1
 #define DOUBLE_PRECISION 1
+#define BLOCK4 1
+#define SIMD_SET VSX_SSE
 #include "../../general/precision_macros.h"
 #include "real_vsx_4hv_template.c"
+#undef BLOCK4
+#undef SIMD_SET
 #undef REALCASE
 #undef DOUBLE_PRECISION
 

src/elpa2/kernels/real_vsx_4hv_single_precision.c

@@ -48,8 +48,12 @@
 
 #define REALCASE 1
 #define SINGLE_PRECISION 1
+#define BLOCK4 1
+#define SIMD_SET VSX_SSE
 #include "../../general/precision_macros.h"
 #include "real_vsx_4hv_template.c"
+#undef BLOCK4
+#undef SIMD_SET
 #undef REALCASE
 #undef SINGLE_PRECISION
 

src/elpa2/kernels/real_vsx_6hv_double_precision.c

@@ -48,8 +48,12 @@
 
 #define REALCASE 1
 #define DOUBLE_PRECISION 1
+#define BLOCK6 1
+#define SIMD_SET VSX_SSE
 #include "../../general/precision_macros.h"
 #include "real_vsx_6hv_template.c"
+#undef BLOCK6
+#undef SIMD_SET
 #undef REALCASE
 #undef DOUBLE_PRECISION
 

src/elpa2/kernels/real_vsx_6hv_single_precision.c

@@ -48,8 +48,12 @@
 
 #define REALCASE 1
 #define SINGLE_PRECISION 1
+#define BLOCK6 1
+#define VEC_SET VSX_SSE
 #include "../../general/precision_macros.h"
 #include "real_vsx_6hv_template.c"
+#undef VEC_SET
+#undef BLOCK6
 #undef REALCASE
 #undef SINGLE_PRECISION