From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pl1-x62e.google.com (mail-pl1-x62e.google.com [IPv6:2607:f8b0:4864:20::62e]) by sourceware.org (Postfix) with ESMTPS id 6E00D3858C83; Tue, 1 Feb 2022 19:53:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 6E00D3858C83 Received: by mail-pl1-x62e.google.com with SMTP id s6so10755348plg.12; Tue, 01 Feb 2022 11:53:15 -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=vOv5jaFP3sY6UO2nQcRatL/jkIilMSfYlRodeVVKKrQ=; b=19YzOXquBCyJTDcEEgtVrVlRxrtpGkwftT8xM3Dhm7mZHRPGi670wBgpAD6BFeHGt4 7+lNV1SmzNFdVo9G1wVZRbvWgaPNiFjZLfyrIrGvCw/Gf3QXKh+Nlo+koR7+Z284cifk TTGG1aoKzCxR/mvAZ9VTtdxmGt2cBPCInwA4gcxxzm628zozZO41Gd/RPfPf13P8OfdZ jT7kJMdnfgsXAwwWzo5cUgBGmGRpIpOlrb/EH32lD+UHnJWDyEAi1BNjnPrV/l0UNbAO UgnNeZFf/xvaRptKxoJY2LxRLfuVJUhLTcHl7Oi4oTsre1QEKWMl359GTkkLWVXTmFu1 TtEA== X-Gm-Message-State: AOAM531hmNlvjWv/2yYnHmAnmzDxVrFpsLoztQuPEg8BMO+iBJr+XgAF dv3T02siWXFjZq06P43+fGbxoTtY+jpfQMatS9I= X-Google-Smtp-Source: ABdhPJxUCSfldSqFfwHwprlNvOzma5XJxJVgzFIUYnvL50a5vFGwiDuWfTkIpo1xeGcnttqxRMGaOXfL1PaodJjcyZg= X-Received: by 2002:a17:902:e851:: with SMTP id t17mr26508279plg.102.1643745194325; Tue, 01 Feb 2022 11:53:14 -0800 (PST) MIME-Version: 1.0 References: <20210708081308.640036-1-goldstein.w.n@gmail.com> <20210708201318.1222367-1-goldstein.w.n@gmail.com> In-Reply-To: <20210708201318.1222367-1-goldstein.w.n@gmail.com> From: "H.J. Lu" Date: Tue, 1 Feb 2022 11:52:38 -0800 Message-ID: Subject: Re: [PATCH v2 1/2] x86-64: Test strlen and wcslen with 0 in the RSI register [BZ #28064] To: Noah Goldstein , Libc-stable Mailing List Cc: GNU C Library , "Carlos O'Donell" Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-3027.3 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, 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-stable@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-stable mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Feb 2022 19:53:17 -0000 On Thu, Jul 8, 2021 at 1:13 PM Noah Goldstein wrote: > > From: "H.J. Lu" > > commit 6f573a27b6c8b4236445810a44660612323f5a73 > Author: Noah Goldstein > Date: Wed Jun 23 01:19:34 2021 -0400 > > x86-64: Add wcslen optimize for sse4.1 > > added wcsnlen-sse4.1 to the wcslen ifunc implementation list. Since the > random value in the the RSI register is larger than the wide-character > string length in the existing wcslen test, it didn't trigger the wcslen > test failure. Add a test to force 0 into the RSI register before calling > wcslen. > --- > sysdeps/x86_64/Makefile | 7 +++ > sysdeps/x86_64/tst-rsi-strlen.c | 81 +++++++++++++++++++++++++++++++++ > sysdeps/x86_64/tst-rsi-wcslen.c | 20 ++++++++ > 3 files changed, 108 insertions(+) > create mode 100644 sysdeps/x86_64/tst-rsi-strlen.c > create mode 100644 sysdeps/x86_64/tst-rsi-wcslen.c > > diff --git a/sysdeps/x86_64/Makefile b/sysdeps/x86_64/Makefile > index 06a444b6af..3fc03f4a19 100644 > --- a/sysdeps/x86_64/Makefile > +++ b/sysdeps/x86_64/Makefile > @@ -20,6 +20,8 @@ endif > ifeq ($(subdir),string) > sysdep_routines += strcasecmp_l-nonascii strncase_l-nonascii > gen-as-const-headers += locale-defines.sym > +tests += \ > + tst-rsi-strlen > endif > > ifeq ($(subdir),elf) > @@ -191,6 +193,11 @@ ifeq ($(subdir),csu) > gen-as-const-headers += tlsdesc.sym rtld-offsets.sym > endif > > +ifeq ($(subdir),wcsmbs) > +tests += \ > + tst-rsi-wcslen > +endif > + > $(objpfx)x86_64/tst-x86_64mod-1.os: $(objpfx)tst-x86_64mod-1.os > $(make-target-directory) > rm -f $@ > diff --git a/sysdeps/x86_64/tst-rsi-strlen.c b/sysdeps/x86_64/tst-rsi-strlen.c > new file mode 100644 > index 0000000000..a80c4f85c2 > --- /dev/null > +++ b/sysdeps/x86_64/tst-rsi-strlen.c > @@ -0,0 +1,81 @@ > +/* Test strlen with 0 in the RSI register. > + Copyright (C) 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 > + . */ > + > +#ifdef WIDE > +# define TEST_NAME "wcslen" > +#else > +# define TEST_NAME "strlen" > +#endif /* WIDE */ > + > +#define TEST_MAIN > +#include > + > +#ifdef WIDE > +# include > +# define STRLEN wcslen > +# define CHAR wchar_t > +#else > +# define STRLEN strlen > +# define CHAR char > +#endif /* WIDE */ > + > +IMPL (STRLEN, 1) > + > +typedef size_t (*proto_t) (const CHAR *); > + > +typedef struct > +{ > + void (*fn) (void); > +} parameter_t; > + > +size_t > +__attribute__ ((weak, noinline, noclone)) > +do_strlen (parameter_t *a, int zero, const CHAR *str) > +{ > + return CALL (a, str); > +} > + > +static int > +test_main (void) > +{ > + test_init (); > + > + size_t size = page_size / sizeof (CHAR) - 1; > + CHAR *buf = (CHAR *) buf2; > + buf[size] = 0; > + > + parameter_t a; > + > + int ret = 0; > + FOR_EACH_IMPL (impl, 0) > + { > + a.fn = impl->fn; > + /* NB: Pass 0 in RSI. */ > + size_t res = do_strlen (&a, 0, buf); > + if (res != size) > + { > + error (0, 0, "Wrong result in function %s: %zu != %zu", > + impl->name, res, size); > + ret = 1; > + } > + } > + > + return ret ? EXIT_FAILURE : EXIT_SUCCESS; > +} > + > +#include > diff --git a/sysdeps/x86_64/tst-rsi-wcslen.c b/sysdeps/x86_64/tst-rsi-wcslen.c > new file mode 100644 > index 0000000000..f45a7dfb51 > --- /dev/null > +++ b/sysdeps/x86_64/tst-rsi-wcslen.c > @@ -0,0 +1,20 @@ > +/* Test wcslen with 0 in the RSI register. > + Copyright (C) 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 WIDE 1 > +#include "tst-rsi-strlen.c" > -- > 2.25.1 > I am backporting this patch to release branches. -- H.J.