From patchwork Sat Dec 4 03:24:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 48487 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 F288B385841B for ; Sat, 4 Dec 2021 03:24:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F288B385841B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1638588284; bh=+DrV2oP6zkJI06Zl1bz4ZCfYWhFUUVbrTvWqLTXLseY=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=hf+mOTV/Ya83LbGOcavVLZ+nhfgxKbTA1h46Pht6xvPGd97Tjzu2ji/LW0URqj9h+ NApZiPi7UHwnE+kg06Oj1HqgnB7RCgwUWXG/Su0BwparKmnfOq5Csro2HsgR9yW3cw u4CLDM7U0WxXumsyPNcLcGhvOL2oIEBVVAajOlC4= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pf1-x434.google.com (mail-pf1-x434.google.com [IPv6:2607:f8b0:4864:20::434]) by sourceware.org (Postfix) with ESMTPS id 46AED3858D28 for ; Sat, 4 Dec 2021 03:24:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 46AED3858D28 Received: by mail-pf1-x434.google.com with SMTP id n26so4723733pff.3 for ; Fri, 03 Dec 2021 19:24:22 -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=+DrV2oP6zkJI06Zl1bz4ZCfYWhFUUVbrTvWqLTXLseY=; b=5xqTeKeAeZxGZ2al+L956atVApIY3OGVX2IViTB4PvdvdyoGfNCPmy/d5sponZ7sLq /jIHQOy2IWukSXWirKnrF28NF1cEfHuo8jUhNHkcLykDMktllW99XDftL0q3M0fVYTCd C72btIM6SiC+JxuQlmtURcMGg+ndDFlfe8ZCHZfANh/ZrLYL2vyxxxxCewixD6VWyeAD 3CVoBgC+V2ki8z9jEKEv4WMW+s/0vhz4EWyku229x+085/poWc2a9XVTG4K4sB4aXAow AwbEfgBdXxzklTvUrJ80SOYLdoVSeqCo7D6xoiBbcAe7v7aBSaMVnx4/J/OxxgEIXrmY Iz+w== X-Gm-Message-State: AOAM532JWy17r4mLQpXr1cwgwttgycFDvgoK9gymMJGlhM8ZpzKVp/pl QbXL36D+e910fjqEQECGjqPG2bqjeCI= X-Google-Smtp-Source: ABdhPJw9ZJNVJS5J9UGRPwKI1rp6dM1WOD+hmPizR++ZR4CyIKk4hZY0HYYZSgdT9pYujGPufC+nuA== X-Received: by 2002:a63:8848:: with SMTP id l69mr7909676pgd.41.1638588261449; Fri, 03 Dec 2021 19:24:21 -0800 (PST) Received: from gnu-tgl-3.localdomain (71-222-78-46.lsv2.qwest.net. [71.222.78.46]) by smtp.gmail.com with ESMTPSA id s15sm3570491pjs.51.2021.12.03.19.24.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Dec 2021 19:24:21 -0800 (PST) Received: from gnu-tgl-3.. (localhost [IPv6:::1]) by gnu-tgl-3.localdomain (Postfix) with ESMTP id 503BDC0B8C; Fri, 3 Dec 2021 19:24:20 -0800 (PST) To: libc-alpha@sourceware.org Subject: [PATCH] x86-64: Use notl in EVEX strcmp [BZ #28646] Date: Fri, 3 Dec 2021 19:24:20 -0800 Message-Id: <20211204032420.3158-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.33.1 MIME-Version: 1.0 X-Spam-Status: No, score=-3031.4 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.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: "H.J. Lu via Libc-alpha" From: "H.J. Lu" Reply-To: "H.J. Lu" Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" From: Noah Goldstein Must use notl %edi here as lower bits are for CHAR comparisons potentially out of range thus can be 0 without indicating mismatch. This fixes BZ #28646. Co-Authored-By: H.J. Lu --- string/test-strcmp.c | 28 ++++++++++++++++++++++++++ sysdeps/x86_64/multiarch/strcmp-evex.S | 14 +++++++------ 2 files changed, 36 insertions(+), 6 deletions(-) diff --git a/string/test-strcmp.c b/string/test-strcmp.c index 77ae73110f..42178a260b 100644 --- a/string/test-strcmp.c +++ b/string/test-strcmp.c @@ -23,6 +23,7 @@ # define TEST_NAME "strcmp" #endif #include "test-string.h" +#include #ifdef WIDE # include @@ -390,6 +391,32 @@ check2 (void) } } +static void +check3 (void) +{ + size_t size = 0xd000 + 0x4000; + CHAR *s1, *s2; + CHAR *buffer1 = mmap (NULL, size, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANON, -1, 0); + CHAR *buffer2 = mmap (NULL, size, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANON, -1, 0); + if (buffer1 == MAP_FAILED || buffer1 == MAP_FAILED) + error (EXIT_UNSUPPORTED, errno, "mmap failed"); + + s1 = (CHAR *) (buffer1 + 0x8f8 / sizeof (CHAR)); + s2 = (CHAR *) (buffer2 + 0xcff3 / sizeof (CHAR)); + + STRCPY(s1, L("/export/redhat/rpms/BUILD/java-1.8.0-openjdk-1.8.0.312.b07-2.fc35.x86_64/openjdk/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/PathDocFileFactory.java")); + STRCPY(s2, L("/export/redhat/rpms/BUILD/java-1.8.0-openjdk-1.8.0.312.b07-2.fc35.x86_64/openjdk/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ThrowsTaglet.java")); + + int exp_result = SIMPLE_STRCMP (s1, s2); + FOR_EACH_IMPL (impl, 0) + check_result (impl, s1, s2, exp_result); + + munmap ((void *) buffer1, size); + munmap ((void *) buffer2, size); +} + int test_main (void) { @@ -398,6 +425,7 @@ test_main (void) test_init (); check(); check2 (); + check3 (); printf ("%23s", ""); FOR_EACH_IMPL (impl, 0) diff --git a/sysdeps/x86_64/multiarch/strcmp-evex.S b/sysdeps/x86_64/multiarch/strcmp-evex.S index 0bea318abd..b68e1f7a1e 100644 --- a/sysdeps/x86_64/multiarch/strcmp-evex.S +++ b/sysdeps/x86_64/multiarch/strcmp-evex.S @@ -646,12 +646,13 @@ L(loop_cross_page): in YMM3 and 32 bytes at VEC_SIZE(%rdx, %r10). */ VPCMP $0, VEC_SIZE(%rdx, %r10), %YMM3, %k3{%k4} kmovd %k3, %edi + /* Must use notl %edi here as lower bits are for CHAR + comparisons potentially out of range thus can be 0 without + indicating mismatch. */ + notl %edi # ifdef USE_AS_WCSCMP /* Don't use subl since it is the upper 8 bits of EDI below. */ - notl %edi andl $0xff, %edi -# else - incl %edi # endif # ifdef USE_AS_WCSCMP @@ -733,12 +734,13 @@ L(loop_cross_page_2_vec): in YMM1 and 32 bytes at (VEC_SIZE * 3)(%rdx, %r10). */ VPCMP $0, (VEC_SIZE * 3)(%rdx, %r10), %YMM1, %k3{%k4} kmovd %k3, %edi + /* Must use notl %edi here as lower bits are for CHAR + comparisons potentially out of range thus can be 0 without + indicating mismatch. */ + notl %edi # ifdef USE_AS_WCSCMP /* Don't use subl since it is the upper 8 bits of EDI below. */ - notl %edi andl $0xff, %edi -# else - incl %edi # endif # ifdef USE_AS_WCSCMP