From patchwork Fri Jun 12 20:10:55 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: 39593 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 24C3A395B826; Fri, 12 Jun 2020 20:11:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 24C3A395B826 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1591992664; bh=qLJv/S3jUpQS+u+ky5cDSwS28vxSyW6CP3YcT1paQcY=; 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=Rh4TvrNLfwsfm0ujfUlzEfkkDT9VKM5GZiQirHqjJ+Xohe9XpY3qWXwTCirgtYY7z zbgMCuKJtIUPzbjM6/uozQ6ImyaBg8d6srA5UlfwG8cVkG3uzTj7ZYMZ9Tuma5xNJ5 5iypZNxsQudsEbmDArEEdpGMGLThcKCFsVAOUc1M= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pl1-x62a.google.com (mail-pl1-x62a.google.com [IPv6:2607:f8b0:4864:20::62a]) by sourceware.org (Postfix) with ESMTPS id 831AC395B43E for ; Fri, 12 Jun 2020 20:10:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 831AC395B43E Received: by mail-pl1-x62a.google.com with SMTP id y18so4186605plr.4 for ; Fri, 12 Jun 2020 13:10:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qLJv/S3jUpQS+u+ky5cDSwS28vxSyW6CP3YcT1paQcY=; b=Bi9jSnab+BV16WuRpk8MDkdTOdtlWRB4fUioI/PNL/crJnbfLwWciVvVLHat1CdiPt CpUva6qZDRI4VoDHYFvTFkyjXOy6hq6Are45G1J2DrAR3mW/aYkajJpSSu5o2+mbfewV +rRpRbLM5tDqmhG4nRq5b7kN4JsIF21zAtsk3byd5X+WuTrptUM+WxL5PLKrMgeC4Gse djSGvGasNbASWkxyfzrqMB7c51W5ZhriiMQ6gGvEOWQdIE6kgSVYSPsZ6+3uLlTJTXPO DK30YiKiPFPp5WQO2IEfxXz/P237uJ9of6yCSkdCfNd6Ef0+EXBadntPTqn6x7uMtTDE S+FA== X-Gm-Message-State: AOAM533eLSq54NYiqH8k15nnVzXUJzN/4GW5BSUYy2gUsjWfH92WYnmf nd3uARLonxBhagZWQsZM9/T04WoF X-Google-Smtp-Source: ABdhPJzZomCRgMuXrxgts9nc6eIdgapFiOyzqOMgIR0JnBRbY1ndTGs9yfHLrh7PfDtFZk28qJuAuQ== X-Received: by 2002:a17:902:9a82:: with SMTP id w2mr12538006plp.177.1591992658418; Fri, 12 Jun 2020 13:10:58 -0700 (PDT) Received: from gnu-cfl-2.localdomain (c-69-181-90-243.hsd1.ca.comcast.net. [69.181.90.243]) by smtp.gmail.com with ESMTPSA id mp15sm5936155pjb.45.2020.06.12.13.10.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jun 2020 13:10:57 -0700 (PDT) Received: from gnu-cfl-2.localdomain (localhost [IPv6:::1]) by gnu-cfl-2.localdomain (Postfix) with ESMTP id 56E401A0145 for ; Fri, 12 Jun 2020 13:10:56 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH 3/4] bench-strncmp.c: Add workloads on page boundary Date: Fri, 12 Jun 2020 13:10:55 -0700 Message-Id: <20200612201056.228614-3-hjl.tools@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200612201056.228614-1-hjl.tools@gmail.com> References: <20200612201056.228614-1-hjl.tools@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-13.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-Patchwork-Original-From: "H.J. Lu via Libc-alpha" From: "H.J. Lu" Reply-To: "H.J. Lu" Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" Add strncmp workloads on page boundary. --- benchtests/bench-strncmp.c | 117 +++++++++++++++++++++++++++++++++++++ 1 file changed, 117 insertions(+) diff --git a/benchtests/bench-strncmp.c b/benchtests/bench-strncmp.c index 95a59c9465..065c7e7789 100644 --- a/benchtests/bench-strncmp.c +++ b/benchtests/bench-strncmp.c @@ -27,6 +27,7 @@ #ifdef WIDE # define L(str) L##str +# define STRDUP wcsdup # define SIMPLE_STRNCMP simple_wcsncmp /* Wcsncmp uses signed semantics for comparison, not unsigned. @@ -48,6 +49,7 @@ simple_wcsncmp (const CHAR *s1, const CHAR *s2, size_t n) #else # define L(str) str +# define STRDUP strdup # define SIMPLE_STRNCMP simple_strncmp /* Strncmp uses unsigned semantics for comparison. */ @@ -190,6 +192,118 @@ do_test (json_ctx_t *json_ctx, size_t align1, size_t align2, size_t len, size_t json_element_object_end (json_ctx); } +static void +do_test_page_boundary_1 (json_ctx_t *json_ctx, CHAR *s1, CHAR *s2, + size_t align1, size_t align2, size_t len, + size_t n, int exp_result) +{ + json_element_object_begin (json_ctx); + json_attr_uint (json_ctx, "strlen", (double) len); + json_attr_uint (json_ctx, "len", (double) n); + 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, n, exp_result); + json_array_end (json_ctx); + json_element_object_end (json_ctx); +} + +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; + + for (size_t s = 99; s <= size; s++) + for (size_t s1a = 31; 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_STRNCMP (s1p, s2p, s); + do_test_page_boundary_1 (json_ctx, s1p, s2p, align1, align2, + len, s, exp_result); + } +} + +static void +do_page_test (json_ctx_t *json_ctx, size_t offset1, size_t offset2, + CHAR *s2) +{ + CHAR *s1; + int exp_result; + + if (offset1 * CHARBYTES >= page_size + || offset2 * CHARBYTES >= page_size) + return; + + s1 = (CHAR *) buf1; + s1 += offset1; + s2 += offset2; + + size_t len = (page_size / CHARBYTES) - offset1; + + exp_result= *s1; + + json_element_object_begin (json_ctx); + json_attr_uint (json_ctx, "strlen", (double) len); + json_attr_uint (json_ctx, "len", (double) page_size); + json_attr_uint (json_ctx, "align1", (double) offset1); + json_attr_uint (json_ctx, "align2", (double) offset2); + json_array_begin (json_ctx, "timings"); + { + FOR_EACH_IMPL (impl, 0) + do_one_test (json_ctx, impl, s1, s2, page_size, -exp_result); + } + json_array_end (json_ctx); + json_element_object_end (json_ctx); + + json_element_object_begin (json_ctx); + json_attr_uint (json_ctx, "strlen", (double) len); + json_attr_uint (json_ctx, "len", (double) page_size); + json_attr_uint (json_ctx, "align1", (double) offset1); + json_attr_uint (json_ctx, "align2", (double) offset2); + json_array_begin (json_ctx, "timings"); + { + FOR_EACH_IMPL (impl, 0) + do_one_test (json_ctx, impl, s1, s2, page_size, exp_result); + } + json_array_end (json_ctx); + json_element_object_end (json_ctx); +} + +static void +do_test_page (json_ctx_t *json_ctx) +{ + size_t i; + CHAR *s1, *s2; + + s1 = (CHAR *) buf1; + for (i = 0; i < (page_size / CHARBYTES) - 1; i++) + s1[i] = 23; + s1[i] = 0; + + s2 = STRDUP (s1); + + for (i = 0; i < 64; ++i) + do_page_test (json_ctx, (3988 / CHARBYTES) + i, + (2636 / CHARBYTES), s2); + + free (s2); +} + int test_main (void) { @@ -267,6 +381,9 @@ test_main (void) do_test_limit (&json_ctx, 0, 0, 15 - i, 16 - i, 255, -1); } + do_test_page_boundary (&json_ctx); + do_test_page (&json_ctx); + json_array_end (&json_ctx); json_attr_object_end (&json_ctx); json_attr_object_end (&json_ctx);