From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-yb1-xb36.google.com (mail-yb1-xb36.google.com [IPv6:2607:f8b0:4864:20::b36]) by sourceware.org (Postfix) with ESMTPS id 45A39398AC3D for ; Mon, 11 Jul 2022 22:18:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 45A39398AC3D Received: by mail-yb1-xb36.google.com with SMTP id i14so11045893yba.1 for ; Mon, 11 Jul 2022 15:18:07 -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=WAc18aKyM2pId2U6oQPYJOHK4BPNsEjC4zHeUgoePwI=; b=yvUQkfJMuOS1R7+3xNA5NeCtxc+8Y1GDAFnDZ+u8RI708gs8EZjVp0eV1HH1vjyYy5 zDn+jZjDHPdbHuyVVLnwy/MkqmB1PutSB1dvqSfbu6YN8vgnCKvc6Zy7xoZx5+vKNZzE E/1CCdyjloC9Jt8KHTR1f8oeB/p6iiE1joA0V3dvAPPN15xL+x1705u4XkMfCr3o9BdD mf5Nv0eBKJndHkDXzCePULjBtSVKEh5VlAVxhvywQbhHr1pJ3OvNdgAHG4Wi2c5Jwx5C OOBu1Uj3odnCpRctqbNCjy2tI2ZsN/v9ph5c4LL1aJiVbdDD4rX3NN0IZCHsjFKxXJPx 4y5w== X-Gm-Message-State: AJIora9lB11AjVzbVcNFb4EY7dn57EbpJUaily2veW3ltG7530X0anJB XksSEadHOadEsn+Elb6uYTi43xpDpIrjaOxw5TCJn4jim0g= X-Google-Smtp-Source: AGRyM1v6871TPhBpZnlEDFqJqFU9ISpoeIBbZ2OaZ/uqUnQMhp2DQaiRvH8CzIfbTMeLjVfXIk8EhFeDKF52nONQqM4= X-Received: by 2002:a5b:20b:0:b0:65c:a0cf:812b with SMTP id z11-20020a5b020b000000b0065ca0cf812bmr19154667ybl.48.1657577886642; Mon, 11 Jul 2022 15:18:06 -0700 (PDT) MIME-Version: 1.0 References: <20220711220730.1968923-1-goldstein.w.n@gmail.com> In-Reply-To: From: Sunil Pandey Date: Mon, 11 Jul 2022 15:17:30 -0700 Message-ID: Subject: Re: [PATCH v1] x86: Use regular casting instead of _cvtmask64_u64 in strstr-avx512 To: Noah Goldstein Cc: GNU C Library , "H.J. Lu" , "Carlos O'Donell" Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-5.8 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, KAM_NUMSUBJECT, 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 22:18:08 -0000 On Mon, Jul 11, 2022 at 3:08 PM Noah Goldstein wrote: > > On Mon, Jul 11, 2022 at 3:07 PM Noah Goldstein wrote: > > > > _cvtmask64_u64 is not available before GCC7. > > --- > > sysdeps/x86_64/multiarch/strstr-avx512.c | 12 +++++++----- > > 1 file changed, 7 insertions(+), 5 deletions(-) > > > > diff --git a/sysdeps/x86_64/multiarch/strstr-avx512.c b/sysdeps/x86_64/multiarch/strstr-avx512.c > > index 2ab9e96db8..e41b44abe1 100644 > > --- a/sysdeps/x86_64/multiarch/strstr-avx512.c > > +++ b/sysdeps/x86_64/multiarch/strstr-avx512.c > > @@ -26,6 +26,8 @@ > > #define ZMM_SIZE_IN_BYTES 64 > > #define PAGESIZE 4096 > > > > +#define cvtmask64_u64(...) (uint64_t) (__VA_ARGS__) > > + > > /* > > 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 +135,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); > > /* 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 +180,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 > > > > Sunil, can you see if this fixed the build issue with gcc6? Nope, there are more missing intrinsics ../sysdeps/x86_64/multiarch/strstr-avx512.c:144:8: error: implicit declaration of function ?_kshiftri_mask64? [-Wer ror=implicit-function-declaration] ../sysdeps/x86_64/multiarch/strstr-avx512.c:146:32: error: implicit declaration of function ?_kand_mask64? [-Werror =implicit-function-declaration] ../sysdeps/x86_64/multiarch/strstr-avx512.c:144:8: error: implicit declaration of function ?_kshiftri_mask64? [-Wer ror=implicit-function-declaration] ../sysdeps/x86_64/multiarch/strstr-avx512.c:146:32: error: implicit declaration of function ?_kand_mask64? [-Werror =implicit-function-declaration]