From patchwork Wed Mar 23 21:57:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Noah Goldstein X-Patchwork-Id: 52282 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 256B03888C42 for ; Wed, 23 Mar 2022 22:08:53 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 256B03888C42 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1648073333; bh=JR5xbocM/XK2hv2ldldOOv+8BwERQCS3P11ZDL87h6E=; 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=Wv9vOeNwbV9pqLrc7pjBwdIAL6+8atNTzbW99PjDPpROVEvYVBQEyTTzwZGQoWCUA aB+/dMtwOUf27K2HiLIMtCUjNtM3Y8RfF9TgUalRQT773MD2DAeJjm2sKhDvJ660tg pXTdoASxyVzGZS3BiPYsUisc3h/lSBE2zXG4Y4Ao= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-il1-x131.google.com (mail-il1-x131.google.com [IPv6:2607:f8b0:4864:20::131]) by sourceware.org (Postfix) with ESMTPS id F06193842435 for ; Wed, 23 Mar 2022 22:01:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org F06193842435 Received: by mail-il1-x131.google.com with SMTP id e18so1998678ilr.2 for ; Wed, 23 Mar 2022 15:01:13 -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=JR5xbocM/XK2hv2ldldOOv+8BwERQCS3P11ZDL87h6E=; b=cUZR4/qZ9W0h5WySq1RZmXi/iTgVTPdXN9ZXUypxQdm+XkobyjNZ8Qzp/PON/pTST1 k/1EornpsQGEoI1qjySk6Qfm262uexajpxgRKCiW7JsYLMBkukpPtmF/XJQOuW5Bo+GY zQYgiXtiLnbLdSIMLeV4NFCX/ITXb8eJd99Jvu2udpN69ZuNfRIyGfzLcxr7XMWI6eFs TZ7GKIn4O3p8shIPe3822x/qGzgU9ilKDQxii77OmXc10Q36lMZ7+FignjgxJU9AehH0 vENf87xaFFjS+CPu2sd0aAlcwowEDKuC13vk82yA/Xt0DUt+kdY6U4mK7quT6AFMVe+L wK2g== X-Gm-Message-State: AOAM531Njl7pj58XloF0dFwp/39jWoPw0sTKGpMWZfgV5gO3xoVXOKDd M6HBpPolgqrBO+ItLEiCBfUs10pJPIg= X-Google-Smtp-Source: ABdhPJx65gDxKoTiRCS7b/6LFV5Cp12RHdyVvaFTD/DE/T3zMMDpTEwQi4wZ17B7uEdWm6e5HqvFYw== X-Received: by 2002:a05:6e02:1948:b0:2c8:1e11:9a4c with SMTP id x8-20020a056e02194800b002c81e119a4cmr1132541ilu.60.1648072872750; Wed, 23 Mar 2022 15:01:12 -0700 (PDT) Received: from localhost.localdomain (node-17-161.flex.volo.net. [76.191.17.161]) by smtp.googlemail.com with ESMTPSA id c22-20020a5ea816000000b00649d360663asm529227ioa.40.2022.03.23.15.01.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Mar 2022 15:01:12 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH v1 15/23] string: Expand page cross tests in test-strcasecmp.c Date: Wed, 23 Mar 2022 16:57:33 -0500 Message-Id: <20220323215734.3927131-15-goldstein.w.n@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220323215734.3927131-1-goldstein.w.n@gmail.com> References: <20220323215734.3927131-1-goldstein.w.n@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-12.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-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 more robust tests that cover all the page cross edge cases. Reviewed-by: H.J. Lu --- string/test-strcasecmp.c | 112 ++++++++++++++++++++++++++++++++++----- 1 file changed, 100 insertions(+), 12 deletions(-) diff --git a/string/test-strcasecmp.c b/string/test-strcasecmp.c index 3d994f9d64..438a9713ac 100644 --- a/string/test-strcasecmp.c +++ b/string/test-strcasecmp.c @@ -18,6 +18,10 @@ #include #include +#include +#define TEST_LEN (getpagesize () * 3) +#define MIN_PAGE_SIZE (TEST_LEN + 2 * getpagesize ()) + #define TEST_MAIN #define TEST_NAME "strcasecmp" #include "test-string.h" @@ -85,12 +89,13 @@ do_test (size_t align1, size_t align2, size_t len, int max_char, if (len == 0) return; - align1 &= 7; - if (align1 + len + 1 >= page_size) + + align1 &= getpagesize () - 1; + if (align1 + (len + 1) >= page_size) return; - align2 &= 7; - if (align2 + len + 1 >= page_size) + align2 &= getpagesize () - 1; + if (align2 + (len + 1) >= page_size) return; s1 = (char *) (buf1 + align1); @@ -105,12 +110,33 @@ do_test (size_t align1, size_t align2, size_t len, int max_char, s1[len] = s2[len] = 0; s1[len + 1] = 23; s2[len + 1] = 24 + exp_result; + if ((s2[len - 1] == 'z' && exp_result == -1) || (s2[len - 1] == 'a' && exp_result == 1)) s1[len - 1] += exp_result; + else if ((s1[len - 1] == 'Z' + 1 && exp_result == 1) + || (s1[len - 1] == 'A' - 1 && exp_result == -1)) + s1[len - 1] = tolower (s2[len - 1]) + exp_result; else s2[len - 1] -= exp_result; + /* For some locals this is not guranteed yet. */ + if (tolower (s1[len - 1]) - tolower (s2[len - 1]) != exp_result) + { + if (exp_result == -1) + { + s1[len - 1] = tolower ('a'); + s2[len - 1] = toupper (tolower ('a') - 1); + } + else if (exp_result == 0) + s1[len - 1] = toupper (s2[len - 1]); + else + { + s1[len - 1] = tolower ('a'); + s2[len - 1] = toupper (tolower ('a') + 1); + } + } + FOR_EACH_IMPL (impl, 0) do_one_test (impl, s1, s2, exp_result); } @@ -207,10 +233,10 @@ do_random_tests (void) } static void -test_locale (const char *locale) +test_locale (const char *locale, int extra_tests) { - size_t i; - + size_t i, j, k; + const size_t test_len = MIN(TEST_LEN, 3 * 4096); if (setlocale (LC_CTYPE, locale) == NULL) { error (0, 0, "cannot set locale \"%s\"", locale); @@ -249,6 +275,68 @@ test_locale (const char *locale) do_test (2 * i, i, 8 << i, 254, -1); } + for (j = 0; extra_tests && j < 160; ++j) + { + for (i = 0; i < test_len;) + { + do_test (getpagesize () - j - 1, 0, i, 127, 0); + do_test (getpagesize () - j - 1, 0, i, 127, 1); + do_test (getpagesize () - j - 1, 0, i, 127, -1); + + do_test (getpagesize () - j - 1, j, i, 127, 0); + do_test (getpagesize () - j - 1, j, i, 127, 1); + do_test (getpagesize () - j - 1, j, i, 127, -1); + + do_test (0, getpagesize () - j - 1, i, 127, 0); + do_test (0, getpagesize () - j - 1, i, 127, 1); + do_test (0, getpagesize () - j - 1, i, 127, -1); + + do_test (j, getpagesize () - j - 1, i, 127, 0); + do_test (j, getpagesize () - j - 1, i, 127, 1); + do_test (j, getpagesize () - j - 1, i, 127, -1); + + for (k = 2; k <= 128; k += k) + { + do_test (getpagesize () - k, getpagesize () - j - 1, i, 127, 0); + do_test (getpagesize () - k - 1, getpagesize () - j - 1, i, 127, + 0); + do_test (getpagesize () - k, getpagesize () - j - 1, i, 127, 1); + do_test (getpagesize () - k - 1, getpagesize () - j - 1, i, 127, + 1); + do_test (getpagesize () - k, getpagesize () - j - 1, i, 127, -1); + do_test (getpagesize () - k - 1, getpagesize () - j - 1, i, 127, + -1); + } + + if (i < 32) + { + i += 1; + } + else if (i < 161) + { + i += 7; + } + else if (i + 161 < test_len) + { + i += 31; + i *= 17; + i /= 16; + if (i + 161 > test_len) + { + i = test_len - 160; + } + } + else if (i + 32 < test_len) + { + i += 7; + } + else + { + i += 1; + } + } + } + do_random_tests (); } @@ -257,11 +345,11 @@ test_main (void) { test_init (); - test_locale ("C"); - test_locale ("en_US.ISO-8859-1"); - test_locale ("en_US.UTF-8"); - test_locale ("tr_TR.ISO-8859-9"); - test_locale ("tr_TR.UTF-8"); + test_locale ("C", 1); + test_locale ("en_US.ISO-8859-1", 0); + test_locale ("en_US.UTF-8", 0); + test_locale ("tr_TR.ISO-8859-9", 0); + test_locale ("tr_TR.UTF-8", 0); return ret; }