From c3a5731890242ae5b72478dca943577f5488c116 Mon Sep 17 00:00:00 2001
From: Andrey Piskunov <andrey.piskunov@mariadb.com>
Date: Thu, 4 Aug 2022 16:16:12 +0300
Subject: [PATCH] Rename cmpGt2

---
 primitives/linux-port/column.cpp | 12 ++++++------
 utils/common/simd_arm.h          | 26 +++++++++++++-------------
 utils/common/simd_sse.h          | 30 +++++++++++++++---------------
 3 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/primitives/linux-port/column.cpp b/primitives/linux-port/column.cpp
index 17a3e9769..4c060c7f6 100644
--- a/primitives/linux-port/column.cpp
+++ b/primitives/linux-port/column.cpp
@@ -1285,10 +1285,10 @@ void vectorizedUpdateMinMax(const bool validMinMax, const MT nonNullOrEmptyMask,
   if (validMinMax)
   {
     auto byteMask = utils::bitCast<SimdType>(simd::bitMaskToByteMask16(nonNullOrEmptyMask));
-    simdMin = simdProcessor.blend(simdMin, dataVec,
-                                  simdProcessor.bwAnd(simdProcessor.cmpGt2(simdMin, dataVec), byteMask));
-    simdMax = simdProcessor.blend(simdMax, dataVec,
-                                  simdProcessor.bwAnd(simdProcessor.cmpGt2(dataVec, simdMax), byteMask));
+    simdMin = simdProcessor.blend(
+        simdMin, dataVec, simdProcessor.bwAnd(simdProcessor.cmpGtSimdType(simdMin, dataVec), byteMask));
+    simdMax = simdProcessor.blend(
+        simdMax, dataVec, simdProcessor.bwAnd(simdProcessor.cmpGtSimdType(dataVec, simdMax), byteMask));
   }
 }
 
@@ -1300,8 +1300,8 @@ void vectorizedTextUpdateMinMax(const bool validMinMax, const MT nonNullOrEmptyM
   if (validMinMax)
   {
     auto byteMask = utils::bitCast<SimdType>(simd::bitMaskToByteMask16(nonNullOrEmptyMask));
-    auto minComp = simdProcessor.bwAnd(simdProcessor.cmpGt2(weightsMin, swapedOrderDataVec), byteMask);
-    auto maxComp = simdProcessor.bwAnd(simdProcessor.cmpGt2(swapedOrderDataVec, weightsMax), byteMask);
+    auto minComp = simdProcessor.bwAnd(simdProcessor.cmpGtSimdType(weightsMin, swapedOrderDataVec), byteMask);
+    auto maxComp = simdProcessor.bwAnd(simdProcessor.cmpGtSimdType(swapedOrderDataVec, weightsMax), byteMask);
     simdMin = simdProcessor.blend(simdMin, dataVec, minComp);
     weightsMin = simdProcessor.blend(weightsMin, swapedOrderDataVec, minComp);
     simdMax = simdProcessor.blend(simdMax, dataVec, maxComp);
diff --git a/utils/common/simd_arm.h b/utils/common/simd_arm.h
index 1459614d5..a32618aa4 100644
--- a/utils/common/simd_arm.h
+++ b/utils/common/simd_arm.h
@@ -205,14 +205,14 @@ struct TypeToVecWrapperType<T, typename std::enable_if<std::is_same_v<double, T>
   using WrapperType =  vi128d_wr;
 };
 template <typename T>
-struct TypeToVecWrapperType<T, typename std::enable_if<std::is_unsigned_v<T> >::type> 
+struct TypeToVecWrapperType<T, typename std::enable_if<std::is_unsigned_v<T> >::type>
     : WidthToVecWrapperType<sizeof(T)>
 {
 };
 
 template <typename T>
     struct TypeToVecWrapperType<
-        T, typename std::enable_if<std::is_signed_v<T> &&!is_floating_point_v<T>>::type> 
+        T, typename std::enable_if<std::is_signed_v<T> &&!is_floating_point_v<T>>::type>
     : WidthToSVecWrapperType<sizeof(T)>
 {
 };
@@ -367,7 +367,7 @@ class SimdFilterProcessor<
   {
     return vbslq_s32((uint32x4_t)mask, y,x);
   }
-  MCS_FORCE_INLINE SimdType cmpGt2(SimdType x, SimdType y) const
+  MCS_FORCE_INLINE SimdType cmpGtSimdType(SimdType x, SimdType y) const
   {
     return (SimdType)vcgtq_s32(x, y);
   }
@@ -533,7 +533,7 @@ class SimdFilterProcessor<
   {
     return vminvq_f64(x);
   }
-  MCS_FORCE_INLINE SimdType cmpGt2(SimdType x, SimdType y) const
+  MCS_FORCE_INLINE SimdType cmpGtSimdType(SimdType x, SimdType y) const
   {
     return (SimdType)vcgtq_f64(x, y);
   }
@@ -638,7 +638,7 @@ class SimdFilterProcessor<
   {
     return vbslq_f32((uint32x4_t)mask, y,x);
   }
-  MCS_FORCE_INLINE SimdType cmpGt2(SimdType x, SimdType y) const
+  MCS_FORCE_INLINE SimdType cmpGtSimdType(SimdType x, SimdType y) const
   {
     return (SimdType)vcgtq_f32(x, y);
   }
@@ -792,7 +792,7 @@ class SimdFilterProcessor<
   {
     return vandq_s64(x, y);
   }
-  MCS_FORCE_INLINE SimdType cmpGt2(SimdType x, SimdType y) const
+  MCS_FORCE_INLINE SimdType cmpGtSimdType(SimdType x, SimdType y) const
   {
     return (SimdType)vcgtq_s64(x, y);
   }
@@ -908,7 +908,7 @@ class SimdFilterProcessor<
   {
     return vbslq_u64((uint64x2_t)mask, y,x);
   }
-  MCS_FORCE_INLINE SimdType cmpGt2(SimdType x, SimdType y) const
+  MCS_FORCE_INLINE SimdType cmpGtSimdType(SimdType x, SimdType y) const
   {
     return (SimdType)vcgtq_u64(x, y);
   }
@@ -1041,7 +1041,7 @@ class SimdFilterProcessor<
   {
     return vbslq_s32((uint32x4_t)mask, y,x);
   }
-  MCS_FORCE_INLINE SimdType cmpGt2(SimdType x, SimdType y) const
+  MCS_FORCE_INLINE SimdType cmpGtSimdType(SimdType x, SimdType y) const
   {
     return (SimdType)vcgtq_s32(x, y);
   }
@@ -1174,7 +1174,7 @@ class SimdFilterProcessor<
   {
     return vbslq_u32((uint32x4_t)mask, y,x);
   }
-  MCS_FORCE_INLINE SimdType cmpGt2(SimdType x, SimdType y) const
+  MCS_FORCE_INLINE SimdType cmpGtSimdType(SimdType x, SimdType y) const
   {
     return (SimdType)vcgtq_u32(x, y);
   }
@@ -1316,7 +1316,7 @@ class SimdFilterProcessor<
   {
     return vandq_s16(x, y);
   }
-  MCS_FORCE_INLINE SimdType cmpGt2(SimdType x, SimdType y) const
+  MCS_FORCE_INLINE SimdType cmpGtSimdType(SimdType x, SimdType y) const
   {
     return (SimdType)vcgtq_s16(x, y);
   }
@@ -1425,7 +1425,7 @@ class SimdFilterProcessor<VT, CHECK_T,
   {
     return vdupq_n_u16(fill);
   }
-  MCS_FORCE_INLINE SimdType cmpGt2(SimdType x, SimdType y) const
+  MCS_FORCE_INLINE SimdType cmpGtSimdType(SimdType x, SimdType y) const
   {
     return (SimdType)vcgtq_u16(x, y);
   }
@@ -1566,7 +1566,7 @@ class SimdFilterProcessor<
   {
     return vmaxvq_s8(x);
   }
-  MCS_FORCE_INLINE SimdType cmpGt2(SimdType x, SimdType y) const
+  MCS_FORCE_INLINE SimdType cmpGtSimdType(SimdType x, SimdType y) const
   {
     return (SimdType)vcgtq_s8(x, y);
   }
@@ -1714,7 +1714,7 @@ class SimdFilterProcessor<
   {
     return vandq_u8(x, y);
   }
-  MCS_FORCE_INLINE SimdType cmpGt2(SimdType x, SimdType y) const
+  MCS_FORCE_INLINE SimdType cmpGtSimdType(SimdType x, SimdType y) const
   {
     return (SimdType)vcgtq_u8(x, y);
   }
diff --git a/utils/common/simd_sse.h b/utils/common/simd_sse.h
index fe755d0c9..edd75bcc6 100644
--- a/utils/common/simd_sse.h
+++ b/utils/common/simd_sse.h
@@ -260,7 +260,7 @@ class SimdFilterProcessor<
     return x;
   }
 
-  MCS_FORCE_INLINE SimdType cmpGt2(SimdType x, SimdType y) const
+  MCS_FORCE_INLINE SimdType cmpGtSimdType(SimdType x, SimdType y) const
   {
     return x;
   }
@@ -404,7 +404,7 @@ class SimdFilterProcessor<
     return _mm_blendv_pd(x, y, mask);
   }
 
-  MCS_FORCE_INLINE SimdType cmpGt2(SimdType x, SimdType y) const
+  MCS_FORCE_INLINE SimdType cmpGtSimdType(SimdType x, SimdType y) const
   {
     return _mm_cmpgt_pd(x, y);
   }
@@ -538,7 +538,7 @@ class SimdFilterProcessor<
     return _mm_max_ps(x, y);
   }
 
-  MCS_FORCE_INLINE SimdType cmpGt2(SimdType x, SimdType y) const
+  MCS_FORCE_INLINE SimdType cmpGtSimdType(SimdType x, SimdType y) const
   {
     return _mm_cmpgt_ps(x, y);
   }
@@ -670,19 +670,19 @@ class SimdFilterProcessor<VT, CHECK_T,
     return _mm_and_si128(x, y);
   }
 
-  MCS_FORCE_INLINE SimdType cmpGt2(SimdType x, SimdType y) const
+  MCS_FORCE_INLINE SimdType cmpGtSimdType(SimdType x, SimdType y) const
   {
     return _mm_cmpgt_epi64(x, y);
   }
 
   MCS_FORCE_INLINE SimdType min(SimdType x, SimdType y) const
   {
-    return blend(x, y, cmpGt2(x,y));
+    return blend(x, y, cmpGtSimdType(x,y));
   }
 
   MCS_FORCE_INLINE SimdType max(SimdType x, SimdType y) const
   {
-    return blend(x, y, cmpGt2(y,x));
+    return blend(x, y, cmpGtSimdType(y,x));
   }
 };
 
@@ -805,7 +805,7 @@ class SimdFilterProcessor<VT, CHECK_T,
     return _mm_and_si128(x, y);
   }
 
-  MCS_FORCE_INLINE SimdType cmpGt2(SimdType x, SimdType y) const
+  MCS_FORCE_INLINE SimdType cmpGtSimdType(SimdType x, SimdType y) const
   {
     SimdType signVec = constant4i<0,(int32_t)0x80000000,0,(int32_t)0x80000000>();
     SimdType xFlip = _mm_xor_si128(x, signVec);
@@ -815,12 +815,12 @@ class SimdFilterProcessor<VT, CHECK_T,
 
   MCS_FORCE_INLINE SimdType min(SimdType x, SimdType y) const
   {
-    return blend(x, y, cmpGt2(x,y));
+    return blend(x, y, cmpGtSimdType(x,y));
   }
 
   MCS_FORCE_INLINE SimdType max(SimdType x, SimdType y) const
   {
-    return blend(x, y, cmpGt2(y,x));
+    return blend(x, y, cmpGtSimdType(y,x));
   }
 };
 
@@ -940,7 +940,7 @@ class SimdFilterProcessor<VT, CHECK_T,
     return _mm_and_si128(x, y);
   }
 
-  MCS_FORCE_INLINE SimdType cmpGt2(SimdType x, SimdType y) const
+  MCS_FORCE_INLINE SimdType cmpGtSimdType(SimdType x, SimdType y) const
   {
     return _mm_cmpgt_epi32(x, y);
   }
@@ -1075,7 +1075,7 @@ class SimdFilterProcessor<VT, CHECK_T,
     return _mm_and_si128(x, y);
   }
 
-  MCS_FORCE_INLINE SimdType cmpGt2(SimdType x, SimdType y) const
+  MCS_FORCE_INLINE SimdType cmpGtSimdType(SimdType x, SimdType y) const
   {
     SimdType signVec = constant4i<(int32_t)0x80000000,(int32_t)0x80000000,(int32_t)0x80000000,(int32_t)0x80000000>();
     SimdType xFlip = _mm_xor_si128(x, signVec);
@@ -1209,7 +1209,7 @@ class SimdFilterProcessor<
     return _mm_and_si128(x, y);
   }
 
-  MCS_FORCE_INLINE SimdType cmpGt2(SimdType x, SimdType y) const
+  MCS_FORCE_INLINE SimdType cmpGtSimdType(SimdType x, SimdType y) const
   {
     return _mm_cmpgt_epi16(x, y);
   }
@@ -1341,7 +1341,7 @@ class SimdFilterProcessor<
     return _mm_and_si128(x, y);
   }
 
-  MCS_FORCE_INLINE SimdType cmpGt2(SimdType x, SimdType y)
+  MCS_FORCE_INLINE SimdType cmpGtSimdType(SimdType x, SimdType y)
   {
     SimdType ones =
         constant4i<(int32_t)0xFFFFFFFF, (int32_t)0xFFFFFFFF, (int32_t)0xFFFFFFFF, (int32_t)0xFFFFFFFF>();
@@ -1482,7 +1482,7 @@ class SimdFilterProcessor<
     return _mm_and_si128(x, y);
   }
 
-  MCS_FORCE_INLINE SimdType cmpGt2(SimdType x, SimdType y) const
+  MCS_FORCE_INLINE SimdType cmpGtSimdType(SimdType x, SimdType y) const
   {
     return _mm_cmpgt_epi8(x, y);
   }
@@ -1621,7 +1621,7 @@ class SimdFilterProcessor<
     return _mm_and_si128(x, y);
   }
 
-  MCS_FORCE_INLINE SimdType cmpGt2(SimdType x, SimdType y)
+  MCS_FORCE_INLINE SimdType cmpGtSimdType(SimdType x, SimdType y)
   {
     SimdType ones =
         constant4i<(int32_t)0xFFFFFFFF, (int32_t)0xFFFFFFFF, (int32_t)0xFFFFFFFF, (int32_t)0xFFFFFFFF>();