@@ -37,7 +37,7 @@ string-benchset := bcopy bzero memccpy memchr memcmp memcpy memmem memmove \
                   strcat strchr strchrnul strcmp strcpy strcspn strlen \
                   strncasecmp strncat strncmp strncpy strnlen strpbrk strrchr \
                   strspn strstr strcpy_chk stpcpy_chk memrchr strsep strtok \
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â strcoll memcpy-large memmove-large memset-large
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â strcoll memcpy-large memcpy-random memmove-large memset-large
Â
 # Build and run locale-dependent benchmarks only if we're building natively.
 ifeq (no,$(cross-compiling))
new file mode 100644
@@ -0,0 +1,157 @@
+/* Measure memcpy performance.
+Â Â Copyright (C) 2016-2017 Free Software Foundation, Inc.
+Â Â This file is part of the GNU C Library.
+
+Â Â The GNU C Library is free software; you can redistribute it and/or
+Â Â modify it under the terms of the GNU Lesser General Public
+Â Â License as published by the Free Software Foundation; either
+Â Â version 2.1 of the License, or (at your option) any later version.
+
+Â Â The GNU C Library is distributed in the hope that it will be useful,
+Â Â but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Â Â Lesser General Public License for more details.
+
+Â Â You should have received a copy of the GNU Lesser General Public
+Â Â License along with the GNU C Library; if not, see
+  <http://www.gnu.org/licenses/>. */
+
+#define MIN_PAGE_SIZE 131072
+#define TEST_MAIN
+#define TEST_NAME "memcpy-random"
+#include "bench-string.h"
+#include <assert.h>
+
+IMPL (memcpy, 0)
+
+#define NUM_COPIES 4096
+
+typedef struct { uint16_t size; uint16_t freq; } freq_data_t;
+typedef struct { uint8_t align; uint8_t freq; } align_data_t;
+
+#define SIZE_NUM 1024
+#define SIZE_MASK (SIZE_NUM-1)
+static uint8_t size_arr[SIZE_NUM];
+
+/* Frequency data for memcpy of less than 256 bytes based on SPEC2006. */
+static freq_data_t size_freq[] =
+{
+ { 8, 576}, {104, 94}, { 24, 78}, { 48, 58}, { 32, 48}, { 16, 46},
+ { 1, 30}, { 96, 12}, { 72, 11}, {216, 11}, {192,  8}, { 12,  7},
+ {144,  5}, { 2,  4}, { 64,  4}, {120,  4}, { 4,  3}, { 40,  2},
+ { 7,  2}, {168,  2}, {160,  2}, {128,  1}, { 3,  1}, { 9,  1},
+ {176,  1}, {240,  1}, { 11,  1}, { 0,  1}, { 5,  1}, { 6,  1},
+ { 80,  1}, { 52,  1}, {152,  1}, { 10,  1}, { 56,  1}, { 51,  1},
+ { 14,  1}, {208,  1}, { 0,  0}
+};
+
+#define ALIGN_NUM 256
+#define ALIGN_MASK (ALIGN_NUM-1)
+static uint8_t src_align_arr[ALIGN_NUM];
+static uint8_t dst_align_arr[ALIGN_NUM];
+
+/* Source alignment frequency for memcpy based on SPEC2006. */
+static align_data_t src_align_freq[] =
+{
+Â {16, 144}, {8, 86}, {3, 23}, {1, 3}, {0, 0}
+};
+
+/* Destination alignment frequency for memcpy based on SPEC2006. */
+static align_data_t dst_align_freq[] =
+{
+Â {16, 197}, {8, 30}, {3, 23}, {1, 6}, {0, 0}
+};
+
+typedef struct
+{
+Â uint16_t src;
+Â uint16_t dst;
+Â uint16_t len;
+} copy_t;
+
+static copy_t copy[NUM_COPIES];
+
+typedef char *(*proto_t) (char *, const char *, size_t);
+
+static void
+init_copy_distribution (void)
+{
+Â int i, j, freq, size, n;
+
+Â for (n = i = 0; (freq = size_freq[i].freq) != 0; i++)
+Â Â Â for (j = 0, size = size_freq[i].size; j < freq; j++)
+Â Â Â Â Â size_arr[n++] = size;
+Â assert (n == SIZE_NUM);
+
+Â for (n = i = 0; (freq = src_align_freq[i].freq) != 0; i++)
+Â Â Â for (j = 0, size = src_align_freq[i].align; j < freq; j++)
+Â Â Â Â Â src_align_arr[n++] = size - 1;
+Â assert (n == ALIGN_NUM);
+
+Â for (n = i = 0; (freq = dst_align_freq[i].freq) != 0; i++)
+Â Â Â for (j = 0, size = dst_align_freq[i].align; j < freq; j++)
+Â Â Â Â Â dst_align_arr[n++] = size - 1;
+Â assert (n == ALIGN_NUM);
+}
+
+
+static void
+do_one_test (impl_t *impl, char *dst, char *src, copy_t *copy, size_t n)
+{
+Â timing_t start, stop, cur;
+Â size_t iters = INNER_LOOP_ITERS * 20;
+
+Â TIMING_NOW (start);
+Â for (int i = 0; i < iters; ++i)
+Â Â Â for (int j = 0; j < n; j++)
+Â Â Â Â Â CALL (impl, dst + copy[j].dst, src + copy[j].src, copy[j].len);
+Â TIMING_NOW (stop);
+
+Â TIMING_DIFF (cur, start, stop);
+
+Â TIMING_PRINT_MEAN ((double) cur, (double) iters);
+}
+
+static void
+do_test (size_t max_size)
+{
+Â for (int i = 0; i < max_size; i++)
+Â Â Â buf1[i] = i * 3;
+
+Â /* Create a random set of copies with the given size and alignment
+    distributions. */
+Â for (int i = 0; i < NUM_COPIES; i++)
+Â Â Â {
+Â Â Â Â Â copy[i].dst = (rand () & (max_size - 1)) | 1;
+Â Â Â Â Â copy[i].dst &= ~dst_align_arr[rand () & ALIGN_MASK];
+Â Â Â Â Â copy[i].src = (rand () & (max_size - 1)) | 3;
+Â Â Â Â Â copy[i].src &= ~src_align_arr[rand () & ALIGN_MASK];
+Â Â Â Â Â copy[i].len = size_arr[rand () & SIZE_MASK];
+Â Â Â }
+
+Â printf ("Memory size %6zd:", max_size);
+
+Â FOR_EACH_IMPL (impl, 0)
+Â Â Â do_one_test (impl, (char *) buf2, (char *) buf1, copy, NUM_COPIES);
+
+Â putchar ('\n');
+}
+
+int
+test_main (void)
+{
+Â test_init ();
+Â init_copy_distribution ();
+
+Â printf ("%23s", "");
+Â FOR_EACH_IMPL (impl, 0)
+Â Â Â printf ("\t%s", impl->name);
+Â putchar ('\n');
+
+Â for (int i = 4; i <= 64; i = i * 2)
+Â Â Â do_test (i * 1024);
+
+Â return ret;
+}
+
+#include <support/test-driver.c>