From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-yw1-x112a.google.com (mail-yw1-x112a.google.com [IPv6:2607:f8b0:4864:20::112a]) by sourceware.org (Postfix) with ESMTPS id C67643858038 for ; Mon, 11 Jul 2022 23:33:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C67643858038 Received: by mail-yw1-x112a.google.com with SMTP id 00721157ae682-31d7db3e6e5so34261697b3.11 for ; Mon, 11 Jul 2022 16:33:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=UbyOKqFuxlr7hYLqr9x9dpfJitsfcXeGVRYVa/4ygYM=; b=FdL3GGsx4ZukZywQJE7Nxk05jyXx46GZRFRVq9rBMIAKORF5BE9DU8epC7EYUe2yjn EdO6Ahq29vpubxh3he3ylqWWumbTPcyk75ZBVgNhB12HwYwlq8GdC7C3NVzE7sTgs2Be TuVlD4yTyi5ERzoBJ8YwdZYGhI+cQ+U9WK8tg02D+xj8+Rw7Lg+ftc6e89uPLhp3py59 NVDGAWH601V2ppriewh9dMYrfF0MbVKkc1T4FjV8Z8JKO8WDTlycAF1ES6OYinl7SQIN FFfXi3sXwFxITLEbHxNBBgWtnx3bxJ08Wav21vAhGBhS0Gsqjg6zlKlnAaMBeA0IcL7H rc+Q== X-Gm-Message-State: AJIora+mMviU5S/p7YcvBfheD1ZxjmdImG46R+HqreiOWhm0/5WYWqr9 RYpJHBumoX8moZ0IQ/asuVzaWklMb7ZTd75ST2g= X-Google-Smtp-Source: AGRyM1uQTiRbBuQKi8LhaWMQktK99iVMDKSlx0cHIzHuLpR01/MFcVHUV/2ZJ/vIx0xxfOSESrOvrwiHjqUk5Dvbp5I= X-Received: by 2002:a81:5486:0:b0:31c:b029:1d24 with SMTP id i128-20020a815486000000b0031cb0291d24mr22663702ywb.56.1657582384211; Mon, 11 Jul 2022 16:33:04 -0700 (PDT) MIME-Version: 1.0 References: <20220711220730.1968923-1-goldstein.w.n@gmail.com> <20220711223841.2041611-1-goldstein.w.n@gmail.com> In-Reply-To: <20220711223841.2041611-1-goldstein.w.n@gmail.com> From: Sunil Pandey Date: Mon, 11 Jul 2022 16:32:28 -0700 Message-ID: Subject: Re: [PATCH v2] x86: Remove __mmask intrinsics in strstr-avx512.c To: Noah Goldstein Cc: GNU C Library Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, GIT_PATCH_0, HK_RANDOM_ENVFROM, HK_RANDOM_FROM, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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, 11 Jul 2022 23:33:06 -0000 On Mon, Jul 11, 2022 at 3:38 PM Noah Goldstein via Libc-alpha wrote: > > Using standard operators generates and the same code and __mmask > instrinsics are not available before GCC7. > > Removed: > _cvtmask64_u64 > _kshiftri_mask64 > _kand_mask64 > --- > sysdeps/x86_64/multiarch/strstr-avx512.c | 16 ++++++++++------ > 1 file changed, 10 insertions(+), 6 deletions(-) > > diff --git a/sysdeps/x86_64/multiarch/strstr-avx512.c b/sysdeps/x86_64/multiarch/strstr-avx512.c > index 2ab9e96db8..e44c1a05dc 100644 > --- a/sysdeps/x86_64/multiarch/strstr-avx512.c > +++ b/sysdeps/x86_64/multiarch/strstr-avx512.c > @@ -26,6 +26,10 @@ > #define ZMM_SIZE_IN_BYTES 64 > #define PAGESIZE 4096 > > +#define cvtmask64_u64(...) (uint64_t) (__VA_ARGS__) > +#define kshiftri_mask64(x, y) ((x) >> (y)) > +#define kand_mask64(x, y) ((x) & (y)) > + > /* > Returns the index of the first edge within the needle, returns 0 if no edge > is found. Example: 'ab' is the first edge in 'aaaaaaaaaabaarddg' > @@ -133,15 +137,15 @@ __strstr_avx512 (const char *haystack, const char *ned) > __m512i hay0 = _mm512_maskz_loadu_epi8 (loadmask, haystack + hay_index); > /* Search for NULL and compare only till null char */ > uint64_t nullmask > - = _cvtmask64_u64 (_mm512_mask_testn_epi8_mask (loadmask, hay0, hay0)); > + = cvtmask64_u64 (_mm512_mask_testn_epi8_mask (loadmask, hay0, hay0)); > uint64_t cmpmask = nullmask ^ (nullmask - ONE_64BIT); > - cmpmask = cmpmask & _cvtmask64_u64 (loadmask); > + cmpmask = cmpmask & cvtmask64_u64 (loadmask); > /* Search for the 2 charaters of needle */ > __mmask64 k0 = _mm512_cmpeq_epi8_mask (hay0, ned0); > __mmask64 k1 = _mm512_cmpeq_epi8_mask (hay0, ned1); > - k1 = _kshiftri_mask64 (k1, 1); > + k1 = kshiftri_mask64 (k1, 1); > /* k2 masks tell us if both chars from needle match */ > - uint64_t k2 = _cvtmask64_u64 (_kand_mask64 (k0, k1)) & cmpmask; > + uint64_t k2 = cvtmask64_u64 (kand_mask64 (k0, k1)) & cmpmask; > /* For every match, search for the entire needle for a full match */ > while (k2) > { > @@ -178,13 +182,13 @@ __strstr_avx512 (const char *haystack, const char *ned) > hay0 = _mm512_loadu_si512 (haystack + hay_index); > hay1 = _mm512_load_si512 (haystack + hay_index > + 1); // Always 64 byte aligned > - nullmask = _cvtmask64_u64 (_mm512_testn_epi8_mask (hay1, hay1)); > + nullmask = cvtmask64_u64 (_mm512_testn_epi8_mask (hay1, hay1)); > /* Compare only till null char */ > cmpmask = nullmask ^ (nullmask - ONE_64BIT); > k0 = _mm512_cmpeq_epi8_mask (hay0, ned0); > k1 = _mm512_cmpeq_epi8_mask (hay1, ned1); > /* k2 masks tell us if both chars from needle match */ > - k2 = _cvtmask64_u64 (_kand_mask64 (k0, k1)) & cmpmask; > + k2 = cvtmask64_u64 (kand_mask64 (k0, k1)) & cmpmask; > /* For every match, compare full strings for potential match */ > while (k2) > { > -- > 2.34.1 > LGTM Reviewed-by: Sunil K Pandey