From patchwork Tue Oct 3 12:22:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 728726 Delivered-To: patch@linaro.org Received: by 2002:a5d:60c8:0:b0:31d:da82:a3b4 with SMTP id x8csp2112467wrt; Tue, 3 Oct 2023 05:23:08 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHoJqdZipZlMc8HD1Myrlb77REwdxf0thDDBHX+q06Xmj6uSGRop2ZUz0y4XHVpiVyvHFTR X-Received: by 2002:aa7:d9c5:0:b0:532:e4b0:557e with SMTP id v5-20020aa7d9c5000000b00532e4b0557emr13104914eds.36.1696335788192; Tue, 03 Oct 2023 05:23:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696335788; cv=none; d=google.com; s=arc-20160816; b=L0fsES8gKwvQZBKb6OXgJPEVkzkkn2ckpii4OZPMYN+hIMGwsja4f4lN6sRwCqMD26 rHEGUj0BgRLFDA2uTegwWBXARlvtsrzpxCTBVa2fWqkmmrHHYSyvGnR7Qkg8mIw/2RpN fqOuq8NIOTc+z5B/Mx48uB69pToYxhnoC6IhtvI/9sNFtakKZNXP+i82XBIF6ciNKFrK +hOiEH1XXHURmpg+2/sfA0eMwoJI5Mifg3eUmtm2HEI5D7O9a9KqfHa3QFpyNkVl870l oUFdqFQISas/VAncF4oQ92XZwB2kxcltnnkH1AvnioaDdgqLHbe4U4aKwveGRndX+s+M RwJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature:dmarc-filter:delivered-to; bh=0BnZhnyLpxUW3RaKIcNqMQA3Ad1H2ZAPclge8iexDEA=; fh=ubzLPtaquqORyAJ/TX35zypB35/iXKzZJOEWlgP8mu4=; b=pwHacgq1WMo8SdWTvvTqy7TayIjZzZfl9qVqwk3dMOFTXL9jQYDBsivhMRFOKmRl4L 9MrAIzblp8ipJIB95mpPfSQwNxCxiNCTq1WhZHiw5Fgq3LBMFUTzojNU36ebu6ObHVeP b0XgUNILVg3MnXElNKEzHUCTqaGj/FLRNuPLIH5U4Sm0+4/WKcJvaZe1UYyQVew3s6xf fjw4OvAiF8ACsb2Hq/ZshWcZD/KILyFmh3PSLafMtgE7Cyf3o53N3CbJO6F4QZwStK0x UYH6Fk6cQKNN37hr35EE1c6XCMwubqjezR7N7nKRAqozQpYgxRlGy9RtV8J2/9i3t8Si cN6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=pEH0JUTR; spf=pass (google.com: domain of libc-alpha-bounces+patch=linaro.org@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="libc-alpha-bounces+patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id bf2-20020a0564021a4200b005223fbd4d87si539222edb.503.2023.10.03.05.23.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 05:23:08 -0700 (PDT) Received-SPF: pass (google.com: domain of libc-alpha-bounces+patch=linaro.org@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=pEH0JUTR; spf=pass (google.com: domain of libc-alpha-bounces+patch=linaro.org@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="libc-alpha-bounces+patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D5C103856DC8 for ; Tue, 3 Oct 2023 12:23:06 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pl1-x632.google.com (mail-pl1-x632.google.com [IPv6:2607:f8b0:4864:20::632]) by sourceware.org (Postfix) with ESMTPS id 75F4D3858D38 for ; Tue, 3 Oct 2023 12:22:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 75F4D3858D38 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org Received: by mail-pl1-x632.google.com with SMTP id d9443c01a7336-1c60a514f3aso6445785ad.3 for ; Tue, 03 Oct 2023 05:22:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1696335778; x=1696940578; darn=sourceware.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=0BnZhnyLpxUW3RaKIcNqMQA3Ad1H2ZAPclge8iexDEA=; b=pEH0JUTROa6ppy4YgcN9mOSWnSI1n7gyDkgPPyfg4sBJa+m9FCpeSSBJyT7RmCVaGk kUaz10pfbo/xIFVbZHAIY81rrPmjvu3Muvkfwu6gaTgsFN3UBRqthdbWa9FdHhthMIYc csaDioanh9CfwgQkyk1QEG2wRKtLfhxg0rm8J6b5rcHUXtK4a9H4NdlRh0LBrtgdgvGg NkY+bjSoijXaMsBDXLUhXx0PSWIIXu+2pIMnQ4iGGDGpYfzrdS0iQ9RS31Zpg3B/fCVB 6AzsTMWYOjFn37uahGR/bJ767gZyi96nFCWDGXpsnwWbbYZwIowluFlXHEVbkDNCWXrl dtgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696335778; x=1696940578; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0BnZhnyLpxUW3RaKIcNqMQA3Ad1H2ZAPclge8iexDEA=; b=Pl+LAnAgLJC99YeeUUH3XzeX5Wt8id1iAT7srF371DEQn+FiF64gKmVN6IGt7HTuXj SFI8MMHKBOHO3KIIMkB6l3heyyb1/kyIi6KoDY761R0nEiQH3Q+qyZvS0sd3OLmk1OCo qIweT+kM1qkZQhlGVc3dwbYWlmn8uzVkE5NFcO6VvmNX//hWEnmOnIhUxCuYEzO35dhM C4oOVAldBZrxO/n/5FbbU/pYXEwxlCXA03OIRbHQA+0Ua6k/n7DkltExz7C1ENf5DFq/ 0Vg2pwcFE5zMiZnHOmkBcgJbQZnSoVf1S0YVwCTN4U6+I8lXSATmD+19GlmpmILNenJS /pyg== X-Gm-Message-State: AOJu0YyX020As/ZqR35TChM7lV+Q2MILE6w7Yz4GGab4hYenSmCvQhxN CxjD5FI54r6ipMpqAw1UzsLZMVhXLcNmNqGjqZaX0g== X-Received: by 2002:a17:902:ed54:b0:1c7:2f33:7ccd with SMTP id y20-20020a170902ed5400b001c72f337ccdmr14233261plb.33.1696335777947; Tue, 03 Oct 2023 05:22:57 -0700 (PDT) Received: from mandiga.. ([2804:1b3:a7c1:feaf:31ef:b40c:b4e5:77c]) by smtp.gmail.com with ESMTPSA id b1-20020a170902d30100b001c5de2f1686sm1403881plc.99.2023.10.03.05.22.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 05:22:57 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org, Noah Goldstein , Paul Eggert , Florian Weimer Subject: [PATCH v8 1/7] string: Add internal memswap implementation Date: Tue, 3 Oct 2023 09:22:45 -0300 Message-Id: <20231003122251.3325435-2-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231003122251.3325435-1-adhemerval.zanella@linaro.org> References: <20231003122251.3325435-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, 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 X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+patch=linaro.org@sourceware.org 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. Reviewed-by: Noah Goldstein --- string/Makefile | 12 +++ string/test-memswap.c | 192 ++++++++++++++++++++++++++++++++++++++ sysdeps/generic/memswap.h | 41 ++++++++ 3 files changed, 245 insertions(+) create mode 100644 string/test-memswap.c create mode 100644 sysdeps/generic/memswap.h diff --git a/string/Makefile b/string/Makefile index 8cdfd5b000..fb101db778 100644 --- a/string/Makefile +++ b/string/Makefile @@ -209,6 +209,18 @@ tests := \ tst-xbzero-opt \ # tests +tests-static-internal := \ + test-memswap \ +# tests-static-internal + +tests-internal := \ + $(tests-static-internal) \ + # tests-internal + +tests-static := \ + $(tests-static-internal) \ + # tests-static + # Both tests require the .mo translation files generated by msgfmt. tests-translation := \ tst-strerror \ diff --git a/string/test-memswap.c b/string/test-memswap.c new file mode 100644 index 0000000000..162beb91e3 --- /dev/null +++ b/string/test-memswap.c @@ -0,0 +1,192 @@ +/* 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 +#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 &= page_size; + if (align1 + len >= page_size) + return; + + align2 &= page_size; + if (align2 + len >= page_size) + return; + + unsigned char *p1 = buf1 + align1; + unsigned char *p2 = buf2 + align2; + for (size_t repeats = 0; repeats < 2; ++repeats) + { + size_t i, j; + for (i = 0, j = 1; i < len; i++, j += 23) + { + ref1[i] = p1[i] = j; + ref2[i] = p2[i] = UCHAR_MAX - j; + } + + do_one_test (p1, ref1, p2, ref2, len); + } +} + +static void +do_random_tests (void) +{ + for (size_t n = 0; n < ITERATIONS; n++) + { + size_t len, size, size1, size2, align1, align2; + + if (n == 0) + { + len = getpagesize (); + size = len + 512; + size1 = size; + size2 = size; + align1 = 512; + align2 = 512; + } + else + { + if ((random () & 255) == 0) + size = 65536; + else + size = 768; + if (size > page_size) + size = page_size; + size1 = size; + size2 = size; + size_t i = random (); + if (i & 3) + size -= 256; + if (i & 1) + size1 -= 256; + if (i & 2) + size2 -= 256; + if (i & 4) + { + len = random () % size; + align1 = size1 - len - (random () & 31); + align2 = size2 - len - (random () & 31); + if (align1 > size1) + align1 = 0; + if (align2 > size2) + align2 = 0; + } + else + { + align1 = random () & 63; + align2 = random () & 63; + len = random () % size; + if (align1 + len > size1) + align1 = size1 - len; + if (align2 + len > size2) + align2 = size2 - len; + } + } + unsigned char *p1 = buf1 + page_size - size1; + unsigned char *p2 = buf2 + page_size - size2; + size_t j = align1 + len + 256; + if (j > size1) + j = size1; + for (size_t i = 0; i < j; ++i) + ref1[i] = p1[i] = random () & 255; + + j = align2 + len + 256; + if (j > size2) + j = size2; + + for (size_t i = 0; i < j; ++i) + ref2[i] = p2[i] = random () & 255; + + do_one_test (p1 + align1, ref1 + align1, p2 + align2, ref2 + align2, len); + } +} + +static int +test_main (void) +{ + test_init (); + /* Use the start of buf1 for reference buffers. */ + ref1 = buf1; + ref2 = buf1 + page_size; + buf1 = ref2 + page_size; + + printf ("%23s", ""); + printf ("\t__memswap\n"); + + for (size_t i = 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 = 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 = 3; i < 32; ++i) + { + if ((i & (i - 1)) == 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 = 19; i <= 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 diff --git a/sysdeps/generic/memswap.h b/sysdeps/generic/memswap.h new file mode 100644 index 0000000000..f09dae1ebb --- /dev/null +++ b/sysdeps/generic/memswap.h @@ -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 + +static inline void +__memswap (void *__restrict p1, void *__restrict p2, size_t n) +{ + /* Use multiple small memcpys with constant size to enable inlining on most + targets. */ + enum { SWAP_GENERIC_SIZE = 32 }; + unsigned char tmp[SWAP_GENERIC_SIZE]; + while (n > SWAP_GENERIC_SIZE) + { + memcpy (tmp, p1, SWAP_GENERIC_SIZE); + p1 = __mempcpy (p1, p2, SWAP_GENERIC_SIZE); + p2 = __mempcpy (p2, tmp, SWAP_GENERIC_SIZE); + n -= SWAP_GENERIC_SIZE; + } + while (n > 0) + { + unsigned char t = ((unsigned char *)p1)[--n]; + ((unsigned char *)p1)[n] = ((unsigned char *)p2)[n]; + ((unsigned char *)p2)[n] = t; + } +}