From patchwork Mon Feb 14 01:40:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Noah Goldstein X-Patchwork-Id: 51089 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 D671A3857C41 for ; Mon, 14 Feb 2022 01:41:05 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D671A3857C41 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1644802865; bh=cu6pu/qsP9BVFuDxYYjgsLktQ65Vg7x71iaM4HoaDHE=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=Ep9uQerUaMgrlnQj4AgdcHvK8fWoqjbjaxcD0zDxrT/s/MjcCBzL71fCDYORDbBWz N4iTxgRjH9jMaQVxRlaD9VvvWCB1QNiQYQi/dehnix7ph2GXaPOSi4LIougDnchXoL 6IB1QtFxXKnUPg/zc0B8FTfc6TPfPowK2IFo6EgE= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-io1-xd32.google.com (mail-io1-xd32.google.com [IPv6:2607:f8b0:4864:20::d32]) by sourceware.org (Postfix) with ESMTPS id 75F4D385840A for ; Mon, 14 Feb 2022 01:40:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 75F4D385840A Received: by mail-io1-xd32.google.com with SMTP id e79so18138611iof.13 for ; Sun, 13 Feb 2022 17:40:44 -0800 (PST) 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:mime-version :content-transfer-encoding; bh=cu6pu/qsP9BVFuDxYYjgsLktQ65Vg7x71iaM4HoaDHE=; b=h7JYHI8DyMjjrDVfgQ1euypCIuCc/Pn+6kNvO7/PE8z+T8LYqRF/+59sXjC1HJXkzy bQeGgAEqP0mK8j7xlB5BawMeflgI3DNb+OL7DlBrOi26wGEJspebEcmEWAaLC7EhTc2p 2jlLEWZDgk+h8HoGgxu4WfpYxEFp3xf7QxCmHtLbGVKIw9iMRZZh7sL/4SFIDojT+8Dg I8sh7vdnGgKeQLlx2/bOJV+e/N+gAWdEBI1/Y40V3uwfLTGGX4Vy70i7qgAHE59+Wpz3 EzDc3hyrNzpHwO64JseCxiutolFQOiPL364wEdmFMM5KgnSvfjvNuYXeTWHtZrR4mH45 Yu+g== X-Gm-Message-State: AOAM532oecwavQYTV8m1hCfYwXNz5FgIz85LkOLQgMKHRRskwpTXYZdi Vug55cDdnAwUFsxQKmeXIi/jV0vSmBQFhg== X-Google-Smtp-Source: ABdhPJxFYXUnSgM+i/mLr8j4E/Wg/U9QZEwFHIxU37unA/tvgTuYp2bdl4cR67GwcnSpDxwum25fLg== X-Received: by 2002:a02:9f84:: with SMTP id a4mr3862jam.137.1644802843568; Sun, 13 Feb 2022 17:40:43 -0800 (PST) Received: from localhost.localdomain (node-17-161.flex.volo.net. [76.191.17.161]) by smtp.googlemail.com with ESMTPSA id x24sm19012035iox.20.2022.02.13.17.40.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Feb 2022 17:40:43 -0800 (PST) To: libc-alpha@sourceware.org Subject: [PATCH v1] String: Strength memset tests in test-memset.c Date: Sun, 13 Feb 2022 19:40:37 -0600 Message-Id: <20220214014037.2422450-1-goldstein.w.n@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Spam-Status: No, score=-12.6 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" The prior sentinel logic was broken and was checking the SIMPLE_MEMSET as opposed to the tested implementation. As well `s` (the test buffer) was not reset between implementation tests so it was possible for a buggy implementation to be hidden by a previously executed correct one. Reviewed-by: Siddhesh Poyarekar --- string/test-memset.c | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/string/test-memset.c b/string/test-memset.c index 8498b1bc97..ee548f6924 100644 --- a/string/test-memset.c +++ b/string/test-memset.c @@ -106,26 +106,28 @@ SIMPLE_MEMSET (CHAR *s, int c, size_t n) } static void -do_one_test (impl_t *impl, CHAR *s, int c __attribute ((unused)), size_t n) +do_one_test (impl_t *impl, CHAR *s, int c __attribute ((unused)), size_t n, int space_below, int space_above) { - CHAR buf[n + 2]; - CHAR *tstbuf = buf + 1; - CHAR sentinel = c - 1; - buf[0] = sentinel; - buf[n + 1] = sentinel; + CHAR buf[n]; + CHAR sentinel = ~c; + if (space_below) + s[-1] = sentinel; + if (space_above) + s[n] = sentinel; + SIMPLE_MEMSET(s, ~c, n); #ifdef TEST_BZERO - simple_bzero (tstbuf, n); + simple_bzero (buf, n); CALL (impl, s, n); - if (memcmp (s, tstbuf, n) != 0 - || buf[0] != sentinel - || buf[n + 1] != sentinel) + if (memcmp (s, buf, n) != 0 + || (space_below && s[-1] != sentinel) + || (space_above && s[n] != sentinel)) #else CHAR *res = CALL (impl, s, c, n); if (res != s - || SIMPLE_MEMSET (tstbuf, c, n) != tstbuf - || MEMCMP (s, tstbuf, n) != 0 - || buf[0] != sentinel - || buf[n + 1] != sentinel) + || SIMPLE_MEMSET (buf, c, n) != buf + || MEMCMP (s, buf, n) != 0 + || (space_below && s[-1] != sentinel) + || (space_above && s[n] != sentinel)) #endif /* !TEST_BZERO */ { error (0, 0, "Wrong result in function %s", impl->name); @@ -137,12 +139,16 @@ do_one_test (impl_t *impl, CHAR *s, int c __attribute ((unused)), size_t n) static void do_test (size_t align, int c, size_t len) { + int space_below, space_above; align &= 4095; if ((align + len) * sizeof (CHAR) > page_size) return; + space_below = !!align; + space_above = !((align + len + 1) * sizeof (CHAR) > page_size); + FOR_EACH_IMPL (impl, 0) - do_one_test (impl, (CHAR *) (buf1) + align, c, len); + do_one_test (impl, (CHAR *) (buf1) + align, c, len, space_below, space_above); } #ifndef TEST_BZERO