From patchwork Sat Oct 23 23:24:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Noah Goldstein X-Patchwork-Id: 1545283 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=j1pAxF/N; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (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) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HcHQX4p2Bz9sR4 for ; Sun, 24 Oct 2021 10:25:56 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 886703857C67 for ; Sat, 23 Oct 2021 23:25:54 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 886703857C67 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1635031554; bh=2SuAWMfUBDIpShpbF6wfV6cIVQe8rUe8J/PfVgv9psE=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=j1pAxF/NX/xRtKcHaFB9c1SNY+48XaKXHsUYFjt/iibD6U2qZCAjP/eyNXDOoa/zg qps/+pjVlt5XBqStdax0yyiOf7Huo5VT3QNQuzSWmHCtVzxby01QaUEMpZYj4J/u1o /8kjOUwjsrGFjeQKdp4kc/uj6Urh4bTwc7v37zVU= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-il1-x134.google.com (mail-il1-x134.google.com [IPv6:2607:f8b0:4864:20::134]) by sourceware.org (Postfix) with ESMTPS id 45D8C3857836 for ; Sat, 23 Oct 2021 23:24:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 45D8C3857836 Received: by mail-il1-x134.google.com with SMTP id j6so8216750ila.1 for ; Sat, 23 Oct 2021 16:24:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2SuAWMfUBDIpShpbF6wfV6cIVQe8rUe8J/PfVgv9psE=; b=a55mY8Z5lPi0Wx3OW36gSIaFkmXj04ubQlWA3Stj319TkSaj6bEccIRJJonzh+vzNt OmfQjw03nquaY0q9EYM1tRLLMxKShZPljyfYAGneYxZWbc1nqYPdO52uksJyzwiUEakn Q0bHIHPa5oiJ7p1eUdcdaSg19Xw/KizFmJY9YoPfKPCaO6mcgvx78w4fKli319/gJsdo sUusZUWPw+jJedo++R0eNn/EpEtwNmx92lgntJRzw4fWPEp2bxUXZcuBaXx+odkiExq6 GsLC5B/Z9ivVYTQtmYPwaKHLCksWk8UJoYaRxBWrDRIAxm4nxj6ymaSbKzDHCRJyZPzZ 9tcg== X-Gm-Message-State: AOAM5314nXB50xEWIYamdhZrFDelc85g+CS+IMctM4n4ZLhadkCUSrjB 2CRlUVr9HOTu5riHpjc62U8X0ch2GLw= X-Google-Smtp-Source: ABdhPJwySfkNRdPQNVZc99g2cZi106YDKqlWuThJc2WBV4Z7/kSSGtwhtbXLw/1KL1U8kckN7SYcjw== X-Received: by 2002:a05:6e02:15c9:: with SMTP id q9mr4985829ilu.298.1635031454481; Sat, 23 Oct 2021 16:24:14 -0700 (PDT) Received: from localhost.localdomain (node-17-161.flex.volo.net. [76.191.17.161]) by smtp.googlemail.com with ESMTPSA id g13sm773757ild.87.2021.10.23.16.24.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Oct 2021 16:24:14 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH v14 3/4] String: Add tests for __memcmpeq Date: Sat, 23 Oct 2021 18:24:03 -0500 Message-Id: <20211023232404.622433-3-goldstein.w.n@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211023232404.622433-1-goldstein.w.n@gmail.com> References: <20210927203827.2852935-1-goldstein.w.n@gmail.com> <20211023232404.622433-1-goldstein.w.n@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-12.0 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-Patchwork-Original-From: Noah Goldstein via Libc-alpha From: Noah Goldstein Reply-To: Noah Goldstein Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org Sender: "Libc-alpha" 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. Reviewed-by: H.J. Lu --- 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"