summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamjan Marion <damarion@cisco.com>2018-05-19 10:27:10 +0200
committerDamjan Marion <dmarion.lists@gmail.com>2018-05-19 11:22:44 +0000
commit398fdc1a874564c6d31a90fc58ec117fcf58af40 (patch)
tree2cf8db6763504b931a296b421d1be252a22de8ec
parenta849b7b50832a63718924d4b54b6b96e2368b0d3 (diff)
Disable vector code in vlib_buffer_enqueue_to_next if no msb mask function
This fixes ARM64 build where we dont have defined u16x8_msb_mask(...) Change-Id: I864f5134a0d951601810c800f587d173b3b7ef41 Signed-off-by: Damjan Marion <damarion@cisco.com>
-rw-r--r--src/vlib/buffer_node.h2
-rw-r--r--src/vppinfra/vector_sse42.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/vlib/buffer_node.h b/src/vlib/buffer_node.h
index 1c4f4e7eea7..c9f4895c739 100644
--- a/src/vlib/buffer_node.h
+++ b/src/vlib/buffer_node.h
@@ -359,7 +359,7 @@ vlib_buffer_enqueue_to_next (vlib_main_t * vm, vlib_node_runtime_t * node,
next16 = (next16 == u16x16_splat (next16[0]));
u64 bitmap = u8x32_msb_mask ((u8x32) next16);
n_enqueued = count_trailing_zeros (~bitmap) / 2;
-#elif defined(CLIB_HAVE_VEC128)
+#elif defined(CLIB_HAVE_VEC128) && defined(CLIB_HAVE_VEC128_MSB_MASK)
u16x8 next8 = u16x8_load_unaligned (nexts);
next8 = (next8 == u16x8_splat (next8[0]));
u64 bitmap = u8x16_msb_mask ((u8x16) next8);
diff --git a/src/vppinfra/vector_sse42.h b/src/vppinfra/vector_sse42.h
index 50aa662a925..0e334c828b6 100644
--- a/src/vppinfra/vector_sse42.h
+++ b/src/vppinfra/vector_sse42.h
@@ -580,6 +580,8 @@ u8x16_msb_mask (u8x16 v)
return _mm_movemask_epi8 ((__m128i) v);
}
+#define CLIB_HAVE_VEC128_MSB_MASK
+
#undef _signed_binop
#endif /* included_vector_sse2_h */