vppinfra: fix issue when copying 16 bytes with clib_memcpy

Current code wos copying same data twice when length is 16.

Change-Id: I8d935b32f61672aaea9789c097a5083ae8f78cdd
Signed-off-by: Damjan Marion <damarion@cisco.com>

diff --git a/src/vppinfra/memcpy_avx.h b/src/vppinfra/memcpy_avx.h
index e3feb76..d95bbad 100644 (file)
--- a/src/vppinfra/memcpy_avx.h
+++ b/src/vppinfra/memcpy_avx.h
@@ -185,6 +185,11 @@ clib_memcpy (void *dst, const void *src, size_t n)
        /**
          * Fast way when copy size doesn't exceed 512 bytes
          */
+  if (n == 16)
+    {
+      clib_mov16 ((u8 *) dst, (const u8 *) src);
+      return ret;
+    }
   if (n <= 32)
     {
       clib_mov16 ((u8 *) dst, (const u8 *) src);

diff --git a/src/vppinfra/memcpy_sse3.h b/src/vppinfra/memcpy_sse3.h
index 4fc48c8..49baf5e 100644 (file)
--- a/src/vppinfra/memcpy_sse3.h
+++ b/src/vppinfra/memcpy_sse3.h
@@ -224,6 +224,11 @@ clib_memcpy (void *dst, const void *src, size_t n)
        /**
         * Fast way when copy size doesn't exceed 512 bytes
         */
+  if (n == 16)
+    {
+      clib_mov16 ((u8 *) dst, (const u8 *) src);
+      return ret;
+    }
   if (n <= 32)
     {
       clib_mov16 ((u8 *) dst, (const u8 *) src);