From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oa1-x31.google.com (mail-oa1-x31.google.com [IPv6:2001:4860:4864:20::31]) by sourceware.org (Postfix) with ESMTPS id D5C74398241F for ; Mon, 11 Jul 2022 22:08:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D5C74398241F Received: by mail-oa1-x31.google.com with SMTP id 586e51a60fabf-fe023ab520so8304095fac.10 for ; Mon, 11 Jul 2022 15:08:35 -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=5lDtpVXXCyHOxvzak3qmq08c6qocoQJbw0MyuNT7UHg=; b=2WQ7bllksW7uguLzsuUg5Vo24DZjgMh68b49VXw74waB0ChRkAORIAnwrA99PVzKY1 g78aPd4WUW/FBzGZWHEd9izGck0XMSWuu3xJrHTvodyXCPacmMIE42PIyF3r13pvRqhH Y7iRMavi65Wt7F4vUkfrBCwFafx1/PBA7+yc/r2DJofxW91fM2Pnx0MW16ccYyHYr8hP M5zhDitZByZKWM2BIZco7ns5fKYzuWIWvnWdCQUD+YkGg0d1Fe+loriw+pBtpHGfX4aO Wg3cWhUtrPqpluvBbk8+wtixC6tGMoMq3h2DobD/QzA1M7jTkBtIcYV0UEuGU90PFhcq IfVQ== X-Gm-Message-State: AJIora+Tv/juBN3aL8sBQeKhpeFyXq6KRfl9/1Wbw8jNalrYW5kRacKj FIRMk0C9n8jzXtz9/Q1py5ak4KBlSqUMfL9ARUyodUD3 X-Google-Smtp-Source: AGRyM1t3MbWdg1S5AnPcWEuA/PqSU0XQDPnvBKOoSXgFYO+lq7ScglKTRN2XGibQ26UYvyv9LS3O/EpecW2clDAQgvo= X-Received: by 2002:a05:6870:e997:b0:10c:6f42:b05e with SMTP id r23-20020a056870e99700b0010c6f42b05emr255587oao.89.1657577315036; Mon, 11 Jul 2022 15:08:35 -0700 (PDT) MIME-Version: 1.0 References: <20220711220730.1968923-1-goldstein.w.n@gmail.com> In-Reply-To: <20220711220730.1968923-1-goldstein.w.n@gmail.com> From: Noah Goldstein Date: Mon, 11 Jul 2022 15:08:24 -0700 Message-ID: Subject: Re: [PATCH v1] x86: Use regular casting instead of _cvtmask64_u64 in strstr-avx512 To: GNU C Library Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, 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:08:37 -0000 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?