From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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: From: "H.J. Lu" 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" Cc: GNU C Library Content-Type: multipart/mixed; boundary="000000000000481e8105b010c78d" 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-List-Received-Date: Thu, 24 Sep 2020 15:23:25 -0000 --000000000000481e8105b010c78d Content-Type: text/plain; charset="UTF-8" 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. -- H.J. --000000000000481e8105b010c78d Content-Type: text/x-patch; charset="US-ASCII"; name="0001-bench-strcmp.c-Add-workloads-on-page-boundary.patch" Content-Disposition: attachment; filename="0001-bench-strcmp.c-Add-workloads-on-page-boundary.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_kfgysu350 RnJvbSBlYWNhZTNmYTg2MDUxYWUzNDMzZGFiZjEzMjNlODA5NDUwY2UzY2M4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiAiSC5KLiBMdSIgPGhqbC50b29sc0BnbWFpbC5jb20+CkRhdGU6 IFRodSwgMTEgSnVuIDIwMjAgMDk6MDA6MTIgLTA3MDAKU3ViamVjdDogW1BBVENIXSBiZW5jaC1z dHJjbXAuYzogQWRkIHdvcmtsb2FkcyBvbiBwYWdlIGJvdW5kYXJ5CgpBZGQgc3RyY21wIHdvcmts b2FkcyBvbiBwYWdlIGJvdW5kYXJ5LgotLS0KIGJlbmNodGVzdHMvYmVuY2gtc3RyY21wLmMgfCA1 NiArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysKIDEgZmlsZSBjaGFuZ2Vk LCA1NiBpbnNlcnRpb25zKCspCgpkaWZmIC0tZ2l0IGEvYmVuY2h0ZXN0cy9iZW5jaC1zdHJjbXAu YyBiL2JlbmNodGVzdHMvYmVuY2gtc3RyY21wLmMKaW5kZXggNDdkMGEzNTI5OS4uYzZmODQ0Njk3 OCAxMDA2NDQKLS0tIGEvYmVuY2h0ZXN0cy9iZW5jaC1zdHJjbXAuYworKysgYi9iZW5jaHRlc3Rz L2JlbmNoLXN0cmNtcC5jCkBAIC0xNDQsNiArMTQ0LDYwIEBAIGRvX3Rlc3QgKGpzb25fY3R4X3Qg Kmpzb25fY3R4LCBzaXplX3QgYWxpZ24xLCBzaXplX3QgYWxpZ24yLCBzaXplX3QgbGVuLCBpbnQK ICAganNvbl9lbGVtZW50X29iamVjdF9lbmQgKGpzb25fY3R4KTsKIH0KIAorc3RhdGljIHZvaWQK K2RvX29uZV90ZXN0X3BhZ2VfYm91bmRhcnkgKGpzb25fY3R4X3QgKmpzb25fY3R4LCBDSEFSICpz MSwgQ0hBUiAqczIsCisJCQkgICBzaXplX3QgYWxpZ24xLCBzaXplX3QgYWxpZ24yLCBzaXplX3Qg bGVuLAorCQkJICAgaW50IGV4cF9yZXN1bHQpCit7CisgIGpzb25fZWxlbWVudF9vYmplY3RfYmVn aW4gKGpzb25fY3R4KTsKKyAganNvbl9hdHRyX3VpbnQgKGpzb25fY3R4LCAibGVuZ3RoIiwgKGRv dWJsZSkgbGVuKTsKKyAganNvbl9hdHRyX3VpbnQgKGpzb25fY3R4LCAiYWxpZ24xIiwgKGRvdWJs ZSkgYWxpZ24xKTsKKyAganNvbl9hdHRyX3VpbnQgKGpzb25fY3R4LCAiYWxpZ24yIiwgKGRvdWJs ZSkgYWxpZ24yKTsKKyAganNvbl9hcnJheV9iZWdpbiAoanNvbl9jdHgsICJ0aW1pbmdzIik7Cisg IEZPUl9FQUNIX0lNUEwgKGltcGwsIDApCisgICAgZG9fb25lX3Rlc3QgKGpzb25fY3R4LCBpbXBs LCBzMSwgczIsIGV4cF9yZXN1bHQpOworICBqc29uX2FycmF5X2VuZCAoanNvbl9jdHgpOworICBq c29uX2VsZW1lbnRfb2JqZWN0X2VuZCAoanNvbl9jdHgpOworfQorCitzdGF0aWMgdm9pZAorZG9f dGVzdF9wYWdlX2JvdW5kYXJ5IChqc29uX2N0eF90ICpqc29uX2N0eCkKK3sKKyAgLyogVG8gdHJp Z2dlciBidWcgMjU5MzMsIHdlIG5lZWQgYSBzaXplIHRoYXQgaXMgZXF1YWwgdG8gdGhlIHZlY3Rv cgorICAgICBsZW5ndGggdGltZXMgNC4gSW4gdGhlIGNhc2Ugb2YgQVZYMiBmb3IgSW50ZWwsIHdl IG5lZWQgMzIgKiA0LiAgV2UKKyAgICAgbWFrZSB0aGlzIHRlc3QgZ2VuZXJpYyBhbmQgcnVuIGl0 IGZvciBhbGwgYXJjaGl0ZWN0dXJlcyBhcyBhZGRpdGlvbmFsCisgICAgIGJvdW5kYXJ5IHRlc3Rp bmcgZm9yIHN1Y2ggcmVsYXRlZCBhbGdvcml0aG1zLiAgKi8KKyAgc2l6ZV90IHNpemUgPSAzMiAq IDQ7CisgIHNpemVfdCBsZW47CisgIENIQVIgKnMxID0gKENIQVIgKikgKGJ1ZjEgKyAoQlVGMVBB R0VTIC0gMSkgKiBwYWdlX3NpemUpOworICBDSEFSICpzMiA9IChDSEFSICopIChidWYyICsgKEJV RjFQQUdFUyAtIDEpICogcGFnZV9zaXplKTsKKyAgaW50IGV4cF9yZXN1bHQ7CisKKyAgbWVtc2V0 IChzMSwgJ2EnLCBwYWdlX3NpemUpOworICBtZW1zZXQgKHMyLCAnYScsIHBhZ2Vfc2l6ZSk7CisK KyAgczFbKHBhZ2Vfc2l6ZSAvIENIQVJCWVRFUykgLSAxXSA9IChDSEFSKSAwOworICBzMlsocGFn ZV9zaXplIC8gQ0hBUkJZVEVTKSAtIDFdID0gKENIQVIpIDA7CisKKyAgLyogSXRlcmF0ZSBvdmVy IGEgc2l6ZSB0aGF0IGlzIGp1c3QgYmVsb3cgd2hlcmUgd2UgZXhwZWN0IHRoZSBidWcgdG8KKyAg ICAgdHJpZ2dlciB1cCB0byB0aGUgc2l6ZSB3ZSBleHBlY3Qgd2lsbCB0cmlnZ2VyIHRoZSBidWcg ZS5nLiBbOTktMTI4XS4KKyAgICAgTGlrZXdpc2UgaXRlcmF0ZSB0aGUgc3RhcnQgb2YgdHdvIHN0 cmluZ3MgYmV0d2VlbiAzMCBhbmQgMzEgYnl0ZXMKKyAgICAgYXdheSBmcm9tIHRoZSBib3VuZGFy eSB0byBzaW11bGF0ZSBhbGlnbm1lbnQgY2hhbmdlcy4gICovCisgIGZvciAoc2l6ZV90IHMgPSA5 OTsgcyA8PSBzaXplOyBzKyspCisgICAgZm9yIChzaXplX3QgczFhID0gMzA7IHMxYSA8IDMyOyBz MWErKykKKyAgICAgIGZvciAoc2l6ZV90IHMyYSA9IDMwOyBzMmEgPCAzMjsgczJhKyspCisJewor CSAgc2l6ZV90IGFsaWduMSA9IChwYWdlX3NpemUgLyBDSEFSQllURVMgLSBzKSAtIHMxYTsKKwkg IHNpemVfdCBhbGlnbjIgPSAocGFnZV9zaXplIC8gQ0hBUkJZVEVTIC0gcykgLSBzMmE7CisJICBD SEFSICpzMXAgPSBzMSArIGFsaWduMTsKKwkgIENIQVIgKnMycCA9IHMyICsgYWxpZ24yOworCSAg bGVuID0gKHBhZ2Vfc2l6ZSAvIENIQVJCWVRFUykgLSAxIC0gYWxpZ24xOworCSAgZXhwX3Jlc3Vs dCA9IFNJTVBMRV9TVFJDTVAgKHMxcCwgczJwKTsKKwkgIGRvX29uZV90ZXN0X3BhZ2VfYm91bmRh cnkgKGpzb25fY3R4LCBzMXAsIHMycCwgYWxpZ24xLCBhbGlnbjIsCisJCQkJICAgICBsZW4sIGV4 cF9yZXN1bHQpOworCX0KK30KKwogaW50CiB0ZXN0X21haW4gKHZvaWQpCiB7CkBAIC0xOTcsNiAr MjUxLDggQEAgdGVzdF9tYWluICh2b2lkKQogICAgICAgZG9fdGVzdCAoJmpzb25fY3R4LCAyICog Q0hBUkJZVEVTICogaSwgQ0hBUkJZVEVTICogaSwgOCA8PCBpLCBMQVJHRUNIQVIsIC0xKTsKICAg ICB9CiAKKyAgZG9fdGVzdF9wYWdlX2JvdW5kYXJ5ICgmanNvbl9jdHgpOworCiAgIGpzb25fYXJy YXlfZW5kICgmanNvbl9jdHgpOwogICBqc29uX2F0dHJfb2JqZWN0X2VuZCAoJmpzb25fY3R4KTsK ICAganNvbl9hdHRyX29iamVjdF9lbmQgKCZqc29uX2N0eCk7Ci0tIAoyLjI2LjIKCg== --000000000000481e8105b010c78d--