From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf1-x42d.google.com (mail-pf1-x42d.google.com [IPv6:2607:f8b0:4864:20::42d]) by sourceware.org (Postfix) with ESMTPS id 8F19D3858001 for ; Tue, 26 Oct 2021 18:57:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 8F19D3858001 Received: by mail-pf1-x42d.google.com with SMTP id d9so356387pfl.6 for ; Tue, 26 Oct 2021 11:57:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=51OD2hgM77gN5ieVmEwum8k2qscuWI+a5/3IbBZCEFY=; b=nIpeQXrL4OjH/SJXKlH8cLUBHri9N1/skf9t7g2W4T0GwOCGeA3cJ81f0KXHt2LZTY ghcQyGWonmFFEil5HnrDxGDWiBVrz/jyNVfhRddqaSWHVksKGt6y9YzW3a2d/mPxYv1O eJIScvRJl5D7YXmurEhF3+AZGC5FV6bNn86dARVWfj/9+jr69P8AC7DnE253TCns3/6m FFoXtdIINupdfNQUv/dPb4bY8I7bmzBWd2hMdVXEnD6W93RI37RhXXHXOoycwRDwxpB0 f0b04HlAjFwB9VgmkyuMkNJdKu1UH0ds7DlkCbNugdkYYVarS8C63rpE5Cxy8SK2vbtp UiTQ== X-Gm-Message-State: AOAM532dqC2LM/GnMPjPmia3iP0fyOJZu9EDWyy+LVdYuI0KAhaMxoLP MJPbnKakjfx1s5d6joBdEUtsyY5vjko= X-Google-Smtp-Source: ABdhPJwu/C4V+AdnN8xXMU6fzuP5zGx4pB17nK/chazCqgIJpKxMY0ZDTdyWEQaJmvrxE6z5UwIHbg== X-Received: by 2002:a05:6a00:887:b0:44b:dee9:b7b1 with SMTP id q7-20020a056a00088700b0044bdee9b7b1mr28525064pfj.84.1635274665609; Tue, 26 Oct 2021 11:57:45 -0700 (PDT) Received: from gnu-cfl-2.localdomain ([2607:fb90:a63f:468b:b937:402b:0:c66]) by smtp.gmail.com with ESMTPSA id h10sm24626003pfi.208.2021.10.26.11.57.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Oct 2021 11:57:45 -0700 (PDT) Received: by gnu-cfl-2.localdomain (Postfix, from userid 1000) id 7A33D1A0948; Tue, 26 Oct 2021 11:57:44 -0700 (PDT) Date: Tue, 26 Oct 2021 11:57:44 -0700 From: "H.J. Lu" To: Noah Goldstein Cc: libc-alpha@sourceware.org, hjl.tools@gmail.com, carlos@systemhalted.org Subject: Re: [PATCH v14 3/4] String: Add tests for __memcmpeq Message-ID: References: <20210927203827.2852935-1-goldstein.w.n@gmail.com> <20211023232404.622433-1-goldstein.w.n@gmail.com> <20211023232404.622433-3-goldstein.w.n@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20211023232404.622433-3-goldstein.w.n@gmail.com> X-Spam-Status: No, score=-3032.4 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.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Oct 2021 18:57:48 -0000 On Sat, Oct 23, 2021 at 06:24:03PM -0500, Noah Goldstein wrote: > No bug. > > This commit adds tests for the new function __memcmpeq. The new tests > use the existing tests in 'test-memcmp.c' but relax the result > requirement to only check for zero or non-zero returns. > > All string tests include test-memcmpeq are passing. > --- > string/Makefile | 4 ++-- > string/test-memcmp.c | 34 ++++++++++++++++++++++------------ > string/test-memcmpeq.c | 21 +++++++++++++++++++++ > 3 files changed, 45 insertions(+), 14 deletions(-) > create mode 100644 string/test-memcmpeq.c > > diff --git a/string/Makefile b/string/Makefile > index f0fce2a0b8..40d6fac133 100644 > --- a/string/Makefile > +++ b/string/Makefile > @@ -48,8 +48,8 @@ routines := strcat strchr strcmp strcoll strcpy strcspn \ > sigdescr_np sigabbrev_np strerrorname_np \ > strerrordesc_np > > -strop-tests := memchr memcmp memcpy memmove mempcpy memset memccpy \ > - stpcpy stpncpy strcat strchr strcmp strcpy strcspn \ > +strop-tests := memchr memcmp memcpy memcmpeq memmove mempcpy memset \ > + memccpy stpcpy stpncpy strcat strchr strcmp strcpy strcspn \ > strlen strncmp strncpy strpbrk strrchr strspn memmem \ > strstr strcasestr strnlen strcasecmp strncasecmp \ > strncat rawmemchr strchrnul bcopy bzero memrchr \ > diff --git a/string/test-memcmp.c b/string/test-memcmp.c > index 6ddbc05d2f..fdf148102c 100644 > --- a/string/test-memcmp.c > +++ b/string/test-memcmp.c > @@ -17,11 +17,14 @@ > . */ > > #define TEST_MAIN > -#ifdef WIDE > +#ifdef TEST_MEMCMPEQ > +# define TEST_NAME "__memcmpeq" > +#elif defined WIDE > # define TEST_NAME "wmemcmp" > #else > # define TEST_NAME "memcmp" > #endif > + > #include "test-string.h" > #ifdef WIDE > # include > @@ -35,8 +38,9 @@ > # define CHARBYTES 4 > # define CHAR__MIN WCHAR_MIN > # define CHAR__MAX WCHAR_MAX > + > int > -simple_wmemcmp (const wchar_t *s1, const wchar_t *s2, size_t n) > +SIMPLE_MEMCMP (const wchar_t *s1, const wchar_t *s2, size_t n) > { > int ret = 0; > /* Warning! > @@ -48,10 +52,14 @@ simple_wmemcmp (const wchar_t *s1, const wchar_t *s2, size_t n) > } > #else > # include > - > -# define MEMCMP memcmp > +# ifdef TEST_MEMCMPEQ > +# define MEMCMP __memcmpeq > +# define SIMPLE_MEMCMP simple_memcmpeq > +# else > +# define MEMCMP memcmp > +# define SIMPLE_MEMCMP simple_memcmp > +# endif > # define MEMCPY memcpy > -# define SIMPLE_MEMCMP simple_memcmp > # define CHAR char > # define MAX_CHAR 255 > # define UCHAR unsigned char > @@ -60,7 +68,7 @@ simple_wmemcmp (const wchar_t *s1, const wchar_t *s2, size_t n) > # define CHAR__MAX CHAR_MAX > > int > -simple_memcmp (const char *s1, const char *s2, size_t n) > +SIMPLE_MEMCMP (const char *s1, const char *s2, size_t n) > { > int ret = 0; > > @@ -69,6 +77,12 @@ simple_memcmp (const char *s1, const char *s2, size_t n) > } > #endif > > +#ifndef BAD_RESULT > +# define BAD_RESULT(result, expec) \ > + (((result) == 0 && (expec)) || ((result) < 0 && (expec) >= 0) || \ > + ((result) > 0 && (expec) <= 0)) > +# endif > + > typedef int (*proto_t) (const CHAR *, const CHAR *, size_t); > > IMPL (SIMPLE_MEMCMP, 0) > @@ -79,9 +93,7 @@ check_result (impl_t *impl, const CHAR *s1, const CHAR *s2, size_t len, > int exp_result) > { > int result = CALL (impl, s1, s2, len); > - if ((exp_result == 0 && result != 0) > - || (exp_result < 0 && result >= 0) > - || (exp_result > 0 && result <= 0)) > + if (BAD_RESULT(result, exp_result)) > { > error (0, 0, "Wrong result in function %s %d %d", impl->name, > result, exp_result); > @@ -186,9 +198,7 @@ do_random_tests (void) > { > r = CALL (impl, (CHAR *) p1 + align1, (const CHAR *) p2 + align2, > len); > - if ((r == 0 && result) > - || (r < 0 && result >= 0) > - || (r > 0 && result <= 0)) > + if (BAD_RESULT(r, result)) > { > error (0, 0, "Iteration %zd - wrong result in function %s (%zd, %zd, %zd, %zd) %ld != %d, p1 %p p2 %p", > n, impl->name, align1 * CHARBYTES & 63, align2 * CHARBYTES & 63, len, pos, r, result, p1, p2); > diff --git a/string/test-memcmpeq.c b/string/test-memcmpeq.c > new file mode 100644 > index 0000000000..8889117868 > --- /dev/null > +++ b/string/test-memcmpeq.c > @@ -0,0 +1,21 @@ > +/* Test and measure __memcmpeq functions. > + Copyright (C) 2012-2021 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 > + . */ > + > +#define BAD_RESULT(result, expec) ((!(result)) != (!(expec))) > +#define TEST_MEMCMPEQ 1 > +#include "test-memcmp.c" > -- > 2.25.1 > LGTM. Reviewed-by: H.J. Lu Thanks. H.J.