SIMD: rename macro names

Author: lamphamsy

src/simd_128.h

@@ -40,17 +40,17 @@ typedef __m128i VecType;
 
 /* ============= Constant variable  ============ */
 
-#define F4_u32 _mm_set1_epi32(65537)
-#define F4m1_u32 _mm_set1_epi32(65536)
-#define F3_u32 _mm_set1_epi32(257)
-#define F3m1_u32 _mm_set1_epi32(256)
+#define F4_U32 _mm_set1_epi32(65537)
+#define F4_MINUS_ONE_U32 _mm_set1_epi32(65536)
+#define F3_U32 _mm_set1_epi32(257)
+#define F3_MINUS_ONE_U32 _mm_set1_epi32(256)
 
-#define F3_u16 _mm_set1_epi16(257)
-#define F3m1_u16 _mm_set1_epi16(256)
+#define F3_U16 _mm_set1_epi16(257)
+#define F3_MINUS_ONE_U16 _mm_set1_epi16(256)
 
 #define ZERO (_mm_setzero_si128())
-#define ONE16 (_mm_set1_epi16(1))
-#define ONE32 (_mm_set1_epi32(1))
+#define ONE_U16 (_mm_set1_epi16(1))
+#define ONE_U32 (_mm_set1_epi32(1))
 
 #define MASK8_LO (_mm_set1_epi16(0x80))
 

src/simd_256.h

@@ -53,17 +53,17 @@ typedef __m128i HalfVecType;
 
 /* ============= Constant variable  ============ */
 
-#define F4_u32 _mm256_set1_epi32(65537)
-#define F4m1_u32 _mm256_set1_epi32(65536)
-#define F3_u32 _mm256_set1_epi32(257)
-#define F3m1_u32 _mm256_set1_epi32(256)
+#define F4_U32 _mm256_set1_epi32(65537)
+#define F4_MINUS_ONE_U32 _mm256_set1_epi32(65536)
+#define F3_U32 _mm256_set1_epi32(257)
+#define F3_MINUS_ONE_U32 _mm256_set1_epi32(256)
 
-#define F3_u16 _mm256_set1_epi16(257)
-#define F3m1_u16 _mm256_set1_epi16(256)
+#define F3_U16 _mm256_set1_epi16(257)
+#define F3_MINUS_ONE_U16 _mm256_set1_epi16(256)
 
 #define ZERO (_mm256_setzero_si256())
-#define ONE16 (_mm256_set1_epi16(1))
-#define ONE32 (_mm256_set1_epi32(1))
+#define ONE_U16 (_mm256_set1_epi16(1))
+#define ONE_U32 (_mm256_set1_epi32(1))
 
 #define MASK8_LO (_mm256_set1_epi16(0x80))
 

src/simd_basic.h

@@ -39,13 +39,13 @@ namespace simd {
 template <typename T>
 inline VecType Card(T q)
 {
-    return (q == F3) ? F3_u32 : F4_u32;
+    return (q == F3) ? F3_U32 : F4_U32;
 }
 
 template <typename T>
 inline VecType CardMinusOne(T q)
 {
-    return (q == F3) ? F3m1_u32 : F4m1_u32;
+    return (q == F3) ? F3_MINUS_ONE_U32 : F4_MINUS_ONE_U32;
 }
 
 /* ================= Basic Operations ================= */
@@ -138,8 +138,8 @@ inline VecType ModMulSafe(VecType x, VecType y, T q)
     if (IsZero(cmp) == 1) {
         return res;
     }
-    return (q == F3) ? Xor(res, And(F4_u32, cmp))
-                     : Add<T>(res, And(ONE32, cmp));
+    return (q == F3) ? Xor(res, And(F4_U32, cmp))
+                     : Add<T>(res, And(ONE_U32, cmp));
 }
 
 /**