u8x16_compare_byte_mask - optimize to use 128bit registers as suggested by Nintin

[vpp.git] / src / vppinfra / vector_neon.h

diff --git a/src/vppinfra/vector_neon.h b/src/vppinfra/vector_neon.h
index 6357d68..331b8ed 100644 (file)
--- a/src/vppinfra/vector_neon.h
+++ b/src/vppinfra/vector_neon.h
@@ -17,81 +17,47 @@
 #define included_vector_neon_h
 #include <arm_neon.h>
 
-/* Splats. */
-
-#define u8x16_splat(i) vdupq_n_u8(i)
-#define u16x8_splat(i) vdupq_n_u16(i)
-#define i16x8_splat(i) vdupq_n_s16(i)
-#define u32x4_splat(i) vdupq_n_u32(i)
-#define i32x4_splat(i) vdupq_n_s32(i)
-
 /* Arithmetic */
-#define u16x8_add(a,b) vaddq_u16(a,b)
-#define i16x8_add(a,b) vaddq_s16(a,b)
 #define u16x8_sub_saturate(a,b) vsubq_u16(a,b)
 #define i16x8_sub_saturate(a,b) vsubq_s16(a,b)
 
+always_inline int
+u8x16_is_all_zero (u8x16 x)
+{
+  return !(vaddvq_u8 (x));
+}
 
-/* Compare operations. */
-#define u8x16_is_equal(a,b) vceqq_u8(a,b)
-#define i8x16_is_equal(a,b) vceqq_s8(a,b)
-#define u16x8_is_equal(a,b) vceqq_u16(a,b)
-#define i16x8_is_equal(a,b) vceqq_i16(a,b)
-#define u32x4_is_equal(a,b) vceqq_u32(a,b)
-#define i32x4_is_equal(a,b) vceqq_s32(a,b)
-#define i8x16_is_greater(a,b) vcgtq_s8(a,b)
-#define i16x8_is_greater(a,b) vcgtq_u8(a,b)
-#define i32x4_is_greater(a,b) vcgtq_s32(a,b)
-
-always_inline u8x16
-u8x16_is_zero (u8x16 x)
+always_inline int
+u16x8_is_all_zero (u16x8 x)
 {
-  u8x16 zero = { 0 };
-  return u8x16_is_equal (x, zero);
+  return !(vaddvq_u16 (x));
 }
 
-always_inline u16x8
-u16x8_is_zero (u16x8 x)
+always_inline int
+u32x4_is_all_zero (u32x4 x)
 {
-  u16x8 zero = { 0 };
-  return u16x8_is_equal (x, zero);
+  return !(vaddvq_u32 (x));
 }
 
-always_inline u32x4
-u32x4_is_zero (u32x4 x)
+always_inline int
+u64x2_is_all_zero (u64x2 x)
 {
-  u32x4 zero = { 0 };
-  return u32x4_is_equal (x, zero);
+  return !(vaddvq_u64 (x));
 }
 
 /* Converts all ones/zeros compare mask to bitmap. */
 always_inline u32
 u8x16_compare_byte_mask (u8x16 x)
 {
-  static int8_t const __attribute__ ((aligned (16))) xr[8] =
-  {
-  -7, -6, -5, -4, -3, -2, -1, 0};
-  uint8x8_t mask_and = vdup_n_u8 (0x80);
-  int8x8_t mask_shift = vld1_s8 (xr);
-
-  uint8x8_t lo = vget_low_u8 (x);
-  uint8x8_t hi = vget_high_u8 (x);
-
-  lo = vand_u8 (lo, mask_and);
-  lo = vshl_u8 (lo, mask_shift);
-
-  hi = vand_u8 (hi, mask_and);
-  hi = vshl_u8 (hi, mask_shift);
-
-  lo = vpadd_u8 (lo, lo);
-  lo = vpadd_u8 (lo, lo);
-  lo = vpadd_u8 (lo, lo);
-
-  hi = vpadd_u8 (hi, hi);
-  hi = vpadd_u8 (hi, hi);
-  hi = vpadd_u8 (hi, hi);
-
-  return ((hi[0] << 8) | (lo[0] & 0xff));
+  uint8x16_t mask_shift =
+    { -7, -6, -5, -4, -3, -2, -1, 0, -7, -6, -5, -4, -3, -2, -1, 0 };
+  uint8x16_t mask_and = vdupq_n_u8 (0x80);
+  x = vandq_u8 (x, mask_and);
+  x = vshlq_u8 (x, vreinterpretq_s8_u8 (mask_shift));
+  x = vpaddq_u8 (x, x);
+  x = vpaddq_u8 (x, x);
+  x = vpaddq_u8 (x, x);
+  return vgetq_lane_u8 (x, 0) | (vgetq_lane_u8 (x, 1) << 8);
 }
 
 always_inline u32