From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oa1-x2a.google.com (mail-oa1-x2a.google.com [IPv6:2001:4860:4864:20::2a]) by sourceware.org (Postfix) with ESMTPS id 4E5E33858D33 for ; Tue, 3 Oct 2023 05:43:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4E5E33858D33 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-oa1-x2a.google.com with SMTP id 586e51a60fabf-1e10507a4d6so361216fac.1 for ; Mon, 02 Oct 2023 22:43:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696311801; x=1696916601; darn=sourceware.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=q4Uv5rwuJ5K+YlgWWKNgXRiuh68/+uZ9ThjrPA0wSZg=; b=SO4foBvY3Wl0ZEymuqEbhJr0Yz1PNmU0Yv2Sje1vU6hbAr0dFBDQgPaONEQIIa0W+e SzG3S0fkchxW5lOYmWx42ju9rRlS/4hWG0cuVTSlHpCB9xzm5uxaViROYca0Mi+d53AZ 5hgenIHn+4S376dsOqIo0I/0FE1kw94IsjcsUMA7NRHOuI9UgsOHETb5H9JEhuu58nZU vfQC+p0q09z2MGNc3LYSAQHWmc04NNk6sS0+72pLNwfLu9gFGPZQ6Fi+NcaZsFI+WO4+ 3cPjpVV5s6mkQBpxeJvp20ORY5sDSDuVByqAufarXWgP4QNCKXsQGT/fAMvrnSGgDWUu kgJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696311801; x=1696916601; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=q4Uv5rwuJ5K+YlgWWKNgXRiuh68/+uZ9ThjrPA0wSZg=; b=PpOR4QeKsSF8i95O7sPO9oZJl1U1YHU2q9JdNTRfh7JDW322Dk21+adxRfUKDodd8T 9latxTtnZn1+tlTOouLXYb2gUjco60olM3cD95+iKX22GFnysfo1eC85Cpl6glh5pyWq UEQ8LmLf52BsgqnacwzuirCrRVf+oq4BbteyUsZliTzF7eK99/xrLCCdlaQTKBn019Ec p6Yes9YnS+jProl9jVzTJ8ssJNd5xrIYSrSyyYuo2uesKmAnVFCLRVwB6Gn/K6c5Q17O OXgyAM4zz334nWm+8Zndpzsfej/EuY7lKcmuoffDs5qW6a5V/GK13mURDZfLYWdsHt0y vWQQ== X-Gm-Message-State: AOJu0Yyk9Ymuvi4kH2HLV6HsMglHVmxP762iwb0bg9XM4Y5XPpCNlz2d LSiWs0X2SZO3VtLv1nTXcRpsQDW90cJ0w3slq46ig+2I X-Google-Smtp-Source: AGHT+IGxIgKTV7NARY8JWyOChKXX5pX/pDoY16bmeKum3cFiAIAJyWoAN3s/pc17I2dBiYFeNCGCHBU0hiMdRdhp97k= X-Received: by 2002:a05:6870:d1c1:b0:1b3:f1f7:999e with SMTP id b1-20020a056870d1c100b001b3f1f7999emr16931830oac.45.1696311800778; Mon, 02 Oct 2023 22:43:20 -0700 (PDT) MIME-Version: 1.0 References: <20231002193311.3985890-1-adhemerval.zanella@linaro.org> <20231002193311.3985890-2-adhemerval.zanella@linaro.org> In-Reply-To: <20231002193311.3985890-2-adhemerval.zanella@linaro.org> From: Noah Goldstein Date: Tue, 3 Oct 2023 00:43:09 -0500 Message-ID: Subject: Re: [PATCH v8 1/7] string: Add internal memswap implementation To: Adhemerval Zanella Cc: libc-alpha@sourceware.org, Paul Eggert , Florian Weimer Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-9.2 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,KAM_SHORT,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On Mon, Oct 2, 2023 at 2:33=E2=80=AFPM Adhemerval Zanella wrote: > > The prototype is: > > void __memswap (void *restrict p1, void *restrict p2, size_t n) > > The function swaps the content of two memory blocks P1 and P2 of > len N. Memory overlap is NOT handled. > > It will be used on qsort optimization. > > Checked on x86_64-linux-gnu and aarch64-linux-gnu. > --- > include/string.h | 3 + > string/Makefile | 13 +++ > string/memswap.c | 41 +++++++++ > string/test-memswap.c | 191 ++++++++++++++++++++++++++++++++++++++++++ > 4 files changed, 248 insertions(+) > create mode 100644 string/memswap.c > create mode 100644 string/test-memswap.c > > diff --git a/include/string.h b/include/string.h > index 86d1fa4abe..f31a7f6006 100644 > --- a/include/string.h > +++ b/include/string.h > @@ -45,6 +45,9 @@ extern void *__memrchr (const void *__s, int __c, size_= t __n) > extern void *__memchr (const void *__s, int __c, size_t __n) > __attribute_pure__; > > +extern void __memswap (void *restrict __p1, void *restrict __p2, size_t = __n) > + attribute_hidden; > + > extern void __bzero (void *__s, size_t __n) __THROW __nonnull ((1)); > > extern int __ffs (int __i) __attribute__ ((const)); > diff --git a/string/Makefile b/string/Makefile > index 8cdfd5b000..3d0a3d5682 100644 > --- a/string/Makefile > +++ b/string/Makefile > @@ -69,6 +69,7 @@ routines :=3D \ > mempcpy \ > memrchr \ > memset \ > + memswap \ > rawmemchr \ > sigabbrev_np \ > sigdescr_np \ > @@ -209,6 +210,18 @@ tests :=3D \ > tst-xbzero-opt \ > # tests > > +tests-static-internal :=3D \ > + test-memswap \ > +# tests-static-internal > + > +tests-internal :=3D \ > + $(tests-static-internal) \ > + # tests-internal > + > +tests-static :=3D \ > + $(tests-static-internal) \ > + # tests-static > + > # Both tests require the .mo translation files generated by msgfmt. > tests-translation :=3D \ > tst-strerror \ > diff --git a/string/memswap.c b/string/memswap.c > new file mode 100644 > index 0000000000..37640c47ad > --- /dev/null > +++ b/string/memswap.c > @@ -0,0 +1,41 @@ > +/* Swap the content of two memory blocks, overlap is NOT handled. > + Copyright (C) 2023 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 > + . */ > + > +#include > + > +void > +__memswap (void *restrict p1, void *restrict p2, size_t n) > +{ Thought you where making this static/moving to header? > + /* Use multiple small memcpys with constant size to enable inlining on= most > + targets. */ > + enum { SWAP_GENERIC_SIZE =3D 32 }; > + unsigned char tmp[SWAP_GENERIC_SIZE]; > + while (n > SWAP_GENERIC_SIZE) > + { > + memcpy (tmp, p1, SWAP_GENERIC_SIZE); > + p1 =3D __mempcpy (p1, p2, SWAP_GENERIC_SIZE); > + p2 =3D __mempcpy (p2, tmp, SWAP_GENERIC_SIZE); > + n -=3D SWAP_GENERIC_SIZE; > + } > + while (n > 0) > + { > + unsigned char t =3D ((unsigned char *)p1)[--n]; > + ((unsigned char *)p1)[n] =3D ((unsigned char *)p2)[n]; > + ((unsigned char *)p2)[n] =3D t; > + } > +} > diff --git a/string/test-memswap.c b/string/test-memswap.c > new file mode 100644 > index 0000000000..7696c43711 > --- /dev/null > +++ b/string/test-memswap.c > @@ -0,0 +1,191 @@ > +/* Test and measure memcpy functions. > + Copyright (C) 2023 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 > + . */ > + > +#include > +#include > + > +#define TEST_MAIN > +#define BUF1PAGES 3 > +#include "test-string.h" > + > +static unsigned char *ref1; > +static unsigned char *ref2; > + > +static void > +do_one_test (unsigned char *p1, unsigned char *ref1, unsigned char *p2, > + unsigned char *ref2, size_t len) > +{ > + __memswap (p1, p2, len); > + > + TEST_COMPARE_BLOB (p1, len, ref2, len); > + TEST_COMPARE_BLOB (p2, len, ref1, len); > +} > + > +static inline void > +do_test (size_t align1, size_t align2, size_t len) > +{ > + align1 &=3D page_size; > + if (align1 + len >=3D page_size) > + return; > + > + align2 &=3D page_size; > + if (align2 + len >=3D page_size) > + return; > + > + unsigned char *p1 =3D buf1 + align1; > + unsigned char *p2 =3D buf2 + align2; > + for (size_t repeats =3D 0; repeats < 2; ++repeats) > + { > + size_t i, j; > + for (i =3D 0, j =3D 1; i < len; i++, j +=3D 23) > + { > + ref1[i] =3D p1[i] =3D j; > + ref2[i] =3D p2[i] =3D UCHAR_MAX - j; > + } > + > + do_one_test (p1, ref1, p2, ref2, len); > + } > +} > + > +static void > +do_random_tests (void) > +{ > + for (size_t n =3D 0; n < ITERATIONS; n++) > + { > + size_t len, size, size1, size2, align1, align2; > + > + if (n =3D=3D 0) > + { > + len =3D getpagesize (); > + size =3D len + 512; > + size1 =3D size; > + size2 =3D size; > + align1 =3D 512; > + align2 =3D 512; > + } > + else > + { > + if ((random () & 255) =3D=3D 0) > + size =3D 65536; > + else > + size =3D 768; > + if (size > page_size) > + size =3D page_size; > + size1 =3D size; > + size2 =3D size; > + size_t i =3D random (); > + if (i & 3) > + size -=3D 256; > + if (i & 1) > + size1 -=3D 256; > + if (i & 2) > + size2 -=3D 256; > + if (i & 4) > + { > + len =3D random () % size; > + align1 =3D size1 - len - (random () & 31); > + align2 =3D size2 - len - (random () & 31); > + if (align1 > size1) > + align1 =3D 0; > + if (align2 > size2) > + align2 =3D 0; > + } > + else > + { > + align1 =3D random () & 63; > + align2 =3D random () & 63; > + len =3D random () % size; > + if (align1 + len > size1) > + align1 =3D size1 - len; > + if (align2 + len > size2) > + align2 =3D size2 - len; > + } > + } > + unsigned char *p1 =3D buf1 + page_size - size1; > + unsigned char *p2 =3D buf2 + page_size - size2; > + size_t j =3D align1 + len + 256; > + if (j > size1) > + j =3D size1; > + for (size_t i =3D 0; i < j; ++i) > + ref1[i] =3D p1[i] =3D random () & 255; > + > + j =3D align2 + len + 256; > + if (j > size2) > + j =3D size2; > + > + for (size_t i =3D 0; i < j; ++i) > + ref2[i] =3D p2[i] =3D random () & 255; > + > + do_one_test (p1 + align1, ref1 + align1, p2 + align2, ref2 + align= 2, len); > + } > +} > + > +static int > +test_main (void) > +{ > + test_init (); > + /* Use the start of buf1 for reference buffers. */ > + ref1 =3D buf1; > + ref2 =3D buf1 + page_size; > + buf1 =3D ref2 + page_size; > + > + printf ("%23s", ""); > + printf ("\t__memswap\n"); > + > + for (size_t i =3D 0; i < 18; ++i) > + { > + do_test (0, 0, 1 << i); > + do_test (i, 0, 1 << i); > + do_test (0, i, 1 << i); > + do_test (i, i, 1 << i); > + } > + > + for (size_t i =3D 0; i < 32; ++i) > + { > + do_test (0, 0, i); > + do_test (i, 0, i); > + do_test (0, i, i); > + do_test (i, i, i); > + } > + > + for (size_t i =3D 3; i < 32; ++i) > + { > + if ((i & (i - 1)) =3D=3D 0) > + continue; > + do_test (0, 0, 16 * i); > + do_test (i, 0, 16 * i); > + do_test (0, i, 16 * i); > + do_test (i, i, 16 * i); > + } > + > + for (size_t i =3D 19; i <=3D 25; ++i) > + { > + do_test (255, 0, 1 << i); > + do_test (0, 4000, 1 << i); > + do_test (0, 255, i); > + do_test (0, 4000, i); > + } > + > + do_test (0, 0, getpagesize ()); > + > + do_random_tests (); > + > + return 0; > +} > + > +#include > -- > 2.34.1 >