From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pj1-x1035.google.com (mail-pj1-x1035.google.com [IPv6:2607:f8b0:4864:20::1035]) by sourceware.org (Postfix) with ESMTPS id E9A253857BA1 for ; Tue, 12 Jul 2022 20:00:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org E9A253857BA1 Received: by mail-pj1-x1035.google.com with SMTP id o31-20020a17090a0a2200b001ef7bd037bbso113007pjo.0 for ; Tue, 12 Jul 2022 13:00:06 -0700 (PDT) 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=kOKX1CseHOdpluvJYUrLWmrCzHFNJ2tfeEhz50DJ/qA=; b=6HQZln6AwW87jcHGEPwldIcJRm1G+LpIzE3TY3lqNiOXIcb6ZKOu0UNzc/X5BT6X1E IABoB4LLTg4/sH4F9e5E3ptAinU2ffR7HeoUULDKjcIoa4oYP5nnZ5b2H/wO/Cw/7fag qv8myl5sSq/KhFLtufOBgTOrZiWAzTyG2LpcNtBK81IOZp3nWu6p5Qjf42gISEHpf2z7 9OUKsLcGMGKVw5VQmFGTSC+/WqYzyYQSoYvXprdQjwCFiCSXEU7vQohAaTCEMfxwdTPN LqDtnji99mVepsJU+qbZtZQRJ1YmGKyeEVBQG9sF2u7Low13tZ7PblSs075uX0bDKcFZ zpVQ== X-Gm-Message-State: AJIora/zVoAZO1SQZtHJ+hldUYVxdSTW30mDZkgI5ELj132GUUZFF5ET wcZdhvpPYMq0l3mziB9QW+rbViKEHvD4mdU7F4w= X-Google-Smtp-Source: AGRyM1v/us9CtQ/KASfkKQSxAohJUe+gotPc3MIeZcd2B4FRDVFwSUqjSAo8VkFIapsRTdmednEN9VJxtTpRflB3oy0= X-Received: by 2002:a17:902:a502:b0:15e:c251:b769 with SMTP id s2-20020a170902a50200b0015ec251b769mr25769713plq.115.1657656005875; Tue, 12 Jul 2022 13:00:05 -0700 (PDT) MIME-Version: 1.0 References: <20220712192910.351121-1-goldstein.w.n@gmail.com> <20220712192910.351121-10-goldstein.w.n@gmail.com> In-Reply-To: <20220712192910.351121-10-goldstein.w.n@gmail.com> From: "H.J. Lu" Date: Tue, 12 Jul 2022 12:59:30 -0700 Message-ID: Subject: Re: [PATCH v1] x86: Add missing rtm tests for strcmp family To: Noah Goldstein Cc: GNU C Library , "Carlos O'Donell" Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-3024.9 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.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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, 12 Jul 2022 20:00:09 -0000 On Tue, Jul 12, 2022 at 12:29 PM Noah Goldstein wrote: > > Add new tests for: > strcasecmp > strncasecmp > strcmp > wcscmp > > These functions all have avx2_rtm implementations so should be tested. > --- > sysdeps/x86/Makefile | 8 ++++ > sysdeps/x86/tst-strcasecmp-rtm.c | 23 ++++++++++ > sysdeps/x86/tst-strcmp-rtm.c | 70 +++++++++++++++++++++++++++++++ > sysdeps/x86/tst-strncasecmp-rtm.c | 23 ++++++++++ > sysdeps/x86/tst-strncmp-rtm.c | 6 ++- > sysdeps/x86/tst-wcscmp-rtm.c | 22 ++++++++++ > 6 files changed, 150 insertions(+), 2 deletions(-) > create mode 100644 sysdeps/x86/tst-strcasecmp-rtm.c > create mode 100644 sysdeps/x86/tst-strcmp-rtm.c > create mode 100644 sysdeps/x86/tst-strncasecmp-rtm.c > create mode 100644 sysdeps/x86/tst-wcscmp-rtm.c > > diff --git a/sysdeps/x86/Makefile b/sysdeps/x86/Makefile > index c6bee981f8..56fd5fc805 100644 > --- a/sysdeps/x86/Makefile > +++ b/sysdeps/x86/Makefile > @@ -95,11 +95,15 @@ tests += \ > tst-memmove-rtm \ > tst-memrchr-rtm \ > tst-memset-rtm \ > + tst-strcasecmp-rtm \ > tst-strchr-rtm \ > + tst-strcmp-rtm \ > tst-strcpy-rtm \ > tst-strlen-rtm \ > + tst-strncasecmp-rtm \ > tst-strncmp-rtm \ > tst-strrchr-rtm \ > + tst-wcscmp-rtm \ > tst-wcsncmp-rtm \ > # tests > > @@ -108,11 +112,15 @@ CFLAGS-tst-memcmp-rtm.c += -mrtm > CFLAGS-tst-memmove-rtm.c += -mrtm > CFLAGS-tst-memrchr-rtm.c += -mrtm > CFLAGS-tst-memset-rtm.c += -mrtm > +CFLAGS-tst-strcasecmp-rtm.c += -mrtm > CFLAGS-tst-strchr-rtm.c += -mrtm > +CFLAGS-tst-strcmp-rtm.c += -mrtm > CFLAGS-tst-strcpy-rtm.c += -mrtm > CFLAGS-tst-strlen-rtm.c += -mrtm > +CFLAGS-tst-strncasecmp-rtm.c += -mrtm -Wno-error > CFLAGS-tst-strncmp-rtm.c += -mrtm -Wno-error > CFLAGS-tst-strrchr-rtm.c += -mrtm > +CFLAGS-tst-wcscmp-rtm.c += -mrtm > CFLAGS-tst-wcsncmp-rtm.c += -mrtm -Wno-error > endif > > diff --git a/sysdeps/x86/tst-strcasecmp-rtm.c b/sysdeps/x86/tst-strcasecmp-rtm.c > new file mode 100644 > index 0000000000..da460799ce > --- /dev/null > +++ b/sysdeps/x86/tst-strcasecmp-rtm.c > @@ -0,0 +1,23 @@ > +/* Test case for strcasecmp inside a transactionally executing RTM > + region. > + Copyright (C) 2022 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 STRCMP strcasecmp > +#define TEST_NAME "strcasecmp" > + > +#include "tst-strcmp-rtm.c" > diff --git a/sysdeps/x86/tst-strcmp-rtm.c b/sysdeps/x86/tst-strcmp-rtm.c > new file mode 100644 > index 0000000000..371916a2f0 > --- /dev/null > +++ b/sysdeps/x86/tst-strcmp-rtm.c > @@ -0,0 +1,70 @@ > +/* Test case for strcmp inside a transactionally executing RTM > + region. > + Copyright (C) 2022 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 > + . */ > + > +#include > +#include > + > +#ifdef WIDE > +# define CHAR wchar_t > +# define MEMSET wmemset > +# define STRCMP wcscmp > +# define TEST_NAME "wcscmp" > +#else /* !WIDE */ > +# define CHAR char > +# define MEMSET memset > + > +# ifndef STRCMP > +# define STRCMP strcmp > +# define TEST_NAME "strcmp" > +# endif > +#endif > + > +#define LOOP 3000 > +#define STRING_SIZE 1024 > +CHAR string1[STRING_SIZE]; > +CHAR string2[STRING_SIZE]; > + > +__attribute__ ((noinline, noclone)) > +static int > +prepare (void) > +{ > + MEMSET (string1, 'a', STRING_SIZE - 1); > + MEMSET (string2, 'a', STRING_SIZE - 1); > + if (STRCMP (string1, string2) == 0) > + return EXIT_SUCCESS; > + else > + return EXIT_FAILURE; > +} > + > +__attribute__ ((noinline, noclone)) > +static int > +function (void) > +{ > + if (STRCMP (string1, string2) == 0) > + return 0; > + else > + return 1; > +} > + > + > +static int > +do_test (void) > +{ > + return do_test_1 (TEST_NAME, LOOP, prepare, function); > +} > diff --git a/sysdeps/x86/tst-strncasecmp-rtm.c b/sysdeps/x86/tst-strncasecmp-rtm.c > new file mode 100644 > index 0000000000..4ebe58951b > --- /dev/null > +++ b/sysdeps/x86/tst-strncasecmp-rtm.c > @@ -0,0 +1,23 @@ > +/* Test case for strncasecmp inside a transactionally executing RTM > + region. > + Copyright (C) 2022 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 STRNCMP strncasecmp > +#define TEST_NAME "strncasecmp" > + > +#include "tst-strncmp-rtm.c" > diff --git a/sysdeps/x86/tst-strncmp-rtm.c b/sysdeps/x86/tst-strncmp-rtm.c > index a3b14e72ff..2d27b20a68 100644 > --- a/sysdeps/x86/tst-strncmp-rtm.c > +++ b/sysdeps/x86/tst-strncmp-rtm.c > @@ -27,8 +27,10 @@ > #else /* !WIDE */ > # define CHAR char > # define MEMSET memset > -# define STRNCMP strncmp > -# define TEST_NAME "strncmp" > +# ifndef STRNCMP > +# define STRNCMP strncmp > +# define TEST_NAME "strncmp" > +# endif > #endif /* !WIDE */ > > > diff --git a/sysdeps/x86/tst-wcscmp-rtm.c b/sysdeps/x86/tst-wcscmp-rtm.c > new file mode 100644 > index 0000000000..28a5b4b82d > --- /dev/null > +++ b/sysdeps/x86/tst-wcscmp-rtm.c > @@ -0,0 +1,22 @@ > +/* Test case for wcscmp inside a transactionally executing RTM > + region. > + Copyright (C) 2022 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 > +#include "tst-strcmp-rtm.c" > -- > 2.34.1 > LGTM. Thanks. -- H.J.