From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg1-x530.google.com (mail-pg1-x530.google.com [IPv6:2607:f8b0:4864:20::530]) by sourceware.org (Postfix) with ESMTPS id 2928D38418A8 for ; Wed, 29 Jun 2022 19:59:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 2928D38418A8 Received: by mail-pg1-x530.google.com with SMTP id r66so16335636pgr.2 for ; Wed, 29 Jun 2022 12:59:52 -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=ITqdXdBbrbwyJuIZYbjbg1/2yDV8jtDEjSUoBXe8+6k=; b=t+QzazQzm3ooMpNJmsLi9kCmWyEtZczGwAhEOKnV9wz4p9BZZOoY3TdcvQ1wJbI51I c7X5ncx8GTQJFMB33kRXm7s86Lwq8m+w6v/7xgkLtPLSVS5jf3yiYctn5lCDpcnJ6NKj 8XZ4+THXPvEak1cRQ1CBS1kcTOKJmFgRZ/3+e571S9s5x18ujIUOUdwC/EzcggDpuNvA 2IRhmdwunuqP6/wwguA9ykurmWeFaLsqpV5AEKsQQWZ7ynrfLEfHjEJ9Rw6ncBlLHmWW Se+zIpod1m153B0th4DgVeSLFt7fOf1cO4MA2fLL89bbkr0obgwCYL6GHAUrmPQyWZy6 53UQ== X-Gm-Message-State: AJIora8TGB9zacx+dT/MXqzZ3+U0p+jk0lajlAHbY5JIOO9Lcqk6JxtN Q6jxMOh+veWnGIhs6VbgOAWH24b0JrUZMT8mRAg= X-Google-Smtp-Source: AGRyM1shkvYRSaXK+q5bZIhwBpmDTCB2u41eKwhnXtnq1/dKXwE6DeQwEP3skiJHTB9DYN5p7vg0BbBqc/XsrEcmZrw= X-Received: by 2002:a63:3c14:0:b0:40c:a228:c3c3 with SMTP id j20-20020a633c14000000b0040ca228c3c3mr4368767pga.256.1656532791110; Wed, 29 Jun 2022 12:59:51 -0700 (PDT) MIME-Version: 1.0 References: <20220628152757.17922-1-goldstein.w.n@gmail.com> In-Reply-To: From: "H.J. Lu" Date: Wed, 29 Jun 2022 12:59:15 -0700 Message-ID: Subject: Re: [PATCH v1 1/2] x86: Move mem{p}{mov|cpy}_{chk_}erms to its own file To: Noah Goldstein Cc: GNU C Library , "Carlos O'Donell" Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-3024.7 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, 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: Wed, 29 Jun 2022 19:59:54 -0000 On Wed, Jun 29, 2022 at 12:48 PM Noah Goldstein wrote: > > On Wed, Jun 29, 2022 at 12:46 PM H.J. Lu wrote: > > > > On Wed, Jun 29, 2022 at 12:34 PM Noah Goldstein wrote: > > > > > > On Wed, Jun 29, 2022 at 12:32 PM H.J. Lu wrote: > > > > > > > > On Tue, Jun 28, 2022 at 8:28 AM Noah Goldstein wrote: > > > > > > > > > > The primary memmove_{impl}_unaligned_erms implementations don't > > > > > interact with this function. Putting them in same file both > > > > > wastes space and unnecessarily bloats a hot code section. > > > > > --- > > > > > sysdeps/x86_64/multiarch/memmove-erms.S | 53 +++++++++++++++++++ > > > > > .../multiarch/memmove-vec-unaligned-erms.S | 50 ----------------- > > > > > 2 files changed, 53 insertions(+), 50 deletions(-) > > > > > create mode 100644 sysdeps/x86_64/multiarch/memmove-erms.S > > > > > > > > > > diff --git a/sysdeps/x86_64/multiarch/memmove-erms.S b/sysdeps/x86_64/multiarch/memmove-erms.S > > > > > new file mode 100644 > > > > > index 0000000000..d98d21644b > > > > > --- /dev/null > > > > > +++ b/sysdeps/x86_64/multiarch/memmove-erms.S > > > > > @@ -0,0 +1,53 @@ > > > > > +#include > > > > > + > > > > > +#if defined USE_MULTIARCH && IS_IN (libc) > > > > > + .text > > > > > +ENTRY (__mempcpy_chk_erms) > > > > > + cmp %RDX_LP, %RCX_LP > > > > > + jb HIDDEN_JUMPTARGET (__chk_fail) > > > > > +END (__mempcpy_chk_erms) > > > > > + > > > > > +/* Only used to measure performance of REP MOVSB. */ > > > > > +ENTRY (__mempcpy_erms) > > > > > + mov %RDI_LP, %RAX_LP > > > > > + /* Skip zero length. */ > > > > > + test %RDX_LP, %RDX_LP > > > > > + jz 2f > > > > > + add %RDX_LP, %RAX_LP > > > > > + jmp L(start_movsb) > > > > > +END (__mempcpy_erms) > > > > > + > > > > > +ENTRY (__memmove_chk_erms) > > > > > + cmp %RDX_LP, %RCX_LP > > > > > + jb HIDDEN_JUMPTARGET (__chk_fail) > > > > > +END (__memmove_chk_erms) > > > > > + > > > > > +ENTRY (__memmove_erms) > > > > > + movq %rdi, %rax > > > > > + /* Skip zero length. */ > > > > > + test %RDX_LP, %RDX_LP > > > > > + jz 2f > > > > > +L(start_movsb): > > > > > + mov %RDX_LP, %RCX_LP > > > > > + cmp %RSI_LP, %RDI_LP > > > > > + jb 1f > > > > > + /* Source == destination is less common. */ > > > > > + je 2f > > > > > + lea (%rsi,%rcx), %RDX_LP > > > > > + cmp %RDX_LP, %RDI_LP > > > > > + jb L(movsb_backward) > > > > > +1: > > > > > + rep movsb > > > > > +2: > > > > > + ret > > > > > +L(movsb_backward): > > > > > + leaq -1(%rdi,%rcx), %rdi > > > > > + leaq -1(%rsi,%rcx), %rsi > > > > > + std > > > > > + rep movsb > > > > > + cld > > > > > + ret > > > > > +END (__memmove_erms) > > > > > +strong_alias (__memmove_erms, __memcpy_erms) > > > > > +strong_alias (__memmove_chk_erms, __memcpy_chk_erms) > > > > > +#endif > > > > > diff --git a/sysdeps/x86_64/multiarch/memmove-vec-unaligned-erms.S b/sysdeps/x86_64/multiarch/memmove-vec-unaligned-erms.S > > > > > index d1518b8bab..04747133b7 100644 > > > > > --- a/sysdeps/x86_64/multiarch/memmove-vec-unaligned-erms.S > > > > > +++ b/sysdeps/x86_64/multiarch/memmove-vec-unaligned-erms.S > > > > > @@ -239,56 +239,6 @@ L(start): > > > > > #endif > > > > > #if defined USE_MULTIARCH && IS_IN (libc) > > > > > END (MEMMOVE_SYMBOL (__memmove, unaligned)) > > > > > -# if VEC_SIZE == 16 > > > > > -ENTRY (__mempcpy_chk_erms) > > > > > - cmp %RDX_LP, %RCX_LP > > > > > - jb HIDDEN_JUMPTARGET (__chk_fail) > > > > > -END (__mempcpy_chk_erms) > > > > > - > > > > > -/* Only used to measure performance of REP MOVSB. */ > > > > > -ENTRY (__mempcpy_erms) > > > > > - mov %RDI_LP, %RAX_LP > > > > > - /* Skip zero length. */ > > > > > - test %RDX_LP, %RDX_LP > > > > > - jz 2f > > > > > - add %RDX_LP, %RAX_LP > > > > > - jmp L(start_movsb) > > > > > -END (__mempcpy_erms) > > > > > - > > > > > -ENTRY (__memmove_chk_erms) > > > > > - cmp %RDX_LP, %RCX_LP > > > > > - jb HIDDEN_JUMPTARGET (__chk_fail) > > > > > -END (__memmove_chk_erms) > > > > > - > > > > > -ENTRY (__memmove_erms) > > > > > - movq %rdi, %rax > > > > > - /* Skip zero length. */ > > > > > - test %RDX_LP, %RDX_LP > > > > > - jz 2f > > > > > -L(start_movsb): > > > > > - mov %RDX_LP, %RCX_LP > > > > > - cmp %RSI_LP, %RDI_LP > > > > > - jb 1f > > > > > - /* Source == destination is less common. */ > > > > > - je 2f > > > > > - lea (%rsi,%rcx), %RDX_LP > > > > > - cmp %RDX_LP, %RDI_LP > > > > > - jb L(movsb_backward) > > > > > -1: > > > > > - rep movsb > > > > > -2: > > > > > - ret > > > > > -L(movsb_backward): > > > > > - leaq -1(%rdi,%rcx), %rdi > > > > > - leaq -1(%rsi,%rcx), %rsi > > > > > - std > > > > > - rep movsb > > > > > - cld > > > > > - ret > > > > > -END (__memmove_erms) > > > > > -strong_alias (__memmove_erms, __memcpy_erms) > > > > > -strong_alias (__memmove_chk_erms, __memcpy_chk_erms) > > > > > -# endif > > > > > > > > > > # ifdef SHARED > > > > > ENTRY (MEMMOVE_CHK_SYMBOL (__mempcpy_chk, unaligned_erms)) > > > > > -- > > > > > 2.34.1 > > > > > > > > > > > > > Please make a standalone patch. > > > > > > The memmove isa raising change has a dependency on it hence the series. > > > Submit this first then rebsubmit memmove? Same for memset-erms / > > > memset-isa raising? > > > > Yes. Moving the erms version to a separate file should be standalone. > > Each patch should build. > > The reason it doesn't is that the isa raising for memmove-vec... > would require handling the memmove_erms case for it to build > otherwise ISA V3/V4 would leave memmove_erms > as undefined symbols in the multiarch build. The first patch in your patch set isn't standalone since Makefile change is in the second patch. > > > > You should combine 2 memset-erms changes > > in 2 memset patches into a single patch. > ? > The first patch moves memset-erms to the file end and the second patch moves it to another file. -- H.J.