From patchwork Tue Jul 12 19:29:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Noah Goldstein X-Patchwork-Id: 55992 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C28C73856082 for ; Tue, 12 Jul 2022 19:31:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C28C73856082 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1657654315; bh=KjkiWoy+L7GAyYa5cQp+2NiqUk1jW+KjRJbmatfQ0o8=; 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=Pydpu0xVCu15d4uwhktMc8/Vwk9qmkrb0WUCCI1B2L4znb/jx1RL3KcdY6bPJOCXq M4uMtmoYUSSI5eaNw8P822kA3P3jTKudIxyxCFSvYV69Yc7XpO4BzMl4yvvNfaLz2s B97q/FVWOFMLM4I1x9a+BTLRCohK/MHYPpyQzBh0= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pf1-x435.google.com (mail-pf1-x435.google.com [IPv6:2607:f8b0:4864:20::435]) by sourceware.org (Postfix) with ESMTPS id A97C63838F05 for ; Tue, 12 Jul 2022 19:29:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A97C63838F05 Received: by mail-pf1-x435.google.com with SMTP id d10so8310057pfd.9 for ; Tue, 12 Jul 2022 12:29:25 -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=KjkiWoy+L7GAyYa5cQp+2NiqUk1jW+KjRJbmatfQ0o8=; b=l3xQ62l65tgT2jWtTejMdqmNnLlAD7nHTesrQvuTB5D8pewEz71AjuYuueqKzx7f/G l6dY9YpC84gUwum+d3wK97ncXihRcYfvzr9/VW7bct0S87t91IaB7Q2QZaaEq4lEzteO qVocMjIriPvXiptXihOd+N4CfJLVT+xsVfeL451TdSQnUkMIfny9FqrRcMoyyuA/JTn7 v5NfP9EfnLaxHNvOPIRXXeYvRHjk3MYQi3YckVbuBm50C3xseaO2ccZblksTMfrAwJLl kNR/ZZ0O3yDwJIWgdvp2wp4jBOrsTV5tKt4wZjOPe2my4f4HzktByx0nTqjxsTuekwJ5 6KYA== X-Gm-Message-State: AJIora9GReKSpLdtCnTOSs1Juldg+L4DZF2LddEqXrDzJqzrZwOrr/Qn mZNDZljmDmkt+IUDpPVRojBuyxWq9YM= X-Google-Smtp-Source: AGRyM1sRou+/zoKeSTYTAdMgf6DOb3ku8uHgkymxixZPY1gyKjNBVK+WTz2lj0I8aAP3PzJTxRRYBg== X-Received: by 2002:a63:6888:0:b0:3fe:49fc:3be3 with SMTP id d130-20020a636888000000b003fe49fc3be3mr20797322pgc.182.1657654164455; Tue, 12 Jul 2022 12:29:24 -0700 (PDT) Received: from noah-tgl.. ([192.55.60.37]) by smtp.gmail.com with ESMTPSA id w7-20020a170902e88700b0016c28fbd7e5sm7274704plg.268.2022.07.12.12.29.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jul 2022 12:29:23 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH v1] x86: Add missing rtm tests for strcmp family Date: Tue, 12 Jul 2022 12:29:10 -0700 Message-Id: <20220712192910.351121-10-goldstein.w.n@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220712192910.351121-1-goldstein.w.n@gmail.com> References: <20220712192910.351121-1-goldstein.w.n@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-12.1 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-Patchwork-Original-From: Noah Goldstein via Libc-alpha From: Noah Goldstein Reply-To: Noah Goldstein Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" 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"