From patchwork Thu Sep 24 15:22:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 40489 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 35FB03954C14; Thu, 24 Sep 2020 15:23:26 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 35FB03954C14 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1600961006; bh=r/LQdCccaVCMWh/r+y5C7XD8484eZD4cu/39d46JY3g=; h=References:In-Reply-To:Date:Subject:To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=e8KWaQYsSdsXybFG7iQOoc9/qMIU43wp/09+T5+bLw6vsbktqZIc45J4BT+PUGSxP 9QUkCRM6eMtLeseRV+QtVKaTa0aPHxgVls9zXqUJuiuU7H+fu+YfCeq39G63y5Yqhe 9RRnxoRjBctk6y10cBtdACU5B8U7tHc3m09cg5D8= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-il1-x141.google.com (mail-il1-x141.google.com [IPv6:2607:f8b0:4864:20::141]) by sourceware.org (Postfix) with ESMTPS id 7D7123959E66 for ; Thu, 24 Sep 2020 15:23:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 7D7123959E66 Received: by mail-il1-x141.google.com with SMTP id y9so3551611ilq.2 for ; Thu, 24 Sep 2020 08:23:13 -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=r/LQdCccaVCMWh/r+y5C7XD8484eZD4cu/39d46JY3g=; b=hJZmfWSMpPP2kzsf8fEeI0wr68Pkci3zjNmL2vvIknZw46gVGcQCuwI0PWdzmcoQQs 3Oz9D8s65x9kTPT1it6HT8r6RQzcs2Mi6Nck8DZeZVsmgSW6NsUNK2i63Y1U6rlCLILS 8Xdu9o6EzpKZ99qQDMhnPyGQL/MjgnG8YRyjNKZ/1ZWa/CJd5JDCrRUc/nDQSiv17Tyo ftHfcYQ5gzrryXwLaDxqKvALc8Unj4+6jrauSsDoH0rib/G7znzeQXfMO0WlJcJ5ZJn1 E9eLqQZ8DcADGIV6vNnM+fsgjjqMRHMQrdI9xZZc3opSnYKbLBGrt2ssv0MipO6Nl2Wz uIIA== X-Gm-Message-State: AOAM531B94i30bN8xZqpOrsKif9SfZfwbGaWSR8F/t5E7NYnMH2pv1q8 eZvD5vAmzRHHh3/VtaSjoyxqUCLbkmtlmgHZIRj3alF6 X-Google-Smtp-Source: ABdhPJwqsI7fSlFXnUv4QtXfb3wmTbk+NVVeGsQhaDwSRIjDc7Y5UnTRgaZ4U2QWDMeOFh84q02sbG9To9QSDEh4WnA= X-Received: by 2002:a92:6a0c:: with SMTP id f12mr4165515ilc.213.1600960992899; Thu, 24 Sep 2020 08:23:12 -0700 (PDT) MIME-Version: 1.0 References: <20200612201056.228614-1-hjl.tools@gmail.com> <20200612201056.228614-4-hjl.tools@gmail.com> In-Reply-To: Date: Thu, 24 Sep 2020 08:22:37 -0700 Message-ID: Subject: V2 [PATCH] bench-strcmp.c: Add workloads on page boundary To: "Carlos O'Donell" X-Spam-Status: No, score=-8.0 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-Patchwork-Original-From: "H.J. Lu via Libc-alpha" From: "H.J. Lu" Reply-To: "H.J. Lu" Cc: GNU C Library Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" On Wed, Sep 23, 2020 at 5:52 PM Carlos O'Donell wrote: > > On 6/12/20 4:10 PM, H.J. Lu via Libc-alpha wrote: > > Add strcmp workloads on page boundary. > > --- > > benchtests/bench-strcmp.c | 48 +++++++++++++++++++++++++++++++++++++++ > > 1 file changed, 48 insertions(+) > > > > These additions to the benchmark exercise the page boundary conditions > in the algorithms implemented by all the architectures. The test is > designed from the experience with bug 25933 in mind so we should mention > that in a comment. It could be made a bit more generic by parametrizing > vector sizes and number of vector registers that might be grouped e.g. > 32 * 4, but it's fine as it is for now to test the page boundary. > > OK with: > - Function rename > - Added comments. > - s1a iterate over [30,21) > > Reviewed-by: Carlos O'Donell > > > diff --git a/benchtests/bench-strcmp.c b/benchtests/bench-strcmp.c > > index 47d0a35299..3ba1399a4d 100644 > > --- a/benchtests/bench-strcmp.c > > +++ b/benchtests/bench-strcmp.c > > @@ -144,6 +144,52 @@ do_test (json_ctx_t *json_ctx, size_t align1, size_t align2, size_t len, int > > json_element_object_end (json_ctx); > > } > > > > +static void > > +do_test_page_boundary_1 (json_ctx_t *json_ctx, CHAR *s1, CHAR *s2, > > Rename to do_one_test_page_boundary () Done. > > + size_t align1, size_t align2, size_t len, > > + int exp_result) > > +{ > > + json_element_object_begin (json_ctx); > > + json_attr_uint (json_ctx, "length", (double) len); > > + json_attr_uint (json_ctx, "align1", (double) align1); > > + json_attr_uint (json_ctx, "align2", (double) align2); > > + json_array_begin (json_ctx, "timings"); > > + FOR_EACH_IMPL (impl, 0) > > + do_one_test (json_ctx, impl, s1, s2, exp_result); > > OK. > > > + json_array_end (json_ctx); > > + json_element_object_end (json_ctx); > > +} > > + > > Add a comment: > > /* To trigger bug 25933 we need a size that is equal to the > vector length times 4. In the case of AVX2 for Intel we > need 32 * 4. We make this test generic and run it for all > architectures as additional boundary testing for such > related algorithms. */ Done. > > +static void > > +do_test_page_boundary (json_ctx_t *json_ctx) > > +{ > > + size_t size = 32 * 4; > > + size_t len; > > + CHAR *s1 = (CHAR *) (buf1 + (BUF1PAGES - 1) * page_size); > > + CHAR *s2 = (CHAR *) (buf2 + (BUF1PAGES - 1) * page_size); > > + int exp_result; > > + > > + memset (s1, 'a', page_size); > > + memset (s2, 'a', page_size); > > + > > + s1[(page_size / CHARBYTES) - 1] = (CHAR) 0; > > + s2[(page_size / CHARBYTES) - 1] = (CHAR) 0; > > + > > > Add comment: > > /* Iterate over a size that is just below where we expect > the bug to trigger up to the size we expect will trigger > the bug e.g. [99-128]. Likewise iterate the start of > two strings between 30 and 31 bytes away from the > boundary to simulate alignment changes. */ Done. > > + for (size_t s = 99; s <= size; s++) > > + for (size_t s1a = 31; s1a < 32; s1a++) > > Make s1a iterate over [30,32) like s2a. Done. > > + for (size_t s2a = 30; s2a < 32; s2a++) > > + { > > + size_t align1 = (page_size / CHARBYTES - s) - s1a; > > + size_t align2 = (page_size / CHARBYTES - s) - s2a; > > + CHAR *s1p = s1 + align1; > > + CHAR *s2p = s2 + align2; > > + len = (page_size / CHARBYTES) - 1 - align1; > > + exp_result = SIMPLE_STRCMP (s1p, s2p); > > + do_test_page_boundary_1 (json_ctx, s1p, s2p, align1, align2, > > Call do_one_test_page_boundary () Done. > > + len, exp_result); > > + } > > +} > > + > > int > > test_main (void) > > { > > @@ -197,6 +243,8 @@ test_main (void) > > do_test (&json_ctx, 2 * CHARBYTES * i, CHARBYTES * i, 8 << i, LARGECHAR, -1); > > } > > > > + do_test_page_boundary (&json_ctx); > > OK. > > > + > > json_array_end (&json_ctx); > > json_attr_object_end (&json_ctx); > > json_attr_object_end (&json_ctx); > > > > Here is the updated patch. OK for master? Thanks. Reviewed-by: Carlos O'Donell From eacae3fa86051ae3433dabf1323e809450ce3cc8 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Thu, 11 Jun 2020 09:00:12 -0700 Subject: [PATCH] bench-strcmp.c: Add workloads on page boundary Add strcmp workloads on page boundary. --- benchtests/bench-strcmp.c | 56 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/benchtests/bench-strcmp.c b/benchtests/bench-strcmp.c index 47d0a35299..c6f8446978 100644 --- a/benchtests/bench-strcmp.c +++ b/benchtests/bench-strcmp.c @@ -144,6 +144,60 @@ do_test (json_ctx_t *json_ctx, size_t align1, size_t align2, size_t len, int json_element_object_end (json_ctx); } +static void +do_one_test_page_boundary (json_ctx_t *json_ctx, CHAR *s1, CHAR *s2, + size_t align1, size_t align2, size_t len, + int exp_result) +{ + json_element_object_begin (json_ctx); + json_attr_uint (json_ctx, "length", (double) len); + json_attr_uint (json_ctx, "align1", (double) align1); + json_attr_uint (json_ctx, "align2", (double) align2); + json_array_begin (json_ctx, "timings"); + FOR_EACH_IMPL (impl, 0) + do_one_test (json_ctx, impl, s1, s2, exp_result); + json_array_end (json_ctx); + json_element_object_end (json_ctx); +} + +static void +do_test_page_boundary (json_ctx_t *json_ctx) +{ + /* To trigger bug 25933, we need a size that is equal to the vector + length times 4. In the case of AVX2 for Intel, we need 32 * 4. We + make this test generic and run it for all architectures as additional + boundary testing for such related algorithms. */ + size_t size = 32 * 4; + size_t len; + CHAR *s1 = (CHAR *) (buf1 + (BUF1PAGES - 1) * page_size); + CHAR *s2 = (CHAR *) (buf2 + (BUF1PAGES - 1) * page_size); + int exp_result; + + memset (s1, 'a', page_size); + memset (s2, 'a', page_size); + + s1[(page_size / CHARBYTES) - 1] = (CHAR) 0; + s2[(page_size / CHARBYTES) - 1] = (CHAR) 0; + + /* Iterate over a size that is just below where we expect the bug to + trigger up to the size we expect will trigger the bug e.g. [99-128]. + Likewise iterate the start of two strings between 30 and 31 bytes + away from the boundary to simulate alignment changes. */ + for (size_t s = 99; s <= size; s++) + for (size_t s1a = 30; s1a < 32; s1a++) + for (size_t s2a = 30; s2a < 32; s2a++) + { + size_t align1 = (page_size / CHARBYTES - s) - s1a; + size_t align2 = (page_size / CHARBYTES - s) - s2a; + CHAR *s1p = s1 + align1; + CHAR *s2p = s2 + align2; + len = (page_size / CHARBYTES) - 1 - align1; + exp_result = SIMPLE_STRCMP (s1p, s2p); + do_one_test_page_boundary (json_ctx, s1p, s2p, align1, align2, + len, exp_result); + } +} + int test_main (void) { @@ -197,6 +251,8 @@ test_main (void) do_test (&json_ctx, 2 * CHARBYTES * i, CHARBYTES * i, 8 << i, LARGECHAR, -1); } + do_test_page_boundary (&json_ctx); + json_array_end (&json_ctx); json_attr_object_end (&json_ctx); json_attr_object_end (&json_ctx); -- 2.26.2