From nobody Sat Sep 23 18:22:28 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RtHYJ5vVmz4v38p; Sat, 23 Sep 2023 18:22:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RtHYJ4BW9z4ks5; Sat, 23 Sep 2023 18:22:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695493348; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CcoXpqANpks7JjUoGWaN9UdOohEv3kIgMkQ5rxzQmJY=; b=LZbJu7pEv+PKk5IaR/GHoHag0FW1jGmY4kb+l9OkFSTSjbyM4wwm8gpoht0IObk1NNSB6J wtD591XUJqdp9A9vLvxiuSrBIU1MMshVYWFLcZrM+KrDnbY9c/0r+n1cWcfzGC8WfFFwXx 7plbbRGMQpGAVplEL506u30991Q34E3y/sfgjsiX7clJfIvl/7aYAJqChpOW/vv6wuL9+e XBwCwzMiPK44LM2A/hSUJIOgObNzYHrb+6eidjMvC4DpdI7HEtNG9dlWNPG7erJ03c9Ad+ jCHUa92KDwUjfkXmMOSR+nIF0R2xuAikY+4z5FbHtqTohXMS0jW4QG/IzFmrCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695493348; a=rsa-sha256; cv=none; b=f+3dA5Y/HlTaMC2NNYa9EbO7TvDCtdmwpBA6+qohItm60cF7fyGaiuCpMTa7vG7tDC04S2 9jXcOTHzi3F1IdrvANzzhisEMJw/Y51zmOaKsTxNw+qp2sSrMmj/3cgA7c1OA69ve+4B/n 003YY52mQHfgsTkCI16qPSnFZ6Gt+0cdeaIbewcu4XxW1vYcJd/Vt1ih+6xMzIkeqObGLi nr4iFpsCo/56Ub5iIJeXtiIFDKGxqh6lISC/1JH0DVIs0Y3HKoZVMdakw4bvXUmh/V9qI7 X1mgKm1zL895/K6ZjVQIx0yvHzUTvW+rfZe6jppbKLgn0X9EYJ+PRhjPMy57/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695493348; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CcoXpqANpks7JjUoGWaN9UdOohEv3kIgMkQ5rxzQmJY=; b=i856wEXv83cnrQeRjnV69sXdBfcdob5ap7ROwNMWjCeGGK1o9vyFfEOBFevGmR06qJG7mo SD/0oxON7xOn3YLpakQEEuV6IFgUZhxR8b83v8yX41zsJ0CWMBP4aPZO5NbUJx8Rq4Ry8R xaxIc9orQHUpmzH5dIB6dEvGPrEDhvZFrVAnR6wclVQ/iQG+/73We4uBuEvFFCvkH6R2zY KJ7XBYl65utrFTPUy1tSolDSNH1z0Lox21m7QtJKoA4y+Y8GSrEBM1IeuLE9SWD5gxL0QN Snqd7/I9MavLOZYxIVUsxy17MZUK0KHLdy42NY8dO4OyNUnhD3/NuZVS9IxgFw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RtHYJ2qWXzq6; Sat, 23 Sep 2023 18:22:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38NIMSOS003820; Sat, 23 Sep 2023 18:22:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38NIMSre003817; Sat, 23 Sep 2023 18:22:28 GMT (envelope-from git) Date: Sat, 23 Sep 2023 18:22:28 GMT Message-Id: <202309231822.38NIMSre003817@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 73883def3215 - stable/14 - lib/libc/tests/string: derive strspn(3) tests from strcspn(3) tests List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 73883def32155cef504dcabcb9f4d8ff56fa661e Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=73883def32155cef504dcabcb9f4d8ff56fa661e commit 73883def32155cef504dcabcb9f4d8ff56fa661e Author: Robert Clausecker AuthorDate: 2023-08-21 15:30:23 +0000 Commit: Robert Clausecker CommitDate: 2023-09-23 18:20:28 +0000 lib/libc/tests/string: derive strspn(3) tests from strcspn(3) tests To cover the new optimised amd64 strspn(3) SIMD implementation, extend the previously written strcspn(3) unit test to also cover strspn(3). Sponsored by: The FreeBSD Foundation Approved by: mjg MFC after: 1 week MFC to: stable/14 Differential Revision: https://reviews.freebsd.org/D41567 (cherry picked from commit 468adddd75f6461fcdd2151122d85879ec592a5b) --- lib/libc/tests/string/Makefile | 2 +- lib/libc/tests/string/strcspn_test.c | 26 +++++++++++++++++++++++--- lib/libc/tests/string/strspn_test.c | 30 ++++++++++++++++++++++++++++++ 3 files changed, 54 insertions(+), 4 deletions(-) diff --git a/lib/libc/tests/string/Makefile b/lib/libc/tests/string/Makefile index 639b7f2d2d2d..1994b128ab57 100644 --- a/lib/libc/tests/string/Makefile +++ b/lib/libc/tests/string/Makefile @@ -13,6 +13,7 @@ ATF_TESTS_C+= memset_s_test ATF_TESTS_C+= stpncpy_test ATF_TESTS_C+= strcspn_test ATF_TESTS_C+= strerror2_test +ATF_TESTS_C+= strspn_test ATF_TESTS_C+= strverscmp_test ATF_TESTS_C+= strxfrm_test ATF_TESTS_C+= wcscasecmp_test @@ -34,7 +35,6 @@ NETBSD_ATF_TESTS_C+= strerror_test NETBSD_ATF_TESTS_C+= strlen_test NETBSD_ATF_TESTS_C+= strpbrk_test NETBSD_ATF_TESTS_C+= strrchr_test -NETBSD_ATF_TESTS_C+= strspn_test NETBSD_ATF_TESTS_C+= swab_test SRCS.strerror2_test= strerror_test.c diff --git a/lib/libc/tests/string/strcspn_test.c b/lib/libc/tests/string/strcspn_test.c index 59da497c16c6..abacdcbbf18a 100644 --- a/lib/libc/tests/string/strcspn_test.c +++ b/lib/libc/tests/string/strcspn_test.c @@ -42,6 +42,12 @@ enum { enum { NOMATCH, MATCH }; +#ifdef STRSPN +#define STRXSPN strspn +#else +#define STRXSPN strcspn +#endif + static void testcase(char *buf, size_t buflen, char *set, size_t setlen, int want_match) { @@ -50,7 +56,11 @@ testcase(char *buf, size_t buflen, char *set, size_t setlen, int want_match) assert(setlen < UCHAR_MAX - 2); for (i = 0; i < buflen; i++) +#ifdef STRSPN + buf[i] = UCHAR_MAX - i % (setlen > 0 ? setlen : 1); +#else /* strcspn */ buf[i] = 1 + i % (UCHAR_MAX - setlen - 1); +#endif buf[i] = '\0'; @@ -59,15 +69,25 @@ testcase(char *buf, size_t buflen, char *set, size_t setlen, int want_match) set[i] = '\0'; +#ifdef STRSPN + if (setlen == 0) + expected = 0; + else if (want_match == MATCH && buflen > 0) { + buf[buflen - 1] = 1; + expected = buflen - 1; + } else + expected = buflen; +#else /* strcspn */ if (want_match == MATCH && buflen > 0 && setlen > 0) { buf[buflen - 1] = UCHAR_MAX; expected = buflen - 1; } else expected = buflen; +#endif - outcome = strcspn(buf, set); - ATF_CHECK_EQ_MSG(expected, outcome, "strcspn(%p[%zu], %p[%zu]) = %zu != %zu", - buf, buflen, set, setlen, outcome, expected); + outcome = STRXSPN(buf, set); + ATF_CHECK_EQ_MSG(expected, outcome, "%s(%p[%zu], %p[%zu]) = %zu != %zu", + __XSTRING(STRXSPN), buf, buflen, set, setlen, outcome, expected); } /* test set with all alignments and lengths of buf */ diff --git a/lib/libc/tests/string/strspn_test.c b/lib/libc/tests/string/strspn_test.c new file mode 100644 index 000000000000..73a08ddefa1b --- /dev/null +++ b/lib/libc/tests/string/strspn_test.c @@ -0,0 +1,30 @@ +/*- + * Copyright (c) 2023 The FreeBSD Foundation + * + * This software was developed by Robert Clausecker + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ''AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE + */ + +#define STRSPN +#include "strcspn_test.c"