From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oi1-x232.google.com (mail-oi1-x232.google.com [IPv6:2607:f8b0:4864:20::232]) by sourceware.org (Postfix) with ESMTPS id 075B13851C0B for ; Mon, 19 Apr 2021 21:53:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 075B13851C0B Received: by mail-oi1-x232.google.com with SMTP id l17so5655614oil.11 for ; Mon, 19 Apr 2021 14:53:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=tkK+SP72Vs3jmSuzzqtolbWaWHqKlIWIAOYNrGoBCnI=; b=G6Xm+BWQg+jktjwjsRWGXVfpi3Qkkl5wXcsSGdE3AysQbLObOeaP65+d6nlJstWDpP BVRDvoFDFY79OU3EKJ+LXXAHfMNVb6Q9SXeKXVVkZ4jIAtb0srIa4ynCNiUCusktG+fY 27Zbt/NPaqtNkRjU/8DIUeIsjvtTjz1QDLyKtb6Buq2AFv6kvxwzPJstlOIjlqM+fNk1 OQyRKPd2yT8FuGTPrlmI6mbSgGabUbAQMz0fSWWMte6laBxAHvmCOivQYoW1u31H9izv lMrymq1LjdOQlTXQ0YUn/6NPqltCUIaFr+8qJAb1whiVXuueK2JZ5rrFAzW9sLGATcqA Hhkg== X-Gm-Message-State: AOAM533WKvXjy9zAgcWE1saxQcke+uhxBx9eHhvs6Fm+ACmNRnM2Xb5f UlN2yBJpwip8Q5gdHgj9cfBxDoeitQrhDmokurM= X-Google-Smtp-Source: ABdhPJxtHedNCFYmZzELZFoBymxi2DTw5epXIRIiTbdrPOyteTS+tA5MEjGLH69+h9VYrfqhkk39ppuRH5ufiJE9rV0= X-Received: by 2002:aca:b208:: with SMTP id b8mr825422oif.79.1618869215454; Mon, 19 Apr 2021 14:53:35 -0700 (PDT) MIME-Version: 1.0 References: <20210419214811.2852085-1-goldstein.w.n@gmail.com> <20210419214811.2852085-2-goldstein.w.n@gmail.com> In-Reply-To: <20210419214811.2852085-2-goldstein.w.n@gmail.com> From: "H.J. Lu" Date: Mon, 19 Apr 2021 14:52:59 -0700 Message-ID: Subject: Re: [PATCH v5 2/2] x86: Expand test-memset.c and bench-memset.c To: Noah Goldstein Cc: libc-alpha@sourceware.org, carlos@systemhalted.org Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-3034.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 autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: Mon, 19 Apr 2021 21:53:46 -0000 On Mon, Apr 19, 2021 at 2:48 PM Noah Goldstein wrote: > > No bug. This commit adds tests cases and benchmarks for page cross and > for memset to the end of the page without crossing. As well in > test-memset.c this commit adds sentinel on start/end of tstbuf to test > for overwrites > > Signed-off-by: Noah Goldstein > --- > benchtests/bench-memset.c | 6 ++++-- > string/test-memset.c | 20 +++++++++++++++----- > 2 files changed, 19 insertions(+), 7 deletions(-) > > diff --git a/benchtests/bench-memset.c b/benchtests/bench-memset.c > index 1174900e88..d6619b4836 100644 > --- a/benchtests/bench-memset.c > +++ b/benchtests/bench-memset.c > @@ -61,7 +61,7 @@ do_one_test (json_ctx_t *json_ctx, impl_t *impl, CHAR *s, > static void > do_test (json_ctx_t *json_ctx, size_t align, int c, size_t len) > { > - align &= 63; > + align &= 4095; > if ((align + len) * sizeof (CHAR) > page_size) > return; > > @@ -110,9 +110,11 @@ test_main (void) > { > for (i = 0; i < 18; ++i) > do_test (&json_ctx, 0, c, 1 << i); > - for (i = 1; i < 32; ++i) > + for (i = 1; i < 64; ++i) > { > do_test (&json_ctx, i, c, i); > + do_test (&json_ctx, 4096 - i, c, i); > + do_test (&json_ctx, 4095, c, i); > if (i & (i - 1)) > do_test (&json_ctx, 0, c, i); > } > diff --git a/string/test-memset.c b/string/test-memset.c > index eb71517390..82bfcd6ad4 100644 > --- a/string/test-memset.c > +++ b/string/test-memset.c > @@ -109,16 +109,24 @@ 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) > { > - CHAR tstbuf[n]; > + CHAR buf[n + 2]; > + CHAR *tstbuf = buf + 1; > + CHAR sentinel = c - 1; > + buf[0] = sentinel; > + buf[n + 1] = sentinel; > #ifdef TEST_BZERO > simple_bzero (tstbuf, n); > CALL (impl, s, n); > - if (memcmp (s, tstbuf, n) != 0) > + if (memcmp (s, tstbuf, n) != 0 > + || buf[0] != sentinel > + || buf[n + 1] != sentinel) > #else > CHAR *res = CALL (impl, s, c, n); > if (res != s > || SIMPLE_MEMSET (tstbuf, c, n) != tstbuf > - || MEMCMP (s, tstbuf, n) != 0) > + || MEMCMP (s, tstbuf, n) != 0 > + || buf[0] != sentinel > + || buf[n + 1] != sentinel) > #endif /* !TEST_BZERO */ > { > error (0, 0, "Wrong result in function %s", impl->name); > @@ -130,7 +138,7 @@ 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) > { > - align &= 7; > + align &= 4095; > if ((align + len) * sizeof (CHAR) > page_size) > return; > > @@ -245,9 +253,11 @@ test_main (void) > { > for (i = 0; i < 18; ++i) > do_test (0, c, 1 << i); > - for (i = 1; i < 32; ++i) > + for (i = 1; i < 64; ++i) > { > do_test (i, c, i); > + do_test (4096 - i, c, i); > + do_test (4095, c, i); > if (i & (i - 1)) > do_test (0, c, i); > } > -- > 2.29.2 > LGTM. I will check it in for you. Thanks. -- H.J.