vppinfra: correct intrinsic called by u16x16_from_u8x16

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

diff --git a/src/vppinfra/vector_avx2.h b/src/vppinfra/vector_avx2.h
index 5162561..6975227 100644 (file)
--- a/src/vppinfra/vector_avx2.h
+++ b/src/vppinfra/vector_avx2.h
@@ -110,28 +110,48 @@ u8x32_msb_mask (u8x32 v)
   return _mm256_movemask_epi8 ((__m256i) v);
 }
 
-/* _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) _mm256_cvt##i ((__m128i) x); }
 
 _(u16x8, u32x8, epu16_epi32)
 _(u16x8, u64x4, epu16_epi64)
 _(u32x4, u64x4, epu32_epi64)
-_(u8x16, u16x16, epu8_epi64)
+_ (u8x16, u16x16, epu8_epi16)
 _(u8x16, u32x8, epu8_epi32)
 _(u8x16, u64x4, epu8_epi64)
 _(i16x8, i32x8, epi16_epi32)
 _(i16x8, i64x4, epi16_epi64)
 _(i32x4, i64x4, epi32_epi64)
-_(i8x16, i16x16, epi8_epi64)
+_ (i8x16, i16x16, epi8_epi16)
 _(i8x16, i32x8, epi8_epi32)
 _(i8x16, i64x4, epi8_epi64)
 #undef _
 /* *INDENT-ON* */
 
+static_always_inline u64x4
+u64x4_byte_swap (u64x4 v)
+{
+  u8x32 swap = {
+    7, 6, 5, 4, 3, 2, 1, 0, 15, 14, 13, 12, 11, 10, 9, 8,
+    7, 6, 5, 4, 3, 2, 1, 0, 15, 14, 13, 12, 11, 10, 9, 8,
+  };
+  return (u64x4) _mm256_shuffle_epi8 ((__m256i) v, (__m256i) swap);
+}
+
+static_always_inline u32x8
+u32x8_byte_swap (u32x8 v)
+{
+  u8x32 swap = {
+    3, 2, 1, 0, 7, 6, 5, 4, 11, 10, 9, 8, 15, 14, 13, 12,
+    3, 2, 1, 0, 7, 6, 5, 4, 11, 10, 9, 8, 15, 14, 13, 12
+  };
+  return (u32x8) _mm256_shuffle_epi8 ((__m256i) v, (__m256i) swap);
+}
+
 static_always_inline u16x16
 u16x16_byte_swap (u16x16 v)
 {
@@ -142,6 +162,23 @@ u16x16_byte_swap (u16x16 v)
   return (u16x16) _mm256_shuffle_epi8 ((__m256i) v, (__m256i) swap);
 }
 
+static_always_inline u8x32
+u8x32_shuffle (u8x32 v, u8x32 m)
+{
+  return (u8x32) _mm256_shuffle_epi8 ((__m256i) v, (__m256i) m);
+}
+
+#define u8x32_align_right(a, b, imm) \
+  (u8x32) _mm256_alignr_epi8 ((__m256i) a, (__m256i) b, imm)
+
+static_always_inline u32
+u32x8_sum_elts (u32x8 sum8)
+{
+  sum8 += (u32x8) u8x32_align_right (sum8, sum8, 8);
+  sum8 += (u32x8) u8x32_align_right (sum8, sum8, 4);
+  return sum8[0] + sum8[4];
+}
+
 static_always_inline u32x8
 u32x8_hadd (u32x8 v1, u32x8 v2)
 {
@@ -176,6 +213,14 @@ u16x16_mask_last (u16x16 v, u8 n_last)
   return v & masks[16 - n_last];
 }
 
+#ifdef __AVX512F__
+static_always_inline u8x32
+u8x32_mask_load (u8x32 a, void *p, u32 mask)
+{
+  return (u8x32) _mm256_mask_loadu_epi8 ((__m256i) a, mask, p);
+}
+#endif
+
 static_always_inline f32x8
 f32x8_from_u32x8 (u32x8 v)
 {
@@ -188,6 +233,9 @@ u32x8_from_f32x8 (f32x8 v)
   return (u32x8) _mm256_cvttps_epi32 ((__m256) v);
 }
 
+#define u32x8_blend(a,b,m) \
+  (u32x8) _mm256_blend_epi32 ((__m256i) a, (__m256i) b, m)
+
 #define u16x16_blend(v1, v2, mask) \
   (u16x16) _mm256_blend_epi16 ((__m256i) (v1), (__m256i) (v2), mask)
 
@@ -247,6 +295,88 @@ u32x8_scatter_one (u32x8 r, int index, void *p)
   *(u32 *) p = r[index];
 }
 
+static_always_inline u8x32
+u8x32_is_greater (u8x32 v1, u8x32 v2)
+{
+  return (u8x32) _mm256_cmpgt_epi8 ((__m256i) v1, (__m256i) v2);
+}
+
+static_always_inline u8x32
+u8x32_blend (u8x32 v1, u8x32 v2, u8x32 mask)
+{
+  return (u8x32) _mm256_blendv_epi8 ((__m256i) v1, (__m256i) v2,
+                                    (__m256i) mask);
+}
+
+#define u32x8_permute_lanes(a, b, m) \
+  (u32x8) _mm256_permute2x128_si256 ((__m256i) a, (__m256i) b, m)
+#define u64x4_permute_lanes(a, b, m) \
+  (u64x4) _mm256_permute2x128_si256 ((__m256i) a, (__m256i) b, m)
+
+static_always_inline u32x8
+u32x8_min (u32x8 a, u32x8 b)
+{
+  return (u32x8) _mm256_min_epu32 ((__m256i) a, (__m256i) b);
+}
+
+static_always_inline u32
+u32x8_min_scalar (u32x8 v)
+{
+  return u32x4_min_scalar (u32x4_min (u32x8_extract_lo (v),
+                                     u32x8_extract_hi (v)));
+}
+
+static_always_inline void
+u32x8_transpose (u32x8 a[8])
+{
+  u64x4 r[8], x, y;
+
+  r[0] = (u64x4) u32x8_interleave_lo (a[0], a[1]);
+  r[1] = (u64x4) u32x8_interleave_hi (a[0], a[1]);
+  r[2] = (u64x4) u32x8_interleave_lo (a[2], a[3]);
+  r[3] = (u64x4) u32x8_interleave_hi (a[2], a[3]);
+  r[4] = (u64x4) u32x8_interleave_lo (a[4], a[5]);
+  r[5] = (u64x4) u32x8_interleave_hi (a[4], a[5]);
+  r[6] = (u64x4) u32x8_interleave_lo (a[6], a[7]);
+  r[7] = (u64x4) u32x8_interleave_hi (a[6], a[7]);
+
+  x = u64x4_interleave_lo (r[0], r[2]);
+  y = u64x4_interleave_lo (r[4], r[6]);
+  a[0] = u32x8_permute_lanes (x, y, 0x20);
+  a[4] = u32x8_permute_lanes (x, y, 0x31);
+
+  x = u64x4_interleave_hi (r[0], r[2]);
+  y = u64x4_interleave_hi (r[4], r[6]);
+  a[1] = u32x8_permute_lanes (x, y, 0x20);
+  a[5] = u32x8_permute_lanes (x, y, 0x31);
+
+  x = u64x4_interleave_lo (r[1], r[3]);
+  y = u64x4_interleave_lo (r[5], r[7]);
+  a[2] = u32x8_permute_lanes (x, y, 0x20);
+  a[6] = u32x8_permute_lanes (x, y, 0x31);
+
+  x = u64x4_interleave_hi (r[1], r[3]);
+  y = u64x4_interleave_hi (r[5], r[7]);
+  a[3] = u32x8_permute_lanes (x, y, 0x20);
+  a[7] = u32x8_permute_lanes (x, y, 0x31);
+}
+
+static_always_inline void
+u64x4_transpose (u64x4 a[8])
+{
+  u64x4 r[4];
+
+  r[0] = u64x4_interleave_lo (a[0], a[1]);
+  r[1] = u64x4_interleave_hi (a[0], a[1]);
+  r[2] = u64x4_interleave_lo (a[2], a[3]);
+  r[3] = u64x4_interleave_hi (a[2], a[3]);
+
+  a[0] = u64x4_permute_lanes (r[0], r[2], 0x20);
+  a[1] = u64x4_permute_lanes (r[1], r[3], 0x20);
+  a[2] = u64x4_permute_lanes (r[0], r[2], 0x31);
+  a[3] = u64x4_permute_lanes (r[1], r[3], 0x31);
+}
+
 #endif /* included_vector_avx2_h */
 
 /*