From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pl1-x62b.google.com (mail-pl1-x62b.google.com [IPv6:2607:f8b0:4864:20::62b]) by sourceware.org (Postfix) with ESMTPS id 702233858D37 for ; Thu, 3 Feb 2022 23:30:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 702233858D37 Received: by mail-pl1-x62b.google.com with SMTP id h14so3607890plf.1 for ; Thu, 03 Feb 2022 15:30:49 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=2O7CigHU14/KW3mu3VsP67R63S1ywBRrzrQlnu3uWMg=; b=LPU3+ZDtUSs6zMqPVu3o/Su5ojcjtKFtDedKHvfqBATPiD/ol5Op6vQqqVRxwlk/c7 AEGLT1IkLOdRMG+Fex4NVDyFgd9tb0uTr1a9JKhW6XnMUpVIKZIyvSnYiK8bsCD/pTWj 26sQ17UjoRmBo5nML05ysDSLjdch7yMeiUytsapPzhLATX+KRhLndVgEqLfOLezn3nxZ YPIolj4GzodWUk0pgfAmq2+DQ5XLpKqvsuvoLL9K8i/xnWBIVYzh1PumwfOG9FhVMTGT 4gp8ugouAWMiNpqXnG/BulCwmFuH6rpiUyRYMdKaI29TOlzkgPD/l+GEMbVGlMkBn9ai CUoA== X-Gm-Message-State: AOAM532skzy6Oc08qL9msNcOYJTIfoWEICw8aOv3zUApOjb4bHOHg+3/ agPWYRaThXF1eyFvH0RbnNiiF6qvi5SvZryWeiyI78KY X-Google-Smtp-Source: ABdhPJwSgPMXnGPVaQ5H1bLTRWcEGK/boWWJjy41EeaXpLpi3Iv/hU9fyLik8iwgzIcL/LnaUYNV9lKRoZsNORdzyy8= X-Received: by 2002:a17:90b:4a0a:: with SMTP id kk10mr71678pjb.208.1643931048542; Thu, 03 Feb 2022 15:30:48 -0800 (PST) MIME-Version: 1.0 References: <20220203214215.3275256-1-goldstein.w.n@gmail.com> In-Reply-To: From: Noah Goldstein Date: Thu, 3 Feb 2022 17:30:37 -0600 Message-ID: Subject: Re: [PATCH v4 1/5] string/test-str*cmp: remove stupid_[strcmp, strncmp, wcscmp, wcsncmp]. To: "H.J. Lu" Cc: GNU C Library , "Carlos O'Donell" Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-9.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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: Thu, 03 Feb 2022 23:30:51 -0000 On Thu, Feb 3, 2022 at 4:28 PM H.J. Lu wrote: > > On Thu, Feb 3, 2022 at 1:42 PM Noah Goldstein wrote: > > > > These implementations just add to test duration. Since we have > > simple_* implementations we already have a safe reference > > implementation. > > > > Signed-off-by: Noah Goldstein > > --- > > string/test-strcmp.c | 35 ----------------------------------- > > string/test-strncmp.c | 34 ---------------------------------- > > 2 files changed, 69 deletions(-) > > > > diff --git a/string/test-strcmp.c b/string/test-strcmp.c > > index 3c75076fb8..97d7bf5043 100644 > > --- a/string/test-strcmp.c > > +++ b/string/test-strcmp.c > > @@ -34,7 +34,6 @@ > > # define STRLEN wcslen > > # define MEMCPY wmemcpy > > # define SIMPLE_STRCMP simple_wcscmp > > -# define STUPID_STRCMP stupid_wcscmp > > # define CHAR wchar_t > > # define UCHAR wchar_t > > # define CHARBYTES 4 > > @@ -64,25 +63,6 @@ simple_wcscmp (const wchar_t *s1, const wchar_t *s2) > > return c1 < c2 ? -1 : 1; > > } > > > > -int > > -stupid_wcscmp (const wchar_t *s1, const wchar_t *s2) > > -{ > > - size_t ns1 = wcslen (s1) + 1; > > - size_t ns2 = wcslen (s2) + 1; > > - size_t n = ns1 < ns2 ? ns1 : ns2; > > - int ret = 0; > > - > > - wchar_t c1, c2; > > - > > - while (n--) { > > - c1 = *s1++; > > - c2 = *s2++; > > - if ((ret = c1 < c2 ? -1 : c1 == c2 ? 0 : 1) != 0) > > - break; > > - } > > - return ret; > > -} > > - > > #else > > # include > > > > @@ -92,7 +72,6 @@ stupid_wcscmp (const wchar_t *s1, const wchar_t *s2) > > # define STRLEN strlen > > # define MEMCPY memcpy > > # define SIMPLE_STRCMP simple_strcmp > > -# define STUPID_STRCMP stupid_strcmp > > # define CHAR char > > # define UCHAR unsigned char > > # define CHARBYTES 1 > > @@ -113,24 +92,10 @@ simple_strcmp (const char *s1, const char *s2) > > return ret; > > } > > > > -int > > -stupid_strcmp (const char *s1, const char *s2) > > -{ > > - size_t ns1 = strlen (s1) + 1; > > - size_t ns2 = strlen (s2) + 1; > > - size_t n = ns1 < ns2 ? ns1 : ns2; > > - int ret = 0; > > - > > - while (n--) > > - if ((ret = *(unsigned char *) s1++ - *(unsigned char *) s2++) != 0) > > - break; > > - return ret; > > -} > > #endif > > > > typedef int (*proto_t) (const CHAR *, const CHAR *); > > > > -IMPL (STUPID_STRCMP, 1) > > IMPL (SIMPLE_STRCMP, 1) > > IMPL (STRCMP, 1) > > > > diff --git a/string/test-strncmp.c b/string/test-strncmp.c > > index e7d5edea39..61a283a0af 100644 > > --- a/string/test-strncmp.c > > +++ b/string/test-strncmp.c > > @@ -33,7 +33,6 @@ > > # define STRDUP wcsdup > > # define MEMCPY wmemcpy > > # define SIMPLE_STRNCMP simple_wcsncmp > > -# define STUPID_STRNCMP stupid_wcsncmp > > # define CHAR wchar_t > > # define UCHAR wchar_t > > # define CHARBYTES 4 > > @@ -57,25 +56,6 @@ simple_wcsncmp (const CHAR *s1, const CHAR *s2, size_t n) > > return 0; > > } > > > > -int > > -stupid_wcsncmp (const CHAR *s1, const CHAR *s2, size_t n) > > -{ > > - wchar_t c1, c2; > > - size_t ns1 = wcsnlen (s1, n) + 1, ns2 = wcsnlen (s2, n) + 1; > > - > > - n = ns1 < n ? ns1 : n; > > - n = ns2 < n ? ns2 : n; > > - > > - while (n--) > > - { > > - c1 = *s1++; > > - c2 = *s2++; > > - if (c1 != c2) > > - return c1 > c2 ? 1 : -1; > > - } > > - return 0; > > -} > > - > > #else > > # define L(str) str > > # define STRNCMP strncmp > > @@ -83,7 +63,6 @@ stupid_wcsncmp (const CHAR *s1, const CHAR *s2, size_t n) > > # define STRDUP strdup > > # define MEMCPY memcpy > > # define SIMPLE_STRNCMP simple_strncmp > > -# define STUPID_STRNCMP stupid_strncmp > > # define CHAR char > > # define UCHAR unsigned char > > # define CHARBYTES 1 > > @@ -101,23 +80,10 @@ simple_strncmp (const char *s1, const char *s2, size_t n) > > return ret; > > } > > > > -int > > -stupid_strncmp (const char *s1, const char *s2, size_t n) > > -{ > > - size_t ns1 = strnlen (s1, n) + 1, ns2 = strnlen (s2, n) + 1; > > - int ret = 0; > > - > > - n = ns1 < n ? ns1 : n; > > - n = ns2 < n ? ns2 : n; > > - while (n-- && (ret = *(unsigned char *) s1++ - * (unsigned char *) s2++) == 0); > > - return ret; > > -} > > - > > #endif > > > > typedef int (*proto_t) (const CHAR *, const CHAR *, size_t); > > > > -IMPL (STUPID_STRNCMP, 0) > > IMPL (SIMPLE_STRNCMP, 0) > > IMPL (STRNCMP, 1) > > > > -- > > 2.25.1 > > > > LGTM. > > Reviewed-by: H.J. Lu > > Thanks. Thanks, pushed the patchset. > > -- > H.J.