From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oi1-x22a.google.com (mail-oi1-x22a.google.com [IPv6:2607:f8b0:4864:20::22a]) by sourceware.org (Postfix) with ESMTPS id 907C73858C83 for ; Thu, 29 Sep 2022 03:42:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 907C73858C83 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-oi1-x22a.google.com with SMTP id n83so353772oif.11 for ; Wed, 28 Sep 2022 20:42:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date; bh=qZ6TIkc9IbFeexe1TVTd/gwOVQfRtYJTB/KradXkfk0=; b=LknpszH4Nem6KIiYAkFzQWCixDZtmkx/NsbmQvQFwexZyvttRKw+ZJd4xA0ujhVGRt UlHZcawmtiqyvBclHIDC51ZCAsF1iJq67rtOGsYTV6Qgno7IkwcCmvLn8724HbXKD9gv UU6sGRAFOz47pDYOFoZ5cOQDD/75WCtIJYgUyuPm1hDNbtbCLtbpfRXZ1emFwWz5hkGj l9t8KKE1h7pOD5cQ/TLb+HBbNnGCka6gd/726J182FxeTYwG2nwkclEYLthhgmq2y4Tt PMlbSLf6MotNeRuihP/SxMsgwTZyjlHLWOjCgLLmxrCBWR5N58vnPTvXEh360pdeVG57 86bQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date; bh=qZ6TIkc9IbFeexe1TVTd/gwOVQfRtYJTB/KradXkfk0=; b=Y94l1vyopaH2uzBVKFoMGTtrh8gMlmwm4mjPYEWziU4MG5kLV2x6JYy7y6F3GXUzL/ EE2oJnEs9cEGepdlWcNEamt4eLBWpyfBHZpS49mOh61JVgCn/gSSoHrreTHM0cauVbSe xjmnxr+lZbty5c7EO5aesRvsViIT+RDQmhEtttgNuw6oKs2oHqp18Z8r7QP0bc0SdbQ0 R0o4s+jtk9g2SDYvQxK0dEmMjNWebt9rGpGceiQLSUDsa2luUywxUna0cerCCE856bb5 7VjT3Doa/hcGgQxKIz6TAG2yNfbp7nvUnmPNHhd2MPED4vbOlFmxm48AZAHlvjH/XeAX KVFg== X-Gm-Message-State: ACrzQf1eLivhvOMXVRRDHsGijbgvbexjp+u6QZKzVG6fL5hpXbFIX5OV iF54U1MixNVfFg4eS8xEjNBrYRahNzS1i0d6UKE= X-Google-Smtp-Source: AMsMyM5UR43zr9LK9rqpGDSyZehRZ8+GZlpYgilMn8l987W1z+1FDnJWr2YMEwJIEU0SDz5ESRmdeu/Vzj0U8waiISg= X-Received: by 2002:aca:2103:0:b0:350:741c:ee92 with SMTP id 3-20020aca2103000000b00350741cee92mr605382oiz.105.1664422960736; Wed, 28 Sep 2022 20:42:40 -0700 (PDT) MIME-Version: 1.0 References: <20220922002451.4039857-1-skpgkp2@gmail.com> In-Reply-To: From: Sunil Pandey Date: Wed, 28 Sep 2022 20:42:04 -0700 Message-ID: Subject: Re: [PATCH] x86_64: Implement evex512 version of strrchr and wcsrchr To: Noah Goldstein Cc: GNU C Library Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-7.0 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_SHORT,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On Thu, Sep 22, 2022 at 8:57 PM Sunil Pandey wrote: > > Microbenchmark data collected on: Intel(R) Xeon(R) Gold 6148 CPU @ 2.40GHz > > > On Wed, Sep 21, 2022 at 5:50 PM Noah Goldstein wrote: > > > > On Wed, Sep 21, 2022 at 5:24 PM Sunil K Pandey via Libc-alpha > > wrote: > > > > > > This patch implements following evex512 version of string functions. > > > evex512 version takes up to 30% less cycle as compared to evex, > > > depending on length and alignment. > > > > > > > Please attach benchmark numbers. > > > > > - strrchr function using 512 bit vectors. > > > - wcsrchr function using 512 bit vectors. > > > > > > Code size data: > > > > > > strrchr-evex.o 833 byte > > > strrchr-evex512.o 573 byte (-31%) > > > > > > wcsrchr-evex.o 836 byte > > > wcsrchr-evex512.o 581 byte (-31%) > > > > > > Placeholder function, not used by any processor at the moment. > > > --- > > > sysdeps/x86_64/multiarch/Makefile | 2 + > > > sysdeps/x86_64/multiarch/ifunc-impl-list.c | 10 + > > > sysdeps/x86_64/multiarch/strrchr-evex-base.S | 307 +++++++++++++++++++ > > > sysdeps/x86_64/multiarch/strrchr-evex512.S | 7 + > > > sysdeps/x86_64/multiarch/wcsrchr-evex512.S | 8 + > > > 5 files changed, 334 insertions(+) > > > create mode 100644 sysdeps/x86_64/multiarch/strrchr-evex-base.S > > > create mode 100644 sysdeps/x86_64/multiarch/strrchr-evex512.S > > > create mode 100644 sysdeps/x86_64/multiarch/wcsrchr-evex512.S > > > > > > diff --git a/sysdeps/x86_64/multiarch/Makefile b/sysdeps/x86_64/multiarch/Makefile > > > index df4601c294..6a275f1c3d 100644 > > > --- a/sysdeps/x86_64/multiarch/Makefile > > > +++ b/sysdeps/x86_64/multiarch/Makefile > > > @@ -110,6 +110,7 @@ sysdep_routines += \ > > > strrchr-avx2 \ > > > strrchr-avx2-rtm \ > > > strrchr-evex \ > > > + strrchr-evex512 \ > > > strrchr-sse2 \ > > > strspn-sse4 \ > > > strstr-avx512 \ > > > @@ -152,6 +153,7 @@ sysdep_routines += \ > > > wcsrchr-avx2 \ > > > wcsrchr-avx2-rtm \ > > > wcsrchr-evex \ > > > + wcsrchr-evex512 \ > > > wcsrchr-sse2 \ > > > wmemchr-avx2 \ > > > wmemchr-avx2-rtm \ > > > diff --git a/sysdeps/x86_64/multiarch/ifunc-impl-list.c b/sysdeps/x86_64/multiarch/ifunc-impl-list.c > > > index a71444eccb..26c941023a 100644 > > > --- a/sysdeps/x86_64/multiarch/ifunc-impl-list.c > > > +++ b/sysdeps/x86_64/multiarch/ifunc-impl-list.c > > > @@ -564,6 +564,11 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, > > > (CPU_FEATURE_USABLE (AVX512VL) > > > && CPU_FEATURE_USABLE (AVX512BW)), > > > __strrchr_evex) > > > + X86_IFUNC_IMPL_ADD_V4 (array, i, strrchr, > > > + (CPU_FEATURE_USABLE (AVX512VL) > > > + && CPU_FEATURE_USABLE (AVX512BW) > > > + && CPU_FEATURE_USABLE (BMI2)), > > > + __strrchr_evex512) > > > X86_IFUNC_IMPL_ADD_V3 (array, i, strrchr, > > > CPU_FEATURE_USABLE (AVX2), > > > __strrchr_avx2) > > > @@ -775,6 +780,11 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, > > > && CPU_FEATURE_USABLE (AVX512BW) > > > && CPU_FEATURE_USABLE (BMI2)), > > > __wcsrchr_evex) > > > + X86_IFUNC_IMPL_ADD_V4 (array, i, wcsrchr, > > > + (CPU_FEATURE_USABLE (AVX512VL) > > > + && CPU_FEATURE_USABLE (AVX512BW) > > > + && CPU_FEATURE_USABLE (BMI2)), > > > + __wcsrchr_evex512) > > > X86_IFUNC_IMPL_ADD_V3 (array, i, wcsrchr, > > > CPU_FEATURE_USABLE (AVX2), > > > __wcsrchr_avx2) > > > diff --git a/sysdeps/x86_64/multiarch/strrchr-evex-base.S b/sysdeps/x86_64/multiarch/strrchr-evex-base.S > > > new file mode 100644 > > > index 0000000000..e937cb193c > > > --- /dev/null > > > +++ b/sysdeps/x86_64/multiarch/strrchr-evex-base.S > > > @@ -0,0 +1,307 @@ > > > +/* Placeholder function, not used by any processor at the moment. > > > + Copyright (C) 2022 Free Software Foundation, Inc. > > > + This file is part of the GNU C Library. > > > + > > > + The GNU C Library is free software; you can redistribute it and/or > > > + modify it under the terms of the GNU Lesser General Public > > > + License as published by the Free Software Foundation; either > > > + version 2.1 of the License, or (at your option) any later version. > > > + > > > + The GNU C Library is distributed in the hope that it will be useful, > > > + but WITHOUT ANY WARRANTY; without even the implied warranty of > > > + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > > > + Lesser General Public License for more details. > > > + > > > + You should have received a copy of the GNU Lesser General Public > > > + License along with the GNU C Library; if not, see > > > + . */ > > > + > > > +/* UNUSED. Exists purely as reference implementation. */ > > > + > > > +#include > > > + > > > +#if ISA_SHOULD_BUILD (4) > > > + > > > +# include > > > + > > > +# ifdef USE_AS_WCSRCHR > > > +# define CHAR_SIZE 4 > > > +# define VPBROADCAST vpbroadcastd > > > +# define VPCMP vpcmpd > > > +# define VPMINU vpminud > > > +# define VPTESTN vptestnmd > > > +# else > > > +# define CHAR_SIZE 1 > > > +# define VPBROADCAST vpbroadcastb > > > +# define VPCMP vpcmpb > > > +# define VPMINU vpminub > > > +# define VPTESTN vptestnmb > > > +# endif > > > + > > > +# define PAGE_SIZE 4096 > > > +# define CHAR_PER_VEC (VEC_SIZE / CHAR_SIZE) > > > + > > > +# if VEC_SIZE == 64 > > > +# define BLSMSK blsmskq > > > +# define BSR bsrq > > > +# define KMOV kmovq > > > +# define KOR korq > > > +# define KORTEST kortestq > > > +# define R8 r8 > > > +# define RAX rax > > > +# define RCX rcx > > > +# define RDX rdx > > > +# define SHR shrq > > > +# define TEXTSUFFIX evex512 > > > +# define VMM0 zmm16 > > > +# define VMM1 zmm17 > > > +# define VMM2 zmm18 > > > +# define VMM3 zmm19 > > > +# define VMM4 zmm20 > > > +# define VMM5 zmm21 > > > +# define VMOVA vmovdqa64 > > > +# define VMOVU vmovdqu64 > > > + > > > +# elif VEC_SIZE == 32 > > > +/* Currently Unused. */ > > > +# define BLSMSK blsmskl > > > +# define BSR bsrl > > > +# define KMOV kmovd > > > +# define KOR kord > > > +# define KORTEST kortestd > > > +# define R8 r8d > > > +# define RAX eax > > > +# define RCX ecx > > > +# define RDX edx > > > +# define SHR shrl > > > +# define TEXTSUFFIX evex256 > > > +# define VMM0 ymm16 > > > +# define VMM1 ymm17 > > > +# define VMM2 ymm18 > > > +# define VMM3 ymm19 > > > +# define VMM4 ymm20 > > > +# define VMM5 ymm21 > > > +# define VMOVA vmovdqa32 > > > +# define VMOVU vmovdqu32 > > > +# endif > > > + > > > + .section .text.TEXTSUFFIX, "ax", @progbits > > > +/* Aligning entry point to 64 byte, provides better performance for > > > + one vector length string. */ > > > +ENTRY_P2ALIGN (STRRCHR, 6) > > > + > > > + /* Broadcast CHAR to VMM0. */ > > > + VPBROADCAST %esi, %VMM0 > > > + movl %edi, %eax > > > + andl $(PAGE_SIZE - 1), %eax > > > + cmpl $(PAGE_SIZE - VEC_SIZE), %eax > > > + ja L(page_cross) > > > + > > > +L(page_cross_continue): > > > + /* Compare [w]char for null, mask bit will be set for match. */ > > > + VMOVU (%rdi), %VMM1 > > > + > > > + VPTESTN %VMM1, %VMM1, %k1 > > > + KMOV %k1, %RCX > > > + test %RCX, %RCX > > > + jz L(align_more) > > > + > > > + VPCMP $0, %VMM1, %VMM0, %k0 > > > + KMOV %k0, %RAX > > > + BLSMSK %RCX, %RCX > > > + and %RCX, %RAX > > > + jz L(ret) > > > + > > > + BSR %RAX, %RAX > > > +# ifdef USE_AS_WCSRCHR > > > + leaq (%rdi, %rax, CHAR_SIZE), %rax > > > +# else > > > + add %rdi, %rax > > > +# endif > > > +L(ret): > > > + ret > > > + > > > +L(vector_x2_end): > > > + VPCMP $0, %VMM2, %VMM0, %k2 > > > + KMOV %k2, %RAX > > > + BLSMSK %RCX, %RCX > > > + and %RCX, %RAX > > > + jz L(vector_x1_ret) > > > + > > > + BSR %RAX, %RAX > > > + leaq (VEC_SIZE)(%rdi, %rax, CHAR_SIZE), %rax > > > + ret > > > + > > > + /* Check the first vector at very last to look for match. */ > > > +L(vector_x1_ret): > > > + VPCMP $0, %VMM1, %VMM0, %k2 > > > + KMOV %k2, %RAX > > > + test %RAX, %RAX > > > + jz L(ret) > > > + > > > + BSR %RAX, %RAX > > > +# ifdef USE_AS_WCSRCHR > > > + leaq (%rsi, %rax, CHAR_SIZE), %rax > > > +# else > > > + add %rsi, %rax > > > +# endif > > > + ret > > > + > > > +L(align_more): > > > + /* Zero r8 to store match result. */ > > > + xorq %r8, %r8 > > > + /* Save pointer of first vector, in case if no match found. */ > > > + movq %rdi, %rsi > > > + /* Align pointer to vector size. */ > > > + andq $-VEC_SIZE, %rdi > > > + /* Loop unroll 2 times for 2 vector loop. */ > > > + VMOVA (VEC_SIZE)(%rdi), %VMM2 > > > + VPTESTN %VMM2, %VMM2, %k0 > > > + KMOV %k0, %RCX > > > + test %RCX, %RCX > > > + jnz L(vector_x2_end) > > > + > > > + /* Save pointer of second vector, in case if no match > > > + found. */ > > > + movq %rdi, %r9 > > > + /* Align address to VEC_SIZE * 2 for loop. */ > > > + andq $-(VEC_SIZE * 2), %rdi > > > + > > > + .p2align 4,,11 > > > +L(loop): > > > + /* 2 vector loop, as it provide better performance as compared > > > + to 4 vector loop. */ > > > + VMOVA (VEC_SIZE * 2)(%rdi), %VMM3 > > > + VMOVA (VEC_SIZE * 3)(%rdi), %VMM4 > > > + VPCMP $0, %VMM3, %VMM0, %k1 > > > + VPCMP $0, %VMM4, %VMM0, %k2 > > > + VPMINU %VMM3, %VMM4, %VMM5 > > > + VPTESTN %VMM5, %VMM5, %k0 > > > + KOR %k1, %k2, %k3 > > > + subq $-(VEC_SIZE * 2), %rdi > > > + /* If k0 and k3 zero, match and end of string not found. */ > > > + KORTEST %k0, %k3 > > > + jz L(loop) > > > + > > > + /* If k0 is non zero, end of string found. */ > > > + KORTEST %k0, %k0 > > > + jnz L(endloop) > > > + > > > + /* A match found, it need to be stored in r8 before loop > > > + continue. */ > > > + /* Check second vector first. */ > > > + KMOV %k2, %RDX > > > + test %RDX, %RDX > > > + jz L(loop_vec_x3_ret) > > > + > > > + BSR %RDX, %RDX > > > + leaq (VEC_SIZE)(%rdi, %rdx, CHAR_SIZE), %r8 > > > + jmp L(loop) > > > + > > > + /* If second vector doesn't have match, first vector must > > > + have match. */ > > > +L(loop_vec_x3_ret): > > > + KMOV %k1, %R8 > > > + BSR %R8, %R8 > > > +# ifdef USE_AS_WCSRCHR > > > + leaq (%rdi, %r8, CHAR_SIZE), %r8 > > > +# else > > > + add %rdi, %r8 > > > +# endif > > > + jmp L(loop) > > > + > > > +L(endloop): > > > + /* Check if string end in first loop vector. */ > > > + VPTESTN %VMM3, %VMM3, %k0 > > > + KMOV %k0, %RCX > > > + test %RCX, %RCX > > > + jnz L(vector_x3_end) > > > + > > > + /* Check if it has match in first loop vector. */ > > > + KMOV %k1, %RAX > > > + test %RAX, %RAX > > > + jz L(vector_x4_end) > > > + > > > + BSR %RAX, %RAX > > > + leaq (%rdi, %rax, CHAR_SIZE), %r8 > > > + > > > + /* String must end in second loop vector. */ > > > +L(vector_x4_end): > > > + VPTESTN %VMM4, %VMM4, %k0 > > > + KMOV %k0, %RCX > > > + KMOV %k2, %RAX > > > + BLSMSK %RCX, %RCX > > > + /* Check if it has match in second loop vector. */ > > > + and %RCX, %RAX > > > + jz L(check_last_match) > > > + > > > + BSR %RAX, %RAX > > > + leaq (VEC_SIZE)(%rdi, %rax, CHAR_SIZE), %rax > > > + ret > > > + > > > + /* String end in first loop vector. */ > > > +L(vector_x3_end): > > > + KMOV %k1, %RAX > > > + BLSMSK %RCX, %RCX > > > + /* Check if it has match in second loop vector. */ > > > + and %RCX, %RAX > > > + jz L(check_last_match) > > > + > > > + BSR %RAX, %RAX > > > + leaq (%rdi, %rax, CHAR_SIZE), %rax > > > + ret > > > + > > > + /* No match in first and second loop vector. */ > > > +L(check_last_match): > > > + /* Check if any match recorded in r8. */ > > > + test %r8, %r8 > > > + jz L(vector_x2_ret) > > > + movq %r8, %rax > > > + ret > > > + > > > + /* No match recorded in r8. Check the second saved vector > > > + in begining. */ > > > +L(vector_x2_ret): > > > + VPCMP $0, %VMM2, %VMM0, %k2 > > > + KMOV %k2, %RAX > > > + test %RAX, %RAX > > > + jz L(vector_x1_ret) > > > + > > > + /* Match found in the second saved vector. */ > > > + BSR %RAX, %RAX > > > + leaq (VEC_SIZE)(%r9, %rax, CHAR_SIZE), %rax > > > + ret > > > + > > > +L(page_cross): > > > + movl %eax, %ecx > > > +# ifdef USE_AS_WCSRCHR > > > + /* Calculate number of compare result bits to be skipped for > > > + wide string alignment adjustment. */ > > > + andl $(VEC_SIZE - 1), %ecx > > > + sarl $2, %ecx > > > +# endif > > > + /* ecx contains number of w[char] to be skipped as a result > > > + of address alignment. */ > > > + xorq %rdi, %rax > > > + VMOVA (PAGE_SIZE - VEC_SIZE)(%rax), %VMM1 > > > + > > > + VPTESTN %VMM1, %VMM1, %k1 > > > + KMOV %k1, %RAX > > > + SHR %cl, %RAX > > > + jz L(page_cross_continue) > > > + VPCMP $0, %VMM1, %VMM0, %k0 > > > + KMOV %k0, %RDX > > > + SHR %cl, %RDX > > > + BLSMSK %RAX, %RAX > > > + and %RDX, %RAX > > > + jz L(ret) > > > + BSR %RAX, %RAX > > > +# ifdef USE_AS_WCSRCHR > > > + leaq (%rdi, %rax, CHAR_SIZE), %rax > > > +# else > > > + add %rdi, %rax > > > +# endif > > > + > > > + ret > > > +END (STRRCHR) > > > +#endif > > > diff --git a/sysdeps/x86_64/multiarch/strrchr-evex512.S b/sysdeps/x86_64/multiarch/strrchr-evex512.S > > > new file mode 100644 > > > index 0000000000..f880848e09 > > > --- /dev/null > > > +++ b/sysdeps/x86_64/multiarch/strrchr-evex512.S > > > @@ -0,0 +1,7 @@ > > > +# ifndef STRRCHR > > > +# define STRRCHR __strrchr_evex512 > > > +# endif > > > + > > > +#define VEC_SIZE 64 > > > + > > > +#include "strrchr-evex-base.S" > > > diff --git a/sysdeps/x86_64/multiarch/wcsrchr-evex512.S b/sysdeps/x86_64/multiarch/wcsrchr-evex512.S > > > new file mode 100644 > > > index 0000000000..65b7710b22 > > > --- /dev/null > > > +++ b/sysdeps/x86_64/multiarch/wcsrchr-evex512.S > > > @@ -0,0 +1,8 @@ > > > +#ifndef WCSRCHR > > > +# define WCSRCHR __wcsrchr_evex512 > > > +#endif > > > + > > > +#define STRRCHR WCSRCHR > > > +#define USE_AS_WCSRCHR 1 > > > + > > > +#include "strrchr-evex512.S" > > > -- > > > 2.36.1 > > > ping