X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvppinfra%2Fvector_sse42.h;h=effab3fe487e5d5c671016d967e4afc7c4b9345f;hb=452cd7e3bee6a28b40949dfeed9f87835551a7cc;hp=ee5b4dcc7df66490703461837a3617e0b64baa65;hpb=c59b9a26ed9a6bc083db2868b6993add6fd2ba5b;p=vpp.git

diff --git a/src/vppinfra/vector_sse42.h b/src/vppinfra/vector_sse42.h
index ee5b4dcc7df..effab3fe487 100644
--- a/src/vppinfra/vector_sse42.h
+++ b/src/vppinfra/vector_sse42.h
@@ -78,6 +78,20 @@ t##s##x##c##_is_all_equal (t##s##x##c v, t##s x)			\
 
 foreach_sse42_vec128i foreach_sse42_vec128u
 #undef _
+
+/* min, max */
+#define _(t, s, c, i) \
+static_always_inline t##s##x##c						\
+t##s##x##c##_min (t##s##x##c a, t##s##x##c b)				\
+{ return (t##s##x##c) _mm_min_##i ((__m128i) a, (__m128i) b); }		\
+\
+static_always_inline t##s##x##c						\
+t##s##x##c##_max (t##s##x##c a, t##s##x##c b)				\
+{ return (t##s##x##c) _mm_max_##i ((__m128i) a, (__m128i) b); }		\
+
+_(i,8,16,epi8) _(i,16,8,epi16) _(i,32,4,epi32)  _(i,64,2,epi64)
+_(u,8,16,epu8) _(u,16,8,epu16) _(u,32,4,epu32)  _(u,64,2,epu64)
+#undef _
 /* *INDENT-ON* */
 
 #define CLIB_VEC128_SPLAT_DEFINED
@@ -520,12 +534,6 @@ u32x4_zero_byte_mask (u32x4 x)
   return u8x16_compare_byte_mask ((u8x16) (x == zero));
 }
 
-always_inline u8x16
-u8x16_max (u8x16 x, u8x16 y)
-{
-  return (u8x16) _mm_max_epu8 ((__m128i) x, (__m128i) y);
-}
-
 always_inline u32
 u8x16_max_scalar (u8x16 x)
 {
@@ -536,12 +544,6 @@ u8x16_max_scalar (u8x16 x)
   return _mm_extract_epi16 ((__m128i) x, 0) & 0xff;
 }
 
-always_inline u8x16
-u8x16_min (u8x16 x, u8x16 y)
-{
-  return (u8x16) _mm_min_epu8 ((__m128i) x, (__m128i) y);
-}
-
 always_inline u8
 u8x16_min_scalar (u8x16 x)
 {
@@ -552,12 +554,6 @@ u8x16_min_scalar (u8x16 x)
   return _mm_extract_epi16 ((__m128i) x, 0) & 0xff;
 }
 
-always_inline i16x8
-i16x8_max (i16x8 x, i16x8 y)
-{
-  return (i16x8) _mm_max_epi16 ((__m128i) x, (__m128i) y);
-}
-
 always_inline i16
 i16x8_max_scalar (i16x8 x)
 {
@@ -567,12 +563,6 @@ i16x8_max_scalar (i16x8 x)
   return _mm_extract_epi16 ((__m128i) x, 0);
 }
 
-always_inline i16x8
-i16x8_min (i16x8 x, i16x8 y)
-{
-  return (i16x8) _mm_min_epi16 ((__m128i) x, (__m128i) y);
-}
-
 always_inline i16
 i16x8_min_scalar (i16x8 x)
 {
@@ -582,6 +572,41 @@ i16x8_min_scalar (i16x8 x)
   return _mm_extract_epi16 ((__m128i) x, 0);
 }
 
+#define u8x16_align_right(a, b, imm) \
+  (u8x16) _mm_alignr_epi8 ((__m128i) a, (__m128i) b, imm)
+
+static_always_inline u32
+u32x4_min_scalar (u32x4 v)
+{
+  v = u32x4_min (v, (u32x4) u8x16_align_right ((u8x16) v, (u8x16) v, 8));
+  v = u32x4_min (v, (u32x4) u8x16_align_right ((u8x16) v, (u8x16) v, 4));
+  return v[0];
+}
+
+static_always_inline u32
+u32x4_max_scalar (u32x4 v)
+{
+  v = u32x4_max (v, (u32x4) u8x16_align_right ((u8x16) v, (u8x16) v, 8));
+  v = u32x4_max (v, (u32x4) u8x16_align_right ((u8x16) v, (u8x16) v, 4));
+  return v[0];
+}
+
+static_always_inline u32
+i32x4_min_scalar (i32x4 v)
+{
+  v = i32x4_min (v, (i32x4) u8x16_align_right ((u8x16) v, (u8x16) v, 8));
+  v = i32x4_min (v, (i32x4) u8x16_align_right ((u8x16) v, (u8x16) v, 4));
+  return v[0];
+}
+
+static_always_inline u32
+i32x4_max_scalar (i32x4 v)
+{
+  v = i32x4_max (v, (i32x4) u8x16_align_right ((u8x16) v, (u8x16) v, 8));
+  v = i32x4_max (v, (i32x4) u8x16_align_right ((u8x16) v, (u8x16) v, 4));
+  return v[0];
+}
+
 static_always_inline u16
 u8x16_msb_mask (u8x16 v)
 {
@@ -592,6 +617,15 @@ u8x16_msb_mask (u8x16 v)
 
 #undef _signed_binop
 
+static_always_inline u32x4
+u32x4_byte_swap (u32x4 v)
+{
+  u8x16 swap = {
+    3, 2, 1, 0, 7, 6, 5, 4, 11, 10, 9, 8, 15, 14, 13, 12
+  };
+  return (u32x4) _mm_shuffle_epi8 ((__m128i) v, (__m128i) swap);
+}
+
 static_always_inline u16x8
 u16x8_byte_swap (u16x8 v)
 {
@@ -601,12 +635,29 @@ u16x8_byte_swap (u16x8 v)
   return (u16x8) _mm_shuffle_epi8 ((__m128i) v, (__m128i) swap);
 }
 
+static_always_inline u8x16
+u8x16_reflect (u8x16 v)
+{
+  u8x16 mask = {
+    15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0
+  };
+  return (u8x16) _mm_shuffle_epi8 ((__m128i) v, (__m128i) mask);
+}
+
 static_always_inline u32x4
 u32x4_hadd (u32x4 v1, u32x4 v2)
 {
   return (u32x4) _mm_hadd_epi32 ((__m128i) v1, (__m128i) v2);
 }
 
+static_always_inline u32 __clib_unused
+u32x4_sum_elts (u32x4 sum4)
+{
+  sum4 += (u32x4) u8x16_align_right (sum4, sum4, 8);
+  sum4 += (u32x4) u8x16_align_right (sum4, sum4, 4);
+  return sum4[0];
+}
+
 static_always_inline u8x16
 u8x16_shuffle (u8x16 v, u8x16 m)
 {
@@ -625,11 +676,11 @@ u32x4_shuffle (u32x4 v, const int a, const int b, const int c, const int d)
 #endif
 }
 
-/* _extend_to_ */
+/* _from_ */
 /* *INDENT-OFF* */
 #define _(f,t,i) \
 static_always_inline t							\
-f##_extend_to_##t (f x)							\
+t##_from_##f (f x)							\
 { return (t) _mm_cvt##i ((__m128i) x); }
 
 _(u8x16, u16x8, epu8_epi16)
@@ -656,7 +707,7 @@ u64x2_gather (void *p0, void *p1)
 }
 
 static_always_inline u32x4
-u32x4_gather (void *p0, void *p1, void *p2, void *p3, void *p4)
+u32x4_gather (void *p0, void *p1, void *p2, void *p3)
 {
   u32x4 r = { *(u32 *) p0, *(u32 *) p1, *(u32 *) p2, *(u32 *) p3 };
   return r;
@@ -703,6 +754,23 @@ u8x16_blend (u8x16 v1, u8x16 v2, u8x16 mask)
   return (u8x16) _mm_blendv_epi8 ((__m128i) v1, (__m128i) v2, (__m128i) mask);
 }
 
+static_always_inline u8x16
+u8x16_xor3 (u8x16 a, u8x16 b, u8x16 c)
+{
+#if __AVX512F__
+  return (u8x16) _mm_ternarylogic_epi32 ((__m128i) a, (__m128i) b,
+					 (__m128i) c, 0x96);
+#endif
+  return a ^ b ^ c;
+}
+
+#ifdef __AVX512F__
+static_always_inline u8x16
+u8x16_mask_load (u8x16 a, void *p, u16 mask)
+{
+  return (u8x16) _mm_mask_loadu_epi8 ((__m128i) a, mask, p);
+}
+#endif
 
 #endif /* included_vector_sse2_h */